From: Laurent Pinchart Date: Fri, 19 Apr 2013 11:29:48 +0000 (+0200) Subject: ARM: shmobile: ap4evb: Register pinctrl mapping for CEU X-Git-Tag: next-20130527~8^2^13~80 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=af9ad439844fd87076817a6f698f8c8f977b2916;p=karo-tx-linux.git ARM: shmobile: ap4evb: Register pinctrl mapping for CEU Replace the GPIO-based CEU pinmux configuration by a pinctrl mapping. Signed-off-by: Laurent Pinchart Signed-off-by: Simon Horman --- diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c index 45f78cadec1d..f42e731e1694 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));