aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/boards
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-02-27 01:41:14 -0500
committerPaul Mundt <lethal@linux-sh.org>2009-02-27 01:41:14 -0500
commit08c2f5b4d76f83213e379b12df504269d21c9e7c (patch)
treebf0c36715e62e0fa9d47ea81c0e2199ca0e16b2e /arch/sh/boards
parent34aeb43e2d3800f4d8f96feb9f1b49cd506679d5 (diff)
sh: ap325rxa: Revert ov772x support.
This change depends on some v4l changes that have been pushed back to 2.6.30, so drop this and fall back on the old soc_camera code until then. Reported-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> Acked-by: Kuninori Morimoto <morimoto.kuninori@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/boards')
-rw-r--r--arch/sh/boards/board-ap325rxa.c53
1 files changed, 3 insertions, 50 deletions
diff --git a/arch/sh/boards/board-ap325rxa.c b/arch/sh/boards/board-ap325rxa.c
index 7c35787d29b4..72da416f6162 100644
--- a/arch/sh/boards/board-ap325rxa.c
+++ b/arch/sh/boards/board-ap325rxa.c
@@ -22,7 +22,6 @@
22#include <linux/gpio.h> 22#include <linux/gpio.h>
23#include <linux/spi/spi.h> 23#include <linux/spi/spi.h>
24#include <linux/spi/spi_gpio.h> 24#include <linux/spi/spi_gpio.h>
25#include <media/ov772x.h>
26#include <media/soc_camera_platform.h> 25#include <media/soc_camera_platform.h>
27#include <media/sh_mobile_ceu.h> 26#include <media/sh_mobile_ceu.h>
28#include <video/sh_mobile_lcdc.h> 27#include <video/sh_mobile_lcdc.h>
@@ -224,7 +223,6 @@ static void camera_power(int val)
224} 223}
225 224
226#ifdef CONFIG_I2C 225#ifdef CONFIG_I2C
227/* support for the old ncm03j camera */
228static unsigned char camera_ncm03j_magic[] = 226static unsigned char camera_ncm03j_magic[] =
229{ 227{
230 0x87, 0x00, 0x88, 0x08, 0x89, 0x01, 0x8A, 0xE8, 228 0x87, 0x00, 0x88, 0x08, 0x89, 0x01, 0x8A, 0xE8,
@@ -245,23 +243,6 @@ static unsigned char camera_ncm03j_magic[] =
245 0x63, 0xD4, 0x64, 0xEA, 0xD6, 0x0F, 243 0x63, 0xD4, 0x64, 0xEA, 0xD6, 0x0F,
246}; 244};
247 245
248static int camera_probe(void)
249{
250 struct i2c_adapter *a = i2c_get_adapter(0);
251 struct i2c_msg msg;
252 int ret;
253
254 camera_power(1);
255 msg.addr = 0x6e;
256 msg.buf = camera_ncm03j_magic;
257 msg.len = 2;
258 msg.flags = 0;
259 ret = i2c_transfer(a, &msg, 1);
260 camera_power(0);
261
262 return ret;
263}
264
265static int camera_set_capture(struct soc_camera_platform_info *info, 246static int camera_set_capture(struct soc_camera_platform_info *info,
266 int enable) 247 int enable)
267{ 248{
@@ -313,35 +294,8 @@ static struct platform_device camera_device = {
313 .platform_data = &camera_info, 294 .platform_data = &camera_info,
314 }, 295 },
315}; 296};
316
317static int __init camera_setup(void)
318{
319 if (camera_probe() > 0)
320 platform_device_register(&camera_device);
321
322 return 0;
323}
324late_initcall(camera_setup);
325
326#endif /* CONFIG_I2C */ 297#endif /* CONFIG_I2C */
327 298
328static int ov7725_power(struct device *dev, int mode)
329{
330 camera_power(0);
331 if (mode)
332 camera_power(1);
333
334 return 0;
335}
336
337static struct ov772x_camera_info ov7725_info = {
338 .buswidth = SOCAM_DATAWIDTH_8,
339 .flags = OV772X_FLAG_VFLIP | OV772X_FLAG_HFLIP,
340 .link = {
341 .power = ov7725_power,
342 },
343};
344
345static struct sh_mobile_ceu_info sh_mobile_ceu_info = { 299static struct sh_mobile_ceu_info sh_mobile_ceu_info = {
346 .flags = SOCAM_PCLK_SAMPLE_RISING | SOCAM_HSYNC_ACTIVE_HIGH | 300 .flags = SOCAM_PCLK_SAMPLE_RISING | SOCAM_HSYNC_ACTIVE_HIGH |
347 SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_MASTER | SOCAM_DATAWIDTH_8, 301 SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_MASTER | SOCAM_DATAWIDTH_8,
@@ -392,6 +346,9 @@ static struct platform_device *ap325rxa_devices[] __initdata = {
392 &ap325rxa_nor_flash_device, 346 &ap325rxa_nor_flash_device,
393 &lcdc_device, 347 &lcdc_device,
394 &ceu_device, 348 &ceu_device,
349#ifdef CONFIG_I2C
350 &camera_device,
351#endif
395 &nand_flash_device, 352 &nand_flash_device,
396 &sdcard_cn3_device, 353 &sdcard_cn3_device,
397}; 354};
@@ -400,10 +357,6 @@ static struct i2c_board_info __initdata ap325rxa_i2c_devices[] = {
400 { 357 {
401 I2C_BOARD_INFO("pcf8563", 0x51), 358 I2C_BOARD_INFO("pcf8563", 0x51),
402 }, 359 },
403 {
404 I2C_BOARD_INFO("ov772x", 0x21),
405 .platform_data = &ov7725_info,
406 },
407}; 360};
408 361
409static struct spi_board_info ap325rxa_spi_devices[] = { 362static struct spi_board_info ap325rxa_spi_devices[] = {