| From c4f2c70af4d2630926e6f599cee1b933d412467a Mon Sep 17 00:00:00 2001 |
| From: Simon Horman <horms+renesas@verge.net.au> |
| Date: Mon, 7 Jul 2014 09:54:34 +0200 |
| Subject: ARM: shmobile: ape6evm-reference: Initialise SCIF device using DT |
| |
| Initialise SCIF device using DT when booting ape6evm |
| using DT reference. |
| |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 27bc82353a3f214a383d7f3b1ccaefdb70d6c94f) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 14 +++++++++++--- |
| arch/arm/mach-shmobile/setup-r8a73a4.c | 12 ++++++------ |
| 2 files changed, 17 insertions(+), 9 deletions(-) |
| |
| diff --git a/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts b/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts |
| index 70b1fff8f4a3..a860f32bca27 100644 |
| --- a/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts |
| +++ b/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts |
| @@ -16,6 +16,10 @@ |
| model = "APE6EVM"; |
| compatible = "renesas,ape6evm-reference", "renesas,r8a73a4"; |
| |
| + aliases { |
| + serial0 = &scifa0; |
| + }; |
| + |
| chosen { |
| bootargs = "console=ttySC0,115200 ignore_loglevel rw"; |
| }; |
| @@ -90,9 +94,6 @@ |
| }; |
| |
| &pfc { |
| - pinctrl-0 = <&scifa0_pins>; |
| - pinctrl-names = "default"; |
| - |
| scifa0_pins: serial0 { |
| renesas,groups = "scifa0_data"; |
| renesas,function = "scifa0"; |
| @@ -123,6 +124,13 @@ |
| status = "okay"; |
| }; |
| |
| +&scifa0 { |
| + pinctrl-0 = <&scifa0_pins>; |
| + pinctrl-names = "default"; |
| + |
| + status = "okay"; |
| +}; |
| + |
| &sdhi0 { |
| vmmc-supply = <&vcc_sdhi0>; |
| bus-width = <4>; |
| diff --git a/arch/arm/mach-shmobile/setup-r8a73a4.c b/arch/arm/mach-shmobile/setup-r8a73a4.c |
| index f470b3cc0b7b..2e1ec5e52b66 100644 |
| --- a/arch/arm/mach-shmobile/setup-r8a73a4.c |
| +++ b/arch/arm/mach-shmobile/setup-r8a73a4.c |
| @@ -189,12 +189,6 @@ static struct resource cmt1_resources[] = { |
| |
| void __init r8a73a4_add_dt_devices(void) |
| { |
| - r8a73a4_register_scif(0); |
| - r8a73a4_register_scif(1); |
| - r8a73a4_register_scif(2); |
| - r8a73a4_register_scif(3); |
| - r8a73a4_register_scif(4); |
| - r8a73a4_register_scif(5); |
| r8a7790_register_cmt(1); |
| } |
| |
| @@ -289,6 +283,12 @@ static struct resource dma_resources[] = { |
| void __init r8a73a4_add_standard_devices(void) |
| { |
| r8a73a4_add_dt_devices(); |
| + r8a73a4_register_scif(0); |
| + r8a73a4_register_scif(1); |
| + r8a73a4_register_scif(2); |
| + r8a73a4_register_scif(3); |
| + r8a73a4_register_scif(4); |
| + r8a73a4_register_scif(5); |
| r8a73a4_register_irqc(0); |
| r8a73a4_register_irqc(1); |
| r8a73a4_register_thermal(); |
| -- |
| 2.1.2 |
| |