diff options
Diffstat (limited to 'recipes/linux/linux-2.6.20/nhk15/linux-2.6.20_01_dec_2.patch')
| -rw-r--r-- | recipes/linux/linux-2.6.20/nhk15/linux-2.6.20_01_dec_2.patch | 1203 |
1 files changed, 961 insertions, 242 deletions
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 { ExposureAlgorithmControls_fpRelativeIntTimeHysThreshold_LSByte , 0x20a2, 0x0000 }, { ExposureAlgorithmControls_fpRelativeIntTimeHysThreshold_MSByte , 0x20a1, 0x0000 }, { ExposureAlgorithmControls_fpRelativeDigitalGainHysThreshold_LSByte , 0x20a6, 0x0000 }, -@@ -1682,34 +1926,61 @@ struct nomadik_vpip_param vpip_default_p + { ExposureAlgorithmControls_fpRelativeDigitalGainHysThreshold_MSByte , 0x20a5, 0x0000 }, + { ExposureAlgorithmControls_fpRelativeCompilationProblemThreshold_LSByte , 0x20aa, 0x0000 }, +@@ -1680,53 +1924,103 @@ struct nomadik_vpip_param vpip_default_p + { ExposureAlgorithmControls_fpMaximumManualExposureTime_s_LSByte , 0x20b6, 0x0000 }, + { ExposureAlgorithmControls_fpMaximumManualExposureTime_s_MSByte , 0x20b5, 0x0000 }, { ExposureAlgorithmControls_fpRelativeStabilityThresholdForAutoFocus_LSByte , 0x20ba, 0x0000 }, { ExposureAlgorithmControls_fpRelativeStabilityThresholdForAutoFocus_MSByte , 0x20b9, 0x0000 }, { ExposureAlgorithmControls_bLeakShift , 0x20bc, 0x0000 }, @@ -891,7 +1006,8 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { WhiteBalanceStatus_bStatus , 0x2380, 0x0000 }, { WhiteBalanceStatus_fUnityGainsUsed , 0x2382, 0x0000 }, { WhiteBalanceStatus_fpRedGain_LSByte , 0x2386, 0x0000 }, -@@ -1718,13 +1989,36 @@ struct nomadik_vpip_param vpip_default_p + { WhiteBalanceStatus_fpRedGain_MSByte , 0x2385, 0x0000 }, + { WhiteBalanceStatus_fpGreenGain_LSByte , 0x238a, 0x0000 }, { WhiteBalanceStatus_fpGreenGain_MSByte , 0x2389, 0x0000 }, { WhiteBalanceStatus_fpBlueGain_LSByte , 0x238e, 0x0000 }, { WhiteBalanceStatus_fpBlueGain_MSByte , 0x238d, 0x0000 }, @@ -928,7 +1044,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { MinWeightedWBControls_fDisable , 0x2500, 0x0000 }, { MinWeightedWBControls_uwSaturationThreshold_LSByte , 0x2504, 0x0000 }, { MinWeightedWBControls_uwSaturationThreshold_MSByte , 0x2503, 0x0300 }, -@@ -1737,6 +2031,9 @@ struct nomadik_vpip_param vpip_default_p + { MinWeightedWBControls_fpRedTiltGain_LSByte , 0x2508, 0x0000 }, + { MinWeightedWBControls_fpRedTiltGain_MSByte , 0x2507, 0x3e00 }, +@@ -1735,38 +2029,56 @@ struct nomadik_vpip_param vpip_default_p + { MinWeightedWBControls_fpGreen2TiltGain_LSByte , 0x2510, 0x0000 }, + { MinWeightedWBControls_fpGreen2TiltGain_MSByte , 0x250f, 0x3e40 }, { MinWeightedWBControls_fpBlueTiltGain_LSByte , 0x2514, 0x0000 }, { MinWeightedWBControls_fpBlueTiltGain_MSByte , 0x2513, 0x3e40 }, { MinWeightedWBControls_GreenChannelToAccumulate , 0x2516, 0x0000 }, @@ -938,7 +1058,10 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { MinWeightedWBStatus_uwZone_X_Offset_LSByte , 0x2582, 0x0000 }, { MinWeightedWBStatus_uwZone_X_Offset_MSByte , 0x2581, 0x0000 }, { MinWeightedWBStatus_uwZone_Y_Offset_LSByte , 0x2586, 0x0000 }, -@@ -1747,24 +2044,39 @@ struct nomadik_vpip_param vpip_default_p + { MinWeightedWBStatus_uwZone_Y_Offset_MSByte , 0x2585, 0x0000 }, + { MinWeightedWBStatus_uwZone_X_Size_LSByte , 0x258a, 0x0000 }, + { MinWeightedWBStatus_uwZone_X_Size_MSByte , 0x2589, 0x0000 }, + { MinWeightedWBStatus_uwZone_Y_Size_LSByte , 0x258e, 0x0000 }, { MinWeightedWBStatus_uwZone_Y_Size_MSByte , 0x258d, 0x0000 }, { MinWeightedWBStatus_fpNumberMacroPixel_LSByte , 0x2592, 0x0000 }, { MinWeightedWBStatus_fpNumberMacroPixel_MSByte , 0x2591, 0x0000 }, @@ -988,7 +1111,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AutomaticFrameRateStatus_fpImpliedGain_LSByte , 0x2782, 0x0000 }, { AutomaticFrameRateStatus_fpImpliedGain_MSByte , 0x2781, 0x0000 }, { AutomaticFrameRateStatus_uwMaximumFrameLength_lines_LSByte , 0x2786, 0x0000 }, -@@ -1781,9 +2093,20 @@ struct nomadik_vpip_param vpip_default_p + { AutomaticFrameRateStatus_uwMaximumFrameLength_lines_MSByte , 0x2785, 0x0000 }, + { AutomaticFrameRateStatus_uwMinimumFrameLength_lines_LSByte , 0x278a, 0x0000 }, +@@ -1779,32 +2091,99 @@ struct nomadik_vpip_param vpip_default_p + { AutomaticFrameRateStatus_uwCurrentFrameLength_lines_MSByte , 0x2795, 0x0000 }, + { AutomaticFrameRateStatus_uwDesiredFrameLength_lines_LSByte , 0x279a, 0x0000 }, { AutomaticFrameRateStatus_uwDesiredFrameLength_lines_MSByte , 0x2799, 0x0000 }, { AutomaticFrameRateStatus_fAutomaticFrameRateStable , 0x279c, 0x0000 }, { AutomaticFrameRateStatus_fAutomaticFrameRateClip , 0x279e, 0x0000 }, @@ -1009,7 +1136,10 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { StaticFrameRateStatus_uwRequestedFrameRate_Hz_LSByte , 0x2882, 0x0000 }, { StaticFrameRateStatus_uwRequestedFrameRate_Hz_MSByte , 0x2881, 0x0000 }, { StaticFrameRateStatus_uwMaxFrameRate_Hz_LSByte , 0x2886, 0x0000 }, -@@ -1794,15 +2117,71 @@ struct nomadik_vpip_param vpip_default_p + { StaticFrameRateStatus_uwMaxFrameRate_Hz_MSByte , 0x2885, 0x0000 }, + { StaticFrameRateStatus_uwMinFrameRate_Hz_LSByte , 0x288a, 0x0000 }, + { StaticFrameRateStatus_uwMinFrameRate_Hz_MSByte , 0x2889, 0x0000 }, + { StaticFrameRateStatus_fChangePending , 0x288c, 0x0000 }, { StaticFrameRateStatus_uwRequiredFrameLength_lines_LSByte , 0x2890, 0x0000 }, { StaticFrameRateStatus_uwRequiredFrameLength_lines_MSByte , 0x288f, 0x0000 }, { StaticFrameRateStatus_ClipFrameRate , 0x2892, 0x0000 }, @@ -1081,7 +1211,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ColourEngine0_ColourMatrixFarSensor_fpRInR_LSByte , 0x2b02, 0x0000 }, { ColourEngine0_ColourMatrixFarSensor_fpRInR_MSByte , 0x2b01, 0x3fd3 }, { ColourEngine0_ColourMatrixFarSensor_fpGInR_LSByte , 0x2b06, 0x0000 }, -@@ -1821,6 +2200,8 @@ struct nomadik_vpip_param vpip_default_p + { ColourEngine0_ColourMatrixFarSensor_fpGInR_MSByte , 0x2b05, 0xbce0 }, + { ColourEngine0_ColourMatrixFarSensor_fpBInR_LSByte , 0x2b0a, 0x0000 }, +@@ -1819,10 +2198,12 @@ struct nomadik_vpip_param vpip_default_p + { ColourEngine0_ColourMatrixFarSensor_fpRInB_MSByte , 0x2b19, 0xb717 }, + { ColourEngine0_ColourMatrixFarSensor_fpGInB_LSByte , 0x2b1e, 0x0000 }, { ColourEngine0_ColourMatrixFarSensor_fpGInB_MSByte , 0x2b1d, 0xbd29 }, { ColourEngine0_ColourMatrixFarSensor_fpBInB_LSByte , 0x2b22, 0x0000 }, { ColourEngine0_ColourMatrixFarSensor_fpBInB_MSByte , 0x2b21, 0x3fc6 }, @@ -1090,7 +1224,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ColourEngine0_ColourMatrixNearSensor_fpRInR_LSByte , 0x2b82, 0x0002 }, { ColourEngine0_ColourMatrixNearSensor_fpRInR_MSByte , 0x2b81, 0x6400 }, { ColourEngine0_ColourMatrixNearSensor_fpGInR_LSByte , 0x2b86, 0x0002 }, -@@ -1839,6 +2220,9 @@ struct nomadik_vpip_param vpip_default_p + { ColourEngine0_ColourMatrixNearSensor_fpGInR_MSByte , 0x2b85, 0x6400 }, + { ColourEngine0_ColourMatrixNearSensor_fpBInR_LSByte , 0x2b8a, 0x0002 }, +@@ -1837,10 +2218,13 @@ struct nomadik_vpip_param vpip_default_p + { ColourEngine0_ColourMatrixNearSensor_fpRInB_MSByte , 0x2b99, 0xe900 }, + { ColourEngine0_ColourMatrixNearSensor_fpGInB_LSByte , 0x2b9e, 0x0000 }, { ColourEngine0_ColourMatrixNearSensor_fpGInB_MSByte , 0x2b9d, 0xe900 }, { ColourEngine0_ColourMatrixNearSensor_fpBInB_LSByte , 0x2ba2, 0x0000 }, { ColourEngine0_ColourMatrixNearSensor_fpBInB_MSByte , 0x2ba1, 0xe900 }, @@ -1100,7 +1238,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ColourEngine0_ColourMatrixDamped_wRInR_LSByte , 0x2c02, 0x0000 }, { ColourEngine0_ColourMatrixDamped_wRInR_MSByte , 0x2c01, 0x0000 }, { ColourEngine0_ColourMatrixDamped_wGInR_LSByte , 0x2c06, 0x0000 }, -@@ -1857,6 +2241,18 @@ struct nomadik_vpip_param vpip_default_p + { ColourEngine0_ColourMatrixDamped_wGInR_MSByte , 0x2c05, 0x0000 }, + { ColourEngine0_ColourMatrixDamped_wBInR_LSByte , 0x2c0a, 0x0000 }, +@@ -1855,17 +2239,53 @@ struct nomadik_vpip_param vpip_default_p + { ColourEngine0_ColourMatrixDamped_wRInB_MSByte , 0x2c19, 0x0000 }, + { ColourEngine0_ColourMatrixDamped_wGInB_LSByte , 0x2c1e, 0x0000 }, { ColourEngine0_ColourMatrixDamped_wGInB_MSByte , 0x2c1d, 0x0000 }, { ColourEngine0_ColourMatrixDamped_wBInB_LSByte , 0x2c22, 0x0000 }, { ColourEngine0_ColourMatrixDamped_wBInB_MSByte , 0x2c21, 0x0000 }, @@ -1119,7 +1261,7 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ColourEngine0_ColourMatrixDamperControl_fDisableMatrixDamping , 0x2c80, 0x0000 }, { ColourEngine0_ColourMatrixDamperControl_DamperLowThreshold_LSByte , 0x2c84, 0x0000 }, { ColourEngine0_ColourMatrixDamperControl_DamperLowThreshold_MSByte , 0x2c83, 0x62ac }, -@@ -1864,6 +2260,30 @@ struct nomadik_vpip_param vpip_default_p + { ColourEngine0_ColourMatrixDamperControl_DamperHighThreshold_LSByte , 0x2c88, 0x0000 }, { ColourEngine0_ColourMatrixDamperControl_DamperHighThreshold_MSByte , 0x2c87, 0x64ac }, { ColourEngine0_ColourMatrixDamperControl_MinimumDamperOutput_LSByte , 0x2c8c, 0x0000 }, { ColourEngine0_ColourMatrixDamperControl_MinimumDamperOutput_MSByte , 0x2c8b, 0x0000 }, @@ -1150,7 +1292,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ColourEngine0_ApertureCorrectionControls_fDisableCorrection , 0x2d00, 0x0000 }, { ColourEngine0_ApertureCorrectionControls_bMaxGain , 0x2d02, 0x0010 }, { ColourEngine0_ApertureCorrectionControls_fDisableGainDamping , 0x2d04, 0x0000 }, -@@ -1882,9 +2302,25 @@ struct nomadik_vpip_param vpip_default_p + { ColourEngine0_ApertureCorrectionControls_DamperLowThreshold_Gain_LSByte , 0x2d08, 0x0000 }, + { ColourEngine0_ApertureCorrectionControls_DamperLowThreshold_Gain_MSByte , 0x2d07, 0x5871 }, +@@ -1880,21 +2300,53 @@ struct nomadik_vpip_param vpip_default_p + { ColourEngine0_ApertureCorrectionControls_DamperLowThreshold_Coring_MSByte , 0x2d19, 0x5871 }, + { ColourEngine0_ApertureCorrectionControls_DamperHighThreshold_Coring_LSByte , 0x2d1e, 0x0000 }, { ColourEngine0_ApertureCorrectionControls_DamperHighThreshold_Coring_MSByte , 0x2d1d, 0x63d1 }, { ColourEngine0_ApertureCorrectionControls_MinimumDamperOutput_Coring_LSByte , 0x2d22, 0x0000 }, { ColourEngine0_ApertureCorrectionControls_MinimumDamperOutput_Coring_MSByte , 0x2d21, 0x3a00 }, @@ -1176,7 +1322,8 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ColourEngine0_GammaCorrection_fEnabled , 0x2e00, 0x0001 }, { ColourEngine0_GammaCorrection_bMode , 0x2e02, 0x0001 }, { ColourEngine0_GammaCorrection_SharpRed , 0x2e04, 0x0013 }, -@@ -1893,6 +2329,22 @@ struct nomadik_vpip_param vpip_default_p + { ColourEngine0_GammaCorrection_SharpGreen , 0x2e06, 0x0013 }, + { ColourEngine0_GammaCorrection_SharpBlue , 0x2e08, 0x0013 }, { ColourEngine0_GammaCorrection_SoftRed , 0x2e0a, 0x0013 }, { ColourEngine0_GammaCorrection_SoftGreen , 0x2e0c, 0x0013 }, { ColourEngine0_GammaCorrection_SoftBlue , 0x2e0e, 0x0013 }, @@ -1199,7 +1346,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { NoraControls_fDisable , 0x2e80, 0x0001 }, { NoraControls_fDisableNoraPromoting , 0x2e82, 0x0000 }, { NoraControls_bMaximumValue , 0x2e84, 0x0001 }, -@@ -1905,7 +2357,33 @@ struct nomadik_vpip_param vpip_default_p + { NoraControls_fDifferentTextureDegreeForBlue , 0x2e86, 0x0000 }, + { NoraControls_fSplitNoiseLevel , 0x2e88, 0x0000 }, +@@ -1903,11 +2355,37 @@ struct nomadik_vpip_param vpip_default_p + { NoraControls_DamperLowThreshold_MSByte , 0x2e8d, 0x4000 }, + { NoraControls_DamperHighThreshold_LSByte , 0x2e92, 0x0000 }, { NoraControls_DamperHighThreshold_MSByte , 0x2e91, 0x4500 }, { NoraControls_MinimumDamperOutput_LSByte , 0x2e96, 0x0000 }, { NoraControls_MinimumDamperOutput_MSByte , 0x2e95, 0x0000 }, @@ -1233,7 +1384,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ScytheFilterControls_fDisableFilter , 0x2f80, 0x0000 }, { ScytheFilterControls_fSquareLaw , 0x2f82, 0x0000 }, { ScytheFilterControls_fDisablePromotingLow , 0x2f84, 0x0000 }, -@@ -1924,6 +2402,29 @@ struct nomadik_vpip_param vpip_default_p + { ScytheFilterControls_fDisablePromotingHigh , 0x2f86, 0x0000 }, + { ScytheFilterControls_bMaxWeightLow , 0x2f88, 0x0010 }, +@@ -1922,10 +2400,33 @@ struct nomadik_vpip_param vpip_default_p + { ScytheFilterControls_fpDamperHighThresholdHigh_MSByte , 0x2f99, 0x68dc }, + { ScytheFilterControls_fpMinimumDamperOutputLow_LSByte , 0x2f9e, 0x0000 }, { ScytheFilterControls_fpMinimumDamperOutputLow_MSByte , 0x2f9d, 0x3a00 }, { ScytheFilterControls_fpMinimumDamperOutputHigh_LSByte , 0x2fa2, 0x0000 }, { ScytheFilterControls_fpMinimumDamperOutputHigh_MSByte , 0x2fa1, 0x3a00 }, @@ -1263,7 +1418,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { JackFilterControls_fDisableFilter , 0x3000, 0x0000 }, { JackFilterControls_fSquareLaw , 0x3002, 0x0000 }, { JackFilterControls_fDisablePromotingLow , 0x3004, 0x0000 }, -@@ -1942,10 +2443,25 @@ struct nomadik_vpip_param vpip_default_p + { JackFilterControls_fDisablePromotingHigh , 0x3006, 0x0000 }, + { JackFilterControls_bMaxWeightLow , 0x3008, 0x0010 }, +@@ -1940,103 +2441,208 @@ struct nomadik_vpip_param vpip_default_p + { JackFilterControls_fpDamperHighThresholdHigh_MSByte , 0x3019, 0x68dc }, + { JackFilterControls_fpMinimumDamperOutputLow_LSByte , 0x301e, 0x0000 }, { JackFilterControls_fpMinimumDamperOutputLow_MSByte , 0x301d, 0x0000 }, { JackFilterControls_fpMinimumDamperOutputHigh_LSByte , 0x3022, 0x0000 }, { JackFilterControls_fpMinimumDamperOutputHigh_MSByte , 0x3021, 0x0000 }, @@ -1289,7 +1448,8 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { VfpnControls_fEnableCorrection , 0x3100, 0x0000 }, { VfpnControls_uwMaximumPixelValue_LSByte , 0x3104, 0x0000 }, { VfpnControls_uwMaximumPixelValue_MSByte , 0x3103, 0x03ff }, -@@ -1954,15 +2470,61 @@ struct nomadik_vpip_param vpip_default_p + { VfpnControls_uwMinimumPixelValue_LSByte , 0x3108, 0x0000 }, + { VfpnControls_uwMinimumPixelValue_MSByte , 0x3107, 0x0000 }, { VfpnControls_uwPixelSaturationLevel_LSByte , 0x310c, 0x0000 }, { VfpnControls_uwPixelSaturationLevel_MSByte , 0x310b, 0x03ff }, { VfpnControls_bLogThreshLog , 0x310e, 0x0004 }, @@ -1354,7 +1514,9 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AntiVignetteControls_bFilterCoeff_R2_b , 0x3208, 0x0000 }, { AntiVignetteControls_bFilterCoeff_R4_r , 0x320a, 0x0000 }, { AntiVignetteControls_bFilterCoeff_R4_gr , 0x320c, 0x0000 }, -@@ -1972,8 +2534,8 @@ struct nomadik_vpip_param vpip_default_p + { AntiVignetteControls_bFilterCoeff_R4_gb , 0x320e, 0x0000 }, + { AntiVignetteControls_bFilterCoeff_R4_b , 0x3210, 0x0000 }, + { AntiVignetteControls_uwHorizontalOffset_LSByte , 0x3214, 0x0000 }, { AntiVignetteControls_uwHorizontalOffset_MSByte , 0x3213, 0x0000 }, { AntiVignetteControls_uwVerticalOffset_LSByte , 0x3218, 0x0000 }, { AntiVignetteControls_uwVerticalOffset_MSByte , 0x3217, 0x0000 }, @@ -1365,7 +1527,9 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AntiVignetteControls_uwHorizontalOffset_r_LSByte , 0x3220, 0x0000 }, { AntiVignetteControls_uwHorizontalOffset_r_MSByte , 0x321f, 0x0000 }, { AntiVignetteControls_uwHorizontalOffset_gr_LSByte , 0x3224, 0x0000 }, -@@ -1983,18 +2545,22 @@ struct nomadik_vpip_param vpip_default_p + { AntiVignetteControls_uwHorizontalOffset_gr_MSByte , 0x3223, 0x0000 }, + { AntiVignetteControls_uwHorizontalOffset_gb_LSByte , 0x3228, 0x0000 }, + { AntiVignetteControls_uwHorizontalOffset_gb_MSByte , 0x3227, 0x0000 }, { AntiVignetteControls_uwHorizontalOffset_b_LSByte , 0x322c, 0x0000 }, { AntiVignetteControls_uwHorizontalOffset_b_MSByte , 0x322b, 0x0000 }, { AntiVignetteControls_uwVerticalOffset_r_LSByte , 0x3230, 0x0000 }, @@ -1394,7 +1558,8 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AntiVignetteStatus_fXScaleEnabled , 0x3280, 0x0000 }, { AntiVignetteStatus_bXScale , 0x3282, 0x0000 }, { AntiVignetteStatus_fYScaleEnabled , 0x3284, 0x0000 }, -@@ -2003,13 +2569,35 @@ struct nomadik_vpip_param vpip_default_p + { AntiVignetteStatus_bYScale , 0x3286, 0x0000 }, + { AntiVignetteStatus_uwHorizontalSize_LSByte , 0x328a, 0x0000 }, { AntiVignetteStatus_uwHorizontalSize_MSByte , 0x3289, 0x0000 }, { AntiVignetteStatus_uwVerticalSize_LSByte , 0x328e, 0x0000 }, { AntiVignetteStatus_uwVerticalSize_MSByte , 0x328d, 0x0000 }, @@ -1431,7 +1596,8 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ColourEngine0_RadialApertureCorrectionApplicationInputs_uwHOffset_LSByte , 0x3402, 0x0000 }, { ColourEngine0_RadialApertureCorrectionApplicationInputs_uwHOffset_MSByte , 0x3401, 0x0000 }, { ColourEngine0_RadialApertureCorrectionApplicationInputs_uwVOffset_LSByte , 0x3406, 0x0000 }, -@@ -2018,9 +2606,21 @@ struct nomadik_vpip_param vpip_default_p + { ColourEngine0_RadialApertureCorrectionApplicationInputs_uwVOffset_MSByte , 0x3405, 0x0000 }, + { ColourEngine0_RadialApertureCorrectionApplicationInputs_uwHScalingFactor_LSByte , 0x340a, 0x0000 }, { ColourEngine0_RadialApertureCorrectionApplicationInputs_uwHScalingFactor_MSByte , 0x3409, 0x0000 }, { ColourEngine0_RadialApertureCorrectionApplicationInputs_uwVScalingFactor_LSByte , 0x340e, 0x0000 }, { ColourEngine0_RadialApertureCorrectionApplicationInputs_uwVScalingFactor_MSByte , 0x340d, 0x0000 }, @@ -1453,7 +1619,8 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ColourEngine0_CoderOutputSignalRange_uwLumaExcursion_LSByte , 0x3502, 0x0000 }, { ColourEngine0_CoderOutputSignalRange_uwLumaExcursion_MSByte , 0x3501, 0x0000 }, { ColourEngine0_CoderOutputSignalRange_uwLumaMidpointTimes2_LSByte , 0x3506, 0x0000 }, -@@ -2029,12 +2629,18 @@ struct nomadik_vpip_param vpip_default_p + { ColourEngine0_CoderOutputSignalRange_uwLumaMidpointTimes2_MSByte , 0x3505, 0x0000 }, + { ColourEngine0_CoderOutputSignalRange_uwChromaExcursion_LSByte , 0x350a, 0x0000 }, { ColourEngine0_CoderOutputSignalRange_uwChromaExcursion_MSByte , 0x3509, 0x0000 }, { ColourEngine0_CoderOutputSignalRange_uwChromaMidpointTimes2_LSByte , 0x350e, 0x0000 }, { ColourEngine0_CoderOutputSignalRange_uwChromaMidpointTimes2_MSByte , 0x350d, 0x0000 }, @@ -1472,7 +1639,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ColourEngine0_OutputCoderMatrix_w0_0_LSByte , 0x3602, 0x0000 }, { ColourEngine0_OutputCoderMatrix_w0_0_MSByte , 0x3601, 0x0000 }, { ColourEngine0_OutputCoderMatrix_w0_1_LSByte , 0x3606, 0x0000 }, -@@ -2053,6 +2659,20 @@ struct nomadik_vpip_param vpip_default_p + { ColourEngine0_OutputCoderMatrix_w0_1_MSByte , 0x3605, 0x0000 }, + { ColourEngine0_OutputCoderMatrix_w0_2_LSByte , 0x360a, 0x0000 }, +@@ -2051,37 +2657,91 @@ struct nomadik_vpip_param vpip_default_p + { ColourEngine0_OutputCoderMatrix_w2_0_MSByte , 0x3619, 0x0000 }, + { ColourEngine0_OutputCoderMatrix_w2_1_LSByte , 0x361e, 0x0000 }, { ColourEngine0_OutputCoderMatrix_w2_1_MSByte , 0x361d, 0x0000 }, { ColourEngine0_OutputCoderMatrix_w2_2_LSByte , 0x3622, 0x0000 }, { ColourEngine0_OutputCoderMatrix_w2_2_MSByte , 0x3621, 0x0000 }, @@ -1493,7 +1664,9 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ColourEngine0_FadeToBlack_fDisable , 0x3680, 0x0001 }, { ColourEngine0_FadeToBlack_fpBlackValue_LSByte , 0x3684, 0x0000 }, { ColourEngine0_FadeToBlack_fpBlackValue_MSByte , 0x3683, 0x0000 }, -@@ -2062,10 +2682,48 @@ struct nomadik_vpip_param vpip_default_p + { ColourEngine0_FadeToBlack_fpDamperLowThreshold_LSByte , 0x3688, 0x0000 }, + { ColourEngine0_FadeToBlack_fpDamperLowThreshold_MSByte , 0x3687, 0x63d1 }, + { ColourEngine0_FadeToBlack_fpDamperHighThreshold_LSByte , 0x368c, 0x0000 }, { ColourEngine0_FadeToBlack_fpDamperHighThreshold_MSByte , 0x368b, 0x656f }, { ColourEngine0_FadeToBlack_fpDamperOutput_LSByte , 0x3690, 0x0000 }, { ColourEngine0_FadeToBlack_fpDamperOutput_MSByte , 0x368f, 0x0000 }, @@ -1542,7 +1715,8 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ZoomMgrParams_fAntiZip , 0x3780, 0x0000 }, { ZoomMgrParams_bFilterCrispness0 , 0x3782, 0x0000 }, { ZoomMgrParams_bFilterCrispness1 , 0x3784, 0x0000 }, -@@ -2074,12 +2732,14 @@ struct nomadik_vpip_param vpip_default_p + { ZoomMgrParams_fInFromOutARLock , 0x3786, 0x0000 }, + { ZoomMgrParams_bPrescaleFactor , 0x3788, 0x0000 }, { ZoomMgrParams_bPrescaleType , 0x378a, 0x0000 }, { ZoomMgrParams_fp16ZoomRange_LSByte , 0x378e, 0x0000 }, { ZoomMgrParams_fp16ZoomRange_MSByte , 0x378d, 0x100 }, @@ -1558,7 +1732,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ZoomMgrCtrl_bChgOverMarginShift , 0x380c, 0x0000 }, { ZoomMgrCtrl_fCheckDataRate , 0x380e, 0x0000 }, { ZoomMgrCtrl_fSetAlternateInitWOI , 0x3810, 0x0000 }, -@@ -2091,6 +2751,9 @@ struct nomadik_vpip_param vpip_default_p + { ZoomMgrCtrl_fSetX_Byte0 , 0x3812, 0x0000 }, + { ZoomMgrCtrl_fSetX_Byte1 , 0x3814, 0x0000 }, +@@ -2089,10 +2749,13 @@ struct nomadik_vpip_param vpip_default_p + { ZoomMgrCtrl_fSetX_Byte3 , 0x3818, 0x0000 }, + { ZoomMgrCtrl_fp16P0ScaleLowLimit_LSByte , 0x381c, 0x0000 }, { ZoomMgrCtrl_fp16P0ScaleLowLimit_MSByte , 0x381b, 0x0000 }, { ZoomMgrCtrl_fp16P1ScaleLowLimit_LSByte , 0x3820, 0x0000 }, { ZoomMgrCtrl_fp16P1ScaleLowLimit_MSByte , 0x381f, 0x0000 }, @@ -1568,7 +1746,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ZoomMgrStatus_fReady , 0x3880, 0x0000 }, { ZoomMgrStatus_bDeviceTestCoin , 0x3882, 0x0000 }, { ZoomMgrStatus_bNextCmd , 0x3884, 0x0000 }, -@@ -2124,6 +2787,24 @@ struct nomadik_vpip_param vpip_default_p + { ZoomMgrStatus_bLastCmd , 0x3886, 0x0000 }, + { ZoomMgrStatus_bCommandStatus , 0x3888, 0x0000 }, +@@ -2122,10 +2785,28 @@ struct nomadik_vpip_param vpip_default_p + { ZoomMgrStatus_fMinFOVX_Byte3 , 0x38b8, 0x0000 }, + { ZoomMgrStatus_uwXOrigin_LSByte , 0x38bc, 0x0000 }, { ZoomMgrStatus_uwXOrigin_MSByte , 0x38bb, 0x0000 }, { ZoomMgrStatus_uwYOrigin_LSByte , 0x38c0, 0x0000 }, { ZoomMgrStatus_uwYOrigin_MSByte , 0x38bf, 0x0000 }, @@ -1593,7 +1775,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { WhiteBalanceConstrainerControls_fpRedA_LSByte , 0x3902, 0x0000 }, { WhiteBalanceConstrainerControls_fpRedA_MSByte , 0x3901, 0x0000 }, { WhiteBalanceConstrainerControls_fpBlueA_LSByte , 0x3906, 0x0000 }, -@@ -2135,6 +2816,9 @@ struct nomadik_vpip_param vpip_default_p + { WhiteBalanceConstrainerControls_fpBlueA_MSByte , 0x3905, 0x0000 }, + { WhiteBalanceConstrainerControls_fpRedB_LSByte , 0x390a, 0x0000 }, +@@ -2133,25 +2814,34 @@ struct nomadik_vpip_param vpip_default_p + { WhiteBalanceConstrainerControls_fpBlueB_LSByte , 0x390e, 0x0000 }, + { WhiteBalanceConstrainerControls_fpBlueB_MSByte , 0x390d, 0x3acf }, { WhiteBalanceConstrainerControls_fpMaximumDistanceAllowedFromLocus_LSByte , 0x3912, 0x0000 }, { WhiteBalanceConstrainerControls_fpMaximumDistanceAllowedFromLocus_MSByte , 0x3911, 0x2e8e }, { WhiteBalanceConstrainerControls_fEnableConstrainedWhiteBalance , 0x3914, 0x0001 }, @@ -1603,7 +1789,7 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { WhiteBalanceConstrainerOutput_fpOutputRedGain_LSByte , 0x3982, 0x0000 }, { WhiteBalanceConstrainerOutput_fpOutputRedGain_MSByte , 0x3981, 0x0000 }, { WhiteBalanceConstrainerOutput_fpOutputGreenGain_LSByte , 0x3986, 0x0000 }, -@@ -2142,6 +2826,9 @@ struct nomadik_vpip_param vpip_default_p + { WhiteBalanceConstrainerOutput_fpOutputGreenGain_MSByte , 0x3985, 0x0000 }, { WhiteBalanceConstrainerOutput_fpOutputBlueGain_LSByte , 0x398a, 0x0000 }, { WhiteBalanceConstrainerOutput_fpOutputBlueGain_MSByte , 0x3989, 0x0000 }, { WhiteBalanceConstrainerOutput_fAreGainsConstrained , 0x398c, 0x0000 }, @@ -1613,7 +1799,8 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { WhiteBalanceConstrainerInternal_fpGradientOfLocusAB_LSByte , 0x3a02, 0x0000 }, { WhiteBalanceConstrainerInternal_fpGradientOfLocusAB_MSByte , 0x3a01, 0x0000 }, { WhiteBalanceConstrainerInternal_fpDistanceOfInputPointFromLocusAB_LSByte , 0x3a06, 0x0000 }, -@@ -2150,6 +2837,9 @@ struct nomadik_vpip_param vpip_default_p + { WhiteBalanceConstrainerInternal_fpDistanceOfInputPointFromLocusAB_MSByte , 0x3a05, 0x0000 }, + { WhiteBalanceConstrainerInternal_fpConstrainedRedPoint_LSByte , 0x3a0a, 0x0000 }, { WhiteBalanceConstrainerInternal_fpConstrainedRedPoint_MSByte , 0x3a09, 0x0000 }, { WhiteBalanceConstrainerInternal_fpConstrainedBluePoint_LSByte , 0x3a0e, 0x0000 }, { WhiteBalanceConstrainerInternal_fpConstrainedBluePoint_MSByte , 0x3a0d, 0x0000 }, @@ -1623,7 +1810,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ModeSetupBank1_uwInputImageSize_X_LSByte , 0x3a82, 0x0000 }, { ModeSetupBank1_uwInputImageSize_X_MSByte , 0x3a81, 0x0000 }, { ModeSetupBank1_uwInputImageSize_Y_LSByte , 0x3a86, 0x0000 }, -@@ -2162,7 +2852,7 @@ struct nomadik_vpip_param vpip_default_p + { ModeSetupBank1_uwInputImageSize_Y_MSByte , 0x3a85, 0x0000 }, + { ModeSetupBank1_uwMaxImageSize_X_LSByte , 0x3a8a, 0x0000 }, +@@ -2160,11 +2850,11 @@ struct nomadik_vpip_param vpip_default_p + { ModeSetupBank1_uwMaxImageSize_Y_MSByte , 0x3a8d, 0x0000 }, + { ModeSetupBank1_uwMinImageSize_X_LSByte , 0x3a92, 0x0000 }, { ModeSetupBank1_uwMinImageSize_X_MSByte , 0x3a91, 0x0000 }, { ModeSetupBank1_uwMinImageSize_Y_LSByte , 0x3a96, 0x0000 }, { ModeSetupBank1_uwMinImageSize_Y_MSByte , 0x3a95, 0x0000 }, @@ -1632,7 +1823,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ModeSetupBank1_fLowPowerStreaming , 0x3a9a, 0x0000 }, { ModeSetupBank1_bTestMode , 0x3a9c, 0x0000 }, { ModeSetupBank1_bNumberOfStatusLines , 0x3a9e, 0x0000 }, -@@ -2175,9 +2865,18 @@ struct nomadik_vpip_param vpip_default_p + { ModeSetupBank1_bNumberOfDarkLines , 0x3aa0, 0x0000 }, + { ModeSetupBank1_bNumberOfBlackLines , 0x3aa2, 0x0000 }, +@@ -2173,13 +2863,22 @@ struct nomadik_vpip_param vpip_default_p + { ModeSetupBank1_uwNumberOfInterFrameLines_LSByte , 0x3aaa, 0x0000 }, + { ModeSetupBank1_uwNumberOfInterFrameLines_MSByte , 0x3aa9, 0x0000 }, { ModeSetupBank1_bNumberOfDummyColumns , 0x3aac, 0x0000 }, { ModeSetupBank1_bInputImageSource , 0x3aae, 0x0000 }, { ModeSetupBank1_bOutputImageDestination , 0x3ab0, 0x0000 }, @@ -1652,7 +1847,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AntiVignetteControlsFar_bFilterCoeff_R2_r , 0x3c02, 0x0000 }, { AntiVignetteControlsFar_bFilterCoeff_R2_gr , 0x3c04, 0x0000 }, { AntiVignetteControlsFar_bFilterCoeff_R2_gb , 0x3c06, 0x0000 }, -@@ -2213,7 +2912,10 @@ struct nomadik_vpip_param vpip_default_p + { AntiVignetteControlsFar_bFilterCoeff_R2_b , 0x3c08, 0x0000 }, + { AntiVignetteControlsFar_bFilterCoeff_R4_r , 0x3c0a, 0x0000 }, +@@ -2211,11 +2910,14 @@ struct nomadik_vpip_param vpip_default_p + { AntiVignetteControlsFar_bUnityOffset_r , 0x3c3e, 0x0000 }, + { AntiVignetteControlsFar_bUnityOffset_gr , 0x3c40, 0x0000 }, { AntiVignetteControlsFar_bUnityOffset_gb , 0x3c42, 0x0000 }, { AntiVignetteControlsFar_bUnityOffset_b , 0x3c44, 0x0000 }, { AntiVignetteControlsFar_fAdaptiveAntiVignetteEnable , 0x3c46, 0x0000 }, @@ -1664,7 +1863,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AntiVignetteControlsNear_bFilterCoeff_R2_r , 0x3c82, 0x0000 }, { AntiVignetteControlsNear_bFilterCoeff_R2_gr , 0x3c84, 0x0000 }, { AntiVignetteControlsNear_bFilterCoeff_R2_gb , 0x3c86, 0x0000 }, -@@ -2249,6 +2951,9 @@ struct nomadik_vpip_param vpip_default_p + { AntiVignetteControlsNear_bFilterCoeff_R2_b , 0x3c88, 0x0000 }, + { AntiVignetteControlsNear_bFilterCoeff_R4_r , 0x3c8a, 0x0000 }, +@@ -2247,19 +2949,25 @@ struct nomadik_vpip_param vpip_default_p + { AntiVignetteControlsNear_bUnityOffset_r , 0x3cbe, 0x0000 }, + { AntiVignetteControlsNear_bUnityOffset_gr , 0x3cc0, 0x0000 }, { AntiVignetteControlsNear_bUnityOffset_gb , 0x3cc2, 0x0000 }, { AntiVignetteControlsNear_bUnityOffset_b , 0x3cc4, 0x0000 }, { AntiVignetteControlsNear_fAdaptiveAntiVignetteEnable , 0x3cc6, 0x0000 }, @@ -1674,7 +1877,9 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AFStatsControls_fAbsSquareEnabled , 0x3d00, 0x0000 }, { AFStatsControls_bCoringValue , 0x3d02, 0x0000 }, { AFStatsControls_bWindowsSystem , 0x3d04, 0x0000 }, -@@ -2258,6 +2963,9 @@ struct nomadik_vpip_param vpip_default_p + { AFStatsControls_bHRatio_Num , 0x3d06, 0x0000 }, + { AFStatsControls_bHRatio_Den , 0x3d08, 0x0000 }, + { AFStatsControls_bVRatio_Num , 0x3d0a, 0x0000 }, { AFStatsControls_bVRatio_Den , 0x3d0c, 0x0000 }, { AFStatsControls_bHostActiveZonesCounter , 0x3d0e, 0x0000 }, { AFStatsControls_fAutoRefresh , 0x3d10, 0x0000 }, @@ -1684,7 +1889,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AFStatsStatus_bAFStats_Error , 0x3d80, 0x0000 }, { AFStatsStatus_fAbsSquareEnabled , 0x3d82, 0x0000 }, { AFStatsStatus_bCoringValue , 0x3d84, 0x0000 }, -@@ -2282,6 +2990,9 @@ struct nomadik_vpip_param vpip_default_p + { AFStatsStatus_bWindowsSystem , 0x3d86, 0x0000 }, + { AFStatsStatus_bActiveZonesCounter , 0x3d88, 0x0000 }, +@@ -2280,10 +2988,13 @@ struct nomadik_vpip_param vpip_default_p + { AFStatsStatus_udwMaxFocusMeasurePerPixel_Byte1 , 0x3da6, 0x0000 }, + { AFStatsStatus_udwMaxFocusMeasurePerPixel_Byte2 , 0x3da8, 0x0000 }, { AFStatsStatus_udwMaxFocusMeasurePerPixel_Byte3 , 0x3daa, 0x0000 }, { AFStatsStatus_uwStartingAFZoneLine_LSByte , 0x3dae, 0x0000 }, { AFStatsStatus_uwStartingAFZoneLine_MSByte , 0x3dad, 0x0000 }, @@ -1694,7 +1903,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AFFocusStats_udwStatsValue_0_Byte0 , 0x3e00, 0x0000 }, { AFFocusStats_udwStatsValue_0_Byte1 , 0x3e02, 0x0000 }, { AFFocusStats_udwStatsValue_0_Byte2 , 0x3e04, 0x0000 }, -@@ -2310,6 +3021,9 @@ struct nomadik_vpip_param vpip_default_p + { AFFocusStats_udwStatsValue_0_Byte3 , 0x3e06, 0x0000 }, + { AFFocusStats_udwStatsValue_1_Byte0 , 0x3e08, 0x0000 }, +@@ -2308,17 +3019,52 @@ struct nomadik_vpip_param vpip_default_p + { AFFocusStats_udwStatsValue_5_Byte3 , 0x3e2e, 0x0000 }, + { AFFocusStats_udwStatsValue_6_Byte0 , 0x3e30, 0x0000 }, { AFFocusStats_udwStatsValue_6_Byte1 , 0x3e32, 0x0000 }, { AFFocusStats_udwStatsValue_6_Byte2 , 0x3e34, 0x0000 }, { AFFocusStats_udwStatsValue_6_Byte3 , 0x3e36, 0x0000 }, @@ -1704,7 +1917,7 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AFLightStats_bStatsValue_0 , 0x3e80, 0x0000 }, { AFLightStats_bStatsValue_1 , 0x3e82, 0x0000 }, { AFLightStats_bStatsValue_2 , 0x3e84, 0x0000 }, -@@ -2317,6 +3031,38 @@ struct nomadik_vpip_param vpip_default_p + { AFLightStats_bStatsValue_3 , 0x3e86, 0x0000 }, { AFLightStats_bStatsValue_4 , 0x3e88, 0x0000 }, { AFLightStats_bStatsValue_5 , 0x3e8a, 0x0000 }, { AFLightStats_bStatsValue_6 , 0x3e8c, 0x0000 }, @@ -1743,7 +1956,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { FLADriverLowLevelParameters_wMinPosition_LSByte , 0x3f02, 0x0000 }, { FLADriverLowLevelParameters_wMinPosition_MSByte , 0x3f01, 0x0000 }, { FLADriverLowLevelParameters_wMaxPosition_LSByte , 0x3f06, 0x0000 }, -@@ -2344,6 +3090,9 @@ struct nomadik_vpip_param vpip_default_p + { FLADriverLowLevelParameters_wMaxPosition_MSByte , 0x3f05, 0x0000 }, + { FLADriverLowLevelParameters_wHomePosition_LSByte , 0x3f0a, 0x0000 }, +@@ -2342,20 +3088,26 @@ struct nomadik_vpip_param vpip_default_p + { FLADriverLowLevelParameters_bNVM_PS_IBias , 0x3f2c, 0x0000 }, + { FLADriverLowLevelParameters_bNVM_PS_RampGain , 0x3f2e, 0x0000 }, { FLADriverLowLevelParameters_bNVM_PS_Type , 0x3f30, 0x0000 }, { FLADriverLowLevelParameters_uwNVM_minidriver_m_c_LSByte , 0x3f34, 0x0000 }, { FLADriverLowLevelParameters_uwNVM_minidriver_m_c_MSByte , 0x3f33, 0x0000 }, @@ -1753,7 +1970,10 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { FLADriverControls_bMMode , 0x3f80, 0x0000 }, { FLADriverControls_wTargetPosition_LSByte , 0x3f84, 0x0000 }, { FLADriverControls_wTargetPosition_MSByte , 0x3f83, 0x0000 }, -@@ -2354,6 +3103,9 @@ struct nomadik_vpip_param vpip_default_p + { FLADriverControls_wPositionTolerance_LSByte , 0x3f88, 0x0000 }, + { FLADriverControls_wPositionTolerance_MSByte , 0x3f87, 0x0000 }, + { FLADriverControls_uwTimeLimit_ms_LSByte , 0x3f8c, 0x0000 }, + { FLADriverControls_uwTimeLimit_ms_MSByte , 0x3f8b, 0x0000 }, { FLADriverControls_bTrigger , 0x3f8e, 0x0000 }, { FLADriverControls_bSlewMode , 0x3f90, 0x0000 }, { FLADriverControls_bSlewRate , 0x3f92, 0x0000 }, @@ -1763,7 +1983,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { FLADriverStatus_wLensPosition_LSByte , 0x4002, 0x0000 }, { FLADriverStatus_wLensPosition_MSByte , 0x4001, 0x0000 }, { FLADriverStatus_fLensIsMoving , 0x4004, 0x0000 }, -@@ -2365,6 +3117,9 @@ struct nomadik_vpip_param vpip_default_p + { FLADriverStatus_fLimitsExceeded , 0x4006, 0x0000 }, + { FLADriverStatus_fLensIsAtHome , 0x4008, 0x0000 }, +@@ -2363,10 +3115,13 @@ struct nomadik_vpip_param vpip_default_p + { FLADriverStatus_bSkippedFrames , 0x400c, 0x0000 }, + { FLADriverStatus_bCycles , 0x400e, 0x0000 }, { FLADriverStatus_bMiniDriverTimeoutError , 0x4010, 0x0000 }, { FLADriverStatus_wTargetPosition , 0x4012, 0x0000 }, { FLADriverStatus_bLowLevelPosition , 0x4014, 0x0000 }, @@ -1773,7 +1997,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { FocusControls_fErrorReset , 0x4080, 0x0000 }, { FocusControls_bRange , 0x4082, 0x0000 }, { FocusControls_bMode , 0x4084, 0x0000 }, -@@ -2376,6 +3131,9 @@ struct nomadik_vpip_param vpip_default_p + { FocusControls_bAFCommand , 0x4086, 0x0000 }, + { FocusControls_bLensCommand , 0x4088, 0x0000 }, +@@ -2374,10 +3129,13 @@ struct nomadik_vpip_param vpip_default_p + { FocusControls_fTestCoinEnabled , 0x408c, 0x0000 }, + { FocusControls_bControlCoin , 0x408e, 0x0000 }, { FocusControls_fInternalStats_Disable , 0x4090, 0x0000 }, { FocusControls_bActuator_Disable , 0x4092, 0x0000 }, { FocusControls_fInhibitAutoMetering , 0x4094, 0x0000 }, @@ -1783,7 +2011,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { FocusStatus_bModeStatus , 0x4100, 0x0000 }, { FocusStatus_bAFCommandStatus , 0x4102, 0x0000 }, { FocusStatus_bLensCommandStatus , 0x4104, 0x0000 }, -@@ -2391,6 +3149,30 @@ struct nomadik_vpip_param vpip_default_p + { FocusStatus_fAutoFocusEnabled , 0x4106, 0x0000 }, + { FocusStatus_bRange , 0x4108, 0x0000 }, +@@ -2389,10 +3147,34 @@ struct nomadik_vpip_param vpip_default_p + { FocusStatus_fRunForTest , 0x4114, 0x0000 }, + { FocusStatus_bStatusCoin , 0x4116, 0x0000 }, { FocusStatus_fInternalStats_Disabled , 0x4118, 0x0000 }, { FocusStatus_bActuator_Disabled , 0x411a, 0x0000 }, { FocusStatus_bLastUsedAFSensor , 0x411c, 0x0000 }, @@ -1814,7 +2046,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { FocusRangeConstants_wFullRange_LensMinPosition_LSByte , 0x4182, 0x0000 }, { FocusRangeConstants_wFullRange_LensMinPosition_MSByte , 0x4181, 0x0000 }, { FocusRangeConstants_wFullRange_LensMaxPosition_LSByte , 0x4186, 0x0000 }, -@@ -2409,6 +3191,34 @@ struct nomadik_vpip_param vpip_default_p + { FocusRangeConstants_wFullRange_LensMaxPosition_MSByte , 0x4185, 0x03ff }, + { FocusRangeConstants_wFullRange_LensRecoveryPosition_LSByte , 0x418a, 0x0000 }, +@@ -2407,10 +3189,38 @@ struct nomadik_vpip_param vpip_default_p + { FocusRangeConstants_wMacro_LensMinPosition_MSByte , 0x4199, 0x0000 }, + { FocusRangeConstants_wMacro_LensMaxPosition_LSByte , 0x419e, 0x0000 }, { FocusRangeConstants_wMacro_LensMaxPosition_MSByte , 0x419d, 0x03ff }, { FocusRangeConstants_wMacro_LensRecoveryPosition_LSByte , 0x41a2, 0x0000 }, { FocusRangeConstants_wMacro_LensRecoveryPosition_MSByte , 0x41a1, 0x01ff }, @@ -1849,7 +2085,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AutoFocusControls_bHostCmd , 0x4200, 0x0000 }, { AutoFocusControls_fFreezeIfStable , 0x4202, 0x0000 }, { AutoFocusControls_fFMTesting_AutoDisable , 0x4204, 0x0001 }, -@@ -2432,6 +3242,35 @@ struct nomadik_vpip_param vpip_default_p + { AutoFocusControls_fFastAFAlgoStart , 0x4206, 0x0000 }, + { AutoFocusControls_fBackLight_Enable , 0x4208, 0x0000 }, +@@ -2430,10 +3240,39 @@ struct nomadik_vpip_param vpip_default_p + { AutoFocusControls_fEnableTrakingZoneVariation , 0x4224, 0x0000 }, + { AutoFocusControls_fEnableFunctionThresholdTest , 0x4226, 0x0001 }, { AutoFocusControls_fForceTestState , 0x4228, 0x0000 }, { AutoFocusControls_bManualAFNextState , 0x422a, 0x0000 }, { AutoFocusControls_fResetHCSPos , 0x422c, 0x0001 }, @@ -1885,7 +2125,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AutoFocusConstants_bCoarseStep , 0x4280, 0x0078 }, { AutoFocusConstants_bFineStep , 0x4282, 0x0014 }, { AutoFocusConstants_bFullSearchStep , 0x4284, 0x0000 }, -@@ -2456,11 +3295,17 @@ struct nomadik_vpip_param vpip_default_p + { AutoFocusConstants_bLeakyIntegratorConstant , 0x4286, 0x0000 }, + { AutoFocusConstants_uwFineThreshold_LSByte , 0x428a, 0x0000 }, +@@ -2454,15 +3293,21 @@ struct nomadik_vpip_param vpip_default_p + { AutoFocusConstants_bLightGap , 0x42a6, 0x0000 }, + { AutoFocusConstants_uwDeltaValue_LSByte , 0x42aa, 0x0000 }, { AutoFocusConstants_uwDeltaValue_MSByte , 0x42a9, 0x0000 }, { AutoFocusConstants_uwMaxFineTh_LSByte , 0x42ae, 0x0000 }, { AutoFocusConstants_uwMaxFineTh_MSByte , 0x42ad, 0x0000 }, @@ -1903,7 +2147,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AutoFocusStatus_bCycles , 0x4380, 0x0000 }, { AutoFocusStatus_bHostCmd , 0x4382, 0x0000 }, { AutoFocusStatus_bAF_PrevState , 0x4384, 0x0000 }, -@@ -2495,10 +3340,16 @@ struct nomadik_vpip_param vpip_default_p + { AutoFocusStatus_bAF_State , 0x4386, 0x0000 }, + { AutoFocusStatus_bAF_NextState , 0x4388, 0x0000 }, +@@ -2493,14 +3338,20 @@ struct nomadik_vpip_param vpip_default_p + { AutoFocusStatus_uwTotalCoarseVariation_LSByte , 0x43bc, 0x0000 }, + { AutoFocusStatus_uwTotalCoarseVariation_MSByte , 0x43bb, 0x0000 }, { AutoFocusStatus_uwTotalFineVariation_LSByte , 0x43c0, 0x0000 }, { AutoFocusStatus_uwTotalFineVariation_MSByte , 0x43bf, 0x0000 }, { AutoFocusStatus_bCountVariationRegion , 0x43c2, 0x0000 }, @@ -1920,7 +2168,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AutoFocusMeasureData_udwFocusMeasure_Byte0 , 0x4480, 0x0000 }, { AutoFocusMeasureData_udwFocusMeasure_Byte1 , 0x4482, 0x0000 }, { AutoFocusMeasureData_udwFocusMeasure_Byte2 , 0x4484, 0x0000 }, -@@ -2555,6 +3406,9 @@ struct nomadik_vpip_param vpip_default_p + { AutoFocusMeasureData_udwFocusMeasure_Byte3 , 0x4486, 0x0000 }, + { AutoFocusMeasureData_udwPrevFocusMeasure_Byte0 , 0x4488, 0x0000 }, +@@ -2553,24 +3404,33 @@ struct nomadik_vpip_param vpip_default_p + { AutoFocusMeasureData_udwCurrentFocusMeasureDifference_Byte3 , 0x44e6, 0x0000 }, + { AutoFocusMeasureData_udwOldTrackingFocusMeasure_Byte0 , 0x44e8, 0x0000 }, { AutoFocusMeasureData_udwOldTrackingFocusMeasure_Byte1 , 0x44ea, 0x0000 }, { AutoFocusMeasureData_udwOldTrackingFocusMeasure_Byte2 , 0x44ec, 0x0000 }, { AutoFocusMeasureData_udwOldTrackingFocusMeasure_Byte3 , 0x44ee, 0x0000 }, @@ -1930,7 +2182,7 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AutoFocusWeightControls_bWeight_0 , 0x4500, 0x0000 }, { AutoFocusWeightControls_bWeight_1 , 0x4502, 0x0000 }, { AutoFocusWeightControls_bWeight_2 , 0x4504, 0x0000 }, -@@ -2562,6 +3416,9 @@ struct nomadik_vpip_param vpip_default_p + { AutoFocusWeightControls_bWeight_3 , 0x4506, 0x0000 }, { AutoFocusWeightControls_bWeight_4 , 0x4508, 0x0000 }, { AutoFocusWeightControls_bWeight_5 , 0x450a, 0x0000 }, { AutoFocusWeightControls_bWeight_6 , 0x450c, 0x0000 }, @@ -1940,7 +2192,7 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AutoFocusDynamicWeight_bWeight_0 , 0x4580, 0x0000 }, { AutoFocusDynamicWeight_bWeight_1 , 0x4582, 0x0000 }, { AutoFocusDynamicWeight_bWeight_2 , 0x4584, 0x0000 }, -@@ -2569,6 +3426,9 @@ struct nomadik_vpip_param vpip_default_p + { AutoFocusDynamicWeight_bWeight_3 , 0x4586, 0x0000 }, { AutoFocusDynamicWeight_bWeight_4 , 0x4588, 0x0000 }, { AutoFocusDynamicWeight_bWeight_5 , 0x458a, 0x0000 }, { AutoFocusDynamicWeight_bWeight_6 , 0x458c, 0x0000 }, @@ -1950,7 +2202,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AutoFocusThresholds_uwCoarseThreshold_LSByte , 0x4602, 0x0000 }, { AutoFocusThresholds_uwCoarseThreshold_MSByte , 0x4601, 0x0000 }, { AutoFocusThresholds_uwFineThreshold_LSByte , 0x4606, 0x0000 }, -@@ -2585,6 +3445,9 @@ struct nomadik_vpip_param vpip_default_p + { AutoFocusThresholds_uwFineThreshold_MSByte , 0x4605, 0x0000 }, + { AutoFocusThresholds_uwBeforeMotionBlur_LSByte , 0x460a, 0x0000 }, +@@ -2583,10 +3443,13 @@ struct nomadik_vpip_param vpip_default_p + { AutoFocusThresholds_udwCurrentVariation_Byte3 , 0x4616, 0x0000 }, + { AutoFocusThresholds_udwLowFocusMeasureValue_Byte0 , 0x4618, 0x0000 }, { AutoFocusThresholds_udwLowFocusMeasureValue_Byte1 , 0x461a, 0x0000 }, { AutoFocusThresholds_udwLowFocusMeasureValue_Byte2 , 0x461c, 0x0000 }, { AutoFocusThresholds_udwLowFocusMeasureValue_Byte3 , 0x461e, 0x0000 }, @@ -1960,7 +2216,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AutoFocusHeuristicConstants_uwLensPositionInputMax_LSByte , 0x4682, 0x0000 }, { AutoFocusHeuristicConstants_uwLensPositionInputMax_MSByte , 0x4681, 0x0000 }, { AutoFocusHeuristicConstants_uwLensPositionInputMin_LSByte , 0x4686, 0x0000 }, -@@ -2601,6 +3464,9 @@ struct nomadik_vpip_param vpip_default_p + { AutoFocusHeuristicConstants_uwLensPositionInputMin_MSByte , 0x4685, 0x0000 }, + { AutoFocusHeuristicConstants_bBrightnessInputMax , 0x4688, 0x0000 }, +@@ -2599,10 +3462,13 @@ struct nomadik_vpip_param vpip_default_p + { AutoFocusHeuristicConstants_uwFineToCoarseMax_MSByte , 0x4695, 0x0000 }, + { AutoFocusHeuristicConstants_uwFineToCoarseMin_LSByte , 0x469a, 0x0000 }, { AutoFocusHeuristicConstants_uwFineToCoarseMin_MSByte , 0x4699, 0x0000 }, { AutoFocusHeuristicConstants_bHighToMaxFMShiftFactor , 0x469c, 0x0000 }, { AutoFocusHeuristicConstants_bLowToHighFMShiftFactor , 0x469e, 0x0000 }, @@ -1970,7 +2230,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AutoFocusThHeuristicInput_udwFocusMeasureInputMax_Byte0 , 0x4700, 0x0000 }, { AutoFocusThHeuristicInput_udwFocusMeasureInputMax_Byte1 , 0x4702, 0x0000 }, { AutoFocusThHeuristicInput_udwFocusMeasureInputMax_Byte2 , 0x4704, 0x0000 }, -@@ -2616,19 +3482,31 @@ struct nomadik_vpip_param vpip_default_p + { AutoFocusThHeuristicInput_udwFocusMeasureInputMax_Byte3 , 0x4706, 0x0000 }, + { AutoFocusThHeuristicInput_udwFocusMeasureInputMin_Byte0 , 0x4708, 0x0000 }, +@@ -2614,23 +3480,35 @@ struct nomadik_vpip_param vpip_default_p + { AutoFocusThHeuristicInput_udwFocusMeasureInput_Byte2 , 0x4714, 0x0000 }, + { AutoFocusThHeuristicInput_udwFocusMeasureInput_Byte3 , 0x4716, 0x0000 }, { AutoFocusThHeuristicInput_uwLensPositionInput_LSByte , 0x471a, 0x0000 }, { AutoFocusThHeuristicInput_uwLensPositionInput_MSByte , 0x4719, 0x0000 }, { AutoFocusThHeuristicInput_bBrightnessInput , 0x471c, 0x0000 }, @@ -2004,7 +2268,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { MiscPageElements_fEnableIntelligentFlash , 0x4904, 0x0000 }, { MiscPageElements_fEligibleFrameForMetering , 0x4906, 0x0000 }, { MiscPageElements_fFlashGunIlluminatedFrameStreamed , 0x4908, 0x0000 }, -@@ -2642,7 +3520,13 @@ struct nomadik_vpip_param vpip_default_p + { MiscPageElements_VpipCut , 0x490a, 0x0000 }, + { MiscPageElements_bGPIOClockFrequency_Mhz , 0x490c, 0x0000 }, +@@ -2640,42 +3518,60 @@ struct nomadik_vpip_param vpip_default_p + { MiscPageElements_fEnableDelayWhenStoppingSensor , 0x4914, 0x0000 }, + { MiscPageElements_fTriggerFlashOnStreaming , 0x4916, 0x0000 }, { MiscPageElements_fDoNotOutputFrameInIntelligentFlash , 0x4918, 0x0000 }, { MiscPageElements_fDisableToshibaInit , 0x491a, 0x0000 }, { MiscPageElements_bNumberofFramesTobeSkippedByRx , 0x491c, 0x0000 }, @@ -2018,7 +2286,9 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { MasterI2cClockControl_bCountFall , 0x4a00, 0x0000 }, { MasterI2cClockControl_bCountRise , 0x4a02, 0x0000 }, { MasterI2cClockControl_bCountHigh , 0x4a04, 0x0000 }, -@@ -2652,6 +3536,9 @@ struct nomadik_vpip_param vpip_default_p + { MasterI2cClockControl_bCountBuffer , 0x4a06, 0x0000 }, + { MasterI2cClockControl_bCountHoldData , 0x4a08, 0x0000 }, + { MasterI2cClockControl_bCountSetupData , 0x4a0a, 0x0000 }, { MasterI2cClockControl_bCountHoldStart , 0x4a0c, 0x0000 }, { MasterI2cClockControl_bCountSetupStart , 0x4a0e, 0x0000 }, { MasterI2cClockControl_bCountSetupStop , 0x4a10, 0x0000 }, @@ -2028,7 +2298,8 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ZoomMgrFOVCtrl_bShiftCenter , 0x4a80, 0x0000 }, { ZoomMgrFOVCtrl_uwXOrigin_LSByte , 0x4a84, 0x0000 }, { ZoomMgrFOVCtrl_uwXOrigin_MSByte , 0x4a83, 0x0000 }, -@@ -2660,11 +3547,17 @@ struct nomadik_vpip_param vpip_default_p + { ZoomMgrFOVCtrl_uwYOrigin_LSByte , 0x4a88, 0x0000 }, + { ZoomMgrFOVCtrl_uwYOrigin_MSByte , 0x4a87, 0x0000 }, { ZoomMgrFOVCtrl_fRestrictMaxFOVToChosenFOV , 0x4a8a, 0x0000 }, { ZoomMgrFOVCtrl_fCalculateMinFOVAlways , 0x4a8c, 0x0000 }, { ZoomMgrFOVCtrl_fInhibitMaxFOVAtModeStaticChange , 0x4a8e, 0x0000 }, @@ -2046,7 +2317,9 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ZoomMgrStripeCtrl_bStripeControl , 0x4b80, 0x0000 }, { ZoomMgrStripeCtrl_uwStripeStartAddr_LSByte , 0x4b84, 0x0000 }, { ZoomMgrStripeCtrl_uwStripeStartAddr_MSByte , 0x4b83, 0x0000 }, -@@ -2674,6 +3567,9 @@ struct nomadik_vpip_param vpip_default_p + { ZoomMgrStripeCtrl_uwStripeSize_LSByte , 0x4b88, 0x0000 }, + { ZoomMgrStripeCtrl_uwStripeSize_MSByte , 0x4b87, 0x0000 }, + { ZoomMgrStripeCtrl_uwStripeInMinLineSize_LSByte , 0x4b8c, 0x0000 }, { ZoomMgrStripeCtrl_uwStripeInMinLineSize_MSByte , 0x4b8b, 0x0000 }, { ZoomMgrStripeCtrl_uwBmsFrameLength_LSByte , 0x4b90, 0x0000 }, { ZoomMgrStripeCtrl_uwBmsFrameLength_MSByte , 0x4b8f, 0x0000 }, @@ -2056,7 +2329,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { LftStripeParam_uwGPSISize_LSByte , 0x4c02, 0x0000 }, { LftStripeParam_uwGPSISize_MSByte , 0x4c01, 0x0000 }, { LftStripeParam_uwGPSOSize_LSByte , 0x4c06, 0x0000 }, -@@ -2694,6 +3590,9 @@ struct nomadik_vpip_param vpip_default_p + { LftStripeParam_uwGPSOSize_MSByte , 0x4c05, 0x0000 }, + { LftStripeParam_uwRightBorder_LSByte , 0x4c0a, 0x0000 }, +@@ -2692,10 +3588,13 @@ struct nomadik_vpip_param vpip_default_p + { LftStripeParam_uwStripeInCropSize_MSByte , 0x4c1d, 0x0000 }, + { LftStripeParam_uwStripeOutCropStart_LSByte , 0x4c22, 0x0000 }, { LftStripeParam_uwStripeOutCropStart_MSByte , 0x4c21, 0x0000 }, { LftStripeParam_uwStripeOutCropSize_LSByte , 0x4c26, 0x0000 }, { LftStripeParam_uwStripeOutCropSize_MSByte , 0x4c25, 0x0000 }, @@ -2066,7 +2343,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { RgtStripeParam_uwGPSISize_LSByte , 0x4c82, 0x0000 }, { RgtStripeParam_uwGPSISize_MSByte , 0x4c81, 0x0000 }, { RgtStripeParam_uwGPSOSize_LSByte , 0x4c86, 0x0000 }, -@@ -2714,6 +3613,9 @@ struct nomadik_vpip_param vpip_default_p + { RgtStripeParam_uwGPSOSize_MSByte , 0x4c85, 0x0000 }, + { RgtStripeParam_uwRightBorder_LSByte , 0x4c8a, 0x0000 }, +@@ -2712,34 +3611,70 @@ struct nomadik_vpip_param vpip_default_p + { RgtStripeParam_uwStripeInCropSize_MSByte , 0x4c9d, 0x0000 }, + { RgtStripeParam_uwStripeOutCropStart_LSByte , 0x4ca2, 0x0000 }, { RgtStripeParam_uwStripeOutCropStart_MSByte , 0x4ca1, 0x0000 }, { RgtStripeParam_uwStripeOutCropSize_LSByte , 0x4ca6, 0x0000 }, { RgtStripeParam_uwStripeOutCropSize_MSByte , 0x4ca5, 0x0000 }, @@ -2076,7 +2357,8 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { DigitalGainStatus_uwCodedGreen1Gain_LSByte , 0x4d02, 0x0000 }, { DigitalGainStatus_uwCodedGreen1Gain_MSByte , 0x4d01, 0x0000 }, { DigitalGainStatus_uwCodedRedGain_LSByte , 0x4d06, 0x0000 }, -@@ -2722,10 +3624,16 @@ struct nomadik_vpip_param vpip_default_p + { DigitalGainStatus_uwCodedRedGain_MSByte , 0x4d05, 0x0000 }, + { DigitalGainStatus_uwCodedBlueGain_LSByte , 0x4d0a, 0x0000 }, { DigitalGainStatus_uwCodedBlueGain_MSByte , 0x4d09, 0x0000 }, { DigitalGainStatus_uwCodedGreen2Gain_LSByte , 0x4d0e, 0x0000 }, { DigitalGainStatus_uwCodedGreen2Gain_MSByte , 0x4d0d, 0x0000 }, @@ -2093,7 +2375,8 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AntiFlickerExposureStatus_fpFlickerFreePeriod_us_LSByte , 0x4e02, 0x0000 }, { AntiFlickerExposureStatus_fpFlickerFreePeriod_us_MSByte , 0x4e01, 0x0000 }, { AntiFlickerExposureStatus_fpGainedFlickerFreeTimePeriod_us_LSByte , 0x4e06, 0x0000 }, -@@ -2734,10 +3642,37 @@ struct nomadik_vpip_param vpip_default_p + { AntiFlickerExposureStatus_fpGainedFlickerFreeTimePeriod_us_MSByte , 0x4e05, 0x0000 }, + { AntiFlickerExposureStatus_uwMaxFlickerFreeBunches_LSByte , 0x4e0a, 0x0000 }, { AntiFlickerExposureStatus_uwMaxFlickerFreeBunches_MSByte , 0x4e09, 0x0000 }, { AntiFlickerExposureStatus_fpConstrainedFlickerFreePeriod_us_LSByte , 0x4e0e, 0x0000 }, { AntiFlickerExposureStatus_fpConstrainedFlickerFreePeriod_us_MSByte , 0x4e0d, 0x0000 }, @@ -2131,7 +2414,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { SensorSetupFarSensor_uwGuaranteedDataSaturationLevel_LSByte , 0x5002, 0x0000 }, { SensorSetupFarSensor_uwGuaranteedDataSaturationLevel_MSByte , 0x5001, 0x043f }, { SensorSetupFarSensor_uwMinimumSensorRxPixelValue_LSByte , 0x5006, 0x0000 }, -@@ -2751,6 +3686,9 @@ struct nomadik_vpip_param vpip_default_p + { SensorSetupFarSensor_uwMinimumSensorRxPixelValue_MSByte , 0x5005, 0x0004 }, + { SensorSetupFarSensor_uwMaximumSensorRxPixelValue_LSByte , 0x500a, 0x0000 }, +@@ -2749,10 +3684,13 @@ struct nomadik_vpip_param vpip_default_p + { SensorSetupFarSensor_fpGreenTiltGain_LSByte , 0x5012, 0x0000 }, + { SensorSetupFarSensor_fpGreenTiltGain_MSByte , 0x5011, 0x3e00 }, { SensorSetupFarSensor_fpBlueTiltGain_LSByte , 0x5016, 0x0000 }, { SensorSetupFarSensor_fpBlueTiltGain_MSByte , 0x5015, 0x3e00 }, { SensorSetupFarSensor_BlackCorrectionOffset , 0x5018, 0x0000 }, @@ -2141,7 +2428,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { SensorSetupNearSensor_uwGuaranteedDataSaturationLevel_LSByte , 0x5082, 0x0000 }, { SensorSetupNearSensor_uwGuaranteedDataSaturationLevel_MSByte , 0x5081, 0x0000 }, { SensorSetupNearSensor_uwMinimumSensorRxPixelValue_LSByte , 0x5086, 0x0000 }, -@@ -2764,6 +3702,9 @@ struct nomadik_vpip_param vpip_default_p + { SensorSetupNearSensor_uwMinimumSensorRxPixelValue_MSByte , 0x5085, 0x0000 }, + { SensorSetupNearSensor_uwMaximumSensorRxPixelValue_LSByte , 0x508a, 0x0000 }, +@@ -2762,10 +3700,13 @@ struct nomadik_vpip_param vpip_default_p + { SensorSetupNearSensor_fpGreenTiltGain_LSByte , 0x5092, 0x0000 }, + { SensorSetupNearSensor_fpGreenTiltGain_MSByte , 0x5091, 0x0000 }, { SensorSetupNearSensor_fpBlueTiltGain_LSByte , 0x5096, 0x0000 }, { SensorSetupNearSensor_fpBlueTiltGain_MSByte , 0x5095, 0x0000 }, { SensorSetupNearSensor_BlackCorrectionOffset , 0x5098, 0x0000 }, @@ -2151,7 +2442,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ToshibaOtpRead_otp_inf_2 , 0x5100, 0x0000 }, { ToshibaOtpRead_otp_inf_1 , 0x5102, 0x0000 }, { ToshibaOtpRead_otp_inf_0 , 0x5104, 0x0000 }, -@@ -2775,8 +3716,24 @@ struct nomadik_vpip_param vpip_default_p + { ToshibaOtpRead_otp_mac_2 , 0x5106, 0x0000 }, + { ToshibaOtpRead_otp_mac_1 , 0x5108, 0x0000 }, +@@ -2773,20 +3714,71 @@ struct nomadik_vpip_param vpip_default_p + { ToshibaOtpRead_otp_posA_1 , 0x510c, 0x0000 }, + { ToshibaOtpRead_otp_posA_0 , 0x510e, 0x0000 }, { ToshibaOtpRead_otp_posB_1 , 0x5110, 0x0000 }, { ToshibaOtpRead_otp_posB_0 , 0x5112, 0x0000 }, { ToshibaOtpRead_otp_register_map_ver , 0x5114, 0x0000 }, @@ -2176,7 +2471,8 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ReferenceIlluminantCasts_fpCAST0_LSByte , 0x5202, 0x0000 }, { ReferenceIlluminantCasts_fpCAST0_MSByte , 0x5201, 0x38b8 }, { ReferenceIlluminantCasts_fpCAST1_LSByte , 0x5206, 0x0000 }, -@@ -2785,6 +3742,41 @@ struct nomadik_vpip_param vpip_default_p + { ReferenceIlluminantCasts_fpCAST1_MSByte , 0x5205, 0x396d }, + { ReferenceIlluminantCasts_fpCAST2_LSByte , 0x520a, 0x0000 }, { ReferenceIlluminantCasts_fpCAST2_MSByte , 0x5209, 0x3a1b }, { ReferenceIlluminantCasts_fpCAST3_LSByte , 0x520e, 0x0000 }, { ReferenceIlluminantCasts_fpCAST3_MSByte , 0x520d, 0x3af2 }, @@ -2218,7 +2514,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AdaptiveAVParameter_B_bAvUnityOffset_Day , 0x5280, 0x0040 }, { AdaptiveAVParameter_B_bAvCoeffR2_Day , 0x5282, 0x003e }, { AdaptiveAVParameter_B_bAvCoeffR4_Day , 0x5284, 0x00e8 }, -@@ -2813,6 +3805,38 @@ struct nomadik_vpip_param vpip_default_p + { AdaptiveAVParameter_B_wAvHOffset_Day_LSByte , 0x5288, 0x0000 }, + { AdaptiveAVParameter_B_wAvHOffset_Day_MSByte , 0x5287, 0x0003 }, +@@ -2811,10 +3803,42 @@ struct nomadik_vpip_param vpip_default_p + { AdaptiveAVParameter_B_bAvCoeffR4_HOR , 0x52ae, 0x00f0 }, + { AdaptiveAVParameter_B_wAvHOffset_HOR_LSByte , 0x52b2, 0x0000 }, { AdaptiveAVParameter_B_wAvHOffset_HOR_MSByte , 0x52b1, 0x000b }, { AdaptiveAVParameter_B_wAvVOffset_HOR_LSByte , 0x52b6, 0x0000 }, { AdaptiveAVParameter_B_wAvVOffset_HOR_MSByte , 0x52b5, 0x001d }, @@ -2257,7 +2557,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AdaptiveAVParameter_GB_bAvUnityOffset_Day , 0x5300, 0x0040 }, { AdaptiveAVParameter_GB_bAvCoeffR2_Day , 0x5302, 0x0047 }, { AdaptiveAVParameter_GB_bAvCoeffR4_Day , 0x5304, 0x00ec }, -@@ -2841,6 +3865,39 @@ struct nomadik_vpip_param vpip_default_p + { AdaptiveAVParameter_GB_wAvHOffset_Day_LSByte , 0x5308, 0x0000 }, + { AdaptiveAVParameter_GB_wAvHOffset_Day_MSByte , 0x5307, 0x000a }, +@@ -2839,10 +3863,43 @@ struct nomadik_vpip_param vpip_default_p + { AdaptiveAVParameter_GB_bAvCoeffR4_HOR , 0x532e, 0x00f0 }, + { AdaptiveAVParameter_GB_wAvHOffset_HOR_LSByte , 0x5332, 0x0000 }, { AdaptiveAVParameter_GB_wAvHOffset_HOR_MSByte , 0x5331, 0x000c }, { AdaptiveAVParameter_GB_wAvVOffset_HOR_LSByte , 0x5336, 0x0000 }, { AdaptiveAVParameter_GB_wAvVOffset_HOR_MSByte , 0x5335, 0x0014 }, @@ -2297,7 +2601,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AdaptiveAVParameter_GR_bAvUnityOffset_Day , 0x5380, 0x0040 }, { AdaptiveAVParameter_GR_bAvCoeffR2_Day , 0x5382, 0x0048 }, { AdaptiveAVParameter_GR_bAvCoeffR4_Day , 0x5384, 0x00e8 }, -@@ -2869,6 +3926,38 @@ struct nomadik_vpip_param vpip_default_p + { AdaptiveAVParameter_GR_wAvHOffset_Day_LSByte , 0x5388, 0x0000 }, + { AdaptiveAVParameter_GR_wAvHOffset_Day_MSByte , 0x5387, 0x0009 }, +@@ -2867,10 +3924,42 @@ struct nomadik_vpip_param vpip_default_p + { AdaptiveAVParameter_GR_bAvCoeffR4_HOR , 0x53ae, 0x00ef }, + { AdaptiveAVParameter_GR_wAvHOffset_HOR_LSByte , 0x53b2, 0x0000 }, { AdaptiveAVParameter_GR_wAvHOffset_HOR_MSByte , 0x53b1, 0x000c }, { AdaptiveAVParameter_GR_wAvVOffset_HOR_LSByte , 0x53b6, 0x0000 }, { AdaptiveAVParameter_GR_wAvVOffset_HOR_MSByte , 0x53b5, 0x0001 }, @@ -2336,7 +2644,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AdaptiveAVParameter_R_bAvUnityOffset_Day , 0x5400, 0x0040 }, { AdaptiveAVParameter_R_bAvCoeffR2_Day , 0x5402, 0x0067 }, { AdaptiveAVParameter_R_bAvCoeffR4_Day , 0x5404, 0x00f6 }, -@@ -2897,17 +3986,39 @@ struct nomadik_vpip_param vpip_default_p + { AdaptiveAVParameter_R_wAvHOffset_Day_LSByte , 0x5408, 0x0000 }, + { AdaptiveAVParameter_R_wAvHOffset_Day_MSByte , 0x5407, 0x000a }, +@@ -2895,21 +3984,43 @@ struct nomadik_vpip_param vpip_default_p + { AdaptiveAVParameter_R_bAvCoeffR4_HOR , 0x542e, 0x00f7 }, + { AdaptiveAVParameter_R_wAvHOffset_HOR_LSByte , 0x5432, 0x0000 }, { AdaptiveAVParameter_R_wAvHOffset_HOR_MSByte , 0x5431, 0x000a }, { AdaptiveAVParameter_R_wAvVOffset_HOR_LSByte , 0x5436, 0x0000 }, { AdaptiveAVParameter_R_wAvVOffset_HOR_MSByte , 0x5435, 0x0004 }, @@ -2376,7 +2688,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { DynamicConstrainedWBControls_fpRedA_LSByte , 0x5582, 0x0000 }, { DynamicConstrainedWBControls_fpRedA_MSByte , 0x5581, 0x3881 }, { DynamicConstrainedWBControls_fpBlueA_LSByte , 0x5586, 0x0000 }, -@@ -2919,6 +4030,8 @@ struct nomadik_vpip_param vpip_default_p + { DynamicConstrainedWBControls_fpBlueA_MSByte , 0x5585, 0x3c68 }, + { DynamicConstrainedWBControls_fpDamperLowThreshold_LSByte , 0x558a, 0x0000 }, +@@ -2917,10 +4028,12 @@ struct nomadik_vpip_param vpip_default_p + { DynamicConstrainedWBControls_fpMinimumDamperOutput_LSByte , 0x558e, 0x0000 }, + { DynamicConstrainedWBControls_fpMinimumDamperOutput_MSByte , 0x558d, 0x3a66 }, { DynamicConstrainedWBControls_fpDamperHighThreshold_LSByte , 0x5592, 0x0000 }, { DynamicConstrainedWBControls_fpDamperHighThreshold_MSByte , 0x5591, 0x5a71 }, { DynamicConstrainedWBControls_fDamperDisable , 0x5594, 0x0000 }, @@ -2385,7 +2701,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { Toshiba_AF_NVM_Read_NVM_Far2Near_inf_LSByte , 0x5602, 0x0000 }, { Toshiba_AF_NVM_Read_NVM_Far2Near_inf_MSByte , 0x5601, 0x0000 }, { Toshiba_AF_NVM_Read_NVM_Near2Far_inf_LSByte , 0x5606, 0x0000 }, -@@ -2931,6 +4044,23 @@ struct nomadik_vpip_param vpip_default_p + { Toshiba_AF_NVM_Read_NVM_Near2Far_inf_MSByte , 0x5605, 0x0000 }, + { Toshiba_AF_NVM_Read_NVM_Far2Near_mac_LSByte , 0x560a, 0x0000 }, +@@ -2929,27 +4042,81 @@ struct nomadik_vpip_param vpip_default_p + { Toshiba_AF_NVM_Read_NVM_Near2Far_mac_MSByte , 0x560d, 0x0000 }, + { Toshiba_AF_NVM_Read_NVM_Pos_A_LSByte , 0x5612, 0x0000 }, { Toshiba_AF_NVM_Read_NVM_Pos_A_MSByte , 0x5611, 0x0000 }, { Toshiba_AF_NVM_Read_NVM_Pos_B_LSByte , 0x5616, 0x0000 }, { Toshiba_AF_NVM_Read_NVM_Pos_B_MSByte , 0x5615, 0x0000 }, @@ -2409,7 +2729,10 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { Toshiba_Vcm_Parameters_wLowLevelMacroPos_LSByte , 0x5682, 0x0000 }, { Toshiba_Vcm_Parameters_wLowLevelMacroPos_MSByte , 0x5681, 0x0000 }, { Toshiba_Vcm_Parameters_wLowLevelInfinityPos_LSByte , 0x5686, 0x0000 }, -@@ -2941,13 +4071,50 @@ struct nomadik_vpip_param vpip_default_p + { Toshiba_Vcm_Parameters_wLowLevelInfinityPos_MSByte , 0x5685, 0x0000 }, + { Toshiba_Vcm_Parameters_bSlewControlModeEnable , 0x5688, 0x0000 }, + { Toshiba_Vcm_Parameters_bSlewModeForSmallerStep , 0x568a, 0x0001 }, + { Toshiba_Vcm_Parameters_bSlewRateForSmallerStep , 0x568c, 0x0004 }, { Toshiba_Vcm_Parameters_bSlewModeForLargerStep , 0x568e, 0x0008 }, { Toshiba_Vcm_Parameters_bSlewRateForLargerStep , 0x5690, 0x0007 }, { Toshiba_Vcm_Parameters_bThresholdStepSize , 0x5692, 0x00b0 }, @@ -2460,7 +2783,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ColourEngine1_ColourMatrixFarSensor_fpRInR_LSByte , 0x5802, 0x0000 }, { ColourEngine1_ColourMatrixFarSensor_fpRInR_MSByte , 0x5801, 0x3f0c }, { ColourEngine1_ColourMatrixFarSensor_fpGInR_LSByte , 0x5806, 0x0000 }, -@@ -2966,6 +4133,8 @@ struct nomadik_vpip_param vpip_default_p + { ColourEngine1_ColourMatrixFarSensor_fpGInR_MSByte , 0x5805, 0xb887 }, + { ColourEngine1_ColourMatrixFarSensor_fpBInR_LSByte , 0x580a, 0x0000 }, +@@ -2964,10 +4131,12 @@ struct nomadik_vpip_param vpip_default_p + { ColourEngine1_ColourMatrixFarSensor_fpRInB_MSByte , 0x5819, 0xbc6e }, + { ColourEngine1_ColourMatrixFarSensor_fpGInB_LSByte , 0x581e, 0x0000 }, { ColourEngine1_ColourMatrixFarSensor_fpGInB_MSByte , 0x581d, 0xc01b }, { ColourEngine1_ColourMatrixFarSensor_fpBInB_LSByte , 0x5822, 0x0000 }, { ColourEngine1_ColourMatrixFarSensor_fpBInB_MSByte , 0x5821, 0x41b7 }, @@ -2469,7 +2796,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ColourEngine1_ColourMatrixNearSensor_fpRInR_LSByte , 0x5882, 0x0000 }, { ColourEngine1_ColourMatrixNearSensor_fpRInR_MSByte , 0x5881, 0x0000 }, { ColourEngine1_ColourMatrixNearSensor_fpGInR_LSByte , 0x5886, 0x0000 }, -@@ -2984,24 +4153,50 @@ struct nomadik_vpip_param vpip_default_p + { ColourEngine1_ColourMatrixNearSensor_fpGInR_MSByte , 0x5885, 0x0000 }, + { ColourEngine1_ColourMatrixNearSensor_fpBInR_LSByte , 0x588a, 0x0000 }, +@@ -2982,106 +4151,155 @@ struct nomadik_vpip_param vpip_default_p + { ColourEngine1_ColourMatrixNearSensor_fpRInB_MSByte , 0x5899, 0x0000 }, + { ColourEngine1_ColourMatrixNearSensor_fpGInB_LSByte , 0x589e, 0x0000 }, { ColourEngine1_ColourMatrixNearSensor_fpGInB_MSByte , 0x589d, 0x0000 }, { ColourEngine1_ColourMatrixNearSensor_fpBInB_LSByte , 0x58a2, 0x0000 }, { ColourEngine1_ColourMatrixNearSensor_fpBInB_MSByte , 0x58a1, 0x0000 }, @@ -2523,7 +2854,9 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ModeSetupBank3_bActiveSensor , 0x3b98,0x2}, -@@ -3011,20 +4206,25 @@ EXPORT_SYMBOL(vpip_default_params); + }; + EXPORT_SYMBOL(vpip_default_params); + struct nomadik_vpip_param vpip_default_params_orig[2700]= @@ -2552,7 +2885,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 }, -@@ -3034,52 +4234,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 }, @@ -2649,7 +2984,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 }, -@@ -3092,22 +4310,37 @@ struct nomadik_vpip_param vpip_default_p + { PipeSetupBankB_uwPipeOutputSize_Y_MSByte , 0x0405, 0x0000 }, + { PipeSetupBankB_bPipeOutputFormat , 0x0408, 0x0000 }, +@@ -3090,26 +4308,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 }, @@ -2688,7 +3027,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 }, -@@ -3120,13 +4353,19 @@ struct nomadik_vpip_param vpip_default_p + { LocalPipe0SetupBank_uwPipeOutputSize_Y_MSByte , 0x0685, 0x0000 }, + { LocalPipe0SetupBank_bPipeOutputFormat , 0x0688, 0x0000 }, +@@ -3118,83 +4351,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 }, @@ -2708,7 +3051,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 }, -@@ -3136,27 +4375,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 }, @@ -2757,7 +3102,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 }, -@@ -3164,24 +4421,36 @@ struct nomadik_vpip_param vpip_default_p + { MasterI2cStatus_fTransactionError , 0x0a06, 0x0000 }, { MasterI2cStatus_bNumberOfTransactionFailures , 0x0a08, 0x0000 }, { MasterI2cStatus_bNumberOfConsecutiveGrabFailures , 0x0a0a, 0x0000 }, { MasterI2cStatus_bNumberOfForcedReleases , 0x0a0c, 0x0000 }, @@ -2797,7 +3142,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 }, -@@ -3192,7 +4461,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 }, @@ -2806,7 +3154,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 }, -@@ -3214,6 +4483,9 @@ struct nomadik_vpip_param vpip_default_p + { VideoTimingSensorConstraints_uwMaximumVTSysClockDiv_LSByte , 0x0c1e, 0x0000 }, + { VideoTimingSensorConstraints_uwMaximumVTSysClockDiv_MSByte , 0x0c1d, 0x0000 }, +@@ -3212,17 +4481,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 }, @@ -2816,7 +3168,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 }, -@@ -3221,6 +4493,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 }, @@ -2826,7 +3178,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 }, -@@ -3249,7 +4524,13 @@ struct nomadik_vpip_param vpip_default_p + { VideoTimingOutput_fpPllInputFrequency_Mhz_MSByte , 0x0d05, 0x0000 }, + { VideoTimingOutput_uwPllMultiplier_LSByte , 0x0d0a, 0x0000 }, +@@ -3247,24 +4522,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 }, @@ -2840,7 +3196,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 }, -@@ -3258,11 +4539,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 }, @@ -2858,7 +3215,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 }, -@@ -3295,6 +4582,9 @@ struct nomadik_vpip_param vpip_default_p + { VideoTimingFarSensorConstraints_uwMaximumPrePllClockDiv_MSByte , 0x0f05, 0x0000 }, + { VideoTimingFarSensorConstraints_fpMinimumPllInputFrequency_Mhz_LSByte , 0x0f0a, 0x0000 }, +@@ -3293,17 +4580,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 }, @@ -2868,7 +3229,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 }, -@@ -3302,6 +4592,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 }, @@ -2878,7 +3239,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 }, -@@ -3330,7 +4623,13 @@ struct nomadik_vpip_param vpip_default_p + { VideoTimingFarOutput_fpPllInputFrequency_Mhz_MSByte , 0x1005, 0x0000 }, + { VideoTimingFarOutput_uwPllMultiplier_LSByte , 0x100a, 0x0000 }, +@@ -3328,24 +4621,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 }, @@ -2892,7 +3257,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 }, -@@ -3339,11 +4638,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 }, @@ -2910,7 +3276,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 }, -@@ -3376,6 +4681,9 @@ struct nomadik_vpip_param vpip_default_p + { VideoTimingNearSensorConstraints_uwMaximumPrePllClockDiv_MSByte , 0x1205, 0x0000 }, + { VideoTimingNearSensorConstraints_fpMinimumPllInputFrequency_Mhz_LSByte , 0x120a, 0x0000 }, +@@ -3374,17 +4679,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 }, @@ -2920,7 +3290,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 }, -@@ -3383,6 +4691,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 }, @@ -2930,7 +3300,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 }, -@@ -3411,35 +4722,47 @@ struct nomadik_vpip_param vpip_default_p + { VideoTimingNearOutput_fpPllInputFrequency_Mhz_MSByte , 0x1305, 0x0000 }, + { VideoTimingNearOutput_uwPllMultiplier_LSByte , 0x130a, 0x0000 }, +@@ -3409,39 +4720,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 }, @@ -2987,7 +3361,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 }, -@@ -3451,8 +4774,10 @@ struct nomadik_vpip_param vpip_default_p + { SensorCapabilitiesFarSensor_uwSensorMinimumCoarseIntegrationLines_MSByte , 0x1505, 0x0000 }, + { SensorCapabilitiesFarSensor_uwSensorCoarseIntegrationTimeMaxMargin_LSByte , 0x150a, 0x0000 }, +@@ -3449,12 +4772,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 }, @@ -2998,7 +3376,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 }, -@@ -3486,7 +4811,11 @@ struct nomadik_vpip_param vpip_default_p + { SensorCapabilitiesFarSensor_uwSensorAnalogGainType_LSByte , 0x1522, 0x0000 }, + { SensorCapabilitiesFarSensor_uwSensorAnalogGainType_MSByte , 0x1521, 0x0000 }, +@@ -3484,11 +4809,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 }, @@ -3010,7 +3392,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 }, -@@ -3499,8 +4828,8 @@ struct nomadik_vpip_param vpip_default_p + { SensorCapabilitiesNearSensor_uwSensorMinimumCoarseIntegrationLines_MSByte , 0x1585, 0x0000 }, + { SensorCapabilitiesNearSensor_uwSensorCoarseIntegrationTimeMaxMargin_LSByte , 0x158a, 0x0000 }, +@@ -3497,12 +4826,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 }, @@ -3021,7 +3407,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 }, -@@ -3534,6 +4863,9 @@ struct nomadik_vpip_param vpip_default_p + { SensorCapabilitiesNearSensor_uwSensorAnalogGainType_MSByte , 0x15a1, 0x0000 }, + { SensorCapabilitiesNearSensor_fpSensorAnalogGainConstM0_LSByte , 0x15a6, 0x0000 }, +@@ -3532,10 +4861,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 }, @@ -3031,7 +3421,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 }, -@@ -3545,8 +4877,10 @@ struct nomadik_vpip_param vpip_default_p + { SensorCapabilitiesCurrentSensor_uwSensorMinimumCoarseIntegrationLines_MSByte , 0x1605, 0x0000 }, + { SensorCapabilitiesCurrentSensor_uwSensorCoarseIntegrationTimeMaxMargin_LSByte , 0x160a, 0x0000 }, +@@ -3543,12 +4875,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 }, @@ -3042,7 +3436,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 }, -@@ -3581,6 +4915,9 @@ struct nomadik_vpip_param vpip_default_p + { SensorCapabilitiesCurrentSensor_uwSensorAnalogGainType_LSByte , 0x1622, 0x0000 }, + { SensorCapabilitiesCurrentSensor_uwSensorAnalogGainType_MSByte , 0x1621, 0x0000 }, +@@ -3579,10 +4913,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 }, @@ -3052,7 +3450,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 }, -@@ -3609,6 +4946,9 @@ struct nomadik_vpip_param vpip_default_p + { SensorFrameConstraintsFar_uwVTYAddrMin_MSByte , 0x1685, 0x0000 }, + { SensorFrameConstraintsFar_uwVTXAddrMax_LSByte , 0x168a, 0x0000 }, +@@ -3607,10 +4944,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 }, @@ -3062,7 +3464,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 }, -@@ -3637,8 +4977,14 @@ struct nomadik_vpip_param vpip_default_p + { SensorFrameConstraintsNear_uwVTYAddrMin_MSByte , 0x1705, 0x0000 }, + { SensorFrameConstraintsNear_uwVTXAddrMax_LSByte , 0x170a, 0x0000 }, +@@ -3635,12 +4975,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 }, @@ -3079,7 +3485,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 }, -@@ -3670,6 +5016,9 @@ struct nomadik_vpip_param vpip_default_p + { CurrentFrameDimension_uwVTLineLengthPck_MSByte , 0x1805, 0x0000 }, + { CurrentFrameDimension_uwVTXAddrStart_LSByte , 0x180a, 0x0000 }, +@@ -3668,10 +5014,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 }, @@ -3089,7 +3499,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 }, -@@ -3698,12 +5047,18 @@ struct nomadik_vpip_param vpip_default_p + { SensorFrameConstraints_uwVTYAddrMin_MSByte , 0x1885, 0x0000 }, + { SensorFrameConstraints_uwVTXAddrMax_LSByte , 0x188a, 0x0000 }, +@@ -3696,16 +5045,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 }, @@ -3108,7 +3522,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 }, -@@ -3726,49 +5081,93 @@ struct nomadik_vpip_param vpip_default_p + { FrameDimensionStatus_uwVTFrameLengthPending_lines_MSByte , 0x1985, 0x0000 }, + { FrameDimensionStatus_fFrameLengthChangeInhibitedForCoarseExposure , 0x1988, 0x0000 }, +@@ -3724,53 +5079,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 }, @@ -3217,7 +3635,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 }, -@@ -3792,24 +5191,29 @@ struct nomadik_vpip_param vpip_default_p + { FlashManagerStatus_fpMainFlashPulseWidth_us_MSByte , 0x1d05, 0x0000 }, + { FlashManagerStatus_fpPreFlashPulseWidth_us_LSByte , 0x1d0a, 0x0000 }, +@@ -3790,46 +5189,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 }, @@ -3251,7 +3673,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 }, -@@ -3820,14 +5224,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 }, @@ -3278,7 +3703,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 }, -@@ -3851,6 +5265,9 @@ struct nomadik_vpip_param vpip_default_p + { ExposureStatus_uwCoarseIntegrationPending_lines_MSByte , 0x1e09, 0x0000 }, + { ExposureStatus_uwFineIntegrationPending_pixels_LSByte , 0x1e0e, 0x0000 }, +@@ -3849,31 +5263,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 }, @@ -3288,7 +3717,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 }, -@@ -3859,8 +5276,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 }, @@ -3303,7 +3733,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 }, -@@ -3868,10 +5291,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 }, @@ -3320,7 +3750,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 }, -@@ -3885,9 +5314,14 @@ struct nomadik_vpip_param vpip_default_p + { ExposureAlgorithmControls_fpMinimumStep_MSByte , 0x2085, 0x0000 }, + { ExposureAlgorithmControls_fpMinimumDesiredExposureTime_us_LSByte , 0x208a, 0x0000 }, +@@ -3883,13 +5312,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 }, @@ -3335,7 +3769,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ExposureAlgorithmControls_fpRelativeIntTimeHysThreshold_LSByte , 0x20a2, 0x0000 }, { ExposureAlgorithmControls_fpRelativeIntTimeHysThreshold_MSByte , 0x20a1, 0x0000 }, { ExposureAlgorithmControls_fpRelativeDigitalGainHysThreshold_LSByte , 0x20a6, 0x0000 }, -@@ -3903,34 +5337,61 @@ struct nomadik_vpip_param vpip_default_p + { ExposureAlgorithmControls_fpRelativeDigitalGainHysThreshold_MSByte , 0x20a5, 0x0000 }, + { ExposureAlgorithmControls_fpRelativeCompilationProblemThreshold_LSByte , 0x20aa, 0x0000 }, +@@ -3901,53 +5335,103 @@ struct nomadik_vpip_param vpip_default_p + { ExposureAlgorithmControls_fpMaximumManualExposureTime_s_LSByte , 0x20b6, 0x0000 }, + { ExposureAlgorithmControls_fpMaximumManualExposureTime_s_MSByte , 0x20b5, 0x0000 }, { ExposureAlgorithmControls_fpRelativeStabilityThresholdForAutoFocus_LSByte , 0x20ba, 0x0000 }, { ExposureAlgorithmControls_fpRelativeStabilityThresholdForAutoFocus_MSByte , 0x20b9, 0x0000 }, { ExposureAlgorithmControls_bLeakShift , 0x20bc, 0x0000 }, @@ -3402,7 +3840,8 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { WhiteBalanceStatus_bStatus , 0x2380, 0x0000 }, { WhiteBalanceStatus_fUnityGainsUsed , 0x2382, 0x0000 }, { WhiteBalanceStatus_fpRedGain_LSByte , 0x2386, 0x0000 }, -@@ -3939,13 +5400,36 @@ struct nomadik_vpip_param vpip_default_p + { WhiteBalanceStatus_fpRedGain_MSByte , 0x2385, 0x0000 }, + { WhiteBalanceStatus_fpGreenGain_LSByte , 0x238a, 0x0000 }, { WhiteBalanceStatus_fpGreenGain_MSByte , 0x2389, 0x0000 }, { WhiteBalanceStatus_fpBlueGain_LSByte , 0x238e, 0x0000 }, { WhiteBalanceStatus_fpBlueGain_MSByte , 0x238d, 0x0000 }, @@ -3439,7 +3878,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { MinWeightedWBControls_fDisable , 0x2500, 0x0000 }, { MinWeightedWBControls_uwSaturationThreshold_LSByte , 0x2504, 0x0000 }, { MinWeightedWBControls_uwSaturationThreshold_MSByte , 0x2503, 0x0300 }, -@@ -3958,6 +5442,9 @@ struct nomadik_vpip_param vpip_default_p + { MinWeightedWBControls_fpRedTiltGain_LSByte , 0x2508, 0x0000 }, + { MinWeightedWBControls_fpRedTiltGain_MSByte , 0x2507, 0x3e00 }, +@@ -3956,38 +5440,56 @@ struct nomadik_vpip_param vpip_default_p + { MinWeightedWBControls_fpGreen2TiltGain_LSByte , 0x2510, 0x0000 }, + { MinWeightedWBControls_fpGreen2TiltGain_MSByte , 0x250f, 0x3e40 }, { MinWeightedWBControls_fpBlueTiltGain_LSByte , 0x2514, 0x0000 }, { MinWeightedWBControls_fpBlueTiltGain_MSByte , 0x2513, 0x3e40 }, { MinWeightedWBControls_GreenChannelToAccumulate , 0x2516, 0x0000 }, @@ -3449,7 +3892,10 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { MinWeightedWBStatus_uwZone_X_Offset_LSByte , 0x2582, 0x0000 }, { MinWeightedWBStatus_uwZone_X_Offset_MSByte , 0x2581, 0x0000 }, { MinWeightedWBStatus_uwZone_Y_Offset_LSByte , 0x2586, 0x0000 }, -@@ -3968,24 +5455,39 @@ struct nomadik_vpip_param vpip_default_p + { MinWeightedWBStatus_uwZone_Y_Offset_MSByte , 0x2585, 0x0000 }, + { MinWeightedWBStatus_uwZone_X_Size_LSByte , 0x258a, 0x0000 }, + { MinWeightedWBStatus_uwZone_X_Size_MSByte , 0x2589, 0x0000 }, + { MinWeightedWBStatus_uwZone_Y_Size_LSByte , 0x258e, 0x0000 }, { MinWeightedWBStatus_uwZone_Y_Size_MSByte , 0x258d, 0x0000 }, { MinWeightedWBStatus_fpNumberMacroPixel_LSByte , 0x2592, 0x0000 }, { MinWeightedWBStatus_fpNumberMacroPixel_MSByte , 0x2591, 0x0000 }, @@ -3499,7 +3945,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AutomaticFrameRateStatus_fpImpliedGain_LSByte , 0x2782, 0x0000 }, { AutomaticFrameRateStatus_fpImpliedGain_MSByte , 0x2781, 0x0000 }, { AutomaticFrameRateStatus_uwMaximumFrameLength_lines_LSByte , 0x2786, 0x0000 }, -@@ -4002,9 +5504,20 @@ struct nomadik_vpip_param vpip_default_p + { AutomaticFrameRateStatus_uwMaximumFrameLength_lines_MSByte , 0x2785, 0x0000 }, + { AutomaticFrameRateStatus_uwMinimumFrameLength_lines_LSByte , 0x278a, 0x0000 }, +@@ -4000,32 +5502,99 @@ struct nomadik_vpip_param vpip_default_p + { AutomaticFrameRateStatus_uwCurrentFrameLength_lines_MSByte , 0x2795, 0x0000 }, + { AutomaticFrameRateStatus_uwDesiredFrameLength_lines_LSByte , 0x279a, 0x0000 }, { AutomaticFrameRateStatus_uwDesiredFrameLength_lines_MSByte , 0x2799, 0x0000 }, { AutomaticFrameRateStatus_fAutomaticFrameRateStable , 0x279c, 0x0000 }, { AutomaticFrameRateStatus_fAutomaticFrameRateClip , 0x279e, 0x0000 }, @@ -3520,7 +3970,10 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { StaticFrameRateStatus_uwRequestedFrameRate_Hz_LSByte , 0x2882, 0x0000 }, { StaticFrameRateStatus_uwRequestedFrameRate_Hz_MSByte , 0x2881, 0x0000 }, { StaticFrameRateStatus_uwMaxFrameRate_Hz_LSByte , 0x2886, 0x0000 }, -@@ -4015,15 +5528,71 @@ struct nomadik_vpip_param vpip_default_p + { StaticFrameRateStatus_uwMaxFrameRate_Hz_MSByte , 0x2885, 0x0000 }, + { StaticFrameRateStatus_uwMinFrameRate_Hz_LSByte , 0x288a, 0x0000 }, + { StaticFrameRateStatus_uwMinFrameRate_Hz_MSByte , 0x2889, 0x0000 }, + { StaticFrameRateStatus_fChangePending , 0x288c, 0x0000 }, { StaticFrameRateStatus_uwRequiredFrameLength_lines_LSByte , 0x2890, 0x0000 }, { StaticFrameRateStatus_uwRequiredFrameLength_lines_MSByte , 0x288f, 0x0000 }, { StaticFrameRateStatus_ClipFrameRate , 0x2892, 0x0000 }, @@ -3592,7 +4045,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ColourEngine0_ColourMatrixFarSensor_fpRInR_LSByte , 0x2b02, 0x0000 }, { ColourEngine0_ColourMatrixFarSensor_fpRInR_MSByte , 0x2b01, 0x3fd3 }, { ColourEngine0_ColourMatrixFarSensor_fpGInR_LSByte , 0x2b06, 0x0000 }, -@@ -4042,6 +5611,8 @@ struct nomadik_vpip_param vpip_default_p + { ColourEngine0_ColourMatrixFarSensor_fpGInR_MSByte , 0x2b05, 0xbce0 }, + { ColourEngine0_ColourMatrixFarSensor_fpBInR_LSByte , 0x2b0a, 0x0000 }, +@@ -4040,10 +5609,12 @@ struct nomadik_vpip_param vpip_default_p + { ColourEngine0_ColourMatrixFarSensor_fpRInB_MSByte , 0x2b19, 0xb717 }, + { ColourEngine0_ColourMatrixFarSensor_fpGInB_LSByte , 0x2b1e, 0x0000 }, { ColourEngine0_ColourMatrixFarSensor_fpGInB_MSByte , 0x2b1d, 0xbd29 }, { ColourEngine0_ColourMatrixFarSensor_fpBInB_LSByte , 0x2b22, 0x0000 }, { ColourEngine0_ColourMatrixFarSensor_fpBInB_MSByte , 0x2b21, 0x3fc6 }, @@ -3601,7 +4058,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ColourEngine0_ColourMatrixNearSensor_fpRInR_LSByte , 0x2b82, 0x0002 }, { ColourEngine0_ColourMatrixNearSensor_fpRInR_MSByte , 0x2b81, 0x6400 }, { ColourEngine0_ColourMatrixNearSensor_fpGInR_LSByte , 0x2b86, 0x0002 }, -@@ -4060,6 +5631,9 @@ struct nomadik_vpip_param vpip_default_p + { ColourEngine0_ColourMatrixNearSensor_fpGInR_MSByte , 0x2b85, 0x6400 }, + { ColourEngine0_ColourMatrixNearSensor_fpBInR_LSByte , 0x2b8a, 0x0002 }, +@@ -4058,10 +5629,13 @@ struct nomadik_vpip_param vpip_default_p + { ColourEngine0_ColourMatrixNearSensor_fpRInB_MSByte , 0x2b99, 0xe900 }, + { ColourEngine0_ColourMatrixNearSensor_fpGInB_LSByte , 0x2b9e, 0x0000 }, { ColourEngine0_ColourMatrixNearSensor_fpGInB_MSByte , 0x2b9d, 0xe900 }, { ColourEngine0_ColourMatrixNearSensor_fpBInB_LSByte , 0x2ba2, 0x0000 }, { ColourEngine0_ColourMatrixNearSensor_fpBInB_MSByte , 0x2ba1, 0xe900 }, @@ -3611,7 +4072,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ColourEngine0_ColourMatrixDamped_wRInR_LSByte , 0x2c02, 0x0000 }, { ColourEngine0_ColourMatrixDamped_wRInR_MSByte , 0x2c01, 0x0000 }, { ColourEngine0_ColourMatrixDamped_wGInR_LSByte , 0x2c06, 0x0000 }, -@@ -4078,6 +5652,18 @@ struct nomadik_vpip_param vpip_default_p + { ColourEngine0_ColourMatrixDamped_wGInR_MSByte , 0x2c05, 0x0000 }, + { ColourEngine0_ColourMatrixDamped_wBInR_LSByte , 0x2c0a, 0x0000 }, +@@ -4076,17 +5650,53 @@ struct nomadik_vpip_param vpip_default_p + { ColourEngine0_ColourMatrixDamped_wRInB_MSByte , 0x2c19, 0x0000 }, + { ColourEngine0_ColourMatrixDamped_wGInB_LSByte , 0x2c1e, 0x0000 }, { ColourEngine0_ColourMatrixDamped_wGInB_MSByte , 0x2c1d, 0x0000 }, { ColourEngine0_ColourMatrixDamped_wBInB_LSByte , 0x2c22, 0x0000 }, { ColourEngine0_ColourMatrixDamped_wBInB_MSByte , 0x2c21, 0x0000 }, @@ -3630,7 +4095,7 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ColourEngine0_ColourMatrixDamperControl_fDisableMatrixDamping , 0x2c80, 0x0000 }, { ColourEngine0_ColourMatrixDamperControl_DamperLowThreshold_LSByte , 0x2c84, 0x0000 }, { ColourEngine0_ColourMatrixDamperControl_DamperLowThreshold_MSByte , 0x2c83, 0x62ac }, -@@ -4085,6 +5671,30 @@ struct nomadik_vpip_param vpip_default_p + { ColourEngine0_ColourMatrixDamperControl_DamperHighThreshold_LSByte , 0x2c88, 0x0000 }, { ColourEngine0_ColourMatrixDamperControl_DamperHighThreshold_MSByte , 0x2c87, 0x64ac }, { ColourEngine0_ColourMatrixDamperControl_MinimumDamperOutput_LSByte , 0x2c8c, 0x0000 }, { ColourEngine0_ColourMatrixDamperControl_MinimumDamperOutput_MSByte , 0x2c8b, 0x0000 }, @@ -3661,7 +4126,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ColourEngine0_ApertureCorrectionControls_fDisableCorrection , 0x2d00, 0x0000 }, { ColourEngine0_ApertureCorrectionControls_bMaxGain , 0x2d02, 0x0010 }, { ColourEngine0_ApertureCorrectionControls_fDisableGainDamping , 0x2d04, 0x0000 }, -@@ -4103,9 +5713,25 @@ struct nomadik_vpip_param vpip_default_p + { ColourEngine0_ApertureCorrectionControls_DamperLowThreshold_Gain_LSByte , 0x2d08, 0x0000 }, + { ColourEngine0_ApertureCorrectionControls_DamperLowThreshold_Gain_MSByte , 0x2d07, 0x5871 }, +@@ -4101,21 +5711,53 @@ struct nomadik_vpip_param vpip_default_p + { ColourEngine0_ApertureCorrectionControls_DamperLowThreshold_Coring_MSByte , 0x2d19, 0x5871 }, + { ColourEngine0_ApertureCorrectionControls_DamperHighThreshold_Coring_LSByte , 0x2d1e, 0x0000 }, { ColourEngine0_ApertureCorrectionControls_DamperHighThreshold_Coring_MSByte , 0x2d1d, 0x63d1 }, { ColourEngine0_ApertureCorrectionControls_MinimumDamperOutput_Coring_LSByte , 0x2d22, 0x0000 }, { ColourEngine0_ApertureCorrectionControls_MinimumDamperOutput_Coring_MSByte , 0x2d21, 0x3a00 }, @@ -3687,7 +4156,8 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ColourEngine0_GammaCorrection_fEnabled , 0x2e00, 0x0001 }, { ColourEngine0_GammaCorrection_bMode , 0x2e02, 0x0001 }, { ColourEngine0_GammaCorrection_SharpRed , 0x2e04, 0x0013 }, -@@ -4114,6 +5740,22 @@ struct nomadik_vpip_param vpip_default_p + { ColourEngine0_GammaCorrection_SharpGreen , 0x2e06, 0x0013 }, + { ColourEngine0_GammaCorrection_SharpBlue , 0x2e08, 0x0013 }, { ColourEngine0_GammaCorrection_SoftRed , 0x2e0a, 0x0013 }, { ColourEngine0_GammaCorrection_SoftGreen , 0x2e0c, 0x0013 }, { ColourEngine0_GammaCorrection_SoftBlue , 0x2e0e, 0x0013 }, @@ -3710,7 +4180,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { NoraControls_fDisable , 0x2e80, 0x0001 }, { NoraControls_fDisableNoraPromoting , 0x2e82, 0x0000 }, { NoraControls_bMaximumValue , 0x2e84, 0x0001 }, -@@ -4126,7 +5768,33 @@ struct nomadik_vpip_param vpip_default_p + { NoraControls_fDifferentTextureDegreeForBlue , 0x2e86, 0x0000 }, + { NoraControls_fSplitNoiseLevel , 0x2e88, 0x0000 }, +@@ -4124,11 +5766,37 @@ struct nomadik_vpip_param vpip_default_p + { NoraControls_DamperLowThreshold_MSByte , 0x2e8d, 0x4000 }, + { NoraControls_DamperHighThreshold_LSByte , 0x2e92, 0x0000 }, { NoraControls_DamperHighThreshold_MSByte , 0x2e91, 0x4500 }, { NoraControls_MinimumDamperOutput_LSByte , 0x2e96, 0x0000 }, { NoraControls_MinimumDamperOutput_MSByte , 0x2e95, 0x0000 }, @@ -3744,7 +4218,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ScytheFilterControls_fDisableFilter , 0x2f80, 0x0000 }, { ScytheFilterControls_fSquareLaw , 0x2f82, 0x0000 }, { ScytheFilterControls_fDisablePromotingLow , 0x2f84, 0x0000 }, -@@ -4145,6 +5813,29 @@ struct nomadik_vpip_param vpip_default_p + { ScytheFilterControls_fDisablePromotingHigh , 0x2f86, 0x0000 }, + { ScytheFilterControls_bMaxWeightLow , 0x2f88, 0x0010 }, +@@ -4143,10 +5811,33 @@ struct nomadik_vpip_param vpip_default_p + { ScytheFilterControls_fpDamperHighThresholdHigh_MSByte , 0x2f99, 0x68dc }, + { ScytheFilterControls_fpMinimumDamperOutputLow_LSByte , 0x2f9e, 0x0000 }, { ScytheFilterControls_fpMinimumDamperOutputLow_MSByte , 0x2f9d, 0x3a00 }, { ScytheFilterControls_fpMinimumDamperOutputHigh_LSByte , 0x2fa2, 0x0000 }, { ScytheFilterControls_fpMinimumDamperOutputHigh_MSByte , 0x2fa1, 0x3a00 }, @@ -3774,7 +4252,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { JackFilterControls_fDisableFilter , 0x3000, 0x0000 }, { JackFilterControls_fSquareLaw , 0x3002, 0x0000 }, { JackFilterControls_fDisablePromotingLow , 0x3004, 0x0000 }, -@@ -4163,10 +5854,25 @@ struct nomadik_vpip_param vpip_default_p + { JackFilterControls_fDisablePromotingHigh , 0x3006, 0x0000 }, + { JackFilterControls_bMaxWeightLow , 0x3008, 0x0010 }, +@@ -4161,103 +5852,208 @@ struct nomadik_vpip_param vpip_default_p + { JackFilterControls_fpDamperHighThresholdHigh_MSByte , 0x3019, 0x68dc }, + { JackFilterControls_fpMinimumDamperOutputLow_LSByte , 0x301e, 0x0000 }, { JackFilterControls_fpMinimumDamperOutputLow_MSByte , 0x301d, 0x0000 }, { JackFilterControls_fpMinimumDamperOutputHigh_LSByte , 0x3022, 0x0000 }, { JackFilterControls_fpMinimumDamperOutputHigh_MSByte , 0x3021, 0x0000 }, @@ -3800,7 +4282,8 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { VfpnControls_fEnableCorrection , 0x3100, 0x0000 }, { VfpnControls_uwMaximumPixelValue_LSByte , 0x3104, 0x0000 }, { VfpnControls_uwMaximumPixelValue_MSByte , 0x3103, 0x03ff }, -@@ -4175,15 +5881,61 @@ struct nomadik_vpip_param vpip_default_p + { VfpnControls_uwMinimumPixelValue_LSByte , 0x3108, 0x0000 }, + { VfpnControls_uwMinimumPixelValue_MSByte , 0x3107, 0x0000 }, { VfpnControls_uwPixelSaturationLevel_LSByte , 0x310c, 0x0000 }, { VfpnControls_uwPixelSaturationLevel_MSByte , 0x310b, 0x03ff }, { VfpnControls_bLogThreshLog , 0x310e, 0x0004 }, @@ -3865,7 +4348,9 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AntiVignetteControls_bFilterCoeff_R2_b , 0x3208, 0x0000 }, { AntiVignetteControls_bFilterCoeff_R4_r , 0x320a, 0x0000 }, { AntiVignetteControls_bFilterCoeff_R4_gr , 0x320c, 0x0000 }, -@@ -4193,8 +5945,8 @@ struct nomadik_vpip_param vpip_default_p + { AntiVignetteControls_bFilterCoeff_R4_gb , 0x320e, 0x0000 }, + { AntiVignetteControls_bFilterCoeff_R4_b , 0x3210, 0x0000 }, + { AntiVignetteControls_uwHorizontalOffset_LSByte , 0x3214, 0x0000 }, { AntiVignetteControls_uwHorizontalOffset_MSByte , 0x3213, 0x0000 }, { AntiVignetteControls_uwVerticalOffset_LSByte , 0x3218, 0x0000 }, { AntiVignetteControls_uwVerticalOffset_MSByte , 0x3217, 0x0000 }, @@ -3876,7 +4361,9 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AntiVignetteControls_uwHorizontalOffset_r_LSByte , 0x3220, 0x0000 }, { AntiVignetteControls_uwHorizontalOffset_r_MSByte , 0x321f, 0x0000 }, { AntiVignetteControls_uwHorizontalOffset_gr_LSByte , 0x3224, 0x0000 }, -@@ -4204,18 +5956,22 @@ struct nomadik_vpip_param vpip_default_p + { AntiVignetteControls_uwHorizontalOffset_gr_MSByte , 0x3223, 0x0000 }, + { AntiVignetteControls_uwHorizontalOffset_gb_LSByte , 0x3228, 0x0000 }, + { AntiVignetteControls_uwHorizontalOffset_gb_MSByte , 0x3227, 0x0000 }, { AntiVignetteControls_uwHorizontalOffset_b_LSByte , 0x322c, 0x0000 }, { AntiVignetteControls_uwHorizontalOffset_b_MSByte , 0x322b, 0x0000 }, { AntiVignetteControls_uwVerticalOffset_r_LSByte , 0x3230, 0x0000 }, @@ -3905,7 +4392,8 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AntiVignetteStatus_fXScaleEnabled , 0x3280, 0x0000 }, { AntiVignetteStatus_bXScale , 0x3282, 0x0000 }, { AntiVignetteStatus_fYScaleEnabled , 0x3284, 0x0000 }, -@@ -4224,13 +5980,35 @@ struct nomadik_vpip_param vpip_default_p + { AntiVignetteStatus_bYScale , 0x3286, 0x0000 }, + { AntiVignetteStatus_uwHorizontalSize_LSByte , 0x328a, 0x0000 }, { AntiVignetteStatus_uwHorizontalSize_MSByte , 0x3289, 0x0000 }, { AntiVignetteStatus_uwVerticalSize_LSByte , 0x328e, 0x0000 }, { AntiVignetteStatus_uwVerticalSize_MSByte , 0x328d, 0x0000 }, @@ -3942,7 +4430,8 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ColourEngine0_RadialApertureCorrectionApplicationInputs_uwHOffset_LSByte , 0x3402, 0x0000 }, { ColourEngine0_RadialApertureCorrectionApplicationInputs_uwHOffset_MSByte , 0x3401, 0x0000 }, { ColourEngine0_RadialApertureCorrectionApplicationInputs_uwVOffset_LSByte , 0x3406, 0x0000 }, -@@ -4239,9 +6017,21 @@ struct nomadik_vpip_param vpip_default_p + { ColourEngine0_RadialApertureCorrectionApplicationInputs_uwVOffset_MSByte , 0x3405, 0x0000 }, + { ColourEngine0_RadialApertureCorrectionApplicationInputs_uwHScalingFactor_LSByte , 0x340a, 0x0000 }, { ColourEngine0_RadialApertureCorrectionApplicationInputs_uwHScalingFactor_MSByte , 0x3409, 0x0000 }, { ColourEngine0_RadialApertureCorrectionApplicationInputs_uwVScalingFactor_LSByte , 0x340e, 0x0000 }, { ColourEngine0_RadialApertureCorrectionApplicationInputs_uwVScalingFactor_MSByte , 0x340d, 0x0000 }, @@ -3964,7 +4453,8 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ColourEngine0_CoderOutputSignalRange_uwLumaExcursion_LSByte , 0x3502, 0x0000 }, { ColourEngine0_CoderOutputSignalRange_uwLumaExcursion_MSByte , 0x3501, 0x0000 }, { ColourEngine0_CoderOutputSignalRange_uwLumaMidpointTimes2_LSByte , 0x3506, 0x0000 }, -@@ -4250,12 +6040,18 @@ struct nomadik_vpip_param vpip_default_p + { ColourEngine0_CoderOutputSignalRange_uwLumaMidpointTimes2_MSByte , 0x3505, 0x0000 }, + { ColourEngine0_CoderOutputSignalRange_uwChromaExcursion_LSByte , 0x350a, 0x0000 }, { ColourEngine0_CoderOutputSignalRange_uwChromaExcursion_MSByte , 0x3509, 0x0000 }, { ColourEngine0_CoderOutputSignalRange_uwChromaMidpointTimes2_LSByte , 0x350e, 0x0000 }, { ColourEngine0_CoderOutputSignalRange_uwChromaMidpointTimes2_MSByte , 0x350d, 0x0000 }, @@ -3983,7 +4473,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ColourEngine0_OutputCoderMatrix_w0_0_LSByte , 0x3602, 0x0000 }, { ColourEngine0_OutputCoderMatrix_w0_0_MSByte , 0x3601, 0x0000 }, { ColourEngine0_OutputCoderMatrix_w0_1_LSByte , 0x3606, 0x0000 }, -@@ -4274,6 +6070,20 @@ struct nomadik_vpip_param vpip_default_p + { ColourEngine0_OutputCoderMatrix_w0_1_MSByte , 0x3605, 0x0000 }, + { ColourEngine0_OutputCoderMatrix_w0_2_LSByte , 0x360a, 0x0000 }, +@@ -4272,37 +6068,91 @@ struct nomadik_vpip_param vpip_default_p + { ColourEngine0_OutputCoderMatrix_w2_0_MSByte , 0x3619, 0x0000 }, + { ColourEngine0_OutputCoderMatrix_w2_1_LSByte , 0x361e, 0x0000 }, { ColourEngine0_OutputCoderMatrix_w2_1_MSByte , 0x361d, 0x0000 }, { ColourEngine0_OutputCoderMatrix_w2_2_LSByte , 0x3622, 0x0000 }, { ColourEngine0_OutputCoderMatrix_w2_2_MSByte , 0x3621, 0x0000 }, @@ -4004,7 +4498,9 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ColourEngine0_FadeToBlack_fDisable , 0x3680, 0x0001 }, { ColourEngine0_FadeToBlack_fpBlackValue_LSByte , 0x3684, 0x0000 }, { ColourEngine0_FadeToBlack_fpBlackValue_MSByte , 0x3683, 0x0000 }, -@@ -4283,10 +6093,48 @@ struct nomadik_vpip_param vpip_default_p + { ColourEngine0_FadeToBlack_fpDamperLowThreshold_LSByte , 0x3688, 0x0000 }, + { ColourEngine0_FadeToBlack_fpDamperLowThreshold_MSByte , 0x3687, 0x63d1 }, + { ColourEngine0_FadeToBlack_fpDamperHighThreshold_LSByte , 0x368c, 0x0000 }, { ColourEngine0_FadeToBlack_fpDamperHighThreshold_MSByte , 0x368b, 0x656f }, { ColourEngine0_FadeToBlack_fpDamperOutput_LSByte , 0x3690, 0x0000 }, { ColourEngine0_FadeToBlack_fpDamperOutput_MSByte , 0x368f, 0x0000 }, @@ -4053,7 +4549,8 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ZoomMgrParams_fAntiZip , 0x3780, 0x0000 }, { ZoomMgrParams_bFilterCrispness0 , 0x3782, 0x0000 }, { ZoomMgrParams_bFilterCrispness1 , 0x3784, 0x0000 }, -@@ -4295,12 +6143,14 @@ struct nomadik_vpip_param vpip_default_p + { ZoomMgrParams_fInFromOutARLock , 0x3786, 0x0000 }, + { ZoomMgrParams_bPrescaleFactor , 0x3788, 0x0000 }, { ZoomMgrParams_bPrescaleType , 0x378a, 0x0000 }, { ZoomMgrParams_fp16ZoomRange_LSByte , 0x378e, 0x0000 }, { ZoomMgrParams_fp16ZoomRange_MSByte , 0x378d, 0x100 }, @@ -4069,7 +4566,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ZoomMgrCtrl_bChgOverMarginShift , 0x380c, 0x0000 }, { ZoomMgrCtrl_fCheckDataRate , 0x380e, 0x0000 }, { ZoomMgrCtrl_fSetAlternateInitWOI , 0x3810, 0x0000 }, -@@ -4312,6 +6162,9 @@ struct nomadik_vpip_param vpip_default_p + { ZoomMgrCtrl_fSetX_Byte0 , 0x3812, 0x0000 }, + { ZoomMgrCtrl_fSetX_Byte1 , 0x3814, 0x0000 }, +@@ -4310,10 +6160,13 @@ struct nomadik_vpip_param vpip_default_p + { ZoomMgrCtrl_fSetX_Byte3 , 0x3818, 0x0000 }, + { ZoomMgrCtrl_fp16P0ScaleLowLimit_LSByte , 0x381c, 0x0000 }, { ZoomMgrCtrl_fp16P0ScaleLowLimit_MSByte , 0x381b, 0x0000 }, { ZoomMgrCtrl_fp16P1ScaleLowLimit_LSByte , 0x3820, 0x0000 }, { ZoomMgrCtrl_fp16P1ScaleLowLimit_MSByte , 0x381f, 0x0000 }, @@ -4079,7 +4580,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ZoomMgrStatus_fReady , 0x3880, 0x0000 }, { ZoomMgrStatus_bDeviceTestCoin , 0x3882, 0x0000 }, { ZoomMgrStatus_bNextCmd , 0x3884, 0x0000 }, -@@ -4345,6 +6198,24 @@ struct nomadik_vpip_param vpip_default_p + { ZoomMgrStatus_bLastCmd , 0x3886, 0x0000 }, + { ZoomMgrStatus_bCommandStatus , 0x3888, 0x0000 }, +@@ -4343,10 +6196,28 @@ struct nomadik_vpip_param vpip_default_p + { ZoomMgrStatus_fMinFOVX_Byte3 , 0x38b8, 0x0000 }, + { ZoomMgrStatus_uwXOrigin_LSByte , 0x38bc, 0x0000 }, { ZoomMgrStatus_uwXOrigin_MSByte , 0x38bb, 0x0000 }, { ZoomMgrStatus_uwYOrigin_LSByte , 0x38c0, 0x0000 }, { ZoomMgrStatus_uwYOrigin_MSByte , 0x38bf, 0x0000 }, @@ -4104,7 +4609,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { WhiteBalanceConstrainerControls_fpRedA_LSByte , 0x3902, 0x0000 }, { WhiteBalanceConstrainerControls_fpRedA_MSByte , 0x3901, 0x0000 }, { WhiteBalanceConstrainerControls_fpBlueA_LSByte , 0x3906, 0x0000 }, -@@ -4356,6 +6227,9 @@ struct nomadik_vpip_param vpip_default_p + { WhiteBalanceConstrainerControls_fpBlueA_MSByte , 0x3905, 0x0000 }, + { WhiteBalanceConstrainerControls_fpRedB_LSByte , 0x390a, 0x0000 }, +@@ -4354,25 +6225,34 @@ struct nomadik_vpip_param vpip_default_p + { WhiteBalanceConstrainerControls_fpBlueB_LSByte , 0x390e, 0x0000 }, + { WhiteBalanceConstrainerControls_fpBlueB_MSByte , 0x390d, 0x3acf }, { WhiteBalanceConstrainerControls_fpMaximumDistanceAllowedFromLocus_LSByte , 0x3912, 0x0000 }, { WhiteBalanceConstrainerControls_fpMaximumDistanceAllowedFromLocus_MSByte , 0x3911, 0x2e8e }, { WhiteBalanceConstrainerControls_fEnableConstrainedWhiteBalance , 0x3914, 0x0001 }, @@ -4114,7 +4623,7 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { WhiteBalanceConstrainerOutput_fpOutputRedGain_LSByte , 0x3982, 0x0000 }, { WhiteBalanceConstrainerOutput_fpOutputRedGain_MSByte , 0x3981, 0x0000 }, { WhiteBalanceConstrainerOutput_fpOutputGreenGain_LSByte , 0x3986, 0x0000 }, -@@ -4363,6 +6237,9 @@ struct nomadik_vpip_param vpip_default_p + { WhiteBalanceConstrainerOutput_fpOutputGreenGain_MSByte , 0x3985, 0x0000 }, { WhiteBalanceConstrainerOutput_fpOutputBlueGain_LSByte , 0x398a, 0x0000 }, { WhiteBalanceConstrainerOutput_fpOutputBlueGain_MSByte , 0x3989, 0x0000 }, { WhiteBalanceConstrainerOutput_fAreGainsConstrained , 0x398c, 0x0000 }, @@ -4124,7 +4633,8 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { WhiteBalanceConstrainerInternal_fpGradientOfLocusAB_LSByte , 0x3a02, 0x0000 }, { WhiteBalanceConstrainerInternal_fpGradientOfLocusAB_MSByte , 0x3a01, 0x0000 }, { WhiteBalanceConstrainerInternal_fpDistanceOfInputPointFromLocusAB_LSByte , 0x3a06, 0x0000 }, -@@ -4371,6 +6248,9 @@ struct nomadik_vpip_param vpip_default_p + { WhiteBalanceConstrainerInternal_fpDistanceOfInputPointFromLocusAB_MSByte , 0x3a05, 0x0000 }, + { WhiteBalanceConstrainerInternal_fpConstrainedRedPoint_LSByte , 0x3a0a, 0x0000 }, { WhiteBalanceConstrainerInternal_fpConstrainedRedPoint_MSByte , 0x3a09, 0x0000 }, { WhiteBalanceConstrainerInternal_fpConstrainedBluePoint_LSByte , 0x3a0e, 0x0000 }, { WhiteBalanceConstrainerInternal_fpConstrainedBluePoint_MSByte , 0x3a0d, 0x0000 }, @@ -4134,7 +4644,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ModeSetupBank1_uwInputImageSize_X_LSByte , 0x3a82, 0x0000 }, { ModeSetupBank1_uwInputImageSize_X_MSByte , 0x3a81, 0x0000 }, { ModeSetupBank1_uwInputImageSize_Y_LSByte , 0x3a86, 0x0000 }, -@@ -4383,7 +6263,7 @@ struct nomadik_vpip_param vpip_default_p + { ModeSetupBank1_uwInputImageSize_Y_MSByte , 0x3a85, 0x0000 }, + { ModeSetupBank1_uwMaxImageSize_X_LSByte , 0x3a8a, 0x0000 }, +@@ -4381,11 +6261,11 @@ struct nomadik_vpip_param vpip_default_p + { ModeSetupBank1_uwMaxImageSize_Y_MSByte , 0x3a8d, 0x0000 }, + { ModeSetupBank1_uwMinImageSize_X_LSByte , 0x3a92, 0x0000 }, { ModeSetupBank1_uwMinImageSize_X_MSByte , 0x3a91, 0x0000 }, { ModeSetupBank1_uwMinImageSize_Y_LSByte , 0x3a96, 0x0000 }, { ModeSetupBank1_uwMinImageSize_Y_MSByte , 0x3a95, 0x0000 }, @@ -4143,7 +4657,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ModeSetupBank1_fLowPowerStreaming , 0x3a9a, 0x0000 }, { ModeSetupBank1_bTestMode , 0x3a9c, 0x0000 }, { ModeSetupBank1_bNumberOfStatusLines , 0x3a9e, 0x0000 }, -@@ -4396,9 +6276,18 @@ struct nomadik_vpip_param vpip_default_p + { ModeSetupBank1_bNumberOfDarkLines , 0x3aa0, 0x0000 }, + { ModeSetupBank1_bNumberOfBlackLines , 0x3aa2, 0x0000 }, +@@ -4394,13 +6274,22 @@ struct nomadik_vpip_param vpip_default_p + { ModeSetupBank1_uwNumberOfInterFrameLines_LSByte , 0x3aaa, 0x0000 }, + { ModeSetupBank1_uwNumberOfInterFrameLines_MSByte , 0x3aa9, 0x0000 }, { ModeSetupBank1_bNumberOfDummyColumns , 0x3aac, 0x0000 }, { ModeSetupBank1_bInputImageSource , 0x3aae, 0x0000 }, { ModeSetupBank1_bOutputImageDestination , 0x3ab0, 0x0000 }, @@ -4163,7 +4681,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AntiVignetteControlsFar_bFilterCoeff_R2_r , 0x3c02, 0x0000 }, { AntiVignetteControlsFar_bFilterCoeff_R2_gr , 0x3c04, 0x0000 }, { AntiVignetteControlsFar_bFilterCoeff_R2_gb , 0x3c06, 0x0000 }, -@@ -4434,7 +6323,10 @@ struct nomadik_vpip_param vpip_default_p + { AntiVignetteControlsFar_bFilterCoeff_R2_b , 0x3c08, 0x0000 }, + { AntiVignetteControlsFar_bFilterCoeff_R4_r , 0x3c0a, 0x0000 }, +@@ -4432,11 +6321,14 @@ struct nomadik_vpip_param vpip_default_p + { AntiVignetteControlsFar_bUnityOffset_r , 0x3c3e, 0x0000 }, + { AntiVignetteControlsFar_bUnityOffset_gr , 0x3c40, 0x0000 }, { AntiVignetteControlsFar_bUnityOffset_gb , 0x3c42, 0x0000 }, { AntiVignetteControlsFar_bUnityOffset_b , 0x3c44, 0x0000 }, { AntiVignetteControlsFar_fAdaptiveAntiVignetteEnable , 0x3c46, 0x0000 }, @@ -4175,7 +4697,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AntiVignetteControlsNear_bFilterCoeff_R2_r , 0x3c82, 0x0000 }, { AntiVignetteControlsNear_bFilterCoeff_R2_gr , 0x3c84, 0x0000 }, { AntiVignetteControlsNear_bFilterCoeff_R2_gb , 0x3c86, 0x0000 }, -@@ -4470,6 +6362,9 @@ struct nomadik_vpip_param vpip_default_p + { AntiVignetteControlsNear_bFilterCoeff_R2_b , 0x3c88, 0x0000 }, + { AntiVignetteControlsNear_bFilterCoeff_R4_r , 0x3c8a, 0x0000 }, +@@ -4468,19 +6360,25 @@ struct nomadik_vpip_param vpip_default_p + { AntiVignetteControlsNear_bUnityOffset_r , 0x3cbe, 0x0000 }, + { AntiVignetteControlsNear_bUnityOffset_gr , 0x3cc0, 0x0000 }, { AntiVignetteControlsNear_bUnityOffset_gb , 0x3cc2, 0x0000 }, { AntiVignetteControlsNear_bUnityOffset_b , 0x3cc4, 0x0000 }, { AntiVignetteControlsNear_fAdaptiveAntiVignetteEnable , 0x3cc6, 0x0000 }, @@ -4185,7 +4711,9 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AFStatsControls_fAbsSquareEnabled , 0x3d00, 0x0000 }, { AFStatsControls_bCoringValue , 0x3d02, 0x0000 }, { AFStatsControls_bWindowsSystem , 0x3d04, 0x0000 }, -@@ -4479,6 +6374,9 @@ struct nomadik_vpip_param vpip_default_p + { AFStatsControls_bHRatio_Num , 0x3d06, 0x0000 }, + { AFStatsControls_bHRatio_Den , 0x3d08, 0x0000 }, + { AFStatsControls_bVRatio_Num , 0x3d0a, 0x0000 }, { AFStatsControls_bVRatio_Den , 0x3d0c, 0x0000 }, { AFStatsControls_bHostActiveZonesCounter , 0x3d0e, 0x0000 }, { AFStatsControls_fAutoRefresh , 0x3d10, 0x0000 }, @@ -4195,7 +4723,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AFStatsStatus_bAFStats_Error , 0x3d80, 0x0000 }, { AFStatsStatus_fAbsSquareEnabled , 0x3d82, 0x0000 }, { AFStatsStatus_bCoringValue , 0x3d84, 0x0000 }, -@@ -4503,6 +6401,9 @@ struct nomadik_vpip_param vpip_default_p + { AFStatsStatus_bWindowsSystem , 0x3d86, 0x0000 }, + { AFStatsStatus_bActiveZonesCounter , 0x3d88, 0x0000 }, +@@ -4501,10 +6399,13 @@ struct nomadik_vpip_param vpip_default_p + { AFStatsStatus_udwMaxFocusMeasurePerPixel_Byte1 , 0x3da6, 0x0000 }, + { AFStatsStatus_udwMaxFocusMeasurePerPixel_Byte2 , 0x3da8, 0x0000 }, { AFStatsStatus_udwMaxFocusMeasurePerPixel_Byte3 , 0x3daa, 0x0000 }, { AFStatsStatus_uwStartingAFZoneLine_LSByte , 0x3dae, 0x0000 }, { AFStatsStatus_uwStartingAFZoneLine_MSByte , 0x3dad, 0x0000 }, @@ -4205,7 +4737,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AFFocusStats_udwStatsValue_0_Byte0 , 0x3e00, 0x0000 }, { AFFocusStats_udwStatsValue_0_Byte1 , 0x3e02, 0x0000 }, { AFFocusStats_udwStatsValue_0_Byte2 , 0x3e04, 0x0000 }, -@@ -4531,6 +6432,9 @@ struct nomadik_vpip_param vpip_default_p + { AFFocusStats_udwStatsValue_0_Byte3 , 0x3e06, 0x0000 }, + { AFFocusStats_udwStatsValue_1_Byte0 , 0x3e08, 0x0000 }, +@@ -4529,17 +6430,52 @@ struct nomadik_vpip_param vpip_default_p + { AFFocusStats_udwStatsValue_5_Byte3 , 0x3e2e, 0x0000 }, + { AFFocusStats_udwStatsValue_6_Byte0 , 0x3e30, 0x0000 }, { AFFocusStats_udwStatsValue_6_Byte1 , 0x3e32, 0x0000 }, { AFFocusStats_udwStatsValue_6_Byte2 , 0x3e34, 0x0000 }, { AFFocusStats_udwStatsValue_6_Byte3 , 0x3e36, 0x0000 }, @@ -4215,7 +4751,7 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AFLightStats_bStatsValue_0 , 0x3e80, 0x0000 }, { AFLightStats_bStatsValue_1 , 0x3e82, 0x0000 }, { AFLightStats_bStatsValue_2 , 0x3e84, 0x0000 }, -@@ -4538,6 +6442,38 @@ struct nomadik_vpip_param vpip_default_p + { AFLightStats_bStatsValue_3 , 0x3e86, 0x0000 }, { AFLightStats_bStatsValue_4 , 0x3e88, 0x0000 }, { AFLightStats_bStatsValue_5 , 0x3e8a, 0x0000 }, { AFLightStats_bStatsValue_6 , 0x3e8c, 0x0000 }, @@ -4254,7 +4790,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { FLADriverLowLevelParameters_wMinPosition_LSByte , 0x3f02, 0x0000 }, { FLADriverLowLevelParameters_wMinPosition_MSByte , 0x3f01, 0x0000 }, { FLADriverLowLevelParameters_wMaxPosition_LSByte , 0x3f06, 0x0000 }, -@@ -4565,6 +6501,9 @@ struct nomadik_vpip_param vpip_default_p + { FLADriverLowLevelParameters_wMaxPosition_MSByte , 0x3f05, 0x0000 }, + { FLADriverLowLevelParameters_wHomePosition_LSByte , 0x3f0a, 0x0000 }, +@@ -4563,20 +6499,26 @@ struct nomadik_vpip_param vpip_default_p + { FLADriverLowLevelParameters_bNVM_PS_IBias , 0x3f2c, 0x0000 }, + { FLADriverLowLevelParameters_bNVM_PS_RampGain , 0x3f2e, 0x0000 }, { FLADriverLowLevelParameters_bNVM_PS_Type , 0x3f30, 0x0000 }, { FLADriverLowLevelParameters_uwNVM_minidriver_m_c_LSByte , 0x3f34, 0x0000 }, { FLADriverLowLevelParameters_uwNVM_minidriver_m_c_MSByte , 0x3f33, 0x0000 }, @@ -4264,7 +4804,10 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { FLADriverControls_bMMode , 0x3f80, 0x0000 }, { FLADriverControls_wTargetPosition_LSByte , 0x3f84, 0x0000 }, { FLADriverControls_wTargetPosition_MSByte , 0x3f83, 0x0000 }, -@@ -4575,6 +6514,9 @@ struct nomadik_vpip_param vpip_default_p + { FLADriverControls_wPositionTolerance_LSByte , 0x3f88, 0x0000 }, + { FLADriverControls_wPositionTolerance_MSByte , 0x3f87, 0x0000 }, + { FLADriverControls_uwTimeLimit_ms_LSByte , 0x3f8c, 0x0000 }, + { FLADriverControls_uwTimeLimit_ms_MSByte , 0x3f8b, 0x0000 }, { FLADriverControls_bTrigger , 0x3f8e, 0x0000 }, { FLADriverControls_bSlewMode , 0x3f90, 0x0000 }, { FLADriverControls_bSlewRate , 0x3f92, 0x0000 }, @@ -4274,7 +4817,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { FLADriverStatus_wLensPosition_LSByte , 0x4002, 0x0000 }, { FLADriverStatus_wLensPosition_MSByte , 0x4001, 0x0000 }, { FLADriverStatus_fLensIsMoving , 0x4004, 0x0000 }, -@@ -4586,6 +6528,9 @@ struct nomadik_vpip_param vpip_default_p + { FLADriverStatus_fLimitsExceeded , 0x4006, 0x0000 }, + { FLADriverStatus_fLensIsAtHome , 0x4008, 0x0000 }, +@@ -4584,10 +6526,13 @@ struct nomadik_vpip_param vpip_default_p + { FLADriverStatus_bSkippedFrames , 0x400c, 0x0000 }, + { FLADriverStatus_bCycles , 0x400e, 0x0000 }, { FLADriverStatus_bMiniDriverTimeoutError , 0x4010, 0x0000 }, { FLADriverStatus_wTargetPosition , 0x4012, 0x0000 }, { FLADriverStatus_bLowLevelPosition , 0x4014, 0x0000 }, @@ -4284,7 +4831,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { FocusControls_fErrorReset , 0x4080, 0x0000 }, { FocusControls_bRange , 0x4082, 0x0000 }, { FocusControls_bMode , 0x4084, 0x0000 }, -@@ -4597,6 +6542,9 @@ struct nomadik_vpip_param vpip_default_p + { FocusControls_bAFCommand , 0x4086, 0x0000 }, + { FocusControls_bLensCommand , 0x4088, 0x0000 }, +@@ -4595,10 +6540,13 @@ struct nomadik_vpip_param vpip_default_p + { FocusControls_fTestCoinEnabled , 0x408c, 0x0000 }, + { FocusControls_bControlCoin , 0x408e, 0x0000 }, { FocusControls_fInternalStats_Disable , 0x4090, 0x0000 }, { FocusControls_bActuator_Disable , 0x4092, 0x0000 }, { FocusControls_fInhibitAutoMetering , 0x4094, 0x0000 }, @@ -4294,7 +4845,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { FocusStatus_bModeStatus , 0x4100, 0x0000 }, { FocusStatus_bAFCommandStatus , 0x4102, 0x0000 }, { FocusStatus_bLensCommandStatus , 0x4104, 0x0000 }, -@@ -4612,6 +6560,30 @@ struct nomadik_vpip_param vpip_default_p + { FocusStatus_fAutoFocusEnabled , 0x4106, 0x0000 }, + { FocusStatus_bRange , 0x4108, 0x0000 }, +@@ -4610,10 +6558,34 @@ struct nomadik_vpip_param vpip_default_p + { FocusStatus_fRunForTest , 0x4114, 0x0000 }, + { FocusStatus_bStatusCoin , 0x4116, 0x0000 }, { FocusStatus_fInternalStats_Disabled , 0x4118, 0x0000 }, { FocusStatus_bActuator_Disabled , 0x411a, 0x0000 }, { FocusStatus_bLastUsedAFSensor , 0x411c, 0x0000 }, @@ -4325,7 +4880,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { FocusRangeConstants_wFullRange_LensMinPosition_LSByte , 0x4182, 0x0000 }, { FocusRangeConstants_wFullRange_LensMinPosition_MSByte , 0x4181, 0x0000 }, { FocusRangeConstants_wFullRange_LensMaxPosition_LSByte , 0x4186, 0x0000 }, -@@ -4630,6 +6602,34 @@ struct nomadik_vpip_param vpip_default_p + { FocusRangeConstants_wFullRange_LensMaxPosition_MSByte , 0x4185, 0x03ff }, + { FocusRangeConstants_wFullRange_LensRecoveryPosition_LSByte , 0x418a, 0x0000 }, +@@ -4628,10 +6600,38 @@ struct nomadik_vpip_param vpip_default_p + { FocusRangeConstants_wMacro_LensMinPosition_MSByte , 0x4199, 0x0000 }, + { FocusRangeConstants_wMacro_LensMaxPosition_LSByte , 0x419e, 0x0000 }, { FocusRangeConstants_wMacro_LensMaxPosition_MSByte , 0x419d, 0x03ff }, { FocusRangeConstants_wMacro_LensRecoveryPosition_LSByte , 0x41a2, 0x0000 }, { FocusRangeConstants_wMacro_LensRecoveryPosition_MSByte , 0x41a1, 0x01ff }, @@ -4360,7 +4919,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AutoFocusControls_bHostCmd , 0x4200, 0x0000 }, { AutoFocusControls_fFreezeIfStable , 0x4202, 0x0000 }, { AutoFocusControls_fFMTesting_AutoDisable , 0x4204, 0x0001 }, -@@ -4653,6 +6653,35 @@ struct nomadik_vpip_param vpip_default_p + { AutoFocusControls_fFastAFAlgoStart , 0x4206, 0x0000 }, + { AutoFocusControls_fBackLight_Enable , 0x4208, 0x0000 }, +@@ -4651,10 +6651,39 @@ struct nomadik_vpip_param vpip_default_p + { AutoFocusControls_fEnableTrakingZoneVariation , 0x4224, 0x0000 }, + { AutoFocusControls_fEnableFunctionThresholdTest , 0x4226, 0x0001 }, { AutoFocusControls_fForceTestState , 0x4228, 0x0000 }, { AutoFocusControls_bManualAFNextState , 0x422a, 0x0000 }, { AutoFocusControls_fResetHCSPos , 0x422c, 0x0001 }, @@ -4396,7 +4959,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AutoFocusConstants_bCoarseStep , 0x4280, 0x0078 }, { AutoFocusConstants_bFineStep , 0x4282, 0x0014 }, { AutoFocusConstants_bFullSearchStep , 0x4284, 0x0000 }, -@@ -4677,11 +6706,17 @@ struct nomadik_vpip_param vpip_default_p + { AutoFocusConstants_bLeakyIntegratorConstant , 0x4286, 0x0000 }, + { AutoFocusConstants_uwFineThreshold_LSByte , 0x428a, 0x0000 }, +@@ -4675,15 +6704,21 @@ struct nomadik_vpip_param vpip_default_p + { AutoFocusConstants_bLightGap , 0x42a6, 0x0000 }, + { AutoFocusConstants_uwDeltaValue_LSByte , 0x42aa, 0x0000 }, { AutoFocusConstants_uwDeltaValue_MSByte , 0x42a9, 0x0000 }, { AutoFocusConstants_uwMaxFineTh_LSByte , 0x42ae, 0x0000 }, { AutoFocusConstants_uwMaxFineTh_MSByte , 0x42ad, 0x0000 }, @@ -4414,7 +4981,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AutoFocusStatus_bCycles , 0x4380, 0x0000 }, { AutoFocusStatus_bHostCmd , 0x4382, 0x0000 }, { AutoFocusStatus_bAF_PrevState , 0x4384, 0x0000 }, -@@ -4716,10 +6751,16 @@ struct nomadik_vpip_param vpip_default_p + { AutoFocusStatus_bAF_State , 0x4386, 0x0000 }, + { AutoFocusStatus_bAF_NextState , 0x4388, 0x0000 }, +@@ -4714,14 +6749,20 @@ struct nomadik_vpip_param vpip_default_p + { AutoFocusStatus_uwTotalCoarseVariation_LSByte , 0x43bc, 0x0000 }, + { AutoFocusStatus_uwTotalCoarseVariation_MSByte , 0x43bb, 0x0000 }, { AutoFocusStatus_uwTotalFineVariation_LSByte , 0x43c0, 0x0000 }, { AutoFocusStatus_uwTotalFineVariation_MSByte , 0x43bf, 0x0000 }, { AutoFocusStatus_bCountVariationRegion , 0x43c2, 0x0000 }, @@ -4431,7 +5002,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AutoFocusMeasureData_udwFocusMeasure_Byte0 , 0x4480, 0x0000 }, { AutoFocusMeasureData_udwFocusMeasure_Byte1 , 0x4482, 0x0000 }, { AutoFocusMeasureData_udwFocusMeasure_Byte2 , 0x4484, 0x0000 }, -@@ -4776,6 +6817,9 @@ struct nomadik_vpip_param vpip_default_p + { AutoFocusMeasureData_udwFocusMeasure_Byte3 , 0x4486, 0x0000 }, + { AutoFocusMeasureData_udwPrevFocusMeasure_Byte0 , 0x4488, 0x0000 }, +@@ -4774,24 +6815,33 @@ struct nomadik_vpip_param vpip_default_p + { AutoFocusMeasureData_udwCurrentFocusMeasureDifference_Byte3 , 0x44e6, 0x0000 }, + { AutoFocusMeasureData_udwOldTrackingFocusMeasure_Byte0 , 0x44e8, 0x0000 }, { AutoFocusMeasureData_udwOldTrackingFocusMeasure_Byte1 , 0x44ea, 0x0000 }, { AutoFocusMeasureData_udwOldTrackingFocusMeasure_Byte2 , 0x44ec, 0x0000 }, { AutoFocusMeasureData_udwOldTrackingFocusMeasure_Byte3 , 0x44ee, 0x0000 }, @@ -4441,7 +5016,7 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AutoFocusWeightControls_bWeight_0 , 0x4500, 0x0000 }, { AutoFocusWeightControls_bWeight_1 , 0x4502, 0x0000 }, { AutoFocusWeightControls_bWeight_2 , 0x4504, 0x0000 }, -@@ -4783,6 +6827,9 @@ struct nomadik_vpip_param vpip_default_p + { AutoFocusWeightControls_bWeight_3 , 0x4506, 0x0000 }, { AutoFocusWeightControls_bWeight_4 , 0x4508, 0x0000 }, { AutoFocusWeightControls_bWeight_5 , 0x450a, 0x0000 }, { AutoFocusWeightControls_bWeight_6 , 0x450c, 0x0000 }, @@ -4451,7 +5026,7 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AutoFocusDynamicWeight_bWeight_0 , 0x4580, 0x0000 }, { AutoFocusDynamicWeight_bWeight_1 , 0x4582, 0x0000 }, { AutoFocusDynamicWeight_bWeight_2 , 0x4584, 0x0000 }, -@@ -4790,6 +6837,9 @@ struct nomadik_vpip_param vpip_default_p + { AutoFocusDynamicWeight_bWeight_3 , 0x4586, 0x0000 }, { AutoFocusDynamicWeight_bWeight_4 , 0x4588, 0x0000 }, { AutoFocusDynamicWeight_bWeight_5 , 0x458a, 0x0000 }, { AutoFocusDynamicWeight_bWeight_6 , 0x458c, 0x0000 }, @@ -4461,7 +5036,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AutoFocusThresholds_uwCoarseThreshold_LSByte , 0x4602, 0x0000 }, { AutoFocusThresholds_uwCoarseThreshold_MSByte , 0x4601, 0x0000 }, { AutoFocusThresholds_uwFineThreshold_LSByte , 0x4606, 0x0000 }, -@@ -4806,6 +6856,9 @@ struct nomadik_vpip_param vpip_default_p + { AutoFocusThresholds_uwFineThreshold_MSByte , 0x4605, 0x0000 }, + { AutoFocusThresholds_uwBeforeMotionBlur_LSByte , 0x460a, 0x0000 }, +@@ -4804,10 +6854,13 @@ struct nomadik_vpip_param vpip_default_p + { AutoFocusThresholds_udwCurrentVariation_Byte3 , 0x4616, 0x0000 }, + { AutoFocusThresholds_udwLowFocusMeasureValue_Byte0 , 0x4618, 0x0000 }, { AutoFocusThresholds_udwLowFocusMeasureValue_Byte1 , 0x461a, 0x0000 }, { AutoFocusThresholds_udwLowFocusMeasureValue_Byte2 , 0x461c, 0x0000 }, { AutoFocusThresholds_udwLowFocusMeasureValue_Byte3 , 0x461e, 0x0000 }, @@ -4471,7 +5050,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AutoFocusHeuristicConstants_uwLensPositionInputMax_LSByte , 0x4682, 0x0000 }, { AutoFocusHeuristicConstants_uwLensPositionInputMax_MSByte , 0x4681, 0x0000 }, { AutoFocusHeuristicConstants_uwLensPositionInputMin_LSByte , 0x4686, 0x0000 }, -@@ -4822,6 +6875,9 @@ struct nomadik_vpip_param vpip_default_p + { AutoFocusHeuristicConstants_uwLensPositionInputMin_MSByte , 0x4685, 0x0000 }, + { AutoFocusHeuristicConstants_bBrightnessInputMax , 0x4688, 0x0000 }, +@@ -4820,10 +6873,13 @@ struct nomadik_vpip_param vpip_default_p + { AutoFocusHeuristicConstants_uwFineToCoarseMax_MSByte , 0x4695, 0x0000 }, + { AutoFocusHeuristicConstants_uwFineToCoarseMin_LSByte , 0x469a, 0x0000 }, { AutoFocusHeuristicConstants_uwFineToCoarseMin_MSByte , 0x4699, 0x0000 }, { AutoFocusHeuristicConstants_bHighToMaxFMShiftFactor , 0x469c, 0x0000 }, { AutoFocusHeuristicConstants_bLowToHighFMShiftFactor , 0x469e, 0x0000 }, @@ -4481,7 +5064,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AutoFocusThHeuristicInput_udwFocusMeasureInputMax_Byte0 , 0x4700, 0x0000 }, { AutoFocusThHeuristicInput_udwFocusMeasureInputMax_Byte1 , 0x4702, 0x0000 }, { AutoFocusThHeuristicInput_udwFocusMeasureInputMax_Byte2 , 0x4704, 0x0000 }, -@@ -4837,19 +6893,31 @@ struct nomadik_vpip_param vpip_default_p + { AutoFocusThHeuristicInput_udwFocusMeasureInputMax_Byte3 , 0x4706, 0x0000 }, + { AutoFocusThHeuristicInput_udwFocusMeasureInputMin_Byte0 , 0x4708, 0x0000 }, +@@ -4835,23 +6891,35 @@ struct nomadik_vpip_param vpip_default_p + { AutoFocusThHeuristicInput_udwFocusMeasureInput_Byte2 , 0x4714, 0x0000 }, + { AutoFocusThHeuristicInput_udwFocusMeasureInput_Byte3 , 0x4716, 0x0000 }, { AutoFocusThHeuristicInput_uwLensPositionInput_LSByte , 0x471a, 0x0000 }, { AutoFocusThHeuristicInput_uwLensPositionInput_MSByte , 0x4719, 0x0000 }, { AutoFocusThHeuristicInput_bBrightnessInput , 0x471c, 0x0000 }, @@ -4515,7 +5102,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { MiscPageElements_fEnableIntelligentFlash , 0x4904, 0x0000 }, { MiscPageElements_fEligibleFrameForMetering , 0x4906, 0x0000 }, { MiscPageElements_fFlashGunIlluminatedFrameStreamed , 0x4908, 0x0000 }, -@@ -4863,7 +6931,13 @@ struct nomadik_vpip_param vpip_default_p + { MiscPageElements_VpipCut , 0x490a, 0x0000 }, + { MiscPageElements_bGPIOClockFrequency_Mhz , 0x490c, 0x0000 }, +@@ -4861,42 +6929,60 @@ struct nomadik_vpip_param vpip_default_p + { MiscPageElements_fEnableDelayWhenStoppingSensor , 0x4914, 0x0000 }, + { MiscPageElements_fTriggerFlashOnStreaming , 0x4916, 0x0000 }, { MiscPageElements_fDoNotOutputFrameInIntelligentFlash , 0x4918, 0x0000 }, { MiscPageElements_fDisableToshibaInit , 0x491a, 0x0000 }, { MiscPageElements_bNumberofFramesTobeSkippedByRx , 0x491c, 0x0000 }, @@ -4529,7 +5120,9 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { MasterI2cClockControl_bCountFall , 0x4a00, 0x0000 }, { MasterI2cClockControl_bCountRise , 0x4a02, 0x0000 }, { MasterI2cClockControl_bCountHigh , 0x4a04, 0x0000 }, -@@ -4873,6 +6947,9 @@ struct nomadik_vpip_param vpip_default_p + { MasterI2cClockControl_bCountBuffer , 0x4a06, 0x0000 }, + { MasterI2cClockControl_bCountHoldData , 0x4a08, 0x0000 }, + { MasterI2cClockControl_bCountSetupData , 0x4a0a, 0x0000 }, { MasterI2cClockControl_bCountHoldStart , 0x4a0c, 0x0000 }, { MasterI2cClockControl_bCountSetupStart , 0x4a0e, 0x0000 }, { MasterI2cClockControl_bCountSetupStop , 0x4a10, 0x0000 }, @@ -4539,7 +5132,8 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ZoomMgrFOVCtrl_bShiftCenter , 0x4a80, 0x0000 }, { ZoomMgrFOVCtrl_uwXOrigin_LSByte , 0x4a84, 0x0000 }, { ZoomMgrFOVCtrl_uwXOrigin_MSByte , 0x4a83, 0x0000 }, -@@ -4881,11 +6958,17 @@ struct nomadik_vpip_param vpip_default_p + { ZoomMgrFOVCtrl_uwYOrigin_LSByte , 0x4a88, 0x0000 }, + { ZoomMgrFOVCtrl_uwYOrigin_MSByte , 0x4a87, 0x0000 }, { ZoomMgrFOVCtrl_fRestrictMaxFOVToChosenFOV , 0x4a8a, 0x0000 }, { ZoomMgrFOVCtrl_fCalculateMinFOVAlways , 0x4a8c, 0x0000 }, { ZoomMgrFOVCtrl_fInhibitMaxFOVAtModeStaticChange , 0x4a8e, 0x0000 }, @@ -4557,7 +5151,9 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ZoomMgrStripeCtrl_bStripeControl , 0x4b80, 0x0000 }, { ZoomMgrStripeCtrl_uwStripeStartAddr_LSByte , 0x4b84, 0x0000 }, { ZoomMgrStripeCtrl_uwStripeStartAddr_MSByte , 0x4b83, 0x0000 }, -@@ -4895,6 +6978,9 @@ struct nomadik_vpip_param vpip_default_p + { ZoomMgrStripeCtrl_uwStripeSize_LSByte , 0x4b88, 0x0000 }, + { ZoomMgrStripeCtrl_uwStripeSize_MSByte , 0x4b87, 0x0000 }, + { ZoomMgrStripeCtrl_uwStripeInMinLineSize_LSByte , 0x4b8c, 0x0000 }, { ZoomMgrStripeCtrl_uwStripeInMinLineSize_MSByte , 0x4b8b, 0x0000 }, { ZoomMgrStripeCtrl_uwBmsFrameLength_LSByte , 0x4b90, 0x0000 }, { ZoomMgrStripeCtrl_uwBmsFrameLength_MSByte , 0x4b8f, 0x0000 }, @@ -4567,7 +5163,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { LftStripeParam_uwGPSISize_LSByte , 0x4c02, 0x0000 }, { LftStripeParam_uwGPSISize_MSByte , 0x4c01, 0x0000 }, { LftStripeParam_uwGPSOSize_LSByte , 0x4c06, 0x0000 }, -@@ -4915,6 +7001,9 @@ struct nomadik_vpip_param vpip_default_p + { LftStripeParam_uwGPSOSize_MSByte , 0x4c05, 0x0000 }, + { LftStripeParam_uwRightBorder_LSByte , 0x4c0a, 0x0000 }, +@@ -4913,10 +6999,13 @@ struct nomadik_vpip_param vpip_default_p + { LftStripeParam_uwStripeInCropSize_MSByte , 0x4c1d, 0x0000 }, + { LftStripeParam_uwStripeOutCropStart_LSByte , 0x4c22, 0x0000 }, { LftStripeParam_uwStripeOutCropStart_MSByte , 0x4c21, 0x0000 }, { LftStripeParam_uwStripeOutCropSize_LSByte , 0x4c26, 0x0000 }, { LftStripeParam_uwStripeOutCropSize_MSByte , 0x4c25, 0x0000 }, @@ -4577,7 +5177,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { RgtStripeParam_uwGPSISize_LSByte , 0x4c82, 0x0000 }, { RgtStripeParam_uwGPSISize_MSByte , 0x4c81, 0x0000 }, { RgtStripeParam_uwGPSOSize_LSByte , 0x4c86, 0x0000 }, -@@ -4935,6 +7024,9 @@ struct nomadik_vpip_param vpip_default_p + { RgtStripeParam_uwGPSOSize_MSByte , 0x4c85, 0x0000 }, + { RgtStripeParam_uwRightBorder_LSByte , 0x4c8a, 0x0000 }, +@@ -4933,34 +7022,70 @@ struct nomadik_vpip_param vpip_default_p + { RgtStripeParam_uwStripeInCropSize_MSByte , 0x4c9d, 0x0000 }, + { RgtStripeParam_uwStripeOutCropStart_LSByte , 0x4ca2, 0x0000 }, { RgtStripeParam_uwStripeOutCropStart_MSByte , 0x4ca1, 0x0000 }, { RgtStripeParam_uwStripeOutCropSize_LSByte , 0x4ca6, 0x0000 }, { RgtStripeParam_uwStripeOutCropSize_MSByte , 0x4ca5, 0x0000 }, @@ -4587,7 +5191,8 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { DigitalGainStatus_uwCodedGreen1Gain_LSByte , 0x4d02, 0x0000 }, { DigitalGainStatus_uwCodedGreen1Gain_MSByte , 0x4d01, 0x0000 }, { DigitalGainStatus_uwCodedRedGain_LSByte , 0x4d06, 0x0000 }, -@@ -4943,10 +7035,16 @@ struct nomadik_vpip_param vpip_default_p + { DigitalGainStatus_uwCodedRedGain_MSByte , 0x4d05, 0x0000 }, + { DigitalGainStatus_uwCodedBlueGain_LSByte , 0x4d0a, 0x0000 }, { DigitalGainStatus_uwCodedBlueGain_MSByte , 0x4d09, 0x0000 }, { DigitalGainStatus_uwCodedGreen2Gain_LSByte , 0x4d0e, 0x0000 }, { DigitalGainStatus_uwCodedGreen2Gain_MSByte , 0x4d0d, 0x0000 }, @@ -4604,7 +5209,8 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AntiFlickerExposureStatus_fpFlickerFreePeriod_us_LSByte , 0x4e02, 0x0000 }, { AntiFlickerExposureStatus_fpFlickerFreePeriod_us_MSByte , 0x4e01, 0x0000 }, { AntiFlickerExposureStatus_fpGainedFlickerFreeTimePeriod_us_LSByte , 0x4e06, 0x0000 }, -@@ -4955,10 +7053,37 @@ struct nomadik_vpip_param vpip_default_p + { AntiFlickerExposureStatus_fpGainedFlickerFreeTimePeriod_us_MSByte , 0x4e05, 0x0000 }, + { AntiFlickerExposureStatus_uwMaxFlickerFreeBunches_LSByte , 0x4e0a, 0x0000 }, { AntiFlickerExposureStatus_uwMaxFlickerFreeBunches_MSByte , 0x4e09, 0x0000 }, { AntiFlickerExposureStatus_fpConstrainedFlickerFreePeriod_us_LSByte , 0x4e0e, 0x0000 }, { AntiFlickerExposureStatus_fpConstrainedFlickerFreePeriod_us_MSByte , 0x4e0d, 0x0000 }, @@ -4642,7 +5248,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { SensorSetupFarSensor_uwGuaranteedDataSaturationLevel_LSByte , 0x5002, 0x0000 }, { SensorSetupFarSensor_uwGuaranteedDataSaturationLevel_MSByte , 0x5001, 0x043f }, { SensorSetupFarSensor_uwMinimumSensorRxPixelValue_LSByte , 0x5006, 0x0000 }, -@@ -4972,6 +7097,9 @@ struct nomadik_vpip_param vpip_default_p + { SensorSetupFarSensor_uwMinimumSensorRxPixelValue_MSByte , 0x5005, 0x0004 }, + { SensorSetupFarSensor_uwMaximumSensorRxPixelValue_LSByte , 0x500a, 0x0000 }, +@@ -4970,10 +7095,13 @@ struct nomadik_vpip_param vpip_default_p + { SensorSetupFarSensor_fpGreenTiltGain_LSByte , 0x5012, 0x0000 }, + { SensorSetupFarSensor_fpGreenTiltGain_MSByte , 0x5011, 0x3e00 }, { SensorSetupFarSensor_fpBlueTiltGain_LSByte , 0x5016, 0x0000 }, { SensorSetupFarSensor_fpBlueTiltGain_MSByte , 0x5015, 0x3e00 }, { SensorSetupFarSensor_BlackCorrectionOffset , 0x5018, 0x0000 }, @@ -4652,7 +5262,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { SensorSetupNearSensor_uwGuaranteedDataSaturationLevel_LSByte , 0x5082, 0x0000 }, { SensorSetupNearSensor_uwGuaranteedDataSaturationLevel_MSByte , 0x5081, 0x0000 }, { SensorSetupNearSensor_uwMinimumSensorRxPixelValue_LSByte , 0x5086, 0x0000 }, -@@ -4985,6 +7113,9 @@ struct nomadik_vpip_param vpip_default_p + { SensorSetupNearSensor_uwMinimumSensorRxPixelValue_MSByte , 0x5085, 0x0000 }, + { SensorSetupNearSensor_uwMaximumSensorRxPixelValue_LSByte , 0x508a, 0x0000 }, +@@ -4983,10 +7111,13 @@ struct nomadik_vpip_param vpip_default_p + { SensorSetupNearSensor_fpGreenTiltGain_LSByte , 0x5092, 0x0000 }, + { SensorSetupNearSensor_fpGreenTiltGain_MSByte , 0x5091, 0x0000 }, { SensorSetupNearSensor_fpBlueTiltGain_LSByte , 0x5096, 0x0000 }, { SensorSetupNearSensor_fpBlueTiltGain_MSByte , 0x5095, 0x0000 }, { SensorSetupNearSensor_BlackCorrectionOffset , 0x5098, 0x0000 }, @@ -4662,7 +5276,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ToshibaOtpRead_otp_inf_2 , 0x5100, 0x0000 }, { ToshibaOtpRead_otp_inf_1 , 0x5102, 0x0000 }, { ToshibaOtpRead_otp_inf_0 , 0x5104, 0x0000 }, -@@ -4996,8 +7127,24 @@ struct nomadik_vpip_param vpip_default_p + { ToshibaOtpRead_otp_mac_2 , 0x5106, 0x0000 }, + { ToshibaOtpRead_otp_mac_1 , 0x5108, 0x0000 }, +@@ -4994,20 +7125,71 @@ struct nomadik_vpip_param vpip_default_p + { ToshibaOtpRead_otp_posA_1 , 0x510c, 0x0000 }, + { ToshibaOtpRead_otp_posA_0 , 0x510e, 0x0000 }, { ToshibaOtpRead_otp_posB_1 , 0x5110, 0x0000 }, { ToshibaOtpRead_otp_posB_0 , 0x5112, 0x0000 }, { ToshibaOtpRead_otp_register_map_ver , 0x5114, 0x0000 }, @@ -4687,7 +5305,8 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ReferenceIlluminantCasts_fpCAST0_LSByte , 0x5202, 0x0000 }, { ReferenceIlluminantCasts_fpCAST0_MSByte , 0x5201, 0x38b8 }, { ReferenceIlluminantCasts_fpCAST1_LSByte , 0x5206, 0x0000 }, -@@ -5006,6 +7153,41 @@ struct nomadik_vpip_param vpip_default_p + { ReferenceIlluminantCasts_fpCAST1_MSByte , 0x5205, 0x396d }, + { ReferenceIlluminantCasts_fpCAST2_LSByte , 0x520a, 0x0000 }, { ReferenceIlluminantCasts_fpCAST2_MSByte , 0x5209, 0x3a1b }, { ReferenceIlluminantCasts_fpCAST3_LSByte , 0x520e, 0x0000 }, { ReferenceIlluminantCasts_fpCAST3_MSByte , 0x520d, 0x3af2 }, @@ -4729,7 +5348,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AdaptiveAVParameter_B_bAvUnityOffset_Day , 0x5280, 0x0040 }, { AdaptiveAVParameter_B_bAvCoeffR2_Day , 0x5282, 0x003e }, { AdaptiveAVParameter_B_bAvCoeffR4_Day , 0x5284, 0x00e8 }, -@@ -5034,6 +7216,38 @@ struct nomadik_vpip_param vpip_default_p + { AdaptiveAVParameter_B_wAvHOffset_Day_LSByte , 0x5288, 0x0000 }, + { AdaptiveAVParameter_B_wAvHOffset_Day_MSByte , 0x5287, 0x0003 }, +@@ -5032,10 +7214,42 @@ struct nomadik_vpip_param vpip_default_p + { AdaptiveAVParameter_B_bAvCoeffR4_HOR , 0x52ae, 0x00f0 }, + { AdaptiveAVParameter_B_wAvHOffset_HOR_LSByte , 0x52b2, 0x0000 }, { AdaptiveAVParameter_B_wAvHOffset_HOR_MSByte , 0x52b1, 0x000b }, { AdaptiveAVParameter_B_wAvVOffset_HOR_LSByte , 0x52b6, 0x0000 }, { AdaptiveAVParameter_B_wAvVOffset_HOR_MSByte , 0x52b5, 0x001d }, @@ -4768,7 +5391,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AdaptiveAVParameter_GB_bAvUnityOffset_Day , 0x5300, 0x0040 }, { AdaptiveAVParameter_GB_bAvCoeffR2_Day , 0x5302, 0x0047 }, { AdaptiveAVParameter_GB_bAvCoeffR4_Day , 0x5304, 0x00ec }, -@@ -5062,6 +7276,39 @@ struct nomadik_vpip_param vpip_default_p + { AdaptiveAVParameter_GB_wAvHOffset_Day_LSByte , 0x5308, 0x0000 }, + { AdaptiveAVParameter_GB_wAvHOffset_Day_MSByte , 0x5307, 0x000a }, +@@ -5060,10 +7274,43 @@ struct nomadik_vpip_param vpip_default_p + { AdaptiveAVParameter_GB_bAvCoeffR4_HOR , 0x532e, 0x00f0 }, + { AdaptiveAVParameter_GB_wAvHOffset_HOR_LSByte , 0x5332, 0x0000 }, { AdaptiveAVParameter_GB_wAvHOffset_HOR_MSByte , 0x5331, 0x000c }, { AdaptiveAVParameter_GB_wAvVOffset_HOR_LSByte , 0x5336, 0x0000 }, { AdaptiveAVParameter_GB_wAvVOffset_HOR_MSByte , 0x5335, 0x0014 }, @@ -4808,7 +5435,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AdaptiveAVParameter_GR_bAvUnityOffset_Day , 0x5380, 0x0040 }, { AdaptiveAVParameter_GR_bAvCoeffR2_Day , 0x5382, 0x0048 }, { AdaptiveAVParameter_GR_bAvCoeffR4_Day , 0x5384, 0x00e8 }, -@@ -5090,6 +7337,38 @@ struct nomadik_vpip_param vpip_default_p + { AdaptiveAVParameter_GR_wAvHOffset_Day_LSByte , 0x5388, 0x0000 }, + { AdaptiveAVParameter_GR_wAvHOffset_Day_MSByte , 0x5387, 0x0009 }, +@@ -5088,10 +7335,42 @@ struct nomadik_vpip_param vpip_default_p + { AdaptiveAVParameter_GR_bAvCoeffR4_HOR , 0x53ae, 0x00ef }, + { AdaptiveAVParameter_GR_wAvHOffset_HOR_LSByte , 0x53b2, 0x0000 }, { AdaptiveAVParameter_GR_wAvHOffset_HOR_MSByte , 0x53b1, 0x000c }, { AdaptiveAVParameter_GR_wAvVOffset_HOR_LSByte , 0x53b6, 0x0000 }, { AdaptiveAVParameter_GR_wAvVOffset_HOR_MSByte , 0x53b5, 0x0001 }, @@ -4847,7 +5478,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { AdaptiveAVParameter_R_bAvUnityOffset_Day , 0x5400, 0x0040 }, { AdaptiveAVParameter_R_bAvCoeffR2_Day , 0x5402, 0x0067 }, { AdaptiveAVParameter_R_bAvCoeffR4_Day , 0x5404, 0x00f6 }, -@@ -5118,17 +7397,39 @@ struct nomadik_vpip_param vpip_default_p + { AdaptiveAVParameter_R_wAvHOffset_Day_LSByte , 0x5408, 0x0000 }, + { AdaptiveAVParameter_R_wAvHOffset_Day_MSByte , 0x5407, 0x000a }, +@@ -5116,21 +7395,43 @@ struct nomadik_vpip_param vpip_default_p + { AdaptiveAVParameter_R_bAvCoeffR4_HOR , 0x542e, 0x00f7 }, + { AdaptiveAVParameter_R_wAvHOffset_HOR_LSByte , 0x5432, 0x0000 }, { AdaptiveAVParameter_R_wAvHOffset_HOR_MSByte , 0x5431, 0x000a }, { AdaptiveAVParameter_R_wAvVOffset_HOR_LSByte , 0x5436, 0x0000 }, { AdaptiveAVParameter_R_wAvVOffset_HOR_MSByte , 0x5435, 0x0004 }, @@ -4887,7 +5522,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { DynamicConstrainedWBControls_fpRedA_LSByte , 0x5582, 0x0000 }, { DynamicConstrainedWBControls_fpRedA_MSByte , 0x5581, 0x3881 }, { DynamicConstrainedWBControls_fpBlueA_LSByte , 0x5586, 0x0000 }, -@@ -5140,6 +7441,8 @@ struct nomadik_vpip_param vpip_default_p + { DynamicConstrainedWBControls_fpBlueA_MSByte , 0x5585, 0x3c68 }, + { DynamicConstrainedWBControls_fpDamperLowThreshold_LSByte , 0x558a, 0x0000 }, +@@ -5138,10 +7439,12 @@ struct nomadik_vpip_param vpip_default_p + { DynamicConstrainedWBControls_fpMinimumDamperOutput_LSByte , 0x558e, 0x0000 }, + { DynamicConstrainedWBControls_fpMinimumDamperOutput_MSByte , 0x558d, 0x3a66 }, { DynamicConstrainedWBControls_fpDamperHighThreshold_LSByte , 0x5592, 0x0000 }, { DynamicConstrainedWBControls_fpDamperHighThreshold_MSByte , 0x5591, 0x5a71 }, { DynamicConstrainedWBControls_fDamperDisable , 0x5594, 0x0000 }, @@ -4896,7 +5535,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { Toshiba_AF_NVM_Read_NVM_Far2Near_inf_LSByte , 0x5602, 0x0000 }, { Toshiba_AF_NVM_Read_NVM_Far2Near_inf_MSByte , 0x5601, 0x0000 }, { Toshiba_AF_NVM_Read_NVM_Near2Far_inf_LSByte , 0x5606, 0x0000 }, -@@ -5152,6 +7455,23 @@ struct nomadik_vpip_param vpip_default_p + { Toshiba_AF_NVM_Read_NVM_Near2Far_inf_MSByte , 0x5605, 0x0000 }, + { Toshiba_AF_NVM_Read_NVM_Far2Near_mac_LSByte , 0x560a, 0x0000 }, +@@ -5150,27 +7453,81 @@ struct nomadik_vpip_param vpip_default_p + { Toshiba_AF_NVM_Read_NVM_Near2Far_mac_MSByte , 0x560d, 0x0000 }, + { Toshiba_AF_NVM_Read_NVM_Pos_A_LSByte , 0x5612, 0x0000 }, { Toshiba_AF_NVM_Read_NVM_Pos_A_MSByte , 0x5611, 0x0000 }, { Toshiba_AF_NVM_Read_NVM_Pos_B_LSByte , 0x5616, 0x0000 }, { Toshiba_AF_NVM_Read_NVM_Pos_B_MSByte , 0x5615, 0x0000 }, @@ -4920,7 +5563,10 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { Toshiba_Vcm_Parameters_wLowLevelMacroPos_LSByte , 0x5682, 0x0000 }, { Toshiba_Vcm_Parameters_wLowLevelMacroPos_MSByte , 0x5681, 0x0000 }, { Toshiba_Vcm_Parameters_wLowLevelInfinityPos_LSByte , 0x5686, 0x0000 }, -@@ -5162,13 +7482,50 @@ struct nomadik_vpip_param vpip_default_p + { Toshiba_Vcm_Parameters_wLowLevelInfinityPos_MSByte , 0x5685, 0x0000 }, + { Toshiba_Vcm_Parameters_bSlewControlModeEnable , 0x5688, 0x0000 }, + { Toshiba_Vcm_Parameters_bSlewModeForSmallerStep , 0x568a, 0x0001 }, + { Toshiba_Vcm_Parameters_bSlewRateForSmallerStep , 0x568c, 0x0004 }, { Toshiba_Vcm_Parameters_bSlewModeForLargerStep , 0x568e, 0x0008 }, { Toshiba_Vcm_Parameters_bSlewRateForLargerStep , 0x5690, 0x0007 }, { Toshiba_Vcm_Parameters_bThresholdStepSize , 0x5692, 0x00b0 }, @@ -4971,7 +5617,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ColourEngine1_ColourMatrixFarSensor_fpRInR_LSByte , 0x5802, 0x0000 }, { ColourEngine1_ColourMatrixFarSensor_fpRInR_MSByte , 0x5801, 0x3f0c }, { ColourEngine1_ColourMatrixFarSensor_fpGInR_LSByte , 0x5806, 0x0000 }, -@@ -5187,6 +7544,8 @@ struct nomadik_vpip_param vpip_default_p + { ColourEngine1_ColourMatrixFarSensor_fpGInR_MSByte , 0x5805, 0xb887 }, + { ColourEngine1_ColourMatrixFarSensor_fpBInR_LSByte , 0x580a, 0x0000 }, +@@ -5185,10 +7542,12 @@ struct nomadik_vpip_param vpip_default_p + { ColourEngine1_ColourMatrixFarSensor_fpRInB_MSByte , 0x5819, 0xbc6e }, + { ColourEngine1_ColourMatrixFarSensor_fpGInB_LSByte , 0x581e, 0x0000 }, { ColourEngine1_ColourMatrixFarSensor_fpGInB_MSByte , 0x581d, 0xc01b }, { ColourEngine1_ColourMatrixFarSensor_fpBInB_LSByte , 0x5822, 0x0000 }, { ColourEngine1_ColourMatrixFarSensor_fpBInB_MSByte , 0x5821, 0x41b7 }, @@ -4980,7 +5630,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ColourEngine1_ColourMatrixNearSensor_fpRInR_LSByte , 0x5882, 0x0000 }, { ColourEngine1_ColourMatrixNearSensor_fpRInR_MSByte , 0x5881, 0x0000 }, { ColourEngine1_ColourMatrixNearSensor_fpGInR_LSByte , 0x5886, 0x0000 }, -@@ -5205,8 +7564,30 @@ struct nomadik_vpip_param vpip_default_p + { ColourEngine1_ColourMatrixNearSensor_fpGInR_MSByte , 0x5885, 0x0000 }, + { ColourEngine1_ColourMatrixNearSensor_fpBInR_LSByte , 0x588a, 0x0000 }, +@@ -5203,31 +7562,63 @@ struct nomadik_vpip_param vpip_default_p + { ColourEngine1_ColourMatrixNearSensor_fpRInB_MSByte , 0x5899, 0x0000 }, + { ColourEngine1_ColourMatrixNearSensor_fpGInB_LSByte , 0x589e, 0x0000 }, { ColourEngine1_ColourMatrixNearSensor_fpGInB_MSByte , 0x589d, 0x0000 }, { ColourEngine1_ColourMatrixNearSensor_fpBInB_LSByte , 0x58a2, 0x0000 }, { ColourEngine1_ColourMatrixNearSensor_fpBInB_MSByte , 0x58a1, 0x0000 }, @@ -5011,7 +5665,9 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new { ToshibaTechnicalParamTuner_uwHostLevelMacroPos_LSByte , 0x5982, 0x0000 }, { ToshibaTechnicalParamTuner_uwHostLevelMacroPos_MSByte , 0x5981, 0x0000 }, { ToshibaTechnicalParamTuner_uwHostLevelInfinityPos_LSByte , 0x5986, 0x0000 }, -@@ -5216,16 +7597,26 @@ struct nomadik_vpip_param vpip_default_p + { ToshibaTechnicalParamTuner_uwHostLevelInfinityPos_MSByte , 0x5985, 0x0000 }, + { ToshibaTechnicalParamTuner_uwDefAFMaxStandardRange_um_LSByte , 0x598a, 0x0000 }, + { ToshibaTechnicalParamTuner_uwDefAFMaxStandardRange_um_MSByte , 0x5989, 0x012c }, { ToshibaTechnicalParamTuner_bDefFineStepParam_um , 0x598c, 0x0008 }, { ToshibaTechnicalParamTuner_bDefCoarseStepParam_um , 0x598e, 0x0030 }, { ToshibaTechnicalParamTuner_fHostDefTechParam , 0x5990, 0x0002 }, @@ -5040,7 +5696,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new int sva_vpip_auto_focus(struct sva_device_open *open, struct vpip_autofocus_id *mode) { -@@ -6234,63 +8625,12 @@ static int irp_start_fw(struct sva_servi + struct sva_service_open *srv_open; + u16 vpip_state=0; +@@ -6232,67 +8623,16 @@ static int irp_start_fw(struct sva_servi + IRP_ASSERT(irp_write_packet(srv_open, vpip_default_params[VfpnControls_bLogThreshLog].addr,vpip_default_params[VfpnControls_bLogThreshLog].val));// 0x4)); + IRP_ASSERT(irp_write_packet(srv_open, vpip_default_params[AntiFlickerExposureControls_bMainsFrequency_Hz].addr,vpip_default_params[AntiFlickerExposureControls_bMainsFrequency_Hz].val));// 0x32)); @@ -5105,7 +5765,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new /** Update only configuration registers -@@ -6310,6 +8650,7 @@ static int irp_start_fw(struct sva_servi + */ + case PipeSetupBankB_fCb_Cr_Flip : +@@ -6308,10 +8648,11 @@ static int irp_start_fw(struct sva_servi + case SensorCapabilitiesFarSensor_uwSensorAnalogGainMaximum_MSByte : + case SensorCapabilitiesFarSensor_uwSensorDataPedestal_MSByte : case SensorCapabilitiesCurrentSensor_uwSensorAnalogGainMinimum_MSByte : case SensorCapabilitiesCurrentSensor_uwSensorAnalogGainMaximum_MSByte : case FlashManagerControl_bMode : @@ -5113,7 +5777,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new case FlashManagerControl_bFlashType : case FlashManagerControl_fOrMainAndPreFlashPulse : case FlashManagerControl_RefPointCalcMode : -@@ -6327,8 +8668,6 @@ static int irp_start_fw(struct sva_servi + case FlashManagerControl_wIntegrationStartPosition_MSByte : + case FlashManagerControl_fOverrideIntegrationStartPosition : +@@ -6325,12 +8666,10 @@ static int irp_start_fw(struct sva_servi + case FlashManagerControl_wMainFlashStartLine_MSByte : + case FlashManagerControl_wMainFlashStartPixel_MSByte : case FlashManagerControl_cPreFlashStartFrame : case FlashManagerControl_wPreFlashStartLine_MSByte : case FlashManagerControl_wPreFlashStartPixel_MSByte : @@ -5122,7 +5790,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new case FlashManagerControl_bTotalFramesRequired : case ExposureControls_bMode : case ExposureControls_bMetering : -@@ -6348,6 +8687,8 @@ static int irp_start_fw(struct sva_servi + case ExposureControls_fpColdStartDesiredTime_us_MSByte : + case ExposureControls_iExposureCompensation : +@@ -6346,10 +8685,12 @@ static int irp_start_fw(struct sva_servi + case ExposureControls_fEnableHighClipForDesiredExposureTime : + case ExposureControls_bAntiFlickerMode : case ExposureControls_fInhibitExposurePresetModeForFlash : case ExposureAlgorithmControls_fpDigitalGainFloor_MSByte : case ExposureAlgorithmControls_fpDigitalGainCeiling_MSByte : @@ -5131,7 +5803,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new case WhiteBalanceControls_bMode : case WhiteBalanceControls_bManualRedGain : case WhiteBalanceControls_bManualGreenGain : -@@ -6376,8 +8717,9 @@ static int irp_start_fw(struct sva_servi + case WhiteBalanceControls_bManualBlueGain : + case WhiteBalanceControls_bMiscSettings : +@@ -6374,12 +8715,13 @@ static int irp_start_fw(struct sva_servi + case AutomaticFrameRateControl_bUserMaximumFrameRate_Hz : + case AutomaticFrameRateControl_bRelativeChange_num : case AutomaticFrameRateControl_bRelativeChange_den : case AutomaticFrameRateControl_fDivorceMinFrameRateFromMaxIntegration : @@ -5142,7 +5818,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new case ColourEngine0_ColourMatrixFarSensor_fpRInR_MSByte : case ColourEngine0_ColourMatrixFarSensor_fpGInR_MSByte : case ColourEngine0_ColourMatrixFarSensor_fpBInR_MSByte : -@@ -6421,6 +8763,7 @@ static int irp_start_fw(struct sva_servi + case ColourEngine0_ColourMatrixFarSensor_fpRInG_MSByte : + case ColourEngine0_ColourMatrixFarSensor_fpGInG_MSByte : +@@ -6419,10 +8761,11 @@ static int irp_start_fw(struct sva_servi + case ColourEngine0_GammaCorrection_SharpBlue : + case ColourEngine0_GammaCorrection_SoftRed : case ColourEngine0_GammaCorrection_SoftGreen : case ColourEngine0_GammaCorrection_SoftBlue : @@ -5150,7 +5830,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new case NoraControls_fDisable : case NoraControls_fDisableNoraPromoting : case NoraControls_bMaximumValue : -@@ -6442,6 +8785,8 @@ static int irp_start_fw(struct sva_servi + case NoraControls_fDifferentTextureDegreeForBlue : + case NoraControls_fSplitNoiseLevel : +@@ -6440,10 +8783,12 @@ static int irp_start_fw(struct sva_servi + case ScytheFilterControls_fpDamperLowThresholdHigh_MSByte : + case ScytheFilterControls_fpDamperHighThresholdLow_MSByte : case ScytheFilterControls_fpDamperHighThresholdHigh_MSByte : case ScytheFilterControls_fpMinimumDamperOutputLow_MSByte : case ScytheFilterControls_fpMinimumDamperOutputHigh_MSByte : @@ -5159,7 +5843,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new case JackFilterControls_fDisableFilter : case JackFilterControls_fSquareLaw : case JackFilterControls_fDisablePromotingLow : -@@ -6454,6 +8799,11 @@ static int irp_start_fw(struct sva_servi + case JackFilterControls_fDisablePromotingHigh : + case JackFilterControls_bMaxWeightLow : +@@ -6452,10 +8797,15 @@ static int irp_start_fw(struct sva_servi + case JackFilterControls_fpDamperLowThresholdHigh_MSByte : + case JackFilterControls_fpDamperHighThresholdLow_MSByte : case JackFilterControls_fpDamperHighThresholdHigh_MSByte : case JackFilterControls_fpMinimumDamperOutputLow_MSByte : case JackFilterControls_fpMinimumDamperOutputHigh_MSByte : @@ -5171,7 +5859,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new case AntiVignetteControls_fDisableFilter : case AntiVignetteControls_bFilterCoeff_R2_r : case AntiVignetteControls_bFilterCoeff_R2_gr : -@@ -6480,6 +8830,9 @@ static int irp_start_fw(struct sva_servi + case AntiVignetteControls_bFilterCoeff_R2_gb : + case AntiVignetteControls_bFilterCoeff_R2_b : +@@ -6478,10 +8828,13 @@ static int irp_start_fw(struct sva_servi + case AntiVignetteControls_bUnityOffset_r : + case AntiVignetteControls_bUnityOffset_gr : case AntiVignetteControls_bUnityOffset_gb : case AntiVignetteControls_bUnityOffset_b : case AntiVignetteControls_fAdaptiveAntiVignetteEnable : @@ -5181,7 +5873,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new case ColourEngine0_RadialApertureCorrectionControl_fEnableCorrection : case ColourEngine0_RadialApertureCorrectionHostInputs_bQvec0 : case ColourEngine0_RadialApertureCorrectionHostInputs_bQvec1 : -@@ -6497,6 +8850,7 @@ static int irp_start_fw(struct sva_servi + case ColourEngine0_RadialApertureCorrectionHostInputs_bCofShift : + case ColourEngine0_RadialApertureCorrectionHostInputs_bOutShift : +@@ -6495,26 +8848,30 @@ static int irp_start_fw(struct sva_servi + case ColourEngine0_CoderOutputSignalRange_uwChromaMidpointTimes2_MSByte : + case ColourEngine0_FadeToBlack_fDisable : case ColourEngine0_FadeToBlack_fpBlackValue_MSByte : case ColourEngine0_FadeToBlack_fpDamperLowThreshold_MSByte : case ColourEngine0_FadeToBlack_fpDamperHighThreshold_MSByte : @@ -5189,7 +5885,7 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new case WhiteBalanceConstrainerControls_fpRedB_MSByte : case WhiteBalanceConstrainerControls_fpBlueB_MSByte : case WhiteBalanceConstrainerControls_fpMaximumDistanceAllowedFromLocus_MSByte : -@@ -6504,6 +8858,8 @@ static int irp_start_fw(struct sva_servi + case WhiteBalanceConstrainerControls_fEnableConstrainedWhiteBalance : case WhiteBalanceGainLimit_fpWhiteBalanceGainLimit_MSByte : case FLADriverLowLevelParameters_bFramesToSkip : @@ -5198,7 +5894,9 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new case FocusRangeConstants_wFullRange_LensMinPosition_MSByte : case FocusRangeConstants_wFullRange_LensMaxPosition_MSByte : case FocusRangeConstants_wFullRange_LensRecoveryPosition_MSByte : -@@ -6513,6 +8869,7 @@ static int irp_start_fw(struct sva_servi + case FocusRangeConstants_wLandscape_LensMinPosition_MSByte : + case FocusRangeConstants_wLandscape_LensMaxPosition_MSByte : + case FocusRangeConstants_wLandscape_LensRecoveryPosition_MSByte : case FocusRangeConstants_wMacro_LensMinPosition_MSByte : case FocusRangeConstants_wMacro_LensMaxPosition_MSByte : case FocusRangeConstants_wMacro_LensRecoveryPosition_MSByte : @@ -5206,7 +5904,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new case AutoFocusControls_fFMTesting_AutoDisable : case AutoFocusControls_fBackLight_Enable : case AutoFocusControls_fBackupSolution : -@@ -6533,10 +8890,14 @@ static int irp_start_fw(struct sva_servi + case AutoFocusControls_fCheckExposureStable_Enable : + case AutoFocusControls_fEnableSimpleCoarseThEvaluation : +@@ -6531,25 +8888,33 @@ static int irp_start_fw(struct sva_servi + case AutoFocusControls_fEnableTrakingZoneVariation : + case AutoFocusControls_fEnableFunctionThresholdTest : case AutoFocusControls_fResetHCSPos : case AutoFocusConstants_bCoarseStep : case AutoFocusConstants_bFineStep : @@ -5221,7 +5923,7 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new case SensorSetupFarSensor_uwGuaranteedDataSaturationLevel_MSByte : case SensorSetupFarSensor_uwMinimumSensorRxPixelValue_MSByte : case SensorSetupFarSensor_uwMaximumSensorRxPixelValue_MSByte : -@@ -6544,10 +8905,14 @@ static int irp_start_fw(struct sva_servi + case SensorSetupFarSensor_fpRedTiltGain_MSByte : case SensorSetupFarSensor_fpGreenTiltGain_MSByte : case SensorSetupFarSensor_fpBlueTiltGain_MSByte : case SensorSetupFarSensor_BlackCorrectionOffset : @@ -5236,7 +5938,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new case AdaptiveAVParameter_B_bAvUnityOffset_Day : case AdaptiveAVParameter_B_bAvCoeffR2_Day : case AdaptiveAVParameter_B_bAvCoeffR4_Day : -@@ -6628,27 +8993,33 @@ static int irp_start_fw(struct sva_servi + case AdaptiveAVParameter_B_wAvHOffset_Day_MSByte : + case AdaptiveAVParameter_B_wAvVOffset_Day_MSByte : +@@ -6626,31 +8991,37 @@ static int irp_start_fw(struct sva_servi + case AdaptiveAVParameter_R_bAvUnityOffset_HOR : + case AdaptiveAVParameter_R_bAvCoeffR2_HOR : case AdaptiveAVParameter_R_bAvCoeffR4_HOR : case AdaptiveAVParameter_R_wAvHOffset_HOR_MSByte : case AdaptiveAVParameter_R_wAvVOffset_HOR_MSByte : @@ -5270,7 +5976,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new case AdaptiveColourMatrix_fpNormalisedRedGain0_MSByte : case AdaptiveColourMatrix_fpNormalisedRedGain1_MSByte : case AdaptiveColourMatrix_bChooseAdaptiveColourMatrix: -@@ -6667,6 +9038,9 @@ static int irp_start_fw(struct sva_servi + + IRP_ASSERT(irp_write_packet(srv_open, vpip_default_params[vpip_update_iteration].addr,vpip_default_params[vpip_update_iteration].val));// 0)); +@@ -6665,10 +9036,13 @@ static int irp_start_fw(struct sva_servi + //IRP_ASSERT(irp_write_packet(srv_open, vpip_default_params[vpip_update_iteration].addr,vpip_default_params[vpip_update_iteration].val));// 0)); + break; } @@ -5280,7 +5990,11 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new } -@@ -6681,6 +9055,8 @@ static int irp_start_fw(struct sva_servi + + +@@ -6679,10 +9053,12 @@ static int irp_start_fw(struct sva_servi + + @@ -5289,10 +6003,13 @@ diff -Nauprw linux-2.6.20/drivers/media/nomadik_mm/sva/nomadik_sva_vpip.c ../new /* debug: depict whether the firmware was able to talk to sensor */ IRP_ASSERT(irp_read_packet(srv_open, vpip_default_params[SensorInformation_fFarSensorAvailable].addr, &vpip_state)); dbgprintk(1,"checking for SensorInformation=%d FAR sensor state \n", vpip_state); -diff -Nauprw linux-2.6.20/drivers/media/video/v4l2-nomadik.c ../new/linux-2.6.20/drivers/media/video/v4l2-nomadik.c ---- linux-2.6.20/drivers/media/video/v4l2-nomadik.c 2008-11-24 14:06:24.000000000 +0530 -+++ ../new/linux-2.6.20/drivers/media/video/v4l2-nomadik.c 2008-12-01 17:35:51.646833000 +0530 -@@ -38,7 +38,7 @@ MODULE_PARM_DESC(v4l2_nomadik_debug,"Deb + IRP_ASSERT(irp_read_packet(srv_open, vpip_default_params[SensorInformation_fNearSensorAvailable].addr, &vpip_state)); + dbgprintk(1,"checking for SensorInformation=%d NEAR sensor state \n", vpip_state); +--- linux-2.6.20.orig/drivers/media/video/v4l2-nomadik.c ++++ linux-2.6.20/drivers/media/video/v4l2-nomadik.c +@@ -36,11 +36,11 @@ MODULE_PARM_DESC(v4l2_nomadik_debug,"Deb + } while(0) + struct v4l2_sva_dev *dev; extern struct sva_device sva; static struct semaphore driver_mutex; @@ -5301,3 +6018,5 @@ diff -Nauprw linux-2.6.20/drivers/media/video/v4l2-nomadik.c ../new/linux-2.6.20 extern struct nomadik_vpip_param vpip_default_params[];//defined in nomadik_sva_vpip.c extern int VPIP_VERSION; + + int sva_vpip_auto_focus(struct sva_device_open *open, struct vpip_autofocus_id *mode); |