* [PATCH 01/25] ARM: shmobile: sh73a0: Add MSIOF clocks
2015-12-18 2:29 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
@ 2015-12-18 2:29 ` Simon Horman
2015-12-18 2:29 ` [PATCH 02/25] ARM: shmobile: sh73a0: Add MSIOF device nodes Simon Horman
` (24 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Simon Horman @ 2015-12-18 2:29 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
The 4 MSIOF clocks are MSTP clocks, and children of the SUB clock.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/sh73a0.dtsi | 28 ++++++++++++++++------------
include/dt-bindings/clock/sh73a0-clock.h | 6 +++++-
2 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/arch/arm/boot/dts/sh73a0.dtsi b/arch/arm/boot/dts/sh73a0.dtsi
index 319551f0fcdb..635564ab98ed 100644
--- a/arch/arm/boot/dts/sh73a0.dtsi
+++ b/arch/arm/boot/dts/sh73a0.dtsi
@@ -812,13 +812,13 @@
mstp0_clks: mstp0_clks at e6150130 {
compatible = "renesas,sh73a0-mstp-clocks", "renesas,cpg-mstp-clocks";
reg = <0xe6150130 4>, <0xe6150030 4>;
- clocks = <&cpg_clocks SH73A0_CLK_HP>;
+ clocks = <&cpg_clocks SH73A0_CLK_HP>, <&sub_clk>;
#clock-cells = <1>;
clock-indices = <
- SH73A0_CLK_IIC2
+ SH73A0_CLK_IIC2 SH73A0_CLK_MSIOF0
>;
clock-output-names =
- "iic2";
+ "iic2", "msiof0";
};
mstp1_clks: mstp1_clks at e6150134 {
compatible = "renesas,sh73a0-mstp-clocks", "renesas,cpg-mstp-clocks";
@@ -848,20 +848,24 @@
reg = <0xe6150138 4>, <0xe6150040 4>;
clocks = <&sub_clk>, <&cpg_clocks SH73A0_CLK_HP>,
<&cpg_clocks SH73A0_CLK_HP>, <&sub_clk>,
- <&sub_clk>, <&sub_clk>, <&sub_clk>, <&sub_clk>,
- <&sub_clk>, <&sub_clk>;
+ <&sub_clk>, <&sub_clk>, <&sub_clk>,
+ <&sub_clk>, <&sub_clk>, <&sub_clk>,
+ <&sub_clk>, <&sub_clk>, <&sub_clk>;
#clock-cells = <1>;
clock-indices = <
SH73A0_CLK_SCIFA7 SH73A0_CLK_SY_DMAC
- SH73A0_CLK_MP_DMAC SH73A0_CLK_SCIFA5
- SH73A0_CLK_SCIFB SH73A0_CLK_SCIFA0
- SH73A0_CLK_SCIFA1 SH73A0_CLK_SCIFA2
- SH73A0_CLK_SCIFA3 SH73A0_CLK_SCIFA4
+ SH73A0_CLK_MP_DMAC SH73A0_CLK_MSIOF3
+ SH73A0_CLK_MSIOF1 SH73A0_CLK_SCIFA5
+ SH73A0_CLK_SCIFB SH73A0_CLK_MSIOF2
+ SH73A0_CLK_SCIFA0 SH73A0_CLK_SCIFA1
+ SH73A0_CLK_SCIFA2 SH73A0_CLK_SCIFA3
+ SH73A0_CLK_SCIFA4
>;
clock-output-names =
- "scifa7", "sy_dmac", "mp_dmac", "scifa5",
- "scifb", "scifa0", "scifa1", "scifa2",
- "scifa3", "scifa4";
+ "scifa7", "sy_dmac", "mp_dmac", "msiof3",
+ "msiof1", "scifa5", "scifb", "msiof2",
+ "scifa0", "scifa1", "scifa2", "scifa3",
+ "scifa4";
};
mstp3_clks: mstp3_clks at e615013c {
compatible = "renesas,sh73a0-mstp-clocks", "renesas,cpg-mstp-clocks";
diff --git a/include/dt-bindings/clock/sh73a0-clock.h b/include/dt-bindings/clock/sh73a0-clock.h
index 53369568c24c..2eca353a29d7 100644
--- a/include/dt-bindings/clock/sh73a0-clock.h
+++ b/include/dt-bindings/clock/sh73a0-clock.h
@@ -28,7 +28,8 @@
#define SH73A0_CLK_HP 14
/* MSTP0 */
-#define SH73A0_CLK_IIC2 1
+#define SH73A0_CLK_IIC2 1
+#define SH73A0_CLK_MSIOF0 0
/* MSTP1 */
#define SH73A0_CLK_CEU1 29
@@ -45,8 +46,11 @@
#define SH73A0_CLK_SCIFA7 19
#define SH73A0_CLK_SY_DMAC 18
#define SH73A0_CLK_MP_DMAC 17
+#define SH73A0_CLK_MSIOF3 15
+#define SH73A0_CLK_MSIOF1 8
#define SH73A0_CLK_SCIFA5 7
#define SH73A0_CLK_SCIFB 6
+#define SH73A0_CLK_MSIOF2 5
#define SH73A0_CLK_SCIFA0 4
#define SH73A0_CLK_SCIFA1 3
#define SH73A0_CLK_SCIFA2 2
--
2.1.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 02/25] ARM: shmobile: sh73a0: Add MSIOF device nodes
2015-12-18 2:29 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
2015-12-18 2:29 ` [PATCH 01/25] ARM: shmobile: sh73a0: Add MSIOF clocks Simon Horman
@ 2015-12-18 2:29 ` Simon Horman
2015-12-18 2:29 ` [PATCH 03/25] ARM: shmobile: r8a7791: add EtherAVB clock Simon Horman
` (23 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Simon Horman @ 2015-12-18 2:29 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
The sh73a0 has 4 MSIOF devices, located in the A3SP power area.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/sh73a0.dtsi | 44 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 44 insertions(+)
diff --git a/arch/arm/boot/dts/sh73a0.dtsi b/arch/arm/boot/dts/sh73a0.dtsi
index 635564ab98ed..3a6056f9f0d2 100644
--- a/arch/arm/boot/dts/sh73a0.dtsi
+++ b/arch/arm/boot/dts/sh73a0.dtsi
@@ -273,6 +273,50 @@
status = "disabled";
};
+ msiof0: spi at e6e20000 {
+ compatible = "renesas,msiof-sh73a0", "renesas,sh-mobile-msiof";
+ reg = <0xe6e20000 0x0064>;
+ interrupts = <0 142 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp0_clks SH73A0_CLK_MSIOF0>;
+ power-domains = <&pd_a3sp>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "disabled";
+ };
+
+ msiof1: spi at e6e10000 {
+ compatible = "renesas,msiof-sh73a0", "renesas,sh-mobile-msiof";
+ reg = <0xe6e10000 0x0064>;
+ interrupts = <0 77 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp2_clks SH73A0_CLK_MSIOF1>;
+ power-domains = <&pd_a3sp>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "disabled";
+ };
+
+ msiof2: spi at e6e00000 {
+ compatible = "renesas,msiof-sh73a0", "renesas,sh-mobile-msiof";
+ reg = <0xe6e00000 0x0064>;
+ interrupts = <0 76 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp2_clks SH73A0_CLK_MSIOF2>;
+ power-domains = <&pd_a3sp>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "disabled";
+ };
+
+ msiof3: spi at e6c90000 {
+ compatible = "renesas,msiof-sh73a0", "renesas,sh-mobile-msiof";
+ reg = <0xe6c90000 0x0064>;
+ interrupts = <0 59 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp2_clks SH73A0_CLK_MSIOF3>;
+ power-domains = <&pd_a3sp>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "disabled";
+ };
+
sdhi0: sd at ee100000 {
compatible = "renesas,sdhi-sh73a0";
reg = <0xee100000 0x100>;
--
2.1.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 03/25] ARM: shmobile: r8a7791: add EtherAVB clock
2015-12-18 2:29 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
2015-12-18 2:29 ` [PATCH 01/25] ARM: shmobile: sh73a0: Add MSIOF clocks Simon Horman
2015-12-18 2:29 ` [PATCH 02/25] ARM: shmobile: sh73a0: Add MSIOF device nodes Simon Horman
@ 2015-12-18 2:29 ` Simon Horman
2015-12-18 2:29 ` [PATCH 04/25] ARM: shmobile: r8a7791: add EtherAVB DT support Simon Horman
` (22 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Simon Horman @ 2015-12-18 2:29 UTC (permalink / raw)
To: linux-arm-kernel
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Add the EtherAVB clock to the R8A7791 device tree.
Based on the commit 63d2d750c902 ("ARM: shmobile: r8a7790: add EtherAVB
clocks").
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7791.dtsi | 10 ++++++----
include/dt-bindings/clock/r8a7791-clock.h | 1 +
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 12b2b0f95806..4b3132d9807f 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -1329,16 +1329,18 @@
compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks";
reg = <0 0xe6150990 0 4>, <0 0xe61509a0 0 4>;
clocks = <&zx_clk>, <&hp_clk>, <&zg_clk>, <&zg_clk>,
- <&zg_clk>, <&p_clk>, <&zs_clk>, <&zs_clk>;
+ <&zg_clk>, <&hp_clk>, <&p_clk>, <&zs_clk>,
+ <&zs_clk>;
#clock-cells = <1>;
clock-indices = <
R8A7791_CLK_IPMMU_SGX R8A7791_CLK_MLB
R8A7791_CLK_VIN2 R8A7791_CLK_VIN1 R8A7791_CLK_VIN0
- R8A7791_CLK_ETHER R8A7791_CLK_SATA1 R8A7791_CLK_SATA0
+ R8A7791_CLK_ETHERAVB R8A7791_CLK_ETHER
+ R8A7791_CLK_SATA1 R8A7791_CLK_SATA0
>;
clock-output-names =
- "ipmmu_sgx", "mlb", "vin2", "vin1", "vin0", "ether",
- "sata1", "sata0";
+ "ipmmu_sgx", "mlb", "vin2", "vin1", "vin0",
+ "etheravb", "ether", "sata1", "sata0";
};
mstp9_clks: mstp9_clks at e6150994 {
compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks";
diff --git a/include/dt-bindings/clock/r8a7791-clock.h b/include/dt-bindings/clock/r8a7791-clock.h
index dd09b73c4aaf..ffa11379b3f0 100644
--- a/include/dt-bindings/clock/r8a7791-clock.h
+++ b/include/dt-bindings/clock/r8a7791-clock.h
@@ -102,6 +102,7 @@
#define R8A7791_CLK_VIN2 9
#define R8A7791_CLK_VIN1 10
#define R8A7791_CLK_VIN0 11
+#define R8A7791_CLK_ETHERAVB 12
#define R8A7791_CLK_ETHER 13
#define R8A7791_CLK_SATA1 14
#define R8A7791_CLK_SATA0 15
--
2.1.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 04/25] ARM: shmobile: r8a7791: add EtherAVB DT support
2015-12-18 2:29 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
` (2 preceding siblings ...)
2015-12-18 2:29 ` [PATCH 03/25] ARM: shmobile: r8a7791: add EtherAVB clock Simon Horman
@ 2015-12-18 2:29 ` Simon Horman
2015-12-18 2:29 ` [PATCH 05/25] ARM: shmobile: r8a7793: remove deprecated #gpio-range-cells Simon Horman
` (21 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Simon Horman @ 2015-12-18 2:29 UTC (permalink / raw)
To: linux-arm-kernel
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Define the generic R8A7791 part of the EtherAVB device node.
Based on the commit f25d6b977240 ("ARM: shmobile: r8a7790: add EtherAVB DT
support").
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7791.dtsi | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 4b3132d9807f..36559cb0eb6b 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -785,6 +785,18 @@
status = "disabled";
};
+ avb: ethernet at e6800000 {
+ compatible = "renesas,etheravb-r8a7791",
+ "renesas,etheravb-rcar-gen2";
+ reg = <0 0xe6800000 0 0x800>, <0 0xee0e8000 0 0x4000>;
+ interrupts = <0 163 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp8_clks R8A7791_CLK_ETHERAVB>;
+ power-domains = <&cpg_clocks>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "disabled";
+ };
+
sata0: sata at ee300000 {
compatible = "renesas,sata-r8a7791";
reg = <0 0xee300000 0 0x2000>;
--
2.1.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 05/25] ARM: shmobile: r8a7793: remove deprecated #gpio-range-cells
2015-12-18 2:29 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
` (3 preceding siblings ...)
2015-12-18 2:29 ` [PATCH 04/25] ARM: shmobile: r8a7791: add EtherAVB DT support Simon Horman
@ 2015-12-18 2:29 ` Simon Horman
2015-12-18 2:29 ` [PATCH 06/25] ARM: shmobile: bockw dts: Override #sound-dai-cells to zero Simon Horman
` (20 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Simon Horman @ 2015-12-18 2:29 UTC (permalink / raw)
To: linux-arm-kernel
Commit a1bc260bb5f5d9 ("gpio: clean up gpio-ranges documentation")
declares the above property deprecated. That was more than 2 years ago.
Remove it, so it doesn't get copied around needlessly.
Based on similar work for the r8a7791 and r8a7794 by Wolfram Sang.
Cc: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Reported-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
arch/arm/boot/dts/r8a7793.dtsi | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm/boot/dts/r8a7793.dtsi b/arch/arm/boot/dts/r8a7793.dtsi
index cbcda80f4658..4c74a9229e71 100644
--- a/arch/arm/boot/dts/r8a7793.dtsi
+++ b/arch/arm/boot/dts/r8a7793.dtsi
@@ -233,7 +233,6 @@
pfc: pfc at e6060000 {
compatible = "renesas,pfc-r8a7793";
reg = <0 0xe6060000 0 0x250>;
- #gpio-range-cells = <3>;
};
dmac0: dma-controller at e6700000 {
--
2.1.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 06/25] ARM: shmobile: bockw dts: Override #sound-dai-cells to zero
2015-12-18 2:29 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
` (4 preceding siblings ...)
2015-12-18 2:29 ` [PATCH 05/25] ARM: shmobile: r8a7793: remove deprecated #gpio-range-cells Simon Horman
@ 2015-12-18 2:29 ` Simon Horman
2015-12-18 2:29 ` [PATCH 07/25] ARM: shmobile: r8a7778: tidyup #sound-dai-cells settings Simon Horman
` (19 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Simon Horman @ 2015-12-18 2:29 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
The default value of #sound-dai-cells in r8a7778.dtsi is one, while
the /sound/simple-audio-card,cpu device node in r8a7778-bockw.dts uses a
phandle without any extra cells ("<&rcar_sound>"), causing:
/sound/simple-audio-card,cpu: arguments longer than property
asoc-simple-card sound: parse error -22
asoc-simple-card: probe of sound failed with error -22
Override #sound-dai-cells to zero to fix this.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7778-bockw.dts | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7778-bockw.dts b/arch/arm/boot/dts/r8a7778-bockw.dts
index 3c03e6b8261e..158ad94fd4d1 100644
--- a/arch/arm/boot/dts/r8a7778-bockw.dts
+++ b/arch/arm/boot/dts/r8a7778-bockw.dts
@@ -172,6 +172,11 @@
};
};
+&rcar_sound {
+ /* Single DAI */
+ #sound-dai-cells = <0>;
+};
+
&sdhi0 {
pinctrl-0 = <&sdhi0_pins>, <&sdhi0_pup_pins>;
pinctrl-names = "default";
--
2.1.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 07/25] ARM: shmobile: r8a7778: tidyup #sound-dai-cells settings
2015-12-18 2:29 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
` (5 preceding siblings ...)
2015-12-18 2:29 ` [PATCH 06/25] ARM: shmobile: bockw dts: Override #sound-dai-cells to zero Simon Horman
@ 2015-12-18 2:29 ` Simon Horman
2015-12-18 2:29 ` [PATCH 08/25] ARM: shmobile: koelsch dts: Add serial port config to chosen/stdout-path Simon Horman
` (18 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Simon Horman @ 2015-12-18 2:29 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Renesas sound driver needs #sound-dai-cells settings, but, this usage
is a little bit confusable. It came from ALSA SoC historical reasons.
The sound DAI naming method is different between Single/Multi DAI in
the ALSA framework, and it is used for sound card matching.
And this #sound-dai-cells has relationship to it.
Current SoC dtsi has #sound-dai-cells = <1> as default settings
(= it is assuming that board/platform has multi DAI), and
board/platform side needs to overwrite it if board/platform was single
DAI. This style is more confusable for users.
This patch removes SoC side default settings, and force to set it by
board/platform side.
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 | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/r8a7778.dtsi b/arch/arm/boot/dts/r8a7778.dtsi
index 4f8e07811746..b140627dd88b 100644
--- a/arch/arm/boot/dts/r8a7778.dtsi
+++ b/arch/arm/boot/dts/r8a7778.dtsi
@@ -236,7 +236,12 @@
};
rcar_sound: sound at ffd90000 {
- #sound-dai-cells = <1>;
+ /*
+ * #sound-dai-cells is required
+ *
+ * Single DAI : #sound-dai-cells = <0>; <&rcar_sound>;
+ * Multi DAI : #sound-dai-cells = <1>; <&rcar_sound N>;
+ */
compatible = "renesas,rcar_sound-r8a7778", "renesas,rcar_sound-gen1";
reg = <0xffd90000 0x1000>, /* SRU */
<0xffd91000 0x240>, /* SSI */
--
2.1.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 08/25] ARM: shmobile: koelsch dts: Add serial port config to chosen/stdout-path
2015-12-18 2:29 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
` (6 preceding siblings ...)
2015-12-18 2:29 ` [PATCH 07/25] ARM: shmobile: r8a7778: tidyup #sound-dai-cells settings Simon Horman
@ 2015-12-18 2:29 ` Simon Horman
2015-12-18 2:29 ` [PATCH 09/25] ARM: shmobile: alt " Simon Horman
` (17 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Simon Horman @ 2015-12-18 2:29 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7791-koelsch.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index 50d7b17c6ebd..c94a0fb807a2 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -54,7 +54,7 @@
chosen {
bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp";
- stdout-path = &scif0;
+ stdout-path = "serial0:115200n8";
};
memory at 40000000 {
--
2.1.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 09/25] ARM: shmobile: alt dts: Add serial port config to chosen/stdout-path
2015-12-18 2:29 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
` (7 preceding siblings ...)
2015-12-18 2:29 ` [PATCH 08/25] ARM: shmobile: koelsch dts: Add serial port config to chosen/stdout-path Simon Horman
@ 2015-12-18 2:29 ` Simon Horman
2015-12-18 2:29 ` [PATCH 10/25] ARM: shmobile: ape6evm " Simon Horman
` (16 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Simon Horman @ 2015-12-18 2:29 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7794-alt.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/r8a7794-alt.dts b/arch/arm/boot/dts/r8a7794-alt.dts
index 767d9224d6cc..2394e4883786 100644
--- a/arch/arm/boot/dts/r8a7794-alt.dts
+++ b/arch/arm/boot/dts/r8a7794-alt.dts
@@ -21,7 +21,7 @@
chosen {
bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp";
- stdout-path = &scif2;
+ stdout-path = "serial0:115200n8";
};
memory at 40000000 {
--
2.1.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 10/25] ARM: shmobile: ape6evm dts: Add serial port config to chosen/stdout-path
2015-12-18 2:29 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
` (8 preceding siblings ...)
2015-12-18 2:29 ` [PATCH 09/25] ARM: shmobile: alt " Simon Horman
@ 2015-12-18 2:29 ` Simon Horman
2015-12-18 2:29 ` [PATCH 11/25] ARM: shmobile: bockw dts: Update console parameters Simon Horman
` (15 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Simon Horman @ 2015-12-18 2:29 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a73a4-ape6evm.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/r8a73a4-ape6evm.dts b/arch/arm/boot/dts/r8a73a4-ape6evm.dts
index 9b7eabd3eba3..590257095700 100644
--- a/arch/arm/boot/dts/r8a73a4-ape6evm.dts
+++ b/arch/arm/boot/dts/r8a73a4-ape6evm.dts
@@ -23,7 +23,7 @@
chosen {
bootargs = "ignore_loglevel root=/dev/nfs ip=dhcp rw";
- stdout-path = &scifa0;
+ stdout-path = "serial0:115200n8";
};
memory at 40000000 {
--
2.1.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 11/25] ARM: shmobile: bockw dts: Update console parameters
2015-12-18 2:29 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
` (9 preceding siblings ...)
2015-12-18 2:29 ` [PATCH 10/25] ARM: shmobile: ape6evm " Simon Horman
@ 2015-12-18 2:29 ` Simon Horman
2015-12-18 2:29 ` [PATCH 12/25] ARM: shmobile: gose dts: Add serial port config to chosen/stdout-path Simon Horman
` (14 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Simon Horman @ 2015-12-18 2:29 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Drop the "console=" parameter from the kernel command line, as it's no
longer needed for DT-based platforms.
Add serial port config to chosen/stdout-path.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7778-bockw.dts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7778-bockw.dts b/arch/arm/boot/dts/r8a7778-bockw.dts
index 158ad94fd4d1..b1aa02599229 100644
--- a/arch/arm/boot/dts/r8a7778-bockw.dts
+++ b/arch/arm/boot/dts/r8a7778-bockw.dts
@@ -28,8 +28,8 @@
};
chosen {
- bootargs = "console=ttySC0,115200 ignore_loglevel ip=dhcp root=/dev/nfs rw";
- stdout-path = &scif0;
+ bootargs = "ignore_loglevel ip=dhcp root=/dev/nfs rw";
+ stdout-path = "serial0:115200n8";
};
memory {
--
2.1.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 12/25] ARM: shmobile: gose dts: Add serial port config to chosen/stdout-path
2015-12-18 2:29 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
` (10 preceding siblings ...)
2015-12-18 2:29 ` [PATCH 11/25] ARM: shmobile: bockw dts: Update console parameters Simon Horman
@ 2015-12-18 2:29 ` Simon Horman
2015-12-18 2:29 ` [PATCH 13/25] ARM: shmobile: silk " Simon Horman
` (13 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Simon Horman @ 2015-12-18 2:29 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7793-gose.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/r8a7793-gose.dts b/arch/arm/boot/dts/r8a7793-gose.dts
index d842ce77b7c8..3e3122490650 100644
--- a/arch/arm/boot/dts/r8a7793-gose.dts
+++ b/arch/arm/boot/dts/r8a7793-gose.dts
@@ -24,7 +24,7 @@
chosen {
bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp";
- stdout-path = &scif0;
+ stdout-path = "serial0:115200n8";
};
memory at 40000000 {
--
2.1.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 13/25] ARM: shmobile: silk dts: Add serial port config to chosen/stdout-path
2015-12-18 2:29 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
` (11 preceding siblings ...)
2015-12-18 2:29 ` [PATCH 12/25] ARM: shmobile: gose dts: Add serial port config to chosen/stdout-path Simon Horman
@ 2015-12-18 2:29 ` Simon Horman
2015-12-18 2:29 ` [PATCH 14/25] ARM: shmobile: porter " Simon Horman
` (12 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Simon Horman @ 2015-12-18 2:29 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7794-silk.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/r8a7794-silk.dts b/arch/arm/boot/dts/r8a7794-silk.dts
index 58f0ddf21c17..5a8dcac37c8e 100644
--- a/arch/arm/boot/dts/r8a7794-silk.dts
+++ b/arch/arm/boot/dts/r8a7794-silk.dts
@@ -24,7 +24,7 @@
chosen {
bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp";
- stdout-path = &scif2;
+ stdout-path = "serial0:115200n8";
};
memory at 40000000 {
--
2.1.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 14/25] ARM: shmobile: porter dts: Add serial port config to chosen/stdout-path
2015-12-18 2:29 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
` (12 preceding siblings ...)
2015-12-18 2:29 ` [PATCH 13/25] ARM: shmobile: silk " Simon Horman
@ 2015-12-18 2:29 ` Simon Horman
2015-12-18 2:29 ` [PATCH 15/25] ARM: shmobile: lager " Simon Horman
` (11 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Simon Horman @ 2015-12-18 2:29 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7791-porter.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/r8a7791-porter.dts b/arch/arm/boot/dts/r8a7791-porter.dts
index f2dd5356eac8..71ba7b6b3a33 100644
--- a/arch/arm/boot/dts/r8a7791-porter.dts
+++ b/arch/arm/boot/dts/r8a7791-porter.dts
@@ -22,7 +22,7 @@
chosen {
bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp";
- stdout-path = &scif0;
+ stdout-path = "serial0:115200n8";
};
memory at 40000000 {
--
2.1.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 15/25] ARM: shmobile: lager dts: Add serial port config to chosen/stdout-path
2015-12-18 2:29 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
` (13 preceding siblings ...)
2015-12-18 2:29 ` [PATCH 14/25] ARM: shmobile: porter " Simon Horman
@ 2015-12-18 2:29 ` Simon Horman
2015-12-18 2:29 ` [PATCH 16/25] ARM: shmobile: r8a7793: Add missing serial devices to DT Simon Horman
` (10 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Simon Horman @ 2015-12-18 2:29 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7790-lager.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index c46295afb08a..44ba69b974a2 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -53,7 +53,7 @@
chosen {
bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp";
- stdout-path = &scif0;
+ stdout-path = "serial0:115200n8";
};
memory at 40000000 {
--
2.1.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 16/25] ARM: shmobile: r8a7793: Add missing serial devices to DT
2015-12-18 2:29 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
` (14 preceding siblings ...)
2015-12-18 2:29 ` [PATCH 15/25] ARM: shmobile: lager " Simon Horman
@ 2015-12-18 2:29 ` Simon Horman
2015-12-18 2:29 ` [PATCH 17/25] ARM: shmobile: r8a7793: Describe DMA for the serial ports Simon Horman
` (9 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Simon Horman @ 2015-12-18 2:29 UTC (permalink / raw)
To: linux-arm-kernel
Instantiate all serial devices in r8a7793 device tree
and set them as disabled by default.
Based on similar work for the r8a7791 by Laurent Pinchart.
Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7793.dtsi | 179 ++++++++++++++++++++++++++++++++++++++++-
1 file changed, 177 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7793.dtsi b/arch/arm/boot/dts/r8a7793.dtsi
index 4c74a9229e71..309b33d60001 100644
--- a/arch/arm/boot/dts/r8a7793.dtsi
+++ b/arch/arm/boot/dts/r8a7793.dtsi
@@ -297,6 +297,96 @@
dma-channels = <15>;
};
+ scifa0: serial at e6c40000 {
+ compatible = "renesas,scifa-r8a7793", "renesas,scifa";
+ reg = <0 0xe6c40000 0 64>;
+ interrupts = <0 144 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp2_clks R8A7793_CLK_SCIFA0>;
+ clock-names = "sci_ick";
+ power-domains = <&cpg_clocks>;
+ status = "disabled";
+ };
+
+ scifa1: serial at e6c50000 {
+ compatible = "renesas,scifa-r8a7793", "renesas,scifa";
+ reg = <0 0xe6c50000 0 64>;
+ interrupts = <0 145 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp2_clks R8A7793_CLK_SCIFA1>;
+ clock-names = "sci_ick";
+ power-domains = <&cpg_clocks>;
+ status = "disabled";
+ };
+
+ scifa2: serial at e6c60000 {
+ compatible = "renesas,scifa-r8a7793", "renesas,scifa";
+ reg = <0 0xe6c60000 0 64>;
+ interrupts = <0 151 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp2_clks R8A7793_CLK_SCIFA2>;
+ clock-names = "sci_ick";
+ power-domains = <&cpg_clocks>;
+ status = "disabled";
+ };
+
+ scifa3: serial at e6c70000 {
+ compatible = "renesas,scifa-r8a7793", "renesas,scifa";
+ reg = <0 0xe6c70000 0 64>;
+ interrupts = <0 29 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp11_clks R8A7793_CLK_SCIFA3>;
+ clock-names = "sci_ick";
+ power-domains = <&cpg_clocks>;
+ status = "disabled";
+ };
+
+ scifa4: serial at e6c78000 {
+ compatible = "renesas,scifa-r8a7793", "renesas,scifa";
+ reg = <0 0xe6c78000 0 64>;
+ interrupts = <0 30 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp11_clks R8A7793_CLK_SCIFA4>;
+ clock-names = "sci_ick";
+ power-domains = <&cpg_clocks>;
+ status = "disabled";
+ };
+
+ scifa5: serial at e6c80000 {
+ compatible = "renesas,scifa-r8a7793", "renesas,scifa";
+ reg = <0 0xe6c80000 0 64>;
+ interrupts = <0 31 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp11_clks R8A7793_CLK_SCIFA5>;
+ clock-names = "sci_ick";
+ power-domains = <&cpg_clocks>;
+ status = "disabled";
+ };
+
+ scifb0: serial at e6c20000 {
+ compatible = "renesas,scifb-r8a7793", "renesas,scifb";
+ reg = <0 0xe6c20000 0 64>;
+ interrupts = <0 148 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp2_clks R8A7793_CLK_SCIFB0>;
+ clock-names = "sci_ick";
+ power-domains = <&cpg_clocks>;
+ status = "disabled";
+ };
+
+ scifb1: serial at e6c30000 {
+ compatible = "renesas,scifb-r8a7793", "renesas,scifb";
+ reg = <0 0xe6c30000 0 64>;
+ interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp2_clks R8A7793_CLK_SCIFB1>;
+ clock-names = "sci_ick";
+ power-domains = <&cpg_clocks>;
+ status = "disabled";
+ };
+
+ scifb2: serial at e6ce0000 {
+ compatible = "renesas,scifb-r8a7793", "renesas,scifb";
+ reg = <0 0xe6ce0000 0 64>;
+ interrupts = <0 150 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp2_clks R8A7793_CLK_SCIFB2>;
+ clock-names = "sci_ick";
+ power-domains = <&cpg_clocks>;
+ status = "disabled";
+ };
+
scif0: serial at e6e60000 {
compatible = "renesas,scif-r8a7793", "renesas,scif";
reg = <0 0xe6e60000 0 64>;
@@ -317,6 +407,76 @@
status = "disabled";
};
+ scif2: serial at e6e58000 {
+ compatible = "renesas,scif-r8a7793", "renesas,scif";
+ reg = <0 0xe6e58000 0 64>;
+ interrupts = <0 22 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp7_clks R8A7793_CLK_SCIF2>;
+ clock-names = "sci_ick";
+ power-domains = <&cpg_clocks>;
+ status = "disabled";
+ };
+
+ scif3: serial at e6ea8000 {
+ compatible = "renesas,scif-r8a7793", "renesas,scif";
+ reg = <0 0xe6ea8000 0 64>;
+ interrupts = <0 23 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp7_clks R8A7793_CLK_SCIF3>;
+ clock-names = "sci_ick";
+ power-domains = <&cpg_clocks>;
+ status = "disabled";
+ };
+
+ scif4: serial at e6ee0000 {
+ compatible = "renesas,scif-r8a7793", "renesas,scif";
+ reg = <0 0xe6ee0000 0 64>;
+ interrupts = <0 24 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp7_clks R8A7793_CLK_SCIF4>;
+ clock-names = "sci_ick";
+ power-domains = <&cpg_clocks>;
+ status = "disabled";
+ };
+
+ scif5: serial at e6ee8000 {
+ compatible = "renesas,scif-r8a7793", "renesas,scif";
+ reg = <0 0xe6ee8000 0 64>;
+ interrupts = <0 25 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp7_clks R8A7793_CLK_SCIF5>;
+ clock-names = "sci_ick";
+ power-domains = <&cpg_clocks>;
+ status = "disabled";
+ };
+
+ hscif0: serial at e62c0000 {
+ compatible = "renesas,hscif-r8a7793", "renesas,hscif";
+ reg = <0 0xe62c0000 0 96>;
+ interrupts = <0 154 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp7_clks R8A7793_CLK_HSCIF0>;
+ clock-names = "sci_ick";
+ power-domains = <&cpg_clocks>;
+ status = "disabled";
+ };
+
+ hscif1: serial at e62c8000 {
+ compatible = "renesas,hscif-r8a7793", "renesas,hscif";
+ reg = <0 0xe62c8000 0 96>;
+ interrupts = <0 155 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp7_clks R8A7793_CLK_HSCIF1>;
+ clock-names = "sci_ick";
+ power-domains = <&cpg_clocks>;
+ status = "disabled";
+ };
+
+ hscif2: serial at e62d0000 {
+ compatible = "renesas,hscif-r8a7793", "renesas,hscif";
+ reg = <0 0xe62d0000 0 96>;
+ interrupts = <0 21 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp7_clks R8A7793_CLK_HSCIF2>;
+ clock-names = "sci_ick";
+ power-domains = <&cpg_clocks>;
+ status = "disabled";
+ };
+
ether: ethernet at ee700000 {
compatible = "renesas,ether-r8a7793";
reg = <0 0xee700000 0 0x400>;
@@ -529,12 +689,17 @@
mstp2_clks: mstp2_clks at e6150138 {
compatible = "renesas,r8a7793-mstp-clocks", "renesas,cpg-mstp-clocks";
reg = <0 0xe6150138 0 4>, <0 0xe6150040 0 4>;
- clocks = <&zs_clk>, <&zs_clk>;
+ clocks = <&mp_clk>, <&mp_clk>, <&mp_clk>, <&mp_clk>,
+ <&mp_clk>, <&mp_clk>, <&zs_clk>, <&zs_clk>;
#clock-cells = <1>;
clock-indices = <
+ R8A7793_CLK_SCIFA2 R8A7793_CLK_SCIFA1 R8A7793_CLK_SCIFA0
+ R8A7793_CLK_SCIFB0 R8A7793_CLK_SCIFB1 R8A7793_CLK_SCIFB2
R8A7793_CLK_SYS_DMAC1 R8A7793_CLK_SYS_DMAC0
>;
- clock-output-names = "sys-dmac1", "sys-dmac0";
+ clock-output-names =
+ "scifa2", "scifa1", "scifa0", "scifb0",
+ "scifb1", "scifb2", "sys-dmac1", "sys-dmac0";
};
mstp3_clks: mstp3_clks at e615013c {
compatible = "renesas,r8a7793-mstp-clocks",
@@ -633,6 +798,16 @@
"gpio3", "gpio2", "gpio1", "gpio0",
"qspi_mod";
};
+ mstp11_clks: mstp11_clks at e615099c {
+ compatible = "renesas,r8a7793-mstp-clocks", "renesas,cpg-mstp-clocks";
+ reg = <0 0xe615099c 0 4>, <0 0xe61509ac 0 4>;
+ clocks = <&mp_clk>, <&mp_clk>, <&mp_clk>;
+ #clock-cells = <1>;
+ clock-indices = <
+ R8A7793_CLK_SCIFA3 R8A7793_CLK_SCIFA4 R8A7793_CLK_SCIFA5
+ >;
+ clock-output-names = "scifa3", "scifa4", "scifa5";
+ };
};
ipmmu_sy0: mmu at e6280000 {
--
2.1.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 17/25] ARM: shmobile: r8a7793: Describe DMA for the serial ports
2015-12-18 2:29 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
` (15 preceding siblings ...)
2015-12-18 2:29 ` [PATCH 16/25] ARM: shmobile: r8a7793: Add missing serial devices to DT Simon Horman
@ 2015-12-18 2:29 ` Simon Horman
2015-12-18 2:29 ` [PATCH 18/25] ARM: shmobile: r8a7790: dtsi: add internal delay for i2c IPs Simon Horman
` (8 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Simon Horman @ 2015-12-18 2:29 UTC (permalink / raw)
To: linux-arm-kernel
Add DMA properties to all SCIF, SCIFA, SCIFB, and HSCIF device nodes.
Based on similar work for the r8a7791 by Geert Uytterhoeven.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/boot/dts/r8a7793.dtsi | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7793.dtsi b/arch/arm/boot/dts/r8a7793.dtsi
index 309b33d60001..df607a92b2ed 100644
--- a/arch/arm/boot/dts/r8a7793.dtsi
+++ b/arch/arm/boot/dts/r8a7793.dtsi
@@ -303,6 +303,8 @@
interrupts = <0 144 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp2_clks R8A7793_CLK_SCIFA0>;
clock-names = "sci_ick";
+ dmas = <&dmac0 0x21>, <&dmac0 0x22>;
+ dma-names = "tx", "rx";
power-domains = <&cpg_clocks>;
status = "disabled";
};
@@ -313,6 +315,8 @@
interrupts = <0 145 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp2_clks R8A7793_CLK_SCIFA1>;
clock-names = "sci_ick";
+ dmas = <&dmac0 0x25>, <&dmac0 0x26>;
+ dma-names = "tx", "rx";
power-domains = <&cpg_clocks>;
status = "disabled";
};
@@ -323,6 +327,8 @@
interrupts = <0 151 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp2_clks R8A7793_CLK_SCIFA2>;
clock-names = "sci_ick";
+ dmas = <&dmac0 0x27>, <&dmac0 0x28>;
+ dma-names = "tx", "rx";
power-domains = <&cpg_clocks>;
status = "disabled";
};
@@ -333,6 +339,8 @@
interrupts = <0 29 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp11_clks R8A7793_CLK_SCIFA3>;
clock-names = "sci_ick";
+ dmas = <&dmac0 0x1b>, <&dmac0 0x1c>;
+ dma-names = "tx", "rx";
power-domains = <&cpg_clocks>;
status = "disabled";
};
@@ -343,6 +351,8 @@
interrupts = <0 30 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp11_clks R8A7793_CLK_SCIFA4>;
clock-names = "sci_ick";
+ dmas = <&dmac0 0x1f>, <&dmac0 0x20>;
+ dma-names = "tx", "rx";
power-domains = <&cpg_clocks>;
status = "disabled";
};
@@ -353,6 +363,8 @@
interrupts = <0 31 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp11_clks R8A7793_CLK_SCIFA5>;
clock-names = "sci_ick";
+ dmas = <&dmac0 0x23>, <&dmac0 0x24>;
+ dma-names = "tx", "rx";
power-domains = <&cpg_clocks>;
status = "disabled";
};
@@ -363,6 +375,8 @@
interrupts = <0 148 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp2_clks R8A7793_CLK_SCIFB0>;
clock-names = "sci_ick";
+ dmas = <&dmac0 0x3d>, <&dmac0 0x3e>;
+ dma-names = "tx", "rx";
power-domains = <&cpg_clocks>;
status = "disabled";
};
@@ -373,6 +387,8 @@
interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp2_clks R8A7793_CLK_SCIFB1>;
clock-names = "sci_ick";
+ dmas = <&dmac0 0x19>, <&dmac0 0x1a>;
+ dma-names = "tx", "rx";
power-domains = <&cpg_clocks>;
status = "disabled";
};
@@ -383,6 +399,8 @@
interrupts = <0 150 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp2_clks R8A7793_CLK_SCIFB2>;
clock-names = "sci_ick";
+ dmas = <&dmac0 0x1d>, <&dmac0 0x1e>;
+ dma-names = "tx", "rx";
power-domains = <&cpg_clocks>;
status = "disabled";
};
@@ -393,6 +411,8 @@
interrupts = <0 152 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp7_clks R8A7793_CLK_SCIF0>;
clock-names = "sci_ick";
+ dmas = <&dmac0 0x29>, <&dmac0 0x2a>;
+ dma-names = "tx", "rx";
power-domains = <&cpg_clocks>;
status = "disabled";
};
@@ -403,6 +423,8 @@
interrupts = <0 153 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp7_clks R8A7793_CLK_SCIF1>;
clock-names = "sci_ick";
+ dmas = <&dmac0 0x2d>, <&dmac0 0x2e>;
+ dma-names = "tx", "rx";
power-domains = <&cpg_clocks>;
status = "disabled";
};
@@ -413,6 +435,8 @@
interrupts = <0 22 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp7_clks R8A7793_CLK_SCIF2>;
clock-names = "sci_ick";
+ dmas = <&dmac0 0x2b>, <&dmac0 0x2c>;
+ dma-names = "tx", "rx";
power-domains = <&cpg_clocks>;
status = "disabled";
};
@@ -423,6 +447,8 @@
interrupts = <0 23 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp7_clks R8A7793_CLK_SCIF3>;
clock-names = "sci_ick";
+ dmas = <&dmac0 0x2f>, <&dmac0 0x30>;
+ dma-names = "tx", "rx";
power-domains = <&cpg_clocks>;
status = "disabled";
};
@@ -433,6 +459,8 @@
interrupts = <0 24 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp7_clks R8A7793_CLK_SCIF4>;
clock-names = "sci_ick";
+ dmas = <&dmac0 0xfb>, <&dmac0 0xfc>;
+ dma-names = "tx", "rx";
power-domains = <&cpg_clocks>;
status = "disabled";
};
@@ -443,6 +471,8 @@
interrupts = <0 25 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp7_clks R8A7793_CLK_SCIF5>;
clock-names = "sci_ick";
+ dmas = <&dmac0 0xfd>, <&dmac0 0xfe>;
+ dma-names = "tx", "rx";
power-domains = <&cpg_clocks>;
status = "disabled";
};
@@ -453,6 +483,8 @@
interrupts = <0 154 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp7_clks R8A7793_CLK_HSCIF0>;
clock-names = "sci_ick";
+ dmas = <&dmac0 0x39>, <&dmac0 0x3a>;
+ dma-names = "tx", "rx";
power-domains = <&cpg_clocks>;
status = "disabled";
};
@@ -463,6 +495,8 @@
interrupts = <0 155 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp7_clks R8A7793_CLK_HSCIF1>;
clock-names = "sci_ick";
+ dmas = <&dmac0 0x4d>, <&dmac0 0x4e>;
+ dma-names = "tx", "rx";
power-domains = <&cpg_clocks>;
status = "disabled";
};
@@ -473,6 +507,8 @@
interrupts = <0 21 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp7_clks R8A7793_CLK_HSCIF2>;
clock-names = "sci_ick";
+ dmas = <&dmac0 0x3b>, <&dmac0 0x3c>;
+ dma-names = "tx", "rx";
power-domains = <&cpg_clocks>;
status = "disabled";
};
--
2.1.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 18/25] ARM: shmobile: r8a7790: dtsi: add internal delay for i2c IPs
2015-12-18 2:29 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
` (16 preceding siblings ...)
2015-12-18 2:29 ` [PATCH 17/25] ARM: shmobile: r8a7793: Describe DMA for the serial ports Simon Horman
@ 2015-12-18 2:29 ` Simon Horman
2015-12-18 2:29 ` [PATCH 19/25] ARM: shmobile: r8a7791: " Simon Horman
` (7 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Simon Horman @ 2015-12-18 2:29 UTC (permalink / raw)
To: linux-arm-kernel
From: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7790.dtsi | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 9f3036b80c0e..4eab5f43f7e5 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -417,6 +417,7 @@
interrupts = <0 287 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp9_clks R8A7790_CLK_I2C0>;
power-domains = <&cpg_clocks>;
+ i2c-scl-internal-delay-ns = <110>;
status = "disabled";
};
@@ -428,6 +429,7 @@
interrupts = <0 288 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp9_clks R8A7790_CLK_I2C1>;
power-domains = <&cpg_clocks>;
+ i2c-scl-internal-delay-ns = <6>;
status = "disabled";
};
@@ -439,6 +441,7 @@
interrupts = <0 286 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp9_clks R8A7790_CLK_I2C2>;
power-domains = <&cpg_clocks>;
+ i2c-scl-internal-delay-ns = <6>;
status = "disabled";
};
@@ -450,6 +453,7 @@
interrupts = <0 290 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp9_clks R8A7790_CLK_I2C3>;
power-domains = <&cpg_clocks>;
+ i2c-scl-internal-delay-ns = <110>;
status = "disabled";
};
--
2.1.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 19/25] ARM: shmobile: r8a7791: dtsi: add internal delay for i2c IPs
2015-12-18 2:29 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
` (17 preceding siblings ...)
2015-12-18 2:29 ` [PATCH 18/25] ARM: shmobile: r8a7790: dtsi: add internal delay for i2c IPs Simon Horman
@ 2015-12-18 2:29 ` Simon Horman
2015-12-18 2:29 ` [PATCH 20/25] ARM: shmobile: r8a7794: " Simon Horman
` (6 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Simon Horman @ 2015-12-18 2:29 UTC (permalink / raw)
To: linux-arm-kernel
From: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7791.dtsi | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 36559cb0eb6b..3a2551094b8b 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -407,6 +407,7 @@
interrupts = <0 287 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp9_clks R8A7791_CLK_I2C0>;
power-domains = <&cpg_clocks>;
+ i2c-scl-internal-delay-ns = <6>;
status = "disabled";
};
@@ -418,6 +419,7 @@
interrupts = <0 288 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp9_clks R8A7791_CLK_I2C1>;
power-domains = <&cpg_clocks>;
+ i2c-scl-internal-delay-ns = <6>;
status = "disabled";
};
@@ -429,6 +431,7 @@
interrupts = <0 286 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp9_clks R8A7791_CLK_I2C2>;
power-domains = <&cpg_clocks>;
+ i2c-scl-internal-delay-ns = <6>;
status = "disabled";
};
@@ -440,6 +443,7 @@
interrupts = <0 290 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp9_clks R8A7791_CLK_I2C3>;
power-domains = <&cpg_clocks>;
+ i2c-scl-internal-delay-ns = <6>;
status = "disabled";
};
@@ -451,6 +455,7 @@
interrupts = <0 19 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp9_clks R8A7791_CLK_I2C4>;
power-domains = <&cpg_clocks>;
+ i2c-scl-internal-delay-ns = <6>;
status = "disabled";
};
@@ -463,6 +468,7 @@
interrupts = <0 20 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp9_clks R8A7791_CLK_I2C5>;
power-domains = <&cpg_clocks>;
+ i2c-scl-internal-delay-ns = <110>;
status = "disabled";
};
--
2.1.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 20/25] ARM: shmobile: r8a7794: dtsi: add internal delay for i2c IPs
2015-12-18 2:29 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
` (18 preceding siblings ...)
2015-12-18 2:29 ` [PATCH 19/25] ARM: shmobile: r8a7791: " Simon Horman
@ 2015-12-18 2:29 ` Simon Horman
2015-12-18 2:29 ` [PATCH 21/25] ARM: shmobile: r8a7790: IPMMU compat string SoC part number update Simon Horman
` (5 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Simon Horman @ 2015-12-18 2:29 UTC (permalink / raw)
To: linux-arm-kernel
From: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7794.dtsi | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
index 89e914f2a2cf..7fb2da2f54ff 100644
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -518,6 +518,7 @@
power-domains = <&cpg_clocks>;
#address-cells = <1>;
#size-cells = <0>;
+ i2c-scl-internal-delay-ns = <6>;
status = "disabled";
};
@@ -529,6 +530,7 @@
power-domains = <&cpg_clocks>;
#address-cells = <1>;
#size-cells = <0>;
+ i2c-scl-internal-delay-ns = <6>;
status = "disabled";
};
@@ -540,6 +542,7 @@
power-domains = <&cpg_clocks>;
#address-cells = <1>;
#size-cells = <0>;
+ i2c-scl-internal-delay-ns = <6>;
status = "disabled";
};
@@ -551,6 +554,7 @@
power-domains = <&cpg_clocks>;
#address-cells = <1>;
#size-cells = <0>;
+ i2c-scl-internal-delay-ns = <6>;
status = "disabled";
};
@@ -562,6 +566,7 @@
power-domains = <&cpg_clocks>;
#address-cells = <1>;
#size-cells = <0>;
+ i2c-scl-internal-delay-ns = <6>;
status = "disabled";
};
@@ -573,6 +578,7 @@
power-domains = <&cpg_clocks>;
#address-cells = <1>;
#size-cells = <0>;
+ i2c-scl-internal-delay-ns = <6>;
status = "disabled";
};
--
2.1.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 21/25] ARM: shmobile: r8a7790: IPMMU compat string SoC part number update
2015-12-18 2:29 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
` (19 preceding siblings ...)
2015-12-18 2:29 ` [PATCH 20/25] ARM: shmobile: r8a7794: " Simon Horman
@ 2015-12-18 2:29 ` Simon Horman
2015-12-18 2:29 ` [PATCH 22/25] ARM: shmobile: r8a7791: " Simon Horman
` (4 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Simon Horman @ 2015-12-18 2:29 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Update IPMMU compat strings to include SoC part number.
By specifying SoC part number in DT it becomes possible
to implement SoC specific features in the IPMMU driver.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7790.dtsi | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 4eab5f43f7e5..ee587cd823f5 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -1770,7 +1770,7 @@
};
ipmmu_sy0: mmu at e6280000 {
- compatible = "renesas,ipmmu-vmsa";
+ compatible = "renesas,ipmmu-r8a7790", "renesas,ipmmu-vmsa";
reg = <0 0xe6280000 0 0x1000>;
interrupts = <0 223 IRQ_TYPE_LEVEL_HIGH>,
<0 224 IRQ_TYPE_LEVEL_HIGH>;
@@ -1779,7 +1779,7 @@
};
ipmmu_sy1: mmu at e6290000 {
- compatible = "renesas,ipmmu-vmsa";
+ compatible = "renesas,ipmmu-r8a7790", "renesas,ipmmu-vmsa";
reg = <0 0xe6290000 0 0x1000>;
interrupts = <0 225 IRQ_TYPE_LEVEL_HIGH>;
#iommu-cells = <1>;
@@ -1787,7 +1787,7 @@
};
ipmmu_ds: mmu at e6740000 {
- compatible = "renesas,ipmmu-vmsa";
+ compatible = "renesas,ipmmu-r8a7790", "renesas,ipmmu-vmsa";
reg = <0 0xe6740000 0 0x1000>;
interrupts = <0 198 IRQ_TYPE_LEVEL_HIGH>,
<0 199 IRQ_TYPE_LEVEL_HIGH>;
@@ -1796,7 +1796,7 @@
};
ipmmu_mp: mmu at ec680000 {
- compatible = "renesas,ipmmu-vmsa";
+ compatible = "renesas,ipmmu-r8a7790", "renesas,ipmmu-vmsa";
reg = <0 0xec680000 0 0x1000>;
interrupts = <0 226 IRQ_TYPE_LEVEL_HIGH>;
#iommu-cells = <1>;
@@ -1804,7 +1804,7 @@
};
ipmmu_mx: mmu at fe951000 {
- compatible = "renesas,ipmmu-vmsa";
+ compatible = "renesas,ipmmu-r8a7790", "renesas,ipmmu-vmsa";
reg = <0 0xfe951000 0 0x1000>;
interrupts = <0 222 IRQ_TYPE_LEVEL_HIGH>,
<0 221 IRQ_TYPE_LEVEL_HIGH>;
@@ -1813,7 +1813,7 @@
};
ipmmu_rt: mmu at ffc80000 {
- compatible = "renesas,ipmmu-vmsa";
+ compatible = "renesas,ipmmu-r8a7790", "renesas,ipmmu-vmsa";
reg = <0 0xffc80000 0 0x1000>;
interrupts = <0 307 IRQ_TYPE_LEVEL_HIGH>;
#iommu-cells = <1>;
--
2.1.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 22/25] ARM: shmobile: r8a7791: IPMMU compat string SoC part number update
2015-12-18 2:29 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
` (20 preceding siblings ...)
2015-12-18 2:29 ` [PATCH 21/25] ARM: shmobile: r8a7790: IPMMU compat string SoC part number update Simon Horman
@ 2015-12-18 2:29 ` Simon Horman
2015-12-18 2:29 ` [PATCH 23/25] ARM: shmobile: r8a7793: " Simon Horman
` (3 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Simon Horman @ 2015-12-18 2:29 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Update IPMMU compat strings to include SoC part number.
By specifying SoC part number in DT it becomes possible
to implement SoC specific features in the IPMMU driver.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7791.dtsi | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 3a2551094b8b..3f15aa7dc4d6 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -1590,7 +1590,7 @@
};
ipmmu_sy0: mmu at e6280000 {
- compatible = "renesas,ipmmu-vmsa";
+ compatible = "renesas,ipmmu-r8a7791", "renesas,ipmmu-vmsa";
reg = <0 0xe6280000 0 0x1000>;
interrupts = <0 223 IRQ_TYPE_LEVEL_HIGH>,
<0 224 IRQ_TYPE_LEVEL_HIGH>;
@@ -1599,7 +1599,7 @@
};
ipmmu_sy1: mmu at e6290000 {
- compatible = "renesas,ipmmu-vmsa";
+ compatible = "renesas,ipmmu-r8a7791", "renesas,ipmmu-vmsa";
reg = <0 0xe6290000 0 0x1000>;
interrupts = <0 225 IRQ_TYPE_LEVEL_HIGH>;
#iommu-cells = <1>;
@@ -1607,7 +1607,7 @@
};
ipmmu_ds: mmu at e6740000 {
- compatible = "renesas,ipmmu-vmsa";
+ compatible = "renesas,ipmmu-r8a7791", "renesas,ipmmu-vmsa";
reg = <0 0xe6740000 0 0x1000>;
interrupts = <0 198 IRQ_TYPE_LEVEL_HIGH>,
<0 199 IRQ_TYPE_LEVEL_HIGH>;
@@ -1616,7 +1616,7 @@
};
ipmmu_mp: mmu at ec680000 {
- compatible = "renesas,ipmmu-vmsa";
+ compatible = "renesas,ipmmu-r8a7791", "renesas,ipmmu-vmsa";
reg = <0 0xec680000 0 0x1000>;
interrupts = <0 226 IRQ_TYPE_LEVEL_HIGH>;
#iommu-cells = <1>;
@@ -1624,7 +1624,7 @@
};
ipmmu_mx: mmu at fe951000 {
- compatible = "renesas,ipmmu-vmsa";
+ compatible = "renesas,ipmmu-r8a7791", "renesas,ipmmu-vmsa";
reg = <0 0xfe951000 0 0x1000>;
interrupts = <0 222 IRQ_TYPE_LEVEL_HIGH>,
<0 221 IRQ_TYPE_LEVEL_HIGH>;
@@ -1633,7 +1633,7 @@
};
ipmmu_rt: mmu at ffc80000 {
- compatible = "renesas,ipmmu-vmsa";
+ compatible = "renesas,ipmmu-r8a7791", "renesas,ipmmu-vmsa";
reg = <0 0xffc80000 0 0x1000>;
interrupts = <0 307 IRQ_TYPE_LEVEL_HIGH>;
#iommu-cells = <1>;
@@ -1641,7 +1641,7 @@
};
ipmmu_gp: mmu at e62a0000 {
- compatible = "renesas,ipmmu-vmsa";
+ compatible = "renesas,ipmmu-r8a7791", "renesas,ipmmu-vmsa";
reg = <0 0xe62a0000 0 0x1000>;
interrupts = <0 260 IRQ_TYPE_LEVEL_HIGH>,
<0 261 IRQ_TYPE_LEVEL_HIGH>;
--
2.1.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 23/25] ARM: shmobile: r8a7793: IPMMU compat string SoC part number update
2015-12-18 2:29 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
` (21 preceding siblings ...)
2015-12-18 2:29 ` [PATCH 22/25] ARM: shmobile: r8a7791: " Simon Horman
@ 2015-12-18 2:29 ` Simon Horman
2015-12-18 2:29 ` [PATCH 24/25] ARM: shmobile: r8a7794: " Simon Horman
` (2 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Simon Horman @ 2015-12-18 2:29 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Update IPMMU compat strings to include SoC part number.
By specifying SoC part number in DT it becomes possible
to implement SoC specific features in the IPMMU driver.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7793.dtsi | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7793.dtsi b/arch/arm/boot/dts/r8a7793.dtsi
index df607a92b2ed..aef9e69d6c26 100644
--- a/arch/arm/boot/dts/r8a7793.dtsi
+++ b/arch/arm/boot/dts/r8a7793.dtsi
@@ -847,7 +847,7 @@
};
ipmmu_sy0: mmu at e6280000 {
- compatible = "renesas,ipmmu-vmsa";
+ compatible = "renesas,ipmmu-r8a7793", "renesas,ipmmu-vmsa";
reg = <0 0xe6280000 0 0x1000>;
interrupts = <0 223 IRQ_TYPE_LEVEL_HIGH>,
<0 224 IRQ_TYPE_LEVEL_HIGH>;
@@ -856,7 +856,7 @@
};
ipmmu_sy1: mmu at e6290000 {
- compatible = "renesas,ipmmu-vmsa";
+ compatible = "renesas,ipmmu-r8a7793", "renesas,ipmmu-vmsa";
reg = <0 0xe6290000 0 0x1000>;
interrupts = <0 225 IRQ_TYPE_LEVEL_HIGH>;
#iommu-cells = <1>;
@@ -864,7 +864,7 @@
};
ipmmu_ds: mmu at e6740000 {
- compatible = "renesas,ipmmu-vmsa";
+ compatible = "renesas,ipmmu-r8a7793", "renesas,ipmmu-vmsa";
reg = <0 0xe6740000 0 0x1000>;
interrupts = <0 198 IRQ_TYPE_LEVEL_HIGH>,
<0 199 IRQ_TYPE_LEVEL_HIGH>;
@@ -873,7 +873,7 @@
};
ipmmu_mp: mmu at ec680000 {
- compatible = "renesas,ipmmu-vmsa";
+ compatible = "renesas,ipmmu-r8a7793", "renesas,ipmmu-vmsa";
reg = <0 0xec680000 0 0x1000>;
interrupts = <0 226 IRQ_TYPE_LEVEL_HIGH>;
#iommu-cells = <1>;
@@ -881,7 +881,7 @@
};
ipmmu_mx: mmu at fe951000 {
- compatible = "renesas,ipmmu-vmsa";
+ compatible = "renesas,ipmmu-r8a7793", "renesas,ipmmu-vmsa";
reg = <0 0xfe951000 0 0x1000>;
interrupts = <0 222 IRQ_TYPE_LEVEL_HIGH>,
<0 221 IRQ_TYPE_LEVEL_HIGH>;
@@ -890,7 +890,7 @@
};
ipmmu_rt: mmu at ffc80000 {
- compatible = "renesas,ipmmu-vmsa";
+ compatible = "renesas,ipmmu-r8a7793", "renesas,ipmmu-vmsa";
reg = <0 0xffc80000 0 0x1000>;
interrupts = <0 307 IRQ_TYPE_LEVEL_HIGH>;
#iommu-cells = <1>;
@@ -898,7 +898,7 @@
};
ipmmu_gp: mmu at e62a0000 {
- compatible = "renesas,ipmmu-vmsa";
+ compatible = "renesas,ipmmu-r8a7793", "renesas,ipmmu-vmsa";
reg = <0 0xe62a0000 0 0x1000>;
interrupts = <0 260 IRQ_TYPE_LEVEL_HIGH>,
<0 261 IRQ_TYPE_LEVEL_HIGH>;
--
2.1.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 24/25] ARM: shmobile: r8a7794: IPMMU compat string SoC part number update
2015-12-18 2:29 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
` (22 preceding siblings ...)
2015-12-18 2:29 ` [PATCH 23/25] ARM: shmobile: r8a7793: " Simon Horman
@ 2015-12-18 2:29 ` Simon Horman
2015-12-18 2:29 ` [PATCH 25/25] ARM: shmobile: r8a779x: use SoC-specific usb-dmac compatibility strings Simon Horman
2015-12-22 20:53 ` [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.5 Olof Johansson
25 siblings, 0 replies; 27+ messages in thread
From: Simon Horman @ 2015-12-18 2:29 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Update IPMMU compat strings to include SoC part number.
By specifying SoC part number in DT it becomes possible
to implement SoC specific features in the IPMMU driver.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7794.dtsi | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
index 7fb2da2f54ff..6c78f1fae90f 100644
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -1109,7 +1109,7 @@
};
ipmmu_sy0: mmu at e6280000 {
- compatible = "renesas,ipmmu-vmsa";
+ compatible = "renesas,ipmmu-r8a7794", "renesas,ipmmu-vmsa";
reg = <0 0xe6280000 0 0x1000>;
interrupts = <0 223 IRQ_TYPE_LEVEL_HIGH>,
<0 224 IRQ_TYPE_LEVEL_HIGH>;
@@ -1118,7 +1118,7 @@
};
ipmmu_sy1: mmu at e6290000 {
- compatible = "renesas,ipmmu-vmsa";
+ compatible = "renesas,ipmmu-r8a7794", "renesas,ipmmu-vmsa";
reg = <0 0xe6290000 0 0x1000>;
interrupts = <0 225 IRQ_TYPE_LEVEL_HIGH>;
#iommu-cells = <1>;
@@ -1126,7 +1126,7 @@
};
ipmmu_ds: mmu at e6740000 {
- compatible = "renesas,ipmmu-vmsa";
+ compatible = "renesas,ipmmu-r8a7794", "renesas,ipmmu-vmsa";
reg = <0 0xe6740000 0 0x1000>;
interrupts = <0 198 IRQ_TYPE_LEVEL_HIGH>,
<0 199 IRQ_TYPE_LEVEL_HIGH>;
@@ -1135,7 +1135,7 @@
};
ipmmu_mp: mmu at ec680000 {
- compatible = "renesas,ipmmu-vmsa";
+ compatible = "renesas,ipmmu-r8a7794", "renesas,ipmmu-vmsa";
reg = <0 0xec680000 0 0x1000>;
interrupts = <0 226 IRQ_TYPE_LEVEL_HIGH>;
#iommu-cells = <1>;
@@ -1143,7 +1143,7 @@
};
ipmmu_mx: mmu at fe951000 {
- compatible = "renesas,ipmmu-vmsa";
+ compatible = "renesas,ipmmu-r8a7794", "renesas,ipmmu-vmsa";
reg = <0 0xfe951000 0 0x1000>;
interrupts = <0 222 IRQ_TYPE_LEVEL_HIGH>,
<0 221 IRQ_TYPE_LEVEL_HIGH>;
@@ -1152,7 +1152,7 @@
};
ipmmu_gp: mmu at e62a0000 {
- compatible = "renesas,ipmmu-vmsa";
+ compatible = "renesas,ipmmu-r8a7794", "renesas,ipmmu-vmsa";
reg = <0 0xe62a0000 0 0x1000>;
interrupts = <0 260 IRQ_TYPE_LEVEL_HIGH>,
<0 261 IRQ_TYPE_LEVEL_HIGH>;
--
2.1.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 25/25] ARM: shmobile: r8a779x: use SoC-specific usb-dmac compatibility strings
2015-12-18 2:29 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
` (23 preceding siblings ...)
2015-12-18 2:29 ` [PATCH 24/25] ARM: shmobile: r8a7794: " Simon Horman
@ 2015-12-18 2:29 ` Simon Horman
2015-12-22 20:53 ` [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.5 Olof Johansson
25 siblings, 0 replies; 27+ messages in thread
From: Simon Horman @ 2015-12-18 2:29 UTC (permalink / raw)
To: linux-arm-kernel
Use recently SoC-specific compatibility strings in r8a779[01] device trees.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7790.dtsi | 4 ++--
arch/arm/boot/dts/r8a7791.dtsi | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index ee587cd823f5..7dfd393bfc7e 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -386,7 +386,7 @@
};
usb_dmac0: dma-controller at e65a0000 {
- compatible = "renesas,usb-dmac";
+ compatible = "renesas,r8a7790-usb-dmac", "renesas,usb-dmac";
reg = <0 0xe65a0000 0 0x100>;
interrupts = <0 109 IRQ_TYPE_LEVEL_HIGH
0 109 IRQ_TYPE_LEVEL_HIGH>;
@@ -398,7 +398,7 @@
};
usb_dmac1: dma-controller at e65b0000 {
- compatible = "renesas,usb-dmac";
+ compatible = "renesas,r8a7790-usb-dmac", "renesas,usb-dmac";
reg = <0 0xe65b0000 0 0x100>;
interrupts = <0 110 IRQ_TYPE_LEVEL_HIGH
0 110 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 3f15aa7dc4d6..2a369ddcb6fd 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -375,7 +375,7 @@
};
usb_dmac0: dma-controller at e65a0000 {
- compatible = "renesas,usb-dmac";
+ compatible = "renesas,r8a7791-usb-dmac", "renesas,usb-dmac";
reg = <0 0xe65a0000 0 0x100>;
interrupts = <0 109 IRQ_TYPE_LEVEL_HIGH
0 109 IRQ_TYPE_LEVEL_HIGH>;
@@ -387,7 +387,7 @@
};
usb_dmac1: dma-controller at e65b0000 {
- compatible = "renesas,usb-dmac";
+ compatible = "renesas,r8a7791-usb-dmac", "renesas,usb-dmac";
reg = <0 0xe65b0000 0 0x100>;
interrupts = <0 110 IRQ_TYPE_LEVEL_HIGH
0 110 IRQ_TYPE_LEVEL_HIGH>;
--
2.1.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.5
2015-12-18 2:29 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
` (24 preceding siblings ...)
2015-12-18 2:29 ` [PATCH 25/25] ARM: shmobile: r8a779x: use SoC-specific usb-dmac compatibility strings Simon Horman
@ 2015-12-22 20:53 ` Olof Johansson
25 siblings, 0 replies; 27+ messages in thread
From: Olof Johansson @ 2015-12-22 20:53 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Dec 18, 2015 at 11:29:43AM +0900, Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
>
> Please consider these third round of Renesas ARM based SoC DT updates for v4.5.
>
> This pull request is based on the previous round of
> such requests, tagged as renesas-dt2-for-v4.5,
> which you have already pulled.
>
>
> The following changes since commit c8d9fdbe2d648caaa510d45dc13eba2e9957140b:
>
> ARM: shmobile: sh73a0 dtsi: Add L2 cache-controller node (2015-11-25 10:42:38 +0900)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt3-for-v4.5
>
> for you to fetch changes up to d01c8bec91414f2110370dfcb9dd33fc0e573cee:
>
> ARM: shmobile: r8a779x: use SoC-specific usb-dmac compatibility strings (2015-12-17 10:10:54 +0900)
Merged, thanks.
> ----------------------------------------------------------------
> Geert Uytterhoeven (11):
> ARM: shmobile: sh73a0: Add MSIOF clocks
> ARM: shmobile: sh73a0: Add MSIOF device nodes
> ARM: shmobile: bockw dts: Override #sound-dai-cells to zero
> ARM: shmobile: koelsch dts: Add serial port config to chosen/stdout-path
> ARM: shmobile: alt dts: Add serial port config to chosen/stdout-path
> ARM: shmobile: ape6evm dts: Add serial port config to chosen/stdout-path
> ARM: shmobile: bockw dts: Update console parameters
> ARM: shmobile: gose dts: Add serial port config to chosen/stdout-path
> ARM: shmobile: silk dts: Add serial port config to chosen/stdout-path
> ARM: shmobile: porter dts: Add serial port config to chosen/stdout-path
> ARM: shmobile: lager dts: Add serial port config to chosen/stdout-path
>
> Kuninori Morimoto (1):
> ARM: shmobile: r8a7778: tidyup #sound-dai-cells settings
>
> Magnus Damm (4):
> ARM: shmobile: r8a7790: IPMMU compat string SoC part number update
> ARM: shmobile: r8a7791: IPMMU compat string SoC part number update
> ARM: shmobile: r8a7793: IPMMU compat string SoC part number update
> ARM: shmobile: r8a7794: IPMMU compat string SoC part number update
>
> Sergei Shtylyov (2):
> ARM: shmobile: r8a7791: add EtherAVB clock
> ARM: shmobile: r8a7791: add EtherAVB DT support
>
> Simon Horman (4):
> ARM: shmobile: r8a7793: remove deprecated #gpio-range-cells
> ARM: shmobile: r8a7793: Add missing serial devices to DT
> ARM: shmobile: r8a7793: Describe DMA for the serial ports
> ARM: shmobile: r8a779x: use SoC-specific usb-dmac compatibility strings
>
> Wolfram Sang (3):
> ARM: shmobile: r8a7790: dtsi: add internal delay for i2c IPs
> ARM: shmobile: r8a7791: dtsi: add internal delay for i2c IPs
> ARM: shmobile: r8a7794: dtsi: add internal delay for i2c IPs
Again, on ARM we use ARM: dts: <platform>: ...
-Olof
^ permalink raw reply [flat|nested] 27+ messages in thread