From be03383f4a472291bcf747e959ffb208d3fd56ce Mon Sep 17 00:00:00 2001 From: Werner Almesberger Date: Tue, 10 Mar 2009 14:02:28 +0000 Subject: add primitive camera power control This dirty hack adds camera activation/deactivation on open/close. This code will have to move to a machine/platform area later. The general driver is the wrong place for it. It also removes the unconditional activation and moves the domain setting to the rest of the power control code. (Thanks, Andy !) Note that opening the camera now always takes about 20 seconds until the settings are downloaded, not just on the first open. Signed-off-by: Werner Almesberger --- arch/arm/mach-s3c6410/mach-om-3d7k.c | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'arch') diff --git a/arch/arm/mach-s3c6410/mach-om-3d7k.c b/arch/arm/mach-s3c6410/mach-om-3d7k.c index e54abd83bc2..74a88d6cfdc 100644 --- a/arch/arm/mach-s3c6410/mach-om-3d7k.c +++ b/arch/arm/mach-s3c6410/mach-om-3d7k.c @@ -69,9 +69,6 @@ #include #include #include -/* temp -- move to camera driver along with _NORMAL register setting */ -#include -#include /* #include */ #include @@ -1044,17 +1041,6 @@ static void om_3d7k_pcf50633_attach_child_devices(struct pcf50633 *pcf) pcf50633_reg_write(pcf, PCF50633_REG_LEDENA, 0x00); pcf50633_reg_write(pcf, PCF50633_REG_LEDDIM, 0x01); pcf50633_reg_write(pcf, PCF50633_REG_LEDENA, 0x01); - -#ifdef CONFIG_S3C_DEV_CAMIF - /* @@@ do this properly later - WA */ - pcf50633_reg_write(om_3d7k_pcf, 0x30, 0x21); - pcf50633_reg_write(om_3d7k_pcf, 0x39, 0x13); - pcf50633_reg_write(om_3d7k_pcf, 0x3a, 0x21); - - /* so it doesn't get lost */ - __raw_writel(__raw_readl(S3C64XX_NORMAL_CFG) | - S3C64XX_NORMALCFG_DOMAIN_I_ON, S3C64XX_NORMAL_CFG); -#endif } static void om_3d7k_l1k002_pwronoff(int level) -- cgit v1.2.3