Merge commit 'main-jb-2012.08.03-B4' into t114-0806

Conflicts:
	arch/arm/boot/compressed/Makefile
	arch/arm/boot/compressed/atags_to_fdt.c
	arch/arm/boot/compressed/head.S
	arch/arm/boot/dts/tegra30.dtsi
	arch/arm/include/asm/bug.h
	arch/arm/kernel/traps.c
	arch/arm/mach-tegra/Makefile.boot
	arch/arm/mach-tegra/board-cardhu-sdhci.c
	arch/arm/mach-tegra/board-cardhu.c
	arch/arm/mach-tegra/board-enterprise-sdhci.c
	arch/arm/mach-tegra/board-enterprise.c
	arch/arm/mach-tegra/board-harmony.c
	arch/arm/mach-tegra/board-kai-sdhci.c
	arch/arm/mach-tegra/board-ventana.c
	arch/arm/mach-tegra/board-whistler.c
	arch/arm/mach-tegra/clock.h
	arch/arm/mach-tegra/fuse.h
	arch/arm/mach-tegra/tegra2_usb_phy.c
	arch/arm/mach-tegra/tegra3_clocks.c
	arch/arm/mach-tegra/tegra3_dvfs.c
	arch/arm/mach-tegra/tegra3_speedo.c
	arch/arm/mach-tegra/timer.c
	arch/arm/mach-tegra/usb_phy.c
	arch/arm/mach-tegra/wakeups-t3.c
	drivers/cpufreq/cpufreq_interactive.c
	drivers/input/touchscreen/atmel_mxt_ts.c
	drivers/mfd/tps65090.c
	drivers/mmc/core/mmc.c
	drivers/mmc/host/sdhci-tegra.c
	drivers/mmc/host/sdhci.c
	drivers/net/wireless/bcmdhd/bcmsdh_sdmmc_linux.c
	drivers/regulator/Kconfig
	drivers/regulator/core.c
	drivers/regulator/tps80031-regulator.c
	drivers/spi/Makefile
	drivers/staging/nvec/nvec.c
	drivers/tty/serial/Makefile
	include/linux/mmc/card.h
	sound/soc/tegra/tegra_max98095.c
	sound/usb/card.c

Change-Id: I65043bc6ce9e97d0592683462215a39e50f403fd
Reviewed-on: http://git-master/r/121392
Reviewed-by: Bo Yan <byan@nvidia.com>
Tested-by: Bo Yan <byan@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User

1 files changed, 52 insertions, 5 deletions

diff --git a/drivers/media/video/tegra/ov9726.c b/drivers/media/video/tegra/ov9726.c
index 27400516488d..52b3b075dd0e 100644
--- a/drivers/media/video/tegra/ov9726.c
+++ b/drivers/media/video/tegra/ov9726.c
@@ -38,6 +38,7 @@ struct ov9726_devinfo {
 	struct ov9726_power_rail	power_rail;
 	atomic_t			in_use;
 	__u32				mode;
+	struct ov9726_reg		grphold_temp[10];
 };
 
 static struct ov9726_reg mode_1280x720[] = {
@@ -603,6 +604,46 @@ static int ov9726_set_gain(struct i2c_client *i2c_client, u16 gain)
 	return ret;
 }
 
+static int ov9726_set_group_hold(struct ov9726_devinfo *dev,
+			struct ov9726_ae *ae)
+{
+#define OV9726_REG_PUSH8(p, a, v) \
+	do { \
+		(p)->addr = (a); \
+		(p)->val = (v); \
+		(p)++; \
+	} while (0)
+
+#define OV9726_REG_PUSH16(ptr, addr, val) do { \
+		OV9726_REG_PUSH8(ptr, (addr), (val) >> 8); \
+		OV9726_REG_PUSH8(ptr, (addr) + 1, (val) & 0xff); \
+	} while (0)
+
+	struct ov9726_reg *gptr = &dev->grphold_temp[0];
+
+	if (!ae->gain_enable &&
+		!ae->coarse_time_enable &&
+		!ae->frame_length_enable)
+		return 0;
+
+	OV9726_REG_PUSH8(gptr, 0x0104, 0x01);
+	if (ae->gain_enable)
+		OV9726_REG_PUSH16(gptr,
+			OV9726_REG_GAIN_HI, ae->gain);
+	if (ae->coarse_time_enable)
+		OV9726_REG_PUSH16(gptr,
+			OV9726_REG_COARSE_TIME_HI, ae->coarse_time);
+	if (ae->frame_length_enable) {
+		OV9726_REG_PUSH16(gptr,
+			OV9726_REG_FRAME_LENGTH_HI, ae->frame_length);
+	}
+	OV9726_REG_PUSH8(gptr, 0x0104, 0x00);
+	OV9726_REG_PUSH8(gptr, OV9726_TABLE_END, 0x00);
+
+	return ov9726_write_table(dev->i2c_client,
+				dev->grphold_temp, NULL, 0);
+}
+
 static int ov9726_get_status(struct i2c_client *i2c_client, u8 *status)
 {
 	int err;
@@ -681,19 +722,26 @@ ov9726_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 
 		break;
 	}
-
 	case OV9726_IOCTL_SET_FRAME_LENGTH:
 		err = ov9726_set_frame_length(i2c_client, (u32)arg);
 		break;
-
 	case OV9726_IOCTL_SET_COARSE_TIME:
 		err = ov9726_set_coarse_time(i2c_client, (u32)arg);
 		break;
-
 	case OV9726_IOCTL_SET_GAIN:
 		err = ov9726_set_gain(i2c_client, (u16)arg);
 		break;
-
+	case OV9726_IOCTL_SET_GROUP_HOLD:
+	{
+		struct ov9726_ae ae;
+		if (copy_from_user(&ae,
+			(const void __user *)arg, sizeof(struct ov9726_ae))) {
+			pr_info("%s %d\n", __func__, __LINE__);
+			return -EFAULT;
+		}
+		err = ov9726_set_group_hold(dev, &ae);
+		break;
+	}
 	case OV9726_IOCTL_GET_STATUS:
 	{
 		u8 status;
@@ -706,7 +754,6 @@ ov9726_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 		}
 		break;
 	}
-
 	default:
 		err = -EINVAL;
 		break;