* [PATCH 1/8] ARM: shmobile: r8a7778: Add SCIF nodes
2014-07-15 9:16 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.17 Simon Horman
@ 2014-07-15 9:16 ` Simon Horman
2014-07-15 9:16 ` [PATCH 2/8] ARM: shmobile: bockw-reference: Initialise SCIF device using DT Simon Horman
` (7 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Simon Horman @ 2014-07-15 9:16 UTC (permalink / raw)
To: linux-arm-kernel
This describes all of the SCIF hardware of the r8a7778.
Each node is disabled and may be enabled as necessary
by board DTS files.
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7778.dtsi | 42 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7778.dtsi b/arch/arm/boot/dts/r8a7778.dtsi
index 3af0a21..ecfdf4b 100644
--- a/arch/arm/boot/dts/r8a7778.dtsi
+++ b/arch/arm/boot/dts/r8a7778.dtsi
@@ -156,6 +156,48 @@
status = "disabled";
};
+ scif0: serial at ffe40000 {
+ compatible = "renesas,scif-r8a7778", "renesas,scif";
+ reg = <0xffe40000 0x100>;
+ interrupts = <0 70 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+ };
+
+ scif1: serial at ffe41000 {
+ compatible = "renesas,scif-r8a7778", "renesas,scif";
+ reg = <0xffe41000 0x100>;
+ interrupts = <0 71 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+ };
+
+ scif2: serial at ffe42000 {
+ compatible = "renesas,scif-r8a7778", "renesas,scif";
+ reg = <0xffe42000 0x100>;
+ interrupts = <0 72 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+ };
+
+ scif3: serial at ffe43000 {
+ compatible = "renesas,scif-r8a7778", "renesas,scif";
+ reg = <0xffe43000 0x100>;
+ interrupts = <0 73 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+ };
+
+ scif4: serial at ffe44000 {
+ compatible = "renesas,scif-r8a7778", "renesas,scif";
+ reg = <0xffe44000 0x100>;
+ interrupts = <0 74 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+ };
+
+ scif5: serial at ffe45000 {
+ compatible = "renesas,scif-r8a7778", "renesas,scif";
+ reg = <0xffe45000 0x100>;
+ interrupts = <0 75 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+ };
+
mmcif: mmc at ffe4e000 {
compatible = "renesas,sh-mmcif";
reg = <0xffe4e000 0x100>;
--
2.0.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 2/8] ARM: shmobile: bockw-reference: Initialise SCIF device using DT
2014-07-15 9:16 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.17 Simon Horman
2014-07-15 9:16 ` [PATCH 1/8] ARM: shmobile: r8a7778: Add SCIF nodes Simon Horman
@ 2014-07-15 9:16 ` Simon Horman
2014-07-15 9:16 ` [PATCH 3/8] ARM: shmobile: r8a73a4: Add SCIF nodes Simon Horman
` (6 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Simon Horman @ 2014-07-15 9:16 UTC (permalink / raw)
To: linux-arm-kernel
Initialise SCIF device using DT when booting bockw
using DT reference.
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7778-bockw-reference.dts | 14 +++++++++++---
arch/arm/mach-shmobile/setup-r8a7778.c | 12 ++++++------
2 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7778-bockw-reference.dts b/arch/arm/boot/dts/r8a7778-bockw-reference.dts
index f76f6ec..3342c74 100644
--- a/arch/arm/boot/dts/r8a7778-bockw-reference.dts
+++ b/arch/arm/boot/dts/r8a7778-bockw-reference.dts
@@ -23,6 +23,10 @@
model = "bockw";
compatible = "renesas,bockw-reference", "renesas,r8a7778";
+ aliases {
+ serial0 = &scif0;
+ };
+
chosen {
bootargs = "console=ttySC0,115200 ignore_loglevel root=/dev/nfs ip=dhcp rw";
};
@@ -70,9 +74,6 @@
};
&pfc {
- pinctrl-0 = <&scif0_pins>;
- pinctrl-names = "default";
-
scif0_pins: serial0 {
renesas,groups = "scif0_data_a", "scif0_ctrl";
renesas,function = "scif0";
@@ -124,3 +125,10 @@
};
};
};
+
+&scif0 {
+ pinctrl-0 = <&scif0_pins>;
+ pinctrl-names = "default";
+
+ status = "okay";
+};
diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c b/arch/arm/mach-shmobile/setup-r8a7778.c
index d311ef9..3d5a5ae 100644
--- a/arch/arm/mach-shmobile/setup-r8a7778.c
+++ b/arch/arm/mach-shmobile/setup-r8a7778.c
@@ -292,12 +292,6 @@ void __init r8a7778_add_dt_devices(void)
}
#endif
- r8a7778_register_scif(0);
- r8a7778_register_scif(1);
- r8a7778_register_scif(2);
- r8a7778_register_scif(3);
- r8a7778_register_scif(4);
- r8a7778_register_scif(5);
r8a7778_register_tmu(0);
}
@@ -506,6 +500,12 @@ static void __init r8a7778_register_hpb_dmae(void)
void __init r8a7778_add_standard_devices(void)
{
r8a7778_add_dt_devices();
+ r8a7778_register_scif(0);
+ r8a7778_register_scif(1);
+ r8a7778_register_scif(2);
+ r8a7778_register_scif(3);
+ r8a7778_register_scif(4);
+ r8a7778_register_scif(5);
r8a7778_register_i2c(0);
r8a7778_register_i2c(1);
r8a7778_register_i2c(2);
--
2.0.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 3/8] ARM: shmobile: r8a73a4: Add SCIF nodes
2014-07-15 9:16 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.17 Simon Horman
2014-07-15 9:16 ` [PATCH 1/8] ARM: shmobile: r8a7778: Add SCIF nodes Simon Horman
2014-07-15 9:16 ` [PATCH 2/8] ARM: shmobile: bockw-reference: Initialise SCIF device using DT Simon Horman
@ 2014-07-15 9:16 ` Simon Horman
2014-10-30 17:43 ` Ulrich Hecht
2014-07-15 9:16 ` [PATCH 4/8] ARM: shmobile: ape6evm-reference: Initialise SCIF device using DT Simon Horman
` (5 subsequent siblings)
8 siblings, 1 reply; 12+ messages in thread
From: Simon Horman @ 2014-07-15 9:16 UTC (permalink / raw)
To: linux-arm-kernel
This describes all of the SCIF hardware of the r8a73a4.
Each node is disabled and may be enabled as necessary
by board DTS files.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a73a4.dtsi | 42 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
diff --git a/arch/arm/boot/dts/r8a73a4.dtsi b/arch/arm/boot/dts/r8a73a4.dtsi
index 82c5ac8..d8ec505 100644
--- a/arch/arm/boot/dts/r8a73a4.dtsi
+++ b/arch/arm/boot/dts/r8a73a4.dtsi
@@ -252,6 +252,48 @@
status = "disabled";
};
+ scifa0: serial at e6c40000 {
+ compatible = "renesas,scifa-r8a73a4", "renesas,scifa";
+ reg = <0 0xe6c40000 0 0x100>;
+ interrupts = <0 144 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+ };
+
+ scifa1: serial at e6c50000 {
+ compatible = "renesas,scifa-r8a73a4", "renesas,scifa";
+ reg = <0 0xe6c50000 0 0x100>;
+ interrupts = <0 145 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+ };
+
+ scifb2: serial at e6c20000 {
+ compatible = "renesas,scifb-r8a73a4", "renesas,scifb";
+ reg = <0 0xe6c20000 0 0x100>;
+ interrupts = <0 148 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+ };
+
+ scifb3: serial at e6c30000 {
+ compatible = "renesas,scifb-r8a73a4", "renesas,scifb";
+ reg = <0 0xe6c30000 0 0x100>;
+ interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+ };
+
+ scifb4: serial at e6ce0000 {
+ compatible = "renesas,scifb-r8a73a4", "renesas,scifb";
+ reg = <0 0xe6ce0000 0 0x100>;
+ interrupts = <0 150 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+ };
+
+ scifb5: serial at e6cf0000 {
+ compatible = "renesas,scifb-r8a73a4", "renesas,scifb";
+ reg = <0 0xe6cf0000 0 0x100>;
+ interrupts = <0 151 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+ };
+
mmcif0: mmc at ee200000 {
compatible = "renesas,sh-mmcif";
reg = <0 0xee200000 0 0x80>;
--
2.0.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 4/8] ARM: shmobile: ape6evm-reference: Initialise SCIF device using DT
2014-07-15 9:16 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.17 Simon Horman
` (2 preceding siblings ...)
2014-07-15 9:16 ` [PATCH 3/8] ARM: shmobile: r8a73a4: Add SCIF nodes Simon Horman
@ 2014-07-15 9:16 ` Simon Horman
2014-07-15 9:16 ` [PATCH 5/8] ARM: shmobile: r8a7740: Add SCIF nodes Simon Horman
` (4 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Simon Horman @ 2014-07-15 9:16 UTC (permalink / raw)
To: linux-arm-kernel
Initialise SCIF device using DT when booting ape6evm
using DT reference.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 14 +++++++++++---
arch/arm/mach-shmobile/setup-r8a73a4.c | 12 ++++++------
2 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts b/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts
index 70b1fff..a860f32 100644
--- a/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts
+++ b/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts
@@ -16,6 +16,10 @@
model = "APE6EVM";
compatible = "renesas,ape6evm-reference", "renesas,r8a73a4";
+ aliases {
+ serial0 = &scifa0;
+ };
+
chosen {
bootargs = "console=ttySC0,115200 ignore_loglevel rw";
};
@@ -90,9 +94,6 @@
};
&pfc {
- pinctrl-0 = <&scifa0_pins>;
- pinctrl-names = "default";
-
scifa0_pins: serial0 {
renesas,groups = "scifa0_data";
renesas,function = "scifa0";
@@ -123,6 +124,13 @@
status = "okay";
};
+&scifa0 {
+ pinctrl-0 = <&scifa0_pins>;
+ pinctrl-names = "default";
+
+ status = "okay";
+};
+
&sdhi0 {
vmmc-supply = <&vcc_sdhi0>;
bus-width = <4>;
diff --git a/arch/arm/mach-shmobile/setup-r8a73a4.c b/arch/arm/mach-shmobile/setup-r8a73a4.c
index 9333770..e84b6a5 100644
--- a/arch/arm/mach-shmobile/setup-r8a73a4.c
+++ b/arch/arm/mach-shmobile/setup-r8a73a4.c
@@ -187,12 +187,6 @@ static struct resource cmt1_resources[] = {
void __init r8a73a4_add_dt_devices(void)
{
- r8a73a4_register_scif(0);
- r8a73a4_register_scif(1);
- r8a73a4_register_scif(2);
- r8a73a4_register_scif(3);
- r8a73a4_register_scif(4);
- r8a73a4_register_scif(5);
r8a7790_register_cmt(1);
}
@@ -287,6 +281,12 @@ static struct resource dma_resources[] = {
void __init r8a73a4_add_standard_devices(void)
{
r8a73a4_add_dt_devices();
+ r8a73a4_register_scif(0);
+ r8a73a4_register_scif(1);
+ r8a73a4_register_scif(2);
+ r8a73a4_register_scif(3);
+ r8a73a4_register_scif(4);
+ r8a73a4_register_scif(5);
r8a73a4_register_irqc(0);
r8a73a4_register_irqc(1);
r8a73a4_register_thermal();
--
2.0.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 5/8] ARM: shmobile: r8a7740: Add SCIF nodes
2014-07-15 9:16 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.17 Simon Horman
` (3 preceding siblings ...)
2014-07-15 9:16 ` [PATCH 4/8] ARM: shmobile: ape6evm-reference: Initialise SCIF device using DT Simon Horman
@ 2014-07-15 9:16 ` Simon Horman
2014-07-15 9:16 ` [PATCH 6/8] ARM: shmobile: armadillo800eva-reference: Initialise SCIF device using DT Simon Horman
` (3 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Simon Horman @ 2014-07-15 9:16 UTC (permalink / raw)
To: linux-arm-kernel
This describes all of the SCIF hardware of the r8a7740.
Each node is disabled and may be enabled as necessary
by board DTS files.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7740.dtsi | 63 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 63 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7740.dtsi b/arch/arm/boot/dts/r8a7740.dtsi
index 55d29f4..bda18fb 100644
--- a/arch/arm/boot/dts/r8a7740.dtsi
+++ b/arch/arm/boot/dts/r8a7740.dtsi
@@ -156,6 +156,69 @@
status = "disabled";
};
+ scifa0: serial at e6c40000 {
+ compatible = "renesas,scifa-r8a7740", "renesas,scifa";
+ reg = <0xe6c40000 0x100>;
+ interrupts = <0 100 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+ };
+
+ scifa1: serial at e6c50000 {
+ compatible = "renesas,scifa-r8a7740", "renesas,scifa";
+ reg = <0xe6c50000 0x100>;
+ interrupts = <0 101 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+ };
+
+ scifa2: serial at e6c60000 {
+ compatible = "renesas,scifa-r8a7740", "renesas,scifa";
+ reg = <0xe6c60000 0x100>;
+ interrupts = <0 102 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+ };
+
+ scifa3: serial at e6c70000 {
+ compatible = "renesas,scifa-r8a7740", "renesas,scifa";
+ reg = <0xe6c70000 0x100>;
+ interrupts = <0 103 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+ };
+
+ scifa4: serial at e6c80000 {
+ compatible = "renesas,scifa-r8a7740", "renesas,scifa";
+ reg = <0xe6c80000 0x100>;
+ interrupts = <0 104 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+ };
+
+ scifa5: serial at e6cb0000 {
+ compatible = "renesas,scifa-r8a7740", "renesas,scifa";
+ reg = <0xe6cb0000 0x100>;
+ interrupts = <0 105 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+ };
+
+ scifa6: serial at e6cc0000 {
+ compatible = "renesas,scifa-r8a7740", "renesas,scifa";
+ reg = <0xe6cc0000 0x100>;
+ interrupts = <0 106 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+ };
+
+ scifa7: serial at e6cd0000 {
+ compatible = "renesas,scifa-r8a7740", "renesas,scifa";
+ reg = <0xe6cd0000 0x100>;
+ interrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+ };
+
+ scifb8: serial at e6c30000 {
+ compatible = "renesas,scifb-r8a7740", "renesas,scifb";
+ reg = <0xe6c30000 0x100>;
+ interrupts = <0 108 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+ };
+
pfc: pfc at e6050000 {
compatible = "renesas,pfc-r8a7740";
reg = <0xe6050000 0x8000>,
--
2.0.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.17
@ 2014-07-15 9:16 Simon Horman
2014-07-15 9:16 ` [PATCH 1/8] ARM: shmobile: r8a7778: Add SCIF nodes Simon Horman
` (8 more replies)
0 siblings, 9 replies; 12+ messages in thread
From: Simon Horman @ 2014-07-15 9:16 UTC (permalink / raw)
To: linux-arm-kernel
Hi Olof, Hi Kevin, Hi Arnd,
Please consider these third round of Renesas ARM based SoC DT updates for v3.17.
This pull request is based on a merge of:
* The previous round of such requests, tagged as renesas-dt2-for-v3.17,
which you have already pulled into next/dt and;
* The second round of Renesas ARM Based SoC Clock Updates for v3.17,
tagged as renesas-clock2-for-v3.17, which I have send a pull request for.
The reason for the clock update is to provide run-time dependencies
to allow SCI to be initialised on DT on SoCs that do not yet have
CCF support. The key word being yet, it is being worked on.
which I have already sent a pull-request for.
The following changes since commit 963b0c359bf5d284fc597bed07a668cb7396bfd2:
Merge branch 'clock-for-v3.17' into dt-for-v3.17 (2014-07-12 15:16:37 +0200)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt3-for-v3.17
for you to fetch changes up to 700ce7c2bb2a4963472d95eba1436d6b0945918e:
ARM: shmobile: kzm9g-reference: Initialise SCIF device using DT (2014-07-12 15:16:58 +0200)
----------------------------------------------------------------
Third Round of Renesas ARM Based SoC DT Updates for v3.17
* Initialise SCI using DT when booting the kzm9g, armadillo800eva,
ape6evm and bockw boards without legacy-C code.
----------------------------------------------------------------
Simon Horman (8):
ARM: shmobile: r8a7778: Add SCIF nodes
ARM: shmobile: bockw-reference: Initialise SCIF device using DT
ARM: shmobile: r8a73a4: Add SCIF nodes
ARM: shmobile: ape6evm-reference: Initialise SCIF device using DT
ARM: shmobile: r8a7740: Add SCIF nodes
ARM: shmobile: armadillo800eva-reference: Initialise SCIF device using DT
ARM: shmobile: sh73a0: Add SCIF nodes
ARM: shmobile: kzm9g-reference: Initialise SCIF device using DT
arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 14 ++++-
arch/arm/boot/dts/r8a73a4.dtsi | 42 +++++++++++++
.../boot/dts/r8a7740-armadillo800eva-reference.dts | 14 ++++-
arch/arm/boot/dts/r8a7740.dtsi | 63 +++++++++++++++++++
arch/arm/boot/dts/r8a7778-bockw-reference.dts | 14 ++++-
arch/arm/boot/dts/r8a7778.dtsi | 42 +++++++++++++
arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 14 ++++-
arch/arm/boot/dts/sh73a0.dtsi | 72 ++++++++++++++++++++++
arch/arm/mach-shmobile/setup-r8a73a4.c | 12 ++--
arch/arm/mach-shmobile/setup-r8a7740.c | 8 +--
arch/arm/mach-shmobile/setup-r8a7778.c | 12 ++--
arch/arm/mach-shmobile/setup-sh73a0.c | 8 +--
12 files changed, 283 insertions(+), 32 deletions(-)
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 6/8] ARM: shmobile: armadillo800eva-reference: Initialise SCIF device using DT
2014-07-15 9:16 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.17 Simon Horman
` (4 preceding siblings ...)
2014-07-15 9:16 ` [PATCH 5/8] ARM: shmobile: r8a7740: Add SCIF nodes Simon Horman
@ 2014-07-15 9:16 ` Simon Horman
2014-07-15 9:16 ` [PATCH 7/8] ARM: shmobile: sh73a0: Add SCIF nodes Simon Horman
` (2 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Simon Horman @ 2014-07-15 9:16 UTC (permalink / raw)
To: linux-arm-kernel
Initialise SCIF device using DT when booting armadillo800eva
using DT reference.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts | 14 +++++++++++---
arch/arm/mach-shmobile/setup-r8a7740.c | 8 ++++----
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts
index ba2e180..ee9e7d5 100644
--- a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts
+++ b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts
@@ -19,6 +19,10 @@
model = "armadillo 800 eva reference";
compatible = "renesas,armadillo800eva-reference", "renesas,r8a7740";
+ aliases {
+ serial1 = &scifa1;
+ };
+
chosen {
bootargs = "console=tty0 console=ttySC1,115200 ignore_loglevel root=/dev/nfs ip=dhcp rw";
};
@@ -202,9 +206,6 @@
};
&pfc {
- pinctrl-0 = <&scifa1_pins>;
- pinctrl-names = "default";
-
ether_pins: ether {
renesas,groups = "gether_mii", "gether_int";
renesas,function = "gether";
@@ -256,6 +257,13 @@
status = "okay";
};
+&scifa1 {
+ pinctrl-0 = <&scifa1_pins>;
+ pinctrl-names = "default";
+
+ status = "okay";
+};
+
&sdhi0 {
pinctrl-0 = <&sdhi0_pins>;
pinctrl-names = "default";
diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c
index 35dec23..d0f51f1 100644
--- a/arch/arm/mach-shmobile/setup-r8a7740.c
+++ b/arch/arm/mach-shmobile/setup-r8a7740.c
@@ -310,6 +310,10 @@ static struct platform_device ipmmu_device = {
};
static struct platform_device *r8a7740_devices_dt[] __initdata = {
+ &cmt1_device,
+};
+
+static struct platform_device *r8a7740_early_devices[] __initdata = {
&scif0_device,
&scif1_device,
&scif2_device,
@@ -319,10 +323,6 @@ static struct platform_device *r8a7740_devices_dt[] __initdata = {
&scif6_device,
&scif7_device,
&scif8_device,
- &cmt1_device,
-};
-
-static struct platform_device *r8a7740_early_devices[] __initdata = {
&irqpin0_device,
&irqpin1_device,
&irqpin2_device,
--
2.0.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 7/8] ARM: shmobile: sh73a0: Add SCIF nodes
2014-07-15 9:16 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.17 Simon Horman
` (5 preceding siblings ...)
2014-07-15 9:16 ` [PATCH 6/8] ARM: shmobile: armadillo800eva-reference: Initialise SCIF device using DT Simon Horman
@ 2014-07-15 9:16 ` Simon Horman
2014-07-15 9:16 ` [PATCH 8/8] ARM: shmobile: kzm9g-reference: Initialise SCIF device using DT Simon Horman
2014-07-19 4:48 ` [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.17 Olof Johansson
8 siblings, 0 replies; 12+ messages in thread
From: Simon Horman @ 2014-07-15 9:16 UTC (permalink / raw)
To: linux-arm-kernel
This describes all of the SCIF hardware of the sh73a0.
Each node is disabled and may be enabled as necessary
by board DTS files.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/sh73a0.dtsi | 72 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 72 insertions(+)
diff --git a/arch/arm/boot/dts/sh73a0.dtsi b/arch/arm/boot/dts/sh73a0.dtsi
index 5ecf552..910b790 100644
--- a/arch/arm/boot/dts/sh73a0.dtsi
+++ b/arch/arm/boot/dts/sh73a0.dtsi
@@ -235,6 +235,78 @@
status = "disabled";
};
+ scifa0: serial at e6c40000 {
+ compatible = "renesas,scifa-sh73a0", "renesas,scifa";
+ reg = <0xe6c40000 0x100>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 72 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+ };
+
+ scifa1: serial at e6c50000 {
+ compatible = "renesas,scifa-sh73a0", "renesas,scifa";
+ reg = <0xe6c50000 0x100>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 73 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+ };
+
+ scifa2: serial at e6c60000 {
+ compatible = "renesas,scifa-sh73a0", "renesas,scifa";
+ reg = <0xe6c60000 0x100>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 74 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+ };
+
+ scifa3: serial at e6c70000 {
+ compatible = "renesas,scifa-sh73a0", "renesas,scifa";
+ reg = <0xe6c70000 0x100>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 75 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+ };
+
+ scifa4: serial at e6c80000 {
+ compatible = "renesas,scifa-sh73a0", "renesas,scifa";
+ reg = <0xe6c80000 0x100>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 78 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+ };
+
+ scifa5: serial at e6cb0000 {
+ compatible = "renesas,scifa-sh73a0", "renesas,scifa";
+ reg = <0xe6cb0000 0x100>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 79 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+ };
+
+ scifa6: serial at e6cc0000 {
+ compatible = "renesas,scifa-sh73a0", "renesas,scifa";
+ reg = <0xe6cc0000 0x100>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 156 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+ };
+
+ scifa7: serial at e6cd0000 {
+ compatible = "renesas,scifa-sh73a0", "renesas,scifa";
+ reg = <0xe6cd0000 0x100>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 143 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+ };
+
+ scifb8: serial at e6c30000 {
+ compatible = "renesas,scifb-sh73a0", "renesas,scifb";
+ reg = <0xe6c30000 0x100>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 80 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+ };
+
pfc: pfc at e6050000 {
compatible = "renesas,pfc-sh73a0";
reg = <0xe6050000 0x8000>,
--
2.0.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 8/8] ARM: shmobile: kzm9g-reference: Initialise SCIF device using DT
2014-07-15 9:16 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.17 Simon Horman
` (6 preceding siblings ...)
2014-07-15 9:16 ` [PATCH 7/8] ARM: shmobile: sh73a0: Add SCIF nodes Simon Horman
@ 2014-07-15 9:16 ` Simon Horman
2014-07-19 4:48 ` [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.17 Olof Johansson
8 siblings, 0 replies; 12+ messages in thread
From: Simon Horman @ 2014-07-15 9:16 UTC (permalink / raw)
To: linux-arm-kernel
Initialise SCIF device using DT when booting armadillo800eva
using DT reference.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 14 +++++++++++---
arch/arm/mach-shmobile/setup-sh73a0.c | 8 ++++----
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
index 838f93e4..18662ae 100644
--- a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
+++ b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
@@ -21,6 +21,10 @@
model = "KZM-A9-GT";
compatible = "renesas,kzm9g-reference", "renesas,sh73a0";
+ aliases {
+ serial4 = &scifa4;
+ };
+
cpus {
cpu at 0 {
cpu0-supply = <&vdd_dvfs>;
@@ -276,9 +280,6 @@
};
&pfc {
- pinctrl-0 = <&scifa4_pins>;
- pinctrl-names = "default";
-
i2c3_pins: i2c3 {
renesas,groups = "i2c3_1";
renesas,function = "i2c3";
@@ -318,6 +319,13 @@
};
};
+&scifa4 {
+ pinctrl-0 = <&scifa4_pins>;
+ pinctrl-names = "default";
+
+ status = "okay";
+};
+
&sdhi0 {
pinctrl-0 = <&sdhi0_pins>;
pinctrl-names = "default";
diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
index ad00724..2e1e289 100644
--- a/arch/arm/mach-shmobile/setup-sh73a0.c
+++ b/arch/arm/mach-shmobile/setup-sh73a0.c
@@ -696,6 +696,10 @@ static struct platform_device irqpin3_device = {
};
static struct platform_device *sh73a0_devices_dt[] __initdata = {
+ &cmt1_device,
+};
+
+static struct platform_device *sh73a0_early_devices[] __initdata = {
&scif0_device,
&scif1_device,
&scif2_device,
@@ -705,10 +709,6 @@ static struct platform_device *sh73a0_devices_dt[] __initdata = {
&scif6_device,
&scif7_device,
&scif8_device,
- &cmt1_device,
-};
-
-static struct platform_device *sh73a0_early_devices[] __initdata = {
&tmu0_device,
&ipmmu_device,
};
--
2.0.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.17
2014-07-15 9:16 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.17 Simon Horman
` (7 preceding siblings ...)
2014-07-15 9:16 ` [PATCH 8/8] ARM: shmobile: kzm9g-reference: Initialise SCIF device using DT Simon Horman
@ 2014-07-19 4:48 ` Olof Johansson
8 siblings, 0 replies; 12+ messages in thread
From: Olof Johansson @ 2014-07-19 4:48 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jul 15, 2014 at 06:16:36PM +0900, Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
>
> Please consider these third round of Renesas ARM based SoC DT updates for v3.17.
>
> This pull request is based on a merge of:
>
> * The previous round of such requests, tagged as renesas-dt2-for-v3.17,
> which you have already pulled into next/dt and;
> * The second round of Renesas ARM Based SoC Clock Updates for v3.17,
> tagged as renesas-clock2-for-v3.17, which I have send a pull request for.
>
> The reason for the clock update is to provide run-time dependencies
> to allow SCI to be initialised on DT on SoCs that do not yet have
> CCF support. The key word being yet, it is being worked on.
>
> which I have already sent a pull-request for.
>
>
> The following changes since commit 963b0c359bf5d284fc597bed07a668cb7396bfd2:
>
> Merge branch 'clock-for-v3.17' into dt-for-v3.17 (2014-07-12 15:16:37 +0200)
>
> are available in the git repository at:
>
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt3-for-v3.17
>
> for you to fetch changes up to 700ce7c2bb2a4963472d95eba1436d6b0945918e:
>
> ARM: shmobile: kzm9g-reference: Initialise SCIF device using DT (2014-07-12 15:16:58 +0200)
Hi,
The diffstat I got were not the same as you, I get more diffs, and more
patches. It seems that you specified your merge commit as the base, while you
had new patches applied before the merge too.
Anyway, merged since the contents looked generally OK.
-Olof
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 3/8] ARM: shmobile: r8a73a4: Add SCIF nodes
2014-07-15 9:16 ` [PATCH 3/8] ARM: shmobile: r8a73a4: Add SCIF nodes Simon Horman
@ 2014-10-30 17:43 ` Ulrich Hecht
2014-10-31 4:54 ` Simon Horman
0 siblings, 1 reply; 12+ messages in thread
From: Ulrich Hecht @ 2014-10-30 17:43 UTC (permalink / raw)
To: linux-arm-kernel
Hi!
On Tue, Jul 15, 2014 at 11:16 AM, Simon Horman
<horms+renesas@verge.net.au> wrote:
> This describes all of the SCIF hardware of the r8a73a4.
> Each node is disabled and may be enabled as necessary
> by board DTS files.
[...]
> + scifb2: serial at e6c20000 {
> + compatible = "renesas,scifb-r8a73a4", "renesas,scifb";
> + reg = <0 0xe6c20000 0 0x100>;
> + interrupts = <0 148 IRQ_TYPE_LEVEL_HIGH>;
> + status = "disabled";
> + };
> +
> + scifb3: serial at e6c30000 {
> + compatible = "renesas,scifb-r8a73a4", "renesas,scifb";
> + reg = <0 0xe6c30000 0 0x100>;
> + interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH>;
> + status = "disabled";
> + };
> +
> + scifb4: serial at e6ce0000 {
> + compatible = "renesas,scifb-r8a73a4", "renesas,scifb";
> + reg = <0 0xe6ce0000 0 0x100>;
> + interrupts = <0 150 IRQ_TYPE_LEVEL_HIGH>;
> + status = "disabled";
> + };
> +
> + scifb5: serial at e6cf0000 {
> + compatible = "renesas,scifb-r8a73a4", "renesas,scifb";
> + reg = <0 0xe6cf0000 0 0x100>;
> + interrupts = <0 151 IRQ_TYPE_LEVEL_HIGH>;
> + status = "disabled";
> + };
> +
I was just about to add clocks to these devices when I noticed that
these ports are labeled scifb0 to scifb3 in the datasheet. Is there
any deeper reasoning behind this, or did you just forget to reset the
counter after scifa1? :)
CU
Uli
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 3/8] ARM: shmobile: r8a73a4: Add SCIF nodes
2014-10-30 17:43 ` Ulrich Hecht
@ 2014-10-31 4:54 ` Simon Horman
0 siblings, 0 replies; 12+ messages in thread
From: Simon Horman @ 2014-10-31 4:54 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Oct 30, 2014 at 06:43:12PM +0100, Ulrich Hecht wrote:
> Hi!
>
> On Tue, Jul 15, 2014 at 11:16 AM, Simon Horman
> <horms+renesas@verge.net.au> wrote:
> > This describes all of the SCIF hardware of the r8a73a4.
> > Each node is disabled and may be enabled as necessary
> > by board DTS files.
> [...]
> > + scifb2: serial at e6c20000 {
> > + compatible = "renesas,scifb-r8a73a4", "renesas,scifb";
> > + reg = <0 0xe6c20000 0 0x100>;
> > + interrupts = <0 148 IRQ_TYPE_LEVEL_HIGH>;
> > + status = "disabled";
> > + };
> > +
> > + scifb3: serial at e6c30000 {
> > + compatible = "renesas,scifb-r8a73a4", "renesas,scifb";
> > + reg = <0 0xe6c30000 0 0x100>;
> > + interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH>;
> > + status = "disabled";
> > + };
> > +
> > + scifb4: serial at e6ce0000 {
> > + compatible = "renesas,scifb-r8a73a4", "renesas,scifb";
> > + reg = <0 0xe6ce0000 0 0x100>;
> > + interrupts = <0 150 IRQ_TYPE_LEVEL_HIGH>;
> > + status = "disabled";
> > + };
> > +
> > + scifb5: serial at e6cf0000 {
> > + compatible = "renesas,scifb-r8a73a4", "renesas,scifb";
> > + reg = <0 0xe6cf0000 0 0x100>;
> > + interrupts = <0 151 IRQ_TYPE_LEVEL_HIGH>;
> > + status = "disabled";
> > + };
> > +
>
> I was just about to add clocks to these devices when I noticed that
> these ports are labeled scifb0 to scifb3 in the datasheet. Is there
> any deeper reasoning behind this, or did you just forget to reset the
> counter after scifa1? :)
Its a while since I wrote this patch. I think the reason is that I was
blindly following the numbering-scheme used in r8a73a4. In any case, I
think it would be good to name them according to the datasheet.
Could you cook up a patch?
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2014-10-31 4:54 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-15 9:16 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.17 Simon Horman
2014-07-15 9:16 ` [PATCH 1/8] ARM: shmobile: r8a7778: Add SCIF nodes Simon Horman
2014-07-15 9:16 ` [PATCH 2/8] ARM: shmobile: bockw-reference: Initialise SCIF device using DT Simon Horman
2014-07-15 9:16 ` [PATCH 3/8] ARM: shmobile: r8a73a4: Add SCIF nodes Simon Horman
2014-10-30 17:43 ` Ulrich Hecht
2014-10-31 4:54 ` Simon Horman
2014-07-15 9:16 ` [PATCH 4/8] ARM: shmobile: ape6evm-reference: Initialise SCIF device using DT Simon Horman
2014-07-15 9:16 ` [PATCH 5/8] ARM: shmobile: r8a7740: Add SCIF nodes Simon Horman
2014-07-15 9:16 ` [PATCH 6/8] ARM: shmobile: armadillo800eva-reference: Initialise SCIF device using DT Simon Horman
2014-07-15 9:16 ` [PATCH 7/8] ARM: shmobile: sh73a0: Add SCIF nodes Simon Horman
2014-07-15 9:16 ` [PATCH 8/8] ARM: shmobile: kzm9g-reference: Initialise SCIF device using DT Simon Horman
2014-07-19 4:48 ` [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.17 Olof Johansson
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).