* [PATCH 01/13] ARM: shmobile: r8a7790 dtsi: Add QSPI node
2014-02-21 6:12 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.15 Simon Horman
@ 2014-02-21 6:12 ` Simon Horman
2014-02-21 6:12 ` [PATCH 02/13] ARM: shmobile: lager dts: Add QSPI nodes Simon Horman
` (12 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Simon Horman @ 2014-02-21 6:12 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7790.dtsi | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index ba0ef9a..858fc58 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -752,4 +752,16 @@
"rcan1", "rcan0", "qspi_mod", "i2c3", "i2c2", "i2c1", "i2c0";
};
};
+
+ spi: spi at e6b10000 {
+ compatible = "renesas,qspi-r8a7790", "renesas,qspi";
+ reg = <0 0xe6b10000 0 0x2c>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 184 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp9_clks R8A7790_CLK_QSPI_MOD>;
+ num-cs = <1>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "disabled";
+ };
};
--
1.8.5.2
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 02/13] ARM: shmobile: lager dts: Add QSPI nodes
2014-02-21 6:12 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.15 Simon Horman
2014-02-21 6:12 ` [PATCH 01/13] ARM: shmobile: r8a7790 dtsi: Add QSPI node Simon Horman
@ 2014-02-21 6:12 ` Simon Horman
2014-02-21 6:12 ` [PATCH 03/13] ARM: shmobile: lager: add SDHI0/2 support on DTS Simon Horman
` (11 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Simon Horman @ 2014-02-21 6:12 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Add pinctrl and SPI devices for QSPI on Lager.
Add Spansion s25fl512s SPI FLASH and MTD partitions.
Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7790-lager.dts | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index 1081c5e..adff2dc 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -80,6 +80,11 @@
renesas,groups = "mmc1_data8", "mmc1_ctrl";
renesas,function = "mmc1";
};
+
+ qspi_pins: spi {
+ renesas,groups = "qspi_ctrl", "qspi_data4";
+ renesas,function = "qspi";
+ };
};
&mmcif1 {
@@ -95,3 +100,34 @@
&sata1 {
status = "okay";
};
+
+&spi {
+ pinctrl-0 = <&qspi_pins>;
+ pinctrl-names = "default";
+
+ status = "okay";
+
+ flash: flash at 0 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "spansion,s25fl512s";
+ reg = <0>;
+ spi-max-frequency = <30000000>;
+ m25p,fast-read;
+
+ partition at 0 {
+ label = "loader";
+ reg = <0x00000000 0x00040000>;
+ read-only;
+ };
+ partition at 40000 {
+ label = "user";
+ reg = <0x00040000 0x00400000>;
+ read-only;
+ };
+ partition at 440000 {
+ label = "flash";
+ reg = <0x00440000 0x03bc0000>;
+ };
+ };
+};
--
1.8.5.2
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 03/13] ARM: shmobile: lager: add SDHI0/2 support on DTS
2014-02-21 6:12 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.15 Simon Horman
2014-02-21 6:12 ` [PATCH 01/13] ARM: shmobile: r8a7790 dtsi: Add QSPI node Simon Horman
2014-02-21 6:12 ` [PATCH 02/13] ARM: shmobile: lager dts: Add QSPI nodes Simon Horman
@ 2014-02-21 6:12 ` Simon Horman
2014-02-21 6:12 ` [PATCH 04/13] ARM: shmobile: r8a7778 dtsi: Remove duplicate i2c nodes Simon Horman
` (10 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Simon Horman @ 2014-02-21 6:12 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>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7790-lager.dts | 78 +++++++++++++++++++++++++++++++++++++
1 file changed, 78 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index adff2dc..5466fe4 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -56,6 +56,54 @@
regulator-boot-on;
regulator-always-on;
};
+
+ vcc_sdhi0: regulator at 1 {
+ compatible = "regulator-fixed";
+
+ regulator-name = "SDHI0 Vcc";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+
+ gpio = <&gpio5 24 GPIO_ACTIVE_HIGH>;
+ enable-active-high;
+ };
+
+ vccq_sdhi0: regulator at 2 {
+ compatible = "regulator-gpio";
+
+ regulator-name = "SDHI0 VccQ";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
+
+ gpios = <&gpio5 29 GPIO_ACTIVE_HIGH>;
+ gpios-states = <1>;
+ states = <3300000 1
+ 1800000 0>;
+ };
+
+ vcc_sdhi2: regulator at 3 {
+ compatible = "regulator-fixed";
+
+ regulator-name = "SDHI2 Vcc";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+
+ gpio = <&gpio5 25 GPIO_ACTIVE_HIGH>;
+ enable-active-high;
+ };
+
+ vccq_sdhi2: regulator at 4 {
+ compatible = "regulator-gpio";
+
+ regulator-name = "SDHI2 VccQ";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
+
+ gpios = <&gpio5 30 GPIO_ACTIVE_HIGH>;
+ gpios-states = <1>;
+ states = <3300000 1
+ 1800000 0>;
+ };
};
&extal_clk {
@@ -76,6 +124,16 @@
renesas,function = "scif1";
};
+ sdhi0_pins: sd0 {
+ renesas,gpios = "sdhi0_data4", "sdhi0_ctrl";
+ renesas,function = "sdhi0";
+ };
+
+ sdhi2_pins: sd2 {
+ renesas,gpios = "sdhi2_data4", "sdhi2_ctrl";
+ renesas,function = "sdhi2";
+ };
+
mmc1_pins: mmc1 {
renesas,groups = "mmc1_data8", "mmc1_ctrl";
renesas,function = "mmc1";
@@ -131,3 +189,23 @@
};
};
};
+
+&sdhi0 {
+ pinctrl-0 = <&sdhi0_pins>;
+ pinctrl-names = "default";
+
+ vmmc-supply = <&vcc_sdhi0>;
+ vqmmc-supply = <&vccq_sdhi0>;
+ cd-gpios = <&gpio3 6 GPIO_ACTIVE_LOW>;
+ status = "okay";
+};
+
+&sdhi2 {
+ pinctrl-0 = <&sdhi2_pins>;
+ pinctrl-names = "default";
+
+ vmmc-supply = <&vcc_sdhi2>;
+ vqmmc-supply = <&vccq_sdhi2>;
+ cd-gpios = <&gpio3 22 GPIO_ACTIVE_LOW>;
+ status = "okay";
+};
--
1.8.5.2
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 04/13] ARM: shmobile: r8a7778 dtsi: Remove duplicate i2c nodes
2014-02-21 6:12 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.15 Simon Horman
` (2 preceding siblings ...)
2014-02-21 6:12 ` [PATCH 03/13] ARM: shmobile: lager: add SDHI0/2 support on DTS Simon Horman
@ 2014-02-21 6:12 ` Simon Horman
2014-02-21 6:12 ` [PATCH 05/13] ARM: shmobile: lager: Add DU device to DTS Simon Horman
` (9 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Simon Horman @ 2014-02-21 6:12 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
"ARM: shmobile: r8a7778: add I2C support on DTSI" was applied twice:
commit ae4273ec7b25c8b9c895a4aae31f2fced980b7bf
commit 3acb51b9215bd99da403ecf8200f8425176b1926
Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7778.dtsi | 40 ----------------------------------------
1 file changed, 40 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7778.dtsi b/arch/arm/boot/dts/r8a7778.dtsi
index ddb3bd7..85c5b3b 100644
--- a/arch/arm/boot/dts/r8a7778.dtsi
+++ b/arch/arm/boot/dts/r8a7778.dtsi
@@ -203,46 +203,6 @@
status = "disabled";
};
- i2c0: i2c at ffc70000 {
- #address-cells = <1>;
- #size-cells = <0>;
- compatible = "renesas,i2c-r8a7778";
- reg = <0xffc70000 0x1000>;
- interrupt-parent = <&gic>;
- interrupts = <0 67 IRQ_TYPE_LEVEL_HIGH>;
- status = "disabled";
- };
-
- i2c1: i2c at ffc71000 {
- #address-cells = <1>;
- #size-cells = <0>;
- compatible = "renesas,i2c-r8a7778";
- reg = <0xffc71000 0x1000>;
- interrupt-parent = <&gic>;
- interrupts = <0 78 IRQ_TYPE_LEVEL_HIGH>;
- status = "disabled";
- };
-
- i2c2: i2c at ffc72000 {
- #address-cells = <1>;
- #size-cells = <0>;
- compatible = "renesas,i2c-r8a7778";
- reg = <0xffc72000 0x1000>;
- interrupt-parent = <&gic>;
- interrupts = <0 76 IRQ_TYPE_LEVEL_HIGH>;
- status = "disabled";
- };
-
- i2c3: i2c at ffc73000 {
- #address-cells = <1>;
- #size-cells = <0>;
- compatible = "renesas,i2c-r8a7778";
- reg = <0xffc73000 0x1000>;
- interrupt-parent = <&gic>;
- interrupts = <0 77 IRQ_TYPE_LEVEL_HIGH>;
- status = "disabled";
- };
-
hspi0: spi at fffc7000 {
compatible = "renesas,hspi";
reg = <0xfffc7000 0x18>;
--
1.8.5.2
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 05/13] ARM: shmobile: lager: Add DU device to DTS
2014-02-21 6:12 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.15 Simon Horman
` (3 preceding siblings ...)
2014-02-21 6:12 ` [PATCH 04/13] ARM: shmobile: r8a7778 dtsi: Remove duplicate i2c nodes Simon Horman
@ 2014-02-21 6:12 ` Simon Horman
2014-02-21 6:12 ` [PATCH 06/13] ARM: shmobile: koelsch-reference: " Simon Horman
` (8 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Simon Horman @ 2014-02-21 6:12 UTC (permalink / raw)
To: linux-arm-kernel
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
The DU device has no DT bindings yet, instantiate it as a platform
device for now.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Magnus Damm <damm@opensource.se>
[horms+renesas at verge.net.au: broken out of larger patch that
included board changes]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7790-lager.dts | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index 5466fe4..26a9010 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -111,9 +111,14 @@
};
&pfc {
- pinctrl-0 = <&scif0_pins &scif1_pins>;
+ pinctrl-0 = <&du_pins &scif0_pins &scif1_pins>;
pinctrl-names = "default";
+ du_pins: du {
+ renesas,groups = "du_rgb666", "du_sync_1", "du_clk_out_0";
+ renesas,function = "du";
+ };
+
scif0_pins: serial0 {
renesas,groups = "scif0_data";
renesas,function = "scif0";
--
1.8.5.2
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 06/13] ARM: shmobile: koelsch-reference: Add DU device to DTS
2014-02-21 6:12 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.15 Simon Horman
` (4 preceding siblings ...)
2014-02-21 6:12 ` [PATCH 05/13] ARM: shmobile: lager: Add DU device to DTS Simon Horman
@ 2014-02-21 6:12 ` Simon Horman
2014-02-21 6:12 ` [PATCH 07/13] ARM: shmobile: r8a7791: remove superfluous interrupt-parents Simon Horman
` (7 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Simon Horman @ 2014-02-21 6:12 UTC (permalink / raw)
To: linux-arm-kernel
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
The DU device has no DT bindings yet, instantiate it as a platform
device for now.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Magnus Damm <damm@opensource.se>
[horms+renesas at verge.net.au: broken out of larger patch that
included board changes]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7791-koelsch.dts | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index d4b9bba..f67d2d0 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -109,9 +109,14 @@
};
&pfc {
- pinctrl-0 = <&scif0_pins &scif1_pins>;
+ pinctrl-0 = <&du_pins &scif0_pins &scif1_pins>;
pinctrl-names = "default";
+ du_pins: du {
+ renesas,groups = "du_rgb666", "du_sync", "du_clk_out_0";
+ renesas,function = "du";
+ };
+
scif0_pins: serial0 {
renesas,groups = "scif0_data_d";
renesas,function = "scif0";
--
1.8.5.2
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 07/13] ARM: shmobile: r8a7791: remove superfluous interrupt-parents
2014-02-21 6:12 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.15 Simon Horman
` (5 preceding siblings ...)
2014-02-21 6:12 ` [PATCH 06/13] ARM: shmobile: koelsch-reference: " Simon Horman
@ 2014-02-21 6:12 ` Simon Horman
2014-02-21 6:12 ` [PATCH 08/13] ARM: shmobile: r8a7790: " Simon Horman
` (6 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Simon Horman @ 2014-02-21 6:12 UTC (permalink / raw)
To: linux-arm-kernel
From: Wolfram Sang <wsa@sang-engineering.com>
These values are inherited, so don't need to be specified again.
Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7791.dtsi | 31 -------------------------------
1 file changed, 31 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 240c4ec..41194fe 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -53,7 +53,6 @@
gpio0: gpio at e6050000 {
compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar";
reg = <0 0xe6050000 0 0x50>;
- interrupt-parent = <&gic>;
interrupts = <0 4 IRQ_TYPE_LEVEL_HIGH>;
#gpio-cells = <2>;
gpio-controller;
@@ -65,7 +64,6 @@
gpio1: gpio at e6051000 {
compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar";
reg = <0 0xe6051000 0 0x50>;
- interrupt-parent = <&gic>;
interrupts = <0 5 IRQ_TYPE_LEVEL_HIGH>;
#gpio-cells = <2>;
gpio-controller;
@@ -77,7 +75,6 @@
gpio2: gpio at e6052000 {
compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar";
reg = <0 0xe6052000 0 0x50>;
- interrupt-parent = <&gic>;
interrupts = <0 6 IRQ_TYPE_LEVEL_HIGH>;
#gpio-cells = <2>;
gpio-controller;
@@ -89,7 +86,6 @@
gpio3: gpio at e6053000 {
compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar";
reg = <0 0xe6053000 0 0x50>;
- interrupt-parent = <&gic>;
interrupts = <0 7 IRQ_TYPE_LEVEL_HIGH>;
#gpio-cells = <2>;
gpio-controller;
@@ -101,7 +97,6 @@
gpio4: gpio at e6054000 {
compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar";
reg = <0 0xe6054000 0 0x50>;
- interrupt-parent = <&gic>;
interrupts = <0 8 IRQ_TYPE_LEVEL_HIGH>;
#gpio-cells = <2>;
gpio-controller;
@@ -113,7 +108,6 @@
gpio5: gpio at e6055000 {
compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar";
reg = <0 0xe6055000 0 0x50>;
- interrupt-parent = <&gic>;
interrupts = <0 9 IRQ_TYPE_LEVEL_HIGH>;
#gpio-cells = <2>;
gpio-controller;
@@ -125,7 +119,6 @@
gpio6: gpio at e6055400 {
compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar";
reg = <0 0xe6055400 0 0x50>;
- interrupt-parent = <&gic>;
interrupts = <0 10 IRQ_TYPE_LEVEL_HIGH>;
#gpio-cells = <2>;
gpio-controller;
@@ -137,7 +130,6 @@
gpio7: gpio at e6055800 {
compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar";
reg = <0 0xe6055800 0 0x50>;
- interrupt-parent = <&gic>;
interrupts = <0 11 IRQ_TYPE_LEVEL_HIGH>;
#gpio-cells = <2>;
gpio-controller;
@@ -149,7 +141,6 @@
thermal at e61f0000 {
compatible = "renesas,thermal-r8a7791", "renesas,rcar-thermal";
reg = <0 0xe61f0000 0 0x14>, <0 0xe61f0100 0 0x38>;
- interrupt-parent = <&gic>;
interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp5_clks R8A7791_CLK_THERMAL>;
};
@@ -167,7 +158,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>,
@@ -189,7 +179,6 @@
scifa0: serial at e6c40000 {
compatible = "renesas,scifa-r8a7791", "renesas,scifa";
reg = <0 0xe6c40000 0 64>;
- interrupt-parent = <&gic>;
interrupts = <0 144 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp2_clks R8A7791_CLK_SCIFA0>;
clock-names = "sci_ick";
@@ -198,7 +187,6 @@
scifa1: serial at e6c50000 {
compatible = "renesas,scifa-r8a7791", "renesas,scifa";
- interrupt-parent = <&gic>;
reg = <0 0xe6c50000 0 64>;
interrupts = <0 145 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp2_clks R8A7791_CLK_SCIFA1>;
@@ -208,7 +196,6 @@
scifa2: serial at e6c60000 {
compatible = "renesas,scifa-r8a7791", "renesas,scifa";
- interrupt-parent = <&gic>;
reg = <0 0xe6c60000 0 64>;
interrupts = <0 151 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp2_clks R8A7791_CLK_SCIFA2>;
@@ -218,7 +205,6 @@
scifa3: serial at e6c70000 {
compatible = "renesas,scifa-r8a7791", "renesas,scifa";
- interrupt-parent = <&gic>;
reg = <0 0xe6c70000 0 64>;
interrupts = <0 29 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp11_clks R8A7791_CLK_SCIFA3>;
@@ -228,7 +214,6 @@
scifa4: serial at e6c78000 {
compatible = "renesas,scifa-r8a7791", "renesas,scifa";
- interrupt-parent = <&gic>;
reg = <0 0xe6c78000 0 64>;
interrupts = <0 30 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp11_clks R8A7791_CLK_SCIFA4>;
@@ -238,7 +223,6 @@
scifa5: serial at e6c80000 {
compatible = "renesas,scifa-r8a7791", "renesas,scifa";
- interrupt-parent = <&gic>;
reg = <0 0xe6c80000 0 64>;
interrupts = <0 31 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp11_clks R8A7791_CLK_SCIFA5>;
@@ -248,7 +232,6 @@
scifb0: serial at e6c20000 {
compatible = "renesas,scifb-r8a7791", "renesas,scifb";
- interrupt-parent = <&gic>;
reg = <0 0xe6c20000 0 64>;
interrupts = <0 148 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp2_clks R8A7791_CLK_SCIFB0>;
@@ -258,7 +241,6 @@
scifb1: serial at e6c30000 {
compatible = "renesas,scifb-r8a7791", "renesas,scifb";
- interrupt-parent = <&gic>;
reg = <0 0xe6c30000 0 64>;
interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp2_clks R8A7791_CLK_SCIFB1>;
@@ -268,7 +250,6 @@
scifb2: serial at e6ce0000 {
compatible = "renesas,scifb-r8a7791", "renesas,scifb";
- interrupt-parent = <&gic>;
reg = <0 0xe6ce0000 0 64>;
interrupts = <0 150 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp2_clks R8A7791_CLK_SCIFB2>;
@@ -278,7 +259,6 @@
scif0: serial at e6e60000 {
compatible = "renesas,scif-r8a7791", "renesas,scif";
- interrupt-parent = <&gic>;
reg = <0 0xe6e60000 0 64>;
interrupts = <0 152 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp7_clks R8A7791_CLK_SCIF0>;
@@ -288,7 +268,6 @@
scif1: serial at e6e68000 {
compatible = "renesas,scif-r8a7791", "renesas,scif";
- interrupt-parent = <&gic>;
reg = <0 0xe6e68000 0 64>;
interrupts = <0 153 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp7_clks R8A7791_CLK_SCIF1>;
@@ -298,7 +277,6 @@
scif2: serial at e6e58000 {
compatible = "renesas,scif-r8a7791", "renesas,scif";
- interrupt-parent = <&gic>;
reg = <0 0xe6e58000 0 64>;
interrupts = <0 22 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp7_clks R8A7791_CLK_SCIF2>;
@@ -308,7 +286,6 @@
scif3: serial at e6ea8000 {
compatible = "renesas,scif-r8a7791", "renesas,scif";
- interrupt-parent = <&gic>;
reg = <0 0xe6ea8000 0 64>;
interrupts = <0 23 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp7_clks R8A7791_CLK_SCIF3>;
@@ -318,7 +295,6 @@
scif4: serial at e6ee0000 {
compatible = "renesas,scif-r8a7791", "renesas,scif";
- interrupt-parent = <&gic>;
reg = <0 0xe6ee0000 0 64>;
interrupts = <0 24 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp7_clks R8A7791_CLK_SCIF4>;
@@ -328,7 +304,6 @@
scif5: serial at e6ee8000 {
compatible = "renesas,scif-r8a7791", "renesas,scif";
- interrupt-parent = <&gic>;
reg = <0 0xe6ee8000 0 64>;
interrupts = <0 25 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp7_clks R8A7791_CLK_SCIF5>;
@@ -338,7 +313,6 @@
hscif0: serial at e62c0000 {
compatible = "renesas,hscif-r8a7791", "renesas,hscif";
- interrupt-parent = <&gic>;
reg = <0 0xe62c0000 0 96>;
interrupts = <0 154 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp7_clks R8A7791_CLK_HSCIF0>;
@@ -348,7 +322,6 @@
hscif1: serial at e62c8000 {
compatible = "renesas,hscif-r8a7791", "renesas,hscif";
- interrupt-parent = <&gic>;
reg = <0 0xe62c8000 0 96>;
interrupts = <0 155 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp7_clks R8A7791_CLK_HSCIF1>;
@@ -358,7 +331,6 @@
hscif2: serial at e62d0000 {
compatible = "renesas,hscif-r8a7791", "renesas,hscif";
- interrupt-parent = <&gic>;
reg = <0 0xe62d0000 0 96>;
interrupts = <0 21 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp7_clks R8A7791_CLK_HSCIF2>;
@@ -369,7 +341,6 @@
sata0: sata at ee300000 {
compatible = "renesas,sata-r8a7791";
reg = <0 0xee300000 0 0x2000>;
- interrupt-parent = <&gic>;
interrupts = <0 105 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp8_clks R8A7791_CLK_SATA0>;
status = "disabled";
@@ -378,7 +349,6 @@
sata1: sata at ee500000 {
compatible = "renesas,sata-r8a7791";
reg = <0 0xee500000 0 0x2000>;
- interrupt-parent = <&gic>;
interrupts = <0 106 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp8_clks R8A7791_CLK_SATA1>;
status = "disabled";
@@ -714,7 +684,6 @@
spi: spi at e6b10000 {
compatible = "renesas,qspi-r8a7791", "renesas,qspi";
reg = <0 0xe6b10000 0 0x2c>;
- interrupt-parent = <&gic>;
interrupts = <0 184 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp9_clks R8A7791_CLK_QSPI_MOD>;
num-cs = <1>;
--
1.8.5.2
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 08/13] ARM: shmobile: r8a7790: remove superfluous interrupt-parents
2014-02-21 6:12 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.15 Simon Horman
` (6 preceding siblings ...)
2014-02-21 6:12 ` [PATCH 07/13] ARM: shmobile: r8a7791: remove superfluous interrupt-parents Simon Horman
@ 2014-02-21 6:12 ` Simon Horman
2014-02-21 6:12 ` [PATCH 09/13] ARM: shmobile: r8a7790: add i2c aliases to dtsi Simon Horman
` (5 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Simon Horman @ 2014-02-21 6:12 UTC (permalink / raw)
To: linux-arm-kernel
From: Wolfram Sang <wsa@sang-engineering.com>
These values are inherited, so don't need to be specified again.
Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7790.dtsi | 31 -------------------------------
1 file changed, 31 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 858fc58..d7bde1e 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -94,7 +94,6 @@
gpio0: gpio at e6050000 {
compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar";
reg = <0 0xe6050000 0 0x50>;
- interrupt-parent = <&gic>;
interrupts = <0 4 IRQ_TYPE_LEVEL_HIGH>;
#gpio-cells = <2>;
gpio-controller;
@@ -106,7 +105,6 @@
gpio1: gpio at e6051000 {
compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar";
reg = <0 0xe6051000 0 0x50>;
- interrupt-parent = <&gic>;
interrupts = <0 5 IRQ_TYPE_LEVEL_HIGH>;
#gpio-cells = <2>;
gpio-controller;
@@ -118,7 +116,6 @@
gpio2: gpio at e6052000 {
compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar";
reg = <0 0xe6052000 0 0x50>;
- interrupt-parent = <&gic>;
interrupts = <0 6 IRQ_TYPE_LEVEL_HIGH>;
#gpio-cells = <2>;
gpio-controller;
@@ -130,7 +127,6 @@
gpio3: gpio at e6053000 {
compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar";
reg = <0 0xe6053000 0 0x50>;
- interrupt-parent = <&gic>;
interrupts = <0 7 IRQ_TYPE_LEVEL_HIGH>;
#gpio-cells = <2>;
gpio-controller;
@@ -142,7 +138,6 @@
gpio4: gpio at e6054000 {
compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar";
reg = <0 0xe6054000 0 0x50>;
- interrupt-parent = <&gic>;
interrupts = <0 8 IRQ_TYPE_LEVEL_HIGH>;
#gpio-cells = <2>;
gpio-controller;
@@ -154,7 +149,6 @@
gpio5: gpio at e6055000 {
compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar";
reg = <0 0xe6055000 0 0x50>;
- interrupt-parent = <&gic>;
interrupts = <0 9 IRQ_TYPE_LEVEL_HIGH>;
#gpio-cells = <2>;
gpio-controller;
@@ -166,7 +160,6 @@
thermal at e61f0000 {
compatible = "renesas,thermal-r8a7790", "renesas,rcar-thermal";
reg = <0 0xe61f0000 0 0x14>, <0 0xe61f0100 0 0x38>;
- interrupt-parent = <&gic>;
interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp5_clks R8A7790_CLK_THERMAL>;
};
@@ -184,7 +177,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>,
@@ -196,7 +188,6 @@
#size-cells = <0>;
compatible = "renesas,i2c-r8a7790";
reg = <0 0xe6508000 0 0x40>;
- interrupt-parent = <&gic>;
interrupts = <0 287 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp9_clks R8A7790_CLK_I2C0>;
status = "disabled";
@@ -207,7 +198,6 @@
#size-cells = <0>;
compatible = "renesas,i2c-r8a7790";
reg = <0 0xe6518000 0 0x40>;
- interrupt-parent = <&gic>;
interrupts = <0 288 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp9_clks R8A7790_CLK_I2C1>;
status = "disabled";
@@ -218,7 +208,6 @@
#size-cells = <0>;
compatible = "renesas,i2c-r8a7790";
reg = <0 0xe6530000 0 0x40>;
- interrupt-parent = <&gic>;
interrupts = <0 286 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp9_clks R8A7790_CLK_I2C2>;
status = "disabled";
@@ -229,7 +218,6 @@
#size-cells = <0>;
compatible = "renesas,i2c-r8a7790";
reg = <0 0xe6540000 0 0x40>;
- interrupt-parent = <&gic>;
interrupts = <0 290 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp9_clks R8A7790_CLK_I2C3>;
status = "disabled";
@@ -238,7 +226,6 @@
mmcif0: mmcif at ee200000 {
compatible = "renesas,mmcif-r8a7790", "renesas,sh-mmcif";
reg = <0 0xee200000 0 0x80>;
- interrupt-parent = <&gic>;
interrupts = <0 169 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp3_clks R8A7790_CLK_MMCIF0>;
reg-io-width = <4>;
@@ -248,7 +235,6 @@
mmcif1: mmc at ee220000 {
compatible = "renesas,mmcif-r8a7790", "renesas,sh-mmcif";
reg = <0 0xee220000 0 0x80>;
- interrupt-parent = <&gic>;
interrupts = <0 170 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp3_clks R8A7790_CLK_MMCIF1>;
reg-io-width = <4>;
@@ -263,7 +249,6 @@
sdhi0: sd at ee100000 {
compatible = "renesas,sdhi-r8a7790";
reg = <0 0xee100000 0 0x200>;
- interrupt-parent = <&gic>;
interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp3_clks R8A7790_CLK_SDHI0>;
cap-sd-highspeed;
@@ -273,7 +258,6 @@
sdhi1: sd at ee120000 {
compatible = "renesas,sdhi-r8a7790";
reg = <0 0xee120000 0 0x200>;
- interrupt-parent = <&gic>;
interrupts = <0 166 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp3_clks R8A7790_CLK_SDHI1>;
cap-sd-highspeed;
@@ -283,7 +267,6 @@
sdhi2: sd at ee140000 {
compatible = "renesas,sdhi-r8a7790";
reg = <0 0xee140000 0 0x100>;
- interrupt-parent = <&gic>;
interrupts = <0 167 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp3_clks R8A7790_CLK_SDHI2>;
cap-sd-highspeed;
@@ -293,7 +276,6 @@
sdhi3: sd at ee160000 {
compatible = "renesas,sdhi-r8a7790";
reg = <0 0xee160000 0 0x100>;
- interrupt-parent = <&gic>;
interrupts = <0 168 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp3_clks R8A7790_CLK_SDHI3>;
cap-sd-highspeed;
@@ -303,7 +285,6 @@
scifa0: serial at e6c40000 {
compatible = "renesas,scifa-r8a7790", "renesas,scifa";
reg = <0 0xe6c40000 0 64>;
- interrupt-parent = <&gic>;
interrupts = <0 144 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp2_clks R8A7790_CLK_SCIFA0>;
clock-names = "sci_ick";
@@ -312,7 +293,6 @@
scifa1: serial at e6c50000 {
compatible = "renesas,scifa-r8a7790", "renesas,scifa";
- interrupt-parent = <&gic>;
reg = <0 0xe6c50000 0 64>;
interrupts = <0 145 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp2_clks R8A7790_CLK_SCIFA1>;
@@ -322,7 +302,6 @@
scifa2: serial at e6c60000 {
compatible = "renesas,scifa-r8a7790", "renesas,scifa";
- interrupt-parent = <&gic>;
reg = <0 0xe6c60000 0 64>;
interrupts = <0 151 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp2_clks R8A7790_CLK_SCIFA2>;
@@ -332,7 +311,6 @@
scifb0: serial at e6c20000 {
compatible = "renesas,scifb-r8a7790", "renesas,scifb";
- interrupt-parent = <&gic>;
reg = <0 0xe6c20000 0 64>;
interrupts = <0 148 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp2_clks R8A7790_CLK_SCIFB0>;
@@ -342,7 +320,6 @@
scifb1: serial at e6c30000 {
compatible = "renesas,scifb-r8a7790", "renesas,scifb";
- interrupt-parent = <&gic>;
reg = <0 0xe6c30000 0 64>;
interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp2_clks R8A7790_CLK_SCIFB1>;
@@ -352,7 +329,6 @@
scifb2: serial at e6ce0000 {
compatible = "renesas,scifb-r8a7790", "renesas,scifb";
- interrupt-parent = <&gic>;
reg = <0 0xe6ce0000 0 64>;
interrupts = <0 150 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp2_clks R8A7790_CLK_SCIFB2>;
@@ -362,7 +338,6 @@
scif0: serial at e6e60000 {
compatible = "renesas,scif-r8a7790", "renesas,scif";
- interrupt-parent = <&gic>;
reg = <0 0xe6e60000 0 64>;
interrupts = <0 152 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp7_clks R8A7790_CLK_SCIF0>;
@@ -372,7 +347,6 @@
scif1: serial at e6e68000 {
compatible = "renesas,scif-r8a7790", "renesas,scif";
- interrupt-parent = <&gic>;
reg = <0 0xe6e68000 0 64>;
interrupts = <0 153 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp7_clks R8A7790_CLK_SCIF1>;
@@ -382,7 +356,6 @@
hscif0: serial at e62c0000 {
compatible = "renesas,hscif-r8a7790", "renesas,hscif";
- interrupt-parent = <&gic>;
reg = <0 0xe62c0000 0 96>;
interrupts = <0 154 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp7_clks R8A7790_CLK_HSCIF0>;
@@ -392,7 +365,6 @@
hscif1: serial at e62c8000 {
compatible = "renesas,hscif-r8a7790", "renesas,hscif";
- interrupt-parent = <&gic>;
reg = <0 0xe62c8000 0 96>;
interrupts = <0 155 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp7_clks R8A7790_CLK_HSCIF1>;
@@ -403,7 +375,6 @@
sata0: sata at ee300000 {
compatible = "renesas,sata-r8a7790";
reg = <0 0xee300000 0 0x2000>;
- interrupt-parent = <&gic>;
interrupts = <0 105 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp8_clks R8A7790_CLK_SATA0>;
status = "disabled";
@@ -412,7 +383,6 @@
sata1: sata at ee500000 {
compatible = "renesas,sata-r8a7790";
reg = <0 0xee500000 0 0x2000>;
- interrupt-parent = <&gic>;
interrupts = <0 106 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp8_clks R8A7790_CLK_SATA1>;
status = "disabled";
@@ -756,7 +726,6 @@
spi: spi at e6b10000 {
compatible = "renesas,qspi-r8a7790", "renesas,qspi";
reg = <0 0xe6b10000 0 0x2c>;
- interrupt-parent = <&gic>;
interrupts = <0 184 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp9_clks R8A7790_CLK_QSPI_MOD>;
num-cs = <1>;
--
1.8.5.2
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 09/13] ARM: shmobile: r8a7790: add i2c aliases to dtsi
2014-02-21 6:12 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.15 Simon Horman
` (7 preceding siblings ...)
2014-02-21 6:12 ` [PATCH 08/13] ARM: shmobile: r8a7790: " Simon Horman
@ 2014-02-21 6:12 ` Simon Horman
2014-02-21 6:12 ` [PATCH 10/13] ARM: shmobile: r8a7791: add i2c master nodes " Simon Horman
` (4 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Simon Horman @ 2014-02-21 6:12 UTC (permalink / raw)
To: linux-arm-kernel
From: Wolfram Sang <wsa@sang-engineering.com>
Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7790.dtsi | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index d7bde1e..6eb9613 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -18,6 +18,13 @@
#address-cells = <2>;
#size-cells = <2>;
+ aliases {
+ i2c0 = &i2c0;
+ i2c1 = &i2c1;
+ i2c2 = &i2c2;
+ i2c3 = &i2c3;
+ };
+
cpus {
#address-cells = <1>;
#size-cells = <0>;
--
1.8.5.2
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.15
@ 2014-02-21 6:12 Simon Horman
2014-02-21 6:12 ` [PATCH 01/13] ARM: shmobile: r8a7790 dtsi: Add QSPI node Simon Horman
` (13 more replies)
0 siblings, 14 replies; 16+ messages in thread
From: Simon Horman @ 2014-02-21 6:12 UTC (permalink / raw)
To: linux-arm-kernel
Hi Olof, Hi Kevin, Hi Arnd,
Please consider this third round of Renesas ARM based SoC DT updates for v3.15.
This pull request is based on the previous round of
such requests, tagged as renesas-dt2-for-v3.15,
which I have already sent a pull-request for.
The following changes since commit e02ee513eed4bb780848a5cedbd4b39afb395d3e:
ARM: shmobile: koelsch dts: Add QSPI nodes (2014-02-06 20:36:12 +0900)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt3-for-v3.15
for you to fetch changes up to 367aaaea1d6c6496695ffd06b49590b8cfcb8aa5:
ARM: shmobile: genmai: adapt dts to use native i2c driver (2014-02-18 11:35:30 +0900)
----------------------------------------------------------------
Third Round of Renesas ARM Based SoC DT Updates for v3.15
* r7s72100 SoC (RZ/A1H)
- Add nodes for i2c controllers to DT
* r7s72100 (RZ/A1H) based Genmai board
- genmai: adapt dts to use native i2c driver
* r8a7791 SoC (R-Car M2)
- Remove superfluous interrupt-parents
* r8a7791 (R-Car M2) based Koelsch board
- Add i2c2 bus to DT
- Add DU device to DT
* r8a7790 SoC (R-Car H2)
- Add i2c aliases
- Remove superfluous interrupt-parents
- Add QSPI node
* r8a7790 SoC (R-Car M2) based Lager
- Add DU, SDHI0/1 and QSPI to DT
* r8a7778 SoC (R-Car M1)
- Remove duplicate i2c nodes
----------------------------------------------------------------
Geert Uytterhoeven (3):
ARM: shmobile: r8a7790 dtsi: Add QSPI node
ARM: shmobile: lager dts: Add QSPI nodes
ARM: shmobile: r8a7778 dtsi: Remove duplicate i2c nodes
Kuninori Morimoto (1):
ARM: shmobile: lager: add SDHI0/2 support on DTS
Laurent Pinchart (2):
ARM: shmobile: lager: Add DU device to DTS
ARM: shmobile: koelsch-reference: Add DU device to DTS
Wolfram Sang (7):
ARM: shmobile: r8a7791: remove superfluous interrupt-parents
ARM: shmobile: r8a7790: remove superfluous interrupt-parents
ARM: shmobile: r8a7790: add i2c aliases to dtsi
ARM: shmobile: r8a7791: add i2c master nodes to dtsi
ARM: shmobile: r8a7791: add i2c2 bus to koelsch dt
ARM: shmobile: r7s72100: add nodes for i2c controllers to dtsi
ARM: shmobile: genmai: adapt dts to use native i2c driver
arch/arm/boot/dts/r7s72100-genmai-reference.dts | 11 +++
arch/arm/boot/dts/r7s72100.dtsi | 72 ++++++++++++++
arch/arm/boot/dts/r8a7778.dtsi | 40 --------
arch/arm/boot/dts/r8a7790-lager.dts | 121 +++++++++++++++++++++++-
arch/arm/boot/dts/r8a7790.dtsi | 48 ++++------
arch/arm/boot/dts/r8a7791-koelsch.dts | 26 ++++-
arch/arm/boot/dts/r8a7791.dtsi | 100 ++++++++++++++------
7 files changed, 315 insertions(+), 103 deletions(-)
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 10/13] ARM: shmobile: r8a7791: add i2c master nodes to dtsi
2014-02-21 6:12 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.15 Simon Horman
` (8 preceding siblings ...)
2014-02-21 6:12 ` [PATCH 09/13] ARM: shmobile: r8a7790: add i2c aliases to dtsi Simon Horman
@ 2014-02-21 6:12 ` Simon Horman
2014-02-21 6:12 ` [PATCH 11/13] ARM: shmobile: r8a7791: add i2c2 bus to koelsch dt Simon Horman
` (3 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Simon Horman @ 2014-02-21 6:12 UTC (permalink / raw)
To: linux-arm-kernel
From: Wolfram Sang <wsa@sang-engineering.com>
Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7791.dtsi | 69 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 69 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 41194fe..1ab4f3d 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -19,6 +19,15 @@
#address-cells = <2>;
#size-cells = <2>;
+ aliases {
+ i2c0 = &i2c0;
+ i2c1 = &i2c1;
+ i2c2 = &i2c2;
+ i2c3 = &i2c3;
+ i2c4 = &i2c4;
+ i2c5 = &i2c5;
+ };
+
cpus {
#address-cells = <1>;
#size-cells = <0>;
@@ -170,6 +179,66 @@
<0 17 IRQ_TYPE_LEVEL_HIGH>;
};
+ i2c0: i2c at e6508000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "renesas,i2c-r8a7791";
+ reg = <0 0xe6508000 0 0x40>;
+ interrupts = <0 287 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp9_clks R8A7791_CLK_I2C0>;
+ status = "disabled";
+ };
+
+ i2c1: i2c at e6518000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "renesas,i2c-r8a7791";
+ reg = <0 0xe6518000 0 0x40>;
+ interrupts = <0 288 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp9_clks R8A7791_CLK_I2C1>;
+ status = "disabled";
+ };
+
+ i2c2: i2c at e6530000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "renesas,i2c-r8a7791";
+ reg = <0 0xe6530000 0 0x40>;
+ interrupts = <0 286 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp9_clks R8A7791_CLK_I2C2>;
+ status = "disabled";
+ };
+
+ i2c3: i2c at e6540000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "renesas,i2c-r8a7791";
+ reg = <0 0xe6540000 0 0x40>;
+ interrupts = <0 290 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp9_clks R8A7791_CLK_I2C3>;
+ status = "disabled";
+ };
+
+ i2c4: i2c at e6520000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "renesas,i2c-r8a7791";
+ reg = <0 0xe6520000 0 0x40>;
+ interrupts = <0 19 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp9_clks R8A7791_CLK_I2C4>;
+ status = "disabled";
+ };
+
+ i2c5: i2c at e6528000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "renesas,i2c-r8a7791";
+ reg = <0 0xe6528000 0 0x40>;
+ interrupts = <0 20 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp9_clks R8A7791_CLK_I2C5>;
+ status = "disabled";
+ };
+
pfc: pfc at e6060000 {
compatible = "renesas,pfc-r8a7791";
reg = <0 0xe6060000 0 0x250>;
--
1.8.5.2
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 11/13] ARM: shmobile: r8a7791: add i2c2 bus to koelsch dt
2014-02-21 6:12 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.15 Simon Horman
` (9 preceding siblings ...)
2014-02-21 6:12 ` [PATCH 10/13] ARM: shmobile: r8a7791: add i2c master nodes " Simon Horman
@ 2014-02-21 6:12 ` Simon Horman
2014-02-21 6:12 ` [PATCH 12/13] ARM: shmobile: r7s72100: add nodes for i2c controllers to dtsi Simon Horman
` (2 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Simon Horman @ 2014-02-21 6:12 UTC (permalink / raw)
To: linux-arm-kernel
From: Wolfram Sang <wsa@sang-engineering.com>
Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
Acked-by: Magnus Damm <damm@opensource.se>
[horms+renesas at verge.net.au: resolved conflict]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7791-koelsch.dts | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index f67d2d0..bf6ba0c 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -108,10 +108,29 @@
clock-frequency = <20000000>;
};
+&i2c2 {
+ pinctrl-0 = <&i2c2_pins>;
+ pinctrl-names = "default";
+
+ status = "okay";
+ clock-frequency = <400000>;
+
+ eeprom at 50 {
+ compatible = "renesas,24c02";
+ reg = <0x50>;
+ pagesize = <16>;
+ };
+};
+
&pfc {
pinctrl-0 = <&du_pins &scif0_pins &scif1_pins>;
pinctrl-names = "default";
+ i2c2_pins: i2c {
+ renesas,groups = "i2c2";
+ renesas,function = "i2c2";
+ };
+
du_pins: du {
renesas,groups = "du_rgb666", "du_sync", "du_clk_out_0";
renesas,function = "du";
--
1.8.5.2
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 12/13] ARM: shmobile: r7s72100: add nodes for i2c controllers to dtsi
2014-02-21 6:12 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.15 Simon Horman
` (10 preceding siblings ...)
2014-02-21 6:12 ` [PATCH 11/13] ARM: shmobile: r8a7791: add i2c2 bus to koelsch dt Simon Horman
@ 2014-02-21 6:12 ` Simon Horman
2014-02-21 6:12 ` [PATCH 13/13] ARM: shmobile: genmai: adapt dts to use native i2c driver Simon Horman
2014-03-17 7:22 ` [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.15 Olof Johansson
13 siblings, 0 replies; 16+ messages in thread
From: Simon Horman @ 2014-02-21 6:12 UTC (permalink / raw)
To: linux-arm-kernel
From: Wolfram Sang <wsa@sang-engineering.com>
Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r7s72100.dtsi | 72 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 72 insertions(+)
diff --git a/arch/arm/boot/dts/r7s72100.dtsi b/arch/arm/boot/dts/r7s72100.dtsi
index 9be67a1..ee70071 100644
--- a/arch/arm/boot/dts/r7s72100.dtsi
+++ b/arch/arm/boot/dts/r7s72100.dtsi
@@ -17,6 +17,10 @@
#size-cells = <1>;
aliases {
+ i2c0 = &i2c0;
+ i2c1 = &i2c1;
+ i2c2 = &i2c2;
+ i2c3 = &i2c3;
spi0 = &spi0;
spi1 = &spi1;
spi2 = &spi2;
@@ -44,6 +48,74 @@
<0xe8202000 0x1000>;
};
+ i2c0: i2c at fcfee000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "renesas,riic-r7s72100", "renesas,riic-rz";
+ reg = <0xfcfee000 0x44>;
+ interrupts = <0 157 IRQ_TYPE_LEVEL_HIGH>,
+ <0 158 IRQ_TYPE_EDGE_RISING>,
+ <0 159 IRQ_TYPE_EDGE_RISING>,
+ <0 160 IRQ_TYPE_LEVEL_HIGH>,
+ <0 161 IRQ_TYPE_LEVEL_HIGH>,
+ <0 162 IRQ_TYPE_LEVEL_HIGH>,
+ <0 163 IRQ_TYPE_LEVEL_HIGH>,
+ <0 164 IRQ_TYPE_LEVEL_HIGH>;
+ clock-frequency = <100000>;
+ status = "disabled";
+ };
+
+ i2c1: i2c at fcfee400 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "renesas,riic-r7s72100", "renesas,riic-rz";
+ reg = <0xfcfee400 0x44>;
+ interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>,
+ <0 166 IRQ_TYPE_EDGE_RISING>,
+ <0 167 IRQ_TYPE_EDGE_RISING>,
+ <0 168 IRQ_TYPE_LEVEL_HIGH>,
+ <0 169 IRQ_TYPE_LEVEL_HIGH>,
+ <0 170 IRQ_TYPE_LEVEL_HIGH>,
+ <0 171 IRQ_TYPE_LEVEL_HIGH>,
+ <0 172 IRQ_TYPE_LEVEL_HIGH>;
+ clock-frequency = <100000>;
+ status = "disabled";
+ };
+
+ i2c2: i2c at fcfee800 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "renesas,riic-r7s72100", "renesas,riic-rz";
+ reg = <0xfcfee800 0x44>;
+ interrupts = <0 173 IRQ_TYPE_LEVEL_HIGH>,
+ <0 174 IRQ_TYPE_EDGE_RISING>,
+ <0 175 IRQ_TYPE_EDGE_RISING>,
+ <0 176 IRQ_TYPE_LEVEL_HIGH>,
+ <0 177 IRQ_TYPE_LEVEL_HIGH>,
+ <0 178 IRQ_TYPE_LEVEL_HIGH>,
+ <0 179 IRQ_TYPE_LEVEL_HIGH>,
+ <0 180 IRQ_TYPE_LEVEL_HIGH>;
+ clock-frequency = <100000>;
+ status = "disabled";
+ };
+
+ i2c3: i2c at fcfeec00 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "renesas,riic-r7s72100", "renesas,riic-rz";
+ reg = <0xfcfeec00 0x44>;
+ interrupts = <0 181 IRQ_TYPE_LEVEL_HIGH>,
+ <0 182 IRQ_TYPE_EDGE_RISING>,
+ <0 183 IRQ_TYPE_EDGE_RISING>,
+ <0 184 IRQ_TYPE_LEVEL_HIGH>,
+ <0 185 IRQ_TYPE_LEVEL_HIGH>,
+ <0 186 IRQ_TYPE_LEVEL_HIGH>,
+ <0 187 IRQ_TYPE_LEVEL_HIGH>,
+ <0 188 IRQ_TYPE_LEVEL_HIGH>;
+ clock-frequency = <100000>;
+ status = "disabled";
+ };
+
spi0: spi at e800c800 {
compatible = "renesas,rspi-r7s72100", "renesas,rspi-rz";
reg = <0xe800c800 0x24>;
--
1.8.5.2
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 13/13] ARM: shmobile: genmai: adapt dts to use native i2c driver
2014-02-21 6:12 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.15 Simon Horman
` (11 preceding siblings ...)
2014-02-21 6:12 ` [PATCH 12/13] ARM: shmobile: r7s72100: add nodes for i2c controllers to dtsi Simon Horman
@ 2014-02-21 6:12 ` Simon Horman
2014-03-17 7:22 ` [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.15 Olof Johansson
13 siblings, 0 replies; 16+ messages in thread
From: Simon Horman @ 2014-02-21 6:12 UTC (permalink / raw)
To: linux-arm-kernel
From: Wolfram Sang <wsa@sang-engineering.com>
Activate the shiny new riic driver for i2c2. Tested by accessing the
eeprom on the genmai board.
Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r7s72100-genmai-reference.dts | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/arch/arm/boot/dts/r7s72100-genmai-reference.dts b/arch/arm/boot/dts/r7s72100-genmai-reference.dts
index 0849017..e664611 100644
--- a/arch/arm/boot/dts/r7s72100-genmai-reference.dts
+++ b/arch/arm/boot/dts/r7s72100-genmai-reference.dts
@@ -29,3 +29,14 @@
#size-cells = <1>;
};
};
+
+&i2c2 {
+ status = "okay";
+ clock-frequency = <400000>;
+
+ eeprom at 50 {
+ compatible = "renesas,24c128";
+ reg = <0x50>;
+ pagesize = <64>;
+ };
+};
--
1.8.5.2
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.15
2014-02-21 6:12 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.15 Simon Horman
` (12 preceding siblings ...)
2014-02-21 6:12 ` [PATCH 13/13] ARM: shmobile: genmai: adapt dts to use native i2c driver Simon Horman
@ 2014-03-17 7:22 ` Olof Johansson
2014-03-17 7:35 ` Simon Horman
13 siblings, 1 reply; 16+ messages in thread
From: Olof Johansson @ 2014-03-17 7:22 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Feb 21, 2014 at 03:12:51PM +0900, Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
>
> Please consider this third round of Renesas ARM based SoC DT updates for v3.15.
>
> This pull request is based on the previous round of
> such requests, tagged as renesas-dt2-for-v3.15,
> which I have already sent a pull-request for.
>
>
> The following changes since commit e02ee513eed4bb780848a5cedbd4b39afb395d3e:
>
> ARM: shmobile: koelsch dts: Add QSPI nodes (2014-02-06 20:36:12 +0900)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt3-for-v3.15
Merged.
For new DT contents, please pick a sort order. Most platforms use the actual
unit address as the ordering, and not alphabetical based on node name. If you
sort, new additions are less likely to conflict since they won't just be
appended.
If you pick an order, you'll maybe have to re-sort some of your DTS files. Do
so at the beginning of a release cycle and use that as a base for any new
changes when you do.
-Olof
^ permalink raw reply [flat|nested] 16+ messages in thread
* [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.15
2014-03-17 7:22 ` [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.15 Olof Johansson
@ 2014-03-17 7:35 ` Simon Horman
0 siblings, 0 replies; 16+ messages in thread
From: Simon Horman @ 2014-03-17 7:35 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Mar 17, 2014 at 12:22:45AM -0700, Olof Johansson wrote:
> On Fri, Feb 21, 2014 at 03:12:51PM +0900, Simon Horman wrote:
> > Hi Olof, Hi Kevin, Hi Arnd,
> >
> > Please consider this third round of Renesas ARM based SoC DT updates for v3.15.
> >
> > This pull request is based on the previous round of
> > such requests, tagged as renesas-dt2-for-v3.15,
> > which I have already sent a pull-request for.
> >
> >
> > The following changes since commit e02ee513eed4bb780848a5cedbd4b39afb395d3e:
> >
> > ARM: shmobile: koelsch dts: Add QSPI nodes (2014-02-06 20:36:12 +0900)
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt3-for-v3.15
>
> Merged.
>
> For new DT contents, please pick a sort order. Most platforms use the actual
> unit address as the ordering, and not alphabetical based on node name. If you
> sort, new additions are less likely to conflict since they won't just be
> appended.
>
> If you pick an order, you'll maybe have to re-sort some of your DTS files. Do
> so at the beginning of a release cycle and use that as a base for any new
> changes when you do.
Thanks. I believe we have been aiming, though not at all consistently,
for alphabetical order. I'll see about getting things cleaned up
for the beginning of the next cycle.
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2014-03-17 7:35 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-21 6:12 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.15 Simon Horman
2014-02-21 6:12 ` [PATCH 01/13] ARM: shmobile: r8a7790 dtsi: Add QSPI node Simon Horman
2014-02-21 6:12 ` [PATCH 02/13] ARM: shmobile: lager dts: Add QSPI nodes Simon Horman
2014-02-21 6:12 ` [PATCH 03/13] ARM: shmobile: lager: add SDHI0/2 support on DTS Simon Horman
2014-02-21 6:12 ` [PATCH 04/13] ARM: shmobile: r8a7778 dtsi: Remove duplicate i2c nodes Simon Horman
2014-02-21 6:12 ` [PATCH 05/13] ARM: shmobile: lager: Add DU device to DTS Simon Horman
2014-02-21 6:12 ` [PATCH 06/13] ARM: shmobile: koelsch-reference: " Simon Horman
2014-02-21 6:12 ` [PATCH 07/13] ARM: shmobile: r8a7791: remove superfluous interrupt-parents Simon Horman
2014-02-21 6:12 ` [PATCH 08/13] ARM: shmobile: r8a7790: " Simon Horman
2014-02-21 6:12 ` [PATCH 09/13] ARM: shmobile: r8a7790: add i2c aliases to dtsi Simon Horman
2014-02-21 6:12 ` [PATCH 10/13] ARM: shmobile: r8a7791: add i2c master nodes " Simon Horman
2014-02-21 6:12 ` [PATCH 11/13] ARM: shmobile: r8a7791: add i2c2 bus to koelsch dt Simon Horman
2014-02-21 6:12 ` [PATCH 12/13] ARM: shmobile: r7s72100: add nodes for i2c controllers to dtsi Simon Horman
2014-02-21 6:12 ` [PATCH 13/13] ARM: shmobile: genmai: adapt dts to use native i2c driver Simon Horman
2014-03-17 7:22 ` [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.15 Olof Johansson
2014-03-17 7:35 ` Simon Horman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).