forked from openwrt/openwrt
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
bcm53xx: backport the latest upstream DT changes
This includes: 1. BCM5301X changes from 5.14 and queued 5.15 stuff 2. NSP changes from 5.11 - 5.15 for kernel 5.10 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
- Loading branch information
Rafał Miłecki
committed
Aug 29, 2021
1 parent
505b7a2
commit bce00f4
Showing
25 changed files
with
2,324 additions
and
2 deletions.
There are no files selected for viewing
32 changes: 32 additions & 0 deletions
32
...ux/bcm53xx/patches-5.10/030-v5.11-0013-ARM-dts-NSP-Update-ethernet-switch-node-name.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
From fd66cd0d79cb836badecb91fdd19afd32afbb443 Mon Sep 17 00:00:00 2001 | ||
From: Florian Fainelli <f.fainelli@gmail.com> | ||
Date: Mon, 9 Nov 2020 12:02:08 -0800 | ||
Subject: [PATCH 13/16] ARM: dts: NSP: Update ethernet switch node name | ||
|
||
Update the switch unit name from srab to ethernet-switch, allowing us | ||
to fix warnings such as: | ||
|
||
CHECK arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dt.yaml | ||
arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dt.yaml: | ||
srab@18007000: $nodename:0: 'srab@18007000' does not match | ||
'^(ethernet-)?switch(@.*)?$' | ||
From schema: | ||
Documentation/devicetree/bindings/net/dsa/b53.yaml | ||
|
||
Reviewed-by: Vladimir Oltean <olteanv@gmail.com> | ||
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> | ||
--- | ||
arch/arm/boot/dts/bcm-nsp.dtsi | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
--- a/arch/arm/boot/dts/bcm-nsp.dtsi | ||
+++ b/arch/arm/boot/dts/bcm-nsp.dtsi | ||
@@ -385,7 +385,7 @@ | ||
clock-names = "apb_pclk"; | ||
}; | ||
|
||
- srab: srab@36000 { | ||
+ srab: ethernet-switch@36000 { | ||
compatible = "brcm,nsp-srab"; | ||
reg = <0x36000 0x1000>, | ||
<0x3f308 0x8>, |
26 changes: 26 additions & 0 deletions
26
...3xx/patches-5.10/030-v5.11-0014-ARM-dts-NSP-Fix-Ethernet-switch-SGMII-register-name.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
From 8b0235d1deace8f1bd8cdd149d698fee3974fdf4 Mon Sep 17 00:00:00 2001 | ||
From: Florian Fainelli <f.fainelli@gmail.com> | ||
Date: Mon, 9 Nov 2020 12:06:15 -0800 | ||
Subject: [PATCH 14/16] ARM: dts: NSP: Fix Ethernet switch SGMII register name | ||
|
||
The register name should be "sgmii_config", not "sgmii", this is not a | ||
functional change since no code is currently looking for that register | ||
by name (or at all). | ||
|
||
Reviewed-by: Vladimir Oltean <olteanv@gmail.com> | ||
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> | ||
--- | ||
arch/arm/boot/dts/bcm-nsp.dtsi | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
--- a/arch/arm/boot/dts/bcm-nsp.dtsi | ||
+++ b/arch/arm/boot/dts/bcm-nsp.dtsi | ||
@@ -390,7 +390,7 @@ | ||
reg = <0x36000 0x1000>, | ||
<0x3f308 0x8>, | ||
<0x3f410 0xc>; | ||
- reg-names = "srab", "mux_config", "sgmii"; | ||
+ reg-names = "srab", "mux_config", "sgmii_config"; | ||
interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>, | ||
<GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>, | ||
<GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>, |
77 changes: 77 additions & 0 deletions
77
...xx/patches-5.10/030-v5.11-0015-ARM-dts-NSP-Add-a-SRAB-compatible-string-for-each-bo.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
From 42791b317db4cda36751f57bada27857849811d3 Mon Sep 17 00:00:00 2001 | ||
From: Florian Fainelli <f.fainelli@gmail.com> | ||
Date: Mon, 9 Nov 2020 17:41:32 -0800 | ||
Subject: [PATCH 15/16] ARM: dts: NSP: Add a SRAB compatible string for each | ||
board | ||
|
||
Provide a valid compatible string for the Ethernet switch node based on | ||
the board including the switch. This allows us to have sane defaults and | ||
silences the following warnings: | ||
|
||
arch/arm/boot/dts/bcm958522er.dt.yaml: | ||
ethernet-switch@36000: compatible: 'oneOf' conditional failed, | ||
one | ||
must be fixed: | ||
['brcm,bcm5301x-srab'] is too short | ||
'brcm,bcm5325' was expected | ||
'brcm,bcm53115' was expected | ||
'brcm,bcm53125' was expected | ||
'brcm,bcm53128' was expected | ||
'brcm,bcm5365' was expected | ||
'brcm,bcm5395' was expected | ||
'brcm,bcm5389' was expected | ||
'brcm,bcm5397' was expected | ||
'brcm,bcm5398' was expected | ||
'brcm,bcm11360-srab' was expected | ||
'brcm,bcm5301x-srab' is not one of ['brcm,bcm53010-srab', | ||
'brcm,bcm53011-srab', 'brcm,bcm53012-srab', 'brcm,bcm53018-srab', | ||
'brcm,bcm53019-srab'] | ||
'brcm,bcm5301x-srab' is not one of ['brcm,bcm11404-srab', | ||
'brcm,bcm11407-srab', 'brcm,bcm11409-srab', 'brcm,bcm58310-srab', | ||
'brcm,bcm58311-srab', 'brcm,bcm58313-srab'] | ||
'brcm,bcm5301x-srab' is not one of ['brcm,bcm58522-srab', | ||
'brcm,bcm58523-srab', 'brcm,bcm58525-srab', 'brcm,bcm58622-srab', | ||
'brcm,bcm58623-srab', 'brcm,bcm58625-srab', 'brcm,bcm88312-srab'] | ||
'brcm,bcm5301x-srab' is not one of ['brcm,bcm3384-switch', | ||
'brcm,bcm6328-switch', 'brcm,bcm6368-switch'] | ||
From schema: | ||
Documentation/devicetree/bindings/net/dsa/b53.yaml | ||
|
||
Reviewed-by: Vladimir Oltean <olteanv@gmail.com> | ||
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> | ||
--- | ||
arch/arm/boot/dts/bcm958522er.dts | 4 ++++ | ||
arch/arm/boot/dts/bcm958525er.dts | 4 ++++ | ||
arch/arm/boot/dts/bcm958525xmc.dts | 4 ++++ | ||
3 files changed, 12 insertions(+) | ||
|
||
--- a/arch/arm/boot/dts/bcm958522er.dts | ||
+++ b/arch/arm/boot/dts/bcm958522er.dts | ||
@@ -178,3 +178,7 @@ | ||
&xhci { | ||
status = "okay"; | ||
}; | ||
+ | ||
+&srab { | ||
+ compatible = "brcm,bcm58522-srab", "brcm,nsp-srab"; | ||
+}; | ||
--- a/arch/arm/boot/dts/bcm958525er.dts | ||
+++ b/arch/arm/boot/dts/bcm958525er.dts | ||
@@ -190,3 +190,7 @@ | ||
&xhci { | ||
status = "okay"; | ||
}; | ||
+ | ||
+&srab { | ||
+ compatible = "brcm,bcm58525-srab", "brcm,nsp-srab"; | ||
+}; | ||
--- a/arch/arm/boot/dts/bcm958525xmc.dts | ||
+++ b/arch/arm/boot/dts/bcm958525xmc.dts | ||
@@ -210,3 +210,7 @@ | ||
&xhci { | ||
status = "okay"; | ||
}; | ||
+ | ||
+&srab { | ||
+ compatible = "brcm,bcm58525-srab", "brcm,nsp-srab"; | ||
+}; |
99 changes: 99 additions & 0 deletions
99
...m53xx/patches-5.10/030-v5.11-0016-ARM-dts-NSP-Provide-defaults-ports-container-node.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,99 @@ | ||
From 51e40c25aa18d926a8eb1c07289d01611b21123a Mon Sep 17 00:00:00 2001 | ||
From: Florian Fainelli <f.fainelli@gmail.com> | ||
Date: Mon, 9 Nov 2020 17:44:33 -0800 | ||
Subject: [PATCH 16/16] ARM: dts: NSP: Provide defaults ports container node | ||
|
||
Provide an empty 'ports' container node with the correct #address-cells | ||
and #size-cells properties. This silences the following warning: | ||
|
||
arch/arm/boot/dts/bcm958522er.dt.yaml: | ||
ethernet-switch@36000: 'oneOf' conditional failed, one must be fixed: | ||
'ports' is a required property | ||
'ethernet-ports' is a required property | ||
From schema: | ||
Documentation/devicetree/bindings/net/dsa/b53.yaml | ||
|
||
Reviewed-by: Vladimir Oltean <olteanv@gmail.com> | ||
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> | ||
--- | ||
arch/arm/boot/dts/bcm-nsp.dtsi | 4 ++++ | ||
arch/arm/boot/dts/bcm958622hr.dts | 3 --- | ||
arch/arm/boot/dts/bcm958623hr.dts | 3 --- | ||
arch/arm/boot/dts/bcm958625hr.dts | 3 --- | ||
arch/arm/boot/dts/bcm958625k.dts | 3 --- | ||
arch/arm/boot/dts/bcm988312hr.dts | 3 --- | ||
6 files changed, 4 insertions(+), 15 deletions(-) | ||
|
||
--- a/arch/arm/boot/dts/bcm-nsp.dtsi | ||
+++ b/arch/arm/boot/dts/bcm-nsp.dtsi | ||
@@ -420,6 +420,10 @@ | ||
status = "disabled"; | ||
|
||
/* ports are defined in board DTS */ | ||
+ ports { | ||
+ #address-cells = <1>; | ||
+ #size-cells = <0>; | ||
+ }; | ||
}; | ||
|
||
i2c0: i2c@38000 { | ||
--- a/arch/arm/boot/dts/bcm958622hr.dts | ||
+++ b/arch/arm/boot/dts/bcm958622hr.dts | ||
@@ -176,9 +176,6 @@ | ||
status = "okay"; | ||
|
||
ports { | ||
- #address-cells = <1>; | ||
- #size-cells = <0>; | ||
- | ||
port@0 { | ||
label = "port0"; | ||
reg = <0>; | ||
--- a/arch/arm/boot/dts/bcm958623hr.dts | ||
+++ b/arch/arm/boot/dts/bcm958623hr.dts | ||
@@ -180,9 +180,6 @@ | ||
status = "okay"; | ||
|
||
ports { | ||
- #address-cells = <1>; | ||
- #size-cells = <0>; | ||
- | ||
port@0 { | ||
label = "port0"; | ||
reg = <0>; | ||
--- a/arch/arm/boot/dts/bcm958625hr.dts | ||
+++ b/arch/arm/boot/dts/bcm958625hr.dts | ||
@@ -195,9 +195,6 @@ | ||
status = "okay"; | ||
|
||
ports { | ||
- #address-cells = <1>; | ||
- #size-cells = <0>; | ||
- | ||
port@0 { | ||
label = "port0"; | ||
reg = <0>; | ||
--- a/arch/arm/boot/dts/bcm958625k.dts | ||
+++ b/arch/arm/boot/dts/bcm958625k.dts | ||
@@ -216,9 +216,6 @@ | ||
status = "okay"; | ||
|
||
ports { | ||
- #address-cells = <1>; | ||
- #size-cells = <0>; | ||
- | ||
port@0 { | ||
label = "port0"; | ||
reg = <0>; | ||
--- a/arch/arm/boot/dts/bcm988312hr.dts | ||
+++ b/arch/arm/boot/dts/bcm988312hr.dts | ||
@@ -184,9 +184,6 @@ | ||
status = "okay"; | ||
|
||
ports { | ||
- #address-cells = <1>; | ||
- #size-cells = <0>; | ||
- | ||
port@0 { | ||
label = "port0"; | ||
reg = <0>; |
77 changes: 77 additions & 0 deletions
77
target/linux/bcm53xx/patches-5.10/032-v5.14-0001-ARM-dts-BCM5301X-Fix-NAND-nodes-names.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
From b660269cba748dfd07eb5551a88ff34d5ea0b86e Mon Sep 17 00:00:00 2001 | ||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl> | ||
Date: Fri, 16 Apr 2021 15:37:48 +0200 | ||
Subject: [PATCH] ARM: dts: BCM5301X: Fix NAND nodes names | ||
MIME-Version: 1.0 | ||
Content-Type: text/plain; charset=UTF-8 | ||
Content-Transfer-Encoding: 8bit | ||
|
||
This matches nand-controller.yaml requirements. | ||
|
||
Signed-off-by: Rafał Miłecki <rafal@milecki.pl> | ||
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> | ||
--- | ||
|
||
--- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | ||
+++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | ||
@@ -24,8 +24,8 @@ | ||
reg = <0x00000000 0x08000000>; | ||
}; | ||
|
||
- nand: nand@18028000 { | ||
- nandcs@0 { | ||
+ nand_controller: nand-controller@18028000 { | ||
+ nand@0 { | ||
partitions { | ||
compatible = "fixed-partitions"; | ||
#address-cells = <1>; | ||
--- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | ||
+++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | ||
@@ -25,8 +25,8 @@ | ||
<0x88000000 0x08000000>; | ||
}; | ||
|
||
- nand: nand@18028000 { | ||
- nandcs@0 { | ||
+ nand_controller: nand-controller@18028000 { | ||
+ nand@0 { | ||
partitions { | ||
compatible = "fixed-partitions"; | ||
#address-cells = <1>; | ||
--- a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi | ||
+++ b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi | ||
@@ -6,8 +6,8 @@ | ||
*/ | ||
|
||
/ { | ||
- nand@18028000 { | ||
- nandcs: nandcs@0 { | ||
+ nand-controller@18028000 { | ||
+ nandcs: nand@0 { | ||
compatible = "brcm,nandcs"; | ||
reg = <0>; | ||
#address-cells = <1>; | ||
--- a/arch/arm/boot/dts/bcm5301x.dtsi | ||
+++ b/arch/arm/boot/dts/bcm5301x.dtsi | ||
@@ -500,7 +500,7 @@ | ||
reg = <0x18004000 0x14>; | ||
}; | ||
|
||
- nand: nand@18028000 { | ||
+ nand_controller: nand-controller@18028000 { | ||
compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1", "brcm,brcmnand"; | ||
reg = <0x18028000 0x600>, <0x1811a408 0x600>, <0x18028f00 0x20>; | ||
reg-names = "nand", "iproc-idm", "iproc-ext"; | ||
--- a/arch/arm/boot/dts/bcm953012k.dts | ||
+++ b/arch/arm/boot/dts/bcm953012k.dts | ||
@@ -49,8 +49,8 @@ | ||
}; | ||
}; | ||
|
||
-&nand { | ||
- nandcs@0 { | ||
+&nand_controller { | ||
+ nand@0 { | ||
compatible = "brcm,nandcs"; | ||
reg = <0>; | ||
nand-on-flash-bbt; |
52 changes: 52 additions & 0 deletions
52
...inux/bcm53xx/patches-5.10/032-v5.14-0002-ARM-dts-BCM5301X-Fix-pinmux-subnodes-names.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
From bb95d7d440fefd104c593d9cb20da6d34a474e97 Mon Sep 17 00:00:00 2001 | ||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl> | ||
Date: Wed, 21 Apr 2021 11:00:06 +0200 | ||
Subject: [PATCH] ARM: dts: BCM5301X: Fix pinmux subnodes names | ||
MIME-Version: 1.0 | ||
Content-Type: text/plain; charset=UTF-8 | ||
Content-Transfer-Encoding: 8bit | ||
|
||
This matches pinmux-node.yaml requirements. | ||
|
||
Signed-off-by: Rafał Miłecki <rafal@milecki.pl> | ||
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> | ||
--- | ||
arch/arm/boot/dts/bcm47094.dtsi | 2 +- | ||
arch/arm/boot/dts/bcm5301x.dtsi | 6 +++--- | ||
2 files changed, 4 insertions(+), 4 deletions(-) | ||
|
||
--- a/arch/arm/boot/dts/bcm47094.dtsi | ||
+++ b/arch/arm/boot/dts/bcm47094.dtsi | ||
@@ -11,7 +11,7 @@ | ||
&pinctrl { | ||
compatible = "brcm,bcm4709-pinmux"; | ||
|
||
- pinmux_mdio: mdio { | ||
+ pinmux_mdio: mdio-pins { | ||
groups = "mdio_grp"; | ||
function = "mdio"; | ||
}; | ||
--- a/arch/arm/boot/dts/bcm5301x.dtsi | ||
+++ b/arch/arm/boot/dts/bcm5301x.dtsi | ||
@@ -438,18 +438,18 @@ | ||
function = "spi"; | ||
}; | ||
|
||
- pinmux_i2c: i2c { | ||
+ pinmux_i2c: i2c-pins { | ||
groups = "i2c_grp"; | ||
function = "i2c"; | ||
}; | ||
|
||
- pinmux_pwm: pwm { | ||
+ pinmux_pwm: pwm-pins { | ||
groups = "pwm0_grp", "pwm1_grp", | ||
"pwm2_grp", "pwm3_grp"; | ||
function = "pwm"; | ||
}; | ||
|
||
- pinmux_uart1: uart1 { | ||
+ pinmux_uart1: uart1-pins { | ||
groups = "uart1_grp"; | ||
function = "uart1"; | ||
}; |
Oops, something went wrong.