Merge tag 'renesas-dt-scif-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards

Merge "Renesas ARM Based SoC dt-scif Updates for v3.16" from Simon Horman:

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

* tag 'renesas-dt-scif-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: koelsch: Enable SCIF0 and SCIF1 serial ports in DT
  ARM: shmobile: lager: Enable SCIF0 and SCIF1 serial ports in DT

Signed-off-by: Olof Johansson <olof@lixom.net>

4 files changed, 10 insertions, 35 deletions

diff --git a/arch/arm/mach-shmobile/board-koelsch-reference.c b/arch/arm/mach-shmobile/board-koelsch-reference.c
index bd9093221f76..0b0ce5a92548 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/board-lager-reference.c b/arch/arm/mach-shmobile/board-lager-reference.c
index 1bca2748aa7c..749832e3f33c 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 87327f353d1b..5fc9b1762a33 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();
diff --git a/arch/arm/mach-shmobile/setup-r8a7791.c b/arch/arm/mach-shmobile/setup-r8a7791.c
index 561653d639d7..b3f42b5b1724 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();