Commit 6d4abd79 authored by Simon Horman's avatar Simon Horman
Browse files

ARM: shmobile: marzen: Initialise SCIF devices using DT 



Initialise SCIF devices using DT when booting marzen
using multiplatform.

Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 33b9966d

arch/arm/boot/dts/r8a7779-marzen.dts

+19 −3
Original line number Original line Diff line number Diff line
@@ -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 @@ &extal_clk { 
};

};





&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 @@ hspi0_pins: hspi0 { 
	};

	};

};

};





&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";

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

+4 −4
Original line number Original line Diff line number Diff line
@@ -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,