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

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: default avatarArnd Bergmann <arnd@arndb.de>
parents e209b029 253358f3

arch/arm/boot/dts/broadcom/bcm-ns.dtsi

+34 −0
Original line number Diff line number Diff line
@@ -14,6 +14,13 @@ / { 
	#address-cells = <1>;

	#size-cells = <1>;



	pmu {

		compatible = "arm,cortex-a9-pmu";

		interrupts =

			<GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,

			<GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;

	};



	chipcommon-a-bus@18000000 {

		compatible = "simple-bus";

		ranges = <0x00000000 0x18000000 0x00001000>;
@@ -320,6 +327,29 @@ mdio: mdio@18003000 { 
		#address-cells = <1>;

	};



	mdio-mux@18003000 {

		compatible = "mdio-mux-mmioreg", "mdio-mux";

		mdio-parent-bus = <&mdio>;

		#address-cells = <1>;

		#size-cells = <0>;

		reg = <0x18003000 0x4>;

		mux-mask = <0x200>;



		mdio@0 {

			reg = <0x0>;

			#address-cells = <1>;

			#size-cells = <0>;



			usb3_phy: usb3-phy@10 {

				compatible = "brcm,ns-ax-usb3-phy";

				reg = <0x10>;

				usb3-dmp-syscon = <&usb3_dmp>;

				#phy-cells = <0>;

				status = "disabled";

			};

		};

	};



	rng: rng@18004000 {

		compatible = "brcm,bcm5301x-rng";

		reg = <0x18004000 0x14>;
@@ -460,6 +490,10 @@ nand_controller: nand-controller@18028000 { 
		brcm,nand-has-wp;

	};



	usb3_dmp: syscon@18105000 {

		reg = <0x18105000 0x1000>;

	};



	thermal-zones {

		cpu_thermal: cpu-thermal {

			polling-delay-passive = <0>;

arch/arm/boot/dts/broadcom/bcm4708-buffalo-wzr-1166dhp-common.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -181,5 +181,13 @@ port@4 { 
		port@5 {

			label = "cpu";

		};



		port@7 {

			status = "disabled";

		};



		port@8 {

			status = "disabled";

		};

	};

};

arch/arm/boot/dts/broadcom/bcm4708-luxul-xap-1510.dts

+8 −0
Original line number Diff line number Diff line
@@ -85,5 +85,13 @@ port@4 { 
		port@5 {

			label = "cpu";

		};



		port@7 {

			status = "disabled";

		};



		port@8 {

			status = "disabled";

		};

	};

};

arch/arm/boot/dts/broadcom/bcm4708-luxul-xwc-1000.dts

+8 −0
Original line number Diff line number Diff line
@@ -88,5 +88,13 @@ port@4 { 
		port@5 {

			label = "cpu";

		};



		port@7 {

			status = "disabled";

		};



		port@8 {

			status = "disabled";

		};

	};

};

arch/arm/boot/dts/broadcom/bcm4708-netgear-r6250.dts

+8 −0
Original line number Diff line number Diff line
@@ -122,5 +122,13 @@ port@4 { 
		port@5 {

			label = "cpu";

		};



		port@7 {

			status = "disabled";

		};



		port@8 {

			status = "disabled";

		};

	};

};