diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2024-03-11 07:43:25 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2024-03-11 07:43:31 +0100 |
| commit | de79649bf981d4c43bb60e29001451c672e6b14c (patch) | |
| tree | 9c5f01d3720719fe964949884e3f648b530ec7b7 | |
| parent | ee7dad0b8181501e0e032d12ef45758eab667c4a (diff) | |
| parent | 27058b95fbb784406ea4c40b20caa3f04937140c (diff) | |
Merge tag 'arm-soc/for-6.9/devicetree-arm64' of https://github.com/Broadcom/stblinux into soc/late
This pull request contains Broadcom ARM64-based SoCs changes for 6.9,
please pull the following:
- Rafal defines a proper NVMEM layout for the Asus GT-AC5300 router and
removes some invalid Device Tree properties pertaining to the
Ethernet switch on bcm4908
* tag 'arm-soc/for-6.9/devicetree-arm64' of https://github.com/Broadcom/stblinux:
arm64: dts: broadcom: bcmbca: bcm4908: drop invalid switch cells
arm64: dts: broadcom: bcmbca: bcm4908: use NVMEM layout for Asus GT-AC5300
Link: https://lore.kernel.org/r/20240307200441.2151734-1-florian.fainelli@broadcom.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm64/boot/dts/broadcom/bcmbca/bcm4908-asus-gt-ac5300.dts | 13 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi | 3 |
2 files changed, 7 insertions, 9 deletions
diff --git a/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908-asus-gt-ac5300.dts b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908-asus-gt-ac5300.dts index d94a53d68320..a48fa913837c 100644 --- a/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908-asus-gt-ac5300.dts +++ b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908-asus-gt-ac5300.dts @@ -181,16 +181,17 @@ #size-cells = <1>; partition@0 { - compatible = "nvmem-cells"; label = "cferom"; reg = <0x0 0x100000>; - #address-cells = <1>; - #size-cells = <1>; - ranges = <0 0x0 0x100000>; + nvmem-layout { + compatible = "fixed-layout"; + #address-cells = <1>; + #size-cells = <1>; - base_mac_addr: mac@106a0 { - reg = <0x106a0 0x6>; + base_mac_addr: mac@106a0 { + reg = <0x106a0 0x6>; + }; }; }; diff --git a/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi index 2f124b027bbf..aadfa0ae0525 100644 --- a/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi +++ b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi @@ -227,9 +227,6 @@ brcm,num-gphy = <5>; brcm,num-rgmii-ports = <2>; - #address-cells = <1>; - #size-cells = <0>; - ports: ports { #address-cells = <1>; #size-cells = <0>; |