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

Commit e9cd49fa authored by Laurent Pinchart's avatar Laurent Pinchart
Browse files

ARM: shmobile: marzen: Register pinctrl mappings for SCIF 



Replace the GPIO-based SCIF pinmux configuration by pinctrl mappings.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
parent 4a655ecd

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

+6 −8
Original line number Original line Diff line number Diff line
@@ -329,6 +329,12 @@ void __init marzen_init_late(void) 
}

}





static const struct pinctrl_map marzen_pinctrl_map[] = {

static const struct pinctrl_map marzen_pinctrl_map[] = {

	/* SCIF2 (CN18: DEBUG0) */

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

				  "scif2_data_c", "scif2"),

	/* SCIF4 (CN19: DEBUG1) */

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

				  "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", "pfc-r8a7779",

				  "sdhi0_data4", "sdhi0"),

				  "sdhi0_data4", "sdhi0"),
@@ -351,14 +357,6 @@ static void __init marzen_init(void) 
				  ARRAY_SIZE(marzen_pinctrl_map));

				  ARRAY_SIZE(marzen_pinctrl_map));

	r8a7779_pinmux_init();

	r8a7779_pinmux_init();





	/* SCIF2 (CN18: DEBUG0) */

	gpio_request(GPIO_FN_TX2_C, NULL);

	gpio_request(GPIO_FN_RX2_C, NULL);



	/* SCIF4 (CN19: DEBUG1) */

	gpio_request(GPIO_FN_TX4, NULL);

	gpio_request(GPIO_FN_RX4, NULL);



	/* LAN89218 */

	/* LAN89218 */

	gpio_request(GPIO_FN_EX_CS0, NULL); /* nCS */

	gpio_request(GPIO_FN_EX_CS0, NULL); /* nCS */

	gpio_request(GPIO_FN_IRQ1_B, NULL); /* IRQ + PME */

	gpio_request(GPIO_FN_IRQ1_B, NULL); /* IRQ + PME */