Commit 6da06083 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-dt-for-v4.5' of... 

Merge tag 'renesas-dt-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt

Merge "Renesas ARM Based SoC DT Updates for v4.5" from Simon Horman:

* henninger: Remove as it is now replaced by silk
* koelsch: Move SPI partitions to subnode
* porter: Add CAN0 and HS-USB support
* r8a7793/gose: Add QSPI, PFC support
* r8a7793: Add GPIO, DMAC, theral, IPMMU support
* r8a7794/alt: Add DU support
* r8a7794: Disable all IPMMU nodes by default
* r8a779[0134]: Use Use SoC specific binding for rcar-dmac
* r8a779[01], r8a73a4, r8a7740, sh73a0: replace gpio-key, wakeup with
  wakeup-source property
* r8a779[14]: Correct "gpio-ranges" properties
* r8a779[14]: Remove bogus imp_clk node
* silk: Add SDHI1 support

* tag 'renesas-dt-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (29 commits)
  ARM: shmobile: alt: add VIN0, ADV7180 DT support
  ARM: shmobile: alt: add I2C1 DT support
  ARM: shmobile: alt: Add pfc pins to DT
  ARM: shmobile: r8a7794: Use SoC specific binding for rcar-dmac nodes
  ARM: shmobile: r8a7793: Use SoC specific binding for rcar-dmac nodes
  ARM: shmobile: r8a7791: Use SoC specific binding for rcar-dmac nodes
  ARM: shmobile: r8a7790: Use SoC specific binding for rcar-dmac nodes
  ARM: shmobile: r8a7793: Add GPIO nodes to device tree
  ARM: shmobile: r8a7794: alt: Enable VGA port
  ARM: shmobile: r8a7794: Add DU node to device tree
  ARM: shmobile: r8a7794: Add DU0 clock
  ARM: shmobile: gose: Add QSPI device to DT
  ARM: shmobile: r8a7793: Add QSPI device to DT
  ARM: shmobile: r8a7793: Add DMAC devices to DT
  ARM: shmobile: koelsch: Move SPI FLASH partitions to subnode
  ARM: shmobile: gose: Configure PFC in DT
  ARM: shmobile: r8a7793: Add PFC to DT
  ARM: shmobile: r8a7793: Add thermal device to DT
  ARM: shmobile: henninger: remove board DT
  ARM: shmobile: porter: add CAN0 DT support
  ...
parents c72c7a00 d537543b

arch/arm/boot/dts/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -547,7 +547,6 @@ dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += \ 
	r8a7778-bockw.dtb \

	r8a7779-marzen.dtb \

	r8a7790-lager.dtb \

	r8a7791-henninger.dtb \

	r8a7791-koelsch.dtb \

	r8a7791-porter.dtb \

	r8a7793-gose.dtb \

arch/arm/boot/dts/r8a73a4-ape6evm.dts

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ 
			gpios = <&pfc 324 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_0>;

			label = "S16";

			gpio-key,wakeup;

			wakeup-source;

		};



		menu-key {

arch/arm/boot/dts/r8a7740-armadillo800eva.dts

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ 
			gpios = <&pfc 99 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_POWER>;

			label = "SW3";

			gpio-key,wakeup;

			wakeup-source;

		};



		back-key {

arch/arm/boot/dts/r8a7790-lager.dts

+4 −4
Original line number Diff line number Diff line
@@ -77,28 +77,28 @@ 
		button@1 {

			linux,code = <KEY_1>;

			label = "SW2-1";

			gpio-key,wakeup;

			wakeup-source;

			debounce-interval = <20>;

			gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;

		};

		button@2 {

			linux,code = <KEY_2>;

			label = "SW2-2";

			gpio-key,wakeup;

			wakeup-source;

			debounce-interval = <20>;

			gpios = <&gpio1 24 GPIO_ACTIVE_LOW>;

		};

		button@3 {

			linux,code = <KEY_3>;

			label = "SW2-3";

			gpio-key,wakeup;

			wakeup-source;

			debounce-interval = <20>;

			gpios = <&gpio1 26 GPIO_ACTIVE_LOW>;

		};

		button@4 {

			linux,code = <KEY_4>;

			label = "SW2-4";

			gpio-key,wakeup;

			wakeup-source;

			debounce-interval = <20>;

			gpios = <&gpio1 28 GPIO_ACTIVE_LOW>;

		};

arch/arm/boot/dts/r8a7790.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ 
		interrupts = <0 5 IRQ_TYPE_LEVEL_HIGH>;

		#gpio-cells = <2>;

		gpio-controller;

		gpio-ranges = <&pfc 0 32 32>;

		gpio-ranges = <&pfc 0 32 30>;

		#interrupt-cells = <2>;

		interrupt-controller;

		clocks = <&mstp9_clks R8A7790_CLK_GPIO1>;
@@ -156,7 +156,7 @@ 
		interrupts = <0 6 IRQ_TYPE_LEVEL_HIGH>;

		#gpio-cells = <2>;

		gpio-controller;

		gpio-ranges = <&pfc 0 64 32>;

		gpio-ranges = <&pfc 0 64 30>;

		#interrupt-cells = <2>;

		interrupt-controller;

		clocks = <&mstp9_clks R8A7790_CLK_GPIO2>;
@@ -266,7 +266,7 @@ 
	};



	dmac0: dma-controller@e6700000 {

		compatible = "renesas,rcar-dmac";

		compatible = "renesas,dmac-r8a7790", "renesas,rcar-dmac";

		reg = <0 0xe6700000 0 0x20000>;

		interrupts = <0 197 IRQ_TYPE_LEVEL_HIGH

			      0 200 IRQ_TYPE_LEVEL_HIGH
@@ -297,7 +297,7 @@ 
	};



	dmac1: dma-controller@e6720000 {

		compatible = "renesas,rcar-dmac";

		compatible = "renesas,dmac-r8a7790", "renesas,rcar-dmac";

		reg = <0 0xe6720000 0 0x20000>;

		interrupts = <0 220 IRQ_TYPE_LEVEL_HIGH

			      0 216 IRQ_TYPE_LEVEL_HIGH
@@ -328,7 +328,7 @@ 
	};



	audma0: dma-controller@ec700000 {

		compatible = "renesas,rcar-dmac";

		compatible = "renesas,dmac-r8a7790", "renesas,rcar-dmac";

		reg = <0 0xec700000 0 0x10000>;

		interrupts =	<0 346 IRQ_TYPE_LEVEL_HIGH

				 0 320 IRQ_TYPE_LEVEL_HIGH
@@ -357,7 +357,7 @@ 
	};



	audma1: dma-controller@ec720000 {

		compatible = "renesas,rcar-dmac";

		compatible = "renesas,dmac-r8a7790", "renesas,rcar-dmac";

		reg = <0 0xec720000 0 0x10000>;

		interrupts =	<0 347 IRQ_TYPE_LEVEL_HIGH

				 0 333 IRQ_TYPE_LEVEL_HIGH

CRA Git | Maintained and supported by SUSTech CRA and CCSE