From 1efa46d840b4137187c8180b34eda2a4e7971c9d Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Thu, 3 Jan 2013 12:54:28 +0100 Subject: [PATCH] --- yaml --- r: 372605 b: refs/heads/master c: 118b673e87c55082e8f537a12db7f2629d6f5109 h: refs/heads/master i: 372603: 1bdf31e52de08a5dba1d8e93459786d2efec2913 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-shmobile/board-kzm9g.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 59bcde0ea259..d30253ce1fae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5606ed9c0c686f370a4f03ff3c1bfda4c020956d +refs/heads/master: 118b673e87c55082e8f537a12db7f2629d6f5109 diff --git a/trunk/arch/arm/mach-shmobile/board-kzm9g.c b/trunk/arch/arm/mach-shmobile/board-kzm9g.c index 3d2cdc45c4d0..df3c5ca4a294 100644 --- a/trunk/arch/arm/mach-shmobile/board-kzm9g.c +++ b/trunk/arch/arm/mach-shmobile/board-kzm9g.c @@ -601,6 +601,9 @@ static struct platform_device *kzm_devices[] __initdata = { }; static const struct pinctrl_map kzm_pinctrl_map[] = { + /* I2C3 */ + PIN_MAP_MUX_GROUP_DEFAULT("i2c-sh_mobile.3", "pfc-sh73a0", + "i2c3_1", "i2c3"), /* LCD */ PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_lcdc_fb.0", "pfc-sh73a0", "lcd_data24", "lcd"), @@ -724,10 +727,6 @@ static void __init kzm_init(void) gpio_request(GPIO_FN_SDHICLK2, NULL); gpio_request_one(14, GPIOF_OUT_INIT_HIGH, NULL); /* power */ - /* I2C 3 */ - gpio_request(GPIO_FN_PORT27_I2C_SCL3, NULL); - gpio_request(GPIO_FN_PORT28_I2C_SDA3, NULL); - /* enable FSI2 port A (ak4648) */ gpio_request(GPIO_FN_FSIACK, NULL); gpio_request(GPIO_FN_FSIAILR, NULL);