* [PATCH 01/13] ARM: shmobile: only enable used I2C interfaces in DT on all Renesas boards
2013-10-09 6:50 [GIT PULL] Second Round of Renesas ARM-based SoC DT updates for v3.13 Simon Horman
@ 2013-10-09 6:50 ` Simon Horman
2013-10-09 6:50 ` [PATCH 02/13] ARM: shmobile: r8a7790: add I2C DT nodes Simon Horman
` (12 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Simon Horman @ 2013-10-09 6:50 UTC (permalink / raw)
To: linux-arm-kernel
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Currently all I2C interfaces in all *.dtsi files for various Renesas SoCs
are enabled by default. Switch them all off and only enable populated I2C
interfaces in board-specific *.dts files.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 1 +
arch/arm/boot/dts/r8a73a4-ape6evm.dts | 1 +
arch/arm/boot/dts/r8a73a4.dtsi | 9 +++++++++
arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts | 1 +
arch/arm/boot/dts/r8a7740.dtsi | 2 ++
arch/arm/boot/dts/r8a7779.dtsi | 4 ++++
arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 2 ++
arch/arm/boot/dts/sh73a0.dtsi | 5 +++++
8 files changed, 25 insertions(+)
diff --git a/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts b/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts
index 2b49b05..9443e93 100644
--- a/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts
+++ b/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts
@@ -62,6 +62,7 @@
};
&i2c5 {
+ status = "okay";
vdd_dvfs: max8973@1b {
compatible = "maxim,max8973";
reg = <0x1b>;
diff --git a/arch/arm/boot/dts/r8a73a4-ape6evm.dts b/arch/arm/boot/dts/r8a73a4-ape6evm.dts
index 72f867e..91436b5 100644
--- a/arch/arm/boot/dts/r8a73a4-ape6evm.dts
+++ b/arch/arm/boot/dts/r8a73a4-ape6evm.dts
@@ -52,6 +52,7 @@
};
&i2c5 {
+ status = "okay";
vdd_dvfs: max8973@1b {
compatible = "maxim,max8973";
reg = <0x1b>;
diff --git a/arch/arm/boot/dts/r8a73a4.dtsi b/arch/arm/boot/dts/r8a73a4.dtsi
index 6c26caa..a2c9456 100644
--- a/arch/arm/boot/dts/r8a73a4.dtsi
+++ b/arch/arm/boot/dts/r8a73a4.dtsi
@@ -93,6 +93,7 @@
reg = <0 0xe6500000 0 0x428>;
interrupt-parent = <&gic>;
interrupts = <0 174 0x4>;
+ status = "disabled";
};
i2c1: i2c@e6510000 {
@@ -102,6 +103,7 @@
reg = <0 0xe6510000 0 0x428>;
interrupt-parent = <&gic>;
interrupts = <0 175 0x4>;
+ status = "disabled";
};
i2c2: i2c@e6520000 {
@@ -111,6 +113,7 @@
reg = <0 0xe6520000 0 0x428>;
interrupt-parent = <&gic>;
interrupts = <0 176 0x4>;
+ status = "disabled";
};
i2c3: i2c@e6530000 {
@@ -120,6 +123,7 @@
reg = <0 0xe6530000 0 0x428>;
interrupt-parent = <&gic>;
interrupts = <0 177 0x4>;
+ status = "disabled";
};
i2c4: i2c@e6540000 {
@@ -129,6 +133,7 @@
reg = <0 0xe6540000 0 0x428>;
interrupt-parent = <&gic>;
interrupts = <0 178 0x4>;
+ status = "disabled";
};
i2c5: i2c@e60b0000 {
@@ -138,6 +143,7 @@
reg = <0 0xe60b0000 0 0x428>;
interrupt-parent = <&gic>;
interrupts = <0 179 0x4>;
+ status = "disabled";
};
i2c6: i2c@e6550000 {
@@ -147,6 +153,7 @@
reg = <0 0xe6550000 0 0x428>;
interrupt-parent = <&gic>;
interrupts = <0 184 0x4>;
+ status = "disabled";
};
i2c7: i2c@e6560000 {
@@ -156,6 +163,7 @@
reg = <0 0xe6560000 0 0x428>;
interrupt-parent = <&gic>;
interrupts = <0 185 0x4>;
+ status = "disabled";
};
i2c8: i2c@e6570000 {
@@ -165,6 +173,7 @@
reg = <0 0xe6570000 0 0x428>;
interrupt-parent = <&gic>;
interrupts = <0 173 0x4>;
+ status = "disabled";
};
mmcif0: mmcif@ee200000 {
diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts
index c638e4a..9fcffc1 100644
--- a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts
+++ b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts
@@ -52,6 +52,7 @@
};
&i2c0 {
+ status = "okay";
touchscreen: st1232@55 {
compatible = "sitronix,st1232";
reg = <0x55>;
diff --git a/arch/arm/boot/dts/r8a7740.dtsi b/arch/arm/boot/dts/r8a7740.dtsi
index 44d3d52..868bdde 100644
--- a/arch/arm/boot/dts/r8a7740.dtsi
+++ b/arch/arm/boot/dts/r8a7740.dtsi
@@ -131,6 +131,7 @@
0 202 0x4
0 203 0x4
0 204 0x4>;
+ status = "disabled";
};
i2c1: i2c@e6c20000 {
@@ -143,6 +144,7 @@
0 71 0x4
0 72 0x4
0 73 0x4>;
+ status = "disabled";
};
pfc: pfc@e6050000 {
diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi
index 23a6244..65dc652 100644
--- a/arch/arm/boot/dts/r8a7779.dtsi
+++ b/arch/arm/boot/dts/r8a7779.dtsi
@@ -156,6 +156,7 @@
reg = <0xffc70000 0x1000>;
interrupt-parent = <&gic>;
interrupts = <0 79 0x4>;
+ status = "disabled";
};
i2c1: i2c@ffc71000 {
@@ -165,6 +166,7 @@
reg = <0xffc71000 0x1000>;
interrupt-parent = <&gic>;
interrupts = <0 82 0x4>;
+ status = "disabled";
};
i2c2: i2c@ffc72000 {
@@ -174,6 +176,7 @@
reg = <0xffc72000 0x1000>;
interrupt-parent = <&gic>;
interrupts = <0 80 0x4>;
+ status = "disabled";
};
i2c3: i2c@ffc73000 {
@@ -183,6 +186,7 @@
reg = <0xffc73000 0x1000>;
interrupt-parent = <&gic>;
interrupts = <0 81 0x4>;
+ status = "disabled";
};
pfc: pfc@fffc0000 {
diff --git a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
index 2122306..8ee06dd 100644
--- a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
+++ b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
@@ -108,6 +108,7 @@
};
&i2c0 {
+ status = "okay";
as3711@40 {
compatible = "ams,as3711";
reg = <0x40>;
@@ -183,6 +184,7 @@
&i2c3 {
pinctrl-0 = <&i2c3_pins>;
pinctrl-names = "default";
+ status = "okay";
};
&mmcif {
diff --git a/arch/arm/boot/dts/sh73a0.dtsi b/arch/arm/boot/dts/sh73a0.dtsi
index ba59a58..f56665a 100644
--- a/arch/arm/boot/dts/sh73a0.dtsi
+++ b/arch/arm/boot/dts/sh73a0.dtsi
@@ -135,6 +135,7 @@
0 168 0x4
0 169 0x4
0 170 0x4>;
+ status = "disabled";
};
i2c1: i2c@e6822000 {
@@ -147,6 +148,7 @@
0 52 0x4
0 53 0x4
0 54 0x4>;
+ status = "disabled";
};
i2c2: i2c@e6824000 {
@@ -159,6 +161,7 @@
0 172 0x4
0 173 0x4
0 174 0x4>;
+ status = "disabled";
};
i2c3: i2c@e6826000 {
@@ -171,6 +174,7 @@
0 184 0x4
0 185 0x4
0 186 0x4>;
+ status = "disabled";
};
i2c4: i2c@e6828000 {
@@ -183,6 +187,7 @@
0 188 0x4
0 189 0x4
0 190 0x4>;
+ status = "disabled";
};
mmcif: mmcif@e6bd0000 {
--
1.8.4
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 02/13] ARM: shmobile: r8a7790: add I2C DT nodes
2013-10-09 6:50 [GIT PULL] Second Round of Renesas ARM-based SoC DT updates for v3.13 Simon Horman
2013-10-09 6:50 ` [PATCH 01/13] ARM: shmobile: only enable used I2C interfaces in DT on all Renesas boards Simon Horman
@ 2013-10-09 6:50 ` Simon Horman
2013-10-09 6:50 ` [PATCH 03/13] ARM: shmobile: r8a73a4: add a DT node for the DMAC Simon Horman
` (11 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Simon Horman @ 2013-10-09 6:50 UTC (permalink / raw)
To: linux-arm-kernel
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Add DT nodes for the four I2C interfacces on r8a7790.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7790.dtsi | 40 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index a0cfb661..47bc1cb 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -176,6 +176,46 @@
interrupts = <0 0 4>, <0 1 4>, <0 2 4>, <0 3 4>;
};
+ i2c0: i2c@e6508000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "renesas,i2c-r8a7790";
+ reg = <0 0xe6508000 0 0x40>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 287 0x4>;
+ status = "disabled";
+ };
+
+ i2c1: i2c@e6518000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "renesas,i2c-r8a7790";
+ reg = <0 0xe6518000 0 0x40>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 288 0x4>;
+ status = "disabled";
+ };
+
+ i2c2: i2c@e6530000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "renesas,i2c-r8a7790";
+ reg = <0 0xe6530000 0 0x40>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 286 0x4>;
+ status = "disabled";
+ };
+
+ i2c3: i2c@e6540000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "renesas,i2c-r8a7790";
+ reg = <0 0xe6540000 0 0x40>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 290 0x4>;
+ status = "disabled";
+ };
+
mmcif0: mmcif@ee200000 {
compatible = "renesas,sh-mmcif";
reg = <0 0xee200000 0 0x80>;
--
1.8.4
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 03/13] ARM: shmobile: r8a73a4: add a DT node for the DMAC
2013-10-09 6:50 [GIT PULL] Second Round of Renesas ARM-based SoC DT updates for v3.13 Simon Horman
2013-10-09 6:50 ` [PATCH 01/13] ARM: shmobile: only enable used I2C interfaces in DT on all Renesas boards Simon Horman
2013-10-09 6:50 ` [PATCH 02/13] ARM: shmobile: r8a7790: add I2C DT nodes Simon Horman
@ 2013-10-09 6:50 ` Simon Horman
2013-10-09 6:50 ` [PATCH 04/13] ARM: shmobile: armadillo-reference: Add PWM backlight node to DT Simon Horman
` (10 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Simon Horman @ 2013-10-09 6:50 UTC (permalink / raw)
To: linux-arm-kernel
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Add a DT node for the only system DMAC instance on r8a73a4. The RT DMAC
can be added later under the same multiplexer, because they can serve the
same slaves and use the same MID-RID values. Configuration data is
supplied to the driver, using a compatibility match string.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a73a4.dtsi | 43 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 43 insertions(+)
diff --git a/arch/arm/boot/dts/r8a73a4.dtsi b/arch/arm/boot/dts/r8a73a4.dtsi
index a2c9456..8c81a0c 100644
--- a/arch/arm/boot/dts/r8a73a4.dtsi
+++ b/arch/arm/boot/dts/r8a73a4.dtsi
@@ -78,6 +78,49 @@
<0 56 4>, <0 57 4>;
};
+ dmac: dma-multiplexer@0 {
+ compatible = "renesas,shdma-mux";
+ #dma-cells = <1>;
+ dma-channels = <20>;
+ dma-requests = <256>;
+ #address-cells = <2>;
+ #size-cells = <2>;
+ ranges;
+
+ dma0: dma-controller@e6700020 {
+ compatible = "renesas,shdma-r8a73a4";
+ reg = <0 0xe6700020 0 0x89e0>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 220 4
+ 0 200 4
+ 0 201 4
+ 0 202 4
+ 0 203 4
+ 0 204 4
+ 0 205 4
+ 0 206 4
+ 0 207 4
+ 0 208 4
+ 0 209 4
+ 0 210 4
+ 0 211 4
+ 0 212 4
+ 0 213 4
+ 0 214 4
+ 0 215 4
+ 0 216 4
+ 0 217 4
+ 0 218 4
+ 0 219 4>;
+ interrupt-names = "error",
+ "ch0", "ch1", "ch2", "ch3",
+ "ch4", "ch5", "ch6", "ch7",
+ "ch8", "ch9", "ch10", "ch11",
+ "ch12", "ch13", "ch14", "ch15",
+ "ch16", "ch17", "ch18", "ch19";
+ };
+ };
+
thermal@e61f0000 {
compatible = "renesas,rcar-thermal";
reg = <0 0xe61f0000 0 0x14>, <0 0xe61f0100 0 0x38>,
--
1.8.4
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 04/13] ARM: shmobile: armadillo-reference: Add PWM backlight node to DT
2013-10-09 6:50 [GIT PULL] Second Round of Renesas ARM-based SoC DT updates for v3.13 Simon Horman
` (2 preceding siblings ...)
2013-10-09 6:50 ` [PATCH 03/13] ARM: shmobile: r8a73a4: add a DT node for the DMAC Simon Horman
@ 2013-10-09 6:50 ` Simon Horman
2013-10-09 6:50 ` [PATCH 05/13] ARM: shmobile: armadillo800eva-reference: add SDHI and MMCIF interfaces Simon Horman
` (9 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Simon Horman @ 2013-10-09 6:50 UTC (permalink / raw)
To: linux-arm-kernel
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
.../boot/dts/r8a7740-armadillo800eva-reference.dts | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts
index 9fcffc1..8b2aab5 100644
--- a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts
+++ b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts
@@ -11,6 +11,7 @@
/dts-v1/;
/include/ "r8a7740.dtsi"
#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/pwm/pwm.h>
/ {
model = "armadillo 800 eva reference";
@@ -49,6 +50,15 @@
gpios = <&pfc 177 GPIO_ACTIVE_HIGH>;
};
};
+
+ backlight {
+ compatible = "pwm-backlight";
+ pwms = <&tpu 2 33333 PWM_POLARITY_INVERTED>;
+ brightness-levels = <0 1 2 4 8 16 32 64 128 255>;
+ default-brightness-level = <9>;
+ pinctrl-0 = <&backlight_pins>;
+ pinctrl-names = "default";
+ };
};
&i2c0 {
@@ -77,4 +87,13 @@
renesas,groups = "intc_irq10";
renesas,function = "intc";
};
+
+ backlight_pins: backlight {
+ renesas,groups = "tpu0_to2_1";
+ renesas,function = "tpu0";
+ };
+};
+
+&tpu {
+ status = "okay";
};
--
1.8.4
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 05/13] ARM: shmobile: armadillo800eva-reference: add SDHI and MMCIF interfaces
2013-10-09 6:50 [GIT PULL] Second Round of Renesas ARM-based SoC DT updates for v3.13 Simon Horman
` (3 preceding siblings ...)
2013-10-09 6:50 ` [PATCH 04/13] ARM: shmobile: armadillo-reference: Add PWM backlight node to DT Simon Horman
@ 2013-10-09 6:50 ` Simon Horman
2013-10-09 6:50 ` [PATCH 06/13] ARM: shmobile: r8a7791 IRQC device tree node Simon Horman
` (8 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Simon Horman @ 2013-10-09 6:50 UTC (permalink / raw)
To: linux-arm-kernel
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Add SDHI0 and MMCIF interfaces to armadillo800eva-reference with
regulators and pin configurations. SDHI1 is not added yet, because the
switch, that connects the interface either to an SD slot or to a WiFi
SDIO card cannot be described in DT yet.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
.../boot/dts/r8a7740-armadillo800eva-reference.dts | 58 ++++++++++++++++++++++
arch/arm/boot/dts/r8a7740.dtsi | 33 ++++++++++++
2 files changed, 91 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts
index 8b2aab5..1c56c5e 100644
--- a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts
+++ b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts
@@ -35,6 +35,33 @@
regulator-boot-on;
};
+ vcc_sdhi0: regulator@1 {
+ compatible = "regulator-fixed";
+
+ regulator-name = "SDHI0 Vcc";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+
+ gpio = <&pfc 75 GPIO_ACTIVE_HIGH>;
+ enable-active-high;
+ };
+
+ vccq_sdhi0: regulator@2 {
+ compatible = "regulator-gpio";
+
+ regulator-name = "SDHI0 VccQ";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
+ vin-supply = <&vcc_sdhi0>;
+
+ enable-gpio = <&pfc 74 GPIO_ACTIVE_HIGH>;
+ gpios = <&pfc 17 GPIO_ACTIVE_HIGH>;
+ states = <3300000 0
+ 1800000 1>;
+
+ enable-active-high;
+ };
+
leds {
compatible = "gpio-leds";
led1 {
@@ -92,8 +119,39 @@
renesas,groups = "tpu0_to2_1";
renesas,function = "tpu0";
};
+
+ mmc0_pins: mmc0 {
+ renesas,groups = "mmc0_data8_1", "mmc0_ctrl_1";
+ renesas,function = "mmc0";
+ };
+
+ sdhi0_pins: sdhi0 {
+ renesas,groups = "sdhi0_data4", "sdhi0_ctrl", "sdhi0_wp";
+ renesas,function = "sdhi0";
+ };
};
&tpu {
status = "okay";
};
+
+&mmcif0 {
+ pinctrl-0 = <&mmc0_pins>;
+ pinctrl-names = "default";
+
+ vmmc-supply = <®_3p3v>;
+ bus-width = <8>;
+ non-removable;
+ status = "okay";
+};
+
+&sdhi0 {
+ pinctrl-0 = <&sdhi0_pins>;
+ pinctrl-names = "default";
+
+ vmmc-supply = <&vcc_sdhi0>;
+ vqmmc-supply = <&vccq_sdhi0>;
+ bus-width = <4>;
+ cd-gpios = <&pfc 167 GPIO_ACTIVE_LOW>;
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/r8a7740.dtsi b/arch/arm/boot/dts/r8a7740.dtsi
index 868bdde..ae1e230 100644
--- a/arch/arm/boot/dts/r8a7740.dtsi
+++ b/arch/arm/boot/dts/r8a7740.dtsi
@@ -161,4 +161,37 @@
status = "disabled";
#pwm-cells = <3>;
};
+
+ mmcif0: mmcif@e6bd0000 {
+ compatible = "renesas,sh-mmcif";
+ reg = <0xe6bd0000 0x100>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 56 4
+ 0 57 4>;
+ status = "disabled";
+ };
+
+ sdhi0: sdhi@e6850000 {
+ compatible = "renesas,sdhi-r8a7740";
+ reg = <0xe6850000 0x100>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 117 4
+ 0 118 4
+ 0 119 4>;
+ cap-sd-highspeed;
+ cap-sdio-irq;
+ status = "disabled";
+ };
+
+ sdhi1: sdhi@e6860000 {
+ compatible = "renesas,sdhi-r8a7740";
+ reg = <0xe6860000 0x100>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 121 4
+ 0 122 4
+ 0 123 4>;
+ cap-sd-highspeed;
+ cap-sdio-irq;
+ status = "disabled";
+ };
};
--
1.8.4
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 06/13] ARM: shmobile: r8a7791 IRQC device tree node
2013-10-09 6:50 [GIT PULL] Second Round of Renesas ARM-based SoC DT updates for v3.13 Simon Horman
` (4 preceding siblings ...)
2013-10-09 6:50 ` [PATCH 05/13] ARM: shmobile: armadillo800eva-reference: add SDHI and MMCIF interfaces Simon Horman
@ 2013-10-09 6:50 ` Simon Horman
2013-10-09 6:50 ` [PATCH 07/13] ARM: shmobile: r8a7791 Arch timer " Simon Horman
` (7 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Simon Horman @ 2013-10-09 6:50 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm@opensource.se>
Enable a r8a7791 IRQC block by adding a device tree
node for the IRQC hardware and pins IRQ0 to IRQ9.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7791.dtsi | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index bbed43b..b701417 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -38,4 +38,22 @@
<0 0xf1006000 0 0x2000>;
interrupts = <1 9 0xf04>;
};
+
+ irqc0: interrupt-controller@e61c0000 {
+ compatible = "renesas,irqc";
+ #interrupt-cells = <2>;
+ interrupt-controller;
+ reg = <0 0xe61c0000 0 0x200>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 0 4>,
+ <0 1 4>,
+ <0 2 4>,
+ <0 3 4>,
+ <0 12 4>,
+ <0 13 4>,
+ <0 14 4>,
+ <0 15 4>,
+ <0 16 4>,
+ <0 17 4>;
+ };
};
--
1.8.4
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 07/13] ARM: shmobile: r8a7791 Arch timer device tree node
2013-10-09 6:50 [GIT PULL] Second Round of Renesas ARM-based SoC DT updates for v3.13 Simon Horman
` (5 preceding siblings ...)
2013-10-09 6:50 ` [PATCH 06/13] ARM: shmobile: r8a7791 IRQC device tree node Simon Horman
@ 2013-10-09 6:50 ` Simon Horman
2013-10-09 6:50 ` [PATCH 08/13] ARM: shmobile: r8a7791 SMP " Simon Horman
` (6 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Simon Horman @ 2013-10-09 6:50 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm@opensource.se>
Add r8a7791 arch timer device tree information.
This needs to be used together with r8a7791 support
code that ties in the R-Car Gen2 arch timer workarounds.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7791.dtsi | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index b701417..a1a9e5c 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -39,6 +39,14 @@
interrupts = <1 9 0xf04>;
};
+ timer {
+ compatible = "arm,armv7-timer";
+ interrupts = <1 13 0xf08>,
+ <1 14 0xf08>,
+ <1 11 0xf08>,
+ <1 10 0xf08>;
+ };
+
irqc0: interrupt-controller@e61c0000 {
compatible = "renesas,irqc";
#interrupt-cells = <2>;
--
1.8.4
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 08/13] ARM: shmobile: r8a7791 SMP device tree node
2013-10-09 6:50 [GIT PULL] Second Round of Renesas ARM-based SoC DT updates for v3.13 Simon Horman
` (6 preceding siblings ...)
2013-10-09 6:50 ` [PATCH 07/13] ARM: shmobile: r8a7791 Arch timer " Simon Horman
@ 2013-10-09 6:50 ` Simon Horman
2013-10-09 6:50 ` [PATCH 09/13] ARM: shmobile: r8a7778: add renesas_intc_irqpin support on DTSI Simon Horman
` (5 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Simon Horman @ 2013-10-09 6:50 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm@opensource.se>
Add a device node for the r8a7791 secondary CPU core.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7791.dtsi | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index a1a9e5c..fea5cfe 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -25,6 +25,13 @@
reg = <0>;
clock-frequency = <1300000000>;
};
+
+ cpu1: cpu@1 {
+ device_type = "cpu";
+ compatible = "arm,cortex-a15";
+ reg = <1>;
+ clock-frequency = <1300000000>;
+ };
};
gic: interrupt-controller@f1001000 {
--
1.8.4
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 09/13] ARM: shmobile: r8a7778: add renesas_intc_irqpin support on DTSI
2013-10-09 6:50 [GIT PULL] Second Round of Renesas ARM-based SoC DT updates for v3.13 Simon Horman
` (7 preceding siblings ...)
2013-10-09 6:50 ` [PATCH 08/13] ARM: shmobile: r8a7791 SMP " Simon Horman
@ 2013-10-09 6:50 ` Simon Horman
2013-10-09 6:50 ` [PATCH 10/13] ARM: shmobile: bockw: add SMSC support on DTS Simon Horman
` (4 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Simon Horman @ 2013-10-09 6:50 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7778.dtsi | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7778.dtsi b/arch/arm/boot/dts/r8a7778.dtsi
index 45ac404..5d08f116 100644
--- a/arch/arm/boot/dts/r8a7778.dtsi
+++ b/arch/arm/boot/dts/r8a7778.dtsi
@@ -33,6 +33,25 @@
<0xfe430000 0x100>;
};
+ /* irqpin: IRQ0 - IRQ3 */
+ irqpin: irqpin@fe78001c {
+ compatible = "renesas,intc-irqpin";
+ #interrupt-cells = <2>;
+ interrupt-controller;
+ status = "disabled"; /* default off */
+ 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>;
+ };
+
gpio0: gpio@ffc40000 {
compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar";
reg = <0xffc40000 0x2c>;
--
1.8.4
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 10/13] ARM: shmobile: bockw: add SMSC support on DTS
2013-10-09 6:50 [GIT PULL] Second Round of Renesas ARM-based SoC DT updates for v3.13 Simon Horman
` (8 preceding siblings ...)
2013-10-09 6:50 ` [PATCH 09/13] ARM: shmobile: r8a7778: add renesas_intc_irqpin support on DTSI Simon Horman
@ 2013-10-09 6:50 ` Simon Horman
2013-10-09 6:50 ` [PATCH 11/13] ARM: shmobile: marzen: fixup SMSC IRQ number " Simon Horman
` (3 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Simon Horman @ 2013-10-09 6:50 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch enables INTC IRQ and SMSC on BockW board via DT.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7778-bockw-reference.dts | 27 ++++++++++++++++++++++++++-
1 file changed, 26 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/r8a7778-bockw-reference.dts b/arch/arm/boot/dts/r8a7778-bockw-reference.dts
index 9bb903a..4425fd2 100644
--- a/arch/arm/boot/dts/r8a7778-bockw-reference.dts
+++ b/arch/arm/boot/dts/r8a7778-bockw-reference.dts
@@ -22,11 +22,36 @@
compatible = "renesas,bockw-reference", "renesas,r8a7778";
chosen {
- bootargs = "console=ttySC0,115200 ignore_loglevel rw";
+ bootargs = "console=ttySC0,115200 ignore_loglevel root=/dev/nfs ip=dhcp rw";
};
memory {
device_type = "memory";
reg = <0x60000000 0x10000000>;
};
+
+ fixedregulator3v3: fixedregulator@0 {
+ compatible = "regulator-fixed";
+ regulator-name = "fixed-3.3V";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-boot-on;
+ regulator-always-on;
+ };
+
+ lan0@18300000 {
+ compatible = "smsc,lan9220", "smsc,lan9115";
+ reg = <0x18300000 0x1000>;
+
+ phy-mode = "mii";
+ interrupt-parent = <&irqpin>;
+ interrupts = <0 0>; /* IRQ0: hwirq 0 on irqpin */
+ reg-io-width = <4>;
+ vddvario-supply = <&fixedregulator3v3>;
+ vdd33a-supply = <&fixedregulator3v3>;
+ };
+};
+
+&irqpin {
+ status = "okay";
};
--
1.8.4
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 11/13] ARM: shmobile: marzen: fixup SMSC IRQ number on DTS
2013-10-09 6:50 [GIT PULL] Second Round of Renesas ARM-based SoC DT updates for v3.13 Simon Horman
` (9 preceding siblings ...)
2013-10-09 6:50 ` [PATCH 10/13] ARM: shmobile: bockw: add SMSC support on DTS Simon Horman
@ 2013-10-09 6:50 ` Simon Horman
2013-10-09 6:50 ` [PATCH 12/13] ARM: shmobile: r8a7779: add irqpin default status on DTSI Simon Horman
` (2 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Simon Horman @ 2013-10-09 6:50 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch fixup miss-setting of SMSC IRQ number.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7779-marzen-reference.dts | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7779-marzen-reference.dts b/arch/arm/boot/dts/r8a7779-marzen-reference.dts
index 6d55083..ab4110a 100644
--- a/arch/arm/boot/dts/r8a7779-marzen-reference.dts
+++ b/arch/arm/boot/dts/r8a7779-marzen-reference.dts
@@ -42,8 +42,8 @@
pinctrl-names = "default";
phy-mode = "mii";
- interrupt-parent = <&gic>;
- interrupts = <0 28 0x4>;
+ interrupt-parent = <&irqpin0>;
+ interrupts = <1 0>; /* IRQ1: hwirq 1 on irqpin0 */
reg-io-width = <4>;
vddvario-supply = <&fixedregulator3v3>;
vdd33a-supply = <&fixedregulator3v3>;
@@ -63,6 +63,10 @@
};
};
+&irqpin0 {
+ status = "okay";
+};
+
&pfc {
pinctrl-0 = <&scif2_pins &scif4_pins &sdhi0_pins>;
pinctrl-names = "default";
--
1.8.4
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 12/13] ARM: shmobile: r8a7779: add irqpin default status on DTSI
2013-10-09 6:50 [GIT PULL] Second Round of Renesas ARM-based SoC DT updates for v3.13 Simon Horman
` (10 preceding siblings ...)
2013-10-09 6:50 ` [PATCH 11/13] ARM: shmobile: marzen: fixup SMSC IRQ number " Simon Horman
@ 2013-10-09 6:50 ` Simon Horman
2013-10-09 6:50 ` [PATCH 13/13] ARM: shmobile: bockw: fixup ether node naming Simon Horman
2013-10-14 20:55 ` [GIT PULL] Second Round of Renesas ARM-based SoC DT updates for v3.13 Kevin Hilman
13 siblings, 0 replies; 15+ messages in thread
From: Simon Horman @ 2013-10-09 6:50 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
r8a7779 INTC needs IRL pin mode settings to determine
behavior of IRQ0 - IRQ3. But it depends on platform.
This patch adds status = "disabled" on r8a7779.dtsi as default
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7779.dtsi | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi
index 65dc652..c2fb49b 100644
--- a/arch/arm/boot/dts/r8a7779.dtsi
+++ b/arch/arm/boot/dts/r8a7779.dtsi
@@ -135,6 +135,7 @@
irqpin0: irqpin@fe780010 {
compatible = "renesas,intc-irqpin";
#interrupt-cells = <2>;
+ status = "disabled";
interrupt-controller;
reg = <0xfe78001c 4>,
<0xfe780010 4>,
--
1.8.4
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 13/13] ARM: shmobile: bockw: fixup ether node naming
2013-10-09 6:50 [GIT PULL] Second Round of Renesas ARM-based SoC DT updates for v3.13 Simon Horman
` (11 preceding siblings ...)
2013-10-09 6:50 ` [PATCH 12/13] ARM: shmobile: r8a7779: add irqpin default status on DTSI Simon Horman
@ 2013-10-09 6:50 ` Simon Horman
2013-10-14 20:55 ` [GIT PULL] Second Round of Renesas ARM-based SoC DT updates for v3.13 Kevin Hilman
13 siblings, 0 replies; 15+ messages in thread
From: Simon Horman @ 2013-10-09 6:50 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
According to the ePAPR spec,
the node name should be "ethernet", not "lan0".
Reported-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7778-bockw-reference.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/r8a7778-bockw-reference.dts b/arch/arm/boot/dts/r8a7778-bockw-reference.dts
index 4425fd2..969e386 100644
--- a/arch/arm/boot/dts/r8a7778-bockw-reference.dts
+++ b/arch/arm/boot/dts/r8a7778-bockw-reference.dts
@@ -39,7 +39,7 @@
regulator-always-on;
};
- lan0@18300000 {
+ ethernet@18300000 {
compatible = "smsc,lan9220", "smsc,lan9115";
reg = <0x18300000 0x1000>;
--
1.8.4
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [GIT PULL] Second Round of Renesas ARM-based SoC DT updates for v3.13
2013-10-09 6:50 [GIT PULL] Second Round of Renesas ARM-based SoC DT updates for v3.13 Simon Horman
` (12 preceding siblings ...)
2013-10-09 6:50 ` [PATCH 13/13] ARM: shmobile: bockw: fixup ether node naming Simon Horman
@ 2013-10-14 20:55 ` Kevin Hilman
13 siblings, 0 replies; 15+ messages in thread
From: Kevin Hilman @ 2013-10-14 20:55 UTC (permalink / raw)
To: linux-arm-kernel
Simon Horman <horms+renesas@verge.net.au> writes:
> Hi Olof, Kevin and Arnd,
>
> please consider this second round of Renesas ARM-based SoC DT updates for v3.13.
>
> This pull request is based on a merge of renesas-soc-for-v3.13
> into renesas-dt-for-v3.13, both of which you have previously pulled.
> The reason for the merge is to eliminate conflicts.
>
>
> The following changes since commit 50128df2c0164a3510da2af9d2dfed2da3987bd3:
>
> Merge tag 'renesas-soc-for-v3.13' into dt2-base (2013-10-08 09:24:24 +0900)
>
> are available in the git repository at:
>
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt2-for-v3.13
>
> for you to fetch changes up to 73c79afa61cdee2553461ee714bb4716372bdd55:
>
> ARM: shmobile: bockw: fixup ether node naming (2013-10-08 10:37:49 +0900)
>
> ----------------------------------------------------------------
> Second Round of Renesas ARM-based SoC DT updates for v3.13
>
> * Correct SMSC ethernet IRQ number on marzen board
> * Add SMSC ethernet node to bockw board
> * Add SDHI, MMCIF and PWM backlight nodes to armadillo800eva-reference board
> * Add irqpin default status to r8a7779 SoC
> * Add irqpin node to r8a7778 SoC
> * Add SMP, Arch timer and IRQC nodes to r8a7791 SoC
> * Add DMAC node to r8a73a4 SoC
> * Add I2C nodes to r8a7790 SoC
> * Only enable used I2C interfaces in DT on all Renesas boards
Pulled into next/dt.
Thanks,
Kevin
^ permalink raw reply [flat|nested] 15+ messages in thread