Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4fac6f2 authored by Simon Horman's avatar Simon Horman
Browse files

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



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

Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent fa12355b

arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts

+11 −3
Original line number Diff line number Diff line
@@ -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";

arch/arm/mach-shmobile/setup-r8a7740.c

+4 −4
Original line number Diff line number Diff line
@@ -310,6 +310,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,
@@ -319,10 +323,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,