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

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

ARM: shmobile: marzen: Register pinctrl mappings for INTC 



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

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

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

+2 −4
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include <linux/platform_device.h>

#include <linux/delay.h>

#include <linux/io.h>

#include <linux/gpio.h>

#include <linux/dma-mapping.h>

#include <linux/pinctrl/machine.h>

#include <linux/regulator/fixed.h>
@@ -348,6 +347,8 @@ static const struct pinctrl_map marzen_pinctrl_map[] = { 
	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7779",

				  "sdhi0_wp", "sdhi0"),

	/* SMSC */

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

				  "intc_irq1_b", "intc"),

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

				  "lbsc_ex_cs0", "lbsc"),

	/* USB0 */
@@ -372,9 +373,6 @@ static void __init marzen_init(void) 
				  ARRAY_SIZE(marzen_pinctrl_map));

	r8a7779_pinmux_init();



	/* LAN89218 */

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



	r8a7779_add_standard_devices();

	platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices));

}