[GIT PULL] Renesas ARM Based SoC DT SCIF Updates for v3.16

linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed

* [GIT PULL] Renesas ARM Based SoC DT SCIF Updates for v3.16
@ 2014-05-16  0:58 Simon Horman
  2014-05-16  0:58 ` [PATCH 1/2] ARM: shmobile: lager: Enable SCIF0 and SCIF1 serial ports in DT Simon Horman
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Simon Horman @ 2014-05-16  0:58 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Olof, Hi Kevin, Hi Arnd,

Please consider these Renesas ARM based SoC DT SCIF updates for v3.16.

This pull request is based on Renesas SoC Clock Cleanups for v3.16,
such requests, tagged as renesas-clock-cleanup2-for-v3.16,
which I have already sent a pull-request for.


This series includes dependencies that do not fit easily into the usual
inter-branch dependencies and as such I have grouped them together in a
single branch.

The following changes since commit c17fcfbcc0f6b4f3cae761149e1a6108dd6750e7:

  ARM: shmobile: r7s72100: Switch to new style MTU2 device (2014-05-11 19:35:28 +0900)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt-scif-for-v3.16

for you to fetch changes up to 5ba55fa81aee9493928c245f142a0bfe9f32d02f:

  ARM: shmobile: koelsch: Enable SCIF0 and SCIF1 serial ports in DT (2014-05-14 09:56:38 +0900)

----------------------------------------------------------------
Renesas ARM Based SoC dt-scif Updates for v3.16

r8a7791 (R-Car M2) based Koelsch board and
r8a7790 (R-Car H1) based Lager board
* Enable SCIF0 and SCIF1 serial ports in DT

----------------------------------------------------------------
Laurent Pinchart (2):
      ARM: shmobile: lager: Enable SCIF0 and SCIF1 serial ports in DT
      ARM: shmobile: koelsch: Enable SCIF0 and SCIF1 serial ports in DT

 arch/arm/boot/dts/r8a7790-lager.dts              | 21 ++++++++++++++++++++-
 arch/arm/boot/dts/r8a7791-koelsch.dts            | 21 ++++++++++++++++++++-
 arch/arm/mach-shmobile/board-koelsch-reference.c | 15 ---------------
 arch/arm/mach-shmobile/board-lager-reference.c   | 10 ----------
 arch/arm/mach-shmobile/setup-r8a7790.c           | 10 +++++-----
 arch/arm/mach-shmobile/setup-r8a7791.c           | 10 +++++-----
 6 files changed, 50 insertions(+), 37 deletions(-)

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH 1/2] ARM: shmobile: lager: Enable SCIF0 and SCIF1 serial ports in DT
  2014-05-16  0:58 [GIT PULL] Renesas ARM Based SoC DT SCIF Updates for v3.16 Simon Horman
@ 2014-05-16  0:58 ` Simon Horman
  2014-05-16  0:58 ` [PATCH 2/2] ARM: shmobile: koelsch: " Simon Horman
  2014-05-21 21:30 ` [GIT PULL] Renesas ARM Based SoC DT SCIF Updates for v3.16 Olof Johansson
  2 siblings, 0 replies; 4+ messages in thread
From: Simon Horman @ 2014-05-16  0:58 UTC (permalink / raw)
  To: linux-arm-kernel

From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

SCIF0 and SCIF1 are used as debug serial ports. Enable them and
configure pinmuxing appropriately. We can now remove the clkdev
registration hack for SCIF devices from the Lager reference board file.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
[horms+renesas at verge.net.au: updated changelog to remove references to
                             device renaming]
[horms+renesas at verge.net.au: resolved conflicts]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7790-lager.dts            | 21 ++++++++++++++++++++-
 arch/arm/mach-shmobile/board-lager-reference.c | 10 ----------
 arch/arm/mach-shmobile/setup-r8a7790.c         | 10 +++++-----
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index 6e99eb2..25e0485 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -17,6 +17,11 @@
 	model = "Lager";
 	compatible = "renesas,lager", "renesas,r8a7790";
 
+	aliases {
+		serial6 = &scif0;
+		serial7 = &scif1;
+	};
+
 	chosen {
 		bootargs = "console=ttySC6,115200 ignore_loglevel rw root=/dev/nfs ip=dhcp";
 	};
@@ -112,7 +117,7 @@
 };
 
 &pfc {
-	pinctrl-0 = <&du_pins &scif0_pins &scif1_pins>;
+	pinctrl-0 = <&du_pins>;
 	pinctrl-names = "default";
 
 	du_pins: du {
@@ -221,6 +226,20 @@
 	};
 };
 
+&scif0 {
+	pinctrl-0 = <&scif0_pins>;
+	pinctrl-names = "default";
+
+	status = "okay";
+};
+
+&scif1 {
+	pinctrl-0 = <&scif1_pins>;
+	pinctrl-names = "default";
+
+	status = "okay";
+};
+
 &sdhi0 {
 	pinctrl-0 = <&sdhi0_pins>;
 	pinctrl-names = "default";
diff --git a/arch/arm/mach-shmobile/board-lager-reference.c b/arch/arm/mach-shmobile/board-lager-reference.c
index 1bca2748..749832e 100644
--- a/arch/arm/mach-shmobile/board-lager-reference.c
+++ b/arch/arm/mach-shmobile/board-lager-reference.c
@@ -91,16 +91,6 @@ static void __init lager_add_du_device(void)
  */
 static const struct clk_name clk_names[] __initconst = {
 	{ "cmt0", "fck", "sh-cmt-48-gen2.0" },
-	{ "scifa0", NULL, "sh-sci.0" },
-	{ "scifa1", NULL, "sh-sci.1" },
-	{ "scifb0", NULL, "sh-sci.2" },
-	{ "scifb1", NULL, "sh-sci.3" },
-	{ "scifb2", NULL, "sh-sci.4" },
-	{ "scifa2", NULL, "sh-sci.5" },
-	{ "scif0", NULL, "sh-sci.6" },
-	{ "scif1", NULL, "sh-sci.7" },
-	{ "hscif0", NULL, "sh-sci.8" },
-	{ "hscif1", NULL, "sh-sci.9" },
 	{ "du0", "du.0", "rcar-du-r8a7790" },
 	{ "du1", "du.1", "rcar-du-r8a7790" },
 	{ "du2", "du.2", "rcar-du-r8a7790" },
diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c
index 87327f3..5fc9b17 100644
--- a/arch/arm/mach-shmobile/setup-r8a7790.c
+++ b/arch/arm/mach-shmobile/setup-r8a7790.c
@@ -287,6 +287,11 @@ static struct resource cmt0_resources[] = {
 
 void __init r8a7790_add_dt_devices(void)
 {
+	r8a7790_register_cmt(0);
+}
+
+void __init r8a7790_add_standard_devices(void)
+{
 	r8a7790_register_scif(0);
 	r8a7790_register_scif(1);
 	r8a7790_register_scif(2);
@@ -297,11 +302,6 @@ void __init r8a7790_add_dt_devices(void)
 	r8a7790_register_scif(7);
 	r8a7790_register_scif(8);
 	r8a7790_register_scif(9);
-	r8a7790_register_cmt(0);
-}
-
-void __init r8a7790_add_standard_devices(void)
-{
 	r8a7790_add_dt_devices();
 	r8a7790_register_irqc(0);
 	r8a7790_register_thermal();
-- 
1.8.5.2

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH 2/2] ARM: shmobile: koelsch: Enable SCIF0 and SCIF1 serial ports in DT
  2014-05-16  0:58 [GIT PULL] Renesas ARM Based SoC DT SCIF Updates for v3.16 Simon Horman
  2014-05-16  0:58 ` [PATCH 1/2] ARM: shmobile: lager: Enable SCIF0 and SCIF1 serial ports in DT Simon Horman
@ 2014-05-16  0:58 ` Simon Horman
  2014-05-21 21:30 ` [GIT PULL] Renesas ARM Based SoC DT SCIF Updates for v3.16 Olof Johansson
  2 siblings, 0 replies; 4+ messages in thread
From: Simon Horman @ 2014-05-16  0:58 UTC (permalink / raw)
  To: linux-arm-kernel

From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

SCIF0 and SCIF1 are used as debug serial ports. Enable them and
configure pinmuxing appropriately. We can now remove the clkdev
registration hack for SCIF devices from the Koelsch reference board
file.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
[horms+renesas at verge.net.au: added aliases to avoid device renumbering]
[horms+renesas at verge.net.au: resolved conflicts]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7791-koelsch.dts            | 21 ++++++++++++++++++++-
 arch/arm/mach-shmobile/board-koelsch-reference.c | 15 ---------------
 arch/arm/mach-shmobile/setup-r8a7791.c           | 10 +++++-----
 3 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index bdd73e6..10c6b40 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -18,6 +18,11 @@
 	model = "Koelsch";
 	compatible = "renesas,koelsch", "renesas,r8a7791";
 
+	aliases {
+		serial6 = &scif0;
+		serial7 = &scif1;
+	};
+
 	chosen {
 		bootargs = "console=ttySC6,115200 ignore_loglevel rw root=/dev/nfs ip=dhcp";
 	};
@@ -196,7 +201,7 @@
 };
 
 &pfc {
-	pinctrl-0 = <&du_pins &scif0_pins &scif1_pins>;
+	pinctrl-0 = <&du_pins>;
 	pinctrl-names = "default";
 
 	i2c2_pins: i2c {
@@ -269,6 +274,20 @@
 	status = "okay";
 };
 
+&scif0 {
+	pinctrl-0 = <&scif0_pins>;
+	pinctrl-names = "default";
+
+	status = "okay";
+};
+
+&scif1 {
+	pinctrl-0 = <&scif1_pins>;
+	pinctrl-names = "default";
+
+	status = "okay";
+};
+
 &sdhi0 {
 	pinctrl-0 = <&sdhi0_pins>;
 	pinctrl-names = "default";
diff --git a/arch/arm/mach-shmobile/board-koelsch-reference.c b/arch/arm/mach-shmobile/board-koelsch-reference.c
index bd90932..0b0ce5a 100644
--- a/arch/arm/mach-shmobile/board-koelsch-reference.c
+++ b/arch/arm/mach-shmobile/board-koelsch-reference.c
@@ -87,21 +87,6 @@ static void __init koelsch_add_du_device(void)
  */
 static const struct clk_name clk_names[] __initconst = {
 	{ "cmt0", "fck", "sh-cmt-48-gen2.0" },
-	{ "scifa0", NULL, "sh-sci.0" },
-	{ "scifa1", NULL, "sh-sci.1" },
-	{ "scifb0", NULL, "sh-sci.2" },
-	{ "scifb1", NULL, "sh-sci.3" },
-	{ "scifb2", NULL, "sh-sci.4" },
-	{ "scifa2", NULL, "sh-sci.5" },
-	{ "scif0", NULL, "sh-sci.6" },
-	{ "scif1", NULL, "sh-sci.7" },
-	{ "scif2", NULL, "sh-sci.8" },
-	{ "scif3", NULL, "sh-sci.9" },
-	{ "scif4", NULL, "sh-sci.10" },
-	{ "scif5", NULL, "sh-sci.11" },
-	{ "scifa3", NULL, "sh-sci.12" },
-	{ "scifa4", NULL, "sh-sci.13" },
-	{ "scifa5", NULL, "sh-sci.14" },
 	{ "du0", "du.0", "rcar-du-r8a7791" },
 	{ "du1", "du.1", "rcar-du-r8a7791" },
 	{ "lvds0", "lvds.0", "rcar-du-r8a7791" },
diff --git a/arch/arm/mach-shmobile/setup-r8a7791.c b/arch/arm/mach-shmobile/setup-r8a7791.c
index 561653d..b3f42b5 100644
--- a/arch/arm/mach-shmobile/setup-r8a7791.c
+++ b/arch/arm/mach-shmobile/setup-r8a7791.c
@@ -182,6 +182,11 @@ static const struct resource thermal_resources[] __initconst = {
 
 void __init r8a7791_add_dt_devices(void)
 {
+	r8a7791_register_cmt(0);
+}
+
+void __init r8a7791_add_standard_devices(void)
+{
 	r8a7791_register_scif(0);
 	r8a7791_register_scif(1);
 	r8a7791_register_scif(2);
@@ -197,11 +202,6 @@ void __init r8a7791_add_dt_devices(void)
 	r8a7791_register_scif(12);
 	r8a7791_register_scif(13);
 	r8a7791_register_scif(14);
-	r8a7791_register_cmt(0);
-}
-
-void __init r8a7791_add_standard_devices(void)
-{
 	r8a7791_add_dt_devices();
 	r8a7791_register_irqc(0);
 	r8a7791_register_thermal();
-- 
1.8.5.2

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [GIT PULL] Renesas ARM Based SoC DT SCIF Updates for v3.16
  2014-05-16  0:58 [GIT PULL] Renesas ARM Based SoC DT SCIF Updates for v3.16 Simon Horman
  2014-05-16  0:58 ` [PATCH 1/2] ARM: shmobile: lager: Enable SCIF0 and SCIF1 serial ports in DT Simon Horman
  2014-05-16  0:58 ` [PATCH 2/2] ARM: shmobile: koelsch: " Simon Horman
@ 2014-05-21 21:30 ` Olof Johansson
  2 siblings, 0 replies; 4+ messages in thread
From: Olof Johansson @ 2014-05-21 21:30 UTC (permalink / raw)
  To: linux-arm-kernel

On Fri, May 16, 2014 at 09:58:02AM +0900, Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
> 
> Please consider these Renesas ARM based SoC DT SCIF updates for v3.16.
> 
> This pull request is based on Renesas SoC Clock Cleanups for v3.16,
> such requests, tagged as renesas-clock-cleanup2-for-v3.16,
> which I have already sent a pull-request for.
> 
> 
> This series includes dependencies that do not fit easily into the usual
> inter-branch dependencies and as such I have grouped them together in a
> single branch.
> 
> The following changes since commit c17fcfbcc0f6b4f3cae761149e1a6108dd6750e7:
> 
>   ARM: shmobile: r7s72100: Switch to new style MTU2 device (2014-05-11 19:35:28 +0900)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt-scif-for-v3.16
> 
> for you to fetch changes up to 5ba55fa81aee9493928c245f142a0bfe9f32d02f:
> 
>   ARM: shmobile: koelsch: Enable SCIF0 and SCIF1 serial ports in DT (2014-05-14 09:56:38 +0900)

Merged into next/boards. Thanks!


-Olof

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2014-05-21 21:30 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-16  0:58 [GIT PULL] Renesas ARM Based SoC DT SCIF Updates for v3.16 Simon Horman
2014-05-16  0:58 ` [PATCH 1/2] ARM: shmobile: lager: Enable SCIF0 and SCIF1 serial ports in DT Simon Horman
2014-05-16  0:58 ` [PATCH 2/2] ARM: shmobile: koelsch: " Simon Horman
2014-05-21 21:30 ` [GIT PULL] Renesas ARM Based SoC DT SCIF Updates for v3.16 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).