merged cm official 06.06.2015

bu44er · Jun 6, 2015 · 7c63574 · 7c63574
1 parent 59b4581
commit 7c63574
Show file tree

Hide file tree

Showing 291 changed files with 525,779 additions and 1,249 deletions.
diff --git a/arch/arm/configs/cyanogenmod_d850_defconfig b/arch/arm/configs/cyanogenmod_d850_defconfig
@@ -170,6 +170,7 @@ CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_DMA_ATTRS=y
 CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_USE_GENERIC_SMP_HELPERS=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_DMA_API_DEBUG=y
@@ -1687,6 +1688,7 @@ CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_I2C=y
 # CONFIG_TOUCHSCREEN_ATMEL_MAXTOUCH is not set
 # CONFIG_TOUCHSCREEN_AD7879 is not set
 # CONFIG_TOUCHSCREEN_ATMEL_MXT is not set
+# CONFIG_TOUCHSCREEN_ATMEL_S540 is not set
 # CONFIG_TOUCHSCREEN_ATMEL_MAXTOUCH_TS is not set
 # CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
 # CONFIG_TOUCHSCREEN_BU21013 is not set
@@ -1731,6 +1733,11 @@ CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=y
 # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_VU3EVB is not set
 # CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_RMI4_DEV is not set
 # CONFIG_TOUCHSCREEN_GT9XX is not set
+# CONFIG_TOUCHSCREEN_SYNAPTICS_DISNEY is not set
+CONFIG_TOUCHSCREEN_SYNAPTICS_FW_PATH="g3"
+CONFIG_TOUCHSCREEN_SYNAPTICS_G3=y
+# CONFIG_TOUCHSCREEN_SYNAPTICS_G2 is not set
+# CONFIG_TOUCHSCREEN_SYNAPTICS_TIGERS is not set
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_BMA150 is not set
@@ -3272,6 +3279,7 @@ CONFIG_ANDROID_TIMED_GPIO=y
 CONFIG_ANDROID_LOW_MEMORY_KILLER=y
 CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES=y
 # CONFIG_ANDROID_SWITCH is not set
+CONFIG_ANDROID_LMK_ADJ_RBTREE=y
 # CONFIG_ANDROID_INTF_ALARM_DEV is not set
 # CONFIG_VIBRATOR_PM8941_HAPTIC is not set
 # CONFIG_PHONE is not set

diff --git a/arch/arm/configs/cyanogenmod_d851_defconfig b/arch/arm/configs/cyanogenmod_d851_defconfig
@@ -170,6 +170,7 @@ CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_DMA_ATTRS=y
 CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_USE_GENERIC_SMP_HELPERS=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_DMA_API_DEBUG=y
@@ -1705,6 +1706,7 @@ CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_I2C=y
 # CONFIG_TOUCHSCREEN_ATMEL_MAXTOUCH is not set
 # CONFIG_TOUCHSCREEN_AD7879 is not set
 # CONFIG_TOUCHSCREEN_ATMEL_MXT is not set
+# CONFIG_TOUCHSCREEN_ATMEL_S540 is not set
 # CONFIG_TOUCHSCREEN_ATMEL_MAXTOUCH_TS is not set
 # CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
 # CONFIG_TOUCHSCREEN_BU21013 is not set
@@ -1749,6 +1751,11 @@ CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=y
 # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_VU3EVB is not set
 # CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_RMI4_DEV is not set
 # CONFIG_TOUCHSCREEN_GT9XX is not set
+# CONFIG_TOUCHSCREEN_SYNAPTICS_DISNEY is not set
+CONFIG_TOUCHSCREEN_SYNAPTICS_FW_PATH="g3"
+CONFIG_TOUCHSCREEN_SYNAPTICS_G3=y
+# CONFIG_TOUCHSCREEN_SYNAPTICS_G2 is not set
+# CONFIG_TOUCHSCREEN_SYNAPTICS_TIGERS is not set
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_BMA150 is not set
@@ -3290,6 +3297,7 @@ CONFIG_ANDROID_TIMED_GPIO=y
 CONFIG_ANDROID_LOW_MEMORY_KILLER=y
 CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES=y
 # CONFIG_ANDROID_SWITCH is not set
+CONFIG_ANDROID_LMK_ADJ_RBTREE=y
 # CONFIG_ANDROID_INTF_ALARM_DEV is not set
 # CONFIG_VIBRATOR_PM8941_HAPTIC is not set
 # CONFIG_PHONE is not set

diff --git a/arch/arm/configs/cyanogenmod_d852_defconfig b/arch/arm/configs/cyanogenmod_d852_defconfig
@@ -170,6 +170,7 @@ CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_DMA_ATTRS=y
 CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_USE_GENERIC_SMP_HELPERS=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_DMA_API_DEBUG=y
@@ -1687,6 +1688,7 @@ CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_I2C=y
 # CONFIG_TOUCHSCREEN_ATMEL_MAXTOUCH is not set
 # CONFIG_TOUCHSCREEN_AD7879 is not set
 # CONFIG_TOUCHSCREEN_ATMEL_MXT is not set
+# CONFIG_TOUCHSCREEN_ATMEL_S540 is not set
 # CONFIG_TOUCHSCREEN_ATMEL_MAXTOUCH_TS is not set
 # CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
 # CONFIG_TOUCHSCREEN_BU21013 is not set
@@ -1731,6 +1733,11 @@ CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=y
 # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_VU3EVB is not set
 # CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_RMI4_DEV is not set
 # CONFIG_TOUCHSCREEN_GT9XX is not set
+# CONFIG_TOUCHSCREEN_SYNAPTICS_DISNEY is not set
+CONFIG_TOUCHSCREEN_SYNAPTICS_FW_PATH="g3"
+CONFIG_TOUCHSCREEN_SYNAPTICS_G3=y
+# CONFIG_TOUCHSCREEN_SYNAPTICS_G2 is not set
+# CONFIG_TOUCHSCREEN_SYNAPTICS_TIGERS is not set
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_BMA150 is not set
@@ -3276,6 +3283,7 @@ CONFIG_ANDROID_TIMED_GPIO=y
 CONFIG_ANDROID_LOW_MEMORY_KILLER=y
 CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES=y
 # CONFIG_ANDROID_SWITCH is not set
+CONFIG_ANDROID_LMK_ADJ_RBTREE=y
 # CONFIG_ANDROID_INTF_ALARM_DEV is not set
 # CONFIG_VIBRATOR_PM8941_HAPTIC is not set
 # CONFIG_PHONE is not set

diff --git a/arch/arm/configs/cyanogenmod_d855_defconfig b/arch/arm/configs/cyanogenmod_d855_defconfig
@@ -3861,3 +3861,15 @@ CONFIG_TCP_CONG_HTCP=y
 CONFIG_TCP_CONG_BIC=y
 
 
+####Merge not if other variants
+# CONFIG_TOUCHSCREEN_SYNAPTICS_DISNEY is not set
+CONFIG_TOUCHSCREEN_SYNAPTICS_FW_PATH="g3"
+CONFIG_TOUCHSCREEN_SYNAPTICS_G3=y
+# CONFIG_TOUCHSCREEN_SYNAPTICS_G2 is not set
+# CONFIG_TOUCHSCREEN_SYNAPTICS_TIGERS is not set
+# CONFIG_TOUCHSCREEN_ATMEL_S540 is not set
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_ANDROID_LMK_ADJ_RBTREE=y
+
+
+