lkml.org 
[lkml]   [2020]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 156/477] arm64: dts: meson: fix leds subnodes name
    Date
    From: Neil Armstrong <narmstrong@baylibre.com>

    [ Upstream commit 08dc0e5dd9aabd52cff9e94febe6b282d29deca4 ]

    Fix the leds subnode names to match (^led-[0-9a-f]$|led)

    It fixes:
    meson-g12b-a311d-khadas-vim3.dt.yaml: leds: 'red', 'white' do not match any of the regexes: '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
    meson-g12b-s922x-khadas-vim3.dt.yaml: leds: 'red', 'white' do not match any of the regexes: '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
    meson-g12b-odroid-n2.dt.yaml: leds: 'blue' does not match any of the regexes: '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
    meson-gxbb-nanopi-k2.dt.yaml: leds: 'stat' does not match any of the regexes: '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
    meson-gxbb-nexbox-a95x.dt.yaml: leds: 'blue' does not match any of the regexes: '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
    meson-gxbb-odroidc2.dt.yaml: leds: 'blue' does not match any of the regexes: '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
    meson-gxbb-vega-s95-pro.dt.yaml: leds: 'blue' does not match any of the regexes: '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
    meson-gxbb-vega-s95-meta.dt.yaml: leds: 'blue' does not match any of the regexes: '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
    meson-gxbb-vega-s95-telos.dt.yaml: leds: 'blue' does not match any of the regexes: '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
    meson-gxbb-wetek-hub.dt.yaml: leds: 'system' does not match any of the regexes: '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
    meson-gxbb-wetek-play2.dt.yaml: leds: 'ethernet', 'system', 'wifi' do not match any of the regexes: '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
    meson-gxl-s905x-libretech-cc.dt.yaml: leds: 'blue', 'system' do not match any of the regexes: '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
    meson-gxl-s905d-libretech-pc.dt.yaml: leds: 'blue', 'green' do not match any of the regexes: '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
    meson-gxm-rbox-pro.dt.yaml: leds: 'blue', 'red' do not match any of the regexes: '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
    meson-gxm-s912-libretech-pc.dt.yaml: leds: 'blue', 'green' do not match any of the regexes: '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
    meson-sm1-sei610.dt.yaml: leds: 'bluetooth' does not match any of the regexes: '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
    meson-sm1-khadas-vim3l.dt.yaml: leds: 'red', 'white' do not match any of the regexes: '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'

    Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
    Signed-off-by: Kevin Hilman <khilman@baylibre.com>
    Link: https://lore.kernel.org/r/20200326165958.19274-6-narmstrong@baylibre.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi | 4 ++--
    arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 2 +-
    arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 2 +-
    arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 2 +-
    arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 2 +-
    arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts | 4 ++--
    arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi | 2 +-
    arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 4 ++--
    arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 4 ++--
    arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 4 ++--
    arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 2 +-
    11 files changed, 16 insertions(+), 16 deletions(-)

    diff --git a/arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi
    index 248b018c83d57..b1da36fdeac6b 100644
    --- a/arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi
    +++ b/arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi
    @@ -96,14 +96,14 @@
    leds {
    compatible = "gpio-leds";

    - green {
    + led-green {
    color = <LED_COLOR_ID_GREEN>;
    function = LED_FUNCTION_DISK_ACTIVITY;
    gpios = <&gpio_ao GPIOAO_9 GPIO_ACTIVE_HIGH>;
    linux,default-trigger = "disk-activity";
    };

    - blue {
    + led-blue {
    color = <LED_COLOR_ID_BLUE>;
    function = LED_FUNCTION_STATUS;
    gpios = <&gpio GPIODV_28 GPIO_ACTIVE_HIGH>;
    diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
    index d6ca684e0e616..7be3e354093bf 100644
    --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
    +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
    @@ -29,7 +29,7 @@
    leds {
    compatible = "gpio-leds";

    - stat {
    + led-stat {
    label = "nanopi-k2:blue:stat";
    gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_HIGH>;
    default-state = "on";
    diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts
    index 65ec7dea828c1..67d901ed2fa3a 100644
    --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts
    +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts
    @@ -31,7 +31,7 @@

    leds {
    compatible = "gpio-leds";
    - blue {
    + led-blue {
    label = "a95x:system-status";
    gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_LOW>;
    linux,default-trigger = "heartbeat";
    diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
    index b46ef985bb444..70fcfb7b0683d 100644
    --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
    +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
    @@ -49,7 +49,7 @@

    leds {
    compatible = "gpio-leds";
    - blue {
    + led-blue {
    label = "c2:blue:alive";
    gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_LOW>;
    linux,default-trigger = "heartbeat";
    diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
    index 45cb83625951a..222ee8069cfaa 100644
    --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
    +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
    @@ -20,7 +20,7 @@
    leds {
    compatible = "gpio-leds";

    - blue {
    + led-blue {
    label = "vega-s95:blue:on";
    gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_HIGH>;
    default-state = "on";
    diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts
    index 1d32d1f6d0327..2ab8a3d100791 100644
    --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts
    +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts
    @@ -14,13 +14,13 @@
    model = "WeTek Play 2";

    leds {
    - wifi {
    + led-wifi {
    label = "wetek-play:wifi-status";
    gpios = <&gpio GPIODV_26 GPIO_ACTIVE_HIGH>;
    default-state = "off";
    };

    - ethernet {
    + led-ethernet {
    label = "wetek-play:ethernet-status";
    gpios = <&gpio GPIODV_27 GPIO_ACTIVE_HIGH>;
    default-state = "off";
    diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
    index dee51cf952237..d6133af09d643 100644
    --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
    +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
    @@ -25,7 +25,7 @@
    leds {
    compatible = "gpio-leds";

    - system {
    + led-system {
    label = "wetek-play:system-status";
    gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_HIGH>;
    default-state = "on";
    diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
    index e8348b2728db5..a4a71c13891b2 100644
    --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
    +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
    @@ -54,14 +54,14 @@
    leds {
    compatible = "gpio-leds";

    - system {
    + led-system {
    label = "librecomputer:system-status";
    gpios = <&gpio GPIODV_24 GPIO_ACTIVE_HIGH>;
    default-state = "on";
    panic-indicator;
    };

    - blue {
    + led-blue {
    label = "librecomputer:blue";
    gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_HIGH>;
    linux,default-trigger = "heartbeat";
    diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts
    index 420a88e9a1950..c89c9f846fb10 100644
    --- a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts
    +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts
    @@ -36,13 +36,13 @@
    leds {
    compatible = "gpio-leds";

    - blue {
    + led-blue {
    label = "rbox-pro:blue:on";
    gpios = <&gpio_ao GPIOAO_9 GPIO_ACTIVE_HIGH>;
    default-state = "on";
    };

    - red {
    + led-red {
    label = "rbox-pro:red:standby";
    gpios = <&gpio GPIODV_28 GPIO_ACTIVE_HIGH>;
    default-state = "off";
    diff --git a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi
    index 094ecf2222bbf..1ef1e3672b967 100644
    --- a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi
    +++ b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi
    @@ -39,13 +39,13 @@
    leds {
    compatible = "gpio-leds";

    - white {
    + led-white {
    label = "vim3:white:sys";
    gpios = <&gpio_ao GPIOAO_4 GPIO_ACTIVE_LOW>;
    linux,default-trigger = "heartbeat";
    };

    - red {
    + led-red {
    label = "vim3:red";
    gpios = <&gpio_expander 5 GPIO_ACTIVE_LOW>;
    };
    diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts
    index dfb2438851c0c..5ab139a34c018 100644
    --- a/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts
    +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts
    @@ -104,7 +104,7 @@
    leds {
    compatible = "gpio-leds";

    - bluetooth {
    + led-bluetooth {
    label = "sei610:blue:bt";
    gpios = <&gpio GPIOC_7 (GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN)>;
    default-state = "off";
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-23 22:08    [W:5.422 / U:0.436 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site