| Message ID | 20201125052914.4092-1-christianshewitt@gmail.com |
|---|---|
| State | Accepted |
| Commit | 6714f28178889da983d020fd9cf3bf7ae1a8c49d |
| Headers | show |
| Series | arm64: dts: meson: update the Khadas VIM3/3L LED bindings | expand |
On 25/11/2020 06:29, Christian Hewitt wrote: > Update the VIM3/3L common dtsi to use the new function/color bindings. > > Suggested-by: Artem Lapkin <art@khadas.com> > Signed-off-by: Christian Hewitt <christianshewitt@gmail.com> > --- > This supersedes a previous submission from Art [0] and uses the updated > LED bindings suggested by Neil. > > [0] https://patchwork.kernel.org/project/linux-amlogic/patch/20200925033017.1790973-4-art@khadas.com/ > > arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi > index 87bd8c9516f2..8f8656262ae7 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi > @@ -6,6 +6,7 @@ > */ > > #include <dt-bindings/input/input.h> > +#include <dt-bindings/leds/common.h> > #include <dt-bindings/gpio/meson-g12a-gpio.h> > #include <dt-bindings/sound/meson-g12a-tohdmitx.h> > > @@ -42,14 +43,16 @@ > leds { > compatible = "gpio-leds"; > > - led-white { > - label = "vim3:white:sys"; > + white { > + color = <LED_COLOR_ID_WHITE>; > + function = LED_FUNCTION_STATUS; > gpios = <&gpio_ao GPIOAO_4 GPIO_ACTIVE_HIGH>; > linux,default-trigger = "heartbeat"; > }; > > - led-red { > - label = "vim3:red"; > + red { > + color = <LED_COLOR_ID_RED>; > + function = LED_FUNCTION_STATUS; > gpios = <&gpio_expander 5 GPIO_ACTIVE_HIGH>; > }; > }; > Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
diff --git a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi index 87bd8c9516f2..8f8656262ae7 100644 --- a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi @@ -6,6 +6,7 @@ */ #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/gpio/meson-g12a-gpio.h> #include <dt-bindings/sound/meson-g12a-tohdmitx.h> @@ -42,14 +43,16 @@ leds { compatible = "gpio-leds"; - led-white { - label = "vim3:white:sys"; + white { + color = <LED_COLOR_ID_WHITE>; + function = LED_FUNCTION_STATUS; gpios = <&gpio_ao GPIOAO_4 GPIO_ACTIVE_HIGH>; linux,default-trigger = "heartbeat"; }; - led-red { - label = "vim3:red"; + red { + color = <LED_COLOR_ID_RED>; + function = LED_FUNCTION_STATUS; gpios = <&gpio_expander 5 GPIO_ACTIVE_HIGH>; }; };
Update the VIM3/3L common dtsi to use the new function/color bindings. Suggested-by: Artem Lapkin <art@khadas.com> Signed-off-by: Christian Hewitt <christianshewitt@gmail.com> --- This supersedes a previous submission from Art [0] and uses the updated LED bindings suggested by Neil. [0] https://patchwork.kernel.org/project/linux-amlogic/patch/20200925033017.1790973-4-art@khadas.com/ arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)