Commit f3b1859b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'realview-dts-v4.20' of... 

Merge tag 'realview-dts-v4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/dt

Realview DTS update for v4.20:
- One patch from Rob fixing SPI node names

* tag 'realview-dts-v4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator

:
  ARM: dts: realview: Fix SPI controller node names

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 11236ef5 016add12

arch/arm/boot/dts/arm-realview-eb.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ 
			clock-names = "uartclk", "apb_pclk";

		};



		ssp: ssp@1000d000 {

		ssp: spi@1000d000 {

			compatible = "arm,pl022", "arm,primecell";

			reg = <0x1000d000 0x1000>;

			clocks = <&sspclk>, <&pclk>;

arch/arm/boot/dts/arm-realview-pb1176.dts

+1 −1
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ 
			clock-names = "apb_pclk";

		};



		pb1176_ssp: ssp@1010b000 {

		pb1176_ssp: spi@1010b000 {

			compatible = "arm,pl022", "arm,primecell";

			reg = <0x1010b000 0x1000>;

			interrupt-parent = <&intc_dc1176>;

arch/arm/boot/dts/arm-realview-pb11mp.dts

+1 −1
Original line number Diff line number Diff line
@@ -523,7 +523,7 @@ 
			clock-names = "uartclk", "apb_pclk";

		};



		ssp@1000d000 {

		spi@1000d000 {

			compatible = "arm,pl022", "arm,primecell";

			reg = <0x1000d000 0x1000>;

			interrupt-parent = <&intc_pb11mp>;

arch/arm/boot/dts/arm-realview-pbx.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ 
			clock-names = "uartclk", "apb_pclk";

		};



		ssp: ssp@1000d000 {

		ssp: spi@1000d000 {

			compatible = "arm,pl022", "arm,primecell";

			reg = <0x1000d000 0x1000>;

			clocks = <&sspclk>, <&pclk>;

arch/arm/boot/dts/versatile-ab.dts

+1 −1
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ 
			clock-names = "apb_pclk";

		};



		ssp@101f4000 {

		spi@101f4000 {

			compatible = "arm,pl022", "arm,primecell";

			reg = <0x101f4000 0x1000>;

			interrupts = <11>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE