forked from openwrt/openwrt
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
bcm53xx: backport DT changes queued for v6.6
Signed-off-by: Rafał Miłecki <rafal@milecki.pl> (cherry picked from commit 37ff916)
- Loading branch information
Rafał Miłecki
committed
Jul 14, 2023
1 parent
e3d0c70
commit a7867e0
Showing
10 changed files
with
474 additions
and
1 deletion.
There are no files selected for viewing
37 changes: 37 additions & 0 deletions
37
.../linux/bcm53xx/patches-5.10/040-v6.6-0001-ARM-dts-broadcom-add-missing-space-before.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,37 @@ | ||
| From 4b8e16de053fc88eac406ad63da2693dd8279043 Mon Sep 17 00:00:00 2001 | ||
| From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> | ||
| Date: Wed, 5 Jul 2023 17:01:07 +0200 | ||
| Subject: [PATCH] ARM: dts: broadcom: add missing space before { | ||
|
|
||
| Add missing whitespace between node name/label and opening {. | ||
|
|
||
| Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> | ||
| Link: https://lore.kernel.org/r/20230705150108.293999-1-krzysztof.kozlowski@linaro.org | ||
| Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com> | ||
| --- | ||
| arch/arm/boot/dts/broadcom/bcm47094-linksys-panamera.dts | 2 +- | ||
| arch/arm/boot/dts/broadcom/bcm47094-phicomm-k3.dts | 2 +- | ||
| 2 files changed, 2 insertions(+), 2 deletions(-) | ||
|
|
||
| --- a/arch/arm/boot/dts/bcm47094-linksys-panamera.dts | ||
| +++ b/arch/arm/boot/dts/bcm47094-linksys-panamera.dts | ||
| @@ -279,7 +279,7 @@ | ||
| reg = <0x080000 0x0100000>; | ||
| }; | ||
|
|
||
| - partition@180000{ | ||
| + partition@180000 { | ||
| label = "devinfo"; | ||
| reg = <0x0180000 0x080000>; | ||
| }; | ||
| --- a/arch/arm/boot/dts/bcm47094-phicomm-k3.dts | ||
| +++ b/arch/arm/boot/dts/bcm47094-phicomm-k3.dts | ||
| @@ -55,7 +55,7 @@ | ||
| reg = <0x0080000 0x0100000>; | ||
| }; | ||
|
|
||
| - partition@180000{ | ||
| + partition@180000 { | ||
| label = "phicomm"; | ||
| reg = <0x0180000 0x0280000>; | ||
| read-only; |
107 changes: 107 additions & 0 deletions
107
...3xx/patches-5.10/040-v6.6-0002-ARM-dts-BCM5301X-Add-Wi-Fi-regulatory-mappings-for-L.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,107 @@ | ||
| From 8960f095de3b80beb3639075f0c8161b6ea98c61 Mon Sep 17 00:00:00 2001 | ||
| From: Dan Haab <dan.haab@luxul.com> | ||
| Date: Wed, 5 Jul 2023 09:32:51 -0600 | ||
| Subject: [PATCH] ARM: dts: BCM5301X: Add Wi-Fi regulatory mappings for Luxul | ||
| devices | ||
|
|
||
| This allows setting FullMAC firmware regulatory domain. | ||
|
|
||
| Signed-off-by: Dan Haab <dan.haab@luxul.com> | ||
| Link: https://lore.kernel.org/r/20230705153251.739236-1-riproute@gmail.com | ||
| Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com> | ||
| --- | ||
| .../dts/broadcom/bcm47094-luxul-xap-1610.dts | 37 +++++++++++++++++++ | ||
| .../broadcom/bcm47094-luxul-xwr-3150-v1.dts | 36 ++++++++++++++++++ | ||
| 2 files changed, 73 insertions(+) | ||
|
|
||
| --- a/arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts | ||
| +++ b/arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts | ||
| @@ -64,6 +64,43 @@ | ||
| nvmem-cell-names = "mac-address"; | ||
| }; | ||
|
|
||
| + | ||
| +&pcie0 { | ||
| + #address-cells = <3>; | ||
| + #size-cells = <2>; | ||
| + | ||
| + bridge@0,0 { | ||
| + reg = <0x0000 0 0 0 0>; | ||
| + | ||
| + #address-cells = <3>; | ||
| + #size-cells = <2>; | ||
| + | ||
| + wifi@0,0 { | ||
| + compatible = "brcm,bcm4366-fmac", "brcm,bcm4329-fmac"; | ||
| + reg = <0x0000 0 0 0 0>; | ||
| + brcm,ccode-map = "AU-AU-920", "CA-CA-892", "GB-DE-964", "NZ-AU-920", "US-US-825"; | ||
| + }; | ||
| + }; | ||
| +}; | ||
| + | ||
| +&pcie1 { | ||
| + #address-cells = <3>; | ||
| + #size-cells = <2>; | ||
| + | ||
| + bridge@0,0 { | ||
| + reg = <0x0000 0 0 0 0>; | ||
| + | ||
| + #address-cells = <3>; | ||
| + #size-cells = <2>; | ||
| + | ||
| + wifi@0,0 { | ||
| + compatible = "brcm,bcm4366-fmac", "brcm,bcm4329-fmac"; | ||
| + reg = <0x0000 0 0 0 0>; | ||
| + brcm,ccode-map = "AU-AU-920", "CA-CA-892", "GB-DE-964", "NZ-AU-920", "US-US-825"; | ||
| + }; | ||
| + }; | ||
| +}; | ||
| + | ||
| &spi_nor { | ||
| status = "okay"; | ||
| }; | ||
| --- a/arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts | ||
| +++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts | ||
| @@ -81,6 +81,42 @@ | ||
| nvmem-cell-names = "mac-address"; | ||
| }; | ||
|
|
||
| +&pcie0 { | ||
| + #address-cells = <3>; | ||
| + #size-cells = <2>; | ||
| + | ||
| + bridge@0,0 { | ||
| + reg = <0x0000 0 0 0 0>; | ||
| + | ||
| + #address-cells = <3>; | ||
| + #size-cells = <2>; | ||
| + | ||
| + wifi@0,0 { | ||
| + compatible = "brcm,bcm4366-fmac", "brcm,bcm4329-fmac"; | ||
| + reg = <0x0000 0 0 0 0>; | ||
| + brcm,ccode-map = "AU-AU-953", "CA-CA-946", "GB-E0-846", "NZ-AU-953", "US-Q2-930"; | ||
| + }; | ||
| + }; | ||
| +}; | ||
| + | ||
| +&pcie1 { | ||
| + #address-cells = <3>; | ||
| + #size-cells = <2>; | ||
| + | ||
| + bridge@0,0 { | ||
| + reg = <0x0000 0 0 0 0>; | ||
| + | ||
| + #address-cells = <3>; | ||
| + #size-cells = <2>; | ||
| + | ||
| + wifi@0,0 { | ||
| + compatible = "brcm,bcm4366-fmac", "brcm,bcm4329-fmac"; | ||
| + reg = <0x0000 0 0 0 0>; | ||
| + brcm,ccode-map = "AU-AU-953", "CA-CA-946", "GB-E0-846", "NZ-AU-953", "US-Q2-930"; | ||
| + }; | ||
| + }; | ||
| +}; | ||
| + | ||
| &usb3 { | ||
| vcc-gpio = <&chipcommon 18 GPIO_ACTIVE_HIGH>; | ||
| }; |
53 changes: 53 additions & 0 deletions
53
...x/bcm53xx/patches-5.10/040-v6.6-0003-ARM-dts-BCM5301X-Add-Ethernet-interfaces-links.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,53 @@ | ||
| From 2ce61fa62183cf994666fcc911da34075c7183b5 Mon Sep 17 00:00:00 2001 | ||
| From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl> | ||
| Date: Fri, 7 Jul 2023 11:15:19 +0200 | ||
| Subject: [PATCH] ARM: dts: BCM5301X: Add Ethernet interfaces links | ||
| MIME-Version: 1.0 | ||
| Content-Type: text/plain; charset=UTF-8 | ||
| Content-Transfer-Encoding: 8bit | ||
|
|
||
| Northstar SoCs have 3 usable Ethernet interfaces each connected to one | ||
| of switch ports. They all use fixed links. | ||
|
|
||
| Signed-off-by: Rafał Miłecki <rafal@milecki.pl> | ||
| Link: https://lore.kernel.org/r/20230707091519.21673-1-zajec5@gmail.com | ||
| Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com> | ||
| --- | ||
| arch/arm/boot/dts/broadcom/bcm-ns.dtsi | 18 ++++++++++++++++++ | ||
| 1 file changed, 18 insertions(+) | ||
|
|
||
| --- a/arch/arm/boot/dts/bcm-ns.dtsi | ||
| +++ b/arch/arm/boot/dts/bcm-ns.dtsi | ||
| @@ -272,14 +272,32 @@ | ||
|
|
||
| gmac0: ethernet@24000 { | ||
| reg = <0x24000 0x800>; | ||
| + phy-mode = "internal"; | ||
| + | ||
| + fixed-link { | ||
| + speed = <1000>; | ||
| + full-duplex; | ||
| + }; | ||
| }; | ||
|
|
||
| gmac1: ethernet@25000 { | ||
| reg = <0x25000 0x800>; | ||
| + phy-mode = "internal"; | ||
| + | ||
| + fixed-link { | ||
| + speed = <1000>; | ||
| + full-duplex; | ||
| + }; | ||
| }; | ||
|
|
||
| gmac2: ethernet@26000 { | ||
| reg = <0x26000 0x800>; | ||
| + phy-mode = "internal"; | ||
| + | ||
| + fixed-link { | ||
| + speed = <1000>; | ||
| + full-duplex; | ||
| + }; | ||
| }; | ||
|
|
||
| gmac3: ethernet@27000 { |
57 changes: 57 additions & 0 deletions
57
...3xx/patches-5.10/040-v6.6-0004-ARM-dts-BCM53573-Drop-nonexistent-default-off-LED-tr.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,57 @@ | ||
| From be7e1e5b0f67c58ec4be0a54db23b6a4fa6e2116 Mon Sep 17 00:00:00 2001 | ||
| From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl> | ||
| Date: Fri, 7 Jul 2023 13:40:01 +0200 | ||
| Subject: [PATCH] ARM: dts: BCM53573: Drop nonexistent "default-off" LED | ||
| trigger | ||
| MIME-Version: 1.0 | ||
| Content-Type: text/plain; charset=UTF-8 | ||
| Content-Transfer-Encoding: 8bit | ||
|
|
||
| There is no such trigger documented or implemented in Linux. It was a | ||
| copy & paste mistake. | ||
|
|
||
| This fixes: | ||
| arch/arm/boot/dts/broadcom/bcm47189-luxul-xap-1440.dtb: leds: led-wlan:linux,default-trigger: 'oneOf' conditional failed, one must be fixed: | ||
| 'default-off' is not one of ['backlight', 'default-on', 'heartbeat', 'disk-activity', 'disk-read', 'disk-write', 'timer', 'pattern', 'audio-micmute', 'audio-mute', 'bluetooth-power', 'flash', 'kbd-capslock', 'mtd', 'nand-disk', 'none', 'torch', 'usb-gadget', 'usb-host', 'usbport'] | ||
| 'default-off' does not match '^cpu[0-9]*$' | ||
| 'default-off' does not match '^hci[0-9]+-power$' | ||
| 'default-off' does not match '^mmc[0-9]+$' | ||
| 'default-off' does not match '^phy[0-9]+tx$' | ||
| From schema: Documentation/devicetree/bindings/leds/leds-gpio.yaml | ||
|
|
||
| Signed-off-by: Rafał Miłecki <rafal@milecki.pl> | ||
| Link: https://lore.kernel.org/r/20230707114004.2740-1-zajec5@gmail.com | ||
| Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com> | ||
| --- | ||
| arch/arm/boot/dts/broadcom/bcm47189-luxul-xap-1440.dts | 1 - | ||
| arch/arm/boot/dts/broadcom/bcm47189-luxul-xap-810.dts | 2 -- | ||
| 2 files changed, 3 deletions(-) | ||
|
|
||
| --- a/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts | ||
| +++ b/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts | ||
| @@ -26,7 +26,6 @@ | ||
| led-wlan { | ||
| label = "bcm53xx:blue:wlan"; | ||
| gpios = <&chipcommon 10 GPIO_ACTIVE_LOW>; | ||
| - linux,default-trigger = "default-off"; | ||
| }; | ||
|
|
||
| led-system { | ||
| --- a/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts | ||
| +++ b/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts | ||
| @@ -26,7 +26,6 @@ | ||
| led-5ghz { | ||
| label = "bcm53xx:blue:5ghz"; | ||
| gpios = <&chipcommon 11 GPIO_ACTIVE_HIGH>; | ||
| - linux,default-trigger = "default-off"; | ||
| }; | ||
|
|
||
| led-system { | ||
| @@ -42,7 +41,6 @@ | ||
| led-2ghz { | ||
| label = "bcm53xx:blue:2ghz"; | ||
| gpios = <&pcie0_chipcommon 3 GPIO_ACTIVE_HIGH>; | ||
| - linux,default-trigger = "default-off"; | ||
| }; | ||
| }; | ||
|
|
32 changes: 32 additions & 0 deletions
32
...inux/bcm53xx/patches-5.10/040-v6.6-0005-ARM-dts-BCM53573-Drop-nonexistent-usb-cells.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 05d2c3d552b8c92fc397377d9d1112fc58e2cd59 Mon Sep 17 00:00:00 2001 | ||
| From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl> | ||
| Date: Fri, 7 Jul 2023 13:40:02 +0200 | ||
| Subject: [PATCH] ARM: dts: BCM53573: Drop nonexistent #usb-cells | ||
| MIME-Version: 1.0 | ||
| Content-Type: text/plain; charset=UTF-8 | ||
| Content-Transfer-Encoding: 8bit | ||
|
|
||
| Such property simply doesn't exist (is not documented or used anywhere). | ||
|
|
||
| This fixes: | ||
| arch/arm/boot/dts/broadcom/bcm47189-luxul-xap-1440.dtb: usb@d000: Unevaluated properties are not allowed ('#usb-cells' was unexpected) | ||
| From schema: Documentation/devicetree/bindings/usb/generic-ohci.yaml | ||
|
|
||
| Signed-off-by: Rafał Miłecki <rafal@milecki.pl> | ||
| Link: https://lore.kernel.org/r/20230707114004.2740-2-zajec5@gmail.com | ||
| Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com> | ||
| --- | ||
| arch/arm/boot/dts/broadcom/bcm53573.dtsi | 2 -- | ||
| 1 file changed, 2 deletions(-) | ||
|
|
||
| --- a/arch/arm/boot/dts/bcm53573.dtsi | ||
| +++ b/arch/arm/boot/dts/bcm53573.dtsi | ||
| @@ -156,8 +156,6 @@ | ||
| }; | ||
|
|
||
| ohci: usb@d000 { | ||
| - #usb-cells = <0>; | ||
| - | ||
| compatible = "generic-ohci"; | ||
| reg = <0xd000 0x1000>; | ||
| interrupt-parent = <&gic>; |
37 changes: 37 additions & 0 deletions
37
...ux/bcm53xx/patches-5.10/040-v6.6-0006-ARM-dts-BCM53573-Add-cells-sizes-to-PCIe-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,37 @@ | ||
| From 3392ef368d9b04622fe758b1079b512664b6110a Mon Sep 17 00:00:00 2001 | ||
| From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl> | ||
| Date: Fri, 7 Jul 2023 13:40:03 +0200 | ||
| Subject: [PATCH] ARM: dts: BCM53573: Add cells sizes to PCIe node | ||
| MIME-Version: 1.0 | ||
| Content-Type: text/plain; charset=UTF-8 | ||
| Content-Transfer-Encoding: 8bit | ||
|
|
||
| This fixes: | ||
| arch/arm/boot/dts/broadcom/bcm47189-luxul-xap-1440.dtb: pcie@2000: '#address-cells' is a required property | ||
| From schema: /lib/python3.10/site-packages/dtschema/schemas/pci/pci-bus.yaml | ||
| arch/arm/boot/dts/broadcom/bcm47189-luxul-xap-1440.dtb: pcie@2000: '#size-cells' is a required property | ||
| From schema: /lib/python3.10/site-packages/dtschema/schemas/pci/pci-bus.yaml | ||
|
|
||
| Two properties that need to be added later are "device_type" and | ||
| "ranges". Adding "device_type" on its own causes a new warning and the | ||
| value of "ranges" needs to be determined yet. | ||
|
|
||
| Signed-off-by: Rafał Miłecki <rafal@milecki.pl> | ||
| Link: https://lore.kernel.org/r/20230707114004.2740-3-zajec5@gmail.com | ||
| Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com> | ||
| --- | ||
| arch/arm/boot/dts/broadcom/bcm53573.dtsi | 3 +++ | ||
| 1 file changed, 3 insertions(+) | ||
|
|
||
| --- a/arch/arm/boot/dts/bcm53573.dtsi | ||
| +++ b/arch/arm/boot/dts/bcm53573.dtsi | ||
| @@ -127,6 +127,9 @@ | ||
|
|
||
| pcie0: pcie@2000 { | ||
| reg = <0x00002000 0x1000>; | ||
| + | ||
| + #address-cells = <3>; | ||
| + #size-cells = <2>; | ||
| }; | ||
|
|
||
| usb2: usb2@4000 { |
44 changes: 44 additions & 0 deletions
44
...3xx/patches-5.10/040-v6.6-0007-ARM-dts-BCM53573-Use-updated-spi-gpio-binding-proper.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,44 @@ | ||
| From 2c0fd6b3d0778ceab40205315ccef74568490f17 Mon Sep 17 00:00:00 2001 | ||
| From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl> | ||
| Date: Fri, 7 Jul 2023 13:40:04 +0200 | ||
| Subject: [PATCH] ARM: dts: BCM53573: Use updated "spi-gpio" binding properties | ||
| MIME-Version: 1.0 | ||
| Content-Type: text/plain; charset=UTF-8 | ||
| Content-Transfer-Encoding: 8bit | ||
|
|
||
| Switch away from deprecated properties. | ||
|
|
||
| This fixes: | ||
| arch/arm/boot/dts/broadcom/bcm947189acdbmr.dtb: spi: gpio-sck: False schema does not allow [[3, 21, 0]] | ||
| From schema: Documentation/devicetree/bindings/spi/spi-gpio.yaml | ||
| arch/arm/boot/dts/broadcom/bcm947189acdbmr.dtb: spi: gpio-miso: False schema does not allow [[3, 22, 0]] | ||
| From schema: Documentation/devicetree/bindings/spi/spi-gpio.yaml | ||
| arch/arm/boot/dts/broadcom/bcm947189acdbmr.dtb: spi: gpio-mosi: False schema does not allow [[3, 23, 0]] | ||
| From schema: Documentation/devicetree/bindings/spi/spi-gpio.yaml | ||
| arch/arm/boot/dts/broadcom/bcm947189acdbmr.dtb: spi: 'sck-gpios' is a required property | ||
| From schema: Documentation/devicetree/bindings/spi/spi-gpio.yaml | ||
| arch/arm/boot/dts/broadcom/bcm947189acdbmr.dtb: spi: Unevaluated properties are not allowed ('gpio-miso', 'gpio-mosi', 'gpio-sck' were unexpected) | ||
| From schema: Documentation/devicetree/bindings/spi/spi-gpio.yaml | ||
|
|
||
| Signed-off-by: Rafał Miłecki <rafal@milecki.pl> | ||
| Link: https://lore.kernel.org/r/20230707114004.2740-4-zajec5@gmail.com | ||
| Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com> | ||
| --- | ||
| arch/arm/boot/dts/broadcom/bcm947189acdbmr.dts | 6 +++--- | ||
| 1 file changed, 3 insertions(+), 3 deletions(-) | ||
|
|
||
| --- a/arch/arm/boot/dts/bcm947189acdbmr.dts | ||
| +++ b/arch/arm/boot/dts/bcm947189acdbmr.dts | ||
| @@ -60,9 +60,9 @@ | ||
| spi { | ||
| compatible = "spi-gpio"; | ||
| num-chipselects = <1>; | ||
| - gpio-sck = <&chipcommon 21 0>; | ||
| - gpio-miso = <&chipcommon 22 0>; | ||
| - gpio-mosi = <&chipcommon 23 0>; | ||
| + sck-gpios = <&chipcommon 21 0>; | ||
| + miso-gpios = <&chipcommon 22 0>; | ||
| + mosi-gpios = <&chipcommon 23 0>; | ||
| cs-gpios = <&chipcommon 24 0>; | ||
| #address-cells = <1>; | ||
| #size-cells = <0>; |
Oops, something went wrong.