Skip to content

Commit

Permalink
sh: fix MSIOF0 SPI on ecovec: it conflicts with VOU
Browse files Browse the repository at this point in the history
MSIOF0 and VOU share pins on sh7724, make MSIOF0 available again, as long as
VOU is not configured.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Guennadi Liakhovetski authored and Paul Mundt committed Jan 18, 2011
1 parent 50cfa79 commit 92359a7
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions arch/sh/boards/mach-ecovec24/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -1294,6 +1294,7 @@ static int __init arch_setup(void)
i2c_register_board_info(1, i2c1_devices,
ARRAY_SIZE(i2c1_devices));

#if defined(CONFIG_VIDEO_SH_VOU) || defined(CONFIG_VIDEO_SH_VOU_MODULE)
/* VOU */
gpio_request(GPIO_FN_DV_D15, NULL);
gpio_request(GPIO_FN_DV_D14, NULL);
Expand Down Expand Up @@ -1325,6 +1326,7 @@ static int __init arch_setup(void)

/* Remove reset */
gpio_set_value(GPIO_PTG4, 1);
#endif

return platform_add_devices(ecovec_devices,
ARRAY_SIZE(ecovec_devices));
Expand Down

0 comments on commit 92359a7

Please sign in to comment.