From: Laurent Pinchart Date: Wed, 6 Mar 2013 13:22:11 +0000 (+0100) Subject: ARM: shmobile: marzen: Register pinctrl mappings for HSPI X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a3217471863c6d3a1ca20bb728ee526c940d87f7;p=linux-beck.git ARM: shmobile: marzen: Register pinctrl mappings for HSPI Replace the GPIO-based HSPI pinmux configuration by pinctrl mappings. Signed-off-by: Laurent Pinchart --- diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c index 4097366603b0..8871af322b4e 100644 --- a/arch/arm/mach-shmobile/board-marzen.c +++ b/arch/arm/mach-shmobile/board-marzen.c @@ -329,6 +329,9 @@ void __init marzen_init_late(void) } static const struct pinctrl_map marzen_pinctrl_map[] = { + /* HSPI0 */ + PIN_MAP_MUX_GROUP_DEFAULT("sh-hspi.0", "pfc-r8a7779", + "hspi0", "hspi0"), /* SCIF2 (CN18: DEBUG0) */ PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.2", "pfc-r8a7779", "scif2_data_c", "scif2"), @@ -361,12 +364,6 @@ static void __init marzen_init(void) gpio_request(GPIO_FN_EX_CS0, NULL); /* nCS */ gpio_request(GPIO_FN_IRQ1_B, NULL); /* IRQ + PME */ - /* HSPI 0 */ - gpio_request(GPIO_FN_HSPI_CLK0, NULL); - gpio_request(GPIO_FN_HSPI_CS0, NULL); - gpio_request(GPIO_FN_HSPI_TX0, NULL); - gpio_request(GPIO_FN_HSPI_RX0, NULL); - /* USB (CN21) */ gpio_request(GPIO_FN_USB_OVC0, NULL); gpio_request(GPIO_FN_USB_OVC1, NULL);