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

Commit 620fa619 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-pinmux-for-v3.11' of... 

Merge tag 'renesas-pinmux-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc

From Simon Horman:
Renesas ARM based SoC pinmux and GPIO update for v3.11

SH-PFC:
* Entries for INTC external IRQs
* Remove dependency on GPIOLIB
* PFC support for r8a7790 SoC
* Pinmux support for r8a7778 SoC
* Increase pin group and function coverage for sh7372, r8a7740,
  r8a7778, r8a7779 and r8a7790 SoCs
* Use pinctrl mapping on mackerel, ap4evb, armadillo800eva,
  bonito, bockw, lager boards
* Use RCAR_GP_PIN macro in marzen board
* Remove unused GPIOs for sh7372, sh73a0, r8a7740 and r8a7790 SoCs
* Add bias (pull-up/down) pinconf support for r8a7740 SoC
* Add VCCQ support for sh73a0

GPIO car:
* Add RCAR_GP_PIN macro
* Add support for IRQ_TYPE_EDGE_BOTH
* Make the platform data gpio_base field signed

The GPIO changes have been included as the RCAR_GP_PIN and
IRQ_TYPE_EDGE_BOTH changes are depended on by SH-PFC changes.

* tag 'renesas-pinmux-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (132 commits)
  ARM: shmobile: marzen: Use RCAR_GP_PIN macro
  ARM: shmobile: lager: Initialize pinmux
  ARM: shmobile: bockw: add pinctrl support
  ARM: shmobile: kzm9g: tidyup FSI pinctrl
  ARM: shmobile: r8a7740 pinmux platform device cleanup
  ARM: shmobile: r8a7790: Configure R-Car GPIO for IRQ_TYPE_EDGE_BOTH
  pinctrl: sh-pfc: r8a7779: Fix missing MOD_SEL2 entry
  Revert "ARM: shmobile: Disallow PINCTRL without GPIOLIB"
  pinctrl: r8a7790: add pinmux data for MMCIF and SDHI interfaces
  sh-pfc: r8a7778: add MMCIF pin groups
  sh-pfc: r8a7778: add HSPI pin groups
  sh-pfc: r8a7778: add I2C pin groups
  pinctrl: sh-pfc: fix a typo in pfc-r8a7790
  pinctrl: sh-pfc: fix r8a7790 Function Select register tables
  sh-pfc: r8a7778: fixup IRQ1A settings
  sh-pfc: r8a7779: add Ether pin groups
  sh-pfc: r8a7778: add Ether pin groups
  sh-pfc: r8a7778: add VIN pin groups
  sh-pfc: sh73a0: Remove function GPIOs
  sh-pfc: r8a7790: Add TPU pin groups and functions
  ...
parents ed3d27fe 5fcf4a3c

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -646,7 +646,7 @@ config ARCH_SHMOBILE 
	select MULTI_IRQ_HANDLER

	select NEED_MACH_MEMORY_H

	select NO_IOPORT

	select PINCTRL if ARCH_WANT_OPTIONAL_GPIOLIB

	select PINCTRL

	select PM_GENERIC_DOMAINS if PM

	select SPARSE_IRQ

	help

arch/arm/mach-shmobile/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ config ARCH_R8A7740 


config ARCH_R8A7778

	bool "R-Car M1 (R8A77780)"

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select CPU_V7

	select SH_CLK_CPG

	select ARM_GIC

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

+55 −77
Original line number Diff line number Diff line
@@ -1026,10 +1026,8 @@ static void __init hdmi_init_pm_clock(void) 


/* TouchScreen */

#ifdef CONFIG_AP4EVB_QHD

# define GPIO_TSC_IRQ	GPIO_FN_IRQ28_123

# define GPIO_TSC_PORT	123

#else /* WVGA */

# define GPIO_TSC_IRQ	GPIO_FN_IRQ7_40

# define GPIO_TSC_PORT	40

#endif
@@ -1037,22 +1035,12 @@ static void __init hdmi_init_pm_clock(void) 
#define IRQ7	evt2irq(0x02e0) /* IRQ7A */

static int ts_get_pendown_state(void)

{

	int val;



	gpio_free(GPIO_TSC_IRQ);



	gpio_request_one(GPIO_TSC_PORT, GPIOF_IN, NULL);



	val = gpio_get_value(GPIO_TSC_PORT);



	gpio_request(GPIO_TSC_IRQ, NULL);



	return !val;

	return !gpio_get_value(GPIO_TSC_PORT);

}



static int ts_init(void)

{

	gpio_request(GPIO_TSC_IRQ, NULL);

	gpio_request_one(GPIO_TSC_PORT, GPIOF_IN, NULL);



	return 0;

}
@@ -1086,11 +1074,42 @@ static struct i2c_board_info i2c1_devices[] = { 




static const struct pinctrl_map ap4evb_pinctrl_map[] = {

	/* CEU */

	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_ceu.0", "pfc-sh7372",

				  "ceu_clk_0", "ceu"),

	/* FSIA (AK4643) */

	PIN_MAP_MUX_GROUP_DEFAULT("asoc-simple-card.0", "pfc-sh7372",

				  "fsia_sclk_in", "fsia"),

	PIN_MAP_MUX_GROUP_DEFAULT("asoc-simple-card.0", "pfc-sh7372",

				  "fsia_data_in", "fsia"),

	PIN_MAP_MUX_GROUP_DEFAULT("asoc-simple-card.0", "pfc-sh7372",

				  "fsia_data_out", "fsia"),

	/* FSIB (HDMI) */

	PIN_MAP_MUX_GROUP_DEFAULT("asoc-simple-card.1", "pfc-sh7372",

				  "fsib_mclk_in", "fsib"),

	/* HDMI */

	PIN_MAP_MUX_GROUP_DEFAULT("sh-mobile-hdmi", "pfc-sh7372",

				  "hdmi", "hdmi"),

	/* KEYSC */

	PIN_MAP_MUX_GROUP_DEFAULT("sh_keysc", "pfc-sh7372",

				  "keysc_in04_0", "keysc"),

	PIN_MAP_MUX_GROUP_DEFAULT("sh_keysc", "pfc-sh7372",

				  "keysc_out5", "keysc"),

#ifndef CONFIG_AP4EVB_QHD

	/* LCDC */

	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_lcdc_fb.0", "pfc-sh7372",

				  "lcd_data18", "lcd"),

	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_lcdc_fb.0", "pfc-sh7372",

				  "lcd_sync", "lcd"),

#endif

	/* MMCIF */

	PIN_MAP_MUX_GROUP_DEFAULT("sh_mmcif.0", "pfc-sh7372",

				  "mmc0_data8_0", "mmc0"),

	PIN_MAP_MUX_GROUP_DEFAULT("sh_mmcif.0", "pfc-sh7372",

				  "mmc0_ctrl_0", "mmc0"),

	/* SCIFA0 */

	PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.0", "pfc-sh7372",

				  "scifa0_data", "scifa0"),

	/* SDHI0 */

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

				  "sdhi0_data4", "sdhi0"),
@@ -1105,6 +1124,26 @@ static const struct pinctrl_map ap4evb_pinctrl_map[] = { 
				  "sdhi1_data4", "sdhi1"),

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

				  "sdhi1_ctrl", "sdhi1"),

	/* SMSC911X */

	PIN_MAP_MUX_GROUP_DEFAULT("smsc911x", "pfc-sh7372",

				  "bsc_cs5a", "bsc"),

	PIN_MAP_MUX_GROUP_DEFAULT("smsc911x", "pfc-sh7372",

				  "intc_irq6_0", "intc"),

	/* TSC2007 */

#ifdef CONFIG_AP4EVB_QHD

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

				  "intc_irq28_0", "intc"),

#else /* WVGA */

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

				  "intc_irq7_0", "intc"),

#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)
@@ -1137,36 +1176,16 @@ static void __init ap4evb_init(void) 
				  ARRAY_SIZE(ap4evb_pinctrl_map));

	sh7372_pinmux_init();



	/* enable SCIFA0 */

	gpio_request(GPIO_FN_SCIFA0_TXD, NULL);

	gpio_request(GPIO_FN_SCIFA0_RXD, NULL);



	/* enable SMSC911X */

	gpio_request(GPIO_FN_CS5A,	NULL);

	gpio_request(GPIO_FN_IRQ6_39,	NULL);



	/* enable Debug switch (S6) */

	gpio_request_one(32, GPIOF_IN | GPIOF_EXPORT, NULL);

	gpio_request_one(33, GPIOF_IN | GPIOF_EXPORT, NULL);

	gpio_request_one(34, 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 */

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



	/* enable FSI2 port A (ak4643) */

	gpio_request(GPIO_FN_FSIAIBT,	NULL);

	gpio_request(GPIO_FN_FSIAILR,	NULL);

	gpio_request(GPIO_FN_FSIAISLD,	NULL);

	gpio_request(GPIO_FN_FSIAOSLD,	NULL);

	/* FSI2 port A (ak4643) */

	gpio_request_one(161, GPIOF_OUT_INIT_LOW, NULL); /* slave */



	gpio_request(9, NULL);
@@ -1177,8 +1196,7 @@ static void __init ap4evb_init(void) 
	/* card detect pin for MMC slot (CN7) */

	gpio_request_one(41, GPIOF_IN, NULL);



	/* setup FSI2 port B (HDMI) */

	gpio_request(GPIO_FN_FSIBCK, NULL);

	/* FSI2 port B (HDMI) */

	__raw_writew(__raw_readw(USCCR1) & ~(1 << 6), USCCR1); /* use SPDIF */



	/* set SPU2 clock to 119.6 MHz */
@@ -1208,18 +1226,6 @@ static void __init ap4evb_init(void) 
	 * IRQ28 for Touch Panel, set dip switches S3, S43 as OFF, ON.

	 */



	/* enable KEYSC */

	gpio_request(GPIO_FN_KEYOUT0, NULL);

	gpio_request(GPIO_FN_KEYOUT1, NULL);

	gpio_request(GPIO_FN_KEYOUT2, NULL);

	gpio_request(GPIO_FN_KEYOUT3, NULL);

	gpio_request(GPIO_FN_KEYOUT4, NULL);

	gpio_request(GPIO_FN_KEYIN0_136, NULL);

	gpio_request(GPIO_FN_KEYIN1_135, NULL);

	gpio_request(GPIO_FN_KEYIN2_134, NULL);

	gpio_request(GPIO_FN_KEYIN3_133, NULL);

	gpio_request(GPIO_FN_KEYIN4,     NULL);



	/* enable TouchScreen */

	irq_set_irq_type(IRQ28, IRQ_TYPE_LEVEL_LOW);
@@ -1241,28 +1247,6 @@ static void __init ap4evb_init(void) 
	 * For WVGA Panel (18-bit RGB, CONFIG_AP4EVB_WVGA=y) and

	 * IRQ7 for Touch Panel, set dip switches S3, S43 to ON, OFF.

	 */



	gpio_request(GPIO_FN_LCDD17,   NULL);

	gpio_request(GPIO_FN_LCDD16,   NULL);

	gpio_request(GPIO_FN_LCDD15,   NULL);

	gpio_request(GPIO_FN_LCDD14,   NULL);

	gpio_request(GPIO_FN_LCDD13,   NULL);

	gpio_request(GPIO_FN_LCDD12,   NULL);

	gpio_request(GPIO_FN_LCDD11,   NULL);

	gpio_request(GPIO_FN_LCDD10,   NULL);

	gpio_request(GPIO_FN_LCDD9,    NULL);

	gpio_request(GPIO_FN_LCDD8,    NULL);

	gpio_request(GPIO_FN_LCDD7,    NULL);

	gpio_request(GPIO_FN_LCDD6,    NULL);

	gpio_request(GPIO_FN_LCDD5,    NULL);

	gpio_request(GPIO_FN_LCDD4,    NULL);

	gpio_request(GPIO_FN_LCDD3,    NULL);

	gpio_request(GPIO_FN_LCDD2,    NULL);

	gpio_request(GPIO_FN_LCDD1,    NULL);

	gpio_request(GPIO_FN_LCDD0,    NULL);

	gpio_request(GPIO_FN_LCDDISP,  NULL);

	gpio_request(GPIO_FN_LCDDCK,   NULL);



	gpio_request_one(189, GPIOF_OUT_INIT_HIGH, NULL); /* backlight */

	gpio_request_one(151, GPIOF_OUT_INIT_HIGH, NULL); /* LCDDON */
@@ -1288,8 +1272,6 @@ static void __init ap4evb_init(void) 
	 */



	/* MIPI-CSI stuff */

	gpio_request(GPIO_FN_VIO_CKO, NULL);



	clk = clk_get(NULL, "vck1_clk");

	if (!IS_ERR(clk)) {

		clk_set_rate(clk, clk_round_rate(clk, 13000000));
@@ -1299,10 +1281,6 @@ static void __init ap4evb_init(void) 


	sh7372_add_standard_devices();



	/* HDMI */

	gpio_request(GPIO_FN_HDMI_HPD, NULL);

	gpio_request(GPIO_FN_HDMI_CEC, NULL);



	/* Reset HDMI, must be held at least one EXTALR (32768Hz) period */

#define SRCR4 IOMEM(0xe61580bc)

	srcr4 = __raw_readl(SRCR4);

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

+49 −67
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ static struct regulator_init_data vcc_sdhi0_init_data = { 
static struct fixed_voltage_config vcc_sdhi0_info = {

	.supply_name = "SDHI0 Vcc",

	.microvolts = 3300000,

	.gpio = GPIO_PORT75,

	.gpio = 75,

	.enable_high = 1,

	.init_data = &vcc_sdhi0_init_data,

};
@@ -615,7 +615,7 @@ static struct regulator_init_data vccq_sdhi0_init_data = { 
};



static struct gpio vccq_sdhi0_gpios[] = {

	{GPIO_PORT17, GPIOF_OUT_INIT_LOW, "vccq-sdhi0" },

	{17, GPIOF_OUT_INIT_LOW, "vccq-sdhi0" },

};



static struct gpio_regulator_state vccq_sdhi0_states[] = {
@@ -626,7 +626,7 @@ static struct gpio_regulator_state vccq_sdhi0_states[] = { 
static struct gpio_regulator_config vccq_sdhi0_info = {

	.supply_name = "vqmmc",



	.enable_gpio = GPIO_PORT74,

	.enable_gpio = 74,

	.enable_high = 1,

	.enabled_at_boot = 0,
@@ -664,7 +664,7 @@ static struct regulator_init_data vcc_sdhi1_init_data = { 
static struct fixed_voltage_config vcc_sdhi1_info = {

	.supply_name = "SDHI1 Vcc",

	.microvolts = 3300000,

	.gpio = GPIO_PORT16,

	.gpio = 16,

	.enable_high = 1,

	.init_data = &vcc_sdhi1_init_data,

};
@@ -693,7 +693,7 @@ static struct sh_mobile_sdhi_info sdhi0_info = { 
	.tmio_caps	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |

			  MMC_CAP_POWER_OFF_CARD,

	.tmio_flags	= TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_USE_GPIO_CD,

	.cd_gpio	= GPIO_PORT167,

	.cd_gpio	= 167,

};



static struct resource sdhi0_resources[] = {
@@ -736,7 +736,7 @@ static struct sh_mobile_sdhi_info sdhi1_info = { 
			  MMC_CAP_POWER_OFF_CARD,

	.tmio_flags	= TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_USE_GPIO_CD,

	/* Port72 cannot generate IRQs, will be used in polling mode. */

	.cd_gpio	= GPIO_PORT72,

	.cd_gpio	= 72,

};



static struct resource sdhi1_resources[] = {
@@ -1046,6 +1046,35 @@ static struct platform_device *eva_devices[] __initdata = { 
};



static const struct pinctrl_map eva_pinctrl_map[] = {

	/* CEU0 */

	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_ceu.0", "pfc-r8a7740",

				  "ceu0_data_0_7", "ceu0"),

	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_ceu.0", "pfc-r8a7740",

				  "ceu0_clk_0", "ceu0"),

	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_ceu.0", "pfc-r8a7740",

				  "ceu0_sync", "ceu0"),

	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_ceu.0", "pfc-r8a7740",

				  "ceu0_field", "ceu0"),

	/* FSIA */

	PIN_MAP_MUX_GROUP_DEFAULT("asoc-simple-card.0", "pfc-r8a7740",

				  "fsia_sclk_in", "fsia"),

	PIN_MAP_MUX_GROUP_DEFAULT("asoc-simple-card.0", "pfc-r8a7740",

				  "fsia_mclk_out", "fsia"),

	PIN_MAP_MUX_GROUP_DEFAULT("asoc-simple-card.0", "pfc-r8a7740",

				  "fsia_data_in_1", "fsia"),

	PIN_MAP_MUX_GROUP_DEFAULT("asoc-simple-card.0", "pfc-r8a7740",

				  "fsia_data_out_0", "fsia"),

	/* FSIB */

	PIN_MAP_MUX_GROUP_DEFAULT("asoc-simple-card.1", "pfc-r8a7740",

				  "fsib_mclk_in", "fsib"),

	/* GETHER */

	PIN_MAP_MUX_GROUP_DEFAULT("sh-eth", "pfc-r8a7740",

				  "gether_mii", "gether"),

	PIN_MAP_MUX_GROUP_DEFAULT("sh-eth", "pfc-r8a7740",

				  "gether_int", "gether"),

	/* HDMI */

	PIN_MAP_MUX_GROUP_DEFAULT("sh-mobile-hdmi", "pfc-r8a7740",

				  "hdmi", "hdmi"),

	/* LCD0 */

	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_lcdc_fb.0", "pfc-r8a7740",

				  "lcd0_data24_0", "lcd0"),
@@ -1058,6 +1087,9 @@ static const struct pinctrl_map eva_pinctrl_map[] = { 
				  "mmc0_data8_1", "mmc0"),

	PIN_MAP_MUX_GROUP_DEFAULT("sh_mmcif.0", "pfc-r8a7740",

				  "mmc0_ctrl_1", "mmc0"),

	/* SCIFA1 */

	PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.1", "pfc-r8a7740",

				  "scifa1_data", "scifa1"),

	/* SDHI0 */

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

				  "sdhi0_data4", "sdhi0"),
@@ -1065,6 +1097,12 @@ static const struct pinctrl_map eva_pinctrl_map[] = { 
				  "sdhi0_ctrl", "sdhi0"),

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

				  "sdhi0_wp", "sdhi0"),

	/* ST1232 */

	PIN_MAP_MUX_GROUP_DEFAULT("0-0055", "pfc-r8a7740",

				  "intc_irq10", "intc"),

	/* USBHS */

	PIN_MAP_MUX_GROUP_DEFAULT("renesas_usbhs", "pfc-r8a7740",

				  "intc_irq7_1", "intc"),

};



static void __init eva_clock_init(void)
@@ -1119,40 +1157,14 @@ static void __init eva_init(void) 
	r8a7740_pinmux_init();

	r8a7740_meram_workaround();



	/* SCIFA1 */

	gpio_request(GPIO_FN_SCIFA1_RXD, NULL);

	gpio_request(GPIO_FN_SCIFA1_TXD, NULL);



	/* LCDC0 */

	gpio_request(GPIO_FN_LCDC0_SELECT,	NULL);



	gpio_request_one(61, GPIOF_OUT_INIT_HIGH, NULL); /* LCDDON */

	gpio_request_one(202, GPIOF_OUT_INIT_LOW, NULL); /* LCD0_LED_CONT */



	/* Touchscreen */

	gpio_request(GPIO_FN_IRQ10,	NULL); /* TP_INT */

	gpio_request_one(166, GPIOF_OUT_INIT_HIGH, NULL); /* TP_RST_B */



	/* GETHER */

	gpio_request(GPIO_FN_ET_CRS,		NULL);

	gpio_request(GPIO_FN_ET_MDC,		NULL);

	gpio_request(GPIO_FN_ET_MDIO,		NULL);

	gpio_request(GPIO_FN_ET_TX_ER,		NULL);

	gpio_request(GPIO_FN_ET_RX_ER,		NULL);

	gpio_request(GPIO_FN_ET_ERXD0,		NULL);

	gpio_request(GPIO_FN_ET_ERXD1,		NULL);

	gpio_request(GPIO_FN_ET_ERXD2,		NULL);

	gpio_request(GPIO_FN_ET_ERXD3,		NULL);

	gpio_request(GPIO_FN_ET_TX_CLK,		NULL);

	gpio_request(GPIO_FN_ET_TX_EN,		NULL);

	gpio_request(GPIO_FN_ET_ETXD0,		NULL);

	gpio_request(GPIO_FN_ET_ETXD1,		NULL);

	gpio_request(GPIO_FN_ET_ETXD2,		NULL);

	gpio_request(GPIO_FN_ET_ETXD3,		NULL);

	gpio_request(GPIO_FN_ET_PHY_INT,	NULL);

	gpio_request(GPIO_FN_ET_COL,		NULL);

	gpio_request(GPIO_FN_ET_RX_DV,		NULL);

	gpio_request(GPIO_FN_ET_RX_CLK,		NULL);



	gpio_request_one(18, GPIOF_OUT_INIT_HIGH, NULL); /* PHY_RST */



	/* USB */
@@ -1163,34 +1175,17 @@ static void __init eva_init(void) 
	} else {

		/* USB Func */

		/*

		 * A1 chip has 2 IRQ7 pin and it was controled by MSEL register.

		 * OTOH, usbhs interrupt needs its value (HI/LOW) to decide

		 * USB connection/disconnection (usbhsf_get_vbus()).

		 * This means we needs to select GPIO_FN_IRQ7_PORT209 first,

		 * and select GPIO 209 here

		 * The USBHS interrupt handlers needs to read the IRQ pin value

		 * (HI/LOW) to diffentiate USB connection and disconnection

		 * events (usbhsf_get_vbus()). We thus need to select both the

		 * intc_irq7_1 pin group and GPIO 209 here.

		 */

		gpio_request(GPIO_FN_IRQ7_PORT209, NULL);

		gpio_request_one(209, GPIOF_IN, NULL);



		platform_device_register(&usbhsf_device);

		usb = &usbhsf_device;

	}



	/* CEU0 */

	gpio_request(GPIO_FN_VIO0_D7,		NULL);

	gpio_request(GPIO_FN_VIO0_D6,		NULL);

	gpio_request(GPIO_FN_VIO0_D5,		NULL);

	gpio_request(GPIO_FN_VIO0_D4,		NULL);

	gpio_request(GPIO_FN_VIO0_D3,		NULL);

	gpio_request(GPIO_FN_VIO0_D2,		NULL);

	gpio_request(GPIO_FN_VIO0_D1,		NULL);

	gpio_request(GPIO_FN_VIO0_D0,		NULL);

	gpio_request(GPIO_FN_VIO0_CLK,		NULL);

	gpio_request(GPIO_FN_VIO0_HD,		NULL);

	gpio_request(GPIO_FN_VIO0_VD,		NULL);

	gpio_request(GPIO_FN_VIO0_FIELD,	NULL);

	gpio_request(GPIO_FN_VIO_CKO,		NULL);



	/* CON1/CON15 Camera */

	gpio_request_one(173, GPIOF_OUT_INIT_LOW, NULL);  /* STANDBY */

	gpio_request_one(172, GPIOF_OUT_INIT_HIGH, NULL); /* RST */
@@ -1198,24 +1193,11 @@ static void __init eva_init(void) 
	gpio_request_one(158, GPIOF_OUT_INIT_LOW, NULL);  /* CAM_PON */



	/* FSI-WM8978 */

	gpio_request(GPIO_FN_FSIAIBT,		NULL);

	gpio_request(GPIO_FN_FSIAILR,		NULL);

	gpio_request(GPIO_FN_FSIAOMC,		NULL);

	gpio_request(GPIO_FN_FSIAOSLD,		NULL);

	gpio_request(GPIO_FN_FSIAISLD_PORT5,	NULL);



	gpio_request(7, NULL);

	gpio_request(8, NULL);

	gpio_direction_none(GPIO_PORT7CR); /* FSIAOBT needs no direction */

	gpio_direction_none(GPIO_PORT8CR); /* FSIAOLR needs no direction */



	/* FSI-HDMI */

	gpio_request(GPIO_FN_FSIBCK,		NULL);



	/* HDMI */

	gpio_request(GPIO_FN_HDMI_HPD,		NULL);

	gpio_request(GPIO_FN_HDMI_CEC,		NULL);



	/*

	 * CAUTION

	 *

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

+13 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

 */



#include <linux/pinctrl/machine.h>

#include <linux/platform_device.h>

#include <linux/smsc911x.h>

#include <mach/common.h>
@@ -37,6 +38,14 @@ static struct resource smsc911x_resources[] = { 
	DEFINE_RES_IRQ(irq_pin(0)), /* IRQ 0 */

};



static const struct pinctrl_map bockw_pinctrl_map[] = {

	/* SCIF0 */

	PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.0", "pfc-r8a7778",

				  "scif0_data_a", "scif0"),

	PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.0", "pfc-r8a7778",

				  "scif0_ctrl", "scif0"),

};



#define IRQ0MR	0x30

static void __init bockw_init(void)

{
@@ -46,6 +55,10 @@ static void __init bockw_init(void) 
	r8a7778_init_irq_extpin(1);

	r8a7778_add_standard_devices();



	pinctrl_register_mappings(bockw_pinctrl_map,

				  ARRAY_SIZE(bockw_pinctrl_map));

	r8a7778_pinmux_init();



	fpga = ioremap_nocache(0x18200000, SZ_1M);

	if (fpga) {

		/*