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

Commit 025cc6ec authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Simon Horman
Browse files

ARM: shmobile: ap4evb: Register pinctrl mapping for USBHS 



Replace the GPIO-based USBHS pinmux configuration by a pinctrl mapping.

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

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

+7 −8
Original line number Original line Diff line number Diff line
@@ -1137,6 +1137,13 @@ static const struct pinctrl_map ap4evb_pinctrl_map[] = { 
	PIN_MAP_MUX_GROUP_DEFAULT("1-0048", "pfc-sh7372",

	PIN_MAP_MUX_GROUP_DEFAULT("1-0048", "pfc-sh7372",

				  "intc_irq7_0", "intc"),

				  "intc_irq7_0", "intc"),

#endif

#endif

	/* USBHS1 */

	PIN_MAP_MUX_GROUP_DEFAULT("r8a66597_hcd.1", "pfc-sh7372",

				  "usb1_vbus", "usb1"),

	PIN_MAP_MUX_GROUP_DEFAULT("r8a66597_hcd.1", "pfc-sh7372",

				  "usb1_otg_id_0", "usb1"),

	PIN_MAP_MUX_GROUP_DEFAULT("r8a66597_hcd.1", "pfc-sh7372",

				  "usb1_otg_ctrl_0", "usb1"),

};

};





#define GPIO_PORT9CR	IOMEM(0xE6051009)

#define GPIO_PORT9CR	IOMEM(0xE6051009)
@@ -1175,14 +1182,6 @@ static void __init ap4evb_init(void) 
	gpio_request_one(34, GPIOF_IN | GPIOF_EXPORT, NULL);

	gpio_request_one(34, GPIOF_IN | GPIOF_EXPORT, NULL);

	gpio_request_one(35, GPIOF_IN | GPIOF_EXPORT, NULL);

	gpio_request_one(35, GPIOF_IN | GPIOF_EXPORT, NULL);





	/* USB enable */

	gpio_request(GPIO_FN_VBUS0_1,    NULL);

	gpio_request(GPIO_FN_IDIN_1_18,  NULL);

	gpio_request(GPIO_FN_PWEN_1_115, NULL);

	gpio_request(GPIO_FN_OVCN_1_114, NULL);

	gpio_request(GPIO_FN_EXTLP_1,    NULL);

	gpio_request(GPIO_FN_OVCN2_1,    NULL);



	/* setup USB phy */

	/* setup USB phy */

	__raw_writew(0x8a0a, IOMEM(0xE6058130));	/* USBCR4 */

	__raw_writew(0x8a0a, IOMEM(0xE6058130));	/* USBCR4 */