diff options
| author | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2010-02-11 10:59:37 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2010-02-11 11:01:07 +0100 |
| commit | 0128a20973f6dc22bbb180b6b4736c3bbf390890 (patch) | |
| tree | e4feb7a19e6a0f16c844dbf84a6863ee2d0fc8ac | |
| parent | 063157b0168f590858ee2ae4f169f44deb06ca91 (diff) | |
linux 2.6.20: refreshed NHK-15 patches to build after stable update
Signed-off-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
8 files changed, 15995 insertions, 14498 deletions
diff --git a/recipes/linux/linux-2.6.20/nhk15/0001-kbuild-include-limits.h-in-sumversion.c-for-path_max.patch b/recipes/linux/linux-2.6.20/nhk15/0001-kbuild-include-limits.h-in-sumversion.c-for-path_max.patch deleted file mode 100644 index 4871601c97..0000000000 --- a/recipes/linux/linux-2.6.20/nhk15/0001-kbuild-include-limits.h-in-sumversion.c-for-path_max.patch +++ /dev/null @@ -1,29 +0,0 @@ -From fc31c7716355a226b8ed4e16f4581e5c8fa53570 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Thu, 17 May 2007 14:57:20 -0400 -Subject: [PATCH] kbuild: include limits.h in sumversion.c for PATH_MAX - -POSIX says limits.h defines PATH_MAX so we should include it (which fixes -compiling on some systems like OS X). - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> -Signed-off-by: Sam Ravnborg <sam@ravnborg.org> ---- - scripts/mod/sumversion.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/scripts/mod/sumversion.c b/scripts/mod/sumversion.c -index 6873d5a..d9cc690 100644 ---- a/scripts/mod/sumversion.c -+++ b/scripts/mod/sumversion.c -@@ -7,6 +7,7 @@ - #include <ctype.h> - #include <errno.h> - #include <string.h> -+#include <limits.h> - #include "modpost.h" - - /* --- -1.6.3.3 - diff --git a/recipes/linux/linux-2.6.20/nhk15/audio_codec_patch_base_v5.6.0.patch b/recipes/linux/linux-2.6.20/nhk15/audio_codec_patch_base_v5.6.0.patch index 1a7bd9e836..5b9c187fbc 100644 --- a/recipes/linux/linux-2.6.20/nhk15/audio_codec_patch_base_v5.6.0.patch +++ b/recipes/linux/linux-2.6.20/nhk15/audio_codec_patch_base_v5.6.0.patch @@ -1,7 +1,14 @@ -diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/saa/nomadik-saa.c ../new/linux-2.6.20/drivers/media/nomadik_mm/saa/nomadik-saa.c ---- linux-2.6.20/drivers/media/nomadik_mm/saa/nomadik-saa.c 2008-11-24 14:06:25.000000000 +0530 -+++ ../new/linux-2.6.20/drivers/media/nomadik_mm/saa/nomadik-saa.c 2008-11-26 18:37:16.000000000 +0530 -@@ -1292,12 +1292,14 @@ static int link_msp (struct instance_des +--- + drivers/media/nomadik_mm/saa/nomadik-saa.c | 4 +++- + sound/arm/nomadik_alsa.c | 4 ++++ + sound/nomadik_stw5095.c | 17 +++++++++++++++++ + 3 files changed, 24 insertions(+), 1 deletion(-) + +--- linux-2.6.20.orig/drivers/media/nomadik_mm/saa/nomadik-saa.c ++++ linux-2.6.20/drivers/media/nomadik_mm/saa/nomadik-saa.c +@@ -1290,16 +1290,18 @@ static int link_msp (struct instance_des + + } else { /*Configure Output sink for audiocodec*/ @@ -17,15 +24,18 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/saa/nomadik-saa.c ../new/linu down(&saa_desc->open_lock); if(saa_desc->msp_out_flag != 0){ printk ("SAA_DRV ERROR : MSP OUT already used \n"); -diff -Nauprw linux-2.6.20/sound/arm/nomadik_alsa.c ../new/linux-2.6.20/sound/arm/nomadik_alsa.c ---- linux-2.6.20/sound/arm/nomadik_alsa.c 2008-11-24 14:06:29.000000000 +0530 -+++ ../new/linux-2.6.20/sound/arm/nomadik_alsa.c 2008-11-26 18:36:26.000000000 +0530 -@@ -568,10 +568,14 @@ static int snd_nomadik_alsa_pcm_open(snd + up(&saa_desc->open_lock); + return -EBUSY; +--- linux-2.6.20.orig/sound/arm/nomadik_alsa.c ++++ linux-2.6.20/sound/arm/nomadik_alsa.c +@@ -566,14 +566,18 @@ static int snd_nomadik_alsa_pcm_open(snd + /* Set the hardware configuration */ + stream_id = substream->pstr->stream; if (stream_id == SNDRV_PCM_STREAM_PLAYBACK) { runtime->hw = snd_nomadik_playback_hw; /* configure the output sink for the acodec */ + #if 0 -+ if(codec_conf.codec_output != chip->output_device){ ++ if(codec_conf.codec_output != chip->output_device){ if ((error = nomadik_acodec_select_output(chip->output_device, USER_ALSA))) { printk("ALSA: ERROR: select output failed\n"); return error; @@ -35,10 +45,13 @@ diff -Nauprw linux-2.6.20/sound/arm/nomadik_alsa.c ../new/linux-2.6.20/sound/arm } else { runtime->hw = snd_nomadik_capture_hw; /* configure the input source for the acodec */ -diff -Nauprw linux-2.6.20/sound/nomadik_stw5095.c ../new/linux-2.6.20/sound/nomadik_stw5095.c ---- linux-2.6.20/sound/nomadik_stw5095.c 2008-11-24 14:06:29.000000000 +0530 -+++ ../new/linux-2.6.20/sound/nomadik_stw5095.c 2008-11-26 18:36:04.000000000 +0530 -@@ -3237,6 +3237,7 @@ t_codec_error nomadik_acodec_setuser(t_a + if ((error = nomadik_acodec_select_input(chip->input_device, USER_ALSA))) { + printk("ALSA: ERROR: select input failed\n"); +--- linux-2.6.20.orig/sound/nomadik_stw5095.c ++++ linux-2.6.20/sound/nomadik_stw5095.c +@@ -3235,19 +3235,32 @@ t_codec_error nomadik_acodec_setuser(t_a + * Unset the current user for acodec. + */ t_codec_error nomadik_acodec_unsetuser(t_acodec_user user) { @@ -46,11 +59,13 @@ diff -Nauprw linux-2.6.20/sound/nomadik_stw5095.c ../new/linux-2.6.20/sound/noma t_codec_error codec_error = CODEC_OK; if(g_codec_system_context.cur_user != user){ -@@ -3246,6 +3247,18 @@ t_codec_error nomadik_acodec_unsetuser(t + printk + ("ERROR : Trying to free audiocodec already in use by other user %d\n", g_codec_system_context.cur_user); + return CODEC_ERROR; } else { g_codec_system_context.cur_user = NO_USER; -+ ++ + err = STMPE2401_Install_Callback(STMPE0, EGPIO_PIN_7 ,NULL,(void*)user); + if (err != STMPE2401_OK) + { @@ -65,7 +80,11 @@ diff -Nauprw linux-2.6.20/sound/nomadik_stw5095.c ../new/linux-2.6.20/sound/noma nomadik_acodec_powerdown(0); } -@@ -3282,6 +3295,10 @@ static void codec_callback1(void *user) + return (codec_error); + } +@@ -3280,10 +3293,14 @@ static void codec_callback1(void *user) + { + int err,codec_error; uint8 byte_value; t_acodec_user t; t = (t_acodec_user) user; @@ -76,3 +95,5 @@ diff -Nauprw linux-2.6.20/sound/nomadik_stw5095.c ../new/linux-2.6.20/sound/noma err = STMPE2401_GetGpioVal(STMPE0,EGPIO_PIN_7,&byte_value); switch(byte_value) { + case 0: + err = STMPE2401_SetGpioAltFunction(STMPE0,EGPIO_PIN_12,STMPE2401_PRIMARY_FUNCTION); diff --git a/recipes/linux/linux-2.6.20/nhk15/hrw-make-create-kconfig-executable.patch b/recipes/linux/linux-2.6.20/nhk15/hrw-make-create-kconfig-executable.patch index 7a2ccae78e..8cb13ba2f0 100644 --- a/recipes/linux/linux-2.6.20/nhk15/hrw-make-create-kconfig-executable.patch +++ b/recipes/linux/linux-2.6.20/nhk15/hrw-make-create-kconfig-executable.patch @@ -12,6 +12,6 @@ @echo "Generating $(TOPDIR)/arch/arm/mach-nomadik/Kconfig" + @chmod 755 ./create_kconfig.pl @./create_kconfig.pl $(TOPDIR)/arch/arm/mach-nomadik - endif + endif # end of Auto board configuration/dependency resolution diff --git a/recipes/linux/linux-2.6.20/nhk15/linux-2.6.20_01_dec_2.patch b/recipes/linux/linux-2.6.20/nhk15/linux-2.6.20_01_dec_2.patch index 4876337dfd..62be30a268 100644 --- a/recipes/linux/linux-2.6.20/nhk15/linux-2.6.20_01_dec_2.patch +++ b/recipes/linux/linux-2.6.20/nhk15/linux-2.6.20_01_dec_2.patch @@ -1,7 +1,13 @@ -diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new/linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ---- linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c 2008-11-24 14:06:26.000000000 +0530 -+++ ../new/linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c 2008-12-01 17:31:42.589136000 +0530 -@@ -38,6 +38,7 @@ +--- + drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c | 2910 +++++++++++++++++++++--- + drivers/media/video/v4l2-nomadik.c | 2 + 2 files changed, 2644 insertions(+), 268 deletions(-) + +--- linux-2.6.20.orig/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ++++ linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c +@@ -36,10 +36,11 @@ + #include <linux/delay.h> + #include "nomadik_sva_vpip.h" #define VPIP_DEFAULT_LOG_LEVEL 4 @@ -9,7 +15,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new int vpip_debug = VPIP_DEFAULT_LOG_LEVEL; module_param(vpip_debug, int, 0644); -@@ -790,20 +791,29 @@ return ret_val; + MODULE_PARM_DESC(vpip_debug,"Debug level for VPIP messages"); + +@@ -788,79 +789,106 @@ IRP_ASSERT(irp_write_packet(srv_open, + return ret_val; + }EXPORT_SYMBOL(write_pages_exposure); @@ -41,7 +51,9 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ModeManagerStatus_bThisLoLevelState , 0x0100, 0x0000 }, { ModeManagerStatus_bNextLoLevelState , 0x0102, 0x0000 }, { ModeManagerStatus_bHiLevelState , 0x0104, 0x0000 }, -@@ -813,52 +823,70 @@ struct nomadik_vpip_param vpip_default_p + { ModeManagerStatus_bCycles , 0x0106, 0x0000 }, + { ModeManagerStatus_fModeStaticSetupsChanged , 0x0108, 0x0000 }, + { ModeManagerStatus_bTestCoin , 0x010a, 0x0000 }, { ModeManagerStatus_fCycleForTest , 0x010c, 0x0000 }, { ModeManagerStatus_bNumberOfFramesStreamed , 0x010e, 0x0000 }, { ModeManagerStatus_bPrevFrameCountForExposure , 0x0110, 0x0000 }, @@ -138,7 +150,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { PipeSetupBankB_uwPipeOutputSize_X_LSByte , 0x0402, 0x0000 }, { PipeSetupBankB_uwPipeOutputSize_X_MSByte , 0x0401, 0x0000 }, { PipeSetupBankB_uwPipeOutputSize_Y_LSByte , 0x0406, 0x0000 }, -@@ -871,22 +899,37 @@ struct nomadik_vpip_param vpip_default_p + { PipeSetupBankB_uwPipeOutputSize_Y_MSByte , 0x0405, 0x0000 }, + { PipeSetupBankB_bPipeOutputFormat , 0x0408, 0x0000 }, +@@ -869,26 +897,41 @@ struct nomadik_vpip_param vpip_default_p + { PipeSetupBankB_fEnableItuEmbeddedCodes , 0x040e, 0x0000 }, + { PipeSetupBankB_bPixValidLineTypes , 0x0410, 0x0000 }, { PipeSetupBankB_fGenerateVSync , 0x0412, 0x0000 }, { PipeSetupBankB_fCb_Cr_Flip , 0x0414, 0x0000 }, { PipeSetupBankB_fY_CbCr_Flip , 0x0416, 0x0000 }, @@ -177,7 +193,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { LocalPipe0SetupBank_uwPipeOutputSize_X_LSByte , 0x0682, 0x0000 }, { LocalPipe0SetupBank_uwPipeOutputSize_X_MSByte , 0x0681, 0x0000 }, { LocalPipe0SetupBank_uwPipeOutputSize_Y_LSByte , 0x0686, 0x0000 }, -@@ -899,13 +942,19 @@ struct nomadik_vpip_param vpip_default_p + { LocalPipe0SetupBank_uwPipeOutputSize_Y_MSByte , 0x0685, 0x0000 }, + { LocalPipe0SetupBank_bPipeOutputFormat , 0x0688, 0x0000 }, +@@ -897,83 +940,119 @@ struct nomadik_vpip_param vpip_default_p + { LocalPipe0SetupBank_fEnableItuEmbeddedCodes , 0x068e, 0x0000 }, + { LocalPipe0SetupBank_bPixValidLineTypes , 0x0690, 0x0000 }, { LocalPipe0SetupBank_fGenerateVSync , 0x0692, 0x0000 }, { LocalPipe0SetupBank_fCb_Cr_Flip , 0x0694, 0x0000 }, { LocalPipe0SetupBank_fY_CbCr_Flip , 0x0696, 0x0000 }, @@ -197,7 +217,9 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { Pipe0Control_fOverrideOFCropRegisters , 0x070e, 0x0000 }, { Pipe0Control_uwHCropRising_LSByte , 0x0712, 0x0000 }, { Pipe0Control_uwHCropRising_MSByte , 0x0711, 0x0000 }, -@@ -915,27 +964,45 @@ struct nomadik_vpip_param vpip_default_p + { Pipe0Control_uwHCropFalling_LSByte , 0x0716, 0x0000 }, + { Pipe0Control_uwHCropFalling_MSByte , 0x0715, 0x0000 }, + { Pipe0Control_uwVCropRisingCrse_LSByte , 0x071a, 0x0000 }, { Pipe0Control_uwVCropRisingCrse_MSByte , 0x0719, 0x0000 }, { Pipe0Control_uwVCropFallingCrse_LSByte , 0x071e, 0x0000 }, { Pipe0Control_uwVCropFallingCrse_MSByte , 0x071d, 0x0000 }, @@ -246,7 +268,7 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { MasterI2cStatus_bResourceStatus , 0x0a00, 0x0000 }, { MasterI2cStatus_uwI2CClkDiv_LSByte , 0x0a04, 0x0000 }, { MasterI2cStatus_uwI2CClkDiv_MSByte , 0x0a03, 0x0000 }, -@@ -943,24 +1010,36 @@ struct nomadik_vpip_param vpip_default_p + { MasterI2cStatus_fTransactionError , 0x0a06, 0x0000 }, { MasterI2cStatus_bNumberOfTransactionFailures , 0x0a08, 0x0000 }, { MasterI2cStatus_bNumberOfConsecutiveGrabFailures , 0x0a0a, 0x0000 }, { MasterI2cStatus_bNumberOfForcedReleases , 0x0a0c, 0x0000 }, @@ -286,7 +308,10 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { VideoTimingSensorConstraints_uwMinimumPrePllClockDiv_LSByte , 0x0c02, 0x0000 }, { VideoTimingSensorConstraints_uwMinimumPrePllClockDiv_MSByte , 0x0c01, 0x0000 }, { VideoTimingSensorConstraints_uwMaximumPrePllClockDiv_LSByte , 0x0c06, 0x0000 }, -@@ -971,7 +1050,7 @@ struct nomadik_vpip_param vpip_default_p + { VideoTimingSensorConstraints_uwMaximumPrePllClockDiv_MSByte , 0x0c05, 0x0000 }, + { VideoTimingSensorConstraints_fpMinimumPllInputFrequency_Mhz_LSByte , 0x0c0a, 0x0000 }, + { VideoTimingSensorConstraints_fpMinimumPllInputFrequency_Mhz_MSByte , 0x0c09, 0x0000 }, + { VideoTimingSensorConstraints_uwMinimumPllMultiplier_LSByte , 0x0c0e, 0x0000 }, { VideoTimingSensorConstraints_uwMinimumPllMultiplier_MSByte , 0x0c0d, 0x0000 }, { VideoTimingSensorConstraints_uwMaximumPllMultiplier_LSByte , 0x0c12, 0x0000 }, { VideoTimingSensorConstraints_uwMaximumPllMultiplier_MSByte , 0x0c11, 0x0000 }, @@ -295,7 +320,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { VideoTimingSensorConstraints_fpMaximumPllOutputFrequency_Mhz_MSByte , 0x0c15, 0x0000 }, { VideoTimingSensorConstraints_uwMinimumVTSysClockDiv_LSByte , 0x0c1a, 0x0000 }, { VideoTimingSensorConstraints_uwMinimumVTSysClockDiv_MSByte , 0x0c19, 0x0000 }, -@@ -993,6 +1072,9 @@ struct nomadik_vpip_param vpip_default_p + { VideoTimingSensorConstraints_uwMaximumVTSysClockDiv_LSByte , 0x0c1e, 0x0000 }, + { VideoTimingSensorConstraints_uwMaximumVTSysClockDiv_MSByte , 0x0c1d, 0x0000 }, +@@ -991,17 +1070,23 @@ struct nomadik_vpip_param vpip_default_p + { VideoTimingSensorConstraints_uwMaximumOPSysClockDiv_MSByte , 0x0c35, 0x0000 }, + { VideoTimingSensorConstraints_fpMaximumOPSystemClockFrequency_Mhz_LSByte , 0x0c3a, 0x0000 }, { VideoTimingSensorConstraints_fpMaximumOPSystemClockFrequency_Mhz_MSByte , 0x0c39, 0x0000 }, { VideoTimingSensorConstraints_fpMaximumOPPixelClockFrequency_Mhz_LSByte , 0x0c3e, 0x0000 }, { VideoTimingSensorConstraints_fpMaximumOPPixelClockFrequency_Mhz_MSByte , 0x0c3d, 0x0000 }, @@ -305,7 +334,7 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { SensorScalingSubSamplingCapabilities_bSensorScalingMode , 0x0c80, 0x0000 }, { SensorScalingSubSamplingCapabilities_uwScalerMMin_LSByte , 0x0c84, 0x0000 }, { SensorScalingSubSamplingCapabilities_uwScalerMMin_MSByte , 0x0c83, 0x0000 }, -@@ -1000,6 +1082,9 @@ struct nomadik_vpip_param vpip_default_p + { SensorScalingSubSamplingCapabilities_uwScalerMMax_LSByte , 0x0c88, 0x0000 }, { SensorScalingSubSamplingCapabilities_uwScalerMMax_MSByte , 0x0c87, 0x0000 }, { SensorScalingSubSamplingCapabilities_uwMaxOddInc_LSByte , 0x0c8c, 0x0000 }, { SensorScalingSubSamplingCapabilities_uwMaxOddInc_MSByte , 0x0c8b, 0x0000 }, @@ -315,7 +344,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { VideoTimingOutput_uwPrePllClockDiv_LSByte , 0x0d02, 0x0000 }, { VideoTimingOutput_uwPrePllClockDiv_MSByte , 0x0d01, 0x0000 }, { VideoTimingOutput_fpPllInputFrequency_Mhz_LSByte , 0x0d06, 0x0000 }, -@@ -1028,7 +1113,13 @@ struct nomadik_vpip_param vpip_default_p + { VideoTimingOutput_fpPllInputFrequency_Mhz_MSByte , 0x0d05, 0x0000 }, + { VideoTimingOutput_uwPllMultiplier_LSByte , 0x0d0a, 0x0000 }, +@@ -1026,24 +1111,36 @@ struct nomadik_vpip_param vpip_default_p + { VideoTimingOutput_uwOPPixelClockDiv_MSByte , 0x0d2d, 0x0000 }, + { VideoTimingOutput_fpOPPixelClockFrequency_Mhz_LSByte , 0x0d32, 0x0000 }, { VideoTimingOutput_fpOPPixelClockFrequency_Mhz_MSByte , 0x0d31, 0x0000 }, { VideoTimingOutput_fpOutputTimingClockDerating_LSByte , 0x0d36, 0x0000 }, { VideoTimingOutput_fpOutputTimingClockDerating_MSByte , 0x0d35, 0x0000 }, @@ -329,7 +362,8 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { VideoTimingInputsFarSensor_VideoTimingMode , 0x0e00, 0x0001 }, { VideoTimingInputsFarSensor_bSensorBitsPerSystemClock , 0x0e02, 0x0002 }, { VideoTimingInputsFarSensor_uwCsiRawFormat_LSByte , 0x0e06, 0x0000 }, -@@ -1037,11 +1128,17 @@ struct nomadik_vpip_param vpip_default_p + { VideoTimingInputsFarSensor_uwCsiRawFormat_MSByte , 0x0e05, 0x0808 }, + { VideoTimingInputsFarSensor_fpHostRxMaxDataRate_Mbps_LSByte , 0x0e0a, 0x0000 }, { VideoTimingInputsFarSensor_fpHostRxMaxDataRate_Mbps_MSByte , 0x0e09, 0x508a }, { VideoTimingInputsFarSensor_VsyncPolarity , 0x0e0c, 0x0000 }, { VideoTimingInputsFarSensor_HsyncPolarity , 0x0e0e, 0x0000 }, @@ -347,7 +381,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { VideoTimingFarSensorConstraints_uwMinimumPrePllClockDiv_LSByte , 0x0f02, 0x0000 }, { VideoTimingFarSensorConstraints_uwMinimumPrePllClockDiv_MSByte , 0x0f01, 0x0000 }, { VideoTimingFarSensorConstraints_uwMaximumPrePllClockDiv_LSByte , 0x0f06, 0x0000 }, -@@ -1074,6 +1171,9 @@ struct nomadik_vpip_param vpip_default_p + { VideoTimingFarSensorConstraints_uwMaximumPrePllClockDiv_MSByte , 0x0f05, 0x0000 }, + { VideoTimingFarSensorConstraints_fpMinimumPllInputFrequency_Mhz_LSByte , 0x0f0a, 0x0000 }, +@@ -1072,17 +1169,23 @@ struct nomadik_vpip_param vpip_default_p + { VideoTimingFarSensorConstraints_uwMaximumOPSysClockDiv_MSByte , 0x0f35, 0x0000 }, + { VideoTimingFarSensorConstraints_fpMaximumOPSystemClockFrequency_Mhz_LSByte , 0x0f3a, 0x0000 }, { VideoTimingFarSensorConstraints_fpMaximumOPSystemClockFrequency_Mhz_MSByte , 0x0f39, 0x0000 }, { VideoTimingFarSensorConstraints_fpMaximumOPPixelClockFrequency_Mhz_LSByte , 0x0f3e, 0x0000 }, { VideoTimingFarSensorConstraints_fpMaximumOPPixelClockFrequency_Mhz_MSByte , 0x0f3d, 0x0000 }, @@ -357,7 +395,7 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { SensorFarScalingSubSamplingCapabilities_bSensorScalingMode , 0x0f80, 0x0000 }, { SensorFarScalingSubSamplingCapabilities_uwScalerMMin_LSByte , 0x0f84, 0x0000 }, { SensorFarScalingSubSamplingCapabilities_uwScalerMMin_MSByte , 0x0f83, 0x0000 }, -@@ -1081,6 +1181,9 @@ struct nomadik_vpip_param vpip_default_p + { SensorFarScalingSubSamplingCapabilities_uwScalerMMax_LSByte , 0x0f88, 0x0000 }, { SensorFarScalingSubSamplingCapabilities_uwScalerMMax_MSByte , 0x0f87, 0x0000 }, { SensorFarScalingSubSamplingCapabilities_uwMaxOddInc_LSByte , 0x0f8c, 0x0000 }, { SensorFarScalingSubSamplingCapabilities_uwMaxOddInc_MSByte , 0x0f8b, 0x0000 }, @@ -367,7 +405,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { VideoTimingFarOutput_uwPrePllClockDiv_LSByte , 0x1002, 0x0000 }, { VideoTimingFarOutput_uwPrePllClockDiv_MSByte , 0x1001, 0x0000 }, { VideoTimingFarOutput_fpPllInputFrequency_Mhz_LSByte , 0x1006, 0x0000 }, -@@ -1109,7 +1212,13 @@ struct nomadik_vpip_param vpip_default_p + { VideoTimingFarOutput_fpPllInputFrequency_Mhz_MSByte , 0x1005, 0x0000 }, + { VideoTimingFarOutput_uwPllMultiplier_LSByte , 0x100a, 0x0000 }, +@@ -1107,24 +1210,36 @@ struct nomadik_vpip_param vpip_default_p + { VideoTimingFarOutput_uwOPPixelClockDiv_MSByte , 0x102d, 0x0000 }, + { VideoTimingFarOutput_fpOPPixelClockFrequency_Mhz_LSByte , 0x1032, 0x0000 }, { VideoTimingFarOutput_fpOPPixelClockFrequency_Mhz_MSByte , 0x1031, 0x0000 }, { VideoTimingFarOutput_fpOutputTimingClockDerating_LSByte , 0x1036, 0x0000 }, { VideoTimingFarOutput_fpOutputTimingClockDerating_MSByte , 0x1035, 0x0000 }, @@ -381,7 +423,8 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { VideoTimingInputsNearSensor_VideoTimingMode , 0x1100, 0x0001 }, { VideoTimingInputsNearSensor_bSensorBitsPerSystemClock , 0x1102, 0x0002 }, { VideoTimingInputsNearSensor_uwCsiRawFormat_LSByte , 0x1106, 0x0000 }, -@@ -1118,11 +1227,17 @@ struct nomadik_vpip_param vpip_default_p + { VideoTimingInputsNearSensor_uwCsiRawFormat_MSByte , 0x1105, 0x0808 }, + { VideoTimingInputsNearSensor_fpHostRxMaxDataRate_Mbps_LSByte , 0x110a, 0x0000 }, { VideoTimingInputsNearSensor_fpHostRxMaxDataRate_Mbps_MSByte , 0x1109, 0x508a }, { VideoTimingInputsNearSensor_VsyncPolarity , 0x110c, 0x0000 }, { VideoTimingInputsNearSensor_HsyncPolarity , 0x110e, 0x0000 }, @@ -399,7 +442,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { VideoTimingNearSensorConstraints_uwMinimumPrePllClockDiv_LSByte , 0x1202, 0x0000 }, { VideoTimingNearSensorConstraints_uwMinimumPrePllClockDiv_MSByte , 0x1201, 0x0000 }, { VideoTimingNearSensorConstraints_uwMaximumPrePllClockDiv_LSByte , 0x1206, 0x0000 }, -@@ -1155,6 +1270,9 @@ struct nomadik_vpip_param vpip_default_p + { VideoTimingNearSensorConstraints_uwMaximumPrePllClockDiv_MSByte , 0x1205, 0x0000 }, + { VideoTimingNearSensorConstraints_fpMinimumPllInputFrequency_Mhz_LSByte , 0x120a, 0x0000 }, +@@ -1153,17 +1268,23 @@ struct nomadik_vpip_param vpip_default_p + { VideoTimingNearSensorConstraints_uwMaximumOPSysClockDiv_MSByte , 0x1235, 0x0000 }, + { VideoTimingNearSensorConstraints_fpMaximumOPSystemClockFrequency_Mhz_LSByte , 0x123a, 0x0000 }, { VideoTimingNearSensorConstraints_fpMaximumOPSystemClockFrequency_Mhz_MSByte , 0x1239, 0x0000 }, { VideoTimingNearSensorConstraints_fpMaximumOPPixelClockFrequency_Mhz_LSByte , 0x123e, 0x0000 }, { VideoTimingNearSensorConstraints_fpMaximumOPPixelClockFrequency_Mhz_MSByte , 0x123d, 0x0000 }, @@ -409,7 +456,7 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { SensorNearScalingSubSamplingCapabilities_bSensorScalingMode , 0x1280, 0x0000 }, { SensorNearScalingSubSamplingCapabilities_uwScalerMMin_LSByte , 0x1284, 0x0000 }, { SensorNearScalingSubSamplingCapabilities_uwScalerMMin_MSByte , 0x1283, 0x0000 }, -@@ -1162,6 +1280,9 @@ struct nomadik_vpip_param vpip_default_p + { SensorNearScalingSubSamplingCapabilities_uwScalerMMax_LSByte , 0x1288, 0x0000 }, { SensorNearScalingSubSamplingCapabilities_uwScalerMMax_MSByte , 0x1287, 0x0000 }, { SensorNearScalingSubSamplingCapabilities_uwMaxOddInc_LSByte , 0x128c, 0x0000 }, { SensorNearScalingSubSamplingCapabilities_uwMaxOddInc_MSByte , 0x128b, 0x0000 }, @@ -419,7 +466,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { VideoTimingNearOutput_uwPrePllClockDiv_LSByte , 0x1302, 0x0000 }, { VideoTimingNearOutput_uwPrePllClockDiv_MSByte , 0x1301, 0x0000 }, { VideoTimingNearOutput_fpPllInputFrequency_Mhz_LSByte , 0x1306, 0x0000 }, -@@ -1190,35 +1311,47 @@ struct nomadik_vpip_param vpip_default_p + { VideoTimingNearOutput_fpPllInputFrequency_Mhz_MSByte , 0x1305, 0x0000 }, + { VideoTimingNearOutput_uwPllMultiplier_LSByte , 0x130a, 0x0000 }, +@@ -1188,39 +1309,51 @@ struct nomadik_vpip_param vpip_default_p + { VideoTimingNearOutput_uwOPPixelClockDiv_MSByte , 0x132d, 0x0000 }, + { VideoTimingNearOutput_fpOPPixelClockFrequency_Mhz_LSByte , 0x1332, 0x0000 }, { VideoTimingNearOutput_fpOPPixelClockFrequency_Mhz_MSByte , 0x1331, 0x0000 }, { VideoTimingNearOutput_fpOutputTimingClockDerating_LSByte , 0x1336, 0x0000 }, { VideoTimingNearOutput_fpOutputTimingClockDerating_MSByte , 0x1335, 0x0000 }, @@ -476,7 +527,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { SensorCapabilitiesFarSensor_uwSensorIntegrationTimeCapability_LSByte , 0x1502, 0x0000 }, { SensorCapabilitiesFarSensor_uwSensorIntegrationTimeCapability_MSByte , 0x1501, 0x0000 }, { SensorCapabilitiesFarSensor_uwSensorMinimumCoarseIntegrationLines_LSByte , 0x1506, 0x0000 }, -@@ -1230,8 +1363,10 @@ struct nomadik_vpip_param vpip_default_p + { SensorCapabilitiesFarSensor_uwSensorMinimumCoarseIntegrationLines_MSByte , 0x1505, 0x0000 }, + { SensorCapabilitiesFarSensor_uwSensorCoarseIntegrationTimeMaxMargin_LSByte , 0x150a, 0x0000 }, +@@ -1228,12 +1361,14 @@ struct nomadik_vpip_param vpip_default_p + { SensorCapabilitiesFarSensor_uwSensorMinimumFineIntegrationPixels_LSByte , 0x150e, 0x0000 }, + { SensorCapabilitiesFarSensor_uwSensorMinimumFineIntegrationPixels_MSByte , 0x150d, 0x0000 }, { SensorCapabilitiesFarSensor_uwSensorFineIntegrationTimeMaxMargin_LSByte , 0x1512, 0x0000 }, { SensorCapabilitiesFarSensor_uwSensorFineIntegrationTimeMaxMargin_MSByte , 0x1511, 0x0000 }, { SensorCapabilitiesFarSensor_uwSensorAnalogGainMinimum_LSByte , 0x1516, 0x0000 }, @@ -487,7 +542,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { SensorCapabilitiesFarSensor_uwSensorAnalogGainMaximum_MSByte , 0x1519, 0x0080 }, { SensorCapabilitiesFarSensor_uwSensorAnalogGainCodeStep_LSByte , 0x151e, 0x0000 }, { SensorCapabilitiesFarSensor_uwSensorAnalogGainCodeStep_MSByte , 0x151d, 0x0000 }, -@@ -1265,7 +1400,11 @@ struct nomadik_vpip_param vpip_default_p + { SensorCapabilitiesFarSensor_uwSensorAnalogGainType_LSByte , 0x1522, 0x0000 }, + { SensorCapabilitiesFarSensor_uwSensorAnalogGainType_MSByte , 0x1521, 0x0000 }, +@@ -1263,11 +1398,15 @@ struct nomadik_vpip_param vpip_default_p + { SensorCapabilitiesFarSensor_uwSensorDigitalGainCapability_LSByte , 0x1554, 0x0000 }, + { SensorCapabilitiesFarSensor_uwSensorDigitalGainCapability_MSByte , 0x1553, 0x0000 }, { SensorCapabilitiesFarSensor_uwSensorDigitalGainMinimum_LSByte , 0x1558, 0x0000 }, { SensorCapabilitiesFarSensor_uwSensorDigitalGainMinimum_MSByte , 0x1557, 0x0000 }, { SensorCapabilitiesFarSensor_uwSensorDataPedestal_LSByte , 0x155c, 0x0000 }, @@ -499,7 +558,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { SensorCapabilitiesNearSensor_uwSensorIntegrationTimeCapability_LSByte , 0x1582, 0x0000 }, { SensorCapabilitiesNearSensor_uwSensorIntegrationTimeCapability_MSByte , 0x1581, 0x0000 }, { SensorCapabilitiesNearSensor_uwSensorMinimumCoarseIntegrationLines_LSByte , 0x1586, 0x0000 }, -@@ -1278,8 +1417,8 @@ struct nomadik_vpip_param vpip_default_p + { SensorCapabilitiesNearSensor_uwSensorMinimumCoarseIntegrationLines_MSByte , 0x1585, 0x0000 }, + { SensorCapabilitiesNearSensor_uwSensorCoarseIntegrationTimeMaxMargin_LSByte , 0x158a, 0x0000 }, +@@ -1276,12 +1415,12 @@ struct nomadik_vpip_param vpip_default_p + { SensorCapabilitiesNearSensor_uwSensorMinimumFineIntegrationPixels_MSByte , 0x158d, 0x0000 }, + { SensorCapabilitiesNearSensor_uwSensorFineIntegrationTimeMaxMargin_LSByte , 0x1592, 0x0000 }, { SensorCapabilitiesNearSensor_uwSensorFineIntegrationTimeMaxMargin_MSByte , 0x1591, 0x0000 }, { SensorCapabilitiesNearSensor_uwSensorAnalogGainMinimum_LSByte , 0x1596, 0x0000 }, { SensorCapabilitiesNearSensor_uwSensorAnalogGainMinimum_MSByte , 0x1595, 0x0000 }, @@ -510,7 +573,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { SensorCapabilitiesNearSensor_uwSensorAnalogGainCodeStep_LSByte , 0x159e, 0x0000 }, { SensorCapabilitiesNearSensor_uwSensorAnalogGainCodeStep_MSByte , 0x159d, 0x0000 }, { SensorCapabilitiesNearSensor_uwSensorAnalogGainType_LSByte , 0x15a2, 0x0000 }, -@@ -1313,6 +1452,9 @@ struct nomadik_vpip_param vpip_default_p + { SensorCapabilitiesNearSensor_uwSensorAnalogGainType_MSByte , 0x15a1, 0x0000 }, + { SensorCapabilitiesNearSensor_fpSensorAnalogGainConstM0_LSByte , 0x15a6, 0x0000 }, +@@ -1311,10 +1450,13 @@ struct nomadik_vpip_param vpip_default_p + { SensorCapabilitiesNearSensor_uwSensorDigitalGainCapability_MSByte , 0x15d3, 0x0000 }, + { SensorCapabilitiesNearSensor_uwSensorDigitalGainMinimum_LSByte , 0x15d8, 0x0000 }, { SensorCapabilitiesNearSensor_uwSensorDigitalGainMinimum_MSByte , 0x15d7, 0x0000 }, { SensorCapabilitiesNearSensor_uwSensorDataPedestal_LSByte , 0x15dc, 0x0000 }, { SensorCapabilitiesNearSensor_uwSensorDataPedestal_MSByte , 0x15db, 0x0000 }, @@ -520,7 +587,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { SensorCapabilitiesCurrentSensor_uwSensorIntegrationTimeCapability_LSByte , 0x1602, 0x0000 }, { SensorCapabilitiesCurrentSensor_uwSensorIntegrationTimeCapability_MSByte , 0x1601, 0x0000 }, { SensorCapabilitiesCurrentSensor_uwSensorMinimumCoarseIntegrationLines_LSByte , 0x1606, 0x0000 }, -@@ -1324,8 +1466,10 @@ struct nomadik_vpip_param vpip_default_p + { SensorCapabilitiesCurrentSensor_uwSensorMinimumCoarseIntegrationLines_MSByte , 0x1605, 0x0000 }, + { SensorCapabilitiesCurrentSensor_uwSensorCoarseIntegrationTimeMaxMargin_LSByte , 0x160a, 0x0000 }, +@@ -1322,12 +1464,14 @@ struct nomadik_vpip_param vpip_default_p + { SensorCapabilitiesCurrentSensor_uwSensorMinimumFineIntegrationPixels_LSByte , 0x160e, 0x0000 }, + { SensorCapabilitiesCurrentSensor_uwSensorMinimumFineIntegrationPixels_MSByte , 0x160d, 0x0000 }, { SensorCapabilitiesCurrentSensor_uwSensorFineIntegrationTimeMaxMargin_LSByte , 0x1612, 0x0000 }, { SensorCapabilitiesCurrentSensor_uwSensorFineIntegrationTimeMaxMargin_MSByte , 0x1611, 0x0000 }, { SensorCapabilitiesCurrentSensor_uwSensorAnalogGainMinimum_LSByte , 0x1616, 0x0000 }, @@ -531,7 +602,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { SensorCapabilitiesCurrentSensor_uwSensorAnalogGainMaximum_MSByte , 0x1619, 0x0080 }, { SensorCapabilitiesCurrentSensor_uwSensorAnalogGainCodeStep_LSByte , 0x161e, 0x0000 }, { SensorCapabilitiesCurrentSensor_uwSensorAnalogGainCodeStep_MSByte , 0x161d, 0x0000 }, -@@ -1360,6 +1504,9 @@ struct nomadik_vpip_param vpip_default_p + { SensorCapabilitiesCurrentSensor_uwSensorAnalogGainType_LSByte , 0x1622, 0x0000 }, + { SensorCapabilitiesCurrentSensor_uwSensorAnalogGainType_MSByte , 0x1621, 0x0000 }, +@@ -1358,10 +1502,13 @@ struct nomadik_vpip_param vpip_default_p + { SensorCapabilitiesCurrentSensor_uwSensorDigitalGainCapability_MSByte , 0x1653, 0x0000 }, + { SensorCapabilitiesCurrentSensor_uwSensorDigitalGainMinimum_LSByte , 0x1658, 0x0000 }, { SensorCapabilitiesCurrentSensor_uwSensorDigitalGainMinimum_MSByte , 0x1657, 0x0000 }, { SensorCapabilitiesCurrentSensor_uwSensorDataPedestal_LSByte , 0x165c, 0x0000 }, { SensorCapabilitiesCurrentSensor_uwSensorDataPedestal_MSByte , 0x165b, 0x0000 }, @@ -541,7 +616,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { SensorFrameConstraintsFar_uwVTXAddrMin_LSByte , 0x1682, 0x0000 }, { SensorFrameConstraintsFar_uwVTXAddrMin_MSByte , 0x1681, 0x0000 }, { SensorFrameConstraintsFar_uwVTYAddrMin_LSByte , 0x1686, 0x0000 }, -@@ -1388,6 +1535,9 @@ struct nomadik_vpip_param vpip_default_p + { SensorFrameConstraintsFar_uwVTYAddrMin_MSByte , 0x1685, 0x0000 }, + { SensorFrameConstraintsFar_uwVTXAddrMax_LSByte , 0x168a, 0x0000 }, +@@ -1386,10 +1533,13 @@ struct nomadik_vpip_param vpip_default_p + { SensorFrameConstraintsFar_uwMaxVTLineLengthPck_MSByte , 0x16ad, 0x0000 }, + { SensorFrameConstraintsFar_uwMinVTLineBlankingPck_LSByte , 0x16b2, 0x0000 }, { SensorFrameConstraintsFar_uwMinVTLineBlankingPck_MSByte , 0x16b1, 0x0000 }, { SensorFrameConstraintsFar_uwMinVTFrameBlanking_LSByte , 0x16b6, 0x0000 }, { SensorFrameConstraintsFar_uwMinVTFrameBlanking_MSByte , 0x16b5, 0x0000 }, @@ -551,7 +630,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { SensorFrameConstraintsNear_uwVTXAddrMin_LSByte , 0x1702, 0x0000 }, { SensorFrameConstraintsNear_uwVTXAddrMin_MSByte , 0x1701, 0x0000 }, { SensorFrameConstraintsNear_uwVTYAddrMin_LSByte , 0x1706, 0x0000 }, -@@ -1416,8 +1566,14 @@ struct nomadik_vpip_param vpip_default_p + { SensorFrameConstraintsNear_uwVTYAddrMin_MSByte , 0x1705, 0x0000 }, + { SensorFrameConstraintsNear_uwVTXAddrMax_LSByte , 0x170a, 0x0000 }, +@@ -1414,12 +1564,18 @@ struct nomadik_vpip_param vpip_default_p + { SensorFrameConstraintsNear_uwMaxVTLineLengthPck_MSByte , 0x172d, 0x0000 }, + { SensorFrameConstraintsNear_uwMinVTLineBlankingPck_LSByte , 0x1732, 0x0000 }, { SensorFrameConstraintsNear_uwMinVTLineBlankingPck_MSByte , 0x1731, 0x0000 }, { SensorFrameConstraintsNear_uwMinVTFrameBlanking_LSByte , 0x1736, 0x0000 }, { SensorFrameConstraintsNear_uwMinVTFrameBlanking_MSByte , 0x1735, 0x0000 }, @@ -568,7 +651,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { CurrentFrameDimension_uwVTFrameLengthLines_LSByte , 0x1802, 0x0000 }, { CurrentFrameDimension_uwVTFrameLengthLines_MSByte , 0x1801, 0x0000 }, { CurrentFrameDimension_uwVTLineLengthPck_LSByte , 0x1806, 0x0000 }, -@@ -1449,6 +1605,9 @@ struct nomadik_vpip_param vpip_default_p + { CurrentFrameDimension_uwVTLineLengthPck_MSByte , 0x1805, 0x0000 }, + { CurrentFrameDimension_uwVTXAddrStart_LSByte , 0x180a, 0x0000 }, +@@ -1447,10 +1603,13 @@ struct nomadik_vpip_param vpip_default_p + { CurrentFrameDimension_bScalingMode , 0x1834, 0x0000 }, + { CurrentFrameDimension_fpScaleFactor_LSByte , 0x1838, 0x0000 }, { CurrentFrameDimension_fpScaleFactor_MSByte , 0x1837, 0x0000 }, { CurrentFrameDimension_uwScalerM_LSByte , 0x183c, 0x0000 }, { CurrentFrameDimension_uwScalerM_MSByte , 0x183b, 0x0000 }, @@ -578,7 +665,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { SensorFrameConstraints_uwVTXAddrMin_LSByte , 0x1882, 0x0000 }, { SensorFrameConstraints_uwVTXAddrMin_MSByte , 0x1881, 0x0000 }, { SensorFrameConstraints_uwVTYAddrMin_LSByte , 0x1886, 0x0000 }, -@@ -1477,12 +1636,18 @@ struct nomadik_vpip_param vpip_default_p + { SensorFrameConstraints_uwVTYAddrMin_MSByte , 0x1885, 0x0000 }, + { SensorFrameConstraints_uwVTXAddrMax_LSByte , 0x188a, 0x0000 }, +@@ -1475,16 +1634,22 @@ struct nomadik_vpip_param vpip_default_p + { SensorFrameConstraints_uwMaxVTLineLengthPck_MSByte , 0x18ad, 0x0000 }, + { SensorFrameConstraints_uwMinVTLineBlankingPck_LSByte , 0x18b2, 0x0000 }, { SensorFrameConstraints_uwMinVTLineBlankingPck_MSByte , 0x18b1, 0x0000 }, { SensorFrameConstraints_uwMinVTFrameBlanking_LSByte , 0x18b6, 0x0000 }, { SensorFrameConstraints_uwMinVTFrameBlanking_MSByte , 0x18b5, 0x0000 }, @@ -597,7 +688,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { FrameDimensionStatus_fFrameLengthChangePending , 0x1980, 0x0000 }, { FrameDimensionStatus_fFrameDimensionChangePending , 0x1982, 0x0000 }, { FrameDimensionStatus_uwVTFrameLengthPending_lines_LSByte , 0x1986, 0x0000 }, -@@ -1505,49 +1670,93 @@ struct nomadik_vpip_param vpip_default_p + { FrameDimensionStatus_uwVTFrameLengthPending_lines_MSByte , 0x1985, 0x0000 }, + { FrameDimensionStatus_fFrameLengthChangeInhibitedForCoarseExposure , 0x1988, 0x0000 }, +@@ -1503,53 +1668,97 @@ struct nomadik_vpip_param vpip_default_p + { FrameDimensionStatus_uwMaximumSensorFOVY_LSByte , 0x19a4, 0x0000 }, + { FrameDimensionStatus_uwMaximumSensorFOVY_MSByte , 0x19a3, 0x0000 }, { FrameDimensionStatus_uwOPXOutputSize_LSByte , 0x19a8, 0x0000 }, { FrameDimensionStatus_uwOPXOutputSize_MSByte , 0x19a7, 0x0000 }, { FrameDimensionStatus_fSensorPreScaleFactorChanged , 0x19aa, 0x0000 }, @@ -706,7 +801,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { FlashManagerStatus_fFlashSequencePending , 0x1d00, 0x0000 }, { FlashManagerStatus_cNumberFramesRequiredForPreFlashes , 0x1d02, 0x0000 }, { FlashManagerStatus_fpMainFlashPulseWidth_us_LSByte , 0x1d06, 0x0000 }, -@@ -1571,24 +1780,29 @@ struct nomadik_vpip_param vpip_default_p + { FlashManagerStatus_fpMainFlashPulseWidth_us_MSByte , 0x1d05, 0x0000 }, + { FlashManagerStatus_fpPreFlashPulseWidth_us_LSByte , 0x1d0a, 0x0000 }, +@@ -1569,46 +1778,61 @@ struct nomadik_vpip_param vpip_default_p + { FlashManagerStatus_wStartPreFlashPixel_LSByte , 0x1d26, 0x0000 }, + { FlashManagerStatus_wStartPreFlashPixel_MSByte , 0x1d25, 0x0000 }, { FlashManagerStatus_cNumberFramesRequired , 0x1d28, 0x0000 }, { FlashManagerStatus_fPreFlashPending , 0x1d2a, 0x0000 }, { FlashManagerStatus_fMainFlashPending , 0x1d2c, 0x0000 }, @@ -740,7 +839,10 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ExposureControls_uwFlashGunModeCoarseIntegration_lines_LSByte , 0x1da6, 0x0000 }, { ExposureControls_uwFlashGunModeCoarseIntegration_lines_MSByte , 0x1da5, 0x0000 }, { ExposureControls_uwFlashGunModeFineIntegration_pixels_LSByte , 0x1daa, 0x0000 }, -@@ -1599,14 +1813,24 @@ struct nomadik_vpip_param vpip_default_p + { ExposureControls_uwFlashGunModeFineIntegration_pixels_MSByte , 0x1da9, 0x0000 }, + { ExposureControls_uwFlashGunModeCodedAnalogGain_LSByte , 0x1dae, 0x0000 }, + { ExposureControls_uwFlashGunModeCodedAnalogGain_MSByte , 0x1dad, 0x0000 }, + { ExposureControls_fpFlashGunModeDigitalGain_LSByte , 0x1db2, 0x0000 }, { ExposureControls_fpFlashGunModeDigitalGain_MSByte , 0x1db1, 0x0000 }, { ExposureControls_fFreezeAutoExposure , 0x1db4, 0x0000 }, { ExposureControls_fpUserMaximumIntegrationTime_us_LSByte , 0x1db8, 0x0000 }, @@ -767,7 +869,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ExposureStatus_fWhiteBalanceGainIncludedInCurrentExposure , 0x1e04, 0x0000 }, { ExposureStatus_fBadExposureForIterativeWhiteBalance , 0x1e06, 0x0000 }, { ExposureStatus_uwCoarseIntegrationPending_lines_LSByte , 0x1e0a, 0x0000 }, -@@ -1630,6 +1854,9 @@ struct nomadik_vpip_param vpip_default_p + { ExposureStatus_uwCoarseIntegrationPending_lines_MSByte , 0x1e09, 0x0000 }, + { ExposureStatus_uwFineIntegrationPending_pixels_LSByte , 0x1e0e, 0x0000 }, +@@ -1628,31 +1852,46 @@ struct nomadik_vpip_param vpip_default_p + { ExposureStatus_fpTotalIntegrationTimePending_us_MSByte , 0x1e27, 0x0000 }, + { ExposureStatus_uwCodedAnalogGainPending_LSByte , 0x1e2c, 0x0000 }, { ExposureStatus_uwCodedAnalogGainPending_MSByte , 0x1e2b, 0x0000 }, { ExposureStatus_fExposureIsStableforAutoFocus , 0x1e2e, 0x0000 }, { ExposureStatus_bRuntimeExposureTarget , 0x1e30, 0x0000 }, @@ -777,7 +883,8 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ExposureParametersApplied_uwCoarseIntegration_lines_LSByte , 0x1e82, 0x0000 }, { ExposureParametersApplied_uwCoarseIntegration_lines_MSByte , 0x1e81, 0x0000 }, { ExposureParametersApplied_uwFineIntegration_pixels_LSByte , 0x1e86, 0x0000 }, -@@ -1638,8 +1865,14 @@ struct nomadik_vpip_param vpip_default_p + { ExposureParametersApplied_uwFineIntegration_pixels_MSByte , 0x1e85, 0x0000 }, + { ExposureParametersApplied_uwCodedAnalogGain_LSByte , 0x1e8a, 0x0000 }, { ExposureParametersApplied_uwCodedAnalogGain_MSByte , 0x1e89, 0x0000 }, { ExposureParametersApplied_fpDigitalGain_LSByte , 0x1e8e, 0x0000 }, { ExposureParametersApplied_fpDigitalGain_MSByte , 0x1e8d, 0x0000 }, @@ -792,7 +899,7 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ExposureCycleTest_fpInitialDesiredExposureTime_LSByte , 0x1f82, 0x0000 }, { ExposureCycleTest_fpInitialDesiredExposureTime_MSByte , 0x1f81, 0x0000 }, { ExposureCycleTest_fpFinalDesiredExposureTime_LSByte , 0x1f86, 0x0000 }, -@@ -1647,10 +1880,16 @@ struct nomadik_vpip_param vpip_default_p + { ExposureCycleTest_fpFinalDesiredExposureTime_MSByte , 0x1f85, 0x0000 }, { ExposureCycleTest_fpExposureStep_LSByte , 0x1f8a, 0x0000 }, { ExposureCycleTest_fpExposureStep_MSByte , 0x1f89, 0x0000 }, { ExposureCycleTest_bStepDirection , 0x1f8c, 0x0000 }, @@ -809,7 +916,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ExposureAlgorithmControls_fpMaximumStep_LSByte , 0x2082, 0x0000 }, { ExposureAlgorithmControls_fpMaximumStep_MSByte , 0x2081, 0x0000 }, { ExposureAlgorithmControls_fpMinimumStep_LSByte , 0x2086, 0x0000 }, -@@ -1664,9 +1903,14 @@ struct nomadik_vpip_param vpip_default_p + { ExposureAlgorithmControls_fpMinimumStep_MSByte , 0x2085, 0x0000 }, + { ExposureAlgorithmControls_fpMinimumDesiredExposureTime_us_LSByte , 0x208a, 0x0000 }, +@@ -1662,13 +1901,18 @@ struct nomadik_vpip_param vpip_default_p + { ExposureAlgorithmControls_fpMaximumNegativeStepThreshold_LSByte , 0x2092, 0x0000 }, + { ExposureAlgorithmControls_fpMaximumNegativeStepThreshold_MSByte , 0x2091, 0x0000 }, { ExposureAlgorithmControls_fpRelativeOnTargetStabilityThreshold_LSByte , 0x2096, 0x0000 }, { ExposureAlgorithmControls_fpRelativeOnTargetStabilityThreshold_MSByte , 0x2095, 0x0000 }, { ExposureAlgorithmControls_fpDigitalGainFloor_LSByte , 0x209a, 0x0000 }, @@ -824,7 +935,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ExposureAlgorithmControl |