diff options
author | Tony Lindgren <tony@atomide.com> | 2021-03-08 10:34:12 +0100 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2021-03-08 10:34:12 +0100 |
commit | 4c9f4865f4604744d4f1a43db22ac6ec9dc8e587 (patch) | |
tree | 46abf93c9b90b880464772ce7d23309ee3616b91 /arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | |
parent | soc: ti: omap-prm: Fix occasional abort on reset deassert for dra7 iva (diff) | |
parent | ARM: dts: Fix moving mmc devices with aliases for omap4 & 5 (diff) | |
download | linux-4c9f4865f4604744d4f1a43db22ac6ec9dc8e587.tar.xz linux-4c9f4865f4604744d4f1a43db22ac6ec9dc8e587.zip |
Merge branch 'fixes-rc2' into fixes
Diffstat (limited to 'arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts')
-rw-r--r-- | arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts index 358ed5f1b1c1..b21ddd0ec1c2 100644 --- a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts +++ b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts @@ -62,12 +62,12 @@ leds { compatible = "gpio-leds"; - red { + led-0 { label = "i12_tvbox:red:usr"; gpios = <&pio 7 9 GPIO_ACTIVE_LOW>; }; - blue { + led-1 { label = "i12_tvbox:blue:usr"; gpios = <&pio 7 20 GPIO_ACTIVE_HIGH>; }; |