Merge remote-tracking branch 'cyanogen/cm-13.0' into replicant-6.0-new

Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>

Conflicts:
	Makefile
	firmware/Makefile
	firmware/epen/W9001_B713.bin.ihex
	firmware/epen/W9001_B746.bin.ihex
	firmware/epen/W9001_B746JD.bin.ihex
	firmware/epen/W9001_B746L.bin.ihex
	firmware/epen/W9001_B746S.bin.ihex

1 files changed, 63 insertions, 27 deletions

diff --git a/arch/arm/configs/cyanogenmod_i9300_defconfig b/arch/arm/configs/cyanogenmod_i9300_defconfig
index 9b139c9..1438605 100644
--- a/arch/arm/configs/cyanogenmod_i9300_defconfig
+++ b/arch/arm/configs/cyanogenmod_i9300_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux/arm 3.0.64 Kernel Configuration
+# Linux/arm 3.0.101 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_HAVE_PWM=y
@@ -42,11 +42,11 @@ CONFIG_LOCALVERSION_AUTO=y
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_LZMA=y
 CONFIG_HAVE_KERNEL_LZO=y
-CONFIG_KERNEL_GZIP=y
-# CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_GZIP is not set
+CONFIG_KERNEL_LZMA=y
 # CONFIG_KERNEL_LZO is not set
 CONFIG_DEFAULT_HOSTNAME="(none)"
-# CONFIG_SWAP is not set
+CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
@@ -84,7 +84,9 @@ CONFIG_CGROUP_FREEZER=y
 # CONFIG_CPUSETS is not set
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
-# CONFIG_CGROUP_MEM_RES_CTLR is not set
+CONFIG_CGROUP_MEM_RES_CTLR=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_RT_GROUP_SCHED=y
@@ -96,6 +98,7 @@ CONFIG_USER_NS=y
 CONFIG_PID_NS=y
 CONFIG_NET_NS=y
 # CONFIG_SCHED_AUTOGROUP is not set
+CONFIG_MM_OWNER=y
 # CONFIG_SYSFS_DEPRECATED is not set
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
@@ -143,7 +146,8 @@ CONFIG_COMPAT_BRK=y
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
 # CONFIG_SLOB is not set
-# CONFIG_PROFILING is not set
+CONFIG_PROFILING=y
+# CONFIG_OPROFILE is not set
 CONFIG_HAVE_OPROFILE=y
 # CONFIG_KPROBES is not set
 CONFIG_HAVE_KPROBES=y
@@ -454,6 +458,7 @@ CONFIG_MACH_M0=y
 # CONFIG_MACH_P4NOTE is not set
 # CONFIG_MACH_GC1 is not set
 # CONFIG_MACH_T0 is not set
+# CONFIG_MACH_KONA is not set
 # CONFIG_MACH_IRON is not set
 # CONFIG_MACH_GRANDE is not set
 # CONFIG_MACH_BAFFIN is not set
@@ -462,12 +467,15 @@ CONFIG_MIDAS_COMMON_BD=y
 # CONFIG_GC1_00_BD is not set
 # CONFIG_T0_00_BD is not set
 # CONFIG_T0_04_BD is not set
+# CONFIG_KONA_00_BD is not set
+# CONFIG_KONA_01_BD is not set
 # CONFIG_IRON_BD is not set
 # CONFIG_GRANDE_BD is not set
 # CONFIG_WRITEBACK_ENABLED is not set
 # CONFIG_EXYNOS_SOUND_PLATFORM_DATA is not set
 # CONFIG_JACK_FET is not set
 # CONFIG_JACK_GROUND_DET is not set
+# CONFIG_USE_ADC_DET is not set
 CONFIG_SAMSUNG_ANALOG_UART_SWITCH=1
 # CONFIG_EXYNOS5_DEV_BTS is not set
 
@@ -521,6 +529,7 @@ CONFIG_SEC_LOG=y
 CONFIG_SEC_LOG_NONCACHED=y
 CONFIG_SEC_LOG_LAST_KMSG=y
 CONFIG_EHCI_IRQ_DISTRIBUTION=y
+CONFIG_EHCI_MODEM_PORTNUM=2
 
 #
 # Samsung Modem Feature
@@ -544,6 +553,11 @@ CONFIG_SEC_MODEM_M0=y
 # CONFIG_SEC_MODEM_P8LTE is not set
 # CONFIG_SEC_MODEM_T0_TD_DUAL is not set
 # CONFIG_SEC_MODEM_U1_SPR is not set
+
+#
+# Connectivity Feature
+#
+# CONFIG_GPS_BRCM_475X is not set
 # CONFIG_BT_CSR8811 is not set
 # CONFIG_BT_BCM4330 is not set
 CONFIG_BT_BCM4334=y
@@ -562,6 +576,7 @@ CONFIG_BT_MGMT=y
 CONFIG_USB_CDFS_SUPPORT=y
 CONFIG_SAMSUNG_PRODUCT_SHIP=y
 # CONFIG_CORESIGHT_ETM is not set
+# CONFIG_MACH_KONA_SENSOR is not set
 
 #
 # Processor Type
@@ -586,6 +601,7 @@ CONFIG_ARM_TRUSTZONE=y
 CONFIG_ARM_THUMB=y
 # CONFIG_ARM_THUMBEE is not set
 CONFIG_SWP_EMULATE=y
+CONFIG_IDIV_EMULATE=y
 # CONFIG_CPU_ICACHE_DISABLE is not set
 # CONFIG_CPU_DCACHE_DISABLE is not set
 # CONFIG_CPU_BPREDICT_DISABLE is not set
@@ -695,9 +711,9 @@ CONFIG_VMWARE_MVP=y
 # CONFIG_USE_OF is not set
 CONFIG_ZBOOT_ROM_TEXT=0
 CONFIG_ZBOOT_ROM_BSS=0
-CONFIG_CMDLINE="console=ttySAC2,115200"
-CONFIG_CMDLINE_FROM_BOOTLOADER=y
-# CONFIG_CMDLINE_EXTEND is not set
+CONFIG_CMDLINE="console=ttySAC2,115200 consoleblank=0 androidboot.hardware=smdk4x12"
+# CONFIG_CMDLINE_FROM_BOOTLOADER is not set
+CONFIG_CMDLINE_EXTEND=y
 # CONFIG_CMDLINE_FORCE is not set
 # CONFIG_XIP_KERNEL is not set
 # CONFIG_KEXEC is not set
@@ -773,6 +789,7 @@ CONFIG_EARLYSUSPEND=y
 # CONFIG_NO_USER_SPACE_SCREEN_ACCESS_CONTROL is not set
 # CONFIG_CONSOLE_EARLYSUSPEND is not set
 CONFIG_FB_EARLYSUSPEND=y
+# CONFIG_HIBERNATION is not set
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
 CONFIG_PM_RUNTIME=y
@@ -783,6 +800,7 @@ CONFIG_ARCH_HAS_OPP=y
 CONFIG_PM_OPP=y
 CONFIG_PM_RUNTIME_CLK=y
 # CONFIG_SUSPEND_TIME is not set
+CONFIG_CPU_PM=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_NET=y
 
@@ -1183,6 +1201,14 @@ CONFIG_RFKILL_PM=y
 #
 # Device Drivers
 #
+CONFIG_MALI400=y
+CONFIG_MALI_VER_R3P2=y
+# CONFIG_MALI400_DEBUG is not set
+# CONFIG_MALI400_PROFILING is not set
+CONFIG_MALI_DVFS=y
+CONFIG_MALI400_UMP=y
+# CONFIG_MALI_SHARED_INTERRUPTS is not set
+# CONFIG_UMP_DEBUG is not set
 
 #
 # Generic Driver Options
@@ -1276,6 +1302,7 @@ CONFIG_MUIC_MAX77693_SUPPORT_CAR_DOCK=y
 # CONFIG_STMPE811_ADC is not set
 # CONFIG_MPU_SENSORS_MPU3050 is not set
 # CONFIG_MPU_SENSORS_MPU6050 is not set
+CONFIG_UID_CPUTIME=y
 # CONFIG_C2PORT is not set
 
 #
@@ -1398,8 +1425,10 @@ CONFIG_WLAN=y
 CONFIG_WIFI_CONTROL_FUNC=y
 # CONFIG_ATH_COMMON is not set
 # CONFIG_BCM4330 is not set
-CONFIG_BCM4334=y
+CONFIG_BCM4334=m
 # CONFIG_BCM4335 is not set
+# CONFIG_BCM4339 is not set
+# CONFIG_BCM4354 is not set
 # CONFIG_BCM43241 is not set
 CONFIG_BROADCOM_WIFI=y
 CONFIG_BCMDHD_FW_PATH="/system/etc/firmware/fw_bcmdhd.bin"
@@ -1494,6 +1523,7 @@ CONFIG_KEYBOARD_GPIO=y
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_SENSORS_HALL is not set
 CONFIG_KEYBOARD_CYPRESS_TOUCH=y
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
@@ -1549,8 +1579,12 @@ CONFIG_TOUCHSCREEN_MELFAS=y
 # CONFIG_TOUCHSCREEN_MXT1386 is not set
 # CONFIG_TOUCHSCREEN_MXT768E is not set
 # CONFIG_TOUCHSCREEN_SYNAPTICS_S7301 is not set
+# CONFIG_TOUCHSCREEN_SYNAPTICS_S7301_KEYS is not set
+# CONFIG_TOUCHSCREEN_SYNAPTICS_S7301_WORKAROUND is not set
+# CONFIG_TOUCHSCREEN_SYNAPTICS_S7301_KEYLED is not set
 # CONFIG_TOUCHSCREEN_CYTTSP4 is not set
 # CONFIG_SEC_TOUCHSCREEN_DVFS_LOCK is not set
+# CONFIG_SEC_TOUCHSCREEN_SURFACE_TOUCH is not set
 # CONFIG_KEYPAD_MELFAS_TOUCH is not set
 # CONFIG_TOUCHSCREEN_ATMEL_MXT540S is not set
 # CONFIG_INPUT_WACOM is not set
@@ -1788,6 +1822,7 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_BATTERY_MAX17043_FUELGAUGE is not set
 # CONFIG_BATTERY_MAX17042_FUELGAUGE is not set
 CONFIG_BATTERY_MAX17047_FUELGAUGE=y
+# CONFIG_BATTERY_MAX17047_C_FUELGAUGE is not set
 # CONFIG_BATTERY_SMB136_CHARGER is not set
 CONFIG_BATTERY_MAX77693_CHARGER=y
 CONFIG_BATTERY_WPC_CHARGER=y
@@ -2040,6 +2075,7 @@ CONFIG_S5K6A3_CSI_D=y
 CONFIG_VIDEO_S5C73M3=y
 CONFIG_VIDEO_S5C73M3_SPI=y
 # CONFIG_VIDEO_SLP_S5C73M3 is not set
+# CONFIG_VIDEO_SR130PC20 is not set
 # CONFIG_VIDEO_IMPROVE_STREAMOFF is not set
 
 #
@@ -2136,21 +2172,8 @@ CONFIG_VIDEO_MFC5X=y
 CONFIG_VIDEO_MFC_MAX_INSTANCE=4
 # CONFIG_VIDEO_MFC5X_DEBUG is not set
 CONFIG_USE_MFC_CMA=y
-CONFIG_VIDEO_MALI400MP=y
-# CONFIG_MALI_DED_ONLY is not set
-# CONFIG_MALI_DED_MMU is not set
-CONFIG_MALI_OSMEM_ONLY=y
-# CONFIG_MALI_DED_OSMEM is not set
-# CONFIG_MALI_R3P1_LSI is not set
-# CONFIG_VIDEO_MALI400MP_DEBUG is not set
-CONFIG_VIDEO_MALI400MP_DVFS=y
-CONFIG_VIDEO_UMP=y
-# CONFIG_UMP_R3P1_LSI is not set
-# CONFIG_UMP_DED_ONLY is not set
-CONFIG_UMP_OSMEM_ONLY=y
-# CONFIG_UMP_VCM_ONLY is not set
-CONFIG_UMP_MEM_SIZE=1024
-# CONFIG_VIDEO_UMP_DEBUG is not set
+# CONFIG_VIDEO_MALI400MP is not set
+# CONFIG_VIDEO_UMP is not set
 CONFIG_VIDEO_FIMG2D=y
 # CONFIG_VIDEO_FIMG2D_DEBUG is not set
 CONFIG_VIDEO_FIMG2D4X=y
@@ -2261,6 +2284,7 @@ CONFIG_FB_S5P_S6E8AA0=y
 # CONFIG_FB_S5P_S6EVR02 is not set
 # CONFIG_FB_S5P_S6D6AA1 is not set
 # CONFIG_FB_S5P_S6E63M0 is not set
+# CONFIG_FB_S5P_NT71391 is not set
 # CONFIG_S6E8AA0_AMS529HA01 is not set
 CONFIG_S6E8AA0_AMS480GYXX=y
 CONFIG_AID_DIMMING=y
@@ -2295,6 +2319,7 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_PWM is not set
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
+# CONFIG_BACKLIGHT_LP855X is not set
 
 #
 # Display device support
@@ -2849,8 +2874,10 @@ CONFIG_ANDROID_LOW_MEMORY_KILLER=y
 # CONFIG_USB_SERIAL_QUATECH_USB2 is not set
 # CONFIG_VT6656 is not set
 # CONFIG_IIO is not set
-# CONFIG_XVMALLOC is not set
-# CONFIG_ZRAM is not set
+CONFIG_XVMALLOC=y
+CONFIG_ZRAM=y
+# CONFIG_ZRAM_DEBUG is not set
+# CONFIG_ZRAM_FOR_ANDROID is not set
 # CONFIG_FB_SM7XX is not set
 # CONFIG_LIRC_STAGING is not set
 # CONFIG_EASYCAP is not set
@@ -2892,10 +2919,14 @@ CONFIG_SENSORS_AK8975C=y
 CONFIG_SENSORS_CM36651=y
 # CONFIG_SENSORS_BH1721 is not set
 # CONFIG_SENSORS_AL3201 is not set
+# CONFIG_SENSORS_K2DH is not set
 # CONFIG_SENSORS_K3DH is not set
 # CONFIG_SENSORS_K3G is not set
 CONFIG_SENSORS_LSM330DLC=y
 CONFIG_SENSORS_LPS331=y
+# CONFIG_SENSORS_YAS532 is not set
+# CONFIG_SENSORS_YAS_ORI is not set
+CONFIG_INPUT_YAS_MAGNETOMETER_POSITION=0
 # CONFIG_SENSORS_SYSFS is not set
 # CONFIG_SENSORS_SSP is not set
 # CONFIG_SENSORS_SSP_LSM330 is not set
@@ -3013,6 +3044,7 @@ CONFIG_WTL_ENCRYPTION_FILTER=y
 # CONFIG_PSTORE is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
+# CONFIG_F2FS_FS is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
@@ -3297,6 +3329,7 @@ CONFIG_CRYPTO_MD5=y
 # CONFIG_CRYPTO_RMD256 is not set
 # CONFIG_CRYPTO_RMD320 is not set
 CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA1_ARM=y
 CONFIG_CRYPTO_SHA256=y
 # CONFIG_CRYPTO_SHA512 is not set
 # CONFIG_CRYPTO_TGR192 is not set
@@ -3306,6 +3339,7 @@ CONFIG_CRYPTO_SHA256=y
 # Ciphers
 #
 CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_AES_ARM=y
 # CONFIG_CRYPTO_ANUBIS is not set
 CONFIG_CRYPTO_ARC4=y
 # CONFIG_CRYPTO_BLOWFISH is not set
@@ -3353,6 +3387,8 @@ CONFIG_LIBCRC32C=y
 CONFIG_AUDIT_GENERIC=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
 # CONFIG_XZ_DEC is not set
 # CONFIG_XZ_DEC_BCJ is not set
 CONFIG_DECOMPRESS_GZIP=y