| From 03abe7aeb9935f9684481102eb9b24cd352a5f46 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 LCD |
| |
| Replace the GPIO-based LCD 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 845a802cd14b6ef4c791284980a09d887407aeaa) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/board-mackerel.c | 33 +++++---------------------------- |
| 1 file changed, 5 insertions(+), 28 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c |
| index e5bcd187..07eeb55b 100644 |
| --- a/arch/arm/mach-shmobile/board-mackerel.c |
| +++ b/arch/arm/mach-shmobile/board-mackerel.c |
| @@ -1341,6 +1341,11 @@ static const struct pinctrl_map mackerel_pinctrl_map[] = { |
| /* HDMI */ |
| PIN_MAP_MUX_GROUP_DEFAULT("sh-mobile-hdmi", "pfc-sh7372", |
| "hdmi", "hdmi"), |
| + /* LCDC */ |
| + PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_lcdc_fb.0", "pfc-sh7372", |
| + "lcd_data24", "lcd"), |
| + PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_lcdc_fb.0", "pfc-sh7372", |
| + "lcd_sync", "lcd"), |
| /* SDHI0 */ |
| PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-sh7372", |
| "sdhi0_data4", "sdhi0"), |
| @@ -1417,34 +1422,6 @@ static void __init mackerel_init(void) |
| gpio_request(GPIO_FN_CS5A, NULL); |
| gpio_request(GPIO_FN_IRQ6_39, NULL); |
| |
| - /* LCDC */ |
| - gpio_request(GPIO_FN_LCDD23, NULL); |
| - gpio_request(GPIO_FN_LCDD22, NULL); |
| - gpio_request(GPIO_FN_LCDD21, NULL); |
| - gpio_request(GPIO_FN_LCDD20, NULL); |
| - gpio_request(GPIO_FN_LCDD19, NULL); |
| - gpio_request(GPIO_FN_LCDD18, NULL); |
| - 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); |
| - |
| /* backlight, off by default */ |
| gpio_request_one(31, GPIOF_OUT_INIT_LOW, NULL); |
| |
| -- |
| 1.8.4.3.gca3854a |
| |