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.
bcm4908: backport upstream DT commits
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
- Loading branch information
Rafał Miłecki
committed
Nov 18, 2021
1 parent
5901917
commit d745835
Showing
14 changed files
with
468 additions
and
16 deletions.
There are no files selected for viewing
25 changes: 25 additions & 0 deletions
25
target/linux/bcm4908/patches-5.10/033-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,25 @@ | ||
| 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/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi | ||
| +++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi | ||
| @@ -306,7 +306,7 @@ | ||
| interrupt-names = "nand"; | ||
| status = "okay"; | ||
|
|
||
| - nandcs: nandcs@0 { | ||
| + nandcs: nand@0 { | ||
| compatible = "brcm,nandcs"; | ||
| reg = <0>; | ||
| }; |
27 changes: 27 additions & 0 deletions
27
...x/bcm4908/patches-5.10/034-v5.16-0001-arm64-dts-broadcom-bcm4908-Fix-NAND-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,27 @@ | ||
| From d0ae9c944b9472c5691a482297df7a57d7fd1199 Mon Sep 17 00:00:00 2001 | ||
| From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl> | ||
| Date: Thu, 19 Aug 2021 14:11:08 +0200 | ||
| Subject: [PATCH] arm64: dts: broadcom: bcm4908: Fix NAND node name | ||
| 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> | ||
| --- | ||
| arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| --- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi | ||
| +++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi | ||
| @@ -296,7 +296,7 @@ | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| - nand@1800 { | ||
| + nand-controller@1800 { | ||
| #address-cells = <1>; | ||
| #size-cells = <0>; | ||
| compatible = "brcm,nand-bcm63138", "brcm,brcmnand-v7.1", "brcm,brcmnand"; |
38 changes: 38 additions & 0 deletions
38
...08/patches-5.10/034-v5.16-0002-arm64-dts-broadcom-bcm4908-Move-reboot-syscon-out-of.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,38 @@ | ||
| From 6cf9f70255b90b540b9cbde062f18fea29024a75 Mon Sep 17 00:00:00 2001 | ||
| From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl> | ||
| Date: Thu, 19 Aug 2021 14:26:06 +0200 | ||
| Subject: [PATCH] arm64: dts: broadcom: bcm4908: Move reboot syscon out of bus | ||
| MIME-Version: 1.0 | ||
| Content-Type: text/plain; charset=UTF-8 | ||
| Content-Transfer-Encoding: 8bit | ||
|
|
||
| This fixes following error for every bcm4908 DTS file: | ||
| bus@ff800000: reboot: {'type': 'object'} is not allowed for {'compatible': ['syscon-reboot'], 'regmap': [[15]], 'offset': [[52]], 'mask': [[1]]} | ||
|
|
||
| Signed-off-by: Rafał Miłecki <rafal@milecki.pl> | ||
| Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> | ||
| --- | ||
| arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi | 12 ++++++------ | ||
| 1 file changed, 6 insertions(+), 6 deletions(-) | ||
|
|
||
| --- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi | ||
| +++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi | ||
| @@ -326,12 +326,12 @@ | ||
| #reset-cells = <1>; | ||
| }; | ||
| }; | ||
| + }; | ||
|
|
||
| - reboot { | ||
| - compatible = "syscon-reboot"; | ||
| - regmap = <&timer>; | ||
| - offset = <0x34>; | ||
| - mask = <1>; | ||
| - }; | ||
| + reboot { | ||
| + compatible = "syscon-reboot"; | ||
| + regmap = <&timer>; | ||
| + offset = <0x34>; | ||
| + mask = <1>; | ||
| }; | ||
| }; |
28 changes: 28 additions & 0 deletions
28
.../bcm4908/patches-5.10/034-v5.16-0003-arm64-dts-broadcom-bcm4908-Fix-UART-clock-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,28 @@ | ||
| From 6c38c39ab2141f53786d73e706675e8819a3f2cb Mon Sep 17 00:00:00 2001 | ||
| From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl> | ||
| Date: Thu, 19 Aug 2021 17:37:02 +0200 | ||
| Subject: [PATCH] arm64: dts: broadcom: bcm4908: Fix UART clock name | ||
| MIME-Version: 1.0 | ||
| Content-Type: text/plain; charset=UTF-8 | ||
| Content-Transfer-Encoding: 8bit | ||
|
|
||
| According to the binding the correct clock name is "refclk". | ||
|
|
||
| Fixes: 2961f69f151c ("arm64: dts: broadcom: add BCM4908 and Asus GT-AC5300 early DTS files") | ||
| Signed-off-by: Rafał Miłecki <rafal@milecki.pl> | ||
| Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> | ||
| --- | ||
| arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| --- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi | ||
| +++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi | ||
| @@ -292,7 +292,7 @@ | ||
| reg = <0x640 0x18>; | ||
| interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; | ||
| clocks = <&periph_clk>; | ||
| - clock-names = "periph"; | ||
| + clock-names = "refclk"; | ||
| status = "okay"; | ||
| }; | ||
|
|
27 changes: 27 additions & 0 deletions
27
...08/patches-5.10/035-v5.17-0001-dt-bindings-arm-bcm-document-Netgear-RAXE500-binding.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,27 @@ | ||
| From 7b0c9ca7f18e8d2e2cf3c342d91f037d436777bf Mon Sep 17 00:00:00 2001 | ||
| From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl> | ||
| Date: Fri, 5 Nov 2021 11:14:12 +0100 | ||
| Subject: [PATCH] dt-bindings: arm: bcm: document Netgear RAXE500 binding | ||
| MIME-Version: 1.0 | ||
| Content-Type: text/plain; charset=UTF-8 | ||
| Content-Transfer-Encoding: 8bit | ||
|
|
||
| One more BCM4908 based device. | ||
|
|
||
| Signed-off-by: Rafał Miłecki <rafal@milecki.pl> | ||
| Acked-by: Rob Herring <robh@kernel.org> | ||
| Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> | ||
| --- | ||
| Documentation/devicetree/bindings/arm/bcm/brcm,bcm4908.yaml | 1 + | ||
| 1 file changed, 1 insertion(+) | ||
|
|
||
| --- a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm4908.yaml | ||
| +++ b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm4908.yaml | ||
| @@ -29,6 +29,7 @@ properties: | ||
| items: | ||
| - enum: | ||
| - asus,gt-ac5300 | ||
| + - netgear,raxe500 | ||
| - const: brcm,bcm4908 | ||
|
|
||
| - description: BCM49408 based boards |
81 changes: 81 additions & 0 deletions
81
...08/patches-5.10/035-v5.17-0002-arm64-dts-broadcom-bcm4908-add-DT-for-Netgear-RAXE50.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,81 @@ | ||
| From d0e68d354f345873e15876a7b35be1baaf5e3ec9 Mon Sep 17 00:00:00 2001 | ||
| From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl> | ||
| Date: Fri, 5 Nov 2021 11:14:13 +0100 | ||
| Subject: [PATCH] arm64: dts: broadcom: bcm4908: add DT for Netgear RAXE500 | ||
| MIME-Version: 1.0 | ||
| Content-Type: text/plain; charset=UTF-8 | ||
| Content-Transfer-Encoding: 8bit | ||
|
|
||
| It's a home router based on BCM4908 SoC. It has: 1 GiB of RAM, 512 MiB | ||
| NAND flash, 6 Ethernet ports and 3 x BCM43684 (WiFi). One of Ethernet | ||
| ports is "2.5 G Multi-Gig port" that isn't described yet (it isn't known | ||
| how it's wired up). | ||
|
|
||
| Signed-off-by: Rafał Miłecki <rafal@milecki.pl> | ||
| Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> | ||
| --- | ||
| arch/arm64/boot/dts/broadcom/bcm4908/Makefile | 1 + | ||
| .../bcm4908/bcm4908-netgear-raxe500.dts | 50 +++++++++++++++++++ | ||
| 2 files changed, 51 insertions(+) | ||
| create mode 100644 arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-netgear-raxe500.dts | ||
|
|
||
| --- a/arch/arm64/boot/dts/broadcom/bcm4908/Makefile | ||
| +++ b/arch/arm64/boot/dts/broadcom/bcm4908/Makefile | ||
| @@ -2,3 +2,4 @@ | ||
| dtb-$(CONFIG_ARCH_BCM4908) += bcm4906-netgear-r8000p.dtb | ||
| dtb-$(CONFIG_ARCH_BCM4908) += bcm4906-tplink-archer-c2300-v1.dtb | ||
| dtb-$(CONFIG_ARCH_BCM4908) += bcm4908-asus-gt-ac5300.dtb | ||
| +dtb-$(CONFIG_ARCH_BCM4908) += bcm4908-netgear-raxe500.dtb | ||
| --- /dev/null | ||
| +++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-netgear-raxe500.dts | ||
| @@ -0,0 +1,50 @@ | ||
| +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT | ||
| + | ||
| +#include "bcm4908.dtsi" | ||
| + | ||
| +/ { | ||
| + compatible = "netgear,raxe500", "brcm,bcm4908"; | ||
| + model = "Netgear RAXE500"; | ||
| + | ||
| + memory@0 { | ||
| + device_type = "memory"; | ||
| + reg = <0x00 0x00 0x00 0x40000000>; | ||
| + }; | ||
| +}; | ||
| + | ||
| +&ehci { | ||
| + status = "okay"; | ||
| +}; | ||
| + | ||
| +&ohci { | ||
| + status = "okay"; | ||
| +}; | ||
| + | ||
| +&xhci { | ||
| + status = "okay"; | ||
| +}; | ||
| + | ||
| +&ports { | ||
| + port@0 { | ||
| + label = "lan4"; | ||
| + }; | ||
| + | ||
| + port@1 { | ||
| + label = "lan3"; | ||
| + }; | ||
| + | ||
| + port@2 { | ||
| + label = "lan2"; | ||
| + }; | ||
| + | ||
| + port@3 { | ||
| + label = "lan1"; | ||
| + }; | ||
| + | ||
| + port@7 { | ||
| + reg = <7>; | ||
| + phy-mode = "internal"; | ||
| + phy-handle = <&phy12>; | ||
| + label = "wan"; | ||
| + }; | ||
| +}; |
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
25 changes: 25 additions & 0 deletions
25
target/linux/bcm4908/patches-5.4/033-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,25 @@ | ||
| 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/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi | ||
| +++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi | ||
| @@ -306,7 +306,7 @@ | ||
| interrupt-names = "nand"; | ||
| status = "okay"; | ||
|
|
||
| - nandcs: nandcs@0 { | ||
| + nandcs: nand@0 { | ||
| compatible = "brcm,nandcs"; | ||
| reg = <0>; | ||
| }; |
27 changes: 27 additions & 0 deletions
27
...ux/bcm4908/patches-5.4/034-v5.16-0001-arm64-dts-broadcom-bcm4908-Fix-NAND-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,27 @@ | ||
| From d0ae9c944b9472c5691a482297df7a57d7fd1199 Mon Sep 17 00:00:00 2001 | ||
| From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl> | ||
| Date: Thu, 19 Aug 2021 14:11:08 +0200 | ||
| Subject: [PATCH] arm64: dts: broadcom: bcm4908: Fix NAND node name | ||
| 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> | ||
| --- | ||
| arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| --- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi | ||
| +++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi | ||
| @@ -296,7 +296,7 @@ | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| - nand@1800 { | ||
| + nand-controller@1800 { | ||
| #address-cells = <1>; | ||
| #size-cells = <0>; | ||
| compatible = "brcm,nand-bcm63138", "brcm,brcmnand-v7.1", "brcm,brcmnand"; |
38 changes: 38 additions & 0 deletions
38
...908/patches-5.4/034-v5.16-0002-arm64-dts-broadcom-bcm4908-Move-reboot-syscon-out-of.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,38 @@ | ||
| From 6cf9f70255b90b540b9cbde062f18fea29024a75 Mon Sep 17 00:00:00 2001 | ||
| From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl> | ||
| Date: Thu, 19 Aug 2021 14:26:06 +0200 | ||
| Subject: [PATCH] arm64: dts: broadcom: bcm4908: Move reboot syscon out of bus | ||
| MIME-Version: 1.0 | ||
| Content-Type: text/plain; charset=UTF-8 | ||
| Content-Transfer-Encoding: 8bit | ||
|
|
||
| This fixes following error for every bcm4908 DTS file: | ||
| bus@ff800000: reboot: {'type': 'object'} is not allowed for {'compatible': ['syscon-reboot'], 'regmap': [[15]], 'offset': [[52]], 'mask': [[1]]} | ||
|
|
||
| Signed-off-by: Rafał Miłecki <rafal@milecki.pl> | ||
| Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> | ||
| --- | ||
| arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi | 12 ++++++------ | ||
| 1 file changed, 6 insertions(+), 6 deletions(-) | ||
|
|
||
| --- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi | ||
| +++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi | ||
| @@ -326,12 +326,12 @@ | ||
| #reset-cells = <1>; | ||
| }; | ||
| }; | ||
| + }; | ||
|
|
||
| - reboot { | ||
| - compatible = "syscon-reboot"; | ||
| - regmap = <&timer>; | ||
| - offset = <0x34>; | ||
| - mask = <1>; | ||
| - }; | ||
| + reboot { | ||
| + compatible = "syscon-reboot"; | ||
| + regmap = <&timer>; | ||
| + offset = <0x34>; | ||
| + mask = <1>; | ||
| }; | ||
| }; |
28 changes: 28 additions & 0 deletions
28
...x/bcm4908/patches-5.4/034-v5.16-0003-arm64-dts-broadcom-bcm4908-Fix-UART-clock-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,28 @@ | ||
| From 6c38c39ab2141f53786d73e706675e8819a3f2cb Mon Sep 17 00:00:00 2001 | ||
| From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl> | ||
| Date: Thu, 19 Aug 2021 17:37:02 +0200 | ||
| Subject: [PATCH] arm64: dts: broadcom: bcm4908: Fix UART clock name | ||
| MIME-Version: 1.0 | ||
| Content-Type: text/plain; charset=UTF-8 | ||
| Content-Transfer-Encoding: 8bit | ||
|
|
||
| According to the binding the correct clock name is "refclk". | ||
|
|
||
| Fixes: 2961f69f151c ("arm64: dts: broadcom: add BCM4908 and Asus GT-AC5300 early DTS files") | ||
| Signed-off-by: Rafał Miłecki <rafal@milecki.pl> | ||
| Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> | ||
| --- | ||
| arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| --- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi | ||
| +++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi | ||
| @@ -292,7 +292,7 @@ | ||
| reg = <0x640 0x18>; | ||
| interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; | ||
| clocks = <&periph_clk>; | ||
| - clock-names = "periph"; | ||
| + clock-names = "refclk"; | ||
| status = "okay"; | ||
| }; | ||
|
|
Oops, something went wrong.