| From c46f3ef555a88ee588bd75bd40255df32bdbd947 Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Fri, 19 Apr 2013 13:29:48 +0200 |
| Subject: ARM: shmobile: mackerel: Register pinctrl mapping for FSI |
| |
| Replace the GPIO-based FSI pinmux configuration by a pinctrl mapping. |
| |
| Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit d39a15793ceded60e4d4f49aab5d6883781a312b) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/board-mackerel.c | 19 ++++++++++++------- |
| 1 file changed, 12 insertions(+), 7 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c |
| index 955fefd3..f2e8740f 100644 |
| --- a/arch/arm/mach-shmobile/board-mackerel.c |
| +++ b/arch/arm/mach-shmobile/board-mackerel.c |
| @@ -1328,6 +1328,16 @@ static const struct pinctrl_map mackerel_pinctrl_map[] = { |
| "flctl_ce0", "flctl"), |
| PIN_MAP_MUX_GROUP_DEFAULT("sh_flctl.0", "pfc-sh7372", |
| "flctl_ctrl", "flctl"), |
| + /* 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"), |
| /* SDHI0 */ |
| PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-sh7372", |
| "sdhi0_data4", "sdhi0"), |
| @@ -1446,11 +1456,7 @@ static void __init mackerel_init(void) |
| gpio_request_pulldown(GPIO_PORT167CR); /* VBUS0_1 pull down */ |
| gpio_request(GPIO_FN_IDIN_1_113, NULL); |
| |
| - /* 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); |
| @@ -1460,8 +1466,7 @@ static void __init mackerel_init(void) |
| |
| intc_set_priority(IRQ_FSI, 3); /* irq priority FSI(3) > SMSC911X(2) */ |
| |
| - /* 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 */ |
| -- |
| 1.8.4.3.gca3854a |
| |
