Update to latest ZTE Blade source code

http://support.zte.com.cn/support//news/NewsDetail.aspx?newsId=1001722

Conflicts:

	arch/arm/configs/msm7627_blade_defconfig

arch/arm/configs/msm7627_blade_defconfig

@@ -1,7 +1,6 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.35.7
-# Sat Sep  3 02:20:38 2011
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -39,13 +38,12 @@ CONFIG_CROSS_COMPILE=""
 CONFIG_LOCALVERSION="$(KERNEL_LOCAL_VERSION)-perf"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_BZIP2=y
 CONFIG_HAVE_KERNEL_LZMA=y
-CONFIG_HAVE_KERNEL_XZ=y
-# CONFIG_KERNEL_GZIP is not set
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_BZIP2 is not set
 # CONFIG_KERNEL_LZMA is not set
-CONFIG_KERNEL_XZ=y
+# CONFIG_KERNEL_LZO is not set
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
@@ -293,8 +291,6 @@ CONFIG_MACH_BLADE=y
 # CONFIG_MACH_ROAMER is not set
 # CONFIG_MACH_BLUETICK is not set
 CONFIG_ZTE_FTM_FLAG_SUPPORT=y
-# CONFIG_ZTE_GEN1 is not set
-CONFIG_ZTE_GEN2=y
 # CONFIG_MSM_STACKED_MEMORY is not set
 CONFIG_PHYS_OFFSET=0x02600000
 CONFIG_MSM_AMSS_VERSION=6225
@@ -491,25 +487,16 @@ CONFIG_CPU_FREQ_TABLE=y
 CONFIG_CPU_FREQ_DEBUG=y
 CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_FREQ_STAT_DETAILS=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_LAGFREE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_SMARTASS2=y
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
-# CONFIG_CPU_FREQ_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_GOV_INTERACTIVEX=y
-CONFIG_CPU_FREQ_GOV_SMARTASS2=y
-CONFIG_CPU_FREQ_GOV_SAVAGEDZEN=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_CPU_FREQ_GOV_LAGFREE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_MINMAX=y
-CONFIG_CPU_FREQ_MIN_TICKS=10
-CONFIG_CPU_FREQ_SAMPLING_LATENCY_MULTIPLIER=1000
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 # CONFIG_CPU_IDLE is not set
 CONFIG_CPU_FREQ_MSM=y
 
@@ -1195,7 +1182,7 @@ CONFIG_INPUT=y
 # CONFIG_INPUT_MOUSEDEV is not set
 # CONFIG_INPUT_JOYDEV is not set
 CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_EVBUG is not set
+CONFIG_INPUT_EVBUG=m
 # CONFIG_INPUT_KEYRESET is not set
 
 #
@@ -1239,7 +1226,7 @@ CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI=y
 CONFIG_TOUCHSCREEN_CYPRESS_I2C_RMI=y
 # CONFIG_TOUCHSCREEN_MXT224 is not set
 # CONFIG_TOUCHSCREEN_CYTTSP_I2C is not set
-# CONFIG_TOUCHSCREEN_FOCALTECH is not set
+CONFIG_TOUCHSCREEN_FOCALTECH=y
 # CONFIG_TOUCHSCREEN_FOCALTECH_NEW is not set
 # CONFIG_TOUCHSCREEN_VIRTUAL_KEYS is not set
 # CONFIG_MINI_RACER is not set
@@ -1363,6 +1350,8 @@ CONFIG_I2C_MSM=y
 #
 # CONFIG_MSENSORS_FROM_AUXI2C_TO_I2C is not set
 # CONFIG_GSENSORS_FROM_AUXI2C_TO_I2C is not set
+CONFIG_SENSORS_ONA3301=y
+CONFIG_SENSORS_ISL29026=y
 CONFIG_SENSORS_TSL2771=y
 # CONFIG_SENSORS_BH1721 is not set
 # CONFIG_SENSORS_AKM8962 is not set
@@ -1441,12 +1430,12 @@ CONFIG_VIDEO_MEDIA=y
 #
 CONFIG_IR_CORE=y
 CONFIG_VIDEO_IR=y
-# CONFIG_RC_MAP is not set
-# CONFIG_IR_NEC_DECODER is not set
-# CONFIG_IR_RC5_DECODER is not set
-# CONFIG_IR_RC6_DECODER is not set
-# CONFIG_IR_JVC_DECODER is not set
-# CONFIG_IR_SONY_DECODER is not set
+CONFIG_RC_MAP=y
+CONFIG_IR_NEC_DECODER=y
+CONFIG_IR_RC5_DECODER=y
+CONFIG_IR_RC6_DECODER=y
+CONFIG_IR_JVC_DECODER=y
+CONFIG_IR_SONY_DECODER=y
 # CONFIG_IR_IMON is not set
 # CONFIG_MEDIA_ATTACH is not set
 CONFIG_MEDIA_TUNER=y
@@ -1485,15 +1474,17 @@ CONFIG_MSM_CAMERA=y
 # CONFIG_MT9D112 is not set
 # CONFIG_MT9P012 is not set
 # CONFIG_MT9V113 is not set
-CONFIG_MT9P111=y
-# CONFIG_MT9P111_MCNEX is not set
-CONFIG_MT9P111_SAMSUNG_FPC=y
-# CONFIG_MT9P111_SAMSUNG_SOCKET is not set
+# CONFIG_MT9P111 is not set
 CONFIG_MT9T11X=y
 CONFIG_MT9T11X_QTECH_MCNEX_FPC=y
+# CONFIG_OV5642 is not set
+CONFIG_OV5640=y
+CONFIG_OV5640_GLOBALOPTICS=y
+
 CONFIG_OV5642=y
 CONFIG_OV5642_GLOBALOPTICS=y
-# CONFIG_OV5640 is not set
+# CONFIG_OVM7690 is not set
+# CONFIG_HI704 is not set
 # CONFIG_MT9D115 is not set
 # CONFIG_MT9D113 is not set
 CONFIG_S5K5CAGX=y
@@ -1506,8 +1497,9 @@ CONFIG_S5K5CAGX_MCNEX_QTECH_FPC=y
 CONFIG_SENSOR_ADAPTER=y
 CONFIG_SENSOR_INFO=y
 # CONFIG_MSM_CAMERA_FLASH is not set
-# CONFIG_MSM_GEMINI is not set
+CONFIG_QUP_EXCLUSIVE_TO_CAMERA=y
 # CONFIG_CAMERA_N880 is not set
+# CONFIG_V4L_MEM2MEM_DRIVERS is not set
 # CONFIG_RADIO_ADAPTERS is not set
 CONFIG_DAB=y
 
@@ -2317,8 +2309,8 @@ CONFIG_CRYPTO_TWOFISH_COMMON=y
 # Compression
 #
 CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_ZLIB=y
-CONFIG_CRYPTO_LZO=y
+# CONFIG_CRYPTO_ZLIB is not set
+# CONFIG_CRYPTO_LZO is not set
 
 #
 # Random Number Generation
@@ -2351,4 +2343,3 @@ CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
 CONFIG_NLATTR=y
-

arch/arm/mach-msm/Kconfig

@@ -182,166 +182,13 @@ config MACH_BLADE
 	help
 	  Support for the ZTE MSM7x27 Blade phone.
 
-config MACH_BLADE2
-	depends on ARCH_MSM7X27
-	depends on !MSM_STACKED_MEMORY
-	default n
-	bool "ZTE BLADE2"
-	select ZTE_PLATFORM
-	help
-	  Support for the ZTE MSM7x27 Blade2 phone.
-
-config MACH_NOVA
-	depends on ARCH_MSM7X27
-	depends on !MSM_STACKED_MEMORY
-	default n
-	bool "ZTE NOVA"
-	select ZTE_PLATFORM
-	help
-	  Support for the ZTE MSM7x27 Nova phone.
-
-config MACH_SAILBOAT
-	depends on ARCH_MSM7X27
-	depends on !MSM_STACKED_MEMORY
-	default n
-	bool "ZTE SAILBOAT"
-	select ZTE_PLATFORM
-	help
-	  Support for the ZTE MSM7x27 Sailboat phone.
-
-config MACH_TURIES
-	depends on ARCH_MSM7X27
-	depends on !MSM_STACKED_MEMORY
-	default n
-	bool "ZTE TURIES"
-	select ZTE_PLATFORM
-	help
-	  Support for the ZTE MSM7x27 Turies phone.
-
 config MACH_BLADE_CAMERA5MP
 	depends on MACH_BLADE
 	default n
 	bool "ZTE blade board,5MP camera."
 	help
 	  Support for the ZTE blade board,5MP camera.
 
-config MACH_MOONCAKE
-	depends on ARCH_MSM7X27
-	depends on !MSM_STACKED_MEMORY
-	default n
-	bool "ZTE MOONCAKE"
-	select ZTE_PLATFORM
-	help
-	  Support for the ZTE MSM7x27 mooncake phone.	
-
-config MACH_V9
-	depends on ARCH_MSM7X27
-	depends on !MSM_STACKED_MEMORY
-	default n
-	bool "ZTE V9"
-	select ZTE_PLATFORM
-	help
-	  Support for the ZTE MSM7x27 v9 phone.	
-
-config MACH_RAISE
-	depends on ARCH_MSM7X27
-	depends on !MSM_STACKED_MEMORY
-	default n
-	bool "ZTE RAISE"
-	select ZTE_PLATFORM
-	help
-	  Support for the ZTE MSM7x27 raise phone.
-
-config MACH_JOE
-	depends on ARCH_MSM7X27
-	depends on !MSM_STACKED_MEMORY
-	default n
-	bool "ZTE JOE"
-	select ZTE_PLATFORM
-	help
-	  Support for the ZTE MSM7x27 joe phone.	
-
-config MACH_R750
-	depends on ARCH_MSM7X27
-	depends on !MSM_STACKED_MEMORY
-	default n
-	bool "ZTE R750"
-	select ZTE_PLATFORM
-	help
-	  Support for the ZTE MSM7x27 r750 phone.		    		   	  
-
-config MACH_IBOX
-	depends on ARCH_MSM7X27
-	depends on !MSM_STACKED_MEMORY
-	default n
-	bool "ZTE IBOX"
-	select ZTE_PLATFORM
-	help
-	  Support for the ZTE MSM7x27 ibox phone.	
-
-config MACH_AMIGO
-	depends on ARCH_MSM7X27
-	depends on !MSM_STACKED_MEMORY
-	default n
-	bool "ZTE AMIGO"
-	select ZTE_PLATFORM
-	help
-	  Support for the ZTE MSM7x27 amigo phone.	
-
-config MACH_SMOOTH
-	depends on ARCH_MSM7X27
-	depends on !MSM_STACKED_MEMORY
-	default n
-	bool "ZTE SMOOTH"
-	select ZTE_PLATFORM
-	help
-	  Support for the ZTE MSM7x27 smooth phone.	  
-
-config MACH_JOECDMA
-	depends on ARCH_MSM7X27
-	depends on !MSM_STACKED_MEMORY
-	default n
-	bool "ZTE JOECDMA"
-	select ZTE_PLATFORM
-	help
-	  Support for the ZTE MSM7x27 joeCDMA phone.		  
-
-config MACH_RACER2
-	depends on ARCH_MSM7X27
-	depends on !MSM_STACKED_MEMORY
-	default n
-	bool "ZTE_RACER2"
-	select ZTE_PLATFORM
-	help
-	  Support for the ZTE MSM7x27 racer2 phone. 
-
-config MACH_SKATE
-	depends on ARCH_MSM7X27
-	depends on !MSM_STACKED_MEMORY
-	default n
-	bool "ZTE SKATE"
-	select ZTE_PLATFORM
-	help
-	  Support for the ZTE MSM7x27 skate phone.
-
-config MACH_ROAMER
-	depends on ARCH_MSM7X27
-	depends on !MSM_STACKED_MEMORY
-	default n
-	bool "ZTE ROAMER"
-	select ZTE_PLATFORM
-	help
-	  Support for the ZTE MSM7x27 roamer phone.	  
-
-config MACH_BLUETICK
-	depends on ARCH_MSM7X27
-	depends on !MSM_STACKED_MEMORY
-	default n
-	bool "ZTE BLUETICK"
-	select ZTE_PLATFORM
-	help
-	  Support for the ZTE MSM7x27 bluetick phone.	  
-
 # ZTE_FTM_FLAG_SUPPORT
 config ZTE_FTM_FLAG_SUPPORT
 	depends on ZTE_PLATFORM

arch/arm/mach-msm/Makefile

@@ -174,17 +174,4 @@ obj-y	+= tlmm-msm7200a.o
 
 # Add ZTE board files and keypad config files
 obj-$(CONFIG_MACH_BLADE) += board-zte-blade-keypad.o board-zte-blade.o
-obj-$(CONFIG_MACH_BLADE2) += board-zte-blade2-keypad.o board-zte-blade2.o
-obj-$(CONFIG_MACH_NOVA) += board-zte-nova-keypad.o board-zte-nova.o
-obj-$(CONFIG_MACH_TURIES) += board-zte-turies-keypad.o board-zte-turies.o
-obj-$(CONFIG_MACH_RACER2) += board-zte-racer2-keypad.o board-zte-racer2.o
-obj-$(CONFIG_MACH_SAILBOAT) += board-zte-sailboat-keypad.o board-zte-sailboat.o
-obj-$(CONFIG_MACH_MOONCAKE) += board-zte-mooncake-keypad.o board-zte-mooncake.o
-obj-$(CONFIG_MACH_V9) += board-zte-v9-keypad.o board-zte-v9.o
-obj-$(CONFIG_MACH_AMIGO) += board-zte-amigo-keypad.o board-zte-amigo.o
-obj-$(CONFIG_MACH_SMOOTH) += board-zte-smooth-keypad.o board-zte-smooth.o
-obj-$(CONFIG_MACH_JOECDMA) += board-zte-joecdma-keypad.o board-zte-joecdma.o
-obj-$(CONFIG_MACH_R750) += board-zte-r750.o board-zte-r750-keypad.o
-obj-$(CONFIG_MACH_SKATE) += board-zte-skate-keypad.o board-zte-skate.o
-obj-$(CONFIG_MACH_ROAMER) += board-zte-roamer-keypad.o board-zte-roamer.o
-obj-$(CONFIG_MACH_BLUETICK) += board-zte-bluetick-keypad.o board-zte-bluetick.o
+

arch/arm/mach-msm/board-msm7x27.c

@@ -2455,6 +2455,14 @@ static struct i2c_board_info aux_i2c_devices[] = {
 		.type         = "taos",
 		.addr         = 0x39,
 	},
+	{
+		.type         = "isl29026",
+		.addr         = 0x45,
+	},
+	{
+		.type         = "ona3301",
+		.addr         = 0x37,
+	},	
 	//ZTE_ALSPRX_001 end
 };
 /*ZTE_AUX_FYA_001,@2010-02-06,END*/