From a01d391b336ba20b5b429fc07d3c9627394ee464 Mon Sep 17 00:00:00 2001 From: Steve Muckle Date: Mon, 25 Mar 2013 13:22:06 -0700 Subject: [PATCH] defconfig: automatic update This change updates the defconfigs to match recent changes in the Kconfig files. Committing these changes now prevents them from showing up in future defconfig commits as unrelated diffs. Change-Id: I101f144d2ff3620e7dd5480ac54c9eec0e588b91 Signed-off-by: Steve Muckle --- arch/arm/configs/fsm9xxx-perf_defconfig | 3 +- arch/arm/configs/fsm9xxx_defconfig | 3 +- arch/arm/configs/msm7627a-perf_defconfig | 12 +- arch/arm/configs/msm7627a_defconfig | 12 +- arch/arm/configs/msm7630-perf_defconfig | 10 +- arch/arm/configs/msm7630_defconfig | 10 +- arch/arm/configs/msm8610_defconfig | 167 ++++++++++------------- arch/arm/configs/msm8660-perf_defconfig | 20 +-- arch/arm/configs/msm8660_defconfig | 20 +-- arch/arm/configs/msm8960-perf_defconfig | 41 +++--- arch/arm/configs/msm8960_defconfig | 41 +++--- arch/arm/configs/msm8974-perf_defconfig | 34 ++--- arch/arm/configs/msm8974_defconfig | 34 ++--- arch/arm/configs/msm9615_defconfig | 2 - arch/arm/configs/msm9625-perf_defconfig | 85 ++++++------ arch/arm/configs/msm9625_defconfig | 85 ++++++------ 16 files changed, 232 insertions(+), 347 deletions(-) diff --git a/arch/arm/configs/fsm9xxx-perf_defconfig b/arch/arm/configs/fsm9xxx-perf_defconfig index 8a7928b68b8..10414e19353 100644 --- a/arch/arm/configs/fsm9xxx-perf_defconfig +++ b/arch/arm/configs/fsm9xxx-perf_defconfig @@ -9,7 +9,6 @@ CONFIG_IKCONFIG_PROC=y CONFIG_BLK_DEV_INITRD=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_PANIC_TIMEOUT=5 -CONFIG_ASHMEM=y CONFIG_EMBEDDED=y CONFIG_SLAB=y CONFIG_PROFILING=y @@ -34,7 +33,6 @@ CONFIG_MSM_ONCRPCROUTER=y CONFIG_MSM_IPC_ROUTER=y CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y # CONFIG_MSM_ONCRPCROUTER_DEBUG is not set -# CONFIG_MSM_HW3D is not set # CONFIG_QSD_AUDIO is not set # CONFIG_SURF_FFA_GPIO_KEYPAD is not set CONFIG_MSM_SMCMOD=m @@ -156,6 +154,7 @@ CONFIG_RTC_DEBUG=y CONFIG_STAGING=y CONFIG_ANDROID=y CONFIG_ANDROID_BINDER_IPC=y +CONFIG_ASHMEM=y CONFIG_ANDROID_LOGGER=y CONFIG_ANDROID_RAM_CONSOLE=y CONFIG_ANDROID_TIMED_GPIO=y diff --git a/arch/arm/configs/fsm9xxx_defconfig b/arch/arm/configs/fsm9xxx_defconfig index db2f25d600d..aa3befa1a58 100644 --- a/arch/arm/configs/fsm9xxx_defconfig +++ b/arch/arm/configs/fsm9xxx_defconfig @@ -10,7 +10,6 @@ CONFIG_BLK_DEV_INITRD=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_PANIC_TIMEOUT=5 CONFIG_KALLSYMS_ALL=y -CONFIG_ASHMEM=y CONFIG_EMBEDDED=y CONFIG_SLAB=y CONFIG_PROFILING=y @@ -33,7 +32,6 @@ CONFIG_MSM_SMD_PKG3=y CONFIG_MSM_ONCRPCROUTER=y CONFIG_MSM_IPC_ROUTER=y CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y -# CONFIG_MSM_HW3D is not set # CONFIG_QSD_AUDIO is not set # CONFIG_SURF_FFA_GPIO_KEYPAD is not set CONFIG_MSM_SMCMOD=m @@ -155,6 +153,7 @@ CONFIG_RTC_DEBUG=y CONFIG_STAGING=y CONFIG_ANDROID=y CONFIG_ANDROID_BINDER_IPC=y +CONFIG_ASHMEM=y CONFIG_ANDROID_LOGGER=y CONFIG_ANDROID_RAM_CONSOLE=y CONFIG_ANDROID_TIMED_GPIO=y diff --git a/arch/arm/configs/msm7627a-perf_defconfig b/arch/arm/configs/msm7627a-perf_defconfig index 8eac20fd816..aea092e9b22 100644 --- a/arch/arm/configs/msm7627a-perf_defconfig +++ b/arch/arm/configs/msm7627a-perf_defconfig @@ -15,7 +15,6 @@ CONFIG_RT_GROUP_SCHED=y CONFIG_BLK_DEV_INITRD=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_KALLSYMS_ALL=y -CONFIG_ASHMEM=y CONFIG_EMBEDDED=y CONFIG_PROFILING=y CONFIG_OPROFILE=y @@ -45,7 +44,6 @@ CONFIG_MSM_ONCRPCROUTER=y CONFIG_MSM_IPC_ROUTER=y # CONFIG_MSM_RPCSERVER_TIME_REMOTE is not set CONFIG_MSM_RMT_STORAGE_CLIENT=y -# CONFIG_MSM_HW3D is not set CONFIG_MSM7X27A_AUDIO=y CONFIG_MSM_DMA_TEST=y CONFIG_MSM_SLEEP_STATS_DEVICE=y @@ -67,7 +65,6 @@ CONFIG_SMP=y CONFIG_PREEMPT=y CONFIG_AEABI=y CONFIG_HIGHMEM=y -CONFIG_VMALLOC_RESERVE=0xC800000 CONFIG_COMPACTION=y CONFIG_CP_ACCESS=y CONFIG_ZBOOT_ROM_TEXT=0x0 @@ -83,7 +80,6 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y CONFIG_VFP=y CONFIG_NEON=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_WAKELOCK=y CONFIG_PM_RUNTIME=y CONFIG_NET=y CONFIG_PACKET=y @@ -249,7 +245,6 @@ CONFIG_INPUT_GPIO=y CONFIG_SERIAL_MSM=y CONFIG_SERIAL_MSM_CONSOLE=y CONFIG_SERIAL_MSM_HS=y -# CONFIG_SERIAL_MSM_CLOCK_CONTROL is not set CONFIG_DIAG_CHAR=y # CONFIG_HW_RANDOM is not set CONFIG_I2C=y @@ -271,9 +266,6 @@ CONFIG_MEDIA_CONTROLLER=y CONFIG_VIDEO_DEV=y CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_RC_CORE is not set -# CONFIG_MEDIA_TUNER_CUSTOMISE is not set -CONFIG_VIDEOBUF2_MSM_MEM=y -CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_MSM_CAMERA_V4L2=y CONFIG_OV5647=y CONFIG_AD5046_ACT=y @@ -286,6 +278,9 @@ CONFIG_OV8825=y CONFIG_MSM_CAMERA_SENSOR=y CONFIG_MSM_ACTUATOR=y CONFIG_OV7692=y +# CONFIG_MEDIA_TUNER_CUSTOMISE is not set +CONFIG_VIDEOBUF2_MSM_MEM=y +CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_RADIO_TAVARUA=y CONFIG_ION=y CONFIG_ION_MSM=y @@ -356,6 +351,7 @@ CONFIG_RTC_CLASS=y CONFIG_STAGING=y CONFIG_ANDROID=y CONFIG_ANDROID_BINDER_IPC=y +CONFIG_ASHMEM=y CONFIG_ANDROID_LOGGER=y CONFIG_ANDROID_LOW_MEMORY_KILLER=y CONFIG_EXT2_FS=y diff --git a/arch/arm/configs/msm7627a_defconfig b/arch/arm/configs/msm7627a_defconfig index 27c10d09e60..b903a0b4e90 100644 --- a/arch/arm/configs/msm7627a_defconfig +++ b/arch/arm/configs/msm7627a_defconfig @@ -15,7 +15,6 @@ CONFIG_RT_GROUP_SCHED=y CONFIG_BLK_DEV_INITRD=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_KALLSYMS_ALL=y -CONFIG_ASHMEM=y CONFIG_EMBEDDED=y CONFIG_PROFILING=y CONFIG_OPROFILE=y @@ -45,7 +44,6 @@ CONFIG_MSM_ONCRPCROUTER=y CONFIG_MSM_IPC_ROUTER=y # CONFIG_MSM_RPCSERVER_TIME_REMOTE is not set CONFIG_MSM_RMT_STORAGE_CLIENT=y -# CONFIG_MSM_HW3D is not set CONFIG_MSM7X27A_AUDIO=y CONFIG_MSM_DMA_TEST=y CONFIG_MSM_SLEEP_STATS_DEVICE=y @@ -69,7 +67,6 @@ CONFIG_SMP=y CONFIG_PREEMPT=y CONFIG_AEABI=y CONFIG_HIGHMEM=y -CONFIG_VMALLOC_RESERVE=0xC800000 CONFIG_COMPACTION=y CONFIG_CP_ACCESS=y CONFIG_ZBOOT_ROM_TEXT=0x0 @@ -85,7 +82,6 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y CONFIG_VFP=y CONFIG_NEON=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_WAKELOCK=y CONFIG_PM_RUNTIME=y CONFIG_NET=y CONFIG_PACKET=y @@ -251,7 +247,6 @@ CONFIG_INPUT_GPIO=y CONFIG_SERIAL_MSM=y CONFIG_SERIAL_MSM_CONSOLE=y CONFIG_SERIAL_MSM_HS=y -# CONFIG_SERIAL_MSM_CLOCK_CONTROL is not set CONFIG_DIAG_CHAR=y # CONFIG_HW_RANDOM is not set CONFIG_I2C=y @@ -273,9 +268,6 @@ CONFIG_MEDIA_CONTROLLER=y CONFIG_VIDEO_DEV=y CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_RC_CORE is not set -# CONFIG_MEDIA_TUNER_CUSTOMISE is not set -CONFIG_VIDEOBUF2_MSM_MEM=y -CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_MSM_CAMERA_V4L2=y CONFIG_OV5647=y CONFIG_AD5046_ACT=y @@ -288,6 +280,9 @@ CONFIG_OV8825=y CONFIG_MSM_CAMERA_SENSOR=y CONFIG_MSM_ACTUATOR=y CONFIG_OV7692=y +# CONFIG_MEDIA_TUNER_CUSTOMISE is not set +CONFIG_VIDEOBUF2_MSM_MEM=y +CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_RADIO_TAVARUA=y CONFIG_ION=y CONFIG_ION_MSM=y @@ -357,6 +352,7 @@ CONFIG_RTC_CLASS=y CONFIG_STAGING=y CONFIG_ANDROID=y CONFIG_ANDROID_BINDER_IPC=y +CONFIG_ASHMEM=y CONFIG_ANDROID_LOGGER=y CONFIG_ANDROID_LOW_MEMORY_KILLER=y CONFIG_EXT2_FS=y diff --git a/arch/arm/configs/msm7630-perf_defconfig b/arch/arm/configs/msm7630-perf_defconfig index e46b8358c22..d925ab3437b 100644 --- a/arch/arm/configs/msm7630-perf_defconfig +++ b/arch/arm/configs/msm7630-perf_defconfig @@ -13,7 +13,6 @@ CONFIG_CGROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y CONFIG_BLK_DEV_INITRD=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_ASHMEM=y CONFIG_EMBEDDED=y CONFIG_SLAB=y CONFIG_PROFILING=y @@ -30,13 +29,9 @@ CONFIG_ARCH_MSM7X30=y # CONFIG_MSM_STACKED_MEMORY is not set CONFIG_MSM_SMD=y CONFIG_MSM_SMD_PKG3=y -CONFIG_MSM_SDIO_DMUX=y -CONFIG_MSM_SDIO_CMUX=y -CONFIG_MSM_SDIO_CTL=y CONFIG_MSM_ONCRPCROUTER=y CONFIG_MSM_RPC_WATCHDOG=y CONFIG_MSM_RMT_STORAGE_CLIENT=y -# CONFIG_MSM_HW3D is not set # CONFIG_QSD_AUDIO is not set CONFIG_MSM_MEMORY_LOW_POWER_MODE=y CONFIG_MSM_MEMORY_LOW_POWER_MODE_IDLE_RETENTION=y @@ -52,7 +47,6 @@ CONFIG_HIGH_RES_TIMERS=y CONFIG_PREEMPT=y CONFIG_AEABI=y CONFIG_HIGHMEM=y -CONFIG_VMALLOC_RESERVE=0x1A000000 CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE="init=/sbin/init root=/dev/ram rw initrd=0x11000000,16M console=ttyDCC0 mem=88M ip=dhcp" @@ -64,7 +58,6 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y CONFIG_VFP=y CONFIG_NEON=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_WAKELOCK=y CONFIG_PM_RUNTIME=y CONFIG_NET=y CONFIG_PACKET=y @@ -212,7 +205,6 @@ CONFIG_DM_CRYPT=y CONFIG_NETDEVICES=y CONFIG_DUMMY=y CONFIG_TUN=y -CONFIG_MSM_RMNET_SDIO=y CONFIG_SMC91X=y CONFIG_SMSC911X=y CONFIG_SLIP=y @@ -326,7 +318,6 @@ CONFIG_USB_MSM_72K=y CONFIG_USB_G_ANDROID=y CONFIG_RMNET_SMD_CTL_CHANNEL="DATA40_CNTL" CONFIG_RMNET_SMD_DATA_CHANNEL="DATA40" -CONFIG_RMNET_SDIO_SMD_DATA_CHANNEL="" CONFIG_USB_MSM_ACA=y CONFIG_MMC=y CONFIG_MMC_PERF_PROFILING=y @@ -349,6 +340,7 @@ CONFIG_RTC_DEBUG=y CONFIG_STAGING=y CONFIG_ANDROID=y CONFIG_ANDROID_BINDER_IPC=y +CONFIG_ASHMEM=y CONFIG_ANDROID_LOGGER=y CONFIG_ANDROID_RAM_CONSOLE=y CONFIG_ANDROID_TIMED_GPIO=y diff --git a/arch/arm/configs/msm7630_defconfig b/arch/arm/configs/msm7630_defconfig index 5964afb7056..9eea95c5f5a 100644 --- a/arch/arm/configs/msm7630_defconfig +++ b/arch/arm/configs/msm7630_defconfig @@ -13,7 +13,6 @@ CONFIG_CGROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y CONFIG_BLK_DEV_INITRD=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_ASHMEM=y CONFIG_EMBEDDED=y CONFIG_SLAB=y CONFIG_PROFILING=y @@ -30,13 +29,9 @@ CONFIG_ARCH_MSM7X30=y # CONFIG_MSM_STACKED_MEMORY is not set CONFIG_MSM_SMD=y CONFIG_MSM_SMD_PKG3=y -CONFIG_MSM_SDIO_DMUX=y -CONFIG_MSM_SDIO_CMUX=y -CONFIG_MSM_SDIO_CTL=y CONFIG_MSM_ONCRPCROUTER=y CONFIG_MSM_RPC_WATCHDOG=y CONFIG_MSM_RMT_STORAGE_CLIENT=y -# CONFIG_MSM_HW3D is not set # CONFIG_QSD_AUDIO is not set CONFIG_MSM_MEMORY_LOW_POWER_MODE=y CONFIG_MSM_MEMORY_LOW_POWER_MODE_IDLE_RETENTION=y @@ -53,7 +48,6 @@ CONFIG_HIGH_RES_TIMERS=y CONFIG_PREEMPT=y CONFIG_AEABI=y CONFIG_HIGHMEM=y -CONFIG_VMALLOC_RESERVE=0x1A000000 CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE="init=/sbin/init root=/dev/ram rw initrd=0x11000000,16M console=ttyDCC0 mem=88M ip=dhcp" @@ -65,7 +59,6 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y CONFIG_VFP=y CONFIG_NEON=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_WAKELOCK=y CONFIG_PM_RUNTIME=y CONFIG_NET=y CONFIG_PACKET=y @@ -213,7 +206,6 @@ CONFIG_DM_CRYPT=y CONFIG_NETDEVICES=y CONFIG_DUMMY=y CONFIG_TUN=y -CONFIG_MSM_RMNET_SDIO=y CONFIG_SMC91X=y CONFIG_SMSC911X=y CONFIG_SLIP=y @@ -322,7 +314,6 @@ CONFIG_USB_MSM_72K=y CONFIG_USB_G_ANDROID=y CONFIG_RMNET_SMD_CTL_CHANNEL="DATA40_CNTL" CONFIG_RMNET_SMD_DATA_CHANNEL="DATA40" -CONFIG_RMNET_SDIO_SMD_DATA_CHANNEL="" CONFIG_USB_MSM_ACA=y CONFIG_MMC=y CONFIG_MMC_PERF_PROFILING=y @@ -345,6 +336,7 @@ CONFIG_RTC_DEBUG=y CONFIG_STAGING=y CONFIG_ANDROID=y CONFIG_ANDROID_BINDER_IPC=y +CONFIG_ASHMEM=y CONFIG_ANDROID_LOGGER=y CONFIG_ANDROID_RAM_CONSOLE=y CONFIG_ANDROID_TIMED_GPIO=y diff --git a/arch/arm/configs/msm8610_defconfig b/arch/arm/configs/msm8610_defconfig index 5eef05cc6a9..d664717ff45 100644 --- a/arch/arm/configs/msm8610_defconfig +++ b/arch/arm/configs/msm8610_defconfig @@ -23,7 +23,6 @@ CONFIG_RD_BZIP2=y CONFIG_RD_LZMA=y CONFIG_PANIC_TIMEOUT=5 CONFIG_KALLSYMS_ALL=y -CONFIG_ASHMEM=y CONFIG_EMBEDDED=y CONFIG_PROFILING=y CONFIG_OPROFILE=m @@ -36,49 +35,54 @@ CONFIG_EFI_PARTITION=y CONFIG_ARCH_MSM=y CONFIG_ARCH_MSM8610=y CONFIG_ARCH_MSM8226=y -CONFIG_SND_SOC_MSM8226=y -CONFIG_SND_SOC_MSM8X10=y # CONFIG_MSM_STACKED_MEMORY is not set CONFIG_CPU_HAS_L2_PMU=y # CONFIG_MSM_FIQ_SUPPORT is not set # CONFIG_MSM_PROC_COMM is not set CONFIG_MSM_SMD=y CONFIG_MSM_SMD_PKG4=y -CONFIG_MSM_IPC_LOGGING=y CONFIG_MSM_BAM_DMUX=y CONFIG_MSM_SMP2P=y CONFIG_MSM_SMP2P_TEST=y +CONFIG_MSM_IPC_LOGGING=y CONFIG_MSM_IPC_ROUTER=y CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y CONFIG_MSM_QMI_INTERFACE=y -# CONFIG_MSM_HW3D is not set CONFIG_MSM_SUBSYSTEM_RESTART=y CONFIG_MSM_SYSMON_COMM=y CONFIG_MSM_PIL_LPASS_QDSP6V5=y -CONFIG_MSM_PIL_PRONTO=y CONFIG_MSM_PIL_MSS_QDSP6V5=y CONFIG_MSM_PIL_VENUS=y +CONFIG_MSM_PIL_PRONTO=y +CONFIG_MSM_TZ_LOG=y CONFIG_MSM_DIRECT_SCLK_ACCESS=y CONFIG_MSM_WATCHDOG_V2=y CONFIG_MSM_DLOAD_MODE=y CONFIG_MSM_ADSP_LOADER=m +CONFIG_MSM_OCMEM=y +CONFIG_MSM_OCMEM_LOCAL_POWER_CTRL=y +CONFIG_MSM_OCMEM_DEBUG=y +CONFIG_MSM_OCMEM_NONSECURE=y CONFIG_MSM_OCMEM_POWER_DISABLE=y +CONFIG_MSM_RTB=y +CONFIG_MSM_RTB_SEPARATE_CPUS=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_SMP=y CONFIG_SCHED_MC=y CONFIG_ARM_ARCH_TIMER=y -CONFIG_HOTPLUG_CPU=y CONFIG_PREEMPT=y CONFIG_AEABI=y CONFIG_HIGHMEM=y -CONFIG_VMALLOC_RESERVE=0x19000000 CONFIG_USE_OF=y CONFIG_CPU_IDLE=y CONFIG_VFP=y CONFIG_NEON=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_WAKELOCK=y +CONFIG_PM_AUTOSLEEP=y +CONFIG_PM_WAKELOCKS=y +CONFIG_PM_WAKELOCKS_LIMIT=0 +# CONFIG_PM_WAKELOCKS_GC is not set CONFIG_PM_RUNTIME=y CONFIG_NET=y CONFIG_PACKET=y @@ -180,9 +184,6 @@ CONFIG_NET_SCHED=y CONFIG_NET_SCH_HTB=y CONFIG_NET_SCH_PRIO=y CONFIG_NET_CLS_FW=y -CONFIG_SYNC=y -CONFIG_SW_SYNC=y -CONFIG_CMA=y CONFIG_BT=y CONFIG_BT_RFCOMM=y CONFIG_BT_RFCOMM_TTY=y @@ -191,9 +192,9 @@ CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y CONFIG_BT_HIDP=y CONFIG_BT_HCISMD=y -CONFIG_MSM_BT_POWER=y CONFIG_CFG80211=y CONFIG_NL80211_TESTMODE=y +CONFIG_CMA=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_MD=y @@ -201,18 +202,18 @@ CONFIG_BLK_DEV_DM=y CONFIG_DM_CRYPT=y CONFIG_NETDEVICES=y CONFIG_DUMMY=y +CONFIG_KS8851=y # CONFIG_MSM_RMNET is not set CONFIG_MSM_RMNET_BAM=y -CONFIG_KS8851=y CONFIG_WCNSS_CORE=y CONFIG_WCNSS_CORE_PRONTO=y CONFIG_WCNSS_MEM_PRE_ALLOC=y CONFIG_INPUT_EVDEV=y CONFIG_INPUT_EVBUG=m +CONFIG_KEYBOARD_GPIO=y CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=y CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_RMI4_DEV=y -CONFIG_KEYBOARD_GPIO=y CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=y CONFIG_INPUT_GPIO=m @@ -221,29 +222,49 @@ CONFIG_SERIAL_MSM_HSL_CONSOLE=y CONFIG_DIAG_CHAR=y CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_MSM=y -CONFIG_SPMI=y -CONFIG_SPMI_MSM_PMIC_ARB=y -CONFIG_MSM_QPNP_INT=y -CONFIG_SLIMBUS=y -CONFIG_SLIMBUS_MSM_NGD=y -CONFIG_DEBUG_GPIO=y -CONFIG_GPIO_SYSFS=y -CONFIG_SPI=y -CONFIG_SPI_QUP=y -CONFIG_SPI_SPIDEV=m CONFIG_I2C=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_QUP=y -CONFIG_WCD9306_CODEC=y +CONFIG_SPI=y +CONFIG_SPI_QUP=y +CONFIG_SPI_SPIDEV=m +CONFIG_SPMI=y +CONFIG_SPMI_MSM_PMIC_ARB=y +CONFIG_MSM_QPNP_INT=y +CONFIG_SLIMBUS_MSM_NGD=y +CONFIG_DEBUG_GPIO=y +CONFIG_GPIO_SYSFS=y CONFIG_GPIO_QPNP_PIN=y -CONFIG_HWMON=y CONFIG_POWER_SUPPLY=y CONFIG_QPNP_CHARGER=y CONFIG_SENSORS_QPNP_ADC_VOLTAGE=y CONFIG_SENSORS_QPNP_ADC_CURRENT=y -CONFIG_REGULATOR=y +CONFIG_THERMAL=y +CONFIG_THERMAL_TSENS8974=y +CONFIG_THERMAL_MONITOR=y +CONFIG_THERMAL_QPNP_ADC_TM=y +CONFIG_WCD9306_CODEC=y CONFIG_REGULATOR_STUB=y CONFIG_REGULATOR_QPNP=y +CONFIG_MEDIA_SUPPORT=y +CONFIG_MEDIA_CONTROLLER=y +CONFIG_VIDEO_DEV=y +CONFIG_VIDEO_V4L2_SUBDEV_API=y +# CONFIG_MSM_CAMERA is not set +CONFIG_OV8825=y +CONFIG_MSM_CAMERA_SENSOR=y +CONFIG_MSM_CPP=y +CONFIG_MSM_CCI=y +CONFIG_MSM_CSI30_HEADER=y +CONFIG_MSM_CSIPHY=y +CONFIG_MSM_CSID=y +CONFIG_MSM_ISPIF=y +CONFIG_MSMB_CAMERA=y +CONFIG_OV9724=y +CONFIG_MSMB_JPEG=y +CONFIG_MSM_VIDC_V4L2=y +CONFIG_VIDEOBUF2_MSM_MEM=y +CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_RADIO_IRIS=y CONFIG_RADIO_IRIS_TRANSPORT=m CONFIG_ION=y @@ -261,6 +282,8 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_SOUND=y CONFIG_SND=y CONFIG_SND_SOC=y +CONFIG_SND_SOC_MSM8226=y +CONFIG_SND_SOC_MSM8X10=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DEBUG_FILES=y CONFIG_USB_GADGET_DEBUG_FS=y @@ -275,25 +298,33 @@ CONFIG_MMC_PARANOID_SD_INIT=y CONFIG_MMC_BLOCK_MINORS=32 CONFIG_MMC_TEST=m CONFIG_MMC_MSM=y -CONFIG_STAGING=y -CONFIG_ANDROID=y -CONFIG_ANDROID_BINDER_IPC=y -CONFIG_ANDROID_LOGGER=y -CONFIG_ANDROID_RAM_CONSOLE=y -CONFIG_ANDROID_TIMED_GPIO=y -CONFIG_ANDROID_LOW_MEMORY_KILLER=y -CONFIG_QPNP_PWM=y -CONFIG_MSM_IOMMU=y -CONFIG_MSM_IOMMU_PMON=y -CONFIG_SPS=y -CONFIG_SPS_SUPPORT_NDP_BAM=y CONFIG_MMC_MSM_SPS_SUPPORT=y -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y CONFIG_LEDS_QPNP=y CONFIG_RTC_CLASS=y # CONFIG_RTC_DRV_MSM is not set CONFIG_RTC_DRV_QPNP=y +CONFIG_STAGING=y +CONFIG_ANDROID=y +CONFIG_ANDROID_BINDER_IPC=y +CONFIG_ASHMEM=y +CONFIG_ANDROID_LOGGER=y +CONFIG_ANDROID_RAM_CONSOLE=y +CONFIG_ANDROID_TIMED_GPIO=y +CONFIG_ANDROID_LOW_MEMORY_KILLER=y +CONFIG_SPS=y +CONFIG_SPS_SUPPORT_NDP_BAM=y +CONFIG_QPNP_PWM=y +CONFIG_QPNP_POWER_ON=y +CONFIG_MSM_IOMMU=y +CONFIG_MSM_IOMMU_PMON=y +CONFIG_CORESIGHT=y +CONFIG_CORESIGHT_TMC=y +CONFIG_CORESIGHT_TPIU=y +CONFIG_CORESIGHT_FUNNEL=y +CONFIG_CORESIGHT_REPLICATOR=y +CONFIG_CORESIGHT_STM=y +CONFIG_CORESIGHT_ETM=y +CONFIG_CORESIGHT_EVENT=m CONFIG_EXT2_FS=y CONFIG_EXT2_FS_XATTR=y CONFIG_EXT3_FS=y @@ -307,66 +338,16 @@ CONFIG_NLS_ASCII=y CONFIG_NLS_ISO8859_1=y CONFIG_PRINTK_TIME=y CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_FS=y CONFIG_SCHEDSTATS=y CONFIG_TIMER_STATS=y CONFIG_DEBUG_INFO=y CONFIG_DEBUG_MEMORY_INIT=y +CONFIG_ENABLE_DEFAULT_TRACERS=y CONFIG_DYNAMIC_DEBUG=y CONFIG_DEBUG_USER=y CONFIG_KEYS=y CONFIG_CRYPTO_MD4=y -CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_ARC4=y CONFIG_CRYPTO_TWOFISH=y # CONFIG_CRYPTO_HW is not set CONFIG_CRC_CCITT=y -CONFIG_QPNP_POWER_ON=y -CONFIG_LIBCRC32C=y -CONFIG_MEDIA_SUPPORT=y -CONFIG_MEDIA_CAMERA_SUPPORT=y -# CONFIG_MSM_CAMERA is not set -CONFIG_MSM_VIDC_V4L2=y -CONFIG_VIDEO_DEV=y -CONFIG_VIDEO_V4L2_SUBDEV_API=y -CONFIG_VIDEOBUF2_MSM_MEM=y -CONFIG_MSM_OCMEM=y -CONFIG_MSM_OCMEM_LOCAL_POWER_CTRL=y -CONFIG_MSM_OCMEM_DEBUG=y -CONFIG_MSM_OCMEM_NONSECURE=y -CONFIG_THERMAL=y -CONFIG_THERMAL_TSENS8974=y -CONFIG_THERMAL_MONITOR=y -CONFIG_THERMAL_QPNP_ADC_TM=y -CONFIG_MSM_RTB=y -CONFIG_MSM_RTB_SEPARATE_CPUS=y -CONFIG_CORESIGHT=y -CONFIG_CORESIGHT_TMC=y -CONFIG_CORESIGHT_TPIU=y -CONFIG_CORESIGHT_FUNNEL=y -CONFIG_CORESIGHT_REPLICATOR=y -CONFIG_CORESIGHT_STM=y -CONFIG_CORESIGHT_ETM=y -CONFIG_CORESIGHT_EVENT=m -CONFIG_ENABLE_DEFAULT_TRACERS=y -CONFIG_PM_WAKELOCKS=y -CONFIG_PM_WAKELOCKS_LIMIT=0 -CONFIG_PM_AUTOSLEEP=y -# CONFIG_PM_WAKELOCKS_GC is not set -CONFIG_MSM_TZ_LOG=y -CONFIG_MEDIA_CONTROLLER=y -# CONFIG_MSM_CAMERA is not set -CONFIG_OV8825=y -CONFIG_OV9724=y -CONFIG_MSM_CAMERA_SENSOR=y -CONFIG_MSM_CCI=y -CONFIG_MSM_CPP=y -CONFIG_MSM_CSI30_HEADER=y -CONFIG_MSM_CSIPHY=y -CONFIG_MSM_CSID=y -CONFIG_MSM_ISPIF=y -CONFIG_MSMB_CAMERA=y -CONFIG_MSMB_JPEG=y -CONFIG_USB_VIDEO_CLASS=y -CONFIG_V4L_PLATFORM_DRIVERS=y diff --git a/arch/arm/configs/msm8660-perf_defconfig b/arch/arm/configs/msm8660-perf_defconfig index baefac58d7b..dda9bd3670f 100644 --- a/arch/arm/configs/msm8660-perf_defconfig +++ b/arch/arm/configs/msm8660-perf_defconfig @@ -21,7 +21,6 @@ CONFIG_RD_BZIP2=y CONFIG_RD_LZMA=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_PANIC_TIMEOUT=5 -CONFIG_ASHMEM=y CONFIG_EMBEDDED=y # CONFIG_SLUB_DEBUG is not set CONFIG_PROFILING=y @@ -47,21 +46,15 @@ CONFIG_MSM7X00A_IDLE_SLEEP_WAIT_FOR_INTERRUPT=y # CONFIG_MSM_FIQ_SUPPORT is not set # CONFIG_MSM_PROC_COMM is not set CONFIG_MSM_SMD=y -CONFIG_MSM_SDIO_DMUX=y # CONFIG_MSM_RESET_MODEM is not set # CONFIG_MSM_SMD_NMEA is not set -CONFIG_MSM_SDIO_TTY=y # CONFIG_MSM_SMD_QMI is not set -CONFIG_MSM_SDIO_CMUX=y CONFIG_MSM_DSPS=y -CONFIG_MSM_SDIO_CTL=y CONFIG_MSM_ONCRPCROUTER=y # CONFIG_MSM_RPCSERVER_TIME_REMOTE is not set # CONFIG_MSM_RPCSERVER_WATCHDOG is not set # CONFIG_MSM_RPCSERVER_HANDSET is not set CONFIG_MSM_RMT_STORAGE_CLIENT=y -CONFIG_MSM_SDIO_SMEM=y -# CONFIG_MSM_HW3D is not set CONFIG_MSM_SUBSYSTEM_RESTART=y CONFIG_MSM_SYSMON_COMM=y CONFIG_MSM_PIL_MODEM=y @@ -84,7 +77,6 @@ CONFIG_NR_CPUS=2 CONFIG_PREEMPT=y CONFIG_AEABI=y CONFIG_HIGHMEM=y -CONFIG_VMALLOC_RESERVE=0x19000000 CONFIG_COMPACTION=y CONFIG_CP_ACCESS=y CONFIG_CPU_FREQ=y @@ -96,7 +88,6 @@ CONFIG_CPU_IDLE=y CONFIG_VFP=y CONFIG_NEON=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_WAKELOCK=y CONFIG_PM_RUNTIME=y CONFIG_NET=y CONFIG_PACKET=y @@ -252,7 +243,6 @@ CONFIG_DM_UEVENT=y CONFIG_NETDEVICES=y CONFIG_DUMMY=y CONFIG_TUN=y -CONFIG_MSM_RMNET_SDIO=y CONFIG_SMC91X=y CONFIG_SMC911X=y CONFIG_SMSC911X=y @@ -315,10 +305,6 @@ CONFIG_REGULATOR_MSM_GPIO=y CONFIG_MEDIA_SUPPORT=y CONFIG_MEDIA_CONTROLLER=y CONFIG_VIDEO_DEV=y -# CONFIG_MEDIA_TUNER_CUSTOMISE is not set -CONFIG_VIDEOBUF2_MSM_MEM=y -CONFIG_USB_VIDEO_CLASS=y -CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_MSM_CAMERA_V4L2=y CONFIG_IMX074=y CONFIG_WEBCAM_OV9726=y @@ -328,6 +314,10 @@ CONFIG_MSM_CAMERA_SENSOR=y CONFIG_MSM_ACTUATOR=y CONFIG_MSM_GEMINI=y CONFIG_OV7692=y +# CONFIG_MEDIA_TUNER_CUSTOMISE is not set +CONFIG_VIDEOBUF2_MSM_MEM=y +CONFIG_USB_VIDEO_CLASS=y +CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_RADIO_TAVARUA=y CONFIG_ION=y CONFIG_ION_MSM=y @@ -404,7 +394,6 @@ CONFIG_LEDS_PMIC8058=y CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_LEDS_TRIGGER_SLEEP=y CONFIG_SWITCH=y CONFIG_SWITCH_GPIO=y CONFIG_RTC_CLASS=y @@ -413,6 +402,7 @@ CONFIG_RTC_DRV_PM8XXX=y CONFIG_STAGING=y CONFIG_ANDROID=y CONFIG_ANDROID_BINDER_IPC=y +CONFIG_ASHMEM=y CONFIG_ANDROID_LOGGER=y CONFIG_ANDROID_RAM_CONSOLE=y CONFIG_ANDROID_TIMED_GPIO=y diff --git a/arch/arm/configs/msm8660_defconfig b/arch/arm/configs/msm8660_defconfig index 28d7b12f8a8..abc746053b2 100644 --- a/arch/arm/configs/msm8660_defconfig +++ b/arch/arm/configs/msm8660_defconfig @@ -21,7 +21,6 @@ CONFIG_RD_BZIP2=y CONFIG_RD_LZMA=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_PANIC_TIMEOUT=5 -CONFIG_ASHMEM=y CONFIG_EMBEDDED=y CONFIG_PROFILING=y CONFIG_OPROFILE=y @@ -46,21 +45,15 @@ CONFIG_MSM7X00A_IDLE_SLEEP_WAIT_FOR_INTERRUPT=y # CONFIG_MSM_FIQ_SUPPORT is not set # CONFIG_MSM_PROC_COMM is not set CONFIG_MSM_SMD=y -CONFIG_MSM_SDIO_DMUX=y # CONFIG_MSM_RESET_MODEM is not set # CONFIG_MSM_SMD_NMEA is not set -CONFIG_MSM_SDIO_TTY=y # CONFIG_MSM_SMD_QMI is not set -CONFIG_MSM_SDIO_CMUX=y CONFIG_MSM_DSPS=y -CONFIG_MSM_SDIO_CTL=y CONFIG_MSM_ONCRPCROUTER=y # CONFIG_MSM_RPCSERVER_TIME_REMOTE is not set # CONFIG_MSM_RPCSERVER_WATCHDOG is not set # CONFIG_MSM_RPCSERVER_HANDSET is not set CONFIG_MSM_RMT_STORAGE_CLIENT=y -CONFIG_MSM_SDIO_SMEM=y -# CONFIG_MSM_HW3D is not set CONFIG_MSM_SUBSYSTEM_RESTART=y CONFIG_MSM_SYSMON_COMM=y CONFIG_MSM_PIL_MODEM=y @@ -83,7 +76,6 @@ CONFIG_NR_CPUS=2 CONFIG_PREEMPT=y CONFIG_AEABI=y CONFIG_HIGHMEM=y -CONFIG_VMALLOC_RESERVE=0x19000000 CONFIG_COMPACTION=y CONFIG_CP_ACCESS=y CONFIG_CPU_FREQ=y @@ -95,7 +87,6 @@ CONFIG_CPU_IDLE=y CONFIG_VFP=y CONFIG_NEON=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_WAKELOCK=y CONFIG_PM_RUNTIME=y CONFIG_NET=y CONFIG_PACKET=y @@ -252,7 +243,6 @@ CONFIG_DM_UEVENT=y CONFIG_NETDEVICES=y CONFIG_DUMMY=y CONFIG_TUN=y -CONFIG_MSM_RMNET_SDIO=y CONFIG_SMC91X=y CONFIG_SMC911X=y CONFIG_SMSC911X=y @@ -315,10 +305,6 @@ CONFIG_REGULATOR_MSM_GPIO=y CONFIG_MEDIA_SUPPORT=y CONFIG_MEDIA_CONTROLLER=y CONFIG_VIDEO_DEV=y -# CONFIG_MEDIA_TUNER_CUSTOMISE is not set -CONFIG_VIDEOBUF2_MSM_MEM=y -CONFIG_USB_VIDEO_CLASS=y -CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_MSM_CAMERA_V4L2=y CONFIG_IMX074=y CONFIG_WEBCAM_OV9726=y @@ -328,6 +314,10 @@ CONFIG_MSM_CAMERA_SENSOR=y CONFIG_MSM_ACTUATOR=y CONFIG_MSM_GEMINI=y CONFIG_OV7692=y +# CONFIG_MEDIA_TUNER_CUSTOMISE is not set +CONFIG_VIDEOBUF2_MSM_MEM=y +CONFIG_USB_VIDEO_CLASS=y +CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_RADIO_TAVARUA=y CONFIG_ION=y CONFIG_ION_MSM=y @@ -404,7 +394,6 @@ CONFIG_LEDS_PMIC8058=y CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_LEDS_TRIGGER_SLEEP=y CONFIG_SWITCH=y CONFIG_SWITCH_GPIO=y CONFIG_RTC_CLASS=y @@ -413,6 +402,7 @@ CONFIG_RTC_DRV_PM8XXX=y CONFIG_STAGING=y CONFIG_ANDROID=y CONFIG_ANDROID_BINDER_IPC=y +CONFIG_ASHMEM=y CONFIG_ANDROID_LOGGER=y CONFIG_ANDROID_RAM_CONSOLE=y CONFIG_ANDROID_TIMED_GPIO=y diff --git a/arch/arm/configs/msm8960-perf_defconfig b/arch/arm/configs/msm8960-perf_defconfig index a8ea31dfc77..4e6cb0512bb 100644 --- a/arch/arm/configs/msm8960-perf_defconfig +++ b/arch/arm/configs/msm8960-perf_defconfig @@ -24,7 +24,6 @@ CONFIG_RD_LZMA=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_PANIC_TIMEOUT=5 CONFIG_KALLSYMS_ALL=y -CONFIG_ASHMEM=y CONFIG_EMBEDDED=y CONFIG_PROFILING=y CONFIG_OPROFILE=y @@ -35,6 +34,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y CONFIG_PARTITION_ADVANCED=y CONFIG_EFI_PARTITION=y +CONFIG_IOSCHED_TEST=y CONFIG_ARCH_MSM=y CONFIG_ARCH_MSM8960=y CONFIG_ARCH_MSM8930=y @@ -69,7 +69,6 @@ CONFIG_MSM_DSPS=y CONFIG_MSM_IPC_ROUTER=y CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y CONFIG_MSM_AVS_HW=y -# CONFIG_MSM_HW3D is not set CONFIG_MSM_SUBSYSTEM_RESTART=y CONFIG_MSM_SYSMON_COMM=y CONFIG_MSM_PIL_LPASS_QDSP6V4=y @@ -107,7 +106,6 @@ CONFIG_SCHED_MC=y CONFIG_PREEMPT=y CONFIG_AEABI=y CONFIG_HIGHMEM=y -CONFIG_VMALLOC_RESERVE=0x19000000 CONFIG_CC_STACKPROTECTOR=y CONFIG_CP_ACCESS=y CONFIG_CPU_FREQ=y @@ -119,7 +117,10 @@ CONFIG_CPU_IDLE=y CONFIG_VFP=y CONFIG_NEON=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_WAKELOCK=y +CONFIG_PM_AUTOSLEEP=y +CONFIG_PM_WAKELOCKS=y +CONFIG_PM_WAKELOCKS_LIMIT=0 +# CONFIG_PM_WAKELOCKS_GC is not set CONFIG_PM_RUNTIME=y CONFIG_NET=y CONFIG_PACKET=y @@ -134,8 +135,6 @@ CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_INET_AH=y CONFIG_INET_ESP=y -CONFIG_INET_XFRM_MODE_TRANSPORT=y -CONFIG_INET_XFRM_MODE_TUNNEL=y # CONFIG_INET_LRO is not set CONFIG_IPV6=y CONFIG_IPV6_PRIVACY=y @@ -355,11 +354,6 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y CONFIG_DVB_CORE=m CONFIG_USER_RC_INPUT=y CONFIG_IR_GPIO_CIR=y -# CONFIG_MEDIA_TUNER_CUSTOMISE is not set -CONFIG_VIDEOBUF2_MSM_MEM=y -CONFIG_VIDEO_HELPER_CHIPS_AUTO=y -CONFIG_USB_VIDEO_CLASS=y -CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_MSM_CAMERA_V4L2=y CONFIG_IMX074=y CONFIG_MT9M114=y @@ -376,17 +370,22 @@ CONFIG_IMX091_EEPROM=y CONFIG_MSM_GEMINI=y CONFIG_MSM_MERCURY=y CONFIG_MSM_CSI20_HEADER=y -CONFIG_S5K3L1YX=y -CONFIG_IMX091=y CONFIG_MSM_CSIPHY=y CONFIG_MSM_CSID=y +CONFIG_S5K3L1YX=y +CONFIG_IMX091=y CONFIG_MSM_WFD=y -CONFIG_RADIO_IRIS=y -CONFIG_RADIO_IRIS_TRANSPORT=m -# CONFIG_DVB_FE_CUSTOMISE is not set CONFIG_DVB_MPQ=m CONFIG_DVB_MPQ_DEMUX=m CONFIG_DVB_MPQ_VIDEO=m +# CONFIG_MEDIA_TUNER_CUSTOMISE is not set +CONFIG_VIDEOBUF2_MSM_MEM=y +CONFIG_VIDEO_HELPER_CHIPS_AUTO=y +CONFIG_USB_VIDEO_CLASS=y +CONFIG_V4L_PLATFORM_DRIVERS=y +CONFIG_RADIO_IRIS=y +CONFIG_RADIO_IRIS_TRANSPORT=m +# CONFIG_DVB_FE_CUSTOMISE is not set CONFIG_ION=y CONFIG_ION_MSM=y CONFIG_MSM_KGSL=y @@ -457,14 +456,13 @@ CONFIG_MMC_PARANOID_SD_INIT=y CONFIG_MMC_BLOCK_MINORS=32 # CONFIG_MMC_BLOCK_BOUNCE is not set CONFIG_MMC_TEST=m +CONFIG_MMC_BLOCK_TEST=y CONFIG_MMC_MSM=y CONFIG_MMC_MSM_SDC1_8_BIT_SUPPORT=y # CONFIG_MMC_MSM_SDC2_SUPPORT is not set CONFIG_MMC_MSM_SDC3_SUPPORT=y CONFIG_MMC_MSM_SDC3_WP_SUPPORT=y CONFIG_MMC_MSM_SPS_SUPPORT=y -CONFIG_IOSCHED_TEST=y -CONFIG_MMC_BLOCK_TEST=y CONFIG_LEDS_PM8XXX=y CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y @@ -475,6 +473,7 @@ CONFIG_RTC_DRV_PM8XXX=y CONFIG_STAGING=y CONFIG_ANDROID=y CONFIG_ANDROID_BINDER_IPC=y +CONFIG_ASHMEM=y CONFIG_ANDROID_LOGGER=y CONFIG_ANDROID_RAM_CONSOLE=y CONFIG_ANDROID_TIMED_GPIO=y @@ -529,9 +528,3 @@ CONFIG_CRYPTO_DEV_QCRYPTO=m CONFIG_CRYPTO_DEV_QCE=m CONFIG_CRYPTO_DEV_QCEDEV=m CONFIG_CRC_CCITT=y -CONFIG_SYNC=y -CONFIG_SW_SYNC=y -CONFIG_PM_WAKELOCKS=y -CONFIG_PM_WAKELOCKS_LIMIT=0 -CONFIG_PM_AUTOSLEEP=y -# CONFIG_PM_WAKELOCKS_GC is not set diff --git a/arch/arm/configs/msm8960_defconfig b/arch/arm/configs/msm8960_defconfig index 9f10bc491ba..c4fffb9386c 100644 --- a/arch/arm/configs/msm8960_defconfig +++ b/arch/arm/configs/msm8960_defconfig @@ -23,7 +23,6 @@ CONFIG_RD_LZMA=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_PANIC_TIMEOUT=5 CONFIG_KALLSYMS_ALL=y -CONFIG_ASHMEM=y CONFIG_EMBEDDED=y CONFIG_PROFILING=y CONFIG_OPROFILE=y @@ -34,6 +33,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y CONFIG_PARTITION_ADVANCED=y CONFIG_EFI_PARTITION=y +CONFIG_IOSCHED_TEST=y CONFIG_ARCH_MSM=y CONFIG_ARCH_MSM8960=y CONFIG_ARCH_MSM8930=y @@ -68,7 +68,6 @@ CONFIG_MSM_DSPS=y CONFIG_MSM_IPC_ROUTER=y CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y CONFIG_MSM_AVS_HW=y -# CONFIG_MSM_HW3D is not set CONFIG_MSM_SUBSYSTEM_RESTART=y CONFIG_MSM_SYSMON_COMM=y CONFIG_MSM_PIL_LPASS_QDSP6V4=y @@ -112,7 +111,6 @@ CONFIG_SCHED_MC=y CONFIG_PREEMPT=y CONFIG_AEABI=y CONFIG_HIGHMEM=y -CONFIG_VMALLOC_RESERVE=0x19000000 CONFIG_CC_STACKPROTECTOR=y CONFIG_CP_ACCESS=y CONFIG_CPU_FREQ=y @@ -124,7 +122,10 @@ CONFIG_CPU_IDLE=y CONFIG_VFP=y CONFIG_NEON=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_WAKELOCK=y +CONFIG_PM_AUTOSLEEP=y +CONFIG_PM_WAKELOCKS=y +CONFIG_PM_WAKELOCKS_LIMIT=0 +# CONFIG_PM_WAKELOCKS_GC is not set CONFIG_PM_RUNTIME=y CONFIG_NET=y CONFIG_PACKET=y @@ -139,8 +140,6 @@ CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_INET_AH=y CONFIG_INET_ESP=y -CONFIG_INET_XFRM_MODE_TRANSPORT=y -CONFIG_INET_XFRM_MODE_TUNNEL=y # CONFIG_INET_LRO is not set CONFIG_IPV6=y CONFIG_IPV6_PRIVACY=y @@ -360,11 +359,6 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y CONFIG_DVB_CORE=m CONFIG_USER_RC_INPUT=y CONFIG_IR_GPIO_CIR=y -# CONFIG_MEDIA_TUNER_CUSTOMISE is not set -CONFIG_VIDEOBUF2_MSM_MEM=y -CONFIG_VIDEO_HELPER_CHIPS_AUTO=y -CONFIG_USB_VIDEO_CLASS=y -CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_MSM_CAMERA_V4L2=y CONFIG_IMX074=y CONFIG_MT9M114=y @@ -380,17 +374,22 @@ CONFIG_IMX091_EEPROM=y CONFIG_MSM_GEMINI=y CONFIG_MSM_MERCURY=y CONFIG_MSM_CSI20_HEADER=y -CONFIG_S5K3L1YX=y -CONFIG_IMX091=y CONFIG_MSM_CSIPHY=y CONFIG_MSM_CSID=y +CONFIG_S5K3L1YX=y +CONFIG_IMX091=y CONFIG_MSM_WFD=y -CONFIG_RADIO_IRIS=y -CONFIG_RADIO_IRIS_TRANSPORT=m -# CONFIG_DVB_FE_CUSTOMISE is not set CONFIG_DVB_MPQ=m CONFIG_DVB_MPQ_DEMUX=m CONFIG_DVB_MPQ_VIDEO=m +# CONFIG_MEDIA_TUNER_CUSTOMISE is not set +CONFIG_VIDEOBUF2_MSM_MEM=y +CONFIG_VIDEO_HELPER_CHIPS_AUTO=y +CONFIG_USB_VIDEO_CLASS=y +CONFIG_V4L_PLATFORM_DRIVERS=y +CONFIG_RADIO_IRIS=y +CONFIG_RADIO_IRIS_TRANSPORT=m +# CONFIG_DVB_FE_CUSTOMISE is not set CONFIG_ION=y CONFIG_ION_MSM=y CONFIG_MSM_KGSL=y @@ -460,14 +459,13 @@ CONFIG_MMC_PARANOID_SD_INIT=y CONFIG_MMC_BLOCK_MINORS=32 # CONFIG_MMC_BLOCK_BOUNCE is not set CONFIG_MMC_TEST=m +CONFIG_MMC_BLOCK_TEST=y CONFIG_MMC_MSM=y CONFIG_MMC_MSM_SDC1_8_BIT_SUPPORT=y # CONFIG_MMC_MSM_SDC2_SUPPORT is not set CONFIG_MMC_MSM_SDC3_SUPPORT=y CONFIG_MMC_MSM_SDC3_WP_SUPPORT=y CONFIG_MMC_MSM_SPS_SUPPORT=y -CONFIG_IOSCHED_TEST=y -CONFIG_MMC_BLOCK_TEST=y CONFIG_LEDS_PM8XXX=y CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y @@ -478,6 +476,7 @@ CONFIG_RTC_DRV_PM8XXX=y CONFIG_STAGING=y CONFIG_ANDROID=y CONFIG_ANDROID_BINDER_IPC=y +CONFIG_ASHMEM=y CONFIG_ANDROID_LOGGER=y CONFIG_ANDROID_RAM_CONSOLE=y CONFIG_ANDROID_TIMED_GPIO=y @@ -547,9 +546,3 @@ CONFIG_CRYPTO_DEV_QCRYPTO=m CONFIG_CRYPTO_DEV_QCE=m CONFIG_CRYPTO_DEV_QCEDEV=m CONFIG_CRC_CCITT=y -CONFIG_SYNC=y -CONFIG_SW_SYNC=y -CONFIG_PM_WAKELOCKS=y -CONFIG_PM_WAKELOCKS_LIMIT=0 -CONFIG_PM_AUTOSLEEP=y -# CONFIG_PM_WAKELOCKS_GC is not set diff --git a/arch/arm/configs/msm8974-perf_defconfig b/arch/arm/configs/msm8974-perf_defconfig index d2c97b131c4..981d6bb5e75 100644 --- a/arch/arm/configs/msm8974-perf_defconfig +++ b/arch/arm/configs/msm8974-perf_defconfig @@ -24,7 +24,6 @@ CONFIG_RD_LZMA=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_PANIC_TIMEOUT=5 CONFIG_KALLSYMS_ALL=y -CONFIG_ASHMEM=y CONFIG_EMBEDDED=y CONFIG_PROFILING=y CONFIG_OPROFILE=y @@ -54,7 +53,6 @@ CONFIG_MSM_IPC_ROUTER=y CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y CONFIG_MSM_IPC_ROUTER_SECURITY=y CONFIG_MSM_QMI_INTERFACE=y -# CONFIG_MSM_HW3D is not set CONFIG_MSM_SUBSYSTEM_RESTART=y CONFIG_MSM_SYSMON_COMM=y CONFIG_MSM_PIL_LPASS_QDSP6V5=y @@ -63,6 +61,7 @@ CONFIG_MSM_PIL_VENUS=y CONFIG_MSM_PIL_PRONTO=y CONFIG_MSM_TZ_LOG=y CONFIG_MSM_DIRECT_SCLK_ACCESS=y +CONFIG_MSM_EVENT_TIMER=y CONFIG_MSM_BUS_SCALING=y CONFIG_MSM_WATCHDOG_V2=y CONFIG_MSM_MEMORY_DUMP=y @@ -80,6 +79,7 @@ CONFIG_MSM_L1_ERR_LOG=y CONFIG_MSM_L2_ERP_2BIT_PANIC=y CONFIG_MSM_ENABLE_WDOG_DEBUG_CONTROL=y CONFIG_MSM_UARTDM_Core_v14=y +CONFIG_MSM_BOOT_STATS=y CONFIG_STRICT_MEMORY_RWX=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y @@ -90,7 +90,6 @@ CONFIG_ARM_ARCH_TIMER=y CONFIG_PREEMPT=y CONFIG_AEABI=y CONFIG_HIGHMEM=y -CONFIG_VMALLOC_RESERVE=0x19000000 CONFIG_CC_STACKPROTECTOR=y CONFIG_CP_ACCESS=y CONFIG_USE_OF=y @@ -103,7 +102,10 @@ CONFIG_CPU_IDLE=y CONFIG_VFP=y CONFIG_NEON=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_WAKELOCK=y +CONFIG_PM_AUTOSLEEP=y +CONFIG_PM_WAKELOCKS=y +CONFIG_PM_WAKELOCKS_LIMIT=0 +# CONFIG_PM_WAKELOCKS_GC is not set CONFIG_PM_RUNTIME=y CONFIG_NET=y CONFIG_PACKET=y @@ -117,8 +119,6 @@ CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_INET_AH=y CONFIG_INET_ESP=y -CONFIG_INET_XFRM_MODE_TRANSPORT=y -CONFIG_INET_XFRM_MODE_TUNNEL=y # CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_LRO is not set CONFIG_IPV6=y @@ -234,13 +234,12 @@ CONFIG_NL80211_TESTMODE=y CONFIG_RFKILL=y CONFIG_GENLOCK=y CONFIG_GENLOCK_MISCDEVICE=y -CONFIG_SYNC=y -CONFIG_SW_SYNC=y CONFIG_CMA=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_HAPTIC_ISA1200=y CONFIG_QSEECOM=y +CONFIG_QPNP_MISC=y CONFIG_USB_HSIC_SMSC_HUB=y CONFIG_TI_DRV2667=y CONFIG_SCSI=y @@ -293,8 +292,6 @@ CONFIG_SPI_SPIDEV=m CONFIG_SPMI=y CONFIG_SPMI_MSM_PMIC_ARB=y CONFIG_MSM_QPNP_INT=y -CONFIG_QPNP_REVID=y -CONFIG_QPNP_MISC=y CONFIG_SLIMBUS_MSM_NGD=y CONFIG_DEBUG_GPIO=y CONFIG_GPIO_SYSFS=y @@ -325,14 +322,14 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_MSM_CAMERA is not set CONFIG_MT9M114=y CONFIG_OV2720=y +CONFIG_IMX135=y CONFIG_MSM_CAMERA_SENSOR=y -CONFIG_MSM_CCI=y CONFIG_MSM_CPP=y +CONFIG_MSM_CCI=y CONFIG_MSM_CSI30_HEADER=y CONFIG_MSM_CSIPHY=y CONFIG_MSM_CSID=y CONFIG_MSM_ISPIF=y -CONFIG_IMX135=y CONFIG_S5K3L1YX=y CONFIG_MSMB_CAMERA=y CONFIG_MSMB_JPEG=y @@ -402,8 +399,8 @@ CONFIG_MMC_TEST=m CONFIG_MMC_BLOCK_TEST=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y -CONFIG_MMC_SDHCI_MSM=y CONFIG_MMC_MSM=y +CONFIG_MMC_SDHCI_MSM=y CONFIG_MMC_MSM_SPS_SUPPORT=y CONFIG_LEDS_QPNP=y CONFIG_LEDS_TRIGGERS=y @@ -416,6 +413,7 @@ CONFIG_RTC_DRV_QPNP=y CONFIG_STAGING=y CONFIG_ANDROID=y CONFIG_ANDROID_BINDER_IPC=y +CONFIG_ASHMEM=y CONFIG_ANDROID_LOGGER=y CONFIG_ANDROID_RAM_CONSOLE=y CONFIG_ANDROID_TIMED_GPIO=y @@ -427,6 +425,7 @@ CONFIG_SPS_SUPPORT_NDP_BAM=y CONFIG_QPNP_PWM=y CONFIG_QPNP_POWER_ON=y CONFIG_QPNP_CLKDIV=y +CONFIG_QPNP_REVID=y CONFIG_QPNP_COINCELL=y CONFIG_MSM_IOMMU=y CONFIG_MOBICORE_SUPPORT=m @@ -465,17 +464,10 @@ CONFIG_DEBUG_USER=y CONFIG_PID_IN_CONTEXTIDR=y CONFIG_KEYS=y CONFIG_CRYPTO_NULL=y +CONFIG_CRYPTO_XCBC=y CONFIG_CRYPTO_MD4=y CONFIG_CRYPTO_ARC4=y -CONFIG_CRYPTO_XCBC=y CONFIG_CRYPTO_TWOFISH=y CONFIG_CRYPTO_DEV_QCRYPTO=m CONFIG_CRYPTO_DEV_QCE=y CONFIG_CRYPTO_DEV_QCEDEV=y -CONFIG_CRC_CCITT=y -CONFIG_MSM_EVENT_TIMER=y -CONFIG_PM_WAKELOCKS=y -CONFIG_PM_WAKELOCKS_LIMIT=0 -CONFIG_PM_AUTOSLEEP=y -# CONFIG_PM_WAKELOCKS_GC is not set -CONFIG_MSM_BOOT_STATS=y diff --git a/arch/arm/configs/msm8974_defconfig b/arch/arm/configs/msm8974_defconfig index c9d6112d9c5..8e9d8e8a205 100644 --- a/arch/arm/configs/msm8974_defconfig +++ b/arch/arm/configs/msm8974_defconfig @@ -23,7 +23,6 @@ CONFIG_RD_LZMA=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_PANIC_TIMEOUT=5 CONFIG_KALLSYMS_ALL=y -CONFIG_ASHMEM=y CONFIG_EMBEDDED=y CONFIG_PROFILING=y CONFIG_OPROFILE=y @@ -53,7 +52,6 @@ CONFIG_MSM_IPC_ROUTER=y CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y CONFIG_MSM_IPC_ROUTER_SECURITY=y CONFIG_MSM_QMI_INTERFACE=y -# CONFIG_MSM_HW3D is not set CONFIG_MSM_SUBSYSTEM_RESTART=y CONFIG_MSM_SYSMON_COMM=y CONFIG_MSM_PIL_LPASS_QDSP6V5=y @@ -62,6 +60,7 @@ CONFIG_MSM_PIL_VENUS=y CONFIG_MSM_PIL_PRONTO=y CONFIG_MSM_TZ_LOG=y CONFIG_MSM_DIRECT_SCLK_ACCESS=y +CONFIG_MSM_EVENT_TIMER=y CONFIG_MSM_BUS_SCALING=y CONFIG_MSM_WATCHDOG_V2=y CONFIG_MSM_MEMORY_DUMP=y @@ -84,6 +83,7 @@ CONFIG_MSM_CACHE_DUMP=y CONFIG_MSM_CACHE_DUMP_ON_PANIC=y CONFIG_MSM_ENABLE_WDOG_DEBUG_CONTROL=y CONFIG_MSM_UARTDM_Core_v14=y +CONFIG_MSM_BOOT_STATS=y CONFIG_STRICT_MEMORY_RWX=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y @@ -94,7 +94,6 @@ CONFIG_ARM_ARCH_TIMER=y CONFIG_PREEMPT=y CONFIG_AEABI=y CONFIG_HIGHMEM=y -CONFIG_VMALLOC_RESERVE=0x19000000 CONFIG_CC_STACKPROTECTOR=y CONFIG_CP_ACCESS=y CONFIG_USE_OF=y @@ -107,7 +106,10 @@ CONFIG_CPU_IDLE=y CONFIG_VFP=y CONFIG_NEON=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_WAKELOCK=y +CONFIG_PM_AUTOSLEEP=y +CONFIG_PM_WAKELOCKS=y +CONFIG_PM_WAKELOCKS_LIMIT=0 +# CONFIG_PM_WAKELOCKS_GC is not set CONFIG_PM_RUNTIME=y CONFIG_NET=y CONFIG_PACKET=y @@ -121,8 +123,6 @@ CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_INET_AH=y CONFIG_INET_ESP=y -CONFIG_INET_XFRM_MODE_TRANSPORT=y -CONFIG_INET_XFRM_MODE_TUNNEL=y # CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_LRO is not set CONFIG_IPV6=y @@ -238,14 +238,13 @@ CONFIG_NL80211_TESTMODE=y CONFIG_RFKILL=y CONFIG_GENLOCK=y CONFIG_GENLOCK_MISCDEVICE=y -CONFIG_SYNC=y -CONFIG_SW_SYNC=y CONFIG_CMA=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_TSPP=m CONFIG_HAPTIC_ISA1200=y CONFIG_QSEECOM=y +CONFIG_QPNP_MISC=y CONFIG_USB_HSIC_SMSC_HUB=y CONFIG_TI_DRV2667=y CONFIG_SCSI=y @@ -298,8 +297,6 @@ CONFIG_SPI_SPIDEV=m CONFIG_SPMI=y CONFIG_SPMI_MSM_PMIC_ARB=y CONFIG_MSM_QPNP_INT=y -CONFIG_QPNP_REVID=y -CONFIG_QPNP_MISC=y CONFIG_SLIMBUS_MSM_NGD=y CONFIG_DEBUG_GPIO=y CONFIG_GPIO_SYSFS=y @@ -331,15 +328,15 @@ CONFIG_DVB_CORE=m # CONFIG_MSM_CAMERA is not set CONFIG_MT9M114=y CONFIG_OV2720=y +CONFIG_IMX135=y CONFIG_MSM_CAMERA_SENSOR=y -CONFIG_MSM_CCI=y CONFIG_MSM_CPP=y +CONFIG_MSM_CCI=y CONFIG_MSM_CSI30_HEADER=y CONFIG_MSM_CSIPHY=y CONFIG_MSM_CSID=y CONFIG_MSM_ISPIF=y CONFIG_S5K3L1YX=y -CONFIG_IMX135=y CONFIG_MSMB_CAMERA=y CONFIG_MSMB_JPEG=y CONFIG_MSM_VIDC_V4L2=y @@ -410,8 +407,8 @@ CONFIG_MMC_TEST=m CONFIG_MMC_BLOCK_TEST=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y -CONFIG_MMC_SDHCI_MSM=y CONFIG_MMC_MSM=y +CONFIG_MMC_SDHCI_MSM=y CONFIG_MMC_MSM_SPS_SUPPORT=y CONFIG_LEDS_QPNP=y CONFIG_LEDS_TRIGGERS=y @@ -424,6 +421,7 @@ CONFIG_RTC_DRV_QPNP=y CONFIG_STAGING=y CONFIG_ANDROID=y CONFIG_ANDROID_BINDER_IPC=y +CONFIG_ASHMEM=y CONFIG_ANDROID_LOGGER=y CONFIG_ANDROID_RAM_CONSOLE=y CONFIG_ANDROID_TIMED_GPIO=y @@ -435,6 +433,7 @@ CONFIG_SPS_SUPPORT_NDP_BAM=y CONFIG_QPNP_PWM=y CONFIG_QPNP_POWER_ON=y CONFIG_QPNP_CLKDIV=y +CONFIG_QPNP_REVID=y CONFIG_QPNP_COINCELL=y CONFIG_MSM_IOMMU=y CONFIG_MSM_IOMMU_PMON=y @@ -490,17 +489,10 @@ CONFIG_EARLY_PRINTK=y CONFIG_PID_IN_CONTEXTIDR=y CONFIG_KEYS=y CONFIG_CRYPTO_NULL=y +CONFIG_CRYPTO_XCBC=y CONFIG_CRYPTO_MD4=y CONFIG_CRYPTO_ARC4=y -CONFIG_CRYPTO_XCBC=y CONFIG_CRYPTO_TWOFISH=y CONFIG_CRYPTO_DEV_QCRYPTO=m CONFIG_CRYPTO_DEV_QCE=y CONFIG_CRYPTO_DEV_QCEDEV=y -CONFIG_CRC_CCITT=y -CONFIG_MSM_EVENT_TIMER=y -CONFIG_PM_WAKELOCKS=y -CONFIG_PM_WAKELOCKS_LIMIT=0 -CONFIG_PM_AUTOSLEEP=y -# CONFIG_PM_WAKELOCKS_GC is not set -CONFIG_MSM_BOOT_STATS=y diff --git a/arch/arm/configs/msm9615_defconfig b/arch/arm/configs/msm9615_defconfig index 9ab1cdd8a19..0fb85385c45 100644 --- a/arch/arm/configs/msm9615_defconfig +++ b/arch/arm/configs/msm9615_defconfig @@ -62,7 +62,6 @@ CONFIG_HIGH_RES_TIMERS=y CONFIG_PREEMPT=y CONFIG_AEABI=y CONFIG_HIGHMEM=y -CONFIG_VMALLOC_RESERVE=0x19000000 CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_GOV_POWERSAVE=y CONFIG_CPU_FREQ_GOV_USERSPACE=y @@ -185,7 +184,6 @@ CONFIG_INPUT_UINPUT=y CONFIG_SERIO_LIBPS2=y CONFIG_SERIAL_MSM=y CONFIG_SERIAL_MSM_CONSOLE=y -# CONFIG_SERIAL_MSM_CLOCK_CONTROL is not set CONFIG_SERIAL_MSM_HSL=y CONFIG_SERIAL_MSM_HSL_CONSOLE=y CONFIG_DIAG_CHAR=y diff --git a/arch/arm/configs/msm9625-perf_defconfig b/arch/arm/configs/msm9625-perf_defconfig index c2fb1487eb0..8d6bc814cf8 100644 --- a/arch/arm/configs/msm9625-perf_defconfig +++ b/arch/arm/configs/msm9625-perf_defconfig @@ -34,7 +34,6 @@ CONFIG_PARTITION_ADVANCED=y CONFIG_ARCH_MSM=y CONFIG_ARCH_MSM9625=y # CONFIG_MSM_STACKED_MEMORY is not set -CONFIG_CPU_HAS_L2_PMU=y # CONFIG_MSM_FIQ_SUPPORT is not set # CONFIG_MSM_PROC_COMM is not set CONFIG_MSM_SMD=y @@ -52,15 +51,18 @@ CONFIG_MSM_PIL_MSS_QDSP6V5=y CONFIG_MSM_DIRECT_SCLK_ACCESS=y CONFIG_MSM_BUS_SCALING=y CONFIG_MSM_WATCHDOG_V2=y +CONFIG_MSM_MEMORY_DUMP=y CONFIG_MSM_DLOAD_MODE=y CONFIG_MSM_ADSP_LOADER=m +CONFIG_MSM_RTB=y +CONFIG_MSM_UARTDM_Core_v14=y +CONFIG_MSM_BOOT_STATS=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_ARM_ARCH_TIMER=y CONFIG_PREEMPT=y CONFIG_AEABI=y CONFIG_HIGHMEM=y -CONFIG_VMALLOC_RESERVE=0x19000000 CONFIG_USE_OF=y CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_GOV_POWERSAVE=y @@ -71,6 +73,7 @@ CONFIG_CPU_IDLE=y CONFIG_VFP=y CONFIG_NEON=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_PM_AUTOSLEEP=y CONFIG_PM_RUNTIME=y CONFIG_NET=y CONFIG_PACKET=y @@ -161,11 +164,18 @@ CONFIG_MTD_OF_PARTS=y CONFIG_MTD_BLOCK=y # CONFIG_MTD_MSM_NAND is not set CONFIG_MTD_MSM_QPIC_NAND=y -CONFIG_SYNC=y -CONFIG_SW_SYNC=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y # CONFIG_ANDROID_PMEM is not set +CONFIG_SCSI=y +CONFIG_SCSI_TGT=y +CONFIG_BLK_DEV_SD=y +CONFIG_CHR_DEV_SG=y +CONFIG_CHR_DEV_SCH=y +CONFIG_SCSI_MULTI_LUN=y +CONFIG_SCSI_CONSTANTS=y +CONFIG_SCSI_LOGGING=y +CONFIG_SCSI_SCAN_ASYNC=y CONFIG_NETDEVICES=y # CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_NET_VENDOR_CIRRUS is not set @@ -174,8 +184,8 @@ CONFIG_NETDEVICES=y CONFIG_KS8851=y # CONFIG_NET_VENDOR_MICROCHIP is not set # CONFIG_MSM_RMNET is not set -# CONFIG_MSM_RMNET_BAM is not set CONFIG_MSM_RMNET_WWAN=y +CONFIG_ECM_IPA=y # CONFIG_NET_VENDOR_NATSEMI is not set # CONFIG_NET_VENDOR_SEEQ is not set # CONFIG_NET_VENDOR_SMSC is not set @@ -190,9 +200,8 @@ CONFIG_INPUT_UINPUT=y CONFIG_INPUT_GPIO=m CONFIG_SERIO_LIBPS2=y # CONFIG_LEGACY_PTYS is not set -CONFIG_SERIAL_MSM_HSL=y CONFIG_SERIAL_MSM_HS=y -CONFIG_MSM_UARTDM_Core_v14=y +CONFIG_SERIAL_MSM_HSL=y CONFIG_DIAG_CHAR=y CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_MSM=y @@ -222,18 +231,35 @@ CONFIG_ION=y CONFIG_ION_MSM=y CONFIG_FB=y CONFIG_FB_MSM=y -CONFIG_FB_MSM_QPIC=y CONFIG_FB_MSM_QPIC_PANEL_DETECT=y CONFIG_SOUND=y CONFIG_SND=y CONFIG_SND_SOC=y CONFIG_SND_SOC_MDM9625=y +CONFIG_USB=y +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y +CONFIG_USB_SUSPEND=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_EHSET=y +CONFIG_USB_EHCI_MSM=y +CONFIG_USB_EHCI_MSM_HSIC=y +CONFIG_USB_STORAGE=y +CONFIG_USB_STORAGE_DEBUG=y +CONFIG_USB_STORAGE_DATAFAB=y +CONFIG_USB_STORAGE_FREECOM=y +CONFIG_USB_STORAGE_ISD200=y +CONFIG_USB_STORAGE_USBAT=y +CONFIG_USB_STORAGE_SDDR09=y +CONFIG_USB_STORAGE_SDDR55=y +CONFIG_USB_STORAGE_JUMPSHOT=y +CONFIG_USB_STORAGE_ALAUDA=y +CONFIG_USB_STORAGE_ONETOUCH=y +CONFIG_USB_STORAGE_KARMA=y +CONFIG_USB_STORAGE_CYPRESS_ATACB=y +CONFIG_USB_EHSET_TEST_FIXTURE=y CONFIG_USB_GADGET=y CONFIG_USB_CI13XXX_MSM=y CONFIG_USB_G_ANDROID=y -CONFIG_USB=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_MSM_HSIC=y CONFIG_MMC=y CONFIG_MMC_PERF_PROFILING=y CONFIG_MMC_UNSAFE_RESUME=y @@ -253,7 +279,6 @@ CONFIG_SPS_SUPPORT_BAMDMA=y CONFIG_SPS_SUPPORT_NDP_BAM=y CONFIG_QPNP_POWER_ON=y CONFIG_IPA=y -CONFIG_ECM_IPA=y CONFIG_CORESIGHT=y CONFIG_CORESIGHT_TMC=y CONFIG_CORESIGHT_TPIU=y @@ -262,10 +287,10 @@ CONFIG_CORESIGHT_REPLICATOR=y CONFIG_CORESIGHT_STM=y CONFIG_CORESIGHT_ETM=y CONFIG_CORESIGHT_EVENT=m +CONFIG_EXT3_FS=y CONFIG_VFAT_FS=y CONFIG_TMPFS=y CONFIG_YAFFS_FS=y -CONFIG_EXT3_FS=y CONFIG_YAFFS_DISABLE_TAGS_ECC=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ASCII=y @@ -298,37 +323,3 @@ CONFIG_CRYPTO_DEV_QCE=m CONFIG_CRYPTO_DEV_QCEDEV=m CONFIG_CRC_CCITT=y CONFIG_LIBCRC32C=y -CONFIG_USB=y -CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -CONFIG_USB_SUSPEND=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_EHSET=y -CONFIG_USB_EHCI_MSM=y -CONFIG_USB_STORAGE=y -CONFIG_USB_STORAGE_DEBUG=y -CONFIG_USB_STORAGE_DATAFAB=y -CONFIG_USB_STORAGE_FREECOM=y -CONFIG_USB_STORAGE_ISD200=y -CONFIG_USB_STORAGE_USBAT=y -CONFIG_USB_STORAGE_SDDR09=y -CONFIG_USB_STORAGE_SDDR55=y -CONFIG_USB_STORAGE_JUMPSHOT=y -CONFIG_USB_STORAGE_ALAUDA=y -CONFIG_USB_STORAGE_ONETOUCH=y -CONFIG_USB_STORAGE_KARMA=y -CONFIG_USB_STORAGE_CYPRESS_ATACB=y -CONFIG_USB_EHSET_TEST_FIXTURE=y -CONFIG_SCSI=y -CONFIG_SCSI_TGT=y -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_SG=y -CONFIG_CHR_DEV_SCH=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_SCSI_CONSTANTS=y -CONFIG_SCSI_LOGGING=y -CONFIG_SCSI_SCAN_ASYNC=y -CONFIG_MSM_RTB=y -CONFIG_MSM_MEMORY_DUMP=y -CONFIG_PM_AUTOSLEEP=y -# CONFIG_PM_WAKELOCKS_GC is not set -CONFIG_MSM_BOOT_STATS=y diff --git a/arch/arm/configs/msm9625_defconfig b/arch/arm/configs/msm9625_defconfig index 828eaa913bd..9e9bba97b9d 100644 --- a/arch/arm/configs/msm9625_defconfig +++ b/arch/arm/configs/msm9625_defconfig @@ -34,7 +34,6 @@ CONFIG_PARTITION_ADVANCED=y CONFIG_ARCH_MSM=y CONFIG_ARCH_MSM9625=y # CONFIG_MSM_STACKED_MEMORY is not set -CONFIG_CPU_HAS_L2_PMU=y # CONFIG_MSM_FIQ_SUPPORT is not set # CONFIG_MSM_PROC_COMM is not set CONFIG_MSM_SMD=y @@ -52,15 +51,18 @@ CONFIG_MSM_PIL_MSS_QDSP6V5=y CONFIG_MSM_DIRECT_SCLK_ACCESS=y CONFIG_MSM_BUS_SCALING=y CONFIG_MSM_WATCHDOG_V2=y +CONFIG_MSM_MEMORY_DUMP=y CONFIG_MSM_DLOAD_MODE=y CONFIG_MSM_ADSP_LOADER=m +CONFIG_MSM_RTB=y +CONFIG_MSM_UARTDM_Core_v14=y +CONFIG_MSM_BOOT_STATS=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_ARM_ARCH_TIMER=y CONFIG_PREEMPT=y CONFIG_AEABI=y CONFIG_HIGHMEM=y -CONFIG_VMALLOC_RESERVE=0x19000000 CONFIG_USE_OF=y CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_GOV_POWERSAVE=y @@ -71,6 +73,7 @@ CONFIG_CPU_IDLE=y CONFIG_VFP=y CONFIG_NEON=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_PM_AUTOSLEEP=y CONFIG_PM_RUNTIME=y CONFIG_NET=y CONFIG_PACKET=y @@ -161,11 +164,18 @@ CONFIG_MTD_OF_PARTS=y CONFIG_MTD_BLOCK=y # CONFIG_MTD_MSM_NAND is not set CONFIG_MTD_MSM_QPIC_NAND=y -CONFIG_SYNC=y -CONFIG_SW_SYNC=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y # CONFIG_ANDROID_PMEM is not set +CONFIG_SCSI=y +CONFIG_SCSI_TGT=y +CONFIG_BLK_DEV_SD=y +CONFIG_CHR_DEV_SG=y +CONFIG_CHR_DEV_SCH=y +CONFIG_SCSI_MULTI_LUN=y +CONFIG_SCSI_CONSTANTS=y +CONFIG_SCSI_LOGGING=y +CONFIG_SCSI_SCAN_ASYNC=y CONFIG_NETDEVICES=y # CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_NET_VENDOR_CIRRUS is not set @@ -174,8 +184,8 @@ CONFIG_NETDEVICES=y CONFIG_KS8851=y # CONFIG_NET_VENDOR_MICROCHIP is not set # CONFIG_MSM_RMNET is not set -# CONFIG_MSM_RMNET_BAM is not set CONFIG_MSM_RMNET_WWAN=y +CONFIG_ECM_IPA=y # CONFIG_NET_VENDOR_NATSEMI is not set # CONFIG_NET_VENDOR_SEEQ is not set # CONFIG_NET_VENDOR_SMSC is not set @@ -190,10 +200,9 @@ CONFIG_INPUT_UINPUT=y CONFIG_INPUT_GPIO=m CONFIG_SERIO_LIBPS2=y # CONFIG_LEGACY_PTYS is not set +CONFIG_SERIAL_MSM_HS=y CONFIG_SERIAL_MSM_HSL=y CONFIG_SERIAL_MSM_HSL_CONSOLE=y -CONFIG_SERIAL_MSM_HS=y -CONFIG_MSM_UARTDM_Core_v14=y CONFIG_DIAG_CHAR=y CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_MSM=y @@ -223,18 +232,35 @@ CONFIG_ION=y CONFIG_ION_MSM=y CONFIG_FB=y CONFIG_FB_MSM=y -CONFIG_FB_MSM_QPIC=y CONFIG_FB_MSM_QPIC_PANEL_DETECT=y CONFIG_SOUND=y CONFIG_SND=y CONFIG_SND_SOC=y CONFIG_SND_SOC_MDM9625=y +CONFIG_USB=y +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y +CONFIG_USB_SUSPEND=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_EHSET=y +CONFIG_USB_EHCI_MSM=y +CONFIG_USB_EHCI_MSM_HSIC=y +CONFIG_USB_STORAGE=y +CONFIG_USB_STORAGE_DEBUG=y +CONFIG_USB_STORAGE_DATAFAB=y +CONFIG_USB_STORAGE_FREECOM=y +CONFIG_USB_STORAGE_ISD200=y +CONFIG_USB_STORAGE_USBAT=y +CONFIG_USB_STORAGE_SDDR09=y +CONFIG_USB_STORAGE_SDDR55=y +CONFIG_USB_STORAGE_JUMPSHOT=y +CONFIG_USB_STORAGE_ALAUDA=y +CONFIG_USB_STORAGE_ONETOUCH=y +CONFIG_USB_STORAGE_KARMA=y +CONFIG_USB_STORAGE_CYPRESS_ATACB=y +CONFIG_USB_EHSET_TEST_FIXTURE=y CONFIG_USB_GADGET=y CONFIG_USB_CI13XXX_MSM=y CONFIG_USB_G_ANDROID=y -CONFIG_USB=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_MSM_HSIC=y CONFIG_MMC=y CONFIG_MMC_PERF_PROFILING=y CONFIG_MMC_UNSAFE_RESUME=y @@ -254,7 +280,6 @@ CONFIG_SPS_SUPPORT_BAMDMA=y CONFIG_SPS_SUPPORT_NDP_BAM=y CONFIG_QPNP_POWER_ON=y CONFIG_IPA=y -CONFIG_ECM_IPA=y CONFIG_CORESIGHT=y CONFIG_CORESIGHT_TMC=y CONFIG_CORESIGHT_TPIU=y @@ -263,10 +288,10 @@ CONFIG_CORESIGHT_REPLICATOR=y CONFIG_CORESIGHT_STM=y CONFIG_CORESIGHT_ETM=y CONFIG_CORESIGHT_EVENT=m +CONFIG_EXT3_FS=y CONFIG_VFAT_FS=y CONFIG_TMPFS=y CONFIG_YAFFS_FS=y -CONFIG_EXT3_FS=y CONFIG_YAFFS_DISABLE_TAGS_ECC=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ASCII=y @@ -299,37 +324,3 @@ CONFIG_CRYPTO_DEV_QCE=m CONFIG_CRYPTO_DEV_QCEDEV=m CONFIG_CRC_CCITT=y CONFIG_LIBCRC32C=y -CONFIG_USB=y -CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -CONFIG_USB_SUSPEND=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_EHSET=y -CONFIG_USB_EHCI_MSM=y -CONFIG_USB_STORAGE=y -CONFIG_USB_STORAGE_DEBUG=y -CONFIG_USB_STORAGE_DATAFAB=y -CONFIG_USB_STORAGE_FREECOM=y -CONFIG_USB_STORAGE_ISD200=y -CONFIG_USB_STORAGE_USBAT=y -CONFIG_USB_STORAGE_SDDR09=y -CONFIG_USB_STORAGE_SDDR55=y -CONFIG_USB_STORAGE_JUMPSHOT=y -CONFIG_USB_STORAGE_ALAUDA=y -CONFIG_USB_STORAGE_ONETOUCH=y -CONFIG_USB_STORAGE_KARMA=y -CONFIG_USB_STORAGE_CYPRESS_ATACB=y -CONFIG_USB_EHSET_TEST_FIXTURE=y -CONFIG_SCSI=y -CONFIG_SCSI_TGT=y -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_SG=y -CONFIG_CHR_DEV_SCH=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_SCSI_CONSTANTS=y -CONFIG_SCSI_LOGGING=y -CONFIG_SCSI_SCAN_ASYNC=y -CONFIG_MSM_RTB=y -CONFIG_MSM_MEMORY_DUMP=y -CONFIG_PM_AUTOSLEEP=y -# CONFIG_PM_WAKELOCKS_GC is not set -CONFIG_MSM_BOOT_STATS=y