| From 897abc538754f1141514e4a8a81036ef3c0fdcfa Mon Sep 17 00:00:00 2001 |
| From: Simon Horman <horms+renesas@verge.net.au> |
| Date: Mon, 7 Jul 2014 09:54:42 +0200 |
| Subject: ARM: shmobile: armadillo800eva-reference: Initialise SCIF device |
| using DT |
| |
| Initialise SCIF device using DT when booting armadillo800eva |
| using DT reference. |
| |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit c4fac6f2f92331fa5788811357f8b8c3352e5ad8) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts | 14 +++++++++++--- |
| arch/arm/mach-shmobile/setup-r8a7740.c | 8 ++++---- |
| 2 files changed, 15 insertions(+), 7 deletions(-) |
| |
| diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts |
| index ba2e1806b3ad..ee9e7d5c97a9 100644 |
| --- a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts |
| +++ b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts |
| @@ -19,6 +19,10 @@ |
| model = "armadillo 800 eva reference"; |
| compatible = "renesas,armadillo800eva-reference", "renesas,r8a7740"; |
| |
| + aliases { |
| + serial1 = &scifa1; |
| + }; |
| + |
| chosen { |
| bootargs = "console=tty0 console=ttySC1,115200 ignore_loglevel root=/dev/nfs ip=dhcp rw"; |
| }; |
| @@ -202,9 +206,6 @@ |
| }; |
| |
| &pfc { |
| - pinctrl-0 = <&scifa1_pins>; |
| - pinctrl-names = "default"; |
| - |
| ether_pins: ether { |
| renesas,groups = "gether_mii", "gether_int"; |
| renesas,function = "gether"; |
| @@ -256,6 +257,13 @@ |
| status = "okay"; |
| }; |
| |
| +&scifa1 { |
| + pinctrl-0 = <&scifa1_pins>; |
| + pinctrl-names = "default"; |
| + |
| + status = "okay"; |
| +}; |
| + |
| &sdhi0 { |
| pinctrl-0 = <&sdhi0_pins>; |
| pinctrl-names = "default"; |
| diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c |
| index 348af358a239..3d5eacaba3e6 100644 |
| --- a/arch/arm/mach-shmobile/setup-r8a7740.c |
| +++ b/arch/arm/mach-shmobile/setup-r8a7740.c |
| @@ -312,6 +312,10 @@ static struct platform_device ipmmu_device = { |
| }; |
| |
| static struct platform_device *r8a7740_devices_dt[] __initdata = { |
| + &cmt1_device, |
| +}; |
| + |
| +static struct platform_device *r8a7740_early_devices[] __initdata = { |
| &scif0_device, |
| &scif1_device, |
| &scif2_device, |
| @@ -321,10 +325,6 @@ static struct platform_device *r8a7740_devices_dt[] __initdata = { |
| &scif6_device, |
| &scif7_device, |
| &scif8_device, |
| - &cmt1_device, |
| -}; |
| - |
| -static struct platform_device *r8a7740_early_devices[] __initdata = { |
| &irqpin0_device, |
| &irqpin1_device, |
| &irqpin2_device, |
| -- |
| 2.1.2 |
| |