Message ID | 20220909035447.36674-2-joelselvaraj.oss@gmail.com (mailing list archive) |
---|---|
State | Accepted |
Headers | show |
Series | Add support for Xiaomi Poco F1 EBBG variant | expand |
On 09/09/2022 05:54, Joel Selvaraj wrote: > 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: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Best regards, Krzysztof
On 09/09/2022 04:54, Joel Selvaraj wrote: > 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> Kind regards, Caleb > --- > arch/arm64/boot/dts/qcom/Makefile | 2 +- > ...um.dts => sdm845-xiaomi-beryllium-common.dtsi} | 11 +++++------ > .../dts/qcom/sdm845-xiaomi-beryllium-tianma.dts | 15 +++++++++++++++ > 3 files changed, 21 insertions(+), 7 deletions(-) > rename arch/arm64/boot/dts/qcom/{sdm845-xiaomi-beryllium.dts => sdm845-xiaomi-beryllium-common.dtsi} (98%) > create mode 100644 arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-tianma.dts > > diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile > index 1d86a33de528..d0bba59d2a8c 100644 > --- a/arch/arm64/boot/dts/qcom/Makefile > +++ b/arch/arm64/boot/dts/qcom/Makefile > @@ -128,7 +128,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 82c27f90d300..940ac9cd0aba 100644 > --- 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 @@ &dsi0 { > 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 @@ panel@0 { > 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 @@ tianma_nt36672a_in_0: endpoint { > }; > > &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 > index 000000000000..8e176111e599 > --- /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"; > +}; > -- > 2.37.3 >
diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile index 1d86a33de528..d0bba59d2a8c 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile @@ -128,7 +128,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 82c27f90d300..940ac9cd0aba 100644 --- 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 @@ &dsi0 { 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 @@ panel@0 { 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 @@ tianma_nt36672a_in_0: endpoint { }; &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 index 000000000000..8e176111e599 --- /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"; +};