Unverified Commit de79649b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
parents ee7dad0b 27058b95

arch/arm64/boot/dts/broadcom/bcmbca/bcm4908-asus-gt-ac5300.dts

+7 −6
Original line number Diff line number Diff line
@@ -181,18 +181,19 @@ partitions { 
		#size-cells = <1>;



		partition@0 {

			compatible = "nvmem-cells";

			label = "cferom";

			reg = <0x0 0x100000>;



			nvmem-layout {

				compatible = "fixed-layout";

				#address-cells = <1>;

				#size-cells = <1>;

			ranges = <0 0x0 0x100000>;



				base_mac_addr: mac@106a0 {

					reg = <0x106a0 0x6>;

				};

			};

		};



		partition@100000 {

			compatible = "brcm,bcm4908-firmware";

arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi

+0 −3
Original line number Diff line number Diff line
@@ -227,9 +227,6 @@ ethernet-switch@0 { 
				brcm,num-gphy = <5>;

				brcm,num-rgmii-ports = <2>;



				#address-cells = <1>;

				#size-cells = <0>;



				ports: ports {

					#address-cells = <1>;

					#size-cells = <0>;