| From 18893e720f51fa234c10faefee1f62aba4c9289e Mon Sep 17 00:00:00 2001 |
| From: Simon Horman <horms+renesas@verge.net.au> |
| Date: Mon, 7 Jul 2014 09:54:28 +0200 |
| Subject: ARM: shmobile: bockw-reference: Initialise SCIF device using DT |
| |
| 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> |
| (cherry picked from commit 5be97ca4a4f6e11c4a839ec3c08dea25589dfeb4) |
| 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 f76f6ec01e19..3342c74c5de8 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 13512e97cd05..8d832640202e 100644 |
| --- a/arch/arm/mach-shmobile/setup-r8a7778.c |
| +++ b/arch/arm/mach-shmobile/setup-r8a7778.c |
| @@ -294,12 +294,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); |
| } |
| |
| @@ -508,6 +502,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.1.2 |
| |