| From f935f61c380a601ee6fd2a814ab87c634b2f37da Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Wed, 30 Apr 2014 02:31:46 +0200 |
| Subject: ARM: shmobile: koelsch: 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 Koelsch reference board |
| file. |
| |
| Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| [horms+renesas@verge.net.au: added aliases to avoid device renumbering] |
| [horms+renesas@verge.net.au: resolved conflicts] |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| |
| (cherry picked from commit 5ba55fa81aee9493928c245f142a0bfe9f32d02f) |
| 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 0d69813def85..05d44f9b202f 100644 |
| --- a/arch/arm/boot/dts/r8a7791-koelsch.dts |
| +++ b/arch/arm/boot/dts/r8a7791-koelsch.dts |
| @@ -19,6 +19,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"; |
| }; |
| @@ -230,7 +235,7 @@ |
| }; |
| |
| &pfc { |
| - pinctrl-0 = <&du_pins &scif0_pins &scif1_pins>; |
| + pinctrl-0 = <&du_pins>; |
| pinctrl-names = "default"; |
| |
| i2c2_pins: i2c2 { |
| @@ -310,6 +315,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 e85f7b685d26..d322a162b4b0 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 74a416e52fb9..04a96ddb3224 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(); |
| -- |
| 2.1.2 |
| |