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>
This commit is contained in:
Arnd Bergmann
2024-03-11 07:43:25 +01:00
2 changed files with 7 additions and 9 deletions
@@ -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>;
};
};
};
@@ -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>;