* [PATCH] sh: fix MSIOF0 SPI on ecovec: it conflicts with VOU
@ 2011-01-17 8:02 Guennadi Liakhovetski
2011-01-18 4:51 ` Paul Mundt
0 siblings, 1 reply; 2+ messages in thread
From: Guennadi Liakhovetski @ 2011-01-17 8:02 UTC (permalink / raw)
To: linux-sh
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>
---
Should be good for 2.6.37
arch/sh/boards/mach-ecovec24/setup.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index 33b6629..701667a 100644
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -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);
@@ -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));
--
1.7.2.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] sh: fix MSIOF0 SPI on ecovec: it conflicts with VOU
2011-01-17 8:02 [PATCH] sh: fix MSIOF0 SPI on ecovec: it conflicts with VOU Guennadi Liakhovetski
@ 2011-01-18 4:51 ` Paul Mundt
0 siblings, 0 replies; 2+ messages in thread
From: Paul Mundt @ 2011-01-18 4:51 UTC (permalink / raw)
To: linux-sh
On Mon, Jan 17, 2011 at 09:02:53AM +0100, Guennadi Liakhovetski wrote:
> 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>
> ---
>
> Should be good for 2.6.37
>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-01-18 4:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-17 8:02 [PATCH] sh: fix MSIOF0 SPI on ecovec: it conflicts with VOU Guennadi Liakhovetski
2011-01-18 4:51 ` Paul Mundt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).