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

Commit 6cd26ece authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

From Simon Horman:
Renesas ARM-based SoC DT updates for v3.11

* Armadillo800eva reference DT - bring up armadillo800eva baord
  using DT as much as possible
* Remove unused GIC dtsi entries for r8a7790 and r8a73a4
* Add AS3711 and CPUFreq DT bindings for kzm9g-reference
* Add irqpin DT support for marzen-reference

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

:
  ARM: shmobile: marzen-reference: add irqpin support in DT
  ARM: shmobile: kzm9g-reference: add AS3711 and CPUFreq DT bindings
  ARM: shmobile: armadillo800eva: Reference DT implementation
  ARM: shmobile: Remove unused r8a7790 GIC CPU interface DT bits
  ARM: shmobile: Remove unused r8a73a4 GIC CPU interface DT bits
  ARM: shmobile: r8a7740: Prepare for reference DT setup
  ARM: shmobile: r8a7740: Add OF support to initialze the GIC

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents b131eaa3 24603f3c

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ dtb-$(CONFIG_ARCH_U8500) += snowball.dtb \ 
dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \

	r8a7740-armadillo800eva.dtb \

	r8a7778-bockw.dtb \

	r8a7740-armadillo800eva-reference.dtb \

	r8a7779-marzen-reference.dtb \

	r8a7790-lager.dtb \

	sh73a0-kzm9g.dtb \

arch/arm/boot/dts/r8a73a4.dtsi

+0 −6
Original line number Diff line number Diff line
@@ -37,12 +37,6 @@ 
			<0 0xf1004000 0 0x2000>,

			<0 0xf1006000 0 0x2000>;

		interrupts = <1 9 0xf04>;



		gic-cpuif@4 {

			compatible = "arm,gic-cpuif";

			cpuif-id = <4>;

			cpu = <&cpu0>;

		};

	};



	timer {

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

0 → 100644
+45 −0
Original line number Diff line number Diff line 
/*

 * Reference Device Tree Source for the armadillo 800 eva board

 *

 * Copyright (C) 2012 Renesas Solutions Corp.

 *

 * This file is licensed under the terms of the GNU General Public License

 * version 2.  This program is licensed "as is" without any warranty of any

 * kind, whether express or implied.

 */



/dts-v1/;

/include/ "r8a7740.dtsi"



/ {

	model = "armadillo 800 eva reference";

	compatible = "renesas,armadillo800eva-reference", "renesas,r8a7740";



	chosen {

		bootargs = "console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize=4096,wsize=4096 rw";

	};



	memory {

		device_type = "memory";

		reg = <0x40000000 0x20000000>;

	};



	reg_3p3v: regulator@0 {

		compatible = "regulator-fixed";

		regulator-name = "fixed-3.3V";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-always-on;

		regulator-boot-on;

	};



};



&i2c0 {

	touchscreen: st1232@55 {

		compatible = "sitronix,st1232";

		reg = <0x55>;

		interrupt-parent = <&irqpin1>;

		interrupts = <2 0>; /* IRQ10: hwirq 2 on irqpin1 */

	};

};

arch/arm/boot/dts/r8a7740.dtsi

+117 −0
Original line number Diff line number Diff line
@@ -22,4 +22,121 @@ 
			reg = <0x0>;

		};

	};



	gic: interrupt-controller@c2800000 {

		compatible = "arm,cortex-a9-gic";

		#interrupt-cells = <3>;

		#address-cells = <1>;

		interrupt-controller;

		reg = <0xc2800000 0x1000>,

		      <0xc2000000 0x1000>;

	};



	/* irqpin0: IRQ0 - IRQ7 */

	irqpin0: irqpin@e6900000 {

		compatible = "renesas,intc-irqpin";

		#interrupt-cells = <2>;

		interrupt-controller;

		reg = <0xe6900000 4>,

			<0xe6900010 4>,

			<0xe6900020 1>,

			<0xe6900040 1>,

			<0xe6900060 1>;

		interrupt-parent = <&gic>;

		interrupts = <0 149 0x4

			      0 149 0x4

			      0 149 0x4

			      0 149 0x4

			      0 149 0x4

			      0 149 0x4

			      0 149 0x4

			      0 149 0x4>;

	};



	/* irqpin1: IRQ8 - IRQ15 */

	irqpin1: irqpin@e6900004 {

		compatible = "renesas,intc-irqpin";

		#interrupt-cells = <2>;

		interrupt-controller;

		reg = <0xe6900004 4>,

			<0xe6900014 4>,

			<0xe6900024 1>,

			<0xe6900044 1>,

			<0xe6900064 1>;

		interrupt-parent = <&gic>;

		interrupts = <0 149 0x4

			      0 149 0x4

			      0 149 0x4

			      0 149 0x4

			      0 149 0x4

			      0 149 0x4

			      0 149 0x4

			      0 149 0x4>;

	};



	/* irqpin2: IRQ16 - IRQ23 */

	irqpin2: irqpin@e6900008 {

		compatible = "renesas,intc-irqpin";

		#interrupt-cells = <2>;

		interrupt-controller;

		reg = <0xe6900008 4>,

			<0xe6900018 4>,

			<0xe6900028 1>,

			<0xe6900048 1>,

			<0xe6900068 1>;

		interrupt-parent = <&gic>;

		interrupts = <0 149 0x4

			      0 149 0x4

			      0 149 0x4

			      0 149 0x4

			      0 149 0x4

			      0 149 0x4

			      0 149 0x4

			      0 149 0x4>;

	};



	/* irqpin3: IRQ24 - IRQ31 */

	irqpin3: irqpin@e690000c {

		compatible = "renesas,intc-irqpin";

		#interrupt-cells = <2>;

		interrupt-controller;

		reg = <0xe690000c 4>,

			<0xe690001c 4>,

			<0xe690002c 1>,

			<0xe690004c 1>,

			<0xe690006c 1>;

		interrupt-parent = <&gic>;

		interrupts = <0 149 0x4

			      0 149 0x4

			      0 149 0x4

			      0 149 0x4

			      0 149 0x4

			      0 149 0x4

			      0 149 0x4

			      0 149 0x4>;

	};



	i2c0: i2c@fff20000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "renesas,rmobile-iic";

		reg = <0xfff20000 0x425>;

		interrupt-parent = <&gic>;

		interrupts = <0 201 0x4

			      0 202 0x4

			      0 203 0x4

			      0 204 0x4>;

	};



	i2c1: i2c@e6c20000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "renesas,rmobile-iic";

		reg = <0xe6c20000 0x425>;

		interrupt-parent = <&gic>;

		interrupts = <0 70 0x4

			      0 71 0x4

			      0 72 0x4

			      0 73 0x4>;

	};

};

arch/arm/boot/dts/r8a7779.dtsi

+17 −0
Original line number Diff line number Diff line
@@ -48,6 +48,23 @@ 
                      <0xf0000100 0x100>;

        };



	irqpin0: irqpin@fe780010 {

		compatible = "renesas,intc-irqpin";

		#interrupt-cells = <2>;

		interrupt-controller;

		reg = <0xfe78001c 4>,

			<0xfe780010 4>,

			<0xfe780024 4>,

			<0xfe780044 4>,

			<0xfe780064 4>;

		interrupt-parent = <&gic>;

		interrupts = <0 27 0x4

				0 28 0x4

				0 29 0x4

				0 30 0x4>;

		sense-bitfield-width = <2>;

	};



	i2c0: i2c@0xffc70000 {

		#address-cells = <1>;

		#size-cells = <0>;