sh: ap325 and Migo-R use new sh_mobile_ceu_info flags
diff mbox

Message ID uprgoplg4.wl%morimoto.kuninori@renesas.com
State Accepted
Headers show

Commit Message

Kuninori Morimoto March 11, 2009, 7:20 a.m. UTC
Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com>
---
> Paul
this patch is for linux 2.6.30

 arch/sh/boards/board-ap325rxa.c   |    4 +---
 arch/sh/boards/mach-migor/setup.c |    4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

Comments

Paul Mundt March 11, 2009, 8:27 a.m. UTC | #1
On Wed, Mar 11, 2009 at 04:20:32PM +0900, Kuninori Morimoto wrote:
> 
> Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com>
> ---
> > Paul
> this patch is for linux 2.6.30
> 
>  arch/sh/boards/board-ap325rxa.c   |    4 +---
>  arch/sh/boards/mach-migor/setup.c |    4 +---
>  2 files changed, 2 insertions(+), 6 deletions(-)
> 
This seems to depend on some stuff in the v4l tree that well presumably
be merged during the merge window, so I'll apply this once those changes
hit mainline.
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Kuninori Morimoto March 11, 2009, 9:32 a.m. UTC | #2
Dear Paul

> This seems to depend on some stuff in the v4l tree that well presumably
> be merged during the merge window, so I'll apply this once those changes
> hit mainline.

Yes. This patch needs
http://git.kernel.org/?p=linux/kernel/git/mchehab/linux-next.git;a=commit;h=0173d07a2579eca98159a3ac71a3d0bd7e81cc47

------------------
Author: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Date:   Mon Feb 23 12:12:58 2009 -0300

    V4L/DVB (10671): sh_mobile_ceu: SOCAM flags are not platform dependent
    
    sh_mobile_ceu_camera.c support for signal polarity flags isn't platform
    dependent, provide them locally. Only the bus width is implementation
    specific.
    
    Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com>
    Acked-by: Magnus Damm <damm@igel.co.jp>
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
------------------

Best regards
--
Kuninori Morimoto
 
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox

diff --git a/arch/sh/boards/board-ap325rxa.c b/arch/sh/boards/board-ap325rxa.c
index 3bdf199..f1e8eb4 100644
--- a/arch/sh/boards/board-ap325rxa.c
+++ b/arch/sh/boards/board-ap325rxa.c
@@ -297,9 +297,7 @@  static struct platform_device camera_device = {
 #endif /* CONFIG_I2C */
 
 static struct sh_mobile_ceu_info sh_mobile_ceu_info = {
-	.flags = SOCAM_PCLK_SAMPLE_RISING | SOCAM_HSYNC_ACTIVE_HIGH |
-	SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_DATA_ACTIVE_HIGH | SOCAM_MASTER |
-	SOCAM_DATAWIDTH_8,
+	.flags = SH_CEU_FLAG_USE_8BIT_BUS,
 };
 
 static struct resource ceu_resources[] = {
diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c
index 6d63959..6e7cbcf 100644
--- a/arch/sh/boards/mach-migor/setup.c
+++ b/arch/sh/boards/mach-migor/setup.c
@@ -352,9 +352,7 @@  static int tw9910_power(struct device *dev, int mode)
 }
 
 static struct sh_mobile_ceu_info sh_mobile_ceu_info = {
-	.flags = SOCAM_MASTER | SOCAM_DATAWIDTH_8 | SOCAM_PCLK_SAMPLE_RISING
-	| SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_HIGH
-	| SOCAM_DATA_ACTIVE_HIGH,
+	.flags = SH_CEU_FLAG_USE_8BIT_BUS,
 };
 
 static struct resource migor_ceu_resources[] = {