diff options
author | Arnd Bergmann <arnd@arndb.de> | 2023-10-25 23:09:25 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2023-10-25 23:09:26 +0200 |
commit | a26dffc16361438d96ff90d7451e43915589a0fa (patch) | |
tree | 7a52b0439b4112cf7ee0780cb4705a8b4524335f /arch/arm/boot/dts/broadcom/bcm47081-luxul-xap-1410.dts | |
parent | e209b029c7d7f6205e510633d6ba966900b87ac2 (diff) | |
parent | 253358f373492608348136e569366d73cb969f6a (diff) |
Merge tag 'arm-soc/for-6.7/devicetree' of https://github.com/Broadcom/stblinux into soc/dt
This pull request contains Broadcom ARM-based SoCs changes for 6.7,
please pull the following:
- Rafal makes a number of updates to the BCM5301X (Northstar) SoCs DTS
to set MAC addresses for D-LInk DIR-885L, Asus, RT-AC87U, he
relicenses parts of the DTSI to GPL 2.0+ / MIT, and finally fixes a
number of Ethernet switch ports properties to enable/disable ports
adequately.
* tag 'arm-soc/for-6.7/devicetree' of https://github.com/Broadcom/stblinux:
ARM: dts: BCM5301X: Set switch ports for Linksys EA9200
ARM: dts: BCM5301X: Set fixed-link for extra Netgear R8000 CPU ports
ARM: dts: BCM5301X: Explicitly disable unused switch CPU ports
ARM: dts: BCM5301X: Relicense Vivek's code to the GPL 2.0+ / MIT
ARM: dts: BCM5301X: Relicense Felix's code to the GPL 2.0+ / MIT
ARM: dts: BCM5301X: Set MAC address for Asus RT-AC87U
ARM: dts: BCM5301X: Set MACs for D-Link DIR-885L
Link: https://lore.kernel.org/r/20231024155927.977263-1-florian.fainelli@broadcom.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/broadcom/bcm47081-luxul-xap-1410.dts')
-rw-r--r-- | arch/arm/boot/dts/broadcom/bcm47081-luxul-xap-1410.dts | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/broadcom/bcm47081-luxul-xap-1410.dts b/arch/arm/boot/dts/broadcom/bcm47081-luxul-xap-1410.dts index 9f21d6d6d35b..0198b5f9e4a7 100644 --- a/arch/arm/boot/dts/broadcom/bcm47081-luxul-xap-1410.dts +++ b/arch/arm/boot/dts/broadcom/bcm47081-luxul-xap-1410.dts @@ -81,5 +81,13 @@ port@5 { label = "cpu"; }; + + port@7 { + status = "disabled"; + }; + + port@8 { + status = "disabled"; + }; }; }; |