| From 97fdbc53628831349cef2025135750c0dcb2e58b Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Thu, 18 Apr 2013 01:18:41 +0200 |
| Subject: ARM: shmobile: armadillo800eva: Register pinctrl mapping for HDMI |
| |
| Replace the GPIO-based HDMI 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 f1bb4ab084626b093ed050dc979144b73f2efc03) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/board-armadillo800eva.c | 7 +++---- |
| 1 file changed, 3 insertions(+), 4 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c |
| index 4e1f8f3f..dad4966d 100644 |
| --- a/arch/arm/mach-shmobile/board-armadillo800eva.c |
| +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c |
| @@ -1072,6 +1072,9 @@ static const struct pinctrl_map eva_pinctrl_map[] = { |
| "gether_mii", "gether"), |
| PIN_MAP_MUX_GROUP_DEFAULT("sh-eth", "pfc-r8a7740", |
| "gether_int", "gether"), |
| + /* HDMI */ |
| + PIN_MAP_MUX_GROUP_DEFAULT("sh-mobile-hdmi", "pfc-r8a7740", |
| + "hdmi", "hdmi"), |
| /* LCD0 */ |
| PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_lcdc_fb.0", "pfc-r8a7740", |
| "lcd0_data24_0", "lcd0"), |
| @@ -1198,10 +1201,6 @@ static void __init eva_init(void) |
| gpio_direction_none(GPIO_PORT7CR); /* FSIAOBT needs no direction */ |
| gpio_direction_none(GPIO_PORT8CR); /* FSIAOLR needs no direction */ |
| |
| - /* HDMI */ |
| - gpio_request(GPIO_FN_HDMI_HPD, NULL); |
| - gpio_request(GPIO_FN_HDMI_CEC, NULL); |
| - |
| /* |
| * CAUTION |
| * |
| -- |
| 1.8.4.3.gca3854a |
| |
