diff options
author | Willy Tarreau <w@1wt.eu> | 2017-02-11 09:56:45 +0100 |
---|---|---|
committer | Heiko Stuebner <heiko@sntech.de> | 2017-03-06 04:45:23 +0100 |
commit | f5de310cf4f0eddd7e6c63ddd9f47f244516e27a (patch) | |
tree | 7a1bbcbdceebba2aaec7c8578fd1941c812aafb0 /arch/arm/boot/dts/rk3288-miqi.dts | |
parent | ARM: dts: rockchip: Add support for ES8388 to the Radxa Rock 2 (diff) | |
download | linux-f5de310cf4f0eddd7e6c63ddd9f47f244516e27a.tar.xz linux-f5de310cf4f0eddd7e6c63ddd9f47f244516e27a.zip |
ARM: dts: rockchip: fix the MiQi board's LED definition
The MiQi board's green LED doesn't work at all with the mainline kernel.
There are multiple reasons to this. First, the gpio number is wrong, it
is declared on gpio220 (chip 7 pin 4) instead of gpio218 (chip 7 pin 2).
Second, a pinctrl is referenced, also declared with the same wrong value
while it is not unused. Third, the GPIO polarity was wrong (active low
instead of active high) with the default value set to "default-on",
resulting in the LED being turned off even when the GPIO is correct.
This patch fixes all these inconsistencies at once since these they are
related to each other, and also restores the "timer" trigger which is
the same as the one used by the kernels shipped with the board.
It's important to note that during the port to mainline, the led's label
was changed from "System" to "miqi:green:user", so scripts making use of
the name will still not work until they're fixed.
Fixes: b1a76f75d76e ("ARM: dts: rockchip: add MiQi board from mqmaker")
Signed-off-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Diffstat (limited to 'arch/arm/boot/dts/rk3288-miqi.dts')
-rw-r--r-- | arch/arm/boot/dts/rk3288-miqi.dts | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/arch/arm/boot/dts/rk3288-miqi.dts b/arch/arm/boot/dts/rk3288-miqi.dts index 21326f3e8564..30e93f694ae8 100644 --- a/arch/arm/boot/dts/rk3288-miqi.dts +++ b/arch/arm/boot/dts/rk3288-miqi.dts @@ -68,11 +68,9 @@ compatible = "gpio-leds"; work { - gpios = <&gpio7 RK_PA4 GPIO_ACTIVE_LOW>; + gpios = <&gpio7 RK_PA2 GPIO_ACTIVE_HIGH>; label = "miqi:green:user"; - linux,default-trigger = "default-on"; - pinctrl-names = "default"; - pinctrl-0 = <&led_ctl>; + linux,default-trigger = "timer"; }; }; @@ -363,12 +361,6 @@ }; }; - leds { - led_ctl: led-ctl { - rockchip,pins = <7 4 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - sdmmc { /* * Default drive strength isn't enough to achieve even |