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

Commit 0673836c authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-dt3-for-v3.16' of... 

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

Merge "Third Round of Renesas ARM Based SoC DT Updates for v3.16" from Simon
Horman:

r8a7791 (R-Car M2), r8a7779 (R-Car H1), r8a7778 (R-Car M1),
r8a7740 (R-Mobile A1) and r8a73a4 (R-Mobile APE6) SoCs
* Move interrupt-parent property to root node

r8a7791 (R-Car M2) and r8a7790 (R-Car H2) SoCs
* Add GPIO clocks

r8a7791 (R-Car M2) based Henninger board
* Add MSIOF0, QSPI and SDHI0/2 support
* Specify EXTAL frequency

r8a7779 (R-Car H1) based Marzen board
* Set SMSC lan to use irq-push-pull

r8a7740 (R-Mobile A1) SoC
* Remove duplicate interrupt-parent property

r8a7740 (R-Mobile A1) based Armadillo800 EVA board
* Add Ethernet support

* tag 'renesas-dt3-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: r8a7740 dtsi: Remove duplicate interrupt-parent property
  ARM: shmobile: marzen-reference: Set SMSC lan to use irq-push-pull
  ARM: shmobile: r8a7791 dtsi: Add GPIO clocks
  ARM: shmobile: r8a7790 dtsi: Add GPIO clocks
  ARM: shmobile: dts: Move interrupt-parent property to root node
  ARM: shmobile: armadillo-reference dts: Add Ethernet support
  ARM: shmobile: r8a7740 dtsi: Add Ethernet support
  ARM: shmobile: henninger: add MSIOF0 DT support
  ARM: shmobile: henninger: add QSPI DT support
  ARM: shmobile: henninger: add SDHI0/2 DT support
  ARM: shmobile: henninger: specify EXTAL frequency

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 5669aab8 3fa3985e

arch/arm/boot/dts/r8a73a4.dtsi

+0 −18
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ 
		#interrupt-cells = <2>;

		interrupt-controller;

		reg = <0 0xe61c0000 0 0x200>;

		interrupt-parent = <&gic>;

		interrupts = <0 0 IRQ_TYPE_LEVEL_HIGH>,

			     <0 1 IRQ_TYPE_LEVEL_HIGH>,

			     <0 2 IRQ_TYPE_LEVEL_HIGH>,
@@ -95,7 +94,6 @@ 
		#interrupt-cells = <2>;

		interrupt-controller;

		reg = <0 0xe61c0200 0 0x200>;

		interrupt-parent = <&gic>;

		interrupts = <0 32 IRQ_TYPE_LEVEL_HIGH>,

			     <0 33 IRQ_TYPE_LEVEL_HIGH>,

			     <0 34 IRQ_TYPE_LEVEL_HIGH>,
@@ -136,7 +134,6 @@ 
		dma0: dma-controller@e6700020 {

			compatible = "renesas,shdma-r8a73a4";

			reg = <0 0xe6700020 0 0x89e0>;

			interrupt-parent = <&gic>;

			interrupts = <0 220 IRQ_TYPE_LEVEL_HIGH

					0 200 IRQ_TYPE_LEVEL_HIGH

					0 201 IRQ_TYPE_LEVEL_HIGH
@@ -171,7 +168,6 @@ 
		compatible = "renesas,rcar-thermal";

		reg = <0 0xe61f0000 0 0x14>, <0 0xe61f0100 0 0x38>,

			 <0 0xe61f0200 0 0x38>, <0 0xe61f0300 0 0x38>;

		interrupt-parent = <&gic>;

		interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>;

	};
@@ -180,7 +176,6 @@ 
		#size-cells = <0>;

		compatible = "renesas,rmobile-iic";

		reg = <0 0xe6500000 0 0x428>;

		interrupt-parent = <&gic>;

		interrupts = <0 174 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";

	};
@@ -190,7 +185,6 @@ 
		#size-cells = <0>;

		compatible = "renesas,rmobile-iic";

		reg = <0 0xe6510000 0 0x428>;

		interrupt-parent = <&gic>;

		interrupts = <0 175 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";

	};
@@ -200,7 +194,6 @@ 
		#size-cells = <0>;

		compatible = "renesas,rmobile-iic";

		reg = <0 0xe6520000 0 0x428>;

		interrupt-parent = <&gic>;

		interrupts = <0 176 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";

	};
@@ -210,7 +203,6 @@ 
		#size-cells = <0>;

		compatible = "renesas,rmobile-iic";

		reg = <0 0xe6530000 0 0x428>;

		interrupt-parent = <&gic>;

		interrupts = <0 177 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";

	};
@@ -220,7 +212,6 @@ 
		#size-cells = <0>;

		compatible = "renesas,rmobile-iic";

		reg = <0 0xe6540000 0 0x428>;

		interrupt-parent = <&gic>;

		interrupts = <0 178 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";

	};
@@ -230,7 +221,6 @@ 
		#size-cells = <0>;

		compatible = "renesas,rmobile-iic";

		reg = <0 0xe60b0000 0 0x428>;

		interrupt-parent = <&gic>;

		interrupts = <0 179 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";

	};
@@ -240,7 +230,6 @@ 
		#size-cells = <0>;

		compatible = "renesas,rmobile-iic";

		reg = <0 0xe6550000 0 0x428>;

		interrupt-parent = <&gic>;

		interrupts = <0 184 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";

	};
@@ -250,7 +239,6 @@ 
		#size-cells = <0>;

		compatible = "renesas,rmobile-iic";

		reg = <0 0xe6560000 0 0x428>;

		interrupt-parent = <&gic>;

		interrupts = <0 185 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";

	};
@@ -260,7 +248,6 @@ 
		#size-cells = <0>;

		compatible = "renesas,rmobile-iic";

		reg = <0 0xe6570000 0 0x428>;

		interrupt-parent = <&gic>;

		interrupts = <0 173 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";

	};
@@ -268,7 +255,6 @@ 
	mmcif0: mmc@ee200000 {

		compatible = "renesas,sh-mmcif";

		reg = <0 0xee200000 0 0x80>;

		interrupt-parent = <&gic>;

		interrupts = <0 169 IRQ_TYPE_LEVEL_HIGH>;

		reg-io-width = <4>;

		status = "disabled";
@@ -277,7 +263,6 @@ 
	mmcif1: mmc@ee220000 {

		compatible = "renesas,sh-mmcif";

		reg = <0 0xee220000 0 0x80>;

		interrupt-parent = <&gic>;

		interrupts = <0 170 IRQ_TYPE_LEVEL_HIGH>;

		reg-io-width = <4>;

		status = "disabled";
@@ -309,7 +294,6 @@ 
	sdhi0: sd@ee100000 {

		compatible = "renesas,sdhi-r8a73a4";

		reg = <0 0xee100000 0 0x100>;

		interrupt-parent = <&gic>;

		interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>;

		cap-sd-highspeed;

		status = "disabled";
@@ -318,7 +302,6 @@ 
	sdhi1: sd@ee120000 {

		compatible = "renesas,sdhi-r8a73a4";

		reg = <0 0xee120000 0 0x100>;

		interrupt-parent = <&gic>;

		interrupts = <0 166 IRQ_TYPE_LEVEL_HIGH>;

		cap-sd-highspeed;

		status = "disabled";
@@ -327,7 +310,6 @@ 
	sdhi2: sd@ee140000 {

		compatible = "renesas,sdhi-r8a73a4";

		reg = <0 0xee140000 0 0x100>;

		interrupt-parent = <&gic>;

		interrupts = <0 167 IRQ_TYPE_LEVEL_HIGH>;

		cap-sd-highspeed;

		status = "disabled";

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

+17 −0
Original line number Diff line number Diff line
@@ -158,6 +158,18 @@ 
	};

};



&ether {

	pinctrl-0 = <&ether_pins>;

	pinctrl-names = "default";



	phy-handle = <&phy0>;

	status = "ok";



	phy0: ethernet-phy@0 {

		reg = <0>;

	};

};



&i2c0 {

	status = "okay";

	touchscreen@55 {
@@ -189,6 +201,11 @@ 
	pinctrl-0 = <&scifa1_pins>;

	pinctrl-names = "default";



	ether_pins: ether {

		renesas,groups = "gether_mii", "gether_int";

		renesas,function = "gether";

	};



	scifa1_pins: serial1 {

		renesas,groups = "scifa1_data";

		renesas,function = "scifa1";

arch/arm/boot/dts/r8a7740.dtsi

+13 −11
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 


/ {

	compatible = "renesas,r8a7740";

	interrupt-parent = <&gic>;



	cpus {

		#address-cells = <1>;
@@ -48,7 +49,6 @@ 
			<0xe6900020 1>,

			<0xe6900040 1>,

			<0xe6900060 1>;

		interrupt-parent = <&gic>;

		interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH

			      0 149 IRQ_TYPE_LEVEL_HIGH

			      0 149 IRQ_TYPE_LEVEL_HIGH
@@ -69,7 +69,6 @@ 
			<0xe6900024 1>,

			<0xe6900044 1>,

			<0xe6900064 1>;

		interrupt-parent = <&gic>;

		interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH

			      0 149 IRQ_TYPE_LEVEL_HIGH

			      0 149 IRQ_TYPE_LEVEL_HIGH
@@ -90,7 +89,6 @@ 
			<0xe6900028 1>,

			<0xe6900048 1>,

			<0xe6900068 1>;

		interrupt-parent = <&gic>;

		interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH

			      0 149 IRQ_TYPE_LEVEL_HIGH

			      0 149 IRQ_TYPE_LEVEL_HIGH
@@ -111,7 +109,6 @@ 
			<0xe690002c 1>,

			<0xe690004c 1>,

			<0xe690006c 1>;

		interrupt-parent = <&gic>;

		interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH

			      0 149 IRQ_TYPE_LEVEL_HIGH

			      0 149 IRQ_TYPE_LEVEL_HIGH
@@ -122,12 +119,23 @@ 
			      0 149 IRQ_TYPE_LEVEL_HIGH>;

	};



	ether: ethernet@e9a00000 {

		compatible = "renesas,gether-r8a7740";

		reg = <0xe9a00000 0x800>,

		      <0xe9a01800 0x800>;

		interrupts = <0 110 IRQ_TYPE_LEVEL_HIGH>;

		/* clocks = <&mstp3_clks R8A7740_CLK_GETHER>; */

		phy-mode = "mii";

		#address-cells = <1>;

		#size-cells = <0>;

		status = "disabled";

	};



	i2c0: i2c@fff20000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "renesas,iic-r8a7740", "renesas,rmobile-iic";

		reg = <0xfff20000 0x425>;

		interrupt-parent = <&gic>;

		interrupts = <0 201 IRQ_TYPE_LEVEL_HIGH

			      0 202 IRQ_TYPE_LEVEL_HIGH

			      0 203 IRQ_TYPE_LEVEL_HIGH
@@ -140,7 +148,6 @@ 
		#size-cells = <0>;

		compatible = "renesas,iic-r8a7740", "renesas,rmobile-iic";

		reg = <0xe6c20000 0x425>;

		interrupt-parent = <&gic>;

		interrupts = <0 70 IRQ_TYPE_LEVEL_HIGH

			      0 71 IRQ_TYPE_LEVEL_HIGH

			      0 72 IRQ_TYPE_LEVEL_HIGH
@@ -175,7 +182,6 @@ 
	mmcif0: mmc@e6bd0000 {

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

		reg = <0xe6bd0000 0x100>;

		interrupt-parent = <&gic>;

		interrupts = <0 56 IRQ_TYPE_LEVEL_HIGH

			      0 57 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";
@@ -184,7 +190,6 @@ 
	sdhi0: sd@e6850000 {

		compatible = "renesas,sdhi-r8a7740";

		reg = <0xe6850000 0x100>;

		interrupt-parent = <&gic>;

		interrupts = <0 117 IRQ_TYPE_LEVEL_HIGH

			      0 118 IRQ_TYPE_LEVEL_HIGH

			      0 119 IRQ_TYPE_LEVEL_HIGH>;
@@ -196,7 +201,6 @@ 
	sdhi1: sd@e6860000 {

		compatible = "renesas,sdhi-r8a7740";

		reg = <0xe6860000 0x100>;

		interrupt-parent = <&gic>;

		interrupts = <0 121 IRQ_TYPE_LEVEL_HIGH

			      0 122 IRQ_TYPE_LEVEL_HIGH

			      0 123 IRQ_TYPE_LEVEL_HIGH>;
@@ -208,7 +212,6 @@ 
	sdhi2: sd@e6870000 {

		compatible = "renesas,sdhi-r8a7740";

		reg = <0xe6870000 0x100>;

		interrupt-parent = <&gic>;

		interrupts = <0 125 IRQ_TYPE_LEVEL_HIGH

			      0 126 IRQ_TYPE_LEVEL_HIGH

			      0 127 IRQ_TYPE_LEVEL_HIGH>;
@@ -221,7 +224,6 @@ 
		#sound-dai-cells = <1>;

		compatible = "renesas,fsi2-r8a7740", "renesas,sh_fsi2";

		reg = <0xfe1f0000 0x400>;

		interrupt-parent = <&gic>;

		interrupts = <0 9 0x4>;

		status = "disabled";

	};

arch/arm/boot/dts/r8a7778.dtsi

+1 −17
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 


/ {

	compatible = "renesas,r8a7778";

	interrupt-parent = <&gic>;



	cpus {

		cpu@0 {
@@ -52,7 +53,6 @@ 
			<0xfe780024 4>,

			<0xfe780044 4>,

			<0xfe780064 4>;

		interrupt-parent = <&gic>;

		interrupts =   <0 27 IRQ_TYPE_LEVEL_HIGH

				0 28 IRQ_TYPE_LEVEL_HIGH

				0 29 IRQ_TYPE_LEVEL_HIGH
@@ -63,7 +63,6 @@ 
	gpio0: gpio@ffc40000 {

		compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar";

		reg = <0xffc40000 0x2c>;

		interrupt-parent = <&gic>;

		interrupts = <0 103 IRQ_TYPE_LEVEL_HIGH>;

		#gpio-cells = <2>;

		gpio-controller;
@@ -75,7 +74,6 @@ 
	gpio1: gpio@ffc41000 {

		compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar";

		reg = <0xffc41000 0x2c>;

		interrupt-parent = <&gic>;

		interrupts = <0 103 IRQ_TYPE_LEVEL_HIGH>;

		#gpio-cells = <2>;

		gpio-controller;
@@ -87,7 +85,6 @@ 
	gpio2: gpio@ffc42000 {

		compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar";

		reg = <0xffc42000 0x2c>;

		interrupt-parent = <&gic>;

		interrupts = <0 103 IRQ_TYPE_LEVEL_HIGH>;

		#gpio-cells = <2>;

		gpio-controller;
@@ -99,7 +96,6 @@ 
	gpio3: gpio@ffc43000 {

		compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar";

		reg = <0xffc43000 0x2c>;

		interrupt-parent = <&gic>;

		interrupts = <0 103 IRQ_TYPE_LEVEL_HIGH>;

		#gpio-cells = <2>;

		gpio-controller;
@@ -111,7 +107,6 @@ 
	gpio4: gpio@ffc44000 {

		compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar";

		reg = <0xffc44000 0x2c>;

		interrupt-parent = <&gic>;

		interrupts = <0 103 IRQ_TYPE_LEVEL_HIGH>;

		#gpio-cells = <2>;

		gpio-controller;
@@ -130,7 +125,6 @@ 
		#size-cells = <0>;

		compatible = "renesas,i2c-r8a7778";

		reg = <0xffc70000 0x1000>;

		interrupt-parent = <&gic>;

		interrupts = <0 67 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";

	};
@@ -140,7 +134,6 @@ 
		#size-cells = <0>;

		compatible = "renesas,i2c-r8a7778";

		reg = <0xffc71000 0x1000>;

		interrupt-parent = <&gic>;

		interrupts = <0 78 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";

	};
@@ -150,7 +143,6 @@ 
		#size-cells = <0>;

		compatible = "renesas,i2c-r8a7778";

		reg = <0xffc72000 0x1000>;

		interrupt-parent = <&gic>;

		interrupts = <0 76 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";

	};
@@ -160,7 +152,6 @@ 
		#size-cells = <0>;

		compatible = "renesas,i2c-r8a7778";

		reg = <0xffc73000 0x1000>;

		interrupt-parent = <&gic>;

		interrupts = <0 77 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";

	};
@@ -168,7 +159,6 @@ 
	mmcif: mmc@ffe4e000 {

		compatible = "renesas,sh-mmcif";

		reg = <0xffe4e000 0x100>;

		interrupt-parent = <&gic>;

		interrupts = <0 61 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";

	};
@@ -176,7 +166,6 @@ 
	sdhi0: sd@ffe4c000 {

		compatible = "renesas,sdhi-r8a7778";

		reg = <0xffe4c000 0x100>;

		interrupt-parent = <&gic>;

		interrupts = <0 87 IRQ_TYPE_LEVEL_HIGH>;

		cap-sd-highspeed;

		cap-sdio-irq;
@@ -186,7 +175,6 @@ 
	sdhi1: sd@ffe4d000 {

		compatible = "renesas,sdhi-r8a7778";

		reg = <0xffe4d000 0x100>;

		interrupt-parent = <&gic>;

		interrupts = <0 88 IRQ_TYPE_LEVEL_HIGH>;

		cap-sd-highspeed;

		cap-sdio-irq;
@@ -196,7 +184,6 @@ 
	sdhi2: sd@ffe4f000 {

		compatible = "renesas,sdhi-r8a7778";

		reg = <0xffe4f000 0x100>;

		interrupt-parent = <&gic>;

		interrupts = <0 86 IRQ_TYPE_LEVEL_HIGH>;

		cap-sd-highspeed;

		cap-sdio-irq;
@@ -206,7 +193,6 @@ 
	hspi0: spi@fffc7000 {

		compatible = "renesas,hspi-r8a7778", "renesas,hspi";

		reg = <0xfffc7000 0x18>;

		interrupt-parent = <&gic>;

		interrupts = <0 63 IRQ_TYPE_LEVEL_HIGH>;

		#address-cells = <1>;

		#size-cells = <0>;
@@ -216,7 +202,6 @@ 
	hspi1: spi@fffc8000 {

		compatible = "renesas,hspi-r8a7778", "renesas,hspi";

		reg = <0xfffc8000 0x18>;

		interrupt-parent = <&gic>;

		interrupts = <0 84 IRQ_TYPE_LEVEL_HIGH>;

		#address-cells = <1>;

		#size-cells = <0>;
@@ -226,7 +211,6 @@ 
	hspi2: spi@fffc6000 {

		compatible = "renesas,hspi-r8a7778", "renesas,hspi";

		reg = <0xfffc6000 0x18>;

		interrupt-parent = <&gic>;

		interrupts = <0 85 IRQ_TYPE_LEVEL_HIGH>;

		#address-cells = <1>;

		#size-cells = <0>;

arch/arm/boot/dts/r8a7779-marzen-reference.dts

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
		phy-mode = "mii";

		interrupt-parent = <&irqpin0>;

		interrupts = <1 IRQ_TYPE_EDGE_FALLING>;

		smsc,irq-push-pull;

		reg-io-width = <4>;

		vddvario-supply = <&fixedregulator3v3>;

		vdd33a-supply = <&fixedregulator3v3>;