Re: [OpenWrt-Devel] [PATCH] bcm63xx: DGND3700v1: device tree improvements
Hi Adrian El dom., 24 may. 2020 a las 13:15, escribió: > > Hi Daniel, > > > -Original Message- > > From: openwrt-devel [mailto:openwrt-devel-boun...@lists.openwrt.org] > > On Behalf Of Daniel González Cabanelas > > Sent: Sonntag, 24. Mai 2020 11:06 > > To: m...@adrianschmutzler.de > > Cc: openwrt-devel@lists.openwrt.org; Álvaro Fernández Rojas > > > > Subject: Re: [OpenWrt-Devel] [PATCH] bcm63xx: DGND3700v1: device tree > > improvements > > > > Hi Adrian: > > > > El dom., 24 may. 2020 a las 1:01, escribió: > > > > > > Hi, > > > > > > > -Original Message- > > > > From: openwrt-devel [mailto:openwrt-devel- > > boun...@lists.openwrt.org] > > > > On Behalf Of Daniel González Cabanelas > > > > Sent: Sonntag, 24. Mai 2020 00:24 > > > > To: openwrt-devel@lists.openwrt.org > > > > Cc: nolt...@gmail.com > > > > Subject: [OpenWrt-Devel] [PATCH] bcm63xx: DGND3700v1: device tree > > > > improvements > > > > > > > > Improve the device tree file and related board data for the > > > > DGND3700v1/ DGND3800B router: > > > > - Improve LEDs definitions, use shorter names. > > > > - Make the board name more readable. > > > > - Fix the switch LAN labels, the order is reversed. > > > > - Use the real name of the board for the board name instead of device > > > >name. > > > > - Use standarized names for partition nodes and leds. > > > > > > This deals with several different issues at the same time. I'd prefer to > > > have > > it split up (e.g. separate board name change from LED changes and switch > > changes). > > > > > > > I can't see the benefit of flooding with commits on every negligible change. > > These are just cosmetic changes which won't affect the behavior of the > > device, and wont produce any unexpected bug, I've made the opportune > > tests. > > Well, one of the possible bugs would be that LEDs won't work after > sysupgrade, see below. > I don't think that everything should be separate, but I don't like completely > different things stuffed together. > Not really a bug, and the solution is easy from the point of view of any user. It would be the reason for non backporting these changes, not a good idea having a diferent behavior of leds on the same Openwrt version. It's more intuitive for any user which decides to upgrade to a new version and if something isn't working, they think there is a missconconfiguration issue somewhere. I'm almost sure 100% of users make a reset to defaults on this case. > > > > > > > > > > Signed-off-by: Daniel González Cabanelas > > > > --- > > > > .../bcm63xx/base-files/etc/board.d/01_leds| 12 ++-- > > > > .../dts/bcm6368-netgear-dgnd3700-v1.dts | 64 +-- > > > > .../549-board_DGND3700v1_3800B.patch | 2 +- > > > > 3 files changed, 39 insertions(+), 39 deletions(-) > > > > > > > > diff --git a/target/linux/bcm63xx/base-files/etc/board.d/01_leds > > > > b/target/linux/bcm63xx/base-files/etc/board.d/01_leds > > > > index 91d67f0c0b..6b82d9e952 100755 > > > > --- a/target/linux/bcm63xx/base-files/etc/board.d/01_leds > > > > +++ b/target/linux/bcm63xx/base-files/etc/board.d/01_leds > > > > @@ -66,12 +66,12 @@ inventel,livebox-1) > > > > ucidef_set_led_netdev "wlan0" "WIFI" "Livebox1:red:wifi" "wlan0" > > > > ;; > > > > netgear,dgnd3700-v1) > > > > - ucidef_set_led_netdev "lan" "LAN" "DGND3700v1_3800B:green:lan" > > > > "eth0.1" > > > > - ucidef_set_led_netdev "wan" "WAN" > > > > "DGND3700v1_3800B:green:inet" "eth0.2" > > > > - ucidef_set_led_netdev "wlan0" "WIFI2G" > > > > "DGND3700v1_3800B:green:wifi2g" "wlan0" > > > > - ucidef_set_led_netdev "wlan1" "WIFI5G" > > > > "DGND3700v1_3800B:blue:wifi5g" "wlan1" > > > > - ucidef_set_led_usbdev "usb1" "USB1" > > > > "DGND3700v1_3800B:green:usb-back" "1-1" > > > > - ucidef_set_led_usbdev "usb2" "USB2" > > > > "DGND3700v1_3800B:green:usb-front" "1-2" > > > > + ucidef_set_led_netdev &quo
Re: [OpenWrt-Devel] [PATCH] bcm63xx: DGND3700v1: device tree improvements
Hi Daniel, > -Original Message- > From: openwrt-devel [mailto:openwrt-devel-boun...@lists.openwrt.org] > On Behalf Of Daniel González Cabanelas > Sent: Sonntag, 24. Mai 2020 11:06 > To: m...@adrianschmutzler.de > Cc: openwrt-devel@lists.openwrt.org; Álvaro Fernández Rojas > > Subject: Re: [OpenWrt-Devel] [PATCH] bcm63xx: DGND3700v1: device tree > improvements > > Hi Adrian: > > El dom., 24 may. 2020 a las 1:01, escribió: > > > > Hi, > > > > > -Original Message- > > > From: openwrt-devel [mailto:openwrt-devel- > boun...@lists.openwrt.org] > > > On Behalf Of Daniel González Cabanelas > > > Sent: Sonntag, 24. Mai 2020 00:24 > > > To: openwrt-devel@lists.openwrt.org > > > Cc: nolt...@gmail.com > > > Subject: [OpenWrt-Devel] [PATCH] bcm63xx: DGND3700v1: device tree > > > improvements > > > > > > Improve the device tree file and related board data for the > > > DGND3700v1/ DGND3800B router: > > > - Improve LEDs definitions, use shorter names. > > > - Make the board name more readable. > > > - Fix the switch LAN labels, the order is reversed. > > > - Use the real name of the board for the board name instead of device > > >name. > > > - Use standarized names for partition nodes and leds. > > > > This deals with several different issues at the same time. I'd prefer to > > have > it split up (e.g. separate board name change from LED changes and switch > changes). > > > > I can't see the benefit of flooding with commits on every negligible change. > These are just cosmetic changes which won't affect the behavior of the > device, and wont produce any unexpected bug, I've made the opportune > tests. Well, one of the possible bugs would be that LEDs won't work after sysupgrade, see below. I don't think that everything should be separate, but I don't like completely different things stuffed together. > > > > > > > Signed-off-by: Daniel González Cabanelas > > > --- > > > .../bcm63xx/base-files/etc/board.d/01_leds| 12 ++-- > > > .../dts/bcm6368-netgear-dgnd3700-v1.dts | 64 +-- > > > .../549-board_DGND3700v1_3800B.patch | 2 +- > > > 3 files changed, 39 insertions(+), 39 deletions(-) > > > > > > diff --git a/target/linux/bcm63xx/base-files/etc/board.d/01_leds > > > b/target/linux/bcm63xx/base-files/etc/board.d/01_leds > > > index 91d67f0c0b..6b82d9e952 100755 > > > --- a/target/linux/bcm63xx/base-files/etc/board.d/01_leds > > > +++ b/target/linux/bcm63xx/base-files/etc/board.d/01_leds > > > @@ -66,12 +66,12 @@ inventel,livebox-1) > > > ucidef_set_led_netdev "wlan0" "WIFI" "Livebox1:red:wifi" "wlan0" > > > ;; > > > netgear,dgnd3700-v1) > > > - ucidef_set_led_netdev "lan" "LAN" "DGND3700v1_3800B:green:lan" > > > "eth0.1" > > > - ucidef_set_led_netdev "wan" "WAN" > > > "DGND3700v1_3800B:green:inet" "eth0.2" > > > - ucidef_set_led_netdev "wlan0" "WIFI2G" > > > "DGND3700v1_3800B:green:wifi2g" "wlan0" > > > - ucidef_set_led_netdev "wlan1" "WIFI5G" > > > "DGND3700v1_3800B:blue:wifi5g" "wlan1" > > > - ucidef_set_led_usbdev "usb1" "USB1" > > > "DGND3700v1_3800B:green:usb-back" "1-1" > > > - ucidef_set_led_usbdev "usb2" "USB2" > > > "DGND3700v1_3800B:green:usb-front" "1-2" > > > + ucidef_set_led_netdev "lan" "LAN" "$model:green:lan" "eth0.1" > > > + ucidef_set_led_netdev "wan" "WAN" "$model:green:inet" "eth0.2" > > > + ucidef_set_led_netdev "wlan0" "WIFI2G" "$model:green:wifi2g" > > > "wlan0" > > > + ucidef_set_led_netdev "wlan1" "WIFI5G" "$model:blue:wifi5g" > > > "wlan1" > > > + ucidef_set_led_usbdev "usb1" "USB1" "$model:green:usb-back" > > > + "1- > > > 1" > > > + ucidef_set_led_usbdev "usb2" "USB2" "$model:green:usb-front" > > > + "1- > > > 2" > > > > Is there any way to do sysupgrade on these devices? If yes, you will need > migration of the nam
Re: [OpenWrt-Devel] [PATCH] bcm63xx: DGND3700v1: device tree improvements
Hi Adrian: El dom., 24 may. 2020 a las 1:01, escribió: > > Hi, > > > -Original Message- > > From: openwrt-devel [mailto:openwrt-devel-boun...@lists.openwrt.org] > > On Behalf Of Daniel González Cabanelas > > Sent: Sonntag, 24. Mai 2020 00:24 > > To: openwrt-devel@lists.openwrt.org > > Cc: nolt...@gmail.com > > Subject: [OpenWrt-Devel] [PATCH] bcm63xx: DGND3700v1: device tree > > improvements > > > > Improve the device tree file and related board data for the DGND3700v1/ > > DGND3800B router: > > - Improve LEDs definitions, use shorter names. > > - Make the board name more readable. > > - Fix the switch LAN labels, the order is reversed. > > - Use the real name of the board for the board name instead of device > >name. > > - Use standarized names for partition nodes and leds. > > This deals with several different issues at the same time. I'd prefer to have > it split up (e.g. separate board name change from LED changes and switch > changes). > I can't see the benefit of flooding with commits on every negligible change. These are just cosmetic changes which won't affect the behavior of the device, and wont produce any unexpected bug, I've made the opportune tests. > > > > Signed-off-by: Daniel González Cabanelas > > --- > > .../bcm63xx/base-files/etc/board.d/01_leds| 12 ++-- > > .../dts/bcm6368-netgear-dgnd3700-v1.dts | 64 +-- > > .../549-board_DGND3700v1_3800B.patch | 2 +- > > 3 files changed, 39 insertions(+), 39 deletions(-) > > > > diff --git a/target/linux/bcm63xx/base-files/etc/board.d/01_leds > > b/target/linux/bcm63xx/base-files/etc/board.d/01_leds > > index 91d67f0c0b..6b82d9e952 100755 > > --- a/target/linux/bcm63xx/base-files/etc/board.d/01_leds > > +++ b/target/linux/bcm63xx/base-files/etc/board.d/01_leds > > @@ -66,12 +66,12 @@ inventel,livebox-1) > > ucidef_set_led_netdev "wlan0" "WIFI" "Livebox1:red:wifi" "wlan0" > > ;; > > netgear,dgnd3700-v1) > > - ucidef_set_led_netdev "lan" "LAN" "DGND3700v1_3800B:green:lan" > > "eth0.1" > > - ucidef_set_led_netdev "wan" "WAN" > > "DGND3700v1_3800B:green:inet" "eth0.2" > > - ucidef_set_led_netdev "wlan0" "WIFI2G" > > "DGND3700v1_3800B:green:wifi2g" "wlan0" > > - ucidef_set_led_netdev "wlan1" "WIFI5G" > > "DGND3700v1_3800B:blue:wifi5g" "wlan1" > > - ucidef_set_led_usbdev "usb1" "USB1" > > "DGND3700v1_3800B:green:usb-back" "1-1" > > - ucidef_set_led_usbdev "usb2" "USB2" > > "DGND3700v1_3800B:green:usb-front" "1-2" > > + ucidef_set_led_netdev "lan" "LAN" "$model:green:lan" "eth0.1" > > + ucidef_set_led_netdev "wan" "WAN" "$model:green:inet" "eth0.2" > > + ucidef_set_led_netdev "wlan0" "WIFI2G" "$model:green:wifi2g" > > "wlan0" > > + ucidef_set_led_netdev "wlan1" "WIFI5G" "$model:blue:wifi5g" > > "wlan1" > > + ucidef_set_led_usbdev "usb1" "USB1" "$model:green:usb-back" "1- > > 1" > > + ucidef_set_led_usbdev "usb2" "USB2" "$model:green:usb-front" "1- > > 2" > > Is there any way to do sysupgrade on these devices? If yes, you will need > migration of the names in /etc/config/system ... > The sysupgrade works out of the box using the default_do_upgrade. Not sure what I need to review, can you be more specific? > > ;; > > netgear,dgnd3700-v2) > > ucidef_set_led_netdev "lan" "LAN" "$model:green:ethernet" "eth0" > > diff --git a/target/linux/bcm63xx/dts/bcm6368-netgear-dgnd3700-v1.dts > > b/target/linux/bcm63xx/dts/bcm6368-netgear-dgnd3700-v1.dts > > index 546b0b1f60..c17bb3a600 100644 > > --- a/target/linux/bcm63xx/dts/bcm6368-netgear-dgnd3700-v1.dts > > +++ b/target/linux/bcm63xx/dts/bcm6368-netgear-dgnd3700-v1.dts > > @@ -5,12 +5,12 @@ > > #include > > > > / { > > - model = "Netgear DGND3700v1/DGND3800B"; > > + model = "Netgear DGND3700v1 / DGND3800B"; > > I don't think this is really necessary ... > > > compatible = "netgear,dgnd3700-v1", &q
Re: [OpenWrt-Devel] [PATCH] bcm63xx: DGND3700v1: device tree improvements
Hi, > -Original Message- > From: openwrt-devel [mailto:openwrt-devel-boun...@lists.openwrt.org] > On Behalf Of Daniel González Cabanelas > Sent: Sonntag, 24. Mai 2020 00:24 > To: openwrt-devel@lists.openwrt.org > Cc: nolt...@gmail.com > Subject: [OpenWrt-Devel] [PATCH] bcm63xx: DGND3700v1: device tree > improvements > > Improve the device tree file and related board data for the DGND3700v1/ > DGND3800B router: > - Improve LEDs definitions, use shorter names. > - Make the board name more readable. > - Fix the switch LAN labels, the order is reversed. > - Use the real name of the board for the board name instead of device >name. > - Use standarized names for partition nodes and leds. This deals with several different issues at the same time. I'd prefer to have it split up (e.g. separate board name change from LED changes and switch changes). > > Signed-off-by: Daniel González Cabanelas > --- > .../bcm63xx/base-files/etc/board.d/01_leds| 12 ++-- > .../dts/bcm6368-netgear-dgnd3700-v1.dts | 64 +-- > .../549-board_DGND3700v1_3800B.patch | 2 +- > 3 files changed, 39 insertions(+), 39 deletions(-) > > diff --git a/target/linux/bcm63xx/base-files/etc/board.d/01_leds > b/target/linux/bcm63xx/base-files/etc/board.d/01_leds > index 91d67f0c0b..6b82d9e952 100755 > --- a/target/linux/bcm63xx/base-files/etc/board.d/01_leds > +++ b/target/linux/bcm63xx/base-files/etc/board.d/01_leds > @@ -66,12 +66,12 @@ inventel,livebox-1) > ucidef_set_led_netdev "wlan0" "WIFI" "Livebox1:red:wifi" "wlan0" > ;; > netgear,dgnd3700-v1) > - ucidef_set_led_netdev "lan" "LAN" "DGND3700v1_3800B:green:lan" > "eth0.1" > - ucidef_set_led_netdev "wan" "WAN" > "DGND3700v1_3800B:green:inet" "eth0.2" > - ucidef_set_led_netdev "wlan0" "WIFI2G" > "DGND3700v1_3800B:green:wifi2g" "wlan0" > - ucidef_set_led_netdev "wlan1" "WIFI5G" > "DGND3700v1_3800B:blue:wifi5g" "wlan1" > - ucidef_set_led_usbdev "usb1" "USB1" > "DGND3700v1_3800B:green:usb-back" "1-1" > - ucidef_set_led_usbdev "usb2" "USB2" > "DGND3700v1_3800B:green:usb-front" "1-2" > + ucidef_set_led_netdev "lan" "LAN" "$model:green:lan" "eth0.1" > + ucidef_set_led_netdev "wan" "WAN" "$model:green:inet" "eth0.2" > + ucidef_set_led_netdev "wlan0" "WIFI2G" "$model:green:wifi2g" > "wlan0" > + ucidef_set_led_netdev "wlan1" "WIFI5G" "$model:blue:wifi5g" > "wlan1" > + ucidef_set_led_usbdev "usb1" "USB1" "$model:green:usb-back" "1- > 1" > + ucidef_set_led_usbdev "usb2" "USB2" "$model:green:usb-front" "1- > 2" Is there any way to do sysupgrade on these devices? If yes, you will need migration of the names in /etc/config/system ... > ;; > netgear,dgnd3700-v2) > ucidef_set_led_netdev "lan" "LAN" "$model:green:ethernet" "eth0" > diff --git a/target/linux/bcm63xx/dts/bcm6368-netgear-dgnd3700-v1.dts > b/target/linux/bcm63xx/dts/bcm6368-netgear-dgnd3700-v1.dts > index 546b0b1f60..c17bb3a600 100644 > --- a/target/linux/bcm63xx/dts/bcm6368-netgear-dgnd3700-v1.dts > +++ b/target/linux/bcm63xx/dts/bcm6368-netgear-dgnd3700-v1.dts > @@ -5,12 +5,12 @@ > #include > > / { > - model = "Netgear DGND3700v1/DGND3800B"; > + model = "Netgear DGND3700v1 / DGND3800B"; I don't think this is really necessary ... > compatible = "netgear,dgnd3700-v1", "brcm,bcm6368"; > > aliases { > led-boot = _power_green; > - led-failsafe = _power_green; > + led-failsafe = _power_red; This should be a separate commit again. > led-running = _power_green; > led-upgrade = _power_green; > }; > @@ -51,49 +51,49 @@ > leds { > compatible = "gpio-leds"; > > - dsl_green { > - label = "DGND3700v1_3800B:green:dsl"; > + led@2 { I don't know whether this is different on bcm63xx, but based on what I'm used to the old node name is preferred (dsl_green). Best Adrian > + label = "dgnd3700-v1:green:dsl"; > gpios = < 2 1>
[OpenWrt-Devel] [PATCH] bcm63xx: DGND3700v1: device tree improvements
Improve the device tree file and related board data for the DGND3700v1/ DGND3800B router: - Improve LEDs definitions, use shorter names. - Make the board name more readable. - Fix the switch LAN labels, the order is reversed. - Use the real name of the board for the board name instead of device name. - Use standarized names for partition nodes and leds. Signed-off-by: Daniel González Cabanelas --- .../bcm63xx/base-files/etc/board.d/01_leds| 12 ++-- .../dts/bcm6368-netgear-dgnd3700-v1.dts | 64 +-- .../549-board_DGND3700v1_3800B.patch | 2 +- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/target/linux/bcm63xx/base-files/etc/board.d/01_leds b/target/linux/bcm63xx/base-files/etc/board.d/01_leds index 91d67f0c0b..6b82d9e952 100755 --- a/target/linux/bcm63xx/base-files/etc/board.d/01_leds +++ b/target/linux/bcm63xx/base-files/etc/board.d/01_leds @@ -66,12 +66,12 @@ inventel,livebox-1) ucidef_set_led_netdev "wlan0" "WIFI" "Livebox1:red:wifi" "wlan0" ;; netgear,dgnd3700-v1) - ucidef_set_led_netdev "lan" "LAN" "DGND3700v1_3800B:green:lan" "eth0.1" - ucidef_set_led_netdev "wan" "WAN" "DGND3700v1_3800B:green:inet" "eth0.2" - ucidef_set_led_netdev "wlan0" "WIFI2G" "DGND3700v1_3800B:green:wifi2g" "wlan0" - ucidef_set_led_netdev "wlan1" "WIFI5G" "DGND3700v1_3800B:blue:wifi5g" "wlan1" - ucidef_set_led_usbdev "usb1" "USB1" "DGND3700v1_3800B:green:usb-back" "1-1" - ucidef_set_led_usbdev "usb2" "USB2" "DGND3700v1_3800B:green:usb-front" "1-2" + ucidef_set_led_netdev "lan" "LAN" "$model:green:lan" "eth0.1" + ucidef_set_led_netdev "wan" "WAN" "$model:green:inet" "eth0.2" + ucidef_set_led_netdev "wlan0" "WIFI2G" "$model:green:wifi2g" "wlan0" + ucidef_set_led_netdev "wlan1" "WIFI5G" "$model:blue:wifi5g" "wlan1" + ucidef_set_led_usbdev "usb1" "USB1" "$model:green:usb-back" "1-1" + ucidef_set_led_usbdev "usb2" "USB2" "$model:green:usb-front" "1-2" ;; netgear,dgnd3700-v2) ucidef_set_led_netdev "lan" "LAN" "$model:green:ethernet" "eth0" diff --git a/target/linux/bcm63xx/dts/bcm6368-netgear-dgnd3700-v1.dts b/target/linux/bcm63xx/dts/bcm6368-netgear-dgnd3700-v1.dts index 546b0b1f60..c17bb3a600 100644 --- a/target/linux/bcm63xx/dts/bcm6368-netgear-dgnd3700-v1.dts +++ b/target/linux/bcm63xx/dts/bcm6368-netgear-dgnd3700-v1.dts @@ -5,12 +5,12 @@ #include / { - model = "Netgear DGND3700v1/DGND3800B"; + model = "Netgear DGND3700v1 / DGND3800B"; compatible = "netgear,dgnd3700-v1", "brcm,bcm6368"; aliases { led-boot = _power_green; - led-failsafe = _power_green; + led-failsafe = _power_red; led-running = _power_green; led-upgrade = _power_green; }; @@ -51,49 +51,49 @@ leds { compatible = "gpio-leds"; - dsl_green { - label = "DGND3700v1_3800B:green:dsl"; + led@2 { + label = "dgnd3700-v1:green:dsl"; gpios = < 2 1>; }; - inet_red { - label = "DGND3700v1_3800B:red:inet"; + led@4 { + label = "dgnd3700-v1:red:inet"; gpios = < 4 1>; }; - inet_green { - label = "DGND3700v1_3800B:green:inet"; + led@5 { + label = "dgnd3700-v1:green:inet"; gpios = < 5 1>; }; - wps_green { - label = "DGND3700v1_3800B:green:wps"; + led@11 { + label = "dgnd3700-v1:green:wps"; gpios = < 11 1>; }; - usbfront_green { - label = "DGND3700v1_3800B:green:usb-front"; + led@13 { + label = "dgnd3700-v1:green:usb-front"; gpios = < 13 1>; }; - usbback_green { - label = "DGND3700v1_3800B:green:usb-back"; + led@14 { + label = "dgnd3700-v1:green:usb-back"; gpios = < 14 1>; }; - power_red { - label = "DGND3700v1_3800B:red:power"; + led_power_red: led@22 { + label = "dgnd3700-v1:red:power"; gpios = < 22 1>; }; - lan_green { - label = "DGND3700v1_3800B:green:lan"; + led@23 { + label = "dgnd3700-v1:green:lan"; gpios = < 23 1>; }; - led_power_green: power_green { - label = "DGND3700v1_3800B:green:power"; + led_power_green: led@24 { +