leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: shmobile: armadillo800eva-reference: Initialise SCIF device using DT

Browse Source 
Initialise SCIF device using DT when booting armadillo800eva
using DT reference.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
This commit is contained in:
Simon Horman 2014-07-07 09:54:42 +02:00
parent fa12355b24
commit c4fac6f2f9
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts
View File

@ -19,6 +19,10 @@
model = "armadillo 800 eva reference"; model = "armadillo 800 eva reference";
compatible = "renesas,armadillo800eva-reference", "renesas,r8a7740"; compatible = "renesas,armadillo800eva-reference", "renesas,r8a7740";
aliases {
serial1 = &scifa1;
};
chosen { chosen {
bootargs = "console=tty0 console=ttySC1,115200 ignore_loglevel root=/dev/nfs ip=dhcp rw"; bootargs = "console=tty0 console=ttySC1,115200 ignore_loglevel root=/dev/nfs ip=dhcp rw";
}; };
@ -202,9 +206,6 @@
}; };
&pfc { &pfc {
pinctrl-0 = <&scifa1_pins>;
pinctrl-names = "default";
ether_pins: ether { ether_pins: ether {
renesas,groups = "gether_mii", "gether_int"; renesas,groups = "gether_mii", "gether_int";
renesas,function = "gether"; renesas,function = "gether";
@ -256,6 +257,13 @@
status = "okay"; status = "okay";
}; };
&scifa1 {
pinctrl-0 = <&scifa1_pins>;
pinctrl-names = "default";
status = "okay";
};
&sdhi0 { &sdhi0 {
pinctrl-0 = <&sdhi0_pins>; pinctrl-0 = <&sdhi0_pins>;
pinctrl-names = "default"; pinctrl-names = "default";

8
arch/arm/mach-shmobile/setup-r8a7740.c
View File

@ -310,6 +310,10 @@ static struct platform_device ipmmu_device = {
}; };
static struct platform_device *r8a7740_devices_dt[] __initdata = { static struct platform_device *r8a7740_devices_dt[] __initdata = {
&cmt1_device,
};
static struct platform_device *r8a7740_early_devices[] __initdata = {
&scif0_device, &scif0_device,
&scif1_device, &scif1_device,
&scif2_device, &scif2_device,
@ -319,10 +323,6 @@ static struct platform_device *r8a7740_devices_dt[] __initdata = {
&scif6_device, &scif6_device,
&scif7_device, &scif7_device,
&scif8_device, &scif8_device,
&cmt1_device,
};
static struct platform_device *r8a7740_early_devices[] __initdata = {
&irqpin0_device, &irqpin0_device,
&irqpin1_device, &irqpin1_device,
&irqpin2_device, &irqpin2_device,