From 9617e2cfba5f87dcc71bd2390d0ab40b6b0762b9 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sun, 13 Dec 2020 10:18:41 +0800 Subject: [PATCH] bcm63xx: sync with upstream source --- target/linux/bcm63xx/Makefile | 1 - .../bcm63xx/base-files/etc/board.d/01_leds | 45 +++-- .../bcm63xx/base-files/etc/board.d/02_network | 6 + .../etc/uci-defaults/04_led_migration | 21 ++ .../base-files/etc/uci-defaults/09_fix_crc | 4 + .../bcm63xx/dts/bcm3368-netgear-cvg834g.dts | 2 - target/linux/bcm63xx/dts/bcm3368.dtsi | 2 + .../dts/bcm63167-sercomm-h500-s-lowi.dts | 2 - .../dts/bcm63167-sercomm-h500-s-vfes.dts | 2 - .../dts/bcm63168-comtrend-vr-3032u.dts | 2 - .../linux/bcm63xx/dts/bcm63168-sky-sr102.dts | 2 - .../bcm63xx/dts/bcm63169-comtrend-vg-8050.dts | 2 - .../dts/bcm6318-brcm-bcm96318ref-p300.dts | 4 +- .../bcm63xx/dts/bcm6318-brcm-bcm96318ref.dts | 2 - .../bcm63xx/dts/bcm6318-comtrend-ar-5315u.dts | 2 - .../dts/bcm6318-d-link-dsl-275xb-d1.dts | 2 - .../bcm63xx/dts/bcm6318-sagem-fast-2704n.dts | 2 - target/linux/bcm63xx/dts/bcm6318.dtsi | 2 + .../dts/bcm63268-brcm-bcm963268bu-p300.dts | 2 - .../bcm63xx/dts/bcm63268-inteno-vg50.dts | 2 - target/linux/bcm63xx/dts/bcm63268.dtsi | 2 + .../dts/bcm63269-brcm-bcm963269bhr.dts | 2 - .../linux/bcm63xx/dts/bcm6328-adb-a4001n.dts | 2 - .../linux/bcm63xx/dts/bcm6328-adb-a4001n1.dts | 2 - .../bcm6328-adb-pdg-a4001n-a-000-1a1-ax.dts | 159 +++++++++++++++ .../bcm6328-adb-pdg-a4101n-a-000-1a1-ae.dts | 141 ++++++++++++++ .../bcm63xx/dts/bcm6328-brcm-bcm963281tan.dts | 14 +- .../bcm63xx/dts/bcm6328-brcm-bcm96328avng.dts | 14 +- .../bcm63xx/dts/bcm6328-comtrend-ar-5381u.dts | 2 - .../dts/bcm6328-comtrend-ar-5387un.dts | 2 - .../dts/bcm6328-d-link-dsl-274xb-f1.dts | 2 - .../dts/bcm6328-d-link-dsl-2750u-c1.dts | 146 ++++++++++++++ .../bcm63xx/dts/bcm6328-innacomm-w3400v6.dts | 118 +++++++++++ .../bcm63xx/dts/bcm6328-nucom-r5010un-v2.dts | 2 - .../dts/bcm6328-sagem-fast-2704-v2.dts | 2 - .../dts/bcm6328-sercomm-ad1018-nor.dts | 2 - .../bcm63xx/dts/bcm6328-sercomm-ad1018.dts | 2 - ...6328-technicolor-tg582n-telecom-italia.dts | 153 +++++++++++++++ .../dts/bcm6328-technicolor-tg582n.dts | 166 ++++++++++++++++ target/linux/bcm63xx/dts/bcm6328.dtsi | 2 + .../bcm63xx/dts/bcm6338-brcm-bcm96338gw.dts | 2 - .../bcm63xx/dts/bcm6338-brcm-bcm96338w.dts | 2 - .../bcm63xx/dts/bcm6338-d-link-dsl-2640u.dts | 2 - .../bcm63xx/dts/bcm6338-dynalink-rta1320.dts | 2 - target/linux/bcm63xx/dts/bcm6338.dtsi | 2 + .../bcm63xx/dts/bcm6345-brcm-bcm96345gw2.dts | 2 - .../bcm63xx/dts/bcm6345-dynalink-rta770bw.dts | 2 - .../bcm63xx/dts/bcm6345-dynalink-rta770w.dts | 2 - target/linux/bcm63xx/dts/bcm6345.dtsi | 2 + .../bcm63xx/dts/bcm6348-asmax-ar-1004g.dts | 2 - .../bcm63xx/dts/bcm6348-belkin-f5d7633.dts | 2 - .../dts/bcm6348-brcm-bcm96348gw-10.dts | 2 - .../dts/bcm6348-brcm-bcm96348gw-11.dts | 2 - .../bcm63xx/dts/bcm6348-brcm-bcm96348gw.dts | 2 - .../bcm63xx/dts/bcm6348-brcm-bcm96348r.dts | 2 - .../bcm63xx/dts/bcm6348-bt-voyager-2110.dts | 2 - .../dts/bcm6348-bt-voyager-2500v-bb.dts | 2 - .../bcm63xx/dts/bcm6348-comtrend-ct-5365.dts | 2 - .../dts/bcm6348-comtrend-ct-536plus.dts | 2 - .../dts/bcm6348-d-link-dsl-2640b-b.dts | 4 +- .../dts/bcm6348-davolink-dv-201amr.dts | 2 - .../bcm63xx/dts/bcm6348-dynalink-rta1025w.dts | 2 - .../dts/bcm6348-inventel-livebox-1.dts | 2 - .../bcm63xx/dts/bcm6348-netgear-dg834g-v4.dts | 6 +- .../dts/bcm6348-netgear-dg834gt-pn.dts | 2 - .../bcm63xx/dts/bcm6348-sagem-fast-2404.dts | 2 - .../bcm63xx/dts/bcm6348-sagem-fast-2604.dts | 2 - .../dts/bcm6348-t-com-speedport-w-500v.dts | 2 - .../bcm63xx/dts/bcm6348-tecom-gw6000.dts | 2 - .../bcm63xx/dts/bcm6348-tecom-gw6200.dts | 2 - .../dts/bcm6348-telsey-cpva502plus.dts | 6 +- .../bcm63xx/dts/bcm6348-telsey-magic.dts | 2 - .../dts/bcm6348-tp-link-td-w8900gb.dts | 2 - .../dts/bcm6348-usrobotics-usr9108.dts | 6 +- target/linux/bcm63xx/dts/bcm6348.dtsi | 2 + .../bcm63xx/dts/bcm6358-alcatel-rg100a.dts | 2 - .../bcm63xx/dts/bcm6358-brcm-bcm96358vw.dts | 2 - .../bcm63xx/dts/bcm6358-brcm-bcm96358vw2.dts | 2 - .../bcm63xx/dts/bcm6358-bt-home-hub-2-a.dts | 2 - .../bcm63xx/dts/bcm6358-comtrend-ct-6373.dts | 2 - .../bcm63xx/dts/bcm6358-d-link-dsl-2650u.dts | 2 - .../dts/bcm6358-d-link-dsl-274xb-c2.dts | 2 - .../dts/bcm6358-d-link-dva-g3810bn-tl.dts | 12 +- .../dts/bcm6358-huawei-echolife-hg553.dts | 2 - .../dts/bcm6358-huawei-echolife-hg556a-a.dts | 168 +++------------- .../dts/bcm6358-huawei-echolife-hg556a-b.dts | 168 +++------------- .../dts/bcm6358-huawei-echolife-hg556a-c.dts | 159 +++------------ .../dts/bcm6358-huawei-echolife-hg556a.dtsi | 127 ++++++++++++ .../bcm63xx/dts/bcm6358-pirelli-a226.dtsi | 93 +++++++++ .../bcm63xx/dts/bcm6358-pirelli-a226g.dts | 94 +-------- .../bcm63xx/dts/bcm6358-pirelli-a226m-fwb.dts | 94 +-------- .../bcm63xx/dts/bcm6358-pirelli-a226m.dts | 94 +-------- .../bcm63xx/dts/bcm6358-pirelli-agpf-s0.dts | 2 - .../dts/bcm6358-sfr-neufbox-4-foxconn-r1.dts | 89 +-------- .../dts/bcm6358-sfr-neufbox-4-sercomm-r0.dts | 89 +-------- .../bcm63xx/dts/bcm6358-sfr-neufbox-4.dtsi | 88 +++++++++ .../dts/bcm6358-t-com-speedport-w-303v.dts | 2 - .../bcm63xx/dts/bcm6358-telsey-cpva642.dts | 2 - target/linux/bcm63xx/dts/bcm6358.dtsi | 2 + .../dts/bcm6359-huawei-echolife-hg520v.dts | 2 - .../dts/bcm6361-sfr-neufbox-6-sercomm-r0.dts | 2 - .../bcm63xx/dts/bcm6362-huawei-hg253s-v2.dts | 2 - .../dts/bcm6362-netgear-dgnd3700-v2.dts | 2 - .../bcm63xx/dts/bcm6362-sagem-fast-2504n.dts | 2 - target/linux/bcm63xx/dts/bcm6362.dtsi | 2 + .../bcm63xx/dts/bcm6368-actiontec-r1000h.dts | 2 - .../linux/bcm63xx/dts/bcm6368-adb-av4202n.dts | 2 - .../dts/bcm6368-brcm-bcm96368mvngr.dts | 2 - .../bcm63xx/dts/bcm6368-brcm-bcm96368mvwg.dts | 2 - .../bcm63xx/dts/bcm6368-comtrend-vr-3025u.dts | 2 - .../dts/bcm6368-comtrend-vr-3025un.dts | 2 - .../bcm63xx/dts/bcm6368-comtrend-vr-3026e.dts | 2 - .../dts/bcm6368-huawei-echolife-hg622.dts | 2 - .../dts/bcm6368-huawei-echolife-hg655b.dts | 2 - .../dts/bcm6368-netgear-dgnd3700-v1.dts | 2 - .../bcm63xx/dts/bcm6368-observa-vh4032n.dts | 2 - .../dts/bcm6368-zyxel-p870hw-51a-v2.dts | 2 - target/linux/bcm63xx/dts/bcm6368.dtsi | 2 + .../dts/bcm6369-comtrend-wap-5813n.dts | 2 - .../bcm63xx/dts/bcm6369-netgear-evg2000.dts | 2 - target/linux/bcm63xx/image/Makefile | 10 +- target/linux/bcm63xx/image/bcm63xx.mk | 75 +++++++ target/linux/bcm63xx/image/bcm63xx_nand.mk | 2 +- .../patches-5.4/512-board_bcm6328.patch | 184 +++++++++++++++++- .../patches-5.4/513-board-bcm6338.patch | 6 +- .../patches-5.4/514-board_bcm6345.patch | 6 +- .../patches-5.4/515-board-bcm6348.patch | 6 +- .../patches-5.4/516-board-bcm6358.patch | 8 +- .../patches-5.4/517-board_bcm6362.patch | 6 +- .../patches-5.4/518-board_bcm6368.patch | 6 +- .../patches-5.4/519-board_bcm63268.patch | 6 +- ...31-board_bcm6348-bt-voyager-2500v-bb.patch | 2 +- target/linux/bcm63xx/profiles/default.mk | 2 +- 133 files changed, 1662 insertions(+), 1126 deletions(-) create mode 100644 target/linux/bcm63xx/base-files/etc/uci-defaults/04_led_migration create mode 100644 target/linux/bcm63xx/dts/bcm6328-adb-pdg-a4001n-a-000-1a1-ax.dts create mode 100644 target/linux/bcm63xx/dts/bcm6328-adb-pdg-a4101n-a-000-1a1-ae.dts create mode 100644 target/linux/bcm63xx/dts/bcm6328-d-link-dsl-2750u-c1.dts create mode 100644 target/linux/bcm63xx/dts/bcm6328-innacomm-w3400v6.dts create mode 100644 target/linux/bcm63xx/dts/bcm6328-technicolor-tg582n-telecom-italia.dts create mode 100644 target/linux/bcm63xx/dts/bcm6328-technicolor-tg582n.dts create mode 100644 target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a.dtsi create mode 100644 target/linux/bcm63xx/dts/bcm6358-pirelli-a226.dtsi create mode 100644 target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4.dtsi diff --git a/target/linux/bcm63xx/Makefile b/target/linux/bcm63xx/Makefile index b0c90efbb1..d87918f0f5 100644 --- a/target/linux/bcm63xx/Makefile +++ b/target/linux/bcm63xx/Makefile @@ -13,7 +13,6 @@ BOARDNAME:=Broadcom BCM63xx SUBTARGETS:=generic smp FEATURES:=squashfs usb atm pci pcmcia usbgadget KERNEL_PATCHVER:=5.4 -MAINTAINER:=Jonas Gorski define Target/Description Build firmware images for Broadcom based xDSL/routers 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 f9c299606a..fe8a54f5d8 100755 --- a/target/linux/bcm63xx/base-files/etc/board.d/01_leds +++ b/target/linux/bcm63xx/base-files/etc/board.d/01_leds @@ -8,19 +8,31 @@ board_config_update board=$(board_name) -model="${board##*,}" case "$board" in actiontec,r1000h) ucidef_set_led_usbport "usb" "USB" "green:usb" "usb1-port1" "usb2-port1" ;; -adb,a4001n) +adb,a4001n|\ +adb,pdg-a4101n-a-000-1a1-ae|\ +comtrend,ar-5315u|\ +comtrend,vr-3032u|\ +d-link,dsl-2750u-c1|\ +huawei,hg253s-v2|\ +nucom,r5010un-v2|\ +sagem,fast-2704-v2) ucidef_set_led_usbdev "usb" "USB" "green:usb" "1-1" ;; adb,a4001n1) ucidef_set_led_netdev "lan" "LAN" "green:eth" "eth0" ucidef_set_led_usbdev "usb" "USB" "green:3g" "1-1" ;; +adb,pdg-a4001n-a-000-1a1-ax|\ +technicolor,tg582n-telecom-italia) + ucidef_set_led_netdev "wlan0" "WIFI" "green:wifi" "wlan0" + ucidef_set_led_usbdev "usb1" "USB1" "green:service" "1-1" + ucidef_set_led_usbdev "usb2" "USB2" "red:service" "2-1" + ;; adb,av4202n) ucidef_set_led_netdev "wlan0" "WLAN" "blue:wifi" "wlan0" ;; @@ -30,13 +42,6 @@ bt,home-hub-2-a) ucidef_set_led_usbdev "usb1" "USB1" "blue:phone" "1-1" ucidef_set_led_usbdev "usb2" "USB2" "green:phone" "2-1" ;; -comtrend,ar-5315u) - ucidef_set_led_usbdev "usb" "USB" "green:usb" "1-1" - ;; -comtrend,vr-3032u|\ -huawei,hg253s-v2) - ucidef_set_led_usbdev "usb" "USB" "green:usb" "1-1" - ;; huawei,echolife-hg553) ucidef_set_led_netdev "lan" "LAN" "blue:lan" "eth0" ucidef_set_led_usbdev "usb1" "USB1" "red:hspa" "1-1" @@ -48,9 +53,7 @@ huawei,echolife-hg556a-c) ucidef_set_led_netdev "lan" "LAN" "red:dsl" "eth0" ucidef_set_led_usbdev "usb" "USB" "red:hspa" "1-2" ;; -huawei,echolife-hg622) - ucidef_set_led_usbdev "usb" "USB" "green:usb" "1-2" - ;; +huawei,echolife-hg622|\ huawei,echolife-hg655b) ucidef_set_led_usbdev "usb" "USB" "green:usb" "1-2" ;; @@ -79,18 +82,10 @@ netgear,evg2000) ucidef_set_led_usbdev "usb1" "USB1" "green:voip1" "1-1" ucidef_set_led_usbdev "usb2" "USB2" "green:voip2" "1-2" ;; -nucom,r5010un-v2) - ucidef_set_led_usbdev "usb" "USB" "green:usb" "1-1" - ;; sagem,fast-2704n) - ucidef_set_led_netdev "wan" "WAN" "F@green:inet" "eth0.2" - ;; -sagem,fast-2704-v2) - ucidef_set_led_usbdev "usb" "USB" "F@green:usb" "1-1" - ;; -sercomm,ad1018) - ucidef_set_led_netdev "wlan0" "WLAN" "green:wifi" "wlan0" + ucidef_set_led_netdev "wan" "WAN" "green:inet" "eth0.2" ;; +sercomm,ad1018|\ sercomm,ad1018-nor) ucidef_set_led_netdev "wlan0" "WLAN" "green:wifi" "wlan0" ;; @@ -98,8 +93,12 @@ sercomm,h500-s-lowi|\ sercomm,h500-s-vfes) ucidef_set_led_netdev "wan" "WAN" "green:internet" "eth0.2" ;; +technicolor,tg582n) + ucidef_set_led_netdev "wlan0" "WIFI" "green:wifi" "wlan0" + ucidef_set_led_usbdev "usb" "USB" "red:power" "1-1" + ;; telsey,cpva502plus) - ucidef_set_led_netdev "lan" "LAN" "CPVA502+:amber:link" "eth0" + ucidef_set_led_netdev "lan" "LAN" "amber:link" "eth0" ;; esac diff --git a/target/linux/bcm63xx/base-files/etc/board.d/02_network b/target/linux/bcm63xx/base-files/etc/board.d/02_network index 00089be2fd..cca607fce1 100755 --- a/target/linux/bcm63xx/base-files/etc/board.d/02_network +++ b/target/linux/bcm63xx/base-files/etc/board.d/02_network @@ -20,6 +20,8 @@ t-com,speedport-w-500v) ;; adb,a4001n1|\ adb,a4001n|\ +adb,pdg-a4001n-a-000-1a1-ax|\ +adb,pdg-a4101n-a-000-1a1-ae|\ adb,av4202n|\ brcm,bcm963281tan|\ brcm,bcm96328avng|\ @@ -30,12 +32,15 @@ comtrend,vr-3025u|\ comtrend,vr-3025un|\ comtrend,vr-3026e|\ d-link,dsl-274xb-f1|\ +d-link,dsl-2750u-c1|\ d-link,dsl-275xb-d1|\ huawei,echolife-hg622|\ huawei,echolife-hg655b|\ nucom,r5010un-v2|\ sagem,fast-2504n|\ sagem,fast-2704-v2|\ +technicolor,tg582n|\ +technicolor,tg582n-telecom-italia|\ zyxel,p870hw-51a-v2) ucidef_add_switch "switch0" \ "0:lan:1" "1:lan:2" "2:lan:3" "3:lan:4" "8t@eth0" @@ -95,6 +100,7 @@ huawei,echolife-hg556a-c) "0:lan:1" "1:lan:2" "2:lan:3" "3:lan:4" "5t@eth0" ;; comtrend,ar-5315u|\ +innacomm,w3400v6|\ observa,vh4032n|\ sagem,fast-2704n) ucidef_add_switch "switch0" \ diff --git a/target/linux/bcm63xx/base-files/etc/uci-defaults/04_led_migration b/target/linux/bcm63xx/base-files/etc/uci-defaults/04_led_migration new file mode 100644 index 0000000000..33ec4d51f9 --- /dev/null +++ b/target/linux/bcm63xx/base-files/etc/uci-defaults/04_led_migration @@ -0,0 +1,21 @@ +. /lib/functions/migrations.sh + +board=$(board_name) + +case "$board" in +brcm,bcm96318ref-p300|\ +brcm,bcm963281tan|\ +brcm,bcm96328avng|\ +d-link,dsl-2640b-b|\ +d-link,dva-g3810bn-tl|\ +netgear,dg834g-v4|\ +usrobotics,usr9108) + migrate_leds "^.*::=" + ;; +esac + +remove_devicename_leds + +migrations_apply system + +exit 0 diff --git a/target/linux/bcm63xx/base-files/etc/uci-defaults/09_fix_crc b/target/linux/bcm63xx/base-files/etc/uci-defaults/09_fix_crc index 6e01323439..a176eb1735 100644 --- a/target/linux/bcm63xx/base-files/etc/uci-defaults/09_fix_crc +++ b/target/linux/bcm63xx/base-files/etc/uci-defaults/09_fix_crc @@ -12,6 +12,8 @@ case "$(board_name)" in actiontec,r1000h|\ adb,a4001n|\ adb,a4001n1|\ + adb,pdg-a4001n-a-000-1a1-ax|\ + adb,pdg-a4101n-a-000-1a1-ae|\ brcm,bcm96328avng|\ brcm,bcm963281tan|\ bt,voyager-2110|\ @@ -32,6 +34,8 @@ case "$(board_name)" in nucom,r5010un-v2|\ observa,vh4032n|\ t-com,speedport-w-303v|\ + technicolor,tg582n|\ + technicolor,tg582n-telecom-italia|\ telsey,cpva502plus|\ telsey,cpva642|\ telsey,magic|\ diff --git a/target/linux/bcm63xx/dts/bcm3368-netgear-cvg834g.dts b/target/linux/bcm63xx/dts/bcm3368-netgear-cvg834g.dts index 334c15e4e8..fb22f769d6 100644 --- a/target/linux/bcm63xx/dts/bcm3368-netgear-cvg834g.dts +++ b/target/linux/bcm63xx/dts/bcm3368-netgear-cvg834g.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm3368.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm3368.dtsi b/target/linux/bcm63xx/dts/bcm3368.dtsi index 66cb6ab8a8..7c392227e2 100644 --- a/target/linux/bcm63xx/dts/bcm3368.dtsi +++ b/target/linux/bcm63xx/dts/bcm3368.dtsi @@ -1,3 +1,5 @@ +/dts-v1/; + / { #address-cells = <1>; #size-cells = <1>; diff --git a/target/linux/bcm63xx/dts/bcm63167-sercomm-h500-s-lowi.dts b/target/linux/bcm63xx/dts/bcm63167-sercomm-h500-s-lowi.dts index 44662a26db..90aa9e1c15 100644 --- a/target/linux/bcm63xx/dts/bcm63167-sercomm-h500-s-lowi.dts +++ b/target/linux/bcm63xx/dts/bcm63167-sercomm-h500-s-lowi.dts @@ -4,8 +4,6 @@ * * Copyright (C) 2020 Daniel González Cabanelas */ - -/dts-v1/; #include "bcm63167-sercomm-h500-s.dtsi" diff --git a/target/linux/bcm63xx/dts/bcm63167-sercomm-h500-s-vfes.dts b/target/linux/bcm63xx/dts/bcm63167-sercomm-h500-s-vfes.dts index 32d8fdbe7e..bd69ccd316 100644 --- a/target/linux/bcm63xx/dts/bcm63167-sercomm-h500-s-vfes.dts +++ b/target/linux/bcm63xx/dts/bcm63167-sercomm-h500-s-vfes.dts @@ -5,8 +5,6 @@ * Copyright (C) 2020 Daniel González Cabanelas */ -/dts-v1/; - #include "bcm63167-sercomm-h500-s.dtsi" / { diff --git a/target/linux/bcm63xx/dts/bcm63168-comtrend-vr-3032u.dts b/target/linux/bcm63xx/dts/bcm63168-comtrend-vr-3032u.dts index 44daf477d3..c2505f86ba 100644 --- a/target/linux/bcm63xx/dts/bcm63168-comtrend-vr-3032u.dts +++ b/target/linux/bcm63xx/dts/bcm63168-comtrend-vr-3032u.dts @@ -1,7 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later -/dts-v1/; - #include "bcm63268.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm63168-sky-sr102.dts b/target/linux/bcm63xx/dts/bcm63168-sky-sr102.dts index efc5bbacbe..47ba15608e 100644 --- a/target/linux/bcm63xx/dts/bcm63168-sky-sr102.dts +++ b/target/linux/bcm63xx/dts/bcm63168-sky-sr102.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm63268.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm63169-comtrend-vg-8050.dts b/target/linux/bcm63xx/dts/bcm63169-comtrend-vg-8050.dts index 0e0cf27ec9..5d5ba46e3c 100644 --- a/target/linux/bcm63xx/dts/bcm63169-comtrend-vg-8050.dts +++ b/target/linux/bcm63xx/dts/bcm63169-comtrend-vg-8050.dts @@ -1,7 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later -/dts-v1/; - #include "bcm63268.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6318-brcm-bcm96318ref-p300.dts b/target/linux/bcm63xx/dts/bcm6318-brcm-bcm96318ref-p300.dts index 1cb57c1651..c6700bdd11 100644 --- a/target/linux/bcm63xx/dts/bcm6318-brcm-bcm96318ref-p300.dts +++ b/target/linux/bcm63xx/dts/bcm6318-brcm-bcm96318ref-p300.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6318.dtsi" #include @@ -53,7 +51,7 @@ }; usb_pwron { - label = ":usb-pwron"; + label = "usb-pwron"; gpios = <&pinctrl 13 1>; default-state = "on"; }; diff --git a/target/linux/bcm63xx/dts/bcm6318-brcm-bcm96318ref.dts b/target/linux/bcm63xx/dts/bcm6318-brcm-bcm96318ref.dts index 91e2e0de86..89649fa739 100644 --- a/target/linux/bcm63xx/dts/bcm6318-brcm-bcm96318ref.dts +++ b/target/linux/bcm63xx/dts/bcm6318-brcm-bcm96318ref.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6318.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6318-comtrend-ar-5315u.dts b/target/linux/bcm63xx/dts/bcm6318-comtrend-ar-5315u.dts index 9483598312..8557730c8c 100644 --- a/target/linux/bcm63xx/dts/bcm6318-comtrend-ar-5315u.dts +++ b/target/linux/bcm63xx/dts/bcm6318-comtrend-ar-5315u.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6318.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6318-d-link-dsl-275xb-d1.dts b/target/linux/bcm63xx/dts/bcm6318-d-link-dsl-275xb-d1.dts index 13981676df..acf4332a66 100644 --- a/target/linux/bcm63xx/dts/bcm6318-d-link-dsl-275xb-d1.dts +++ b/target/linux/bcm63xx/dts/bcm6318-d-link-dsl-275xb-d1.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6318.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6318-sagem-fast-2704n.dts b/target/linux/bcm63xx/dts/bcm6318-sagem-fast-2704n.dts index bd87dbc4e6..6702ef1656 100644 --- a/target/linux/bcm63xx/dts/bcm6318-sagem-fast-2704n.dts +++ b/target/linux/bcm63xx/dts/bcm6318-sagem-fast-2704n.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6318.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6318.dtsi b/target/linux/bcm63xx/dts/bcm6318.dtsi index a902c1bd57..ee7db04fe9 100644 --- a/target/linux/bcm63xx/dts/bcm6318.dtsi +++ b/target/linux/bcm63xx/dts/bcm6318.dtsi @@ -1,3 +1,5 @@ +/dts-v1/; + / { #address-cells = <1>; #size-cells = <1>; diff --git a/target/linux/bcm63xx/dts/bcm63268-brcm-bcm963268bu-p300.dts b/target/linux/bcm63xx/dts/bcm63268-brcm-bcm963268bu-p300.dts index 2e3a1afa5a..08959ed156 100644 --- a/target/linux/bcm63xx/dts/bcm63268-brcm-bcm963268bu-p300.dts +++ b/target/linux/bcm63xx/dts/bcm63268-brcm-bcm963268bu-p300.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm63268.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm63268-inteno-vg50.dts b/target/linux/bcm63xx/dts/bcm63268-inteno-vg50.dts index 80d5727bc2..fa9856f337 100644 --- a/target/linux/bcm63xx/dts/bcm63268-inteno-vg50.dts +++ b/target/linux/bcm63xx/dts/bcm63268-inteno-vg50.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm63268.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm63268.dtsi b/target/linux/bcm63xx/dts/bcm63268.dtsi index 0c08aead20..2c8f28d4b7 100644 --- a/target/linux/bcm63xx/dts/bcm63268.dtsi +++ b/target/linux/bcm63xx/dts/bcm63268.dtsi @@ -1,3 +1,5 @@ +/dts-v1/; + / { #address-cells = <1>; #size-cells = <1>; diff --git a/target/linux/bcm63xx/dts/bcm63269-brcm-bcm963269bhr.dts b/target/linux/bcm63xx/dts/bcm63269-brcm-bcm963269bhr.dts index 92508c3b64..186c208a1f 100644 --- a/target/linux/bcm63xx/dts/bcm63269-brcm-bcm963269bhr.dts +++ b/target/linux/bcm63xx/dts/bcm63269-brcm-bcm963269bhr.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm63268.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6328-adb-a4001n.dts b/target/linux/bcm63xx/dts/bcm6328-adb-a4001n.dts index b844f84b85..641de68d35 100644 --- a/target/linux/bcm63xx/dts/bcm6328-adb-a4001n.dts +++ b/target/linux/bcm63xx/dts/bcm6328-adb-a4001n.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6328.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6328-adb-a4001n1.dts b/target/linux/bcm63xx/dts/bcm6328-adb-a4001n1.dts index 7467f0c5ff..bd05547bae 100644 --- a/target/linux/bcm63xx/dts/bcm6328-adb-a4001n1.dts +++ b/target/linux/bcm63xx/dts/bcm6328-adb-a4001n1.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6328.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6328-adb-pdg-a4001n-a-000-1a1-ax.dts b/target/linux/bcm63xx/dts/bcm6328-adb-pdg-a4001n-a-000-1a1-ax.dts new file mode 100644 index 0000000000..f42b970c46 --- /dev/null +++ b/target/linux/bcm63xx/dts/bcm6328-adb-pdg-a4001n-a-000-1a1-ax.dts @@ -0,0 +1,159 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +#include "bcm6328.dtsi" + +#include + +/ { + model = "ADB P.DG A4001N A-000-1A1-AX"; + compatible = "adb,pdg-a4001n-a-000-1a1-ax", "brcm,bcm6328"; + + aliases { + led-boot = &led_power_green; + led-failsafe = &led_power_green; + led-running = &led_power_green; + led-upgrade = &led_power_green; + }; + + chosen { + bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; + stdout-path = "serial0:115200n8"; + }; + + keys { + compatible = "gpio-keys-polled"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <20>; + + reset { + label = "reset"; + gpios = <&pinctrl 23 1>; + linux,code = ; + debounce-interval = <60>; + }; + + wps { + label = "wifi-led"; + gpios = <&pinctrl 24 1>; + linux,code = ; + debounce-interval = <60>; + }; + }; +}; + +&leds { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_leds>; + + led@2 { + reg = <2>; + active-low; + label = "red:internet"; + }; + + led@3 { + reg = <3>; + active-low; + label = "green:adsl"; + }; + + led@5 { + reg = <5>; + active-low; + label = "red:adsl"; + }; + + led@6 { + reg = <6>; + active-low; + label = "green:service"; + }; + + led@7 { + reg = <7>; + active-low; + label = "red:service"; + }; + + led@8 { + reg = <8>; + active-low; + label = "red:power"; + }; + + led@9 { + reg = <9>; + active-low; + label = "green:wifi"; + }; + + led@10 { + reg = <10>; + active-low; + label = "red:wifi"; + }; + + led@11 { + reg = <11>; + active-low; + label = "green:internet"; + }; + + led_power_green: led@12 { + reg = <12>; + active-low; + label = "green:power"; + default-state = "on"; + }; +}; + +&hsspi { + status = "okay"; + + flash@0 { + compatible = "jedec,spi-nor"; + spi-max-frequency = <16666667>; + spi-tx-bus-width = <2>; + spi-rx-bus-width = <2>; + reg = <0>; + + #address-cells = <1>; + #size-cells = <1>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + reg = <0x000000 0x010000>; + label = "cfe"; + read-only; + }; + + partition@10000 { + reg = <0x010000 0xff0000>; + label = "linux"; + compatible = "brcm,bcm963xx-imagetag"; + }; + }; + }; +}; + +&pinctrl { + pinctrl_leds: leds { + function = "led"; + pins = "gpio2", "gpio3", + "gpio5", "gpio6", + "gpio7", "gpio8", + "gpio9", "gpio10", + "gpio11", "gpio12"; + }; +}; + +&uart0 { + status = "okay"; +}; diff --git a/target/linux/bcm63xx/dts/bcm6328-adb-pdg-a4101n-a-000-1a1-ae.dts b/target/linux/bcm63xx/dts/bcm6328-adb-pdg-a4101n-a-000-1a1-ae.dts new file mode 100644 index 0000000000..7ffff4e223 --- /dev/null +++ b/target/linux/bcm63xx/dts/bcm6328-adb-pdg-a4101n-a-000-1a1-ae.dts @@ -0,0 +1,141 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +#include "bcm6328.dtsi" + +#include + +/ { + model = "ADB P.DG A4101N A-000-1A1-AE"; + compatible = "adb,pdg-a4101n-a-000-1a1-ae", "brcm,bcm6328"; + + aliases { + led-boot = &led_dsl_green; + led-failsafe = &led_dsl_green; + led-upgrade = &led_dsl_green; + }; + + chosen { + bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; + stdout-path = "serial0:115200n8"; + }; + + keys { + compatible = "gpio-keys-polled"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <20>; + + wifi { + label = "wifi"; + gpios = <&pinctrl 12 1>; + linux,code = ; + debounce-interval = <60>; + }; + + reset { + label = "reset"; + gpios = <&pinctrl 23 1>; + linux,code = ; + debounce-interval = <60>; + }; + + wps { + label = "wps"; + gpios = <&pinctrl 24 1>; + linux,code = ; + debounce-interval = <60>; + }; + }; + + leds { + compatible = "gpio-leds"; + + led@31 { + label = "green:tel"; + gpios = <&pinctrl 31 1>; + }; + }; +}; + +&leds { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_leds>; + + led_dsl_green: led@3 { + reg = <3>; + active-low; + label = "green:dsl"; + }; + + led@9 { + reg = <9>; + active-low; + label = "green:wps"; + }; + + led@10 { + reg = <10>; + active-low; + label = "green:usb"; + }; + + led@11 { + reg = <11>; + active-low; + label = "green:internet"; + }; +}; + +&hsspi { + status = "okay"; + + flash@0 { + compatible = "jedec,spi-nor"; + spi-max-frequency = <16666667>; + spi-tx-bus-width = <2>; + spi-rx-bus-width = <2>; + reg = <0>; + + #address-cells = <1>; + #size-cells = <1>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + reg = <0x000000 0x010000>; + label = "cfe"; + read-only; + }; + + partition@10000 { + reg = <0x010000 0xff0000>; + label = "linux"; + compatible = "brcm,bcm963xx-imagetag"; + }; + }; + }; +}; + +&pinctrl { + pinctrl_leds: leds { + function = "led"; + pins = "gpio3", "gpio9", "gpio10", + "gpio11"; + }; + + green_internet_switch { + gpio-hog; + gpios = <2 1>; + output-low; + line-name = "green:internet-switch"; + }; +}; + +&uart0 { + status = "okay"; +}; diff --git a/target/linux/bcm63xx/dts/bcm6328-brcm-bcm963281tan.dts b/target/linux/bcm63xx/dts/bcm6328-brcm-bcm963281tan.dts index fbf8e7cd47..0d494baeb7 100644 --- a/target/linux/bcm63xx/dts/bcm6328-brcm-bcm963281tan.dts +++ b/target/linux/bcm63xx/dts/bcm6328-brcm-bcm963281tan.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6328.dtsi" #include @@ -24,28 +22,28 @@ compatible = "gpio-leds"; inet { - label = "963281TAN::internet"; + label = "internet"; gpios = <&pinctrl 1 1>; }; led_power: power { - label = "963281TAN::power"; + label = "power"; gpios = <&pinctrl 4 1>; default-state = "on"; }; inet_fail { - label = "963281TAN::internet-fail"; + label = "internet-fail"; gpios = <&pinctrl 7 1>; }; power_fail { - label = "963281TAN::power-fail"; + label = "power-fail"; gpios = <&pinctrl 8 1>; }; wps { - label = "963281TAN::wps"; + label = "wps"; gpios = <&pinctrl 9 1>; }; dsl { - label = "963281TAN::dsl"; + label = "dsl"; gpios = <&pinctrl 11 1>; }; }; diff --git a/target/linux/bcm63xx/dts/bcm6328-brcm-bcm96328avng.dts b/target/linux/bcm63xx/dts/bcm6328-brcm-bcm96328avng.dts index 9bec24539b..d047e3fa89 100644 --- a/target/linux/bcm63xx/dts/bcm6328-brcm-bcm96328avng.dts +++ b/target/linux/bcm63xx/dts/bcm6328-brcm-bcm96328avng.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6328.dtsi" #include @@ -24,28 +22,28 @@ compatible = "gpio-leds"; inet_fail { - label = "96328avng::internet-fail"; + label = "internet-fail"; gpios = <&pinctrl 2 1>; }; dsl { - label = "96328avng::dsl"; + label = "dsl"; gpios = <&pinctrl 3 1>; }; led_power: power { - label = "96328avng::power"; + label = "power"; gpios = <&pinctrl 4 1>; default-state = "on"; }; power_fail { - label = "96328avng::power-fail"; + label = "power-fail"; gpios = <&pinctrl 8 1>; }; wps { - label = "96328avng::wps"; + label = "wps"; gpios = <&pinctrl 9 1>; }; inet { - label = "96328avng::internet"; + label = "internet"; gpios = <&pinctrl 11 1>; }; }; diff --git a/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5381u.dts b/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5381u.dts index 5569bedc6c..5878e886d2 100644 --- a/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5381u.dts +++ b/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5381u.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6328.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5387un.dts b/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5387un.dts index 00bfa896ff..a703fd6629 100644 --- a/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5387un.dts +++ b/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5387un.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6328.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6328-d-link-dsl-274xb-f1.dts b/target/linux/bcm63xx/dts/bcm6328-d-link-dsl-274xb-f1.dts index 06ada11594..660a4d570c 100644 --- a/target/linux/bcm63xx/dts/bcm6328-d-link-dsl-274xb-f1.dts +++ b/target/linux/bcm63xx/dts/bcm6328-d-link-dsl-274xb-f1.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6328.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6328-d-link-dsl-2750u-c1.dts b/target/linux/bcm63xx/dts/bcm6328-d-link-dsl-2750u-c1.dts new file mode 100644 index 0000000000..0915215039 --- /dev/null +++ b/target/linux/bcm63xx/dts/bcm6328-d-link-dsl-2750u-c1.dts @@ -0,0 +1,146 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +#include "bcm6328.dtsi" + +#include + +/ { + model = "D-Link DSL-2750U rev C1"; + compatible = "d-link,dsl-2750u-c1", "brcm,bcm6328"; + + aliases { + led-boot = &led_power_green; + led-failsafe = &led_power_green; + led-running = &led_power_green; + led-upgrade = &led_power_green; + }; + + chosen { + bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; + stdout-path = "serial0:115200n8"; + }; + + keys { + compatible = "gpio-keys-polled"; + poll-interval = <20>; + + wifi { + label = "wifi"; + gpios = <&pinctrl 12 1>; + linux,code = ; + debounce-interval = <60>; + }; + + reset { + label = "reset"; + gpios = <&pinctrl 23 1>; + linux,code = ; + debounce-interval = <60>; + }; + + wps { + label = "wps"; + gpios = <&pinctrl 24 1>; + linux,code = ; + debounce-interval = <60>; + }; + }; +}; + +&hsspi { + status = "okay"; + + flash@0 { + compatible = "jedec,spi-nor"; + spi-max-frequency = <16666667>; + spi-tx-bus-width = <2>; + spi-rx-bus-width = <2>; + reg = <0>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + cfe@0 { + reg = <0x000000 0x010000>; + label = "cfe"; + read-only; + }; + + linux@10000 { + reg = <0x010000 0x7e0000>; + label = "linux"; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@7f0000 { + reg = <0x7f0000 0x010000>; + label = "nvram"; + }; + }; + }; +}; + +&leds { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_leds>; + + led@1 { + reg = <1>; + active-low; + label = "green:inet"; + }; + + led_power_green: led@4 { + reg = <4>; + active-low; + label = "green:power"; + default-state = "on"; + }; + + led@7 { + reg = <7>; + active-low; + label = "red:inet"; + }; + + led@8 { + reg = <8>; + active-low; + label = "red:power"; + }; + + led@9 { + reg = <9>; + active-low; + label = "green:wps"; + }; + + led@10 { + reg = <10>; + active-low; + label = "green:usb"; + }; + + led@11 { + reg = <11>; + active-low; + label = "green:dsl"; + }; +}; + +&pinctrl { + pinctrl_leds: leds { + function = "led"; + pins = "gpio1", "gpio4", "gpio7", + "gpio8", "gpio9", "gpio10", + "gpio11"; + }; +}; + +&uart0 { + status = "okay"; +}; diff --git a/target/linux/bcm63xx/dts/bcm6328-innacomm-w3400v6.dts b/target/linux/bcm63xx/dts/bcm6328-innacomm-w3400v6.dts new file mode 100644 index 0000000000..dd8ab12958 --- /dev/null +++ b/target/linux/bcm63xx/dts/bcm6328-innacomm-w3400v6.dts @@ -0,0 +1,118 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "bcm6328.dtsi" + +#include + +/ { + model = "Innacomm W3400V6"; + compatible = "innacomm,w3400v6", "brcm,bcm6328"; + + aliases { + led-boot = &led_power_green; + led-failsafe = &led_power_red; + led-running = &led_power_green; + led-upgrade = &led_power_green; + }; + + chosen { + bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; + stdout-path = "serial0:115200n8"; + }; + + keys { + compatible = "gpio-keys-polled"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <20>; + + wps { + label = "wps"; + gpios = <&pinctrl 15 1>; + linux,code = ; + debounce-interval = <60>; + }; + + reset { + label = "reset"; + gpios = <&pinctrl 23 1>; + linux,code = ; + debounce-interval = <60>; + }; + }; +}; + +&hsspi { + status = "okay"; + + flash@0 { + compatible = "jedec,spi-nor"; + spi-max-frequency = <16666667>; + spi-tx-bus-width = <2>; + spi-rx-bus-width = <2>; + reg = <0>; + + #address-cells = <1>; + #size-cells = <1>; + + partitions { + compatible = "brcm,bcm963xx-cfe-nor-partitions"; + }; + }; +}; + +&leds { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_leds>; + + led@1 { + reg = <1>; + active-low; + label = "green:inet"; + }; + + led@2 { + reg = <2>; + active-low; + label = "red:inet"; + }; + + led@3 { + reg = <3>; + active-low; + label = "green:dsl"; + }; + + led_power_green: led@4 { + reg = <4>; + active-low; + label = "green:power"; + default-state = "on"; + }; + + led_power_red: led@5 { + reg = <5>; + active-low; + label = "red:power"; + }; + + led@11 { + reg = <11>; + active-low; + label = "green:wps"; + }; +}; + +&pinctrl { + pinctrl_leds: leds { + function = "led"; + pins = "gpio1", "gpio2", "gpio3", + "gpio4", "gpio5", "gpio11"; + }; +}; + +&uart0 { + status = "okay"; +}; diff --git a/target/linux/bcm63xx/dts/bcm6328-nucom-r5010un-v2.dts b/target/linux/bcm63xx/dts/bcm6328-nucom-r5010un-v2.dts index 5ad94af532..08f3736a7b 100644 --- a/target/linux/bcm63xx/dts/bcm6328-nucom-r5010un-v2.dts +++ b/target/linux/bcm63xx/dts/bcm6328-nucom-r5010un-v2.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6328.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6328-sagem-fast-2704-v2.dts b/target/linux/bcm63xx/dts/bcm6328-sagem-fast-2704-v2.dts index 8ef0c3b4be..ff9b23049b 100644 --- a/target/linux/bcm63xx/dts/bcm6328-sagem-fast-2704-v2.dts +++ b/target/linux/bcm63xx/dts/bcm6328-sagem-fast-2704-v2.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6328.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6328-sercomm-ad1018-nor.dts b/target/linux/bcm63xx/dts/bcm6328-sercomm-ad1018-nor.dts index d280a14fd3..83f7578b06 100644 --- a/target/linux/bcm63xx/dts/bcm6328-sercomm-ad1018-nor.dts +++ b/target/linux/bcm63xx/dts/bcm6328-sercomm-ad1018-nor.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6328.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6328-sercomm-ad1018.dts b/target/linux/bcm63xx/dts/bcm6328-sercomm-ad1018.dts index 620d4fc33e..edb1ce49a6 100644 --- a/target/linux/bcm63xx/dts/bcm6328-sercomm-ad1018.dts +++ b/target/linux/bcm63xx/dts/bcm6328-sercomm-ad1018.dts @@ -1,7 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later -/dts-v1/; - #include "bcm6328.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6328-technicolor-tg582n-telecom-italia.dts b/target/linux/bcm63xx/dts/bcm6328-technicolor-tg582n-telecom-italia.dts new file mode 100644 index 0000000000..0dfa38e474 --- /dev/null +++ b/target/linux/bcm63xx/dts/bcm6328-technicolor-tg582n-telecom-italia.dts @@ -0,0 +1,153 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +#include "bcm6328.dtsi" + +#include + +/ { + model = "Technicolor TG582n Telecom Italia"; + compatible = "technicolor,tg582n-telecom-italia", "brcm,bcm6328"; + + aliases { + led-boot = &led_power_green; + led-failsafe = &led_power_green; + led-running = &led_power_green; + led-upgrade = &led_power_green; + }; + + chosen { + bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; + stdout-path = "serial0:115200n8"; + }; + + keys { + compatible = "gpio-keys-polled"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <20>; + + reset { + label = "reset"; + gpios = <&pinctrl 23 1>; + linux,code = ; + debounce-interval = <60>; + }; + + wps { + label = "wps"; + gpios = <&pinctrl 24 1>; + linux,code = ; + debounce-interval = <60>; + }; + }; +}; + +&leds { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_leds>; + + led@1 { + reg = <1>; + active-low; + label = "green:wifi"; + }; + + led_power_green: led@4 { + reg = <4>; + active-low; + label = "green:power"; + default-state = "on"; + }; + + led@5 { + reg = <5>; + active-low; + label = "green:adsl"; + }; + + led@7 { + reg = <7>; + active-low; + label = "red:wifi"; + }; + + led@8 { + reg = <8>; + active-low; + label = "red:power"; + }; + + led@11 { + reg = <11>; + active-low; + label = "green:internet"; + }; + + led@14 { + reg = <14>; + active-low; + label = "red:internet"; + }; + + led@18 { + reg = <18>; + active-low; + label = "red:service"; + }; + + led@19 { + reg = <19>; + active-low; + label = "green:service"; + }; +}; + +&hsspi { + status = "okay"; + + flash@0 { + compatible = "jedec,spi-nor"; + spi-max-frequency = <16666667>; + spi-tx-bus-width = <2>; + spi-rx-bus-width = <2>; + reg = <0>; + + #address-cells = <1>; + #size-cells = <1>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + reg = <0x000000 0x010000>; + label = "cfe"; + read-only; + }; + + partition@10000 { + reg = <0x010000 0xff0000>; + label = "linux"; + compatible = "brcm,bcm963xx-imagetag"; + }; + }; + }; +}; + +&pinctrl { + pinctrl_leds: leds { + function = "led"; + pins = "gpio1", "gpio4", + "gpio5", "gpio7", + "gpio8", "gpio11", + "gpio14", "gpio18", + "gpio19"; + }; +}; + +&uart0 { + status = "okay"; +}; diff --git a/target/linux/bcm63xx/dts/bcm6328-technicolor-tg582n.dts b/target/linux/bcm63xx/dts/bcm6328-technicolor-tg582n.dts new file mode 100644 index 0000000000..6ec20048cd --- /dev/null +++ b/target/linux/bcm63xx/dts/bcm6328-technicolor-tg582n.dts @@ -0,0 +1,166 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +#include "bcm6328.dtsi" + +#include + +/ { + model = "Technicolor TG582n"; + compatible = "technicolor,tg582n", "brcm,bcm6328"; + + aliases { + led-boot = &led_power_green; + led-failsafe = &led_power_green; + led-running = &led_power_green; + led-upgrade = &led_power_green; + }; + + chosen { + bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; + stdout-path = "serial0:115200n8"; + }; + + keys { + compatible = "gpio-keys-polled"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <20>; + + wifi { + label = "wifi"; + gpios = <&pinctrl 15 1>; + linux,code = ; + debounce-interval = <60>; + }; + + reset { + label = "reset"; + gpios = <&pinctrl 23 1>; + linux,code = ; + debounce-interval = <60>; + }; + + wps { + label = "wps"; + gpios = <&pinctrl 24 1>; + linux,code = ; + debounce-interval = <60>; + }; + }; +}; + +&leds { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_leds>; + + led@1 { + reg = <1>; + active-low; + label = "green:internet"; + }; + + led@2 { + reg = <2>; + active-low; + label = "red:wifi"; + }; + + led@3 { + reg = <3>; + active-low; + label = "green:wifi"; + }; + + led_power_green: led@4 { + reg = <4>; + active-low; + label = "green:power"; + default-state = "on"; + }; + + led@5 { + reg = <5>; + active-low; + label = "green:ethernet"; + }; + + led@7 { + reg = <7>; + active-low; + label = "red:internet"; + }; + + led@8 { + reg = <8>; + active-low; + label = "red:power"; + }; + + led@9 { + reg = <9>; + active-low; + label = "green:wps"; + }; + + led@10 { + reg = <10>; + active-low; + label = "red:wps"; + }; + + led@11 { + reg = <11>; + active-low; + label = "green:broadband"; + }; +}; + +&hsspi { + status = "okay"; + + flash@0 { + compatible = "jedec,spi-nor"; + spi-max-frequency = <16666667>; + spi-tx-bus-width = <2>; + spi-rx-bus-width = <2>; + reg = <0>; + + #address-cells = <1>; + #size-cells = <1>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + reg = <0x000000 0x010000>; + label = "cfe"; + read-only; + }; + + partition@10000 { + reg = <0x010000 0xff0000>; + label = "linux"; + compatible = "brcm,bcm963xx-imagetag"; + }; + }; + }; +}; + +&pinctrl { + pinctrl_leds: leds { + function = "led"; + pins = "gpio1", "gpio2", + "gpio3", "gpio4", + "gpio5", "gpio7", + "gpio8", "gpio9", + "gpio10", "gpio11"; + }; +}; + +&uart0 { + status = "okay"; +}; diff --git a/target/linux/bcm63xx/dts/bcm6328.dtsi b/target/linux/bcm63xx/dts/bcm6328.dtsi index f62fad783e..9b7e078c6d 100644 --- a/target/linux/bcm63xx/dts/bcm6328.dtsi +++ b/target/linux/bcm63xx/dts/bcm6328.dtsi @@ -1,3 +1,5 @@ +/dts-v1/; + / { #address-cells = <1>; #size-cells = <1>; diff --git a/target/linux/bcm63xx/dts/bcm6338-brcm-bcm96338gw.dts b/target/linux/bcm63xx/dts/bcm6338-brcm-bcm96338gw.dts index fa33c57732..885654ad41 100644 --- a/target/linux/bcm63xx/dts/bcm6338-brcm-bcm96338gw.dts +++ b/target/linux/bcm63xx/dts/bcm6338-brcm-bcm96338gw.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6338.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6338-brcm-bcm96338w.dts b/target/linux/bcm63xx/dts/bcm6338-brcm-bcm96338w.dts index 28cf9e95af..3002a9240b 100644 --- a/target/linux/bcm63xx/dts/bcm6338-brcm-bcm96338w.dts +++ b/target/linux/bcm63xx/dts/bcm6338-brcm-bcm96338w.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6338.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6338-d-link-dsl-2640u.dts b/target/linux/bcm63xx/dts/bcm6338-d-link-dsl-2640u.dts index afa92991d4..dae5324f0a 100644 --- a/target/linux/bcm63xx/dts/bcm6338-d-link-dsl-2640u.dts +++ b/target/linux/bcm63xx/dts/bcm6338-d-link-dsl-2640u.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6338.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6338-dynalink-rta1320.dts b/target/linux/bcm63xx/dts/bcm6338-dynalink-rta1320.dts index 713ab9a4ae..7d3f4a598f 100644 --- a/target/linux/bcm63xx/dts/bcm6338-dynalink-rta1320.dts +++ b/target/linux/bcm63xx/dts/bcm6338-dynalink-rta1320.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6338.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6338.dtsi b/target/linux/bcm63xx/dts/bcm6338.dtsi index 3d1c068351..fc8b2dfe51 100644 --- a/target/linux/bcm63xx/dts/bcm6338.dtsi +++ b/target/linux/bcm63xx/dts/bcm6338.dtsi @@ -1,3 +1,5 @@ +/dts-v1/; + / { #address-cells = <1>; #size-cells = <1>; diff --git a/target/linux/bcm63xx/dts/bcm6345-brcm-bcm96345gw2.dts b/target/linux/bcm63xx/dts/bcm6345-brcm-bcm96345gw2.dts index 1a86007290..515771904e 100644 --- a/target/linux/bcm63xx/dts/bcm6345-brcm-bcm96345gw2.dts +++ b/target/linux/bcm63xx/dts/bcm6345-brcm-bcm96345gw2.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6345.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770bw.dts b/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770bw.dts index afaf3ed88d..e5b67291b1 100644 --- a/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770bw.dts +++ b/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770bw.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6345.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770w.dts b/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770w.dts index ae1c0a5b31..65fb1d7b1e 100644 --- a/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770w.dts +++ b/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770w.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6345.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6345.dtsi b/target/linux/bcm63xx/dts/bcm6345.dtsi index 7d5f79be35..095af83637 100644 --- a/target/linux/bcm63xx/dts/bcm6345.dtsi +++ b/target/linux/bcm63xx/dts/bcm6345.dtsi @@ -1,3 +1,5 @@ +/dts-v1/; + / { #address-cells = <1>; #size-cells = <1>; diff --git a/target/linux/bcm63xx/dts/bcm6348-asmax-ar-1004g.dts b/target/linux/bcm63xx/dts/bcm6348-asmax-ar-1004g.dts index 5c2749a40b..6ffa3b457d 100644 --- a/target/linux/bcm63xx/dts/bcm6348-asmax-ar-1004g.dts +++ b/target/linux/bcm63xx/dts/bcm6348-asmax-ar-1004g.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6348.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6348-belkin-f5d7633.dts b/target/linux/bcm63xx/dts/bcm6348-belkin-f5d7633.dts index a00e9b585a..620d6510b6 100644 --- a/target/linux/bcm63xx/dts/bcm6348-belkin-f5d7633.dts +++ b/target/linux/bcm63xx/dts/bcm6348-belkin-f5d7633.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6348.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw-10.dts b/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw-10.dts index 5bb42cbf39..8e19d7a261 100644 --- a/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw-10.dts +++ b/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw-10.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6348.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw-11.dts b/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw-11.dts index fec1f87879..cf983b446b 100644 --- a/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw-11.dts +++ b/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw-11.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6348.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw.dts b/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw.dts index 8d470e3f07..9eeb50625d 100644 --- a/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw.dts +++ b/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6348.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348r.dts b/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348r.dts index 5fbed215dc..2b54404560 100644 --- a/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348r.dts +++ b/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348r.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6348.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6348-bt-voyager-2110.dts b/target/linux/bcm63xx/dts/bcm6348-bt-voyager-2110.dts index 7c4a76cc10..39aa48971d 100644 --- a/target/linux/bcm63xx/dts/bcm6348-bt-voyager-2110.dts +++ b/target/linux/bcm63xx/dts/bcm6348-bt-voyager-2110.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6348.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6348-bt-voyager-2500v-bb.dts b/target/linux/bcm63xx/dts/bcm6348-bt-voyager-2500v-bb.dts index 2c87943015..5e399a05a5 100644 --- a/target/linux/bcm63xx/dts/bcm6348-bt-voyager-2500v-bb.dts +++ b/target/linux/bcm63xx/dts/bcm6348-bt-voyager-2500v-bb.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6348.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6348-comtrend-ct-5365.dts b/target/linux/bcm63xx/dts/bcm6348-comtrend-ct-5365.dts index 1fc98fe564..308139b0ce 100644 --- a/target/linux/bcm63xx/dts/bcm6348-comtrend-ct-5365.dts +++ b/target/linux/bcm63xx/dts/bcm6348-comtrend-ct-5365.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6348.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6348-comtrend-ct-536plus.dts b/target/linux/bcm63xx/dts/bcm6348-comtrend-ct-536plus.dts index 030b6f9c88..e95e4e6e4f 100644 --- a/target/linux/bcm63xx/dts/bcm6348-comtrend-ct-536plus.dts +++ b/target/linux/bcm63xx/dts/bcm6348-comtrend-ct-536plus.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6348.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6348-d-link-dsl-2640b-b.dts b/target/linux/bcm63xx/dts/bcm6348-d-link-dsl-2640b-b.dts index 5c90f2b934..d71bc4e56a 100644 --- a/target/linux/bcm63xx/dts/bcm6348-d-link-dsl-2640b-b.dts +++ b/target/linux/bcm63xx/dts/bcm6348-d-link-dsl-2640b-b.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6348.dtsi" #include @@ -43,7 +41,7 @@ default-state = "on"; }; status { - label = ":status"; + label = "status"; gpios = <&pinctrl 3 1>; }; inet_green { diff --git a/target/linux/bcm63xx/dts/bcm6348-davolink-dv-201amr.dts b/target/linux/bcm63xx/dts/bcm6348-davolink-dv-201amr.dts index 59a1b7b5e3..abb2cc0ec7 100644 --- a/target/linux/bcm63xx/dts/bcm6348-davolink-dv-201amr.dts +++ b/target/linux/bcm63xx/dts/bcm6348-davolink-dv-201amr.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6348.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6348-dynalink-rta1025w.dts b/target/linux/bcm63xx/dts/bcm6348-dynalink-rta1025w.dts index 76af7b4147..e107337ea1 100644 --- a/target/linux/bcm63xx/dts/bcm6348-dynalink-rta1025w.dts +++ b/target/linux/bcm63xx/dts/bcm6348-dynalink-rta1025w.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6348.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6348-inventel-livebox-1.dts b/target/linux/bcm63xx/dts/bcm6348-inventel-livebox-1.dts index 00a1b23cf9..df204cc51e 100644 --- a/target/linux/bcm63xx/dts/bcm6348-inventel-livebox-1.dts +++ b/target/linux/bcm63xx/dts/bcm6348-inventel-livebox-1.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6348.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6348-netgear-dg834g-v4.dts b/target/linux/bcm63xx/dts/bcm6348-netgear-dg834g-v4.dts index ac9e1905c6..e91a4105db 100644 --- a/target/linux/bcm63xx/dts/bcm6348-netgear-dg834g-v4.dts +++ b/target/linux/bcm63xx/dts/bcm6348-netgear-dg834g-v4.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6348.dtsi" #include @@ -40,11 +38,11 @@ gpios = <&pinctrl 1 1>; }; inet_green { - label = ":adsl"; + label = "adsl"; gpios = <&pinctrl 2 1>; }; inet_red { - label = ":internet"; + label = "internet"; gpios = <&pinctrl 3 1>; }; }; diff --git a/target/linux/bcm63xx/dts/bcm6348-netgear-dg834gt-pn.dts b/target/linux/bcm63xx/dts/bcm6348-netgear-dg834gt-pn.dts index b67d6119b0..3f17f987da 100644 --- a/target/linux/bcm63xx/dts/bcm6348-netgear-dg834gt-pn.dts +++ b/target/linux/bcm63xx/dts/bcm6348-netgear-dg834gt-pn.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6348.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6348-sagem-fast-2404.dts b/target/linux/bcm63xx/dts/bcm6348-sagem-fast-2404.dts index d3c0859a65..4abd185ca6 100644 --- a/target/linux/bcm63xx/dts/bcm6348-sagem-fast-2404.dts +++ b/target/linux/bcm63xx/dts/bcm6348-sagem-fast-2404.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6348.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6348-sagem-fast-2604.dts b/target/linux/bcm63xx/dts/bcm6348-sagem-fast-2604.dts index e8adc07255..987903d525 100644 --- a/target/linux/bcm63xx/dts/bcm6348-sagem-fast-2604.dts +++ b/target/linux/bcm63xx/dts/bcm6348-sagem-fast-2604.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6348.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6348-t-com-speedport-w-500v.dts b/target/linux/bcm63xx/dts/bcm6348-t-com-speedport-w-500v.dts index 2357058902..c096b88d8f 100644 --- a/target/linux/bcm63xx/dts/bcm6348-t-com-speedport-w-500v.dts +++ b/target/linux/bcm63xx/dts/bcm6348-t-com-speedport-w-500v.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6348.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6348-tecom-gw6000.dts b/target/linux/bcm63xx/dts/bcm6348-tecom-gw6000.dts index e3876e1366..a34cd49a46 100644 --- a/target/linux/bcm63xx/dts/bcm6348-tecom-gw6000.dts +++ b/target/linux/bcm63xx/dts/bcm6348-tecom-gw6000.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6348.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6348-tecom-gw6200.dts b/target/linux/bcm63xx/dts/bcm6348-tecom-gw6200.dts index 455c4b5994..5773077b54 100644 --- a/target/linux/bcm63xx/dts/bcm6348-tecom-gw6200.dts +++ b/target/linux/bcm63xx/dts/bcm6348-tecom-gw6200.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6348.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6348-telsey-cpva502plus.dts b/target/linux/bcm63xx/dts/bcm6348-telsey-cpva502plus.dts index f0024ae22d..d0ec1cf15e 100644 --- a/target/linux/bcm63xx/dts/bcm6348-telsey-cpva502plus.dts +++ b/target/linux/bcm63xx/dts/bcm6348-telsey-cpva502plus.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6348.dtsi" #include @@ -31,12 +29,12 @@ compatible = "gpio-leds"; phone_green { - label = "CPVA502+:green:phone"; + label = "green:phone"; gpios = <&pinctrl 0 1>; }; link_amber { - label = "CPVA502+:amber:link"; + label = "amber:link"; gpios = <&pinctrl 5 1>; }; }; diff --git a/target/linux/bcm63xx/dts/bcm6348-telsey-magic.dts b/target/linux/bcm63xx/dts/bcm6348-telsey-magic.dts index c3bc5944db..00ce70f17b 100644 --- a/target/linux/bcm63xx/dts/bcm6348-telsey-magic.dts +++ b/target/linux/bcm63xx/dts/bcm6348-telsey-magic.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6348.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6348-tp-link-td-w8900gb.dts b/target/linux/bcm63xx/dts/bcm6348-tp-link-td-w8900gb.dts index e97ab9b098..1a49e7ff33 100644 --- a/target/linux/bcm63xx/dts/bcm6348-tp-link-td-w8900gb.dts +++ b/target/linux/bcm63xx/dts/bcm6348-tp-link-td-w8900gb.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6348.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6348-usrobotics-usr9108.dts b/target/linux/bcm63xx/dts/bcm6348-usrobotics-usr9108.dts index 4ce7fbce23..412d80a8c3 100644 --- a/target/linux/bcm63xx/dts/bcm6348-usrobotics-usr9108.dts +++ b/target/linux/bcm63xx/dts/bcm6348-usrobotics-usr9108.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6348.dtsi" #include @@ -17,11 +15,11 @@ compatible = "gpio-leds"; usb { - label = "96348GW-A::usb"; + label = "usb"; gpios = <&pinctrl 0 1>; }; dsl { - label = "96348GW-A::adsl"; + label = "adsl"; gpios = <&pinctrl 3 1>; }; }; diff --git a/target/linux/bcm63xx/dts/bcm6348.dtsi b/target/linux/bcm63xx/dts/bcm6348.dtsi index f3e17be533..1e04486909 100644 --- a/target/linux/bcm63xx/dts/bcm6348.dtsi +++ b/target/linux/bcm63xx/dts/bcm6348.dtsi @@ -1,3 +1,5 @@ +/dts-v1/; + / { #address-cells = <1>; #size-cells = <1>; diff --git a/target/linux/bcm63xx/dts/bcm6358-alcatel-rg100a.dts b/target/linux/bcm63xx/dts/bcm6358-alcatel-rg100a.dts index 1c8ca60d21..fdc1edf906 100644 --- a/target/linux/bcm63xx/dts/bcm6358-alcatel-rg100a.dts +++ b/target/linux/bcm63xx/dts/bcm6358-alcatel-rg100a.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6358.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6358-brcm-bcm96358vw.dts b/target/linux/bcm63xx/dts/bcm6358-brcm-bcm96358vw.dts index 41ecf6b204..bf997935e8 100644 --- a/target/linux/bcm63xx/dts/bcm6358-brcm-bcm96358vw.dts +++ b/target/linux/bcm63xx/dts/bcm6358-brcm-bcm96358vw.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6358.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6358-brcm-bcm96358vw2.dts b/target/linux/bcm63xx/dts/bcm6358-brcm-bcm96358vw2.dts index ce08d4dcfd..316581d2a5 100644 --- a/target/linux/bcm63xx/dts/bcm6358-brcm-bcm96358vw2.dts +++ b/target/linux/bcm63xx/dts/bcm6358-brcm-bcm96358vw2.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6358.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6358-bt-home-hub-2-a.dts b/target/linux/bcm63xx/dts/bcm6358-bt-home-hub-2-a.dts index 393328ffb9..b5eea3dcb1 100644 --- a/target/linux/bcm63xx/dts/bcm6358-bt-home-hub-2-a.dts +++ b/target/linux/bcm63xx/dts/bcm6358-bt-home-hub-2-a.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6358.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6358-comtrend-ct-6373.dts b/target/linux/bcm63xx/dts/bcm6358-comtrend-ct-6373.dts index 9f982ecfaa..ab9d5659ba 100644 --- a/target/linux/bcm63xx/dts/bcm6358-comtrend-ct-6373.dts +++ b/target/linux/bcm63xx/dts/bcm6358-comtrend-ct-6373.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6358.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6358-d-link-dsl-2650u.dts b/target/linux/bcm63xx/dts/bcm6358-d-link-dsl-2650u.dts index 76abbb8dba..6d26261a34 100644 --- a/target/linux/bcm63xx/dts/bcm6358-d-link-dsl-2650u.dts +++ b/target/linux/bcm63xx/dts/bcm6358-d-link-dsl-2650u.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6358.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6358-d-link-dsl-274xb-c2.dts b/target/linux/bcm63xx/dts/bcm6358-d-link-dsl-274xb-c2.dts index 37aa30cac2..ff007ebe4c 100644 --- a/target/linux/bcm63xx/dts/bcm6358-d-link-dsl-274xb-c2.dts +++ b/target/linux/bcm63xx/dts/bcm6358-d-link-dsl-274xb-c2.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6358.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6358-d-link-dva-g3810bn-tl.dts b/target/linux/bcm63xx/dts/bcm6358-d-link-dva-g3810bn-tl.dts index 71c8f53676..ef6ff862e5 100644 --- a/target/linux/bcm63xx/dts/bcm6358-d-link-dva-g3810bn-tl.dts +++ b/target/linux/bcm63xx/dts/bcm6358-d-link-dva-g3810bn-tl.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6358.dtsi" #include @@ -31,24 +29,24 @@ compatible = "gpio-leds"; voip { - label = "DVAG3810BN::voip"; + label = "voip"; gpios = <&pinctrl 1 0>; }; power { - label = "DVAG3810BN::power"; + label = "power"; gpios = <&pinctrl 4 0>; default-state = "on"; }; stop { - label = "DVAG3810BN::stop"; + label = "stop"; gpios = <&pinctrl 5 0>; }; dsl { - label = "DVAG3810BN::dsl"; + label = "dsl"; gpios = <&pinctrl 22 1>; }; inet { - label = "DVAG3810BN::internet"; + label = "internet"; gpios = <&pinctrl 23 1>; }; }; diff --git a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg553.dts b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg553.dts index cb164fd138..243e2ca300 100644 --- a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg553.dts +++ b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg553.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6358.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-a.dts b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-a.dts index 47b0618e6c..76dbe4f92b 100644 --- a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-a.dts +++ b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-a.dts @@ -1,153 +1,43 @@ -/dts-v1/; - -#include "bcm6358.dtsi" - -#include +#include "bcm6358-huawei-echolife-hg556a.dtsi" / { model = "Huawei EchoLife HG556a (version A)"; compatible = "huawei,echolife-hg556a-a", "brcm,bcm6358"; +}; - aliases { - led-boot = &led_power_red; - led-failsafe = &led_power_red; - led-running = &led_power_red; - led-upgrade = &led_power_red; - }; - - chosen { - bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; - stdout-path = "serial0:115200n8"; - }; - - keys { - compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; - poll-interval = <20>; - - help { - label = "help"; - gpios = <&pinctrl 8 1>; - linux,code = ; - debounce-interval = <60>; - }; - - wlan { - label = "wlan"; - gpios = <&pinctrl 9 1>; - linux,code = ; - debounce-interval = <60>; - }; - - restart { - label = "restart"; - gpios = <&pinctrl 10 1>; - linux,code = ; - debounce-interval = <60>; - }; - - reset { - label = "reset"; - gpios = <&pinctrl 11 1>; - linux,code = ; - debounce-interval = <60>; - }; - }; - - leds { - compatible = "gpio-leds"; - - message_red { - label = "red:message"; - gpios = <&pinctrl 0 1>; - }; - hspa_red { - label = "red:hspa"; - gpios = <&pinctrl 1 1>; - }; - dsl_red { - label = "red:dsl"; - gpios = <&pinctrl 2 1>; - }; - led_power_red: power_red { - label = "red:power"; - gpios = <&pinctrl 3 1>; - default-state = "on"; - }; - all_red { - label = "red:all"; - gpios = <&pinctrl 6 1>; - default-state = "on"; - }; - lan1_green { - label = "green:lan1"; - gpios = <&pinctrl 12 1>; - }; - lan1_red { - label = "red:lan1"; - gpios = <&pinctrl 13 1>; - }; - lan2_green { - label = "green:lan2"; - gpios = <&pinctrl 15 1>; - }; - lan2_red { - label = "red:lan2"; - gpios = <&pinctrl 22 1>; - }; - lan3_green { - label = "green:lan3"; - gpios = <&pinctrl 23 1>; - }; - lan3_red { - label = "red:lan3"; - gpios = <&pinctrl 26 1>; - }; - lan4_green { - label = "green:lan4"; - gpios = <&pinctrl 27 1>; - }; - lan4_red { - label = "red:lan4"; - gpios = <&pinctrl 28 1>; - }; +&gpiokeys { + help { + label = "help"; + gpios = <&pinctrl 8 1>; + linux,code = ; + debounce-interval = <60>; }; }; -&pflash { - status = "okay"; +&gpioleds { + message_red { + label = "red:message"; + gpios = <&pinctrl 0 1>; + }; - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; + hspa_red { + label = "red:hspa"; + gpios = <&pinctrl 1 1>; + }; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x020000>; - read-only; - }; + all_red { + label = "red:all"; + gpios = <&pinctrl 6 1>; + default-state = "on"; + }; - linux@20000 { - label = "linux"; - reg = <0x020000 0xec0000>; - compatible = "brcm,bcm963xx-imagetag"; - }; + lan1_green { + label = "green:lan1"; + gpios = <&pinctrl 12 1>; + }; - cal_data@ee0000 { - label = "cal_data"; - reg = <0xee0000 0x100000>; - read-only; - }; - - nvram@fe0000 { - label = "nvram"; - reg = <0xfe0000 0x020000>; - }; + lan2_green { + label = "green:lan2"; + gpios = <&pinctrl 15 1>; }; }; - -&uart0 { - status = "okay"; -}; diff --git a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-b.dts b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-b.dts index 66d4acf6b4..c39e574b36 100644 --- a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-b.dts +++ b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-b.dts @@ -1,153 +1,43 @@ -/dts-v1/; - -#include "bcm6358.dtsi" - -#include +#include "bcm6358-huawei-echolife-hg556a.dtsi" / { model = "Huawei EchoLife HG556a (version B)"; compatible = "huawei,echolife-hg556a-b", "brcm,bcm6358"; +}; - aliases { - led-boot = &led_power_red; - led-failsafe = &led_power_red; - led-running = &led_power_red; - led-upgrade = &led_power_red; - }; - - chosen { - bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; - stdout-path = "serial0:115200n8"; - }; - - keys { - compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; - poll-interval = <20>; - - help { - label = "help"; - gpios = <&pinctrl 8 1>; - linux,code = ; - debounce-interval = <60>; - }; - - wlan { - label = "wlan"; - gpios = <&pinctrl 9 1>; - linux,code = ; - debounce-interval = <60>; - }; - - restart { - label = "restart"; - gpios = <&pinctrl 10 1>; - linux,code = ; - debounce-interval = <60>; - }; - - reset { - label = "reset"; - gpios = <&pinctrl 11 1>; - linux,code = ; - debounce-interval = <60>; - }; - }; - - leds { - compatible = "gpio-leds"; - - message_red { - label = "red:message"; - gpios = <&pinctrl 0 1>; - }; - hspa_red { - label = "red:hspa"; - gpios = <&pinctrl 1 1>; - }; - dsl_red { - label = "red:dsl"; - gpios = <&pinctrl 2 1>; - }; - led_power_red: power_red { - label = "red:power"; - gpios = <&pinctrl 3 1>; - default-state = "on"; - }; - all_red { - label = "red:all"; - gpios = <&pinctrl 6 1>; - default-state = "on"; - }; - lan1_green { - label = "green:lan1"; - gpios = <&pinctrl 12 1>; - }; - lan1_red { - label = "red:lan1"; - gpios = <&pinctrl 13 1>; - }; - lan2_green { - label = "green:lan2"; - gpios = <&pinctrl 15 1>; - }; - lan2_red { - label = "red:lan2"; - gpios = <&pinctrl 22 1>; - }; - lan3_green { - label = "green:lan3"; - gpios = <&pinctrl 23 1>; - }; - lan3_red { - label = "red:lan3"; - gpios = <&pinctrl 26 1>; - }; - lan4_green { - label = "green:lan4"; - gpios = <&pinctrl 27 1>; - }; - lan4_red { - label = "red:lan4"; - gpios = <&pinctrl 28 1>; - }; +&gpiokeys { + help { + label = "help"; + gpios = <&pinctrl 8 1>; + linux,code = ; + debounce-interval = <60>; }; }; -&pflash { - status = "okay"; +&gpioleds { + message_red { + label = "red:message"; + gpios = <&pinctrl 0 1>; + }; - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; + hspa_red { + label = "red:hspa"; + gpios = <&pinctrl 1 1>; + }; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x020000>; - read-only; - }; + all_red { + label = "red:all"; + gpios = <&pinctrl 6 1>; + default-state = "on"; + }; - linux@20000 { - label = "linux"; - reg = <0x020000 0xec0000>; - compatible = "brcm,bcm963xx-imagetag"; - }; + lan1_green { + label = "green:lan1"; + gpios = <&pinctrl 12 1>; + }; - cal_data@ee0000 { - label = "cal_data"; - reg = <0xee0000 0x100000>; - read-only; - }; - - nvram@fe0000 { - label = "nvram"; - reg = <0xfe0000 0x020000>; - }; + lan2_green { + label = "green:lan2"; + gpios = <&pinctrl 15 1>; }; }; - -&uart0 { - status = "okay"; -}; diff --git a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-c.dts b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-c.dts index fe2e5efff4..3f5931d7bd 100644 --- a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-c.dts +++ b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-c.dts @@ -1,148 +1,37 @@ -/dts-v1/; - -#include "bcm6358.dtsi" - -#include +#include "bcm6358-huawei-echolife-hg556a.dtsi" / { model = "Huawei EchoLife HG556a (version C)"; compatible = "huawei,echolife-hg556a-c", "brcm,bcm6358"; +}; - aliases { - led-boot = &led_power_red; - led-failsafe = &led_power_red; - led-running = &led_power_red; - led-upgrade = &led_power_red; - }; - - chosen { - bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; - stdout-path = "serial0:115200n8"; - }; - - keys { - compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; - poll-interval = <20>; - - help { - label = "help"; - gpios = <&pinctrl 36 1>; - linux,code = ; - debounce-interval = <60>; - }; - - wlan { - label = "wlan"; - gpios = <&pinctrl 9 1>; - linux,code = ; - debounce-interval = <60>; - }; - - restart { - label = "restart"; - gpios = <&pinctrl 10 1>; - linux,code = ; - debounce-interval = <60>; - }; - - reset { - label = "reset"; - gpios = <&pinctrl 11 1>; - linux,code = ; - debounce-interval = <60>; - }; - }; - - leds { - compatible = "gpio-leds"; - - lan1_green { - label = "green:lan1"; - gpios = <&pinctrl 0 1>; - }; - lan2_green { - label = "green:lan2"; - gpios = <&pinctrl 1 1>; - }; - dsl_red { - label = "red:dsl"; - gpios = <&pinctrl 2 1>; - }; - led_power_red: power_red { - label = "red:power"; - gpios = <&pinctrl 3 1>; - default-state = "on"; - }; - message_red { - label = "red:message"; - gpios = <&pinctrl 12 1>; - }; - lan1_red { - label = "red:lan1"; - gpios = <&pinctrl 13 1>; - }; - hspa_red { - label = "red:hspa"; - gpios = <&pinctrl 15 1>; - }; - lan2_red { - label = "red:lan2"; - gpios = <&pinctrl 22 1>; - }; - lan3_green { - label = "green:lan3"; - gpios = <&pinctrl 23 1>; - }; - lan3_red { - label = "red:lan3"; - gpios = <&pinctrl 26 1>; - }; - lan4_green { - label = "green:lan4"; - gpios = <&pinctrl 27 1>; - }; - lan4_red { - label = "red:lan4"; - gpios = <&pinctrl 28 1>; - }; +&gpiokeys { + help { + label = "help"; + gpios = <&pinctrl 36 1>; + linux,code = ; + debounce-interval = <60>; }; }; -&pflash { - status = "okay"; +&gpioleds { + lan1_green { + label = "green:lan1"; + gpios = <&pinctrl 0 1>; + }; - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; + lan2_green { + label = "green:lan2"; + gpios = <&pinctrl 1 1>; + }; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x020000>; - read-only; - }; + message_red { + label = "red:message"; + gpios = <&pinctrl 12 1>; + }; - linux@20000 { - label = "linux"; - reg = <0x020000 0xec0000>; - compatible = "brcm,bcm963xx-imagetag"; - }; - - cal_data@ee0000 { - label = "cal_data"; - reg = <0xee0000 0x100000>; - read-only; - }; - - nvram@fe0000 { - label = "nvram"; - reg = <0xfe0000 0x020000>; - }; + hspa_red { + label = "red:hspa"; + gpios = <&pinctrl 15 1>; }; }; - -&uart0 { - status = "okay"; -}; diff --git a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a.dtsi b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a.dtsi new file mode 100644 index 0000000000..09a21f7ad7 --- /dev/null +++ b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a.dtsi @@ -0,0 +1,127 @@ +#include "bcm6358.dtsi" + +#include + +/ { + aliases { + led-boot = &led_power_red; + led-failsafe = &led_power_red; + led-running = &led_power_red; + led-upgrade = &led_power_red; + }; + + chosen { + bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; + stdout-path = "serial0:115200n8"; + }; + + gpiokeys: keys { + compatible = "gpio-keys-polled"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <20>; + + wlan { + label = "wlan"; + gpios = <&pinctrl 9 1>; + linux,code = ; + debounce-interval = <60>; + }; + + restart { + label = "restart"; + gpios = <&pinctrl 10 1>; + linux,code = ; + debounce-interval = <60>; + }; + + reset { + label = "reset"; + gpios = <&pinctrl 11 1>; + linux,code = ; + debounce-interval = <60>; + }; + }; + + gpioleds: leds { + compatible = "gpio-leds"; + + dsl_red { + label = "red:dsl"; + gpios = <&pinctrl 2 1>; + }; + + led_power_red: power_red { + label = "red:power"; + gpios = <&pinctrl 3 1>; + default-state = "on"; + }; + + lan1_red { + label = "red:lan1"; + gpios = <&pinctrl 13 1>; + }; + + lan2_red { + label = "red:lan2"; + gpios = <&pinctrl 22 1>; + }; + + lan3_green { + label = "green:lan3"; + gpios = <&pinctrl 23 1>; + }; + + lan3_red { + label = "red:lan3"; + gpios = <&pinctrl 26 1>; + }; + + lan4_green { + label = "green:lan4"; + gpios = <&pinctrl 27 1>; + }; + + lan4_red { + label = "red:lan4"; + gpios = <&pinctrl 28 1>; + }; + }; +}; + +&pflash { + status = "okay"; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + cfe@0 { + label = "CFE"; + reg = <0x000000 0x020000>; + read-only; + }; + + linux@20000 { + label = "linux"; + reg = <0x020000 0xec0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + cal_data@ee0000 { + label = "cal_data"; + reg = <0xee0000 0x100000>; + read-only; + }; + + nvram@fe0000 { + label = "nvram"; + reg = <0xfe0000 0x020000>; + }; + }; +}; + +&uart0 { + status = "okay"; +}; diff --git a/target/linux/bcm63xx/dts/bcm6358-pirelli-a226.dtsi b/target/linux/bcm63xx/dts/bcm6358-pirelli-a226.dtsi new file mode 100644 index 0000000000..cc833b0c18 --- /dev/null +++ b/target/linux/bcm63xx/dts/bcm6358-pirelli-a226.dtsi @@ -0,0 +1,93 @@ +#include "bcm6358.dtsi" + +#include + +/ { + chosen { + bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; + stdout-path = "serial0:115200n8"; + }; + + keys { + compatible = "gpio-keys-polled"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <20>; + + wps { + label = "wps"; + gpios = <&pinctrl 34 1>; + linux,code = ; + debounce-interval = <60>; + }; + + reset { + label = "reset"; + gpios = <&pinctrl 37 1>; + linux,code = ; + debounce-interval = <60>; + }; + }; + + leds { + compatible = "gpio-leds"; + + voip_red { + label = "red:VoIP"; + gpios = <&pinctrl 0 1>; + }; + eth_red { + label = "red:ethernet"; + gpios = <&pinctrl 1 1>; + }; + dsl_green { + label = "green:ADSL"; + gpios = <&pinctrl 2 1>; + }; + usb_green { + label = "green:USB"; + gpios = <&pinctrl 3 1>; + }; + power_green { + label = "green:power"; + gpios = <&pinctrl 4 1>; + default-state = "on"; + }; + power_red { + label = "red:power"; + gpios = <&pinctrl 5 1>; + }; + inet_red { + label = "red:internet"; + gpios = <&pinctrl 6 1>; + }; + inet_green { + label = "green:internet"; + gpios = <&pinctrl 7 1>; + }; + eth_green { + label = "green:ethernet"; + gpios = <&pinctrl 8 1>; + }; + voip_green { + label = "green:VoIP"; + gpios = <&pinctrl 9 1>; + }; + wifi_red { + label = "red:wifi"; + gpios = <&pinctrl 10 1>; + }; + usb_red { + label = "red:USB"; + gpios = <&pinctrl 11 1>; + }; + dsl_red { + label = "red:ADSL"; + gpios = <&pinctrl 12 1>; + }; + }; +}; + +&uart0 { + status = "okay"; +}; diff --git a/target/linux/bcm63xx/dts/bcm6358-pirelli-a226g.dts b/target/linux/bcm63xx/dts/bcm6358-pirelli-a226g.dts index 2e1cc6b90d..492fd2ed31 100644 --- a/target/linux/bcm63xx/dts/bcm6358-pirelli-a226g.dts +++ b/target/linux/bcm63xx/dts/bcm6358-pirelli-a226g.dts @@ -1,96 +1,8 @@ -/dts-v1/; - -#include "bcm6358.dtsi" - -#include +#include "bcm6358-pirelli-a226.dtsi" / { model = "Pirelli A226G"; compatible = "pirelli,a226g", "brcm,bcm6358"; - - chosen { - bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; - stdout-path = "serial0:115200n8"; - }; - - keys { - compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; - poll-interval = <20>; - - wps { - label = "wps"; - gpios = <&pinctrl 34 1>; - linux,code = ; - debounce-interval = <60>; - }; - - reset { - label = "reset"; - gpios = <&pinctrl 37 1>; - linux,code = ; - debounce-interval = <60>; - }; - }; - - leds { - compatible = "gpio-leds"; - - voip_red { - label = "red:VoIP"; - gpios = <&pinctrl 0 1>; - }; - eth_red { - label = "red:ethernet"; - gpios = <&pinctrl 1 1>; - }; - dsl_green { - label = "green:ADSL"; - gpios = <&pinctrl 2 1>; - }; - usb_green { - label = "green:USB"; - gpios = <&pinctrl 3 1>; - }; - power_green { - label = "green:power"; - gpios = <&pinctrl 4 1>; - default-state = "on"; - }; - power_red { - label = "red:power"; - gpios = <&pinctrl 5 1>; - }; - inet_red { - label = "red:internet"; - gpios = <&pinctrl 6 1>; - }; - inet_green { - label = "green:internet"; - gpios = <&pinctrl 7 1>; - }; - eth_green { - label = "green:ethernet"; - gpios = <&pinctrl 8 1>; - }; - voip_green { - label = "green:VoIP"; - gpios = <&pinctrl 9 1>; - }; - wifi_red { - label = "red:wifi"; - gpios = <&pinctrl 10 1>; - }; - usb_red { - label = "red:USB"; - gpios = <&pinctrl 11 1>; - }; - dsl_red { - label = "red:ADSL"; - gpios = <&pinctrl 12 1>; - }; - }; }; &pflash { @@ -119,7 +31,3 @@ }; }; }; - -&uart0 { - status = "okay"; -}; diff --git a/target/linux/bcm63xx/dts/bcm6358-pirelli-a226m-fwb.dts b/target/linux/bcm63xx/dts/bcm6358-pirelli-a226m-fwb.dts index a1d4cdaa9c..1a820fbcbf 100644 --- a/target/linux/bcm63xx/dts/bcm6358-pirelli-a226m-fwb.dts +++ b/target/linux/bcm63xx/dts/bcm6358-pirelli-a226m-fwb.dts @@ -1,96 +1,8 @@ -/dts-v1/; - -#include "bcm6358.dtsi" - -#include +#include "bcm6358-pirelli-a226.dtsi" / { model = "Pirelli A226M-FWB"; compatible = "pirelli,a226m-fwb", "brcm,bcm6358"; - - chosen { - bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; - stdout-path = "serial0:115200n8"; - }; - - keys { - compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; - poll-interval = <20>; - - wps { - label = "wps"; - gpios = <&pinctrl 34 1>; - linux,code = ; - debounce-interval = <60>; - }; - - reset { - label = "reset"; - gpios = <&pinctrl 37 1>; - linux,code = ; - debounce-interval = <60>; - }; - }; - - leds { - compatible = "gpio-leds"; - - voip_red { - label = "red:VoIP"; - gpios = <&pinctrl 0 1>; - }; - eth_red { - label = "red:ethernet"; - gpios = <&pinctrl 1 1>; - }; - dsl_green { - label = "green:ADSL"; - gpios = <&pinctrl 2 1>; - }; - usb_green { - label = "green:USB"; - gpios = <&pinctrl 3 1>; - }; - power_green { - label = "green:power"; - gpios = <&pinctrl 4 1>; - default-state = "on"; - }; - power_red { - label = "red:power"; - gpios = <&pinctrl 5 1>; - }; - inet_red { - label = "red:internet"; - gpios = <&pinctrl 6 1>; - }; - inet_green { - label = "green:internet"; - gpios = <&pinctrl 7 1>; - }; - eth_green { - label = "green:ethernet"; - gpios = <&pinctrl 8 1>; - }; - voip_green { - label = "green:VoIP"; - gpios = <&pinctrl 9 1>; - }; - wifi_red { - label = "red:wifi"; - gpios = <&pinctrl 10 1>; - }; - usb_red { - label = "red:USB"; - gpios = <&pinctrl 11 1>; - }; - dsl_red { - label = "red:ADSL"; - gpios = <&pinctrl 12 1>; - }; - }; }; &pflash { @@ -119,7 +31,3 @@ }; }; }; - -&uart0 { - status = "okay"; -}; diff --git a/target/linux/bcm63xx/dts/bcm6358-pirelli-a226m.dts b/target/linux/bcm63xx/dts/bcm6358-pirelli-a226m.dts index db525acbfa..ba1a8629b5 100644 --- a/target/linux/bcm63xx/dts/bcm6358-pirelli-a226m.dts +++ b/target/linux/bcm63xx/dts/bcm6358-pirelli-a226m.dts @@ -1,96 +1,8 @@ -/dts-v1/; - -#include "bcm6358.dtsi" - -#include +#include "bcm6358-pirelli-a226.dtsi" / { model = "Pirelli A226M"; compatible = "pirelli,a226m", "brcm,bcm6358"; - - chosen { - bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; - stdout-path = "serial0:115200n8"; - }; - - keys { - compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; - poll-interval = <20>; - - wps { - label = "wps"; - gpios = <&pinctrl 34 1>; - linux,code = ; - debounce-interval = <60>; - }; - - reset { - label = "reset"; - gpios = <&pinctrl 37 1>; - linux,code = ; - debounce-interval = <60>; - }; - }; - - leds { - compatible = "gpio-leds"; - - voip_red { - label = "red:VoIP"; - gpios = <&pinctrl 0 1>; - }; - eth_red { - label = "red:ethernet"; - gpios = <&pinctrl 1 1>; - }; - dsl_green { - label = "green:ADSL"; - gpios = <&pinctrl 2 1>; - }; - usb_green { - label = "green:USB"; - gpios = <&pinctrl 3 1>; - }; - power_green { - label = "green:power"; - gpios = <&pinctrl 4 1>; - default-state = "on"; - }; - power_red { - label = "red:power"; - gpios = <&pinctrl 5 1>; - }; - inet_red { - label = "red:internet"; - gpios = <&pinctrl 6 1>; - }; - inet_green { - label = "green:internet"; - gpios = <&pinctrl 7 1>; - }; - eth_green { - label = "green:ethernet"; - gpios = <&pinctrl 8 1>; - }; - voip_green { - label = "green:VoIP"; - gpios = <&pinctrl 9 1>; - }; - wifi_red { - label = "red:wifi"; - gpios = <&pinctrl 10 1>; - }; - usb_red { - label = "red:USB"; - gpios = <&pinctrl 11 1>; - }; - dsl_red { - label = "red:ADSL"; - gpios = <&pinctrl 12 1>; - }; - }; }; &pflash { @@ -119,7 +31,3 @@ }; }; }; - -&uart0 { - status = "okay"; -}; diff --git a/target/linux/bcm63xx/dts/bcm6358-pirelli-agpf-s0.dts b/target/linux/bcm63xx/dts/bcm6358-pirelli-agpf-s0.dts index 09795297c0..12e9a0eba3 100644 --- a/target/linux/bcm63xx/dts/bcm6358-pirelli-agpf-s0.dts +++ b/target/linux/bcm63xx/dts/bcm6358-pirelli-agpf-s0.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6358.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4-foxconn-r1.dts b/target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4-foxconn-r1.dts index 5aed0bf529..c4c9ee9518 100644 --- a/target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4-foxconn-r1.dts +++ b/target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4-foxconn-r1.dts @@ -1,53 +1,9 @@ -/dts-v1/; - -#include "bcm6358.dtsi" - -#include +#include "bcm6358-sfr-neufbox-4.dtsi" / { model = "SFR Neufbox 4 (Foxconn)"; compatible = "sfr,neufbox-4-foxconn-r1", "brcm,bcm6358"; - chosen { - bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; - stdout-path = "serial0:115200n8"; - }; - - keys { - compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; - poll-interval = <20>; - - service { - label = "service"; - gpios = <&pinctrl 27 1>; - linux,code = ; - debounce-interval = <60>; - }; - - clip { - label = "clip"; - gpios = <&pinctrl 31 1>; - linux,code = ; - debounce-interval = <60>; - }; - - reset { - label = "reset"; - gpios = <&pinctrl 34 1>; - linux,code = ; - debounce-interval = <60>; - }; - - wps { - label = "wps"; - gpios = <&pinctrl 37 1>; - linux,code = ; - debounce-interval = <60>; - }; - }; - leds { compatible = "gpio-leds"; @@ -73,46 +29,3 @@ }; }; }; - -&leds { - status = "okay"; - - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_serial_led>; - - led@0 { - reg = <0>; - active-low; - label = "white:alarm"; - }; - - led@2 { - reg = <2>; - active-low; - label = "white:tv"; - }; - - led@3 { - reg = <3>; - active-low; - label = "white:tel"; - }; - - led@4 { - reg = <4>; - active-low; - label = "white:adsl"; - }; -}; - -&pflash { - status = "okay"; - - partitions { - compatible = "brcm,bcm963xx-cfe-nor-partitions"; - }; -}; - -&uart0 { - status = "okay"; -}; diff --git a/target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4-sercomm-r0.dts b/target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4-sercomm-r0.dts index 7d5e77dc65..fa23b68ef5 100644 --- a/target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4-sercomm-r0.dts +++ b/target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4-sercomm-r0.dts @@ -1,53 +1,9 @@ -/dts-v1/; - -#include "bcm6358.dtsi" - -#include +#include "bcm6358-sfr-neufbox-4.dtsi" / { model = "SFR Neufbox 4 (Sercomm)"; compatible = "sfr,neufbox-4-sercomm-r0", "brcm,bcm6358"; - chosen { - bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; - stdout-path = "serial0:115200n8"; - }; - - keys { - compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; - poll-interval = <20>; - - service { - label = "service"; - gpios = <&pinctrl 27 1>; - linux,code = ; - debounce-interval = <60>; - }; - - clip { - label = "clip"; - gpios = <&pinctrl 31 1>; - linux,code = ; - debounce-interval = <60>; - }; - - reset { - label = "reset"; - gpios = <&pinctrl 34 1>; - linux,code = ; - debounce-interval = <60>; - }; - - wps { - label = "wps"; - gpios = <&pinctrl 37 1>; - linux,code = ; - debounce-interval = <60>; - }; - }; - leds { compatible = "gpio-leds"; @@ -73,46 +29,3 @@ }; }; }; - -&leds { - status = "okay"; - - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_serial_led>; - - led@0 { - reg = <0>; - active-low; - label = "white:alarm"; - }; - - led@2 { - reg = <2>; - active-low; - label = "white:tv"; - }; - - led@3 { - reg = <3>; - active-low; - label = "white:tel"; - }; - - led@4 { - reg = <4>; - active-low; - label = "white:adsl"; - }; -}; - -&pflash { - status = "okay"; - - partitions { - compatible = "brcm,bcm963xx-cfe-nor-partitions"; - }; -}; - -&uart0 { - status = "okay"; -}; diff --git a/target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4.dtsi b/target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4.dtsi new file mode 100644 index 0000000000..58075c879a --- /dev/null +++ b/target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4.dtsi @@ -0,0 +1,88 @@ +#include "bcm6358.dtsi" + +#include + +/ { + chosen { + bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; + stdout-path = "serial0:115200n8"; + }; + + keys { + compatible = "gpio-keys-polled"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <20>; + + service { + label = "service"; + gpios = <&pinctrl 27 1>; + linux,code = ; + debounce-interval = <60>; + }; + + clip { + label = "clip"; + gpios = <&pinctrl 31 1>; + linux,code = ; + debounce-interval = <60>; + }; + + reset { + label = "reset"; + gpios = <&pinctrl 34 1>; + linux,code = ; + debounce-interval = <60>; + }; + + wps { + label = "wps"; + gpios = <&pinctrl 37 1>; + linux,code = ; + debounce-interval = <60>; + }; + }; +}; + +&leds { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_serial_led>; + + led@0 { + reg = <0>; + active-low; + label = "white:alarm"; + }; + + led@2 { + reg = <2>; + active-low; + label = "white:tv"; + }; + + led@3 { + reg = <3>; + active-low; + label = "white:tel"; + }; + + led@4 { + reg = <4>; + active-low; + label = "white:adsl"; + }; +}; + +&pflash { + status = "okay"; + + partitions { + compatible = "brcm,bcm963xx-cfe-nor-partitions"; + }; +}; + +&uart0 { + status = "okay"; +}; diff --git a/target/linux/bcm63xx/dts/bcm6358-t-com-speedport-w-303v.dts b/target/linux/bcm63xx/dts/bcm6358-t-com-speedport-w-303v.dts index d9c5bb202d..7a66e68031 100644 --- a/target/linux/bcm63xx/dts/bcm6358-t-com-speedport-w-303v.dts +++ b/target/linux/bcm63xx/dts/bcm6358-t-com-speedport-w-303v.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6358.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6358-telsey-cpva642.dts b/target/linux/bcm63xx/dts/bcm6358-telsey-cpva642.dts index cbb4326cef..f679b40ac9 100644 --- a/target/linux/bcm63xx/dts/bcm6358-telsey-cpva642.dts +++ b/target/linux/bcm63xx/dts/bcm6358-telsey-cpva642.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6358.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6358.dtsi b/target/linux/bcm63xx/dts/bcm6358.dtsi index a78cdef373..c2e0a97bb2 100644 --- a/target/linux/bcm63xx/dts/bcm6358.dtsi +++ b/target/linux/bcm63xx/dts/bcm6358.dtsi @@ -1,3 +1,5 @@ +/dts-v1/; + / { #address-cells = <1>; #size-cells = <1>; diff --git a/target/linux/bcm63xx/dts/bcm6359-huawei-echolife-hg520v.dts b/target/linux/bcm63xx/dts/bcm6359-huawei-echolife-hg520v.dts index b16004f134..ec47764ccb 100644 --- a/target/linux/bcm63xx/dts/bcm6359-huawei-echolife-hg520v.dts +++ b/target/linux/bcm63xx/dts/bcm6359-huawei-echolife-hg520v.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6358.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6361-sfr-neufbox-6-sercomm-r0.dts b/target/linux/bcm63xx/dts/bcm6361-sfr-neufbox-6-sercomm-r0.dts index af172564a2..c7b6806810 100644 --- a/target/linux/bcm63xx/dts/bcm6361-sfr-neufbox-6-sercomm-r0.dts +++ b/target/linux/bcm63xx/dts/bcm6361-sfr-neufbox-6-sercomm-r0.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6362.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6362-huawei-hg253s-v2.dts b/target/linux/bcm63xx/dts/bcm6362-huawei-hg253s-v2.dts index f3c0d867fc..255c1c8f6c 100644 --- a/target/linux/bcm63xx/dts/bcm6362-huawei-hg253s-v2.dts +++ b/target/linux/bcm63xx/dts/bcm6362-huawei-hg253s-v2.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6362.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6362-netgear-dgnd3700-v2.dts b/target/linux/bcm63xx/dts/bcm6362-netgear-dgnd3700-v2.dts index b426f79825..50133265f7 100644 --- a/target/linux/bcm63xx/dts/bcm6362-netgear-dgnd3700-v2.dts +++ b/target/linux/bcm63xx/dts/bcm6362-netgear-dgnd3700-v2.dts @@ -1,7 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later -/dts-v1/; - #include "bcm6362.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6362-sagem-fast-2504n.dts b/target/linux/bcm63xx/dts/bcm6362-sagem-fast-2504n.dts index ff72cbb4b1..e5ae573c97 100644 --- a/target/linux/bcm63xx/dts/bcm6362-sagem-fast-2504n.dts +++ b/target/linux/bcm63xx/dts/bcm6362-sagem-fast-2504n.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6362.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6362.dtsi b/target/linux/bcm63xx/dts/bcm6362.dtsi index e639fc8837..0571b1e1ba 100644 --- a/target/linux/bcm63xx/dts/bcm6362.dtsi +++ b/target/linux/bcm63xx/dts/bcm6362.dtsi @@ -1,3 +1,5 @@ +/dts-v1/; + / { #address-cells = <1>; #size-cells = <1>; diff --git a/target/linux/bcm63xx/dts/bcm6368-actiontec-r1000h.dts b/target/linux/bcm63xx/dts/bcm6368-actiontec-r1000h.dts index 4cb26a2cbc..fa038962c2 100644 --- a/target/linux/bcm63xx/dts/bcm6368-actiontec-r1000h.dts +++ b/target/linux/bcm63xx/dts/bcm6368-actiontec-r1000h.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6368.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6368-adb-av4202n.dts b/target/linux/bcm63xx/dts/bcm6368-adb-av4202n.dts index 00e260d12a..fb1b4bcf06 100644 --- a/target/linux/bcm63xx/dts/bcm6368-adb-av4202n.dts +++ b/target/linux/bcm63xx/dts/bcm6368-adb-av4202n.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6368.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6368-brcm-bcm96368mvngr.dts b/target/linux/bcm63xx/dts/bcm6368-brcm-bcm96368mvngr.dts index 198f30cccf..50c57d5271 100644 --- a/target/linux/bcm63xx/dts/bcm6368-brcm-bcm96368mvngr.dts +++ b/target/linux/bcm63xx/dts/bcm6368-brcm-bcm96368mvngr.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6368.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6368-brcm-bcm96368mvwg.dts b/target/linux/bcm63xx/dts/bcm6368-brcm-bcm96368mvwg.dts index 0ef1e2829e..664e3e02f5 100644 --- a/target/linux/bcm63xx/dts/bcm6368-brcm-bcm96368mvwg.dts +++ b/target/linux/bcm63xx/dts/bcm6368-brcm-bcm96368mvwg.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6368.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025u.dts b/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025u.dts index 8919ef5be9..a237d18ac7 100644 --- a/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025u.dts +++ b/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025u.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6368.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025un.dts b/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025un.dts index 3663593c46..2391fb0671 100644 --- a/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025un.dts +++ b/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025un.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6368.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3026e.dts b/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3026e.dts index be3f324fb4..b17439ea23 100644 --- a/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3026e.dts +++ b/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3026e.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6368.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6368-huawei-echolife-hg622.dts b/target/linux/bcm63xx/dts/bcm6368-huawei-echolife-hg622.dts index 482d17d95c..95e482bca3 100644 --- a/target/linux/bcm63xx/dts/bcm6368-huawei-echolife-hg622.dts +++ b/target/linux/bcm63xx/dts/bcm6368-huawei-echolife-hg622.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6368.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6368-huawei-echolife-hg655b.dts b/target/linux/bcm63xx/dts/bcm6368-huawei-echolife-hg655b.dts index daf39b06e6..124b5ca1b7 100644 --- a/target/linux/bcm63xx/dts/bcm6368-huawei-echolife-hg655b.dts +++ b/target/linux/bcm63xx/dts/bcm6368-huawei-echolife-hg655b.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6368.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6368-netgear-dgnd3700-v1.dts b/target/linux/bcm63xx/dts/bcm6368-netgear-dgnd3700-v1.dts index bc8e8d91bd..700adea4c1 100644 --- a/target/linux/bcm63xx/dts/bcm6368-netgear-dgnd3700-v1.dts +++ b/target/linux/bcm63xx/dts/bcm6368-netgear-dgnd3700-v1.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6368.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6368-observa-vh4032n.dts b/target/linux/bcm63xx/dts/bcm6368-observa-vh4032n.dts index 5e58b22624..9ed3cc23d0 100644 --- a/target/linux/bcm63xx/dts/bcm6368-observa-vh4032n.dts +++ b/target/linux/bcm63xx/dts/bcm6368-observa-vh4032n.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6368.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6368-zyxel-p870hw-51a-v2.dts b/target/linux/bcm63xx/dts/bcm6368-zyxel-p870hw-51a-v2.dts index 072b138088..0bc66fb031 100644 --- a/target/linux/bcm63xx/dts/bcm6368-zyxel-p870hw-51a-v2.dts +++ b/target/linux/bcm63xx/dts/bcm6368-zyxel-p870hw-51a-v2.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6368.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6368.dtsi b/target/linux/bcm63xx/dts/bcm6368.dtsi index b539020c21..0e9610dbc5 100644 --- a/target/linux/bcm63xx/dts/bcm6368.dtsi +++ b/target/linux/bcm63xx/dts/bcm6368.dtsi @@ -1,3 +1,5 @@ +/dts-v1/; + / { #address-cells = <1>; #size-cells = <1>; diff --git a/target/linux/bcm63xx/dts/bcm6369-comtrend-wap-5813n.dts b/target/linux/bcm63xx/dts/bcm6369-comtrend-wap-5813n.dts index 487dcc1d19..2f0ec53e34 100644 --- a/target/linux/bcm63xx/dts/bcm6369-comtrend-wap-5813n.dts +++ b/target/linux/bcm63xx/dts/bcm6369-comtrend-wap-5813n.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6368.dtsi" #include diff --git a/target/linux/bcm63xx/dts/bcm6369-netgear-evg2000.dts b/target/linux/bcm63xx/dts/bcm6369-netgear-evg2000.dts index 6b6e6673b9..b96ba7eb65 100644 --- a/target/linux/bcm63xx/dts/bcm6369-netgear-evg2000.dts +++ b/target/linux/bcm63xx/dts/bcm6369-netgear-evg2000.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "bcm6368.dtsi" #include diff --git a/target/linux/bcm63xx/image/Makefile b/target/linux/bcm63xx/image/Makefile index 90d87f7bd4..d8e68862b3 100644 --- a/target/linux/bcm63xx/image/Makefile +++ b/target/linux/bcm63xx/image/Makefile @@ -311,12 +311,12 @@ define Device/Default endef DEVICE_VARS += CHIP_ID DEVICE_LOADADDR -ATH5K_PACKAGES := kmod-ath5k wpad-basic -ATH9K_PACKAGES := kmod-ath9k wpad-basic -B43_PACKAGES := kmod-b43 wpad-basic +ATH5K_PACKAGES := kmod-ath5k wpad-basic-wolfssl +ATH9K_PACKAGES := kmod-ath9k wpad-basic-wolfssl +B43_PACKAGES := kmod-b43 wpad-basic-wolfssl BRCMWL_PACKAGES := kmod-brcm-wl nas wlc -RT28_PACKAGES := kmod-rt2800-pci wpad-basic -RT61_PACKAGES := kmod-rt61-pci wpad-basic +RT28_PACKAGES := kmod-rt2800-pci wpad-basic-wolfssl +RT61_PACKAGES := kmod-rt61-pci wpad-basic-wolfssl USB1_PACKAGES := kmod-usb-ohci kmod-usb-ledtrig-usbport USB2_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport diff --git a/target/linux/bcm63xx/image/bcm63xx.mk b/target/linux/bcm63xx/image/bcm63xx.mk index 3c8eb364ce..24b150c063 100644 --- a/target/linux/bcm63xx/image/bcm63xx.mk +++ b/target/linux/bcm63xx/image/bcm63xx.mk @@ -225,6 +225,30 @@ define Device/adb_a4001n1 endef TARGET_DEVICES += adb_a4001n1 +define Device/adb_pdg-a4001n-a-000-1a1-ax + $(Device/bcm63xx) + DEVICE_VENDOR := ADB + DEVICE_MODEL := P.DG A4001N A-000-1A1-AX + IMAGES += sysupgrade.bin + CFE_BOARD_ID := 96328avng + CHIP_ID := 6328 + FLASH_MB := 16 + DEVICE_PACKAGES := $(USB2_PACKAGES) $(B43_PACKAGES) +endef +TARGET_DEVICES += adb_pdg-a4001n-a-000-1a1-ax + +define Device/adb_pdg-a4101n-a-000-1a1-ae + $(Device/bcm63xx) + DEVICE_VENDOR := ADB + DEVICE_MODEL := P.DG A4101N A-000-1A1-AE + IMAGES += sysupgrade.bin + CFE_BOARD_ID := 96328avngv + CHIP_ID := 6328 + FLASH_MB := 16 + DEVICE_PACKAGES := $(USB2_PACKAGES) $(B43_PACKAGES) +endef +TARGET_DEVICES += adb_pdg-a4101n-a-000-1a1-ae + define Device/adb_av4202n $(Device/bcm63xx) DEVICE_VENDOR := ADB @@ -559,6 +583,19 @@ define Device/d-link_dsl-274xb-f1 endef TARGET_DEVICES += d-link_dsl-274xb-f1 +define Device/d-link_dsl-2750u-c1 + $(Device/bcm63xx) + DEVICE_VENDOR := D-Link + DEVICE_MODEL := DSL-2750U + DEVICE_VARIANT := C1 + IMAGES += sysupgrade.bin + CFE_BOARD_ID := 963281TAVNG + CHIP_ID := 6328 + FLASH_MB := 8 + DEVICE_PACKAGES := $(USB2_PACKAGES) $(B43_PACKAGES) +endef +TARGET_DEVICES += d-link_dsl-2750u-c1 + define Device/d-link_dsl-275xb-d1 $(Device/bcm63xx) DEVICE_VENDOR := D-Link @@ -744,6 +781,18 @@ define Device/huawei_echolife-hg655b endef TARGET_DEVICES += huawei_echolife-hg655b +### Innacomm ### +define Device/innacomm_w3400v6 + $(Device/bcm63xx) + DEVICE_VENDOR := Innacomm + DEVICE_MODEL := W3400V6 + CFE_BOARD_ID := 96328ang + CHIP_ID := 6328 + FLASH_MB := 8 + DEVICE_PACKAGES := $(B43_PACKAGES) +endef +TARGET_DEVICES += innacomm_w3400v6 + ### Inteno ### define Device/inteno_vg50 $(Device/bcm63xx) @@ -1061,6 +1110,32 @@ define Device/t-com_speedport-w-500v endef TARGET_DEVICES += t-com_speedport-w-500v +### Technicolor ### +define Device/technicolor_tg582n + $(Device/bcm63xx) + DEVICE_VENDOR := Technicolor + DEVICE_MODEL := TG582n + IMAGES += sysupgrade.bin + CFE_BOARD_ID := DANT-1 + CHIP_ID := 6328 + FLASH_MB := 16 + DEVICE_PACKAGES := $(USB2_PACKAGES) $(B43_PACKAGES) +endef +TARGET_DEVICES += technicolor_tg582n + +define Device/technicolor_tg582n-telecom-italia + $(Device/bcm63xx) + DEVICE_VENDOR := Technicolor + DEVICE_MODEL := TG582n + DEVICE_VARIANT := Telecom Italia + IMAGES += sysupgrade.bin + CFE_BOARD_ID := DANT-V + CHIP_ID := 6328 + FLASH_MB := 16 + DEVICE_PACKAGES := $(USB2_PACKAGES) $(B43_PACKAGES) +endef +TARGET_DEVICES += technicolor_tg582n-telecom-italia + ### Tecom ### define Device/tecom_gw6000 $(Device/bcm63xx-legacy) diff --git a/target/linux/bcm63xx/image/bcm63xx_nand.mk b/target/linux/bcm63xx/image/bcm63xx_nand.mk index 713f7b353e..81c328b712 100644 --- a/target/linux/bcm63xx/image/bcm63xx_nand.mk +++ b/target/linux/bcm63xx/image/bcm63xx_nand.mk @@ -82,7 +82,7 @@ define Device/comtrend_vr-3032u endef TARGET_DEVICES += comtrend_vr-3032u -### Huawei ### +### Huawei ### define Device/huawei_hg253s-v2 $(Device/bcm63xx-nand) IMAGES := flash.bin sysupgrade.bin diff --git a/target/linux/bcm63xx/patches-5.4/512-board_bcm6328.patch b/target/linux/bcm63xx/patches-5.4/512-board_bcm6328.patch index abab912092..e28ff912cb 100644 --- a/target/linux/bcm63xx/patches-5.4/512-board_bcm6328.patch +++ b/target/linux/bcm63xx/patches-5.4/512-board_bcm6328.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -348,6 +348,482 @@ static struct board_info __initdata boar +@@ -348,6 +348,651 @@ static struct board_info __initdata boar }, }, }; @@ -438,6 +438,49 @@ + }, +}; + ++static struct board_info __initdata board_PDG_A4101N_A_000_1A1_AE = { ++ .name = "96328avngv", ++ .expected_cpu_id = 0x6328, ++ ++ .has_pci = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, ++ .num_usbh_ports = 1, ++ ++ .has_enetsw = 1, ++ .enetsw = { ++ .used_ports = { ++ [0] = { ++ .used = 1, ++ .phy_id = 1, ++ .name = "Port 1", ++ }, ++ [1] = { ++ .used = 1, ++ .phy_id = 2, ++ .name = "Port 2", ++ }, ++ [2] = { ++ .used = 1, ++ .phy_id = 3, ++ .name = "Port 3", ++ }, ++ [3] = { ++ .used = 1, ++ .phy_id = 4, ++ .name = "Port 4", ++ }, ++ }, ++ }, ++ ++ .use_fallback_sprom = 1, ++ .fallback_sprom = { ++ .type = SPROM_BCM43225, ++ .pci_bus = 1, ++ .pci_dev = 0, ++ }, ++}; ++ +static struct board_info __initdata board_R5010UNV2 = { + .name = "96328ang", + .expected_cpu_id = 0x6328, @@ -479,11 +522,137 @@ + .pci_bus = 1, + .pci_dev = 0, + }, ++}; ++ ++static struct board_info __initdata board_TG582N = { ++ .name = "DANT-1", ++ .expected_cpu_id = 0x6328, ++ ++ .has_pci = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, ++ .num_usbh_ports = 1, ++ ++ .has_enetsw = 1, ++ .enetsw = { ++ .used_ports = { ++ [0] = { ++ .used = 1, ++ .phy_id = 1, ++ .name = "Port 1", ++ }, ++ [1] = { ++ .used = 1, ++ .phy_id = 2, ++ .name = "Port 2", ++ }, ++ [2] = { ++ .used = 1, ++ .phy_id = 3, ++ .name = "Port 3", ++ }, ++ [3] = { ++ .used = 1, ++ .phy_id = 4, ++ .name = "Port 4", ++ }, ++ }, ++ }, ++ ++ .use_fallback_sprom = 1, ++ .fallback_sprom = { ++ .type = SPROM_BCM43225, ++ .pci_bus = 1, ++ .pci_dev = 0, ++ }, ++}; ++ ++static struct board_info __initdata board_TG582N_TELECOM_ITALIA = { ++ .name = "DANT-V", ++ .expected_cpu_id = 0x6328, ++ ++ .has_pci = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, ++ .num_usbh_ports = 1, ++ ++ .has_enetsw = 1, ++ .enetsw = { ++ .used_ports = { ++ [0] = { ++ .used = 1, ++ .phy_id = 1, ++ .name = "Port 1", ++ }, ++ [1] = { ++ .used = 1, ++ .phy_id = 2, ++ .name = "Port 2", ++ }, ++ [2] = { ++ .used = 1, ++ .phy_id = 3, ++ .name = "Port 3", ++ }, ++ [3] = { ++ .used = 1, ++ .phy_id = 4, ++ .name = "Port 4", ++ }, ++ }, ++ }, ++ ++ .use_fallback_sprom = 1, ++ .fallback_sprom = { ++ .type = SPROM_BCM43225, ++ .pci_bus = 1, ++ .pci_dev = 0, ++ }, ++}; ++ ++static struct board_info __initdata board_W3400V6 = { ++ .name = "96328ang", ++ .expected_cpu_id = 0x6328, ++ ++ .has_pci = 1, ++ ++ .has_enetsw = 1, ++ .enetsw = { ++ .used_ports = { ++ [0] = { ++ .used = 1, ++ .phy_id = 1, ++ .name = "Port 1", ++ }, ++ [1] = { ++ .used = 1, ++ .phy_id = 2, ++ .name = "Port 2", ++ }, ++ [2] = { ++ .used = 1, ++ .phy_id = 3, ++ .name = "Port 3", ++ }, ++ [3] = { ++ .used = 1, ++ .phy_id = 4, ++ .name = "Port 4", ++ }, ++ }, ++ }, ++ ++ .use_fallback_sprom = 1, ++ .fallback_sprom = { ++ .type = SPROM_BCM4318, ++ .pci_bus = 1, ++ .pci_dev = 0, ++ }, +}; #endif /* CONFIG_BCM63XX_CPU_6328 */ /* -@@ -703,6 +1179,16 @@ static const struct board_info __initcon +@@ -703,6 +1348,20 @@ static const struct board_info __initcon #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, @@ -496,26 +665,35 @@ + &board_dsl_274xb_f1, + &board_FAST2704V2, + &board_PDG_A4001N_A_000_1A1_AX, ++ &board_PDG_A4101N_A_000_1A1_AE, ++ &board_TG582N, ++ &board_TG582N_TELECOM_ITALIA, + &board_R5010UNV2, ++ &board_W3400V6, #endif /* CONFIG_BCM63XX_CPU_6328 */ #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, -@@ -742,7 +1228,18 @@ static struct of_device_id const bcm963x +@@ -742,7 +1401,23 @@ static struct of_device_id const bcm963x { .compatible = "sagem,fast-2704n", .data = &board_FAST2704N, }, #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 + { .compatible = "adb,a4001n", .data = &board_A4001N, }, + { .compatible = "adb,a4001n1", .data = &board_A4001N1, }, + { .compatible = "adb,pdg-a4001n-a-000-1a1-ax", .data = &board_PDG_A4001N_A_000_1A1_AX, }, ++ { .compatible = "adb,pdg-a4101n-a-000-1a1-ae", .data = &board_PDG_A4101N_A_000_1A1_AE, }, { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, + { .compatible = "brcm,bcm963281tan", .data = &board_963281TAN, }, + { .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, }, + { .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, }, + { .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, }, ++ { .compatible = "d-link,dsl-2750u-c1", .data = &board_A4001N, }, ++ { .compatible = "innacomm,w3400v6", .data = &board_W3400V6, }, + { .compatible = "nucom,r5010un-v2", .data = &board_R5010UNV2, }, + { .compatible = "sagem,fast-2704-v2", .data = &board_FAST2704V2, }, + { .compatible = "sercomm,ad1018", .data = &board_AD1018, }, + { .compatible = "sercomm,ad1018-nor", .data = &board_AD1018, }, ++ { .compatible = "technicolor,tg582n", .data = &board_TG582N, }, ++ { .compatible = "technicolor,tg582n-telecom-italia", .data = &board_TG582N_TELECOM_ITALIA, }, #endif /* CONFIG_BCM63XX_CPU_6328 */ #ifdef CONFIG_BCM63XX_CPU_6338 { .compatible = "brcm,bcm96338gw", .data = &board_96338gw, }, diff --git a/target/linux/bcm63xx/patches-5.4/513-board-bcm6338.patch b/target/linux/bcm63xx/patches-5.4/513-board-bcm6338.patch index 85c8e6c390..f3847c8140 100644 --- a/target/linux/bcm63xx/patches-5.4/513-board-bcm6338.patch +++ b/target/linux/bcm63xx/patches-5.4/513-board-bcm6338.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -857,6 +857,32 @@ static struct board_info __initdata boar +@@ -1026,6 +1026,32 @@ static struct board_info __initdata boar .force_duplex_full = 1, }, }; @@ -33,7 +33,7 @@ #endif /* CONFIG_BCM63XX_CPU_6338 */ /* -@@ -1193,6 +1219,8 @@ static const struct board_info __initcon +@@ -1366,6 +1392,8 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, &board_96338w, @@ -42,7 +42,7 @@ #endif /* CONFIG_BCM63XX_CPU_6338 */ #ifdef CONFIG_BCM63XX_CPU_6345 &board_96345gw2, -@@ -1244,6 +1272,8 @@ static struct of_device_id const bcm963x +@@ -1422,6 +1450,8 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6338 { .compatible = "brcm,bcm96338gw", .data = &board_96338gw, }, { .compatible = "brcm,bcm96338w", .data = &board_96338w, }, diff --git a/target/linux/bcm63xx/patches-5.4/514-board_bcm6345.patch b/target/linux/bcm63xx/patches-5.4/514-board_bcm6345.patch index d881555853..3f84c95385 100644 --- a/target/linux/bcm63xx/patches-5.4/514-board_bcm6345.patch +++ b/target/linux/bcm63xx/patches-5.4/514-board_bcm6345.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -893,6 +893,19 @@ static struct board_info __initdata boar +@@ -1062,6 +1062,19 @@ static struct board_info __initdata boar .name = "96345GW2", .expected_cpu_id = 0x6345, }; @@ -20,7 +20,7 @@ #endif /* CONFIG_BCM63XX_CPU_6345 */ /* -@@ -1224,6 +1237,7 @@ static const struct board_info __initcon +@@ -1397,6 +1410,7 @@ static const struct board_info __initcon #endif /* CONFIG_BCM63XX_CPU_6338 */ #ifdef CONFIG_BCM63XX_CPU_6345 &board_96345gw2, @@ -28,7 +28,7 @@ #endif /* CONFIG_BCM63XX_CPU_6345 */ #ifdef CONFIG_BCM63XX_CPU_6348 &board_96348r, -@@ -1277,6 +1291,8 @@ static struct of_device_id const bcm963x +@@ -1455,6 +1469,8 @@ static struct of_device_id const bcm963x #endif /* CONFIG_BCM63XX_CPU_6338 */ #ifdef CONFIG_BCM63XX_CPU_6345 { .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, }, diff --git a/target/linux/bcm63xx/patches-5.4/515-board-bcm6348.patch b/target/linux/bcm63xx/patches-5.4/515-board-bcm6348.patch index 1e93c5e443..891184eedd 100644 --- a/target/linux/bcm63xx/patches-5.4/515-board-bcm6348.patch +++ b/target/linux/bcm63xx/patches-5.4/515-board-bcm6348.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1092,6 +1092,275 @@ static struct board_info __initdata boar +@@ -1261,6 +1261,275 @@ static struct board_info __initdata boar .has_ohci0 = 1, }; @@ -276,7 +276,7 @@ #endif /* CONFIG_BCM63XX_CPU_6348 */ /* -@@ -1248,6 +1517,19 @@ static const struct board_info __initcon +@@ -1421,6 +1690,19 @@ static const struct board_info __initcon &board_DV201AMR, &board_96348gw_a, &board_rta1025w_16, @@ -296,7 +296,7 @@ #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 &board_96358vw, -@@ -1295,15 +1577,29 @@ static struct of_device_id const bcm963x +@@ -1473,15 +1755,29 @@ static struct of_device_id const bcm963x { .compatible = "dynalink,rta770w", .data = &board_rta770w, }, #endif /* CONFIG_BCM63XX_CPU_6345 */ #ifdef CONFIG_BCM63XX_CPU_6348 diff --git a/target/linux/bcm63xx/patches-5.4/516-board-bcm6358.patch b/target/linux/bcm63xx/patches-5.4/516-board-bcm6358.patch index 18f813b9b8..c1a4e9bbd5 100644 --- a/target/linux/bcm63xx/patches-5.4/516-board-bcm6358.patch +++ b/target/linux/bcm63xx/patches-5.4/516-board-bcm6358.patch @@ -8,7 +8,7 @@ #include #include #include -@@ -1445,6 +1446,88 @@ static struct board_info __initdata boar +@@ -1614,6 +1615,88 @@ static struct board_info __initdata boar .has_ehci0 = 1, }; @@ -97,7 +97,7 @@ static struct board_info __initdata board_DWVS0 = { .name = "DWV-S0", .expected_cpu_id = 0x6358, -@@ -1469,6 +1552,238 @@ static struct board_info __initdata boar +@@ -1638,6 +1721,238 @@ static struct board_info __initdata boar .has_ohci0 = 1, .has_ehci0 = 1, }; @@ -336,7 +336,7 @@ #endif /* CONFIG_BCM63XX_CPU_6358 */ /* -@@ -1535,7 +1850,20 @@ static const struct board_info __initcon +@@ -1708,7 +2023,20 @@ static const struct board_info __initcon &board_96358vw, &board_96358vw2, &board_AGPFS0, @@ -357,7 +357,7 @@ #endif /* CONFIG_BCM63XX_CPU_6358 */ }; -@@ -1607,11 +1935,24 @@ static struct of_device_id const bcm963x +@@ -1785,11 +2113,24 @@ static struct of_device_id const bcm963x { .compatible = "alcatel,rg100a", .data = &board_96358vw2, }, { .compatible = "brcm,bcm96358vw", .data = &board_96358vw, }, { .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, }, diff --git a/target/linux/bcm63xx/patches-5.4/517-board_bcm6362.patch b/target/linux/bcm63xx/patches-5.4/517-board_bcm6362.patch index 8e87c0cc55..71a84937a2 100644 --- a/target/linux/bcm63xx/patches-5.4/517-board_bcm6362.patch +++ b/target/linux/bcm63xx/patches-5.4/517-board_bcm6362.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1786,6 +1786,117 @@ static struct board_info __initdata boar +@@ -1955,6 +1955,117 @@ static struct board_info __initdata boar }; #endif /* CONFIG_BCM63XX_CPU_6358 */ @@ -118,7 +118,7 @@ /* * all boards */ -@@ -1865,6 +1976,12 @@ static const struct board_info __initcon +@@ -2038,6 +2149,12 @@ static const struct board_info __initcon &board_nb4_fxc_r1, &board_spw303v, #endif /* CONFIG_BCM63XX_CPU_6358 */ @@ -131,7 +131,7 @@ }; static struct of_device_id const bcm963xx_boards_dt[] = { -@@ -1955,6 +2072,10 @@ static struct of_device_id const bcm963x +@@ -2133,6 +2250,10 @@ static struct of_device_id const bcm963x { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, #endif /* CONFIG_BCM63XX_CPU_6358 */ #ifdef CONFIG_BCM63XX_CPU_6362 diff --git a/target/linux/bcm63xx/patches-5.4/518-board_bcm6368.patch b/target/linux/bcm63xx/patches-5.4/518-board_bcm6368.patch index 119e65f0f5..e200535217 100644 --- a/target/linux/bcm63xx/patches-5.4/518-board_bcm6368.patch +++ b/target/linux/bcm63xx/patches-5.4/518-board_bcm6368.patch @@ -9,7 +9,7 @@ #include #include #include -@@ -1898,6 +1900,648 @@ static struct board_info __initdata boar +@@ -2067,6 +2069,648 @@ static struct board_info __initdata boar #endif /* CONFIG_BCM63XX_CPU_6362 */ /* @@ -658,7 +658,7 @@ * all boards */ static const struct board_info __initconst *bcm963xx_boards[] = { -@@ -1982,6 +2626,22 @@ static const struct board_info __initcon +@@ -2155,6 +2799,22 @@ static const struct board_info __initcon &board_hg253s_v2, &board_nb6, #endif /* CONFIG_BCM63XX_CPU_6362 */ @@ -681,7 +681,7 @@ }; static struct of_device_id const bcm963xx_boards_dt[] = { -@@ -2078,6 +2738,20 @@ static struct of_device_id const bcm963x +@@ -2256,6 +2916,20 @@ static struct of_device_id const bcm963x { .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, }, #endif /* CONFIG_BCM63XX_CPU_6362 */ #ifdef CONFIG_BCM63XX_CPU_6368 diff --git a/target/linux/bcm63xx/patches-5.4/519-board_bcm63268.patch b/target/linux/bcm63xx/patches-5.4/519-board_bcm63268.patch index 2718bbdd36..f46cbbedc7 100644 --- a/target/linux/bcm63xx/patches-5.4/519-board_bcm63268.patch +++ b/target/linux/bcm63xx/patches-5.4/519-board_bcm63268.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2542,6 +2542,273 @@ static struct board_info __initdata boar +@@ -2711,6 +2711,273 @@ static struct board_info __initdata boar #endif /* CONFIG_BCM63XX_CPU_6368 */ /* @@ -274,7 +274,7 @@ * all boards */ static const struct board_info __initconst *bcm963xx_boards[] = { -@@ -2642,6 +2909,15 @@ static const struct board_info __initcon +@@ -2815,6 +3082,15 @@ static const struct board_info __initcon &board_VR3026e, &board_WAP5813n, #endif /* CONFIG_BCM63XX_CPU_6368 */ @@ -290,7 +290,7 @@ }; static struct of_device_id const bcm963xx_boards_dt[] = { -@@ -2754,6 +3030,14 @@ static struct of_device_id const bcm963x +@@ -2932,6 +3208,14 @@ static struct of_device_id const bcm963x { .compatible = "zyxel,p870hw-51a-v2", .data = &board_P870HW51A_V2, }, #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 diff --git a/target/linux/bcm63xx/patches-5.4/531-board_bcm6348-bt-voyager-2500v-bb.patch b/target/linux/bcm63xx/patches-5.4/531-board_bcm6348-bt-voyager-2500v-bb.patch index 750deb6da0..ec49e933d6 100644 --- a/target/linux/bcm63xx/patches-5.4/531-board_bcm6348-bt-voyager-2500v-bb.patch +++ b/target/linux/bcm63xx/patches-5.4/531-board_bcm6348-bt-voyager-2500v-bb.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -3066,6 +3066,22 @@ void __init board_bcm963xx_init(void) +@@ -3244,6 +3244,22 @@ void __init board_bcm963xx_init(void) val &= MPI_CSBASE_BASE_MASK; } boot_addr = (u8 *)KSEG1ADDR(val); diff --git a/target/linux/bcm63xx/profiles/default.mk b/target/linux/bcm63xx/profiles/default.mk index 95cd67c46e..2df9d062ff 100644 --- a/target/linux/bcm63xx/profiles/default.mk +++ b/target/linux/bcm63xx/profiles/default.mk @@ -7,7 +7,7 @@ define Profile/Default NAME:=Default Profile - PACKAGES:=kmod-b43 wpad-basic + PACKAGES:=kmod-b43 wpad-basic-wolfssl PRIORITY:=1 endef