Commit 6375b908 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'arm-soc/for-5.15/devicetree' of https://github.com/Broadcom/stblinux into arm/dt 

This is already in v5.15-rc5, but I'm adding it here as well to get
a clean build of the dts files.

* tag 'arm-soc/for-5.15/devicetree':
  ARM: dts: bcm2711-rpi-4-b: Fix usb's unit address
  ARM: dts: bcm2711-rpi-4-b: Fix pcie0's unit address formatting
  ARM: dts: bcm2711-rpi-4-b: fix sd_io_1v8_reg regulator states
  ARM: dts: bcm2711: fix MDIO #address- and #size-cells
  ARM: dts: bcm283x: Fix VEC address for BCM2711
parents fcd9d346 bc22b620

arch/arm/boot/dts/bcm2711-rpi-4-b.dts

+6 −5
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ sd_io_1v8_reg: sd_io_1v8_reg { 
		regulator-always-on;

		regulator-settling-time-us = <5000>;

		gpios = <&expgpio 4 GPIO_ACTIVE_HIGH>;

		states = <1800000 0x1

			  3300000 0x0>;

		states = <1800000 0x1>,

			 <3300000 0x0>;

		status = "okay";

	};
@@ -200,15 +200,16 @@ phy1: ethernet-phy@1 { 
};



&pcie0 {

	pci@1,0 {

	pci@0,0 {

		device_type = "pci";

		#address-cells = <3>;

		#size-cells = <2>;

		ranges;



		reg = <0 0 0 0 0>;



		usb@1,0 {

			reg = <0x10000 0 0 0 0>;

		usb@0,0 {

			reg = <0 0 0 0 0>;

			resets = <&reset RASPBERRYPI_FIRMWARE_RESET_ID_USB>;

		};

	};

arch/arm/boot/dts/bcm2711.dtsi

+10 −2
Original line number Diff line number Diff line
@@ -300,6 +300,14 @@ pixelvalve3: pixelvalve@7ec12000 { 
			status = "disabled";

		};



		vec: vec@7ec13000 {

			compatible = "brcm,bcm2711-vec";

			reg = <0x7ec13000 0x1000>;

			clocks = <&clocks BCM2835_CLOCK_VEC>;

			interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>;

			status = "disabled";

		};



		dvp: clock@7ef00000 {

			compatible = "brcm,brcm2711-dvp";

			reg = <0x7ef00000 0x10>;
@@ -532,8 +540,8 @@ genet_mdio: mdio@e14 { 
				compatible = "brcm,genet-mdio-v5";

				reg = <0xe14 0x8>;

				reg-names = "mdio";

				#address-cells = <0x0>;

				#size-cells = <0x1>;

				#address-cells = <0x1>;

				#size-cells = <0x0>;

			};

		};

	};

arch/arm/boot/dts/bcm2835-common.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -106,6 +106,14 @@ i2c2: i2c@7e805000 { 
			status = "okay";

		};



		vec: vec@7e806000 {

			compatible = "brcm,bcm2835-vec";

			reg = <0x7e806000 0x1000>;

			clocks = <&clocks BCM2835_CLOCK_VEC>;

			interrupts = <2 27>;

			status = "disabled";

		};



		pixelvalve@7e807000 {

			compatible = "brcm,bcm2835-pixelvalve2";

			reg = <0x7e807000 0x100>;

arch/arm/boot/dts/bcm283x.dtsi

+0 −8
Original line number Diff line number Diff line
@@ -464,14 +464,6 @@ i2c1: i2c@7e804000 { 
			status = "disabled";

		};



		vec: vec@7e806000 {

			compatible = "brcm,bcm2835-vec";

			reg = <0x7e806000 0x1000>;

			clocks = <&clocks BCM2835_CLOCK_VEC>;

			interrupts = <2 27>;

			status = "disabled";

		};



		usb: usb@7e980000 {

			compatible = "brcm,bcm2835-usb";

			reg = <0x7e980000 0x10000>;