| Message ID | 20190921131457.36258-1-sigmaris@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | deea9f5fc32040fd6f6132f2260ba410fb5cf98c |
| Headers | show |
| Series | arm64: dts: rockchip: fix Rockpro64 RK808 interrupt line | expand |
Am Samstag, 21. September 2019, 15:14:57 CEST schrieb Hugh Cole-Baker: > Fix the pinctrl and interrupt specifier for RK808 to use GPIO3_B2. On the > Rockpro64 schematic [1] page 16, it shows GPIO3_B2 used for the interrupt > line PMIC_INT_L from the RK808, and there's a note which translates as: > "PMU termination GPIO1_C5 changed to this". > > Tested by setting an RTC wakealarm and checking /proc/interrupts counters. > Without this patch, neither the rockchip_gpio_irq counter for the RK808, > nor the RTC alarm counter increment when the alarm time is reached. > With this patch, both interrupt counters increment by 1 as expected. > > [1] http://files.pine64.org/doc/rockpro64/rockpro64_v21-SCH.pdf > > Fixes: e4f3fb4 ("arm64: dts: rockchip: add initial dts support for Rockpro64") > Signed-off-by: Hugh Cole-Baker <sigmaris@gmail.com> applied as fix for 5.4 Thanks Heiko
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts index 0401d4ec1f45..c27d8a6ae1c5 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts @@ -247,8 +247,8 @@ rk808: pmic@1b { compatible = "rockchip,rk808"; reg = <0x1b>; - interrupt-parent = <&gpio1>; - interrupts = <21 IRQ_TYPE_LEVEL_LOW>; + interrupt-parent = <&gpio3>; + interrupts = <10 IRQ_TYPE_LEVEL_LOW>; #clock-cells = <1>; clock-output-names = "xin32k", "rk808-clkout2"; pinctrl-names = "default"; @@ -574,7 +574,7 @@ pmic { pmic_int_l: pmic-int-l { - rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>; + rockchip,pins = <3 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>; }; vsel1_gpio: vsel1-gpio {
Fix the pinctrl and interrupt specifier for RK808 to use GPIO3_B2. On the Rockpro64 schematic [1] page 16, it shows GPIO3_B2 used for the interrupt line PMIC_INT_L from the RK808, and there's a note which translates as: "PMU termination GPIO1_C5 changed to this". Tested by setting an RTC wakealarm and checking /proc/interrupts counters. Without this patch, neither the rockchip_gpio_irq counter for the RK808, nor the RTC alarm counter increment when the alarm time is reached. With this patch, both interrupt counters increment by 1 as expected. [1] http://files.pine64.org/doc/rockpro64/rockpro64_v21-SCH.pdf Fixes: e4f3fb4 ("arm64: dts: rockchip: add initial dts support for Rockpro64") Signed-off-by: Hugh Cole-Baker <sigmaris@gmail.com> --- arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)