Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70c6420c authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

Renesas ARM Based SoC DT Updates for v4.11

* Add da9063 PMIC device node for system restart to gose board
* Add device node for PRR to SoCs where it was missing
* Move RST node before SYSC node where it was incorrectly placed
* Use Gen 2 fallback bindings for I2C, IIC, MSIOf and USB2 phy
* Use SoC-specific compat string for MMCIF where it was missing

* tag 'renesas-dt-for-v4.11' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

: (25 commits)
  ARM: dts: r8a7790: Use R-Car Gen 2 fallback binding for msiof nodes
  ARM: dts: r8a7792: Use R-Car Gen 2 fallback binding for msiof nodes
  ARM: dts: r8a7791: Use R-Car Gen 2 fallback binding for msiof nodes
  ARM: dts: r8a7794: Use R-Car Gen 2 fallback binding for iic nodes
  ARM: dts: r8a7793: Use R-Car Gen 2 fallback binding for iic nodes
  ARM: dts: r8a7791: Use R-Car Gen 2 fallback binding for iic nodes
  ARM: dts: r8a7790: Use R-Car Gen 2 fallback binding for iic nodes
  ARM: dts: r8a7794: Use R-Car Gen 2 fallback binding for i2c nodes
  ARM: dts: r8a7793: Use R-Car Gen 2 fallback binding for i2c nodes
  ARM: dts: r8a7792: Use R-Car Gen 2 fallback binding for i2c nodes
  ARM: dts: r8a7791: Use R-Car Gen 2 fallback binding for i2c nodes
  ARM: dts: r8a7790: Use R-Car Gen 2 fallback binding for i2c nodes
  ARM: dts: r8a7778: Use R-Car Gen 1 fallback binding for i2c nodes
  ARM: dts: r8a7779: Use R-Car Gen 1 fallback binding for i2c nodes
  ARM: dts: r8a7794: Use renesas,rcar-gen2-usb-phy fallback binding
  ARM: dts: r8a7791: Use renesas,rcar-gen2-usb-phy fallback binding
  ARM: dts: r8a7790: Use renesas,rcar-gen2-usb-phy fallback binding
  ARM: dts: gose: Add da9063 PMIC device node for system restart
  ARM: dts: sh73a0: Use SoC-specific compat string for mmcif
  ARM: dts: r8a7778: Use SoC-specific compat string for mmcif
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents a121103c 654450ba

arch/arm/boot/dts/r8a73a4.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ 
	};



	mmcif0: mmc@ee200000 {

		compatible = "renesas,sh-mmcif";

		compatible = "renesas,mmcif-r8a73a4", "renesas,sh-mmcif";

		reg = <0 0xee200000 0 0x80>;

		interrupts = <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp3_clks R8A73A4_CLK_MMCIF0>;
@@ -450,7 +450,7 @@ 
	};



	mmcif1: mmc@ee220000 {

		compatible = "renesas,sh-mmcif";

		compatible = "renesas,mmcif-r8a73a4", "renesas,sh-mmcif";

		reg = <0 0xee220000 0 0x80>;

		interrupts = <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp3_clks R8A73A4_CLK_MMCIF1>;

arch/arm/boot/dts/r8a7743.dtsi

+9 −4
Original line number Diff line number Diff line
@@ -102,10 +102,9 @@ 
			#power-domain-cells = <0>;

		};



		sysc: system-controller@e6180000 {

			compatible = "renesas,r8a7743-sysc";

			reg = <0 0xe6180000 0 0x200>;

			#power-domain-cells = <1>;

		prr: chipid@ff000044 {

			compatible = "renesas,prr";

			reg = <0 0xff000044 0 4>;

		};



		rst: reset-controller@e6160000 {
@@ -113,6 +112,12 @@ 
			reg = <0 0xe6160000 0 0x100>;

		};



		sysc: system-controller@e6180000 {

			compatible = "renesas,r8a7743-sysc";

			reg = <0 0xe6180000 0 0x200>;

			#power-domain-cells = <1>;

		};



		dmac0: dma-controller@e6700000 {

			compatible = "renesas,dmac-r8a7743",

				     "renesas,rcar-dmac";

arch/arm/boot/dts/r8a7745.dtsi

+9 −4
Original line number Diff line number Diff line
@@ -102,10 +102,9 @@ 
			#power-domain-cells = <0>;

		};



		sysc: system-controller@e6180000 {

			compatible = "renesas,r8a7745-sysc";

			reg = <0 0xe6180000 0 0x200>;

			#power-domain-cells = <1>;

		prr: chipid@ff000044 {

			compatible = "renesas,prr";

			reg = <0 0xff000044 0 4>;

		};



		rst: reset-controller@e6160000 {
@@ -113,6 +112,12 @@ 
			reg = <0 0xe6160000 0 0x100>;

		};



		sysc: system-controller@e6180000 {

			compatible = "renesas,r8a7745-sysc";

			reg = <0 0xe6180000 0 0x200>;

			#power-domain-cells = <1>;

		};



		dmac0: dma-controller@e6700000 {

			compatible = "renesas,dmac-r8a7745",

				     "renesas,rcar-dmac";

arch/arm/boot/dts/r8a7778.dtsi

+5 −5
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ 
	i2c0: i2c@ffc70000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "renesas,i2c-r8a7778";

		compatible = "renesas,i2c-r8a7778", "renesas,rcar-gen1-i2c";

		reg = <0xffc70000 0x1000>;

		interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp0_clks R8A7778_CLK_I2C0>;
@@ -161,7 +161,7 @@ 
	i2c1: i2c@ffc71000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "renesas,i2c-r8a7778";

		compatible = "renesas,i2c-r8a7778", "renesas,rcar-gen1-i2c";

		reg = <0xffc71000 0x1000>;

		interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp0_clks R8A7778_CLK_I2C1>;
@@ -172,7 +172,7 @@ 
	i2c2: i2c@ffc72000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "renesas,i2c-r8a7778";

		compatible = "renesas,i2c-r8a7778", "renesas,rcar-gen1-i2c";

		reg = <0xffc72000 0x1000>;

		interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp0_clks R8A7778_CLK_I2C2>;
@@ -183,7 +183,7 @@ 
	i2c3: i2c@ffc73000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "renesas,i2c-r8a7778";

		compatible = "renesas,i2c-r8a7778", "renesas,rcar-gen1-i2c";

		reg = <0xffc73000 0x1000>;

		interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp0_clks R8A7778_CLK_I2C3>;
@@ -369,7 +369,7 @@ 
	};



	mmcif: mmc@ffe4e000 {

		compatible = "renesas,sh-mmcif";

		compatible = "renesas,mmcif-r8a7778", "renesas,sh-mmcif";

		reg = <0xffe4e000 0x100>;

		interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp3_clks R8A7778_CLK_MMC>;

arch/arm/boot/dts/r8a7779.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ 
	i2c0: i2c@ffc70000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "renesas,i2c-r8a7779";

		compatible = "renesas,i2c-r8a7779", "renesas,rcar-gen1-i2c";

		reg = <0xffc70000 0x1000>;

		interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp0_clks R8A7779_CLK_I2C0>;
@@ -184,7 +184,7 @@ 
	i2c1: i2c@ffc71000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "renesas,i2c-r8a7779";

		compatible = "renesas,i2c-r8a7779", "renesas,rcar-gen1-i2c";

		reg = <0xffc71000 0x1000>;

		interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp0_clks R8A7779_CLK_I2C1>;
@@ -195,7 +195,7 @@ 
	i2c2: i2c@ffc72000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "renesas,i2c-r8a7779";

		compatible = "renesas,i2c-r8a7779", "renesas,rcar-gen1-i2c";

		reg = <0xffc72000 0x1000>;

		interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp0_clks R8A7779_CLK_I2C2>;
@@ -206,7 +206,7 @@ 
	i2c3: i2c@ffc73000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "renesas,i2c-r8a7779";

		compatible = "renesas,i2c-r8a7779", "renesas,rcar-gen1-i2c";

		reg = <0xffc73000 0x1000>;

		interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp0_clks R8A7779_CLK_I2C3>;