Commit 22b15436 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'renesas-pinctrl-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC pinctrl changes for Renesas from Olof Johansson:
 "This is yet another driver change, which is split out just because of
  its size.  As already in 3.9, a lot of changes are going on here, as
  the shmobile platform gets converted from its own pin control API to
  the generic drivers/pinctrl subsystem.

  Based on agreements with Paul Mundt, we are merging the sh-arch-side
  changes here as well"

* tag 'renesas-pinctrl-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (142 commits)
  ARM: shmobile: r8a7779: Remove INTC function GPIOs
  ARM: shmobile: r8a7779: Remove LBSC function GPIOs
  ARM: shmobile: r8a7779: Remove USB function GPIOs
  ARM: shmobile: r8a7779: Remove HSPI function GPIOs
  ARM: shmobile: r8a7779: Remove SCIF function GPIOs
  ARM: shmobile: r8a7779: Remove SDHI and MMCIF function GPIOs
  ARM: shmobile: r8a7779: Remove DU function GPIOs
  ARM: shmobile: r8a7779: Remove DU1_DOTCLKOUT1 GPIO
  ARM: shmobile: r8a7740: Remove SDHI and MMCIF function GPIOs
  ARM: shmobile: r8a7740: Remove LCD0 and LCD1 function GPIOs
  ARM: shmobile: sh73a0: Remove IrDA function GPIOs
  ARM: shmobile: sh73a0: Remove USB function GPIOs
  ARM: shmobile: sh73a0: Remove BSC function GPIOs
  ARM: shmobile: sh73a0: Remove KEYSC function GPIOs
  ARM: shmobile: sh73a0: Remove pull-up function GPIOS
  ARM: shmobile: sh73a0: Remove FSI function GPIOs
  ARM: shmobile: sh73a0: Remove I2C function GPIOs
  ARM: shmobile: sh73a0: Remove SCIFA and SCIFB function GPIOs
  ARM: shmobile: sh73a0: Remove LCDC and LCDC2 function GPIOs
  ARM: shmobile: sh7372: Remove SDHI and MMCIF function GPIOs
  ...
parents 6fa52ed3 cb3daf58

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

+88 −84
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
#include <linux/init.h>

#include <linux/interrupt.h>

#include <linux/irq.h>

#include <linux/pinctrl/machine.h>

#include <linux/pinctrl/pinconf-generic.h>

#include <linux/platform_device.h>

#include <linux/delay.h>

#include <linux/io.h>
@@ -304,9 +306,9 @@ static int lcd_backlight_set_brightness(int brightness) 


	if (brightness == 0) {

		/* Reset the chip */

		gpio_set_value(GPIO_PORT235, 0);

		gpio_set_value(235, 0);

		mdelay(24);

		gpio_set_value(GPIO_PORT235, 1);

		gpio_set_value(235, 1);

		return 0;

	}
@@ -406,7 +408,7 @@ static struct sh_mobile_sdhi_info sdhi0_info = { 
	.tmio_flags	= TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_USE_GPIO_CD,

	.tmio_caps	= MMC_CAP_SD_HIGHSPEED,

	.tmio_ocr_mask	= MMC_VDD_27_28 | MMC_VDD_28_29,

	.cd_gpio	= GPIO_PORT251,

	.cd_gpio	= 251,

};



static struct resource sdhi0_resources[] = {
@@ -461,7 +463,7 @@ static struct regulator_init_data cn4_power_init_data = { 
static struct fixed_voltage_config cn4_power_info = {

	.supply_name = "CN4 SD/MMC Vdd",

	.microvolts = 3300000,

	.gpio = GPIO_PORT114,

	.gpio = 114,

	.enable_high = 1,

	.init_data = &cn4_power_init_data,

};
@@ -479,10 +481,10 @@ static void ag5evm_sdhi1_set_pwr(struct platform_device *pdev, int state) 
	static int power_gpio = -EINVAL;



	if (power_gpio < 0) {

		int ret = gpio_request_one(GPIO_PORT114, GPIOF_OUT_INIT_LOW,

		int ret = gpio_request_one(114, GPIOF_OUT_INIT_LOW,

					   "sdhi1_power");

		if (!ret)

			power_gpio = GPIO_PORT114;

			power_gpio = 114;

	}



	/*
@@ -493,7 +495,7 @@ static void ag5evm_sdhi1_set_pwr(struct platform_device *pdev, int state) 
	 * regulator driver. We have to live with the race in case the driver

	 * gets unloaded and the GPIO freed between these two steps.

	 */

	gpio_set_value(GPIO_PORT114, state);

	gpio_set_value(114, state);

}



static struct sh_mobile_sdhi_info sh_sdhi1_info = {
@@ -550,6 +552,77 @@ static struct platform_device *ag5evm_devices[] __initdata = { 
	&sdhi1_device,

};



static unsigned long pin_pullup_conf[] = {

	PIN_CONF_PACKED(PIN_CONFIG_BIAS_PULL_UP, 0),

};



static const struct pinctrl_map ag5evm_pinctrl_map[] = {

	/* FSIA */

	PIN_MAP_MUX_GROUP_DEFAULT("sh_fsi2.0", "pfc-sh73a0",

				  "fsia_mclk_in", "fsia"),

	PIN_MAP_MUX_GROUP_DEFAULT("sh_fsi2.0", "pfc-sh73a0",

				  "fsia_sclk_in", "fsia"),

	PIN_MAP_MUX_GROUP_DEFAULT("sh_fsi2.0", "pfc-sh73a0",

				  "fsia_data_in", "fsia"),

	PIN_MAP_MUX_GROUP_DEFAULT("sh_fsi2.0", "pfc-sh73a0",

				  "fsia_data_out", "fsia"),

	/* I2C2 & I2C3 */

	PIN_MAP_MUX_GROUP_DEFAULT("i2c-sh_mobile.2", "pfc-sh73a0",

				  "i2c2_0", "i2c2"),

	PIN_MAP_MUX_GROUP_DEFAULT("i2c-sh_mobile.3", "pfc-sh73a0",

				  "i2c3_0", "i2c3"),

	/* IrDA */

	PIN_MAP_MUX_GROUP_DEFAULT("sh_irda.0", "pfc-sh73a0",

				  "irda_0", "irda"),

	/* KEYSC */

	PIN_MAP_MUX_GROUP_DEFAULT("sh_keysc.0", "pfc-sh73a0",

				  "keysc_in8", "keysc"),

	PIN_MAP_MUX_GROUP_DEFAULT("sh_keysc.0", "pfc-sh73a0",

				  "keysc_out04", "keysc"),

	PIN_MAP_MUX_GROUP_DEFAULT("sh_keysc.0", "pfc-sh73a0",

				  "keysc_out5", "keysc"),

	PIN_MAP_MUX_GROUP_DEFAULT("sh_keysc.0", "pfc-sh73a0",

				  "keysc_out6_0", "keysc"),

	PIN_MAP_MUX_GROUP_DEFAULT("sh_keysc.0", "pfc-sh73a0",

				  "keysc_out7_0", "keysc"),

	PIN_MAP_MUX_GROUP_DEFAULT("sh_keysc.0", "pfc-sh73a0",

				  "keysc_out8_0", "keysc"),

	PIN_MAP_MUX_GROUP_DEFAULT("sh_keysc.0", "pfc-sh73a0",

				  "keysc_out9_2", "keysc"),

	PIN_MAP_CONFIGS_GROUP_DEFAULT("sh_keysc.0", "pfc-sh73a0",

				      "keysc_in8", pin_pullup_conf),

	/* MMCIF */

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

				  "mmc0_data8_0", "mmc0"),

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

				  "mmc0_ctrl_0", "mmc0"),

	PIN_MAP_CONFIGS_PIN_DEFAULT("sh_mmcif.0", "pfc-sh73a0",

				    "PORT279", pin_pullup_conf),

	PIN_MAP_CONFIGS_GROUP_DEFAULT("sh_mmcif.0", "pfc-sh73a0",

				      "mmc0_data8_0", pin_pullup_conf),

	/* SCIFA2 */

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

				  "scifa2_data_0", "scifa2"),

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

				  "scifa2_ctrl_0", "scifa2"),

	/* SDHI0 (CN15 [SD I/F]) */

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

				  "sdhi0_data4", "sdhi0"),

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

				  "sdhi0_ctrl", "sdhi0"),

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

				  "sdhi0_wp", "sdhi0"),

	/* SDHI1 (CN4 [WLAN I/F]) */

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

				  "sdhi1_data4", "sdhi1"),

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

				  "sdhi1_ctrl", "sdhi1"),

	PIN_MAP_CONFIGS_GROUP_DEFAULT("sh_mobile_sdhi.1", "pfc-sh73a0",

				      "sdhi1_data4", pin_pullup_conf),

	PIN_MAP_CONFIGS_PIN_DEFAULT("sh_mobile_sdhi.1", "pfc-sh73a0",

				    "PORT263", pin_pullup_conf),

};



static void __init ag5evm_init(void)

{

	regulator_register_always_on(0, "fixed-1.8V", fixed1v8_power_consumers,
@@ -558,96 +631,27 @@ static void __init ag5evm_init(void) 
				     ARRAY_SIZE(fixed2v8_power_consumers), 3300000);

	regulator_register_fixed(3, dummy_supplies, ARRAY_SIZE(dummy_supplies));



	pinctrl_register_mappings(ag5evm_pinctrl_map,

				  ARRAY_SIZE(ag5evm_pinctrl_map));

	sh73a0_pinmux_init();



	/* enable SCIFA2 */

	gpio_request(GPIO_FN_SCIFA2_TXD1, NULL);

	gpio_request(GPIO_FN_SCIFA2_RXD1, NULL);

	gpio_request(GPIO_FN_SCIFA2_RTS1_, NULL);

	gpio_request(GPIO_FN_SCIFA2_CTS1_, NULL);



	/* enable KEYSC */

	gpio_request(GPIO_FN_KEYIN0_PU, NULL);

	gpio_request(GPIO_FN_KEYIN1_PU, NULL);

	gpio_request(GPIO_FN_KEYIN2_PU, NULL);

	gpio_request(GPIO_FN_KEYIN3_PU, NULL);

	gpio_request(GPIO_FN_KEYIN4_PU, NULL);

	gpio_request(GPIO_FN_KEYIN5_PU, NULL);

	gpio_request(GPIO_FN_KEYIN6_PU, NULL);

	gpio_request(GPIO_FN_KEYIN7_PU, NULL);

	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_KEYOUT5, NULL);

	gpio_request(GPIO_FN_PORT59_KEYOUT6, NULL);

	gpio_request(GPIO_FN_PORT58_KEYOUT7, NULL);

	gpio_request(GPIO_FN_KEYOUT8, NULL);

	gpio_request(GPIO_FN_PORT149_KEYOUT9, NULL);



	/* enable I2C channel 2 and 3 */

	gpio_request(GPIO_FN_PORT236_I2C_SDA2, NULL);

	gpio_request(GPIO_FN_PORT237_I2C_SCL2, NULL);

	gpio_request(GPIO_FN_PORT248_I2C_SCL3, NULL);

	gpio_request(GPIO_FN_PORT249_I2C_SDA3, NULL);



	/* enable MMCIF */

	gpio_request(GPIO_FN_MMCCLK0, NULL);

	gpio_request(GPIO_FN_MMCCMD0_PU, NULL);

	gpio_request(GPIO_FN_MMCD0_0_PU, NULL);

	gpio_request(GPIO_FN_MMCD0_1_PU, NULL);

	gpio_request(GPIO_FN_MMCD0_2_PU, NULL);

	gpio_request(GPIO_FN_MMCD0_3_PU, NULL);

	gpio_request(GPIO_FN_MMCD0_4_PU, NULL);

	gpio_request(GPIO_FN_MMCD0_5_PU, NULL);

	gpio_request(GPIO_FN_MMCD0_6_PU, NULL);

	gpio_request(GPIO_FN_MMCD0_7_PU, NULL);

	gpio_request_one(GPIO_PORT208, GPIOF_OUT_INIT_HIGH, NULL); /* Reset */

	gpio_request_one(208, GPIOF_OUT_INIT_HIGH, NULL); /* Reset */



	/* enable SMSC911X */

	gpio_request_one(GPIO_PORT144, GPIOF_IN, NULL); /* PINTA2 */

	gpio_request_one(GPIO_PORT145, GPIOF_OUT_INIT_HIGH, NULL); /* RESET */



	/* FSI A */

	gpio_request(GPIO_FN_FSIACK, NULL);

	gpio_request(GPIO_FN_FSIAILR, NULL);

	gpio_request(GPIO_FN_FSIAIBT, NULL);

	gpio_request(GPIO_FN_FSIAISLD, NULL);

	gpio_request(GPIO_FN_FSIAOSLD, NULL);



	/* IrDA */

	gpio_request(GPIO_FN_PORT241_IRDA_OUT, NULL);

	gpio_request(GPIO_FN_PORT242_IRDA_IN,  NULL);

	gpio_request(GPIO_FN_PORT243_IRDA_FIRSEL, NULL);

	gpio_request_one(144, GPIOF_IN, NULL); /* PINTA2 */

	gpio_request_one(145, GPIOF_OUT_INIT_HIGH, NULL); /* RESET */



	/* LCD panel */

	gpio_request_one(GPIO_PORT217, GPIOF_OUT_INIT_LOW, NULL); /* RESET */

	gpio_request_one(217, GPIOF_OUT_INIT_LOW, NULL); /* RESET */

	mdelay(1);

	gpio_set_value(GPIO_PORT217, 1);

	gpio_set_value(217, 1);

	mdelay(100);



	/* LCD backlight controller */

	gpio_request_one(GPIO_PORT235, GPIOF_OUT_INIT_LOW, NULL); /* RESET */

	gpio_request_one(235, GPIOF_OUT_INIT_LOW, NULL); /* RESET */

	lcd_backlight_set_brightness(0);



	/* enable SDHI0 on CN15 [SD I/F] */

	gpio_request(GPIO_FN_SDHIWP0, NULL);

	gpio_request(GPIO_FN_SDHICMD0, NULL);

	gpio_request(GPIO_FN_SDHICLK0, NULL);

	gpio_request(GPIO_FN_SDHID0_3, NULL);

	gpio_request(GPIO_FN_SDHID0_2, NULL);

	gpio_request(GPIO_FN_SDHID0_1, NULL);

	gpio_request(GPIO_FN_SDHID0_0, NULL);



	/* enable SDHI1 on CN4 [WLAN I/F] */

	gpio_request(GPIO_FN_SDHICLK1, NULL);

	gpio_request(GPIO_FN_SDHICMD1_PU, NULL);

	gpio_request(GPIO_FN_SDHID1_3_PU, NULL);

	gpio_request(GPIO_FN_SDHID1_2_PU, NULL);

	gpio_request(GPIO_FN_SDHID1_1_PU, NULL);

	gpio_request(GPIO_FN_SDHID1_0_PU, NULL);



#ifdef CONFIG_CACHE_L2X0

	/* Shared attribute override enable, 64K*8way */

	l2x0_init(IOMEM(0xf0100000), 0x00460000, 0xc2000fff);

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

+43 −48
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <linux/i2c.h>

#include <linux/i2c/tsc2007.h>

#include <linux/io.h>

#include <linux/pinctrl/machine.h>

#include <linux/regulator/fixed.h>

#include <linux/regulator/machine.h>

#include <linux/smsc911x.h>
@@ -273,11 +274,11 @@ static struct platform_device smc911x_device = { 


/*

 * The card detect pin of the top SD/MMC slot (CN7) is active low and is

 * connected to GPIO A22 of SH7372 (GPIO_PORT41).

 * connected to GPIO A22 of SH7372 (GPIO 41).

 */

static int slot_cn7_get_cd(struct platform_device *pdev)

{

	return !gpio_get_value(GPIO_PORT41);

	return !gpio_get_value(41);

}

/* MERAM */

static struct sh_mobile_meram_info meram_info = {
@@ -838,22 +839,22 @@ static struct platform_device fsi_hdmi_device = { 
static struct gpio_led ap4evb_leds[] = {

	{

		.name			= "led4",

		.gpio			= GPIO_PORT185,

		.gpio			= 185,

		.default_state	= LEDS_GPIO_DEFSTATE_ON,

	},

	{

		.name			= "led2",

		.gpio			= GPIO_PORT186,

		.gpio			= 186,

		.default_state	= LEDS_GPIO_DEFSTATE_ON,

	},

	{

		.name			= "led3",

		.gpio			= GPIO_PORT187,

		.gpio			= 187,

		.default_state	= LEDS_GPIO_DEFSTATE_ON,

	},

	{

		.name			= "led1",

		.gpio			= GPIO_PORT188,

		.gpio			= 188,

		.default_state	= LEDS_GPIO_DEFSTATE_ON,

	}

};
@@ -1026,10 +1027,10 @@ out: 
/* TouchScreen */

#ifdef CONFIG_AP4EVB_QHD

# define GPIO_TSC_IRQ	GPIO_FN_IRQ28_123

# define GPIO_TSC_PORT	GPIO_PORT123

# define GPIO_TSC_PORT	123

#else /* WVGA */

# define GPIO_TSC_IRQ	GPIO_FN_IRQ7_40

# define GPIO_TSC_PORT	GPIO_PORT40

# define GPIO_TSC_PORT	40

#endif



#define IRQ28	evt2irq(0x3380) /* IRQ28A */
@@ -1084,6 +1085,28 @@ static struct i2c_board_info i2c1_devices[] = { 
};





static const struct pinctrl_map ap4evb_pinctrl_map[] = {

	/* 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"),

	/* SDHI0 */

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

				  "sdhi0_data4", "sdhi0"),

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

				  "sdhi0_ctrl", "sdhi0"),

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

				  "sdhi0_cd", "sdhi0"),

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

				  "sdhi0_wp", "sdhi0"),

	/* SDHI1 */

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

				  "sdhi1_data4", "sdhi1"),

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

				  "sdhi1_ctrl", "sdhi1"),

};



#define GPIO_PORT9CR	IOMEM(0xE6051009)

#define GPIO_PORT10CR	IOMEM(0xE605100A)

#define USCCR1		IOMEM(0xE6058144)
@@ -1110,6 +1133,8 @@ static void __init ap4evb_init(void) 
	/* External clock source */

	clk_set_rate(&sh7372_dv_clki_clk, 27000000);



	pinctrl_register_mappings(ap4evb_pinctrl_map,

				  ARRAY_SIZE(ap4evb_pinctrl_map));

	sh7372_pinmux_init();



	/* enable SCIFA0 */
@@ -1121,40 +1146,10 @@ static void __init ap4evb_init(void) 
	gpio_request(GPIO_FN_IRQ6_39,	NULL);



	/* enable Debug switch (S6) */

	gpio_request_one(GPIO_PORT32, GPIOF_IN | GPIOF_EXPORT, NULL);

	gpio_request_one(GPIO_PORT33, GPIOF_IN | GPIOF_EXPORT, NULL);

	gpio_request_one(GPIO_PORT34, GPIOF_IN | GPIOF_EXPORT, NULL);

	gpio_request_one(GPIO_PORT35, GPIOF_IN | GPIOF_EXPORT, NULL);



	/* SDHI0 */

	gpio_request(GPIO_FN_SDHICD0, NULL);

	gpio_request(GPIO_FN_SDHIWP0, NULL);

	gpio_request(GPIO_FN_SDHICMD0, NULL);

	gpio_request(GPIO_FN_SDHICLK0, NULL);

	gpio_request(GPIO_FN_SDHID0_3, NULL);

	gpio_request(GPIO_FN_SDHID0_2, NULL);

	gpio_request(GPIO_FN_SDHID0_1, NULL);

	gpio_request(GPIO_FN_SDHID0_0, NULL);



	/* SDHI1 */

	gpio_request(GPIO_FN_SDHICMD1, NULL);

	gpio_request(GPIO_FN_SDHICLK1, NULL);

	gpio_request(GPIO_FN_SDHID1_3, NULL);

	gpio_request(GPIO_FN_SDHID1_2, NULL);

	gpio_request(GPIO_FN_SDHID1_1, NULL);

	gpio_request(GPIO_FN_SDHID1_0, NULL);



	/* MMCIF */

	gpio_request(GPIO_FN_MMCD0_0, NULL);

	gpio_request(GPIO_FN_MMCD0_1, NULL);

	gpio_request(GPIO_FN_MMCD0_2, NULL);

	gpio_request(GPIO_FN_MMCD0_3, NULL);

	gpio_request(GPIO_FN_MMCD0_4, NULL);

	gpio_request(GPIO_FN_MMCD0_5, NULL);

	gpio_request(GPIO_FN_MMCD0_6, NULL);

	gpio_request(GPIO_FN_MMCD0_7, NULL);

	gpio_request(GPIO_FN_MMCCMD0, NULL);

	gpio_request(GPIO_FN_MMCCLK0, NULL);

	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);
@@ -1172,15 +1167,15 @@ static void __init ap4evb_init(void) 
	gpio_request(GPIO_FN_FSIAILR,	NULL);

	gpio_request(GPIO_FN_FSIAISLD,	NULL);

	gpio_request(GPIO_FN_FSIAOSLD,	NULL);

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

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



	gpio_request(GPIO_PORT9, NULL);

	gpio_request(GPIO_PORT10, NULL);

	gpio_request(9, NULL);

	gpio_request(10, NULL);

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

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



	/* card detect pin for MMC slot (CN7) */

	gpio_request_one(GPIO_PORT41, GPIOF_IN, NULL);

	gpio_request_one(41, GPIOF_IN, NULL);



	/* setup FSI2 port B (HDMI) */

	gpio_request(GPIO_FN_FSIBCK, NULL);
@@ -1268,8 +1263,8 @@ static void __init ap4evb_init(void) 
	gpio_request(GPIO_FN_LCDDISP,  NULL);

	gpio_request(GPIO_FN_LCDDCK,   NULL);



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

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

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

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



	lcdc_info.clock_source			= LCDC_CLK_BUS;

	lcdc_info.ch[0].interface_type		= RGB18;

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

+67 −91
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/platform_device.h>

#include <linux/gpio.h>

#include <linux/gpio_keys.h>

#include <linux/pinctrl/machine.h>

#include <linux/regulator/fixed.h>

#include <linux/regulator/machine.h>

#include <linux/sh_eth.h>
@@ -230,7 +231,7 @@ static int usbhsf_power_ctrl(struct platform_device *pdev, 


static int usbhsf_get_vbus(struct platform_device *pdev)

{

	return gpio_get_value(GPIO_PORT209);

	return gpio_get_value(209);

}



static irqreturn_t usbhsf_interrupt(int irq, void *data)
@@ -540,10 +541,10 @@ static struct platform_device hdmi_lcdc_device = { 
	{ .code = c, .gpio = g, .desc = d, .active_low = 1, __VA_ARGS__ }



static struct gpio_keys_button gpio_buttons[] = {

	GPIO_KEY(KEY_POWER,	GPIO_PORT99,	"SW3", .wakeup = 1),

	GPIO_KEY(KEY_BACK,	GPIO_PORT100,	"SW4"),

	GPIO_KEY(KEY_MENU,	GPIO_PORT97,	"SW5"),

	GPIO_KEY(KEY_HOME,	GPIO_PORT98,	"SW6"),

	GPIO_KEY(KEY_POWER,	99,	"SW3", .wakeup = 1),

	GPIO_KEY(KEY_BACK,	100,	"SW4"),

	GPIO_KEY(KEY_MENU,	97,	"SW5"),

	GPIO_KEY(KEY_HOME,	98,	"SW6"),

};



static struct gpio_keys_platform_data gpio_key_info = {
@@ -661,6 +662,17 @@ static struct platform_device sdhi1_device = { 
	.resource	= sdhi1_resources,

};



static const struct pinctrl_map eva_sdhi1_pinctrl_map[] = {

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

				  "sdhi1_data4", "sdhi1"),

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

				  "sdhi1_ctrl", "sdhi1"),

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

				  "sdhi1_cd", "sdhi1"),

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

				  "sdhi1_wp", "sdhi1"),

};



/* MMCIF */

static struct sh_mmcif_plat_data sh_mmcif_plat = {

	.sup_pclk	= 0,
@@ -713,9 +725,9 @@ static int mt9t111_power(struct device *dev, int mode) 
		/* video1 (= CON1 camera) expect 24MHz */

		clk_set_rate(mclk, clk_round_rate(mclk, 24000000));

		clk_enable(mclk);

		gpio_set_value(GPIO_PORT158, 1);

		gpio_set_value(158, 1);

	} else {

		gpio_set_value(GPIO_PORT158, 0);

		gpio_set_value(158, 0);

		clk_disable(mclk);

	}
@@ -869,8 +881,8 @@ static struct platform_device fsi_hdmi_device = { 


/* RTC: RTC connects i2c-gpio. */

static struct i2c_gpio_platform_data i2c_gpio_data = {

	.sda_pin	= GPIO_PORT208,

	.scl_pin	= GPIO_PORT91,

	.sda_pin	= 208,

	.scl_pin	= 91,

	.udelay		= 5, /* 100 kHz */

};
@@ -924,6 +936,28 @@ static struct platform_device *eva_devices[] __initdata = { 
	&i2c_gpio_device,

};



static const struct pinctrl_map eva_pinctrl_map[] = {

	/* LCD0 */

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

				  "lcd0_data24_0", "lcd0"),

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

				  "lcd0_lclk_1", "lcd0"),

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

				  "lcd0_sync", "lcd0"),

	/* MMCIF */

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

				  "mmc0_data8_1", "mmc0"),

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

				  "mmc0_ctrl_1", "mmc0"),

	/* SDHI0 */

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

				  "sdhi0_data4", "sdhi0"),

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

				  "sdhi0_ctrl", "sdhi0"),

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

				  "sdhi0_wp", "sdhi0"),

};



static void __init eva_clock_init(void)

{

	struct clk *system	= clk_get(NULL, "system_clk");
@@ -971,6 +1005,8 @@ static void __init eva_init(void) 
	regulator_register_always_on(0, "fixed-3.3V", fixed3v3_power_consumers,

				     ARRAY_SIZE(fixed3v3_power_consumers), 3300000);



	pinctrl_register_mappings(eva_pinctrl_map, ARRAY_SIZE(eva_pinctrl_map));



	r8a7740_pinmux_init();

	r8a7740_meram_workaround();
@@ -980,38 +1016,9 @@ static void __init eva_init(void) 


	/* LCDC0 */

	gpio_request(GPIO_FN_LCDC0_SELECT,	NULL);

	gpio_request(GPIO_FN_LCD0_D0,		NULL);

	gpio_request(GPIO_FN_LCD0_D1,		NULL);

	gpio_request(GPIO_FN_LCD0_D2,		NULL);

	gpio_request(GPIO_FN_LCD0_D3,		NULL);

	gpio_request(GPIO_FN_LCD0_D4,		NULL);

	gpio_request(GPIO_FN_LCD0_D5,		NULL);

	gpio_request(GPIO_FN_LCD0_D6,		NULL);

	gpio_request(GPIO_FN_LCD0_D7,		NULL);

	gpio_request(GPIO_FN_LCD0_D8,		NULL);

	gpio_request(GPIO_FN_LCD0_D9,		NULL);

	gpio_request(GPIO_FN_LCD0_D10,		NULL);

	gpio_request(GPIO_FN_LCD0_D11,		NULL);

	gpio_request(GPIO_FN_LCD0_D12,		NULL);

	gpio_request(GPIO_FN_LCD0_D13,		NULL);

	gpio_request(GPIO_FN_LCD0_D14,		NULL);

	gpio_request(GPIO_FN_LCD0_D15,		NULL);

	gpio_request(GPIO_FN_LCD0_D16,		NULL);

	gpio_request(GPIO_FN_LCD0_D17,		NULL);

	gpio_request(GPIO_FN_LCD0_D18_PORT40,	NULL);

	gpio_request(GPIO_FN_LCD0_D19_PORT4,	NULL);

	gpio_request(GPIO_FN_LCD0_D20_PORT3,	NULL);

	gpio_request(GPIO_FN_LCD0_D21_PORT2,	NULL);

	gpio_request(GPIO_FN_LCD0_D22_PORT0,	NULL);

	gpio_request(GPIO_FN_LCD0_D23_PORT1,	NULL);

	gpio_request(GPIO_FN_LCD0_DCK,		NULL);

	gpio_request(GPIO_FN_LCD0_VSYN,		NULL);

	gpio_request(GPIO_FN_LCD0_HSYN,		NULL);

	gpio_request(GPIO_FN_LCD0_DISP,		NULL);

	gpio_request(GPIO_FN_LCD0_LCLK_PORT165,	NULL);



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

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



	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 */
@@ -1037,12 +1044,12 @@ static void __init eva_init(void) 
	gpio_request(GPIO_FN_ET_RX_DV,		NULL);

	gpio_request(GPIO_FN_ET_RX_CLK,		NULL);



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

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



	/* USB */

	gpio_request_one(GPIO_PORT159, GPIOF_IN, NULL); /* USB_DEVICE_MODE */

	gpio_request_one(159, GPIOF_IN, NULL); /* USB_DEVICE_MODE */



	if (gpio_get_value(GPIO_PORT159)) {

	if (gpio_get_value(159)) {

		/* USB Host */

	} else {

		/* USB Func */
@@ -1051,47 +1058,22 @@ static void __init eva_init(void) 
		 * 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_PORT209 here

		 * and select GPIO 209 here

		 */

		gpio_request(GPIO_FN_IRQ7_PORT209, NULL);

		gpio_request_one(GPIO_PORT209, GPIOF_IN, NULL);

		gpio_request_one(209, GPIOF_IN, NULL);



		platform_device_register(&usbhsf_device);

		usb = &usbhsf_device;

	}



	/* SDHI0 */

	gpio_request(GPIO_FN_SDHI0_CMD, NULL);

	gpio_request(GPIO_FN_SDHI0_CLK, NULL);

	gpio_request(GPIO_FN_SDHI0_D0, NULL);

	gpio_request(GPIO_FN_SDHI0_D1, NULL);

	gpio_request(GPIO_FN_SDHI0_D2, NULL);

	gpio_request(GPIO_FN_SDHI0_D3, NULL);

	gpio_request(GPIO_FN_SDHI0_WP, NULL);



	gpio_request_one(GPIO_PORT17, GPIOF_OUT_INIT_LOW, NULL);  /* SDHI0_18/33_B */

	gpio_request_one(GPIO_PORT74, GPIOF_OUT_INIT_HIGH, NULL); /* SDHI0_PON */

	gpio_request_one(GPIO_PORT75, GPIOF_OUT_INIT_HIGH, NULL); /* SDSLOT1_PON */

	gpio_request_one(17, GPIOF_OUT_INIT_LOW, NULL);  /* SDHI0_18/33_B */

	gpio_request_one(74, GPIOF_OUT_INIT_HIGH, NULL); /* SDHI0_PON */

	gpio_request_one(75, GPIOF_OUT_INIT_HIGH, NULL); /* SDSLOT1_PON */



	/* we can use GPIO_FN_IRQ31_PORT167 here for SDHI0 CD irq */



	/*

	 * MMCIF

	 *

	 * Here doesn't care SW1.4 status,

	 * since CON2 is not mounted.

	 */

	gpio_request(GPIO_FN_MMC1_CLK_PORT103,	NULL);

	gpio_request(GPIO_FN_MMC1_CMD_PORT104,	NULL);

	gpio_request(GPIO_FN_MMC1_D0_PORT149,	NULL);

	gpio_request(GPIO_FN_MMC1_D1_PORT148,	NULL);

	gpio_request(GPIO_FN_MMC1_D2_PORT147,	NULL);

	gpio_request(GPIO_FN_MMC1_D3_PORT146,	NULL);

	gpio_request(GPIO_FN_MMC1_D4_PORT145,	NULL);

	gpio_request(GPIO_FN_MMC1_D5_PORT144,	NULL);

	gpio_request(GPIO_FN_MMC1_D6_PORT143,	NULL);

	gpio_request(GPIO_FN_MMC1_D7_PORT142,	NULL);



	/* CEU0 */

	gpio_request(GPIO_FN_VIO0_D7,		NULL);

	gpio_request(GPIO_FN_VIO0_D6,		NULL);
@@ -1108,10 +1090,10 @@ static void __init eva_init(void) 
	gpio_request(GPIO_FN_VIO_CKO,		NULL);



	/* CON1/CON15 Camera */

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

	gpio_request_one(GPIO_PORT172, GPIOF_OUT_INIT_HIGH, NULL); /* RST */

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

	gpio_request_one(172, GPIOF_OUT_INIT_HIGH, NULL); /* RST */

	/* see mt9t111_power() */

	gpio_request_one(GPIO_PORT158, GPIOF_OUT_INIT_LOW, NULL);  /* CAM_PON */

	gpio_request_one(158, GPIOF_OUT_INIT_LOW, NULL);  /* CAM_PON */



	/* FSI-WM8978 */

	gpio_request(GPIO_FN_FSIAIBT,		NULL);
@@ -1120,8 +1102,8 @@ static void __init eva_init(void) 
	gpio_request(GPIO_FN_FSIAOSLD,		NULL);

	gpio_request(GPIO_FN_FSIAISLD_PORT5,	NULL);



	gpio_request(GPIO_PORT7, NULL);

	gpio_request(GPIO_PORT8, 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 */
@@ -1138,28 +1120,22 @@ static void __init eva_init(void) 
	 * DBGMD/LCDC0/FSIA MUX

	 * DBGMD_SELECT_B should be set after setting PFC Function.

	 */

	gpio_request_one(GPIO_PORT176, GPIOF_OUT_INIT_HIGH, NULL);

	gpio_request_one(176, GPIOF_OUT_INIT_HIGH, NULL);



	/*

	 * We can switch CON8/CON14 by SW1.5,

	 * but it needs after DBGMD_SELECT_B

	 */

	gpio_request_one(GPIO_PORT6, GPIOF_IN, NULL);

	if (gpio_get_value(GPIO_PORT6)) {

	gpio_request_one(6, GPIOF_IN, NULL);

	if (gpio_get_value(6)) {

		/* CON14 enable */

	} else {

		/* CON8 (SDHI1) enable */

		gpio_request(GPIO_FN_SDHI1_CLK,	NULL);

		gpio_request(GPIO_FN_SDHI1_CMD,	NULL);

		gpio_request(GPIO_FN_SDHI1_D0,	NULL);

		gpio_request(GPIO_FN_SDHI1_D1,	NULL);

		gpio_request(GPIO_FN_SDHI1_D2,	NULL);

		gpio_request(GPIO_FN_SDHI1_D3,	NULL);

		gpio_request(GPIO_FN_SDHI1_CD,	NULL);

		gpio_request(GPIO_FN_SDHI1_WP,	NULL);

		pinctrl_register_mappings(eva_sdhi1_pinctrl_map,

					  ARRAY_SIZE(eva_sdhi1_pinctrl_map));



		/* SDSLOT2_PON */

		gpio_request_one(GPIO_PORT16, GPIOF_OUT_INIT_HIGH, NULL);

		gpio_request_one(16, GPIOF_OUT_INIT_HIGH, NULL);



		platform_device_register(&sdhi1_device);

	}

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

+18 −34

File changed.

Preview size limit exceeded, changes collapsed.

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

+104 −104

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE