Commit a6623f5f authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'arm-soc/for-4.18/devicetree-arm64-fixes' of... 

Merge tag 'arm-soc/for-4.18/devicetree-arm64-fixes' of https://github.com/Broadcom/stblinux into fixes

This pull request contains Broadcom ARM64-based SoCs Device Tree fixes
for 4.18, please pull the following:

- Scott fixes both the bcm958742k and bcm958742t reference boards to
  have the correct eMMC voltage specified

- Ray fixes the I2C and PCIe Device Tree nodes interrupt specifiers for
  Northstar 2 and Stingray SoCs.

* tag 'arm-soc/for-4.18/devicetree-arm64-fixes' of https://github.com/Broadcom/stblinux

:
  arm64: dts: Stingray: Fix I2C controller interrupt type
  arm64: dts: ns2: Fix PCIe controller interrupt type
  arm64: dts: ns2: Fix I2C controller interrupt type
  arm64: dts: specify 1.8V EMMC capabilities for bcm958742t
  arm64: dts: specify 1.8V EMMC capabilities for bcm958742k

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 0988e8e2 75af23c4

arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ 


		#interrupt-cells = <1>;

		interrupt-map-mask = <0 0 0 0>;

		interrupt-map = <0 0 0 0 &gic 0 GIC_SPI 281 IRQ_TYPE_NONE>;

		interrupt-map = <0 0 0 0 &gic 0 GIC_SPI 281 IRQ_TYPE_LEVEL_HIGH>;



		linux,pci-domain = <0>;
@@ -149,7 +149,7 @@ 


		#interrupt-cells = <1>;

		interrupt-map-mask = <0 0 0 0>;

		interrupt-map = <0 0 0 0 &gic 0 GIC_SPI 305 IRQ_TYPE_NONE>;

		interrupt-map = <0 0 0 0 &gic 0 GIC_SPI 305 IRQ_TYPE_LEVEL_HIGH>;



		linux,pci-domain = <4>;
@@ -566,7 +566,7 @@ 
			reg = <0x66080000 0x100>;

			#address-cells = <1>;

			#size-cells = <0>;

			interrupts = <GIC_SPI 394 IRQ_TYPE_NONE>;

			interrupts = <GIC_SPI 394 IRQ_TYPE_LEVEL_HIGH>;

			clock-frequency = <100000>;

			status = "disabled";

		};
@@ -594,7 +594,7 @@ 
			reg = <0x660b0000 0x100>;

			#address-cells = <1>;

			#size-cells = <0>;

			interrupts = <GIC_SPI 395 IRQ_TYPE_NONE>;

			interrupts = <GIC_SPI 395 IRQ_TYPE_LEVEL_HIGH>;

			clock-frequency = <100000>;

			status = "disabled";

		};

arch/arm64/boot/dts/broadcom/stingray/bcm958742k.dts

+4 −0
Original line number Diff line number Diff line
@@ -43,6 +43,10 @@ 
	enet-phy-lane-swap;

};



&sdio0 {

	mmc-ddr-1_8v;

};



&uart2 {

	status = "okay";

};

arch/arm64/boot/dts/broadcom/stingray/bcm958742t.dts

+4 −0
Original line number Diff line number Diff line
@@ -42,3 +42,7 @@ 
&gphy0 {

	enet-phy-lane-swap;

};



&sdio0 {

	mmc-ddr-1_8v;

};

arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ 
			reg = <0x000b0000 0x100>;

			#address-cells = <1>;

			#size-cells = <0>;

			interrupts = <GIC_SPI 177 IRQ_TYPE_NONE>;

			interrupts = <GIC_SPI 177 IRQ_TYPE_LEVEL_HIGH>;

			clock-frequency = <100000>;

			status = "disabled";

		};
@@ -453,7 +453,7 @@ 
			reg = <0x000e0000 0x100>;

			#address-cells = <1>;

			#size-cells = <0>;

			interrupts = <GIC_SPI 178 IRQ_TYPE_NONE>;

			interrupts = <GIC_SPI 178 IRQ_TYPE_LEVEL_HIGH>;

			clock-frequency = <100000>;

			status = "disabled";

		};

CRA Git | Maintained and supported by SUSTech CRA and CCSE