diff options
author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-01-03 12:54:28 +0100 |
---|---|---|
committer | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-03-15 13:34:11 +0100 |
commit | ee9f8da7f722367478b4ebfb51d3c88417246123 (patch) | |
tree | 8f9b17902ff471f2cc122edd6fe47c9ddd046844 | |
parent | 118b673e87c55082e8f537a12db7f2629d6f5109 (diff) | |
download | op-kernel-dev-ee9f8da7f722367478b4ebfb51d3c88417246123.zip op-kernel-dev-ee9f8da7f722367478b4ebfb51d3c88417246123.tar.gz |
ARM: shmobile: kzm9g: Register pinctrl mappings for FSI
Replace the GPIO-based FSI pinmux configuration by pinctrl mappings.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
-rw-r--r-- | arch/arm/mach-shmobile/board-kzm9g.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c index df3c5ca..a628d1b 100644 --- a/arch/arm/mach-shmobile/board-kzm9g.c +++ b/arch/arm/mach-shmobile/board-kzm9g.c @@ -601,6 +601,15 @@ static struct platform_device *kzm_devices[] __initdata = { }; static const struct pinctrl_map kzm_pinctrl_map[] = { + /* FSIA (AK4648) */ + 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"), /* I2C3 */ PIN_MAP_MUX_GROUP_DEFAULT("i2c-sh_mobile.3", "pfc-sh73a0", "i2c3_1", "i2c3"), @@ -727,13 +736,6 @@ static void __init kzm_init(void) gpio_request(GPIO_FN_SDHICLK2, NULL); gpio_request_one(14, GPIOF_OUT_INIT_HIGH, NULL); /* power */ - /* enable FSI2 port A (ak4648) */ - 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); - /* enable USB */ gpio_request(GPIO_FN_VBUS_0, NULL); |