[PATCH 1/2] arm64: dts: rockchip: enable internal pull-up for Q7_THRM# on RK3399 Puma

[PATCH 1/2] arm64: dts: rockchip: enable internal pull-up for Q7_THRM# on RK3399 Puma

[Iskander Amara]

Q7_THRM# pin is connected to a diode on the module which is used
as a level shifter, and the pin have a pull-down enabled by
default. We need to configure it to internal pull-up, other-
wise whenever the pin is configured as INPUT and we try to
control it externally the value will always remain zero.

Signed-off-by: Iskander Amara <iskander.amara@theobroma-systems.com>
---
 arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
index c08e69391c01..06f3e97af7cd 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
@@ -426,6 +426,16 @@ &pwm2 {
 };
 
 &pinctrl {
+	pinctrl-names = "default";
+	pinctrl-0 = <&q7_thermal_pin>;
+
+	gpios {
+		q7_thermal_pin: q7-thermal-pin {
+			rockchip,pins =
+				<0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+	};
+
 	i2c8 {
 		i2c8_xfer_a: i2c8-xfer {
 			rockchip,pins =
-- 
2.34.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH 2/2] arm64: dts: rockchip: fix alphabetical ordering RK3399 puma

[Iskander Amara]

Nodes overridden by their reference should be ordered alphabetically to
make it easier to read the DTS. pinctrl node is defined in the wrong
location so let's reorder it.

Signed-off-by: Iskander Amara <iskander.amara@theobroma-systems.com>
---
 arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
index 06f3e97af7cd..214ea62b24a5 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
@@ -416,15 +416,6 @@ &io_domains {
 	gpio1830-supply = <&vcc_1v8>;
 };
 
-&pmu_io_domains {
-	status = "okay";
-	pmu1830-supply = <&vcc_1v8>;
-};
-
-&pwm2 {
-	status = "okay";
-};
-
 &pinctrl {
 	pinctrl-names = "default";
 	pinctrl-0 = <&q7_thermal_pin>;
@@ -473,6 +464,15 @@ usb3_id: usb3-id {
 	};
 };
 
+&pmu_io_domains {
+	status = "okay";
+	pmu1830-supply = <&vcc_1v8>;
+};
+
+&pwm2 {
+	status = "okay";
+};
+
 &sdhci {
 	/*
 	 * Signal integrity isn't great at 200MHz but 100MHz has proven stable
-- 
2.34.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 1/2] arm64: dts: rockchip: enable internal pull-up for Q7_THRM# on RK3399 Puma

[Quentin Schulz]

Hi Iskander,

On 3/8/24 09:52, Iskander Amara wrote:
> Q7_THRM# pin is connected to a diode on the module which is used
> as a level shifter, and the pin have a pull-down enabled by
> default. We need to configure it to internal pull-up, other-
> wise whenever the pin is configured as INPUT and we try to
> control it externally the value will always remain zero.
> 
> Signed-off-by: Iskander Amara <iskander.amara@theobroma-systems.com>

For the whole series:

Reviewed-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>

@Heiko I think this may match the criteria for stable backports?

Thanks,
Quentin

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 1/2] arm64: dts: rockchip: enable internal pull-up for Q7_THRM# on RK3399 Puma

[Heiko Stübner]

Am Freitag, 8. März 2024, 10:25:43 CET schrieb Quentin Schulz:
> Hi Iskander,
> 
> On 3/8/24 09:52, Iskander Amara wrote:
> > Q7_THRM# pin is connected to a diode on the module which is used
> > as a level shifter, and the pin have a pull-down enabled by
> > default. We need to configure it to internal pull-up, other-
> > wise whenever the pin is configured as INPUT and we try to
> > control it externally the value will always remain zero.
> > 
> > Signed-off-by: Iskander Amara <iskander.amara@theobroma-systems.com>
> 
> For the whole series:
> 
> Reviewed-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
> 
> @Heiko I think this may match the criteria for stable backports?

at least patch1 does ... it definitly should have a Fixes tag though.



_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 1/2] arm64: dts: rockchip: enable internal pull-up for Q7_THRM# on RK3399 Puma

[Quentin Schulz]

Hi Heiko,

On 3/8/24 10:29, Heiko Stübner wrote:
> Am Freitag, 8. März 2024, 10:25:43 CET schrieb Quentin Schulz:
>> Hi Iskander,
>>
>> On 3/8/24 09:52, Iskander Amara wrote:
>>> Q7_THRM# pin is connected to a diode on the module which is used
>>> as a level shifter, and the pin have a pull-down enabled by
>>> default. We need to configure it to internal pull-up, other-
>>> wise whenever the pin is configured as INPUT and we try to
>>> control it externally the value will always remain zero.
>>>
>>> Signed-off-by: Iskander Amara <iskander.amara@theobroma-systems.com>
>>
>> For the whole series:
>>
>> Reviewed-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
>>
>> @Heiko I think this may match the criteria for stable backports?
> 
> at least patch1 does ... it definitly should have a Fixes tag though.
> 
> 

Fixes: 2c66fc34e945 ("arm64: dts: rockchip: add RK3399-Q7 (Puma) SoM")

I assume, since this issue existed since the introducing commit.

Cheers,
Quentin

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 1/2] arm64: dts: rockchip: enable internal pull-up for Q7_THRM# on RK3399 Puma

[Heiko Stuebner]

On Fri, 8 Mar 2024 09:52:42 +0100, Iskander Amara wrote:
> Q7_THRM# pin is connected to a diode on the module which is used
> as a level shifter, and the pin have a pull-down enabled by
> default. We need to configure it to internal pull-up, other-
> wise whenever the pin is configured as INPUT and we try to
> control it externally the value will always remain zero.
> 
> 
> [...]

Applied, thanks!

[1/2] arm64: dts: rockchip: enable internal pull-up for Q7_THRM# on RK3399 Puma
      commit: 0ac417b8f124427c90ec8c2ef4f632b821d924cc
[2/2] arm64: dts: rockchip: fix alphabetical ordering RK3399 puma
      commit: f0abb4b2c7acf3c3e4130dc3f54cd90cf2ae62bc

Best regards,
-- 
Heiko Stuebner <heiko@sntech.de>

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel