ARM: shmobile: lager: Enable SCIF0 and SCIF1 serial ports in DT

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@verge.net.au: updated changelog to remove references to
                             device renaming]
[horms+renesas@verge.net.au: resolved conflicts]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 4e9c4877aacc134b568e480eb8998de58b43d63e)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Conflicts:
	arch/arm/boot/dts/r8a7790-lager.dts

diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index 86d676f629429ab3c304111fcdd987e91fca0c9a..9becef78c797da3a72c1c0bc63ed2b6c745358a2 100644 (file)
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -18,6 +18,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";
        };
@@ -146,7 +151,7 @@
 };
 
 &pfc {
-       pinctrl-0 = <&du_pins &scif0_pins &scif1_pins>;
+       pinctrl-0 = <&du_pins>;
        pinctrl-names = "default";
 
        du_pins: du {
@@ -277,7 +282,20 @@
                spi-cpol;
                spi-cpha;
        };
+};
 
+&scif0 {
+       pinctrl-0 = <&scif0_pins>;
+       pinctrl-names = "default";
+
+       status = "okay";
+};
+
+&scif1 {
+       pinctrl-0 = <&scif1_pins>;
+       pinctrl-names = "default";
+
+       status = "okay";
 };
 
 &sdhi0 {

diff --git a/arch/arm/mach-shmobile/board-lager-reference.c b/arch/arm/mach-shmobile/board-lager-reference.c
index 1bca2748aa7c7e97572c7872e401400a4091535b..749832e3f33c64aa52ad1d5295297a8f7120938a 100644 (file)
--- 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 2a6708358d4eb395ae747cde0a073abfd23f5684..6bd08b127fa4edce8f457ed3af91c5c8de8b6686 100644 (file)
--- a/arch/arm/mach-shmobile/setup-r8a7790.c
+++ b/arch/arm/mach-shmobile/setup-r8a7790.c
@@ -280,6 +280,11 @@ static struct resource cmt0_resources[] = {
                                          sizeof(struct sh_timer_config))
 
 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);
@@ -291,11 +296,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();