Unverified Commit 43e403a2 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'versatile-dts-v6.1' of... 

Merge tag 'versatile-dts-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into arm/fixes

These are some Versatile family DTS fixes, fixing some
node names and clock names related to SPI.

* tag 'versatile-dts-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
  ARM: dts: versatile: Update spi clock-names property
  ARM: dts: realview: Update spi clock-names property
  ARM: dts: integratorap: Update spi node properties

Link: https://lore.kernel.org/r/CACRpkdZfTe8NSGR2ZCkn-1JcNobjfWeXqajSqcJMp8+WtY+2Xw@mail.gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents a3bedd24 6c939e28

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

+1 −1
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ 
			compatible = "arm,pl022", "arm,primecell";

			reg = <0x1000d000 0x1000>;

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

			clock-names = "SSPCLK", "apb_pclk";

			clock-names = "sspclk", "apb_pclk";

		};



		wdog: watchdog@10010000 {

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

+1 −1
Original line number Diff line number Diff line
@@ -410,7 +410,7 @@ 
			interrupt-parent = <&intc_dc1176>;

			interrupts = <0 17 IRQ_TYPE_LEVEL_HIGH>;

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

			clock-names = "SSPCLK", "apb_pclk";

			clock-names = "sspclk", "apb_pclk";

		};



		pb1176_serial0: serial@1010c000 {

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

+1 −1
Original line number Diff line number Diff line
@@ -555,7 +555,7 @@ 
			interrupt-parent = <&intc_pb11mp>;

			interrupts = <0 11 IRQ_TYPE_LEVEL_HIGH>;

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

			clock-names = "SSPCLK", "apb_pclk";

			clock-names = "sspclk", "apb_pclk";

		};



		watchdog@1000f000 {

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

+1 −1
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ 
			compatible = "arm,pl022", "arm,primecell";

			reg = <0x1000d000 0x1000>;

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

			clock-names = "SSPCLK", "apb_pclk";

			clock-names = "sspclk", "apb_pclk";

		};



		wdog0: watchdog@1000f000 {

arch/arm/boot/dts/integratorap-im-pd1.dts

+2 −2
Original line number Diff line number Diff line
@@ -178,12 +178,12 @@ 
		clock-names = "uartclk", "apb_pclk";

	};



	ssp@300000 {

	spi@300000 {

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

		reg = <0x00300000 0x1000>;

		interrupts-extended = <&impd1_vic 3>;

		clocks = <&impd1_sspclk>, <&sysclk>;

		clock-names = "spiclk", "apb_pclk";

		clock-names = "sspclk", "apb_pclk";

	};



	impd1_gpio0: gpio@400000 {