lkml.org 
[lkml]   [2022]   [Apr]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 249/475] staging: mt7621-dts: fix LEDs and pinctrl on GB-PC1 devicetree
    Date
    From: Arınç ÜNAL <arinc.unal@arinc9.com>

    [ Upstream commit 6256e18686158fa49e019297f990f1c1817aabf1 ]

    Fix LED and pinctrl definitions on the GB-PC1 devicetree. Refer to the
    schematics of the device for more information.

    LED fixes:
    - Change GPIO6 LED label from system to power as GPIO6 is connected to
    PLED.
    - Add default-on default-trigger to power LED.
    - Change GPIO8 LED label from status to system as GPIO8 is connected to
    SYS_LED.
    - Add disk-activity default-trigger to system LED.
    - Switch to the color:function naming scheme.
    - Remove lan1 and lan2 LEDs as they don't exist.

    Pinctrl fixes:
    - Claim state_default node under pinctrl node.
    - Change pinctrl0 node name to state-default.
    - Change gpio node name to gpio-pinmux to respect
    Documentation/devicetree/bindings/pinctrl/ralink,rt2880-pinmux.yaml.
    - Sort pin groups alphabetically.

    Misc fixes:
    - Fix formatting.
    - Use the status value "okay".
    - Define hexadecimal addresses in lower case.
    - Make hexadecimal addresses for memory easier to read.

    Link: https://github.com/ngiger/GnuBee_Docs/blob/master/GB-PCx/Documents/GB-PC1_V1.0_Schematic.pdf
    Tested-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
    Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com>
    Link: https://lore.kernel.org/r/20220311090320.3068-1-arinc.unal@arinc9.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/staging/mt7621-dts/gbpc1.dts | 40 +++++++++++++---------------
    1 file changed, 18 insertions(+), 22 deletions(-)

    diff --git a/drivers/staging/mt7621-dts/gbpc1.dts b/drivers/staging/mt7621-dts/gbpc1.dts
    index 1fb560ff059c..1713283e60d4 100644
    --- a/drivers/staging/mt7621-dts/gbpc1.dts
    +++ b/drivers/staging/mt7621-dts/gbpc1.dts
    @@ -11,7 +11,8 @@

    memory@0 {
    device_type = "memory";
    - reg = <0x0 0x1c000000>, <0x20000000 0x4000000>;
    + reg = <0x00000000 0x1c000000>,
    + <0x20000000 0x04000000>;
    };

    chosen {
    @@ -37,24 +38,16 @@
    gpio-leds {
    compatible = "gpio-leds";

    - system {
    - label = "gb-pc1:green:system";
    + power {
    + label = "green:power";
    gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
    + linux,default-trigger = "default-on";
    };

    - status {
    - label = "gb-pc1:green:status";
    + system {
    + label = "green:system";
    gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
    - };
    -
    - lan1 {
    - label = "gb-pc1:green:lan1";
    - gpios = <&gpio 24 GPIO_ACTIVE_LOW>;
    - };
    -
    - lan2 {
    - label = "gb-pc1:green:lan2";
    - gpios = <&gpio 25 GPIO_ACTIVE_LOW>;
    + linux,default-trigger = "disk-activity";
    };
    };
    };
    @@ -94,9 +87,8 @@

    partition@50000 {
    label = "firmware";
    - reg = <0x50000 0x1FB0000>;
    + reg = <0x50000 0x1fb0000>;
    };
    -
    };
    };

    @@ -118,9 +110,12 @@
    };

    &pinctrl {
    - state_default: pinctrl0 {
    - default_gpio: gpio {
    - groups = "wdt", "rgmii2", "uart3";
    + pinctrl-names = "default";
    + pinctrl-0 = <&state_default>;
    +
    + state_default: state-default {
    + gpio-pinmux {
    + groups = "rgmii2", "uart3", "wdt";
    function = "gpio";
    };
    };
    @@ -129,12 +124,13 @@
    &switch0 {
    ports {
    port@0 {
    + status = "okay";
    label = "ethblack";
    - status = "ok";
    };
    +
    port@4 {
    + status = "okay";
    label = "ethblue";
    - status = "ok";
    };
    };
    };
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-04-14 17:11    [W:2.282 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site