[PATCH 0/3] arm64: dts: qcom: msm8916/39: Fix-ups for dynamic reserved mem patches

[PATCH 0/3] arm64: dts: qcom: msm8916/39: Fix-ups for dynamic reserved mem patches

[Stephan Gerhold]

Enable GPU/WCNSS properly in some MSM8916/MSM8939 boards that were 
changed after I sent the patches for the dynamic reserved memory 
allocation.

I have magic scripts that make the necessary changes automatically so 
I'm quite sure that I caught all new instances that need adjustment. :-)

Since my scripts only work properly on board DTs with sorted nodes
I also included a bonus patch to fix that in some of the MSM8916 DTs. 

Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
---
Stephan Gerhold (3):
      arm64: dts: qcom: msm8916-samsung-gt5: Enable GPU
      arm64: dts: qcom: msm8939-longcheer-l9100: Enable wcnss_mem
      arm64: dts: qcom: msm8916-*: Fix alphabetic node order

 .../boot/dts/qcom/msm8916-alcatel-idol347.dts      |  8 ++---
 .../boot/dts/qcom/msm8916-samsung-a3u-eur.dts      | 10 +++---
 .../boot/dts/qcom/msm8916-samsung-gt5-common.dtsi  | 38 +++++++++++-----------
 arch/arm64/boot/dts/qcom/msm8916-samsung-gt510.dts |  4 +++
 arch/arm64/boot/dts/qcom/msm8916-samsung-gt58.dts  |  4 +++
 arch/arm64/boot/dts/qcom/msm8916-thwc-uf896.dts    |  8 ++---
 arch/arm64/boot/dts/qcom/msm8916-thwc-ufi001c.dts  |  8 ++---
 .../arm64/boot/dts/qcom/msm8916-yiming-uz801v3.dts |  8 ++---
 .../boot/dts/qcom/msm8939-longcheer-l9100.dts      |  4 +++
 9 files changed, 52 insertions(+), 40 deletions(-)
---
base-commit: a35461d47fe3e555602912b905f1bae7045256eb
change-id: 20230921-msm8916-rmem-fixups-46ec18b9ba5d

Best regards,
-- 
Stephan Gerhold <stephan@gerhold.net>

[PATCH 1/3] arm64: dts: qcom: msm8916-samsung-gt5: Enable GPU

[Stephan Gerhold]

Enable the GPU for the msm8916-samsung-gt58 and gt510 tablets now that
they have display panels enabled in the device tree. This was missed
when the GPU was disabled by default because the change was not applied
yet.

Fixes: 0ce5bb825d54 ("arm64: dts: qcom: msm8916/39: Disable GPU by default")
Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
---
 arch/arm64/boot/dts/qcom/msm8916-samsung-gt510.dts | 4 ++++
 arch/arm64/boot/dts/qcom/msm8916-samsung-gt58.dts  | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt510.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt510.dts
index 75c4854ecd64..c3f1acc55078 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt510.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt510.dts
@@ -112,6 +112,10 @@ touchscreen@4a {
 	};
 };
 
+&gpu {
+	status = "okay";
+};
+
 &mdss {
 	status = "okay";
 };
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt58.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt58.dts
index 11359bcc27b3..998625abd409 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt58.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt58.dts
@@ -64,6 +64,10 @@ touchscreen@20 {
 	};
 };
 
+&gpu {
+	status = "okay";
+};
+
 &mdss {
 	status = "okay";
 };

-- 
2.42.0

[PATCH 2/3] arm64: dts: qcom: msm8939-longcheer-l9100: Enable wcnss_mem

[Stephan Gerhold]

Enable &wcnss_mem for msm8939-longcheer-l9100. This is needed now to
have WCNSS working. It was missed when &wcnss_mem was disabled by
default because the patch with the msm8939-longcheer-l9100 device tree
was not applied yet.

Fixes: 0ece6438a8c0 ("arm64: dts: qcom: msm8916/39: Disable unneeded firmware reservations")
Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
---
 arch/arm64/boot/dts/qcom/msm8939-longcheer-l9100.dts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/msm8939-longcheer-l9100.dts b/arch/arm64/boot/dts/qcom/msm8939-longcheer-l9100.dts
index 6802714fda3f..a3357513037c 100644
--- a/arch/arm64/boot/dts/qcom/msm8939-longcheer-l9100.dts
+++ b/arch/arm64/boot/dts/qcom/msm8939-longcheer-l9100.dts
@@ -247,6 +247,10 @@ &wcnss_iris {
 	compatible = "qcom,wcn3620";
 };
 
+&wcnss_mem {
+	status = "okay";
+};
+
 &tlmm {
 	button_backlight_default: button-backlight-default-state {
 		pins = "gpio17";

-- 
2.42.0

[PATCH 3/3] arm64: dts: qcom: msm8916-*: Fix alphabetic node order

[Stephan Gerhold]

Fix a couple of instances of incorrectly sorted nodes in the MSM8916
boards. They should be ordered alphabetically for consistency.

No functional change.

Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
---
Changing the RGB LED node order to BGR is a bit funny but this is how
alphabetic ordering works. :-)
---
 .../boot/dts/qcom/msm8916-alcatel-idol347.dts      |  8 ++---
 .../boot/dts/qcom/msm8916-samsung-a3u-eur.dts      | 10 +++---
 .../boot/dts/qcom/msm8916-samsung-gt5-common.dtsi  | 38 +++++++++++-----------
 arch/arm64/boot/dts/qcom/msm8916-thwc-uf896.dts    |  8 ++---
 arch/arm64/boot/dts/qcom/msm8916-thwc-ufi001c.dts  |  8 ++---
 .../arm64/boot/dts/qcom/msm8916-yiming-uz801v3.dts |  8 ++---
 6 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
index aa4c1ab1e673..fade93c55299 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
@@ -58,10 +58,6 @@ usb_id: usb-id {
 	};
 };
 
-&blsp_uart2 {
-	status = "okay";
-};
-
 &blsp_i2c4 {
 	status = "okay";
 
@@ -153,6 +149,10 @@ led@1 {
 	};
 };
 
+&blsp_uart2 {
+	status = "okay";
+};
+
 &pm8916_resin {
 	status = "okay";
 	linux,code = <KEY_VOLUMEDOWN>;
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts
index f5a808369518..3b934f5eba47 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts
@@ -49,11 +49,6 @@ reg_key_led: regulator-key-led {
 	};
 };
 
-&touchkey {
-	vcc-supply = <&reg_touch_key>;
-	vdd-supply = <&reg_key_led>;
-};
-
 &accelerometer {
 	mount-matrix = "0", "1", "0",
 		       "1", "0", "0",
@@ -108,6 +103,11 @@ &mdss_dsi0_out {
 	remote-endpoint = <&panel_in>;
 };
 
+&touchkey {
+	vcc-supply = <&reg_touch_key>;
+	vdd-supply = <&reg_key_led>;
+};
+
 &vibrator {
 	status = "okay";
 };
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
index c19cf20d7427..6a16eb5ce07b 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
@@ -65,25 +65,6 @@ hall-sensor-switch {
 	};
 };
 
-&blsp_i2c4 {
-	status = "okay";
-
-	fuelgauge@36 {
-		compatible = "maxim,max77849-battery";
-		reg = <0x36>;
-
-		maxim,rsns-microohm = <10000>;
-		maxim,over-heat-temp = <600>;
-		maxim,over-volt = <4400>;
-
-		interrupt-parent = <&tlmm>;
-		interrupts = <121 IRQ_TYPE_EDGE_FALLING>;
-
-		pinctrl-0 = <&fuelgauge_int_default>;
-		pinctrl-names = "default";
-	};
-};
-
 &blsp_i2c2 {
 	status = "okay";
 
@@ -112,6 +93,25 @@ accelerometer@1d {
 	};
 };
 
+&blsp_i2c4 {
+	status = "okay";
+
+	fuelgauge@36 {
+		compatible = "maxim,max77849-battery";
+		reg = <0x36>;
+
+		maxim,rsns-microohm = <10000>;
+		maxim,over-heat-temp = <600>;
+		maxim,over-volt = <4400>;
+
+		interrupt-parent = <&tlmm>;
+		interrupts = <121 IRQ_TYPE_EDGE_FALLING>;
+
+		pinctrl-0 = <&fuelgauge_int_default>;
+		pinctrl-names = "default";
+	};
+};
+
 &blsp_uart2 {
 	status = "okay";
 };
diff --git a/arch/arm64/boot/dts/qcom/msm8916-thwc-uf896.dts b/arch/arm64/boot/dts/qcom/msm8916-thwc-uf896.dts
index 6fe1850ba20e..f34997500891 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-thwc-uf896.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-thwc-uf896.dts
@@ -13,16 +13,16 @@ &button_restart {
 	gpios = <&tlmm 35 GPIO_ACTIVE_LOW>;
 };
 
-&led_r {
-	gpios = <&tlmm 82 GPIO_ACTIVE_HIGH>;
+&led_b {
+	gpios = <&tlmm 81 GPIO_ACTIVE_HIGH>;
 };
 
 &led_g {
 	gpios = <&tlmm 83 GPIO_ACTIVE_HIGH>;
 };
 
-&led_b {
-	gpios = <&tlmm 81 GPIO_ACTIVE_HIGH>;
+&led_r {
+	gpios = <&tlmm 82 GPIO_ACTIVE_HIGH>;
 };
 
 &button_default {
diff --git a/arch/arm64/boot/dts/qcom/msm8916-thwc-ufi001c.dts b/arch/arm64/boot/dts/qcom/msm8916-thwc-ufi001c.dts
index 16d4a91022be..6cb3911ba1c9 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-thwc-ufi001c.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-thwc-ufi001c.dts
@@ -13,16 +13,16 @@ &button_restart {
 	gpios = <&tlmm 37 GPIO_ACTIVE_HIGH>;
 };
 
-&led_r {
-	gpios = <&tlmm 22 GPIO_ACTIVE_HIGH>;
+&led_b {
+	gpios = <&tlmm 20 GPIO_ACTIVE_HIGH>;
 };
 
 &led_g {
 	gpios = <&tlmm 21 GPIO_ACTIVE_HIGH>;
 };
 
-&led_b {
-	gpios = <&tlmm 20 GPIO_ACTIVE_HIGH>;
+&led_r {
+	gpios = <&tlmm 22 GPIO_ACTIVE_HIGH>;
 };
 
 &mpss {
diff --git a/arch/arm64/boot/dts/qcom/msm8916-yiming-uz801v3.dts b/arch/arm64/boot/dts/qcom/msm8916-yiming-uz801v3.dts
index 5e6ba8c58bb5..a98efcfe78b7 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-yiming-uz801v3.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-yiming-uz801v3.dts
@@ -13,16 +13,16 @@ &button_restart {
 	gpios = <&tlmm 23 GPIO_ACTIVE_LOW>;
 };
 
-&led_r {
-	gpios = <&tlmm 7 GPIO_ACTIVE_HIGH>;
+&led_b {
+	gpios = <&tlmm 6 GPIO_ACTIVE_HIGH>;
 };
 
 &led_g {
 	gpios = <&tlmm 8 GPIO_ACTIVE_HIGH>;
 };
 
-&led_b {
-	gpios = <&tlmm 6 GPIO_ACTIVE_HIGH>;
+&led_r {
+	gpios = <&tlmm 7 GPIO_ACTIVE_HIGH>;
 };
 
 &button_default {

-- 
2.42.0

Re: [PATCH 0/3] arm64: dts: qcom: msm8916/39: Fix-ups for dynamic reserved mem patches

[Bryan O'Donoghue]

On 21/09/2023 19:56, Stephan Gerhold wrote:
> Enable GPU/WCNSS properly in some MSM8916/MSM8939 boards that were
> changed after I sent the patches for the dynamic reserved memory
> allocation.
> 
> I have magic scripts that make the necessary changes automatically so
> I'm quite sure that I caught all new instances that need adjustment. :-)
> 
> Since my scripts only work properly on board DTs with sorted nodes
> I also included a bonus patch to fix that in some of the MSM8916 DTs.
> 
> Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
> ---
> Stephan Gerhold (3):
>        arm64: dts: qcom: msm8916-samsung-gt5: Enable GPU
>        arm64: dts: qcom: msm8939-longcheer-l9100: Enable wcnss_mem
>        arm64: dts: qcom: msm8916-*: Fix alphabetic node order
> 
>   .../boot/dts/qcom/msm8916-alcatel-idol347.dts      |  8 ++---
>   .../boot/dts/qcom/msm8916-samsung-a3u-eur.dts      | 10 +++---
>   .../boot/dts/qcom/msm8916-samsung-gt5-common.dtsi  | 38 +++++++++++-----------
>   arch/arm64/boot/dts/qcom/msm8916-samsung-gt510.dts |  4 +++
>   arch/arm64/boot/dts/qcom/msm8916-samsung-gt58.dts  |  4 +++
>   arch/arm64/boot/dts/qcom/msm8916-thwc-uf896.dts    |  8 ++---
>   arch/arm64/boot/dts/qcom/msm8916-thwc-ufi001c.dts  |  8 ++---
>   .../arm64/boot/dts/qcom/msm8916-yiming-uz801v3.dts |  8 ++---
>   .../boot/dts/qcom/msm8939-longcheer-l9100.dts      |  4 +++
>   9 files changed, 52 insertions(+), 40 deletions(-)
> ---
> base-commit: a35461d47fe3e555602912b905f1bae7045256eb
> change-id: 20230921-msm8916-rmem-fixups-46ec18b9ba5d
> 
> Best regards,

Do these Fixes shas exist ? I can't seem to find them.

---
bod

Re: [PATCH 0/3] arm64: dts: qcom: msm8916/39: Fix-ups for dynamic reserved mem patches

[Stephan Gerhold]

On Sat, Sep 23, 2023 at 04:12:25PM +0100, Bryan O'Donoghue wrote:
> On 21/09/2023 19:56, Stephan Gerhold wrote:
> > Enable GPU/WCNSS properly in some MSM8916/MSM8939 boards that were
> > changed after I sent the patches for the dynamic reserved memory
> > allocation.
> > 
> > I have magic scripts that make the necessary changes automatically so
> > I'm quite sure that I caught all new instances that need adjustment. :-)
> > 
> > Since my scripts only work properly on board DTs with sorted nodes
> > I also included a bonus patch to fix that in some of the MSM8916 DTs.
> > 
> > Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
> > ---
> > Stephan Gerhold (3):
> >        arm64: dts: qcom: msm8916-samsung-gt5: Enable GPU
> >        arm64: dts: qcom: msm8939-longcheer-l9100: Enable wcnss_mem
> >        arm64: dts: qcom: msm8916-*: Fix alphabetic node order
> > 
> >   .../boot/dts/qcom/msm8916-alcatel-idol347.dts      |  8 ++---
> >   .../boot/dts/qcom/msm8916-samsung-a3u-eur.dts      | 10 +++---
> >   .../boot/dts/qcom/msm8916-samsung-gt5-common.dtsi  | 38 +++++++++++-----------
> >   arch/arm64/boot/dts/qcom/msm8916-samsung-gt510.dts |  4 +++
> >   arch/arm64/boot/dts/qcom/msm8916-samsung-gt58.dts  |  4 +++
> >   arch/arm64/boot/dts/qcom/msm8916-thwc-uf896.dts    |  8 ++---
> >   arch/arm64/boot/dts/qcom/msm8916-thwc-ufi001c.dts  |  8 ++---
> >   .../arm64/boot/dts/qcom/msm8916-yiming-uz801v3.dts |  8 ++---
> >   .../boot/dts/qcom/msm8939-longcheer-l9100.dts      |  4 +++
> >   9 files changed, 52 insertions(+), 40 deletions(-)
> > ---
> > base-commit: a35461d47fe3e555602912b905f1bae7045256eb
> > change-id: 20230921-msm8916-rmem-fixups-46ec18b9ba5d
> > 
> 
> Do these Fixes shas exist ? I can't seem to find them.
> 

Yes, fetch for-next from
https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git

It did not end up in linux-next yet because the ARM32 build in the
qcom tree is broken currently [1].

[1]: https://lore.kernel.org/linux-next/20230921084252.3c5ab501@canb.auug.org.au/

Re: [PATCH 2/3] arm64: dts: qcom: msm8939-longcheer-l9100: Enable wcnss_mem

[André Apitzsch]

Am Donnerstag, dem 21.09.2023 um 20:56 +0200 schrieb Stephan Gerhold:
> Enable &wcnss_mem for msm8939-longcheer-l9100. This is needed now to
> have WCNSS working. It was missed when &wcnss_mem was disabled by
> default because the patch with the msm8939-longcheer-l9100 device
> tree
> was not applied yet.
> 
> Fixes: 0ece6438a8c0 ("arm64: dts: qcom: msm8916/39: Disable unneeded
> firmware reservations")
> Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
> ---
>  arch/arm64/boot/dts/qcom/msm8939-longcheer-l9100.dts | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/qcom/msm8939-longcheer-l9100.dts
> b/arch/arm64/boot/dts/qcom/msm8939-longcheer-l9100.dts
> index 6802714fda3f..a3357513037c 100644
> --- a/arch/arm64/boot/dts/qcom/msm8939-longcheer-l9100.dts
> +++ b/arch/arm64/boot/dts/qcom/msm8939-longcheer-l9100.dts
> @@ -247,6 +247,10 @@ &wcnss_iris {
>  	compatible = "qcom,wcn3620";
>  };
>  
> +&wcnss_mem {
> +	status = "okay";
> +};
> +
>  &tlmm {
>  	button_backlight_default: button-backlight-default-state {
>  		pins = "gpio17";
> 

Reviewed-by: André Apitzsch <git@apitzsch.eu>
Tested-by: André Apitzsch <git@apitzsch.eu>

Re: [PATCH 0/3] arm64: dts: qcom: msm8916/39: Fix-ups for dynamic reserved mem patches

[Bjorn Andersson]

On Thu, 21 Sep 2023 20:56:03 +0200, Stephan Gerhold wrote:
> Enable GPU/WCNSS properly in some MSM8916/MSM8939 boards that were
> changed after I sent the patches for the dynamic reserved memory
> allocation.
> 
> I have magic scripts that make the necessary changes automatically so
> I'm quite sure that I caught all new instances that need adjustment. :-)
> 
> [...]

Applied, thanks!

[1/3] arm64: dts: qcom: msm8916-samsung-gt5: Enable GPU
      commit: e87cef6a035edc03b4ac98f88121c706b2843156
[2/3] arm64: dts: qcom: msm8939-longcheer-l9100: Enable wcnss_mem
      commit: d63ae4a814a763a5d2d4d078073562698693a909
[3/3] arm64: dts: qcom: msm8916-*: Fix alphabetic node order
      commit: b364cc485da1b769f1ead705dcd853e87b42f96e

Best regards,
-- 
Bjorn Andersson <andersson@kernel.org>