From patchwork Thu Jan 22 00:38:31 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Kuninori Morimoto <morimoto.kuninori@renesas.com>
X-Patchwork-Id: 3502
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n0M0m2SK002832
	for <patchwork-sh@patchwork.kernel.org>;
	Wed, 21 Jan 2009 16:48:08 -0800
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753644AbZAVAwr (ORCPT
	<rfc822;patchwork-sh@patchwork.kernel.org>);
	Wed, 21 Jan 2009 19:52:47 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753728AbZAVAwr
	(ORCPT <rfc822; linux-sh-outgoing>);
	Wed, 21 Jan 2009 19:52:47 -0500
Received: from mail.renesas.com ([202.234.163.13]:65272 "EHLO
	mail05.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org
	with ESMTP id S1753644AbZAVAwq (ORCPT
	<rfc822;linux-sh@vger.kernel.org>); Wed, 21 Jan 2009 19:52:46 -0500
X-AuditID: ac140388-0000000b00006b18-58-4977c35b7f83
Received: from guardian01.idc.renesas.com ([172.20.8.200])
	by mail05.idc.renesas.com (sendmail) with ESMTP id n0M0qhxc013666;
	Thu, 22 Jan 2009 09:52:43 +0900 (JST)
Received: (from root@localhost)
	by guardian01.idc.renesas.com with  id n0M0qhp8007726;
	Thu, 22 Jan 2009 09:52:43 +0900 (JST)
Received: from mta01.idc.renesas.com (localhost [127.0.0.1])
	by mta01.idc.renesas.com with ESMTP id n0M0qhPc021849;
	Thu, 22 Jan 2009 09:52:43 +0900 (JST)
Received: from PG10870.renesas.com ([172.30.8.159])
	by ims05.idc.renesas.com (Sendmail)
	with ESMTPA id <0KDU008D8L3V34@ims05.idc.renesas.com>; Thu,
	22 Jan 2009 09:52:43 +0900 (JST)
Date: Thu, 22 Jan 2009 09:38:31 +0900
From: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Subject: [PATCH 2/2] Add support ov772x driver setting to ap325
To: Paul Mundt <lethal@linux-sh.org>
Cc: SH-Linux <linux-sh@vger.kernel.org>
Message-id: <uhc3skvqd.wl%morimoto.kuninori@renesas.com>
MIME-version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-type: text/plain; charset=US-ASCII
User-Agent: SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=)
	APEL/10.7 Emacs/22.1 (i386-mingw-nt5.1.2600) MULE/5.0 (SAKAKI)
	Meadow/3.00-dev (KIKU)
X-Brightmail-Tracker: AAAAAA==
Sender: linux-sh-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-sh.vger.kernel.org>
X-Mailing-List: linux-sh@vger.kernel.org

This patch add ov772x camera settings to ap325,
Old camera is still supported. And it will be 2nd camera
if you select ov772x and soc_camera_platform in same time.

Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Signed-off-by: Magnus Damm <damm@igel.co.jp>
---
 arch/sh/boards/board-ap325rxa.c |   53 ++++++++++++++++++++++++++++++++++++--
 1 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/arch/sh/boards/board-ap325rxa.c b/arch/sh/boards/board-ap325rxa.c
index 72da416..7c35787 100644
--- a/arch/sh/boards/board-ap325rxa.c
+++ b/arch/sh/boards/board-ap325rxa.c
@@ -22,6 +22,7 @@
 #include <linux/gpio.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/spi_gpio.h>
+#include <media/ov772x.h>
 #include <media/soc_camera_platform.h>
 #include <media/sh_mobile_ceu.h>
 #include <video/sh_mobile_lcdc.h>
@@ -223,6 +224,7 @@ static void camera_power(int val)
 }
 
 #ifdef CONFIG_I2C
+/* support for the old ncm03j camera */
 static unsigned char camera_ncm03j_magic[] =
 {
 	0x87, 0x00, 0x88, 0x08, 0x89, 0x01, 0x8A, 0xE8,
@@ -243,6 +245,23 @@ static unsigned char camera_ncm03j_magic[] =
 	0x63, 0xD4, 0x64, 0xEA, 0xD6, 0x0F,
 };
 
+static int camera_probe(void)
+{
+	struct i2c_adapter *a = i2c_get_adapter(0);
+	struct i2c_msg msg;
+	int ret;
+
+	camera_power(1);
+	msg.addr = 0x6e;
+	msg.buf = camera_ncm03j_magic;
+	msg.len = 2;
+	msg.flags = 0;
+	ret = i2c_transfer(a, &msg, 1);
+	camera_power(0);
+
+	return ret;
+}
+
 static int camera_set_capture(struct soc_camera_platform_info *info,
 			      int enable)
 {
@@ -294,8 +313,35 @@ static struct platform_device camera_device = {
 		.platform_data	= &camera_info,
 	},
 };
+
+static int __init camera_setup(void)
+{
+	if (camera_probe() > 0)
+		platform_device_register(&camera_device);
+
+	return 0;
+}
+late_initcall(camera_setup);
+
 #endif /* CONFIG_I2C */
 
+static int ov7725_power(struct device *dev, int mode)
+{
+	camera_power(0);
+	if (mode)
+		camera_power(1);
+
+	return 0;
+}
+
+static struct ov772x_camera_info ov7725_info = {
+	.buswidth  = SOCAM_DATAWIDTH_8,
+	.flags = OV772X_FLAG_VFLIP | OV772X_FLAG_HFLIP,
+	.link = {
+		.power  = ov7725_power,
+	},
+};
+
 static struct sh_mobile_ceu_info sh_mobile_ceu_info = {
 	.flags = SOCAM_PCLK_SAMPLE_RISING | SOCAM_HSYNC_ACTIVE_HIGH |
 	SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_MASTER | SOCAM_DATAWIDTH_8,
@@ -346,9 +392,6 @@ static struct platform_device *ap325rxa_devices[] __initdata = {
 	&ap325rxa_nor_flash_device,
 	&lcdc_device,
 	&ceu_device,
-#ifdef CONFIG_I2C
-	&camera_device,
-#endif
 	&nand_flash_device,
 	&sdcard_cn3_device,
 };
@@ -357,6 +400,10 @@ static struct i2c_board_info __initdata ap325rxa_i2c_devices[] = {
 	{
 		I2C_BOARD_INFO("pcf8563", 0x51),
 	},
+	{
+		I2C_BOARD_INFO("ov772x", 0x21),
+		.platform_data = &ov7725_info,
+	},
 };
 
 static struct spi_board_info ap325rxa_spi_devices[] = {