[PATCH 1/5] arm64: dts: sdm845-xiaomi-beryllium: rename beryllium.dts into beryllium-common.dtsi

[PATCH 1/5] arm64: dts: sdm845-xiaomi-beryllium: rename beryllium.dts into beryllium-common.dtsi

[Joel Selvaraj]

The existing beryllium dts file is converted into a common dtsi file
which the tianma and ebbg variant will inherit.

Signed-off-by: Joel Selvaraj <jo@jsfamily.in>
---
 ...5-xiaomi-beryllium.dts => sdm845-xiaomi-beryllium-common.dtsi} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename arch/arm64/boot/dts/qcom/{sdm845-xiaomi-beryllium.dts => sdm845-xiaomi-beryllium-common.dtsi} (100%)

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 100%
rename from arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts
rename to arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
-- 
2.36.1

Re: [PATCH 1/5] arm64: dts: sdm845-xiaomi-beryllium: rename beryllium.dts into beryllium-common.dtsi

[Bjorn Andersson]

On Fri 08 Jul 06:12 CDT 2022, Joel Selvaraj wrote:

> The existing beryllium dts file is converted into a common dtsi file
> which the tianma and ebbg variant will inherit.
> 

Applying this patch would cause the tree to fail to build until the last
patch is introduced. This would cause problems for people trying to use
git bisect to find regressions in the git history.

Could you please respin this patch such that it continues to build the
currently supported board and then you could add the new board/variant
in a separate commit.

Regards,
Bjorn

> Signed-off-by: Joel Selvaraj <jo@jsfamily.in>
> ---
>  ...5-xiaomi-beryllium.dts => sdm845-xiaomi-beryllium-common.dtsi} | 0
>  1 file changed, 0 insertions(+), 0 deletions(-)
>  rename arch/arm64/boot/dts/qcom/{sdm845-xiaomi-beryllium.dts => sdm845-xiaomi-beryllium-common.dtsi} (100%)
> 
> 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 100%
> rename from arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts
> rename to arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
> -- 
> 2.36.1
> 

Re: [PATCH 1/5] arm64: dts: sdm845-xiaomi-beryllium: rename beryllium.dts into beryllium-common.dtsi

[Joel Selvaraj]

Hi Bjorn Andersson

On 14/07/22 02:22, Bjorn Andersson wrote:
> Applying this patch would cause the tree to fail to build until the last
> patch is introduced. This would cause problems for people trying to use
> git bisect to find regressions in the git history.
> 
> Could you please respin this patch such that it continues to build the
> currently supported board and then you could add the new board/variant
> in a separate commit.

Ok. Understood. But I am not entirely sure how I implement this? Since
except for display and touchscreen, everything is almost the same. So I
wanted to move the common bits to a common dtsi. Here is the cover
letter where I explain a bit on the situation, if it's missed and not
noticed.

Link:
https://lore.kernel.org/r/MN2PR02MB702415D7BF12B7B7A41B2D38D9829@MN2PR02MB7024.namprd02.prod.outlook.com/

Here are few things I think I can do, kindly let me know which seems
more ideal.

1. Don't create a common dtsi and leave the existing dts as it is and
just create a new dts for the new variant.
sdm845-xiaomi-beryllium.dts - untouched. represents tianma variant.
sdm845-xiaomi-beryllium-ebbg.dts - new dts, represents ebbg variant.

2. Create new common dtsi file and move all the common bits to it. Then
create new dts for ebbg variant.
sdm845-xiaomi-beryllium-common.dtsi - new, has the common bits
sdm845-xiaomi-beryllium.dts - use common dtsi, represent tianma model
sdm845-xiaomi-beryllium-ebbg.dts - new, use common dtsi, represent ebbg
variant.

These two approaches keep the existing dts valid even after the patch
and doesn't break build. But I wish I could rename the existing dts to
sdm845-xiaomi-beryllium-tianma.dts as its more appropriate. So I can do
something like:

3. Create new common dtsi, create new tianma variant dts, create new
ebbg variant dts. Finally, when changing the Makefile, delete the old
sdm845-xiaomi-beryllium.dts. We can explain in this commit, that it has
been renamed. This way, if someone git bisect, it can point to this
exact commit where it breaks and know that a rename has happened.

Kindly help me choosing an ideal approach or suggest a better approach.

> Regards,
> Bjorn

Regards,
Joel Selvaraj

[PATCH 2/5] arm64: dts: qcom: sdm845-xiaomi-beryllium-common: generalize the display panel node

[Joel Selvaraj]

Make the display panel nodes generic. The tianma and ebbg variant will
set the compatabile property as per the display model they use.

Signed-off-by: Joel Selvaraj <jo@jsfamily.in>
---
 .../boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
index d88dc07205f7..634999cf8987 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
@@ -221,8 +221,8 @@ &dsi0 {
 	status = "okay";
 	vdda-supply = <&vreg_l26a_1p2>;
 
-	panel@0 {
-		compatible = "tianma,fhd-video";
+	display_panel: panel@0 {
+		status = "disabled";
 		reg = <0>;
 		vddio-supply = <&vreg_l14a_1p8>;
 		vddpos-supply = <&lab>;
@@ -235,7 +235,7 @@ panel@0 {
 		reset-gpios = <&tlmm 6 GPIO_ACTIVE_LOW>;
 
 		port {
-			tianma_nt36672a_in_0: endpoint {
+			panel_in_0: endpoint {
 				remote-endpoint = <&dsi0_out>;
 			};
 		};
@@ -243,7 +243,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>;
 };
 
-- 
2.36.1

Re: [PATCH 2/5] arm64: dts: qcom: sdm845-xiaomi-beryllium-common: generalize the display panel node

[Bjorn Andersson]

On Fri 08 Jul 06:12 CDT 2022, Joel Selvaraj wrote:

> Make the display panel nodes generic. The tianma and ebbg variant will
> set the compatabile property as per the display model they use.
> 
> Signed-off-by: Joel Selvaraj <jo@jsfamily.in>
> ---
>  .../boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi     | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
> index d88dc07205f7..634999cf8987 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
> @@ -221,8 +221,8 @@ &dsi0 {
>  	status = "okay";
>  	vdda-supply = <&vreg_l26a_1p2>;
>  
> -	panel@0 {
> -		compatible = "tianma,fhd-video";
> +	display_panel: panel@0 {
> +		status = "disabled";

Please make "status" the last property defined in the node. Same comment
on the next 2 patches.

Thanks,
Bjorn

>  		reg = <0>;
>  		vddio-supply = <&vreg_l14a_1p8>;
>  		vddpos-supply = <&lab>;
> @@ -235,7 +235,7 @@ panel@0 {
>  		reset-gpios = <&tlmm 6 GPIO_ACTIVE_LOW>;
>  
>  		port {
> -			tianma_nt36672a_in_0: endpoint {
> +			panel_in_0: endpoint {
>  				remote-endpoint = <&dsi0_out>;
>  			};
>  		};
> @@ -243,7 +243,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>;
>  };
>  
> -- 
> 2.36.1
> 

[PATCH 3/5] arm64: dts: qcom: sdm845-xiaomi-beryllium: introduce tianma variant

[Joel Selvaraj]

The tianma variant uses the Novatek NT36672a panel manufactured by tianma.

Signed-off-by: Joel Selvaraj <jo@jsfamily.in>
---
 .../boot/dts/qcom/sdm845-xiaomi-beryllium-tianma.dts   | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-tianma.dts

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..97bfc1c67eaf
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-tianma.dts
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/dts-v1/;
+
+#include "sdm845-xiaomi-beryllium-common.dtsi"
+
+&display_panel {
+	status = "okay";
+	compatible = "tianma,fhd-video";
+};
-- 
2.36.1

[PATCH 4/5] arm64: dts: qcom: sdm845-xiaomi-beryllium: introduce ebbg variant

[Joel Selvaraj]

The ebbg variant uses EBBG FT8719 panel manufactured by EBBG.

Signed-off-by: Joel Selvaraj <jo@jsfamily.in>
---
 .../boot/dts/qcom/sdm845-xiaomi-beryllium-ebbg.dts     | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-ebbg.dts

diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-ebbg.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-ebbg.dts
new file mode 100644
index 000000000000..3716e16e79b1
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-ebbg.dts
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/dts-v1/;
+
+#include "sdm845-xiaomi-beryllium-common.dtsi"
+
+&display_panel {
+	status = "okay";
+	compatible = "ebbg,ft8719";
+};
-- 
2.36.1

[PATCH 5/5] arm64: dts: qcom: Makefile: split beryllium into tianma and ebbg variant

[Joel Selvaraj]

Remove old beryllium dtb and compile the new tianma and ebbg variant dts.

Signed-off-by: Joel Selvaraj <jo@jsfamily.in>
---
 arch/arm64/boot/dts/qcom/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
index 2f8aec2cc6db..5cc165dfbc94 100644
--- a/arch/arm64/boot/dts/qcom/Makefile
+++ b/arch/arm64/boot/dts/qcom/Makefile
@@ -106,7 +106,8 @@ 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-beryllium-ebbg.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-shift-axolotl.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sdm850-lenovo-yoga-c630.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sdm850-samsung-w737.dtb
-- 
2.36.1