| From cffbaf7aaccf22267914d4130c3b50b84da766fc 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: ap4evb: Register pinctrl mapping for CEU |
| |
| Replace the GPIO-based CEU 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 bdf439f1878925c536533dd908467a3462171c33) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/board-ap4evb.c | 5 +++-- |
| 1 file changed, 3 insertions(+), 2 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c |
| index 45f78cad..f42e731e 100644 |
| --- a/arch/arm/mach-shmobile/board-ap4evb.c |
| +++ b/arch/arm/mach-shmobile/board-ap4evb.c |
| @@ -1086,6 +1086,9 @@ static struct i2c_board_info i2c1_devices[] = { |
| |
| |
| static const struct pinctrl_map ap4evb_pinctrl_map[] = { |
| + /* CEU */ |
| + PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_ceu.0", "pfc-sh7372", |
| + "ceu_clk_0", "ceu"), |
| /* MMCIF */ |
| PIN_MAP_MUX_GROUP_DEFAULT("sh_mmcif.0", "pfc-sh7372", |
| "mmc0_data8_0", "mmc0"), |
| @@ -1288,8 +1291,6 @@ static void __init ap4evb_init(void) |
| */ |
| |
| /* MIPI-CSI stuff */ |
| - gpio_request(GPIO_FN_VIO_CKO, NULL); |
| - |
| clk = clk_get(NULL, "vck1_clk"); |
| if (!IS_ERR(clk)) { |
| clk_set_rate(clk, clk_round_rate(clk, 13000000)); |
| -- |
| 1.8.4.3.gca3854a |
| |
