diff mbox series

arm64: dts: rockchip: Add some pins for NanoPi4

Message ID f02b2410663150e68cb9e402e910bb2c2f53549c.1647352379.git.robin.murphy@arm.com (mailing list archive)
State New, archived
Headers show
Series arm64: dts: rockchip: Add some pins for NanoPi4 | expand

Commit Message

Robin Murphy March 15, 2022, 1:52 p.m. UTC
The NanoPi4 boards have the RK808's always-on 32KHz clock wired to the
SoC, so have it claim the relevant pinctrl to actually enable the
CLK32K_IN input. The RK808's SLEEP pin is also wired to the SoC's
AP_PWROFF output, so we may as well claim that too.

Signed-off-by: Robin Murphy <robin.murphy@arm.com>
---
 arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Heiko Stübner March 15, 2022, 6:43 p.m. UTC | #1
Am Dienstag, 15. März 2022, 14:52:59 CET schrieb Robin Murphy:
> The NanoPi4 boards have the RK808's always-on 32KHz clock wired to the
> SoC, so have it claim the relevant pinctrl to actually enable the
> CLK32K_IN input. The RK808's SLEEP pin is also wired to the SoC's
> AP_PWROFF output, so we may as well claim that too.
> 
> Signed-off-by: Robin Murphy <robin.murphy@arm.com>
> ---
>  arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
> index 8c0ff6c96e03..cbb12cfd40be 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
> @@ -267,7 +267,7 @@ rk808: pmic@1b {
>  		interrupt-parent = <&gpio1>;
>  		interrupts = <21 IRQ_TYPE_LEVEL_LOW>;
>  		pinctrl-names = "default";
> -		pinctrl-0 = <&pmic_int_l>;
> +		pinctrl-0 = <&pmic_int_l>, <&ap_pwroff>, <&xin32k>;

hmm that xin32k isn't present. Is this missing some previous patch?

>  		rockchip,system-power-controller;
>  		wakeup-source;
>  
>
Robin Murphy March 15, 2022, 6:53 p.m. UTC | #2
On 2022-03-15 18:43, Heiko Stübner wrote:
> Am Dienstag, 15. März 2022, 14:52:59 CET schrieb Robin Murphy:
>> The NanoPi4 boards have the RK808's always-on 32KHz clock wired to the
>> SoC, so have it claim the relevant pinctrl to actually enable the
>> CLK32K_IN input. The RK808's SLEEP pin is also wired to the SoC's
>> AP_PWROFF output, so we may as well claim that too.
>>
>> Signed-off-by: Robin Murphy <robin.murphy@arm.com>
>> ---
>>   arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
>> index 8c0ff6c96e03..cbb12cfd40be 100644
>> --- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
>> +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
>> @@ -267,7 +267,7 @@ rk808: pmic@1b {
>>   		interrupt-parent = <&gpio1>;
>>   		interrupts = <21 IRQ_TYPE_LEVEL_LOW>;
>>   		pinctrl-names = "default";
>> -		pinctrl-0 = <&pmic_int_l>;
>> +		pinctrl-0 = <&pmic_int_l>, <&ap_pwroff>, <&xin32k>;
> 
> hmm that xin32k isn't present. Is this missing some previous patch?

Err... no, that should of course be &clk_32k :(

That's what happens when I leave ~24 hours between hacking about with 
the board then typing up a proper patch from memory on a different 
machine, then "git send-email @~1" without even build-testing because 
it's so simple it can't possibly go wrong, right?

*Sigh* sorry for the noise, let me spin up a v2 and properly test it 
this time...

Robin.

> 
>>   		rockchip,system-power-controller;
>>   		wakeup-source;
>>   
>>
> 
> 
> 
>
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
index 8c0ff6c96e03..cbb12cfd40be 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
@@ -267,7 +267,7 @@  rk808: pmic@1b {
 		interrupt-parent = <&gpio1>;
 		interrupts = <21 IRQ_TYPE_LEVEL_LOW>;
 		pinctrl-names = "default";
-		pinctrl-0 = <&pmic_int_l>;
+		pinctrl-0 = <&pmic_int_l>, <&ap_pwroff>, <&xin32k>;
 		rockchip,system-power-controller;
 		wakeup-source;