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

Commit 3ab03d01 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Simon Horman
Browse files

ARM: shmobile: r8a7779: Add pin control device to device tree 



Add a pfc node to the r8a7779 device tree and remove manual pinmux
initialization from the corresponding board files.

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

arch/arm/boot/dts/r8a7779.dtsi

+5 −0
Original line number Original line Diff line number Diff line
@@ -101,6 +101,11 @@ 
		interrupts = <0 81 0x4>;

		interrupts = <0 81 0x4>;

	};

	};





	pfc: pfc@fffc0000 {

		compatible = "renesas,pfc-r8a7779";

		reg = <0xfffc0000 0x23c>;

	};



	thermal@ffc48000 {

	thermal@ffc48000 {

		compatible = "renesas,rcar-thermal";

		compatible = "renesas,rcar-thermal";

		reg = <0xffc48000 0x38>;

		reg = <0xffc48000 0x38>;

arch/arm/mach-shmobile/board-marzen-reference.c

+8 −9
Original line number Original line Diff line number Diff line
@@ -28,24 +28,24 @@ 




static const struct pinctrl_map marzen_pinctrl_map[] = {

static const struct pinctrl_map marzen_pinctrl_map[] = {

	/* SCIF2 (CN18: DEBUG0) */

	/* SCIF2 (CN18: DEBUG0) */

	PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.2", "pfc-r8a7779",

	PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.2", "fffc0000.pfc",

				  "scif2_data_c", "scif2"),

				  "scif2_data_c", "scif2"),

	/* SCIF4 (CN19: DEBUG1) */

	/* SCIF4 (CN19: DEBUG1) */

	PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "pfc-r8a7779",

	PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "fffc0000.pfc",

				  "scif4_data", "scif4"),

				  "scif4_data", "scif4"),

	/* SDHI0 */

	/* SDHI0 */

	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7779",

	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "fffc0000.pfc",

				  "sdhi0_data4", "sdhi0"),

				  "sdhi0_data4", "sdhi0"),

	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7779",

	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "fffc0000.pfc",

				  "sdhi0_ctrl", "sdhi0"),

				  "sdhi0_ctrl", "sdhi0"),

	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7779",

	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "fffc0000.pfc",

				  "sdhi0_cd", "sdhi0"),

				  "sdhi0_cd", "sdhi0"),

	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7779",

	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "fffc0000.pfc",

				  "sdhi0_wp", "sdhi0"),

				  "sdhi0_wp", "sdhi0"),

	/* SMSC */

	/* SMSC */

	PIN_MAP_MUX_GROUP_DEFAULT("smsc911x", "pfc-r8a7779",

	PIN_MAP_MUX_GROUP_DEFAULT("smsc911x", "fffc0000.pfc",

				  "intc_irq1_b", "intc"),

				  "intc_irq1_b", "intc"),

	PIN_MAP_MUX_GROUP_DEFAULT("smsc911x", "pfc-r8a7779",

	PIN_MAP_MUX_GROUP_DEFAULT("smsc911x", "fffc0000.pfc",

				  "lbsc_ex_cs0", "lbsc"),

				  "lbsc_ex_cs0", "lbsc"),

};

};
@@ -53,7 +53,6 @@ static void __init marzen_init(void) 
{

{

	pinctrl_register_mappings(marzen_pinctrl_map,

	pinctrl_register_mappings(marzen_pinctrl_map,

				  ARRAY_SIZE(marzen_pinctrl_map));

				  ARRAY_SIZE(marzen_pinctrl_map));

	r8a7779_pinmux_init();





	r8a7779_add_standard_devices_dt();

	r8a7779_add_standard_devices_dt();

}

}