renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-26 22:24:09 +08:00
Code

ARM: shmobile: marzen: Initialise SCIF devices using DT

Browse Source 
Initialise SCIF devices using DT when booting marzen
using multiplatform.

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
This commit is contained in:
Simon Horman 2014-05-15 20:39:32 +09:00
parent 33b9966db3
commit 6d4abd79c8
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
arch/arm/boot/dts/r8a7779-marzen.dts
View File

@ -18,6 +18,11 @@
model = "marzen"; model = "marzen";
compatible = "renesas,marzen", "renesas,r8a7779"; compatible = "renesas,marzen", "renesas,r8a7779";
aliases {
serial2 = &scif2;
serial4 = &scif4;
};
chosen { chosen {
bootargs = "console=ttySC2,115200 ignore_loglevel root=/dev/nfs ip=on"; bootargs = "console=ttySC2,115200 ignore_loglevel root=/dev/nfs ip=on";
}; };
@ -74,9 +79,6 @@
}; };
&pfc { &pfc {
pinctrl-0 = <&scif2_pins &scif4_pins>;
pinctrl-names = "default";
lan0_pins: lan0 { lan0_pins: lan0 {
intc { intc {
renesas,groups = "intc_irq1_b"; renesas,groups = "intc_irq1_b";
@ -109,6 +111,20 @@
}; };
}; };
&scif2 {
pinctrl-0 = <&scif2_pins>;
pinctrl-names = "default";
status = "okay";
};
&scif4 {
pinctrl-0 = <&scif4_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-r8a7779.c
View File

@ -640,16 +640,16 @@ static void __init r8a7779_register_hpb_dmae(void)
} }
static struct platform_device *r8a7779_devices_dt[] __initdata = { static struct platform_device *r8a7779_devices_dt[] __initdata = {
&tmu0_device,
};
static struct platform_device *r8a7779_standard_devices[] __initdata = {
&scif0_device, &scif0_device,
&scif1_device, &scif1_device,
&scif2_device, &scif2_device,
&scif3_device, &scif3_device,
&scif4_device, &scif4_device,
&scif5_device, &scif5_device,
&tmu0_device,
};
static struct platform_device *r8a7779_standard_devices[] __initdata = {
&i2c0_device, &i2c0_device,
&i2c1_device, &i2c1_device,
&i2c2_device, &i2c2_device,