arm64: dts: qcom: split beryllium dts into common dtsi and tianma dts

There are two panel variants of Xiaomi Poco F1. Tianma and EBBG panel.
The previous beryllium dts supported the Tianma variant. In order to
add support for EBBG variant, the common nodes from beryllium dts are
moved to a new common dtsi and to make the variants distinguishable,
sdm845-xiaomi-beryllium.dts is now named as
sdm845-xiaomi-beryllium-tianma.dts. The model property is updated to
distinguish between the variants. The compatibility property is
moved to the tianma variant, but it is not updated to avoid any
further conflict with other projects/users that might depend on it.

Signed-off-by: Joel Selvaraj <joelselvaraj.oss@gmail.com>
Reviewed-by: Marijn Suijten <marijn.suijten@somainline.org>
Reviewed-by: Caleb Connolly <caleb@connolly.tech>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20220909035447.36674-2-joelselvaraj.oss@gmail.com

diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
index 04f4fa66f9669c0b34266ed3a3e5e9e2c7cd0a40..3bb6f511348919339b124741d3d98755441721a5 100644 (file)
--- a/arch/arm64/boot/dts/qcom/Makefile
+++ b/arch/arm64/boot/dts/qcom/Makefile
@@ -136,7 +136,7 @@ dtb-$(CONFIG_ARCH_QCOM)     += sdm845-oneplus-fajita.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += sdm845-sony-xperia-tama-akari.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += sdm845-sony-xperia-tama-akatsuki.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += sdm845-sony-xperia-tama-apollo.dtb
-dtb-$(CONFIG_ARCH_QCOM)        += sdm845-xiaomi-beryllium.dtb
+dtb-$(CONFIG_ARCH_QCOM)        += sdm845-xiaomi-beryllium-tianma.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += sdm845-xiaomi-polaris.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += sdm845-shift-axolotl.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += sdm850-lenovo-yoga-c630.dtb

diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
similarity index 98%
rename from arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts
rename to arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
index 68e2a07a01dc7ac9b6e88831939f124b315ef967..163bf9c1a1d812454f1f17cf478a81bb12d9830f 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
@@ -26,8 +26,6 @@
 /delete-node/ &rmtfs_mem;
 
 / {
-       model = "Xiaomi Pocophone F1";
-       compatible = "xiaomi,beryllium", "qcom,sdm845";
        chassis-type = "handset";
 
        /* required for bootloader to select correct board */
@@ -221,8 +219,7 @@
        status = "okay";
        vdda-supply = <&vreg_l26a_1p2>;
 
-       panel@0 {
-               compatible = "tianma,fhd-video";
+       display_panel: panel@0 {
                reg = <0>;
                vddio-supply = <&vreg_l14a_1p8>;
                vddpos-supply = <&lab>;
@@ -234,8 +231,10 @@
                backlight = <&pmi8998_wled>;
                reset-gpios = <&tlmm 6 GPIO_ACTIVE_LOW>;
 
+               status = "disabled";
+
                port {
-                       tianma_nt36672a_in_0: endpoint {
+                       panel_in_0: endpoint {
                                remote-endpoint = <&dsi0_out>;
                        };
                };
@@ -243,7 +242,7 @@
 };
 
 &dsi0_out {
-       remote-endpoint = <&tianma_nt36672a_in_0>;
+       remote-endpoint = <&panel_in_0>;
        data-lanes = <0 1 2 3>;
 };
 

diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-tianma.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-tianma.dts
new file mode 100644 (file)
index 0000000..8e17611
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-tianma.dts
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/dts-v1/;
+
+#include "sdm845-xiaomi-beryllium-common.dtsi"
+
+/ {
+       model = "Xiaomi Pocophone F1 (Tianma)";
+       compatible = "xiaomi,beryllium", "qcom,sdm845";
+};
+
+&display_panel {
+       compatible = "tianma,fhd-video";
+       status = "okay";
+};