diff --git a/arch/arm/configs/fsm9xxx-perf_defconfig b/arch/arm/configs/fsm9xxx-perf_defconfig index 3d4b37d5c39..c671d32ac52 100644 --- a/arch/arm/configs/fsm9xxx-perf_defconfig +++ b/arch/arm/configs/fsm9xxx-perf_defconfig @@ -114,7 +114,6 @@ CONFIG_SLIP_MODE_SLIP6=y CONFIG_INPUT_EVDEV=y CONFIG_INPUT_EVBUG=m # CONFIG_KEYBOARD_ATKBD is not set -# CONFIG_KEYBOARD_PMIC8058 is not set # CONFIG_INPUT_MOUSE is not set CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=y diff --git a/arch/arm/configs/fsm9xxx_defconfig b/arch/arm/configs/fsm9xxx_defconfig index ebff2d2bc18..80252d869e5 100644 --- a/arch/arm/configs/fsm9xxx_defconfig +++ b/arch/arm/configs/fsm9xxx_defconfig @@ -112,7 +112,6 @@ CONFIG_SLIP_MODE_SLIP6=y CONFIG_INPUT_EVDEV=y CONFIG_INPUT_EVBUG=m # CONFIG_KEYBOARD_ATKBD is not set -# CONFIG_KEYBOARD_PMIC8058 is not set # CONFIG_INPUT_MOUSE is not set CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=y diff --git a/arch/arm/configs/msm-copper_defconfig b/arch/arm/configs/msm-copper_defconfig index 58aece269a6..613ad72807b 100644 --- a/arch/arm/configs/msm-copper_defconfig +++ b/arch/arm/configs/msm-copper_defconfig @@ -37,6 +37,10 @@ CONFIG_KERNEL_PMEM_EBI_REGION=y 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_ROUTER=y +CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y # CONFIG_MSM_HW3D is not set CONFIG_MSM_DIRECT_SCLK_ACCESS=y CONFIG_NO_HZ=y @@ -168,13 +172,3 @@ CONFIG_CRYPTO_TWOFISH=y CONFIG_CRYPTO_DEFLATE=y CONFIG_CRC_CCITT=y CONFIG_LIBCRC32C=y -CONFIG_MSM_SMD=y -CONFIG_MSM_SMD_PKG4=y -CONFIG_MSM_SMD_PKT=y -CONFIG_MSM_SMD_DEBUG=y -CONFIG_MSM_SMD_TTY=y -CONFIG_MSM_N_WAY_SMD=y -CONFIG_MSM_N_WAY_SMSM=y -CONFIG_MSM_SMD_LOGGING=y -CONFIG_MSM_IPC_ROUTER=y -CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y diff --git a/arch/arm/configs/msm7627a_defconfig b/arch/arm/configs/msm7627a_defconfig index 642d843cd34..f4646dcff52 100644 --- a/arch/arm/configs/msm7627a_defconfig +++ b/arch/arm/configs/msm7627a_defconfig @@ -45,7 +45,6 @@ CONFIG_MSM_RMT_STORAGE_CLIENT=y # CONFIG_MSM_HW3D is not set CONFIG_MSM7X27A_AUDIO=y CONFIG_MSM_DMA_TEST=y -# CONFIG_MSM_JTAG_V7 is not set CONFIG_MSM_SLEEP_STATS_DEVICE=y CONFIG_BT_MSM_PINTEST=y CONFIG_MSM_RPC_VIBRATOR=y @@ -235,6 +234,7 @@ CONFIG_VIDEO_DEV=y # CONFIG_MT9T013 is not set # CONFIG_MT9D112 is not set CONFIG_OV5640=y +CONFIG_OV5647=y CONFIG_WEBCAM_OV7692_QRD=y CONFIG_WEBCAM_OV9726=y # CONFIG_MT9P012 is not set @@ -330,9 +330,9 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_FS=y CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_SHIRQ=y -# CONFIG_SCHED_DEBUG is not set CONFIG_LOCKUP_DETECTOR=y CONFIG_DETECT_HUNG_TASK=y +# CONFIG_SCHED_DEBUG is not set CONFIG_TIMER_STATS=y CONFIG_DEBUG_SLAB=y CONFIG_DEBUG_SLAB_LEAK=y @@ -342,7 +342,6 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y CONFIG_DEBUG_STACK_USAGE=y CONFIG_DEBUG_INFO=y CONFIG_DEBUG_LIST=y -CONFIG_LATENCYTOP=y CONFIG_DEBUG_PAGEALLOC=y # CONFIG_FTRACE is not set CONFIG_DYNAMIC_DEBUG=y @@ -352,4 +351,3 @@ CONFIG_EARLY_PRINTK=y CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_TWOFISH=y CONFIG_CRC_CCITT=y -CONFIG_OV5647=y diff --git a/arch/arm/configs/msm7630-perf_defconfig b/arch/arm/configs/msm7630-perf_defconfig index e319f0d3223..546649813ab 100644 --- a/arch/arm/configs/msm7630-perf_defconfig +++ b/arch/arm/configs/msm7630-perf_defconfig @@ -40,7 +40,6 @@ CONFIG_MSM_MEMORY_LOW_POWER_MODE=y CONFIG_MSM_MEMORY_LOW_POWER_MODE_IDLE_RETENTION=y CONFIG_MSM_MEMORY_LOW_POWER_MODE_SUSPEND_DEEP_POWER_DOWN=y CONFIG_MSM_IDLE_WAIT_ON_MODEM=2000 -# CONFIG_MSM_JTAG_V7 is not set CONFIG_MSM_STANDALONE_POWER_COLLAPSE=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y @@ -223,7 +222,6 @@ CONFIG_INPUT_EVDEV=y CONFIG_INPUT_EVBUG=m # CONFIG_KEYBOARD_ATKBD is not set CONFIG_KEYBOARD_PMIC8XXX=y -# CONFIG_KEYBOARD_PMIC8058 is not set # CONFIG_INPUT_MOUSE is not set CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_MSM=y diff --git a/arch/arm/configs/msm7630_defconfig b/arch/arm/configs/msm7630_defconfig index b4babebb2f3..1a708164de9 100644 --- a/arch/arm/configs/msm7630_defconfig +++ b/arch/arm/configs/msm7630_defconfig @@ -40,7 +40,6 @@ CONFIG_MSM_MEMORY_LOW_POWER_MODE=y CONFIG_MSM_MEMORY_LOW_POWER_MODE_IDLE_RETENTION=y CONFIG_MSM_MEMORY_LOW_POWER_MODE_SUSPEND_DEEP_POWER_DOWN=y CONFIG_MSM_IDLE_WAIT_ON_MODEM=2000 -# CONFIG_MSM_JTAG_V7 is not set CONFIG_MSM_STANDALONE_POWER_COLLAPSE=y CONFIG_STRICT_MEMORY_RWX=y CONFIG_NO_HZ=y @@ -224,7 +223,6 @@ CONFIG_INPUT_EVDEV=y CONFIG_INPUT_EVBUG=m # CONFIG_KEYBOARD_ATKBD is not set CONFIG_KEYBOARD_PMIC8XXX=y -# CONFIG_KEYBOARD_PMIC8058 is not set # CONFIG_INPUT_MOUSE is not set CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_MSM=y @@ -371,7 +369,6 @@ CONFIG_PRINTK_TIME=y CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_FS=y CONFIG_DEBUG_KERNEL=y -# CONFIG_SCHED_DEBUG is not set CONFIG_LOCKUP_DETECTOR=y CONFIG_DETECT_HUNG_TASK=y # CONFIG_SCHED_DEBUG is not set @@ -380,7 +377,6 @@ CONFIG_TIMER_STATS=y CONFIG_DEBUG_SLAB=y CONFIG_DEBUG_SLAB_LEAK=y # CONFIG_DEBUG_PREEMPT is not set -CONFIG_DEBUG_SPINLOCK=y CONFIG_PROVE_LOCKING=y CONFIG_DEBUG_SPINLOCK_SLEEP=y CONFIG_DEBUG_STACK_USAGE=y diff --git a/arch/arm/configs/msm8660-perf_defconfig b/arch/arm/configs/msm8660-perf_defconfig index b3a45d2f903..13656418738 100644 --- a/arch/arm/configs/msm8660-perf_defconfig +++ b/arch/arm/configs/msm8660-perf_defconfig @@ -70,7 +70,6 @@ CONFIG_MSM_RPM_LOG=y CONFIG_MSM_RPM_STATS_LOG=y CONFIG_MSM_WATCHDOG=y CONFIG_MSM_DLOAD_MODE=y -# CONFIG_MSM_JTAG_V7 is not set CONFIG_MSM_ETM=y CONFIG_MSM_SLEEP_STATS=y CONFIG_MSM_GSBI9_UART=y @@ -272,7 +271,6 @@ CONFIG_INPUT_KEYRESET=y CONFIG_KEYBOARD_GPIO=y CONFIG_KEYBOARD_MATRIX=y CONFIG_KEYBOARD_PMIC8XXX=y -# CONFIG_KEYBOARD_PMIC8058 is not set CONFIG_INPUT_JOYSTICK=y CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_ATMEL_MAXTOUCH=y @@ -299,7 +297,6 @@ CONFIG_SPI_SPIDEV=m CONFIG_DEBUG_GPIO=y CONFIG_GPIO_SYSFS=y CONFIG_GPIO_SX150X=y -# CONFIG_MPP_PMIC8901 is not set CONFIG_POWER_SUPPLY=y # CONFIG_BATTERY_MSM is not set CONFIG_BATTERY_MSM8X60=y @@ -324,9 +321,9 @@ CONFIG_MEDIA_SUPPORT=y CONFIG_VIDEO_DEV=y # CONFIG_MEDIA_TUNER_CUSTOMISE is not set CONFIG_USB_VIDEO_CLASS=y +CONFIG_IMX074=y CONFIG_WEBCAM_OV9726=y CONFIG_MT9E013=y -CONFIG_IMX074=y CONFIG_MSM_GEMINI=y CONFIG_RADIO_TAVARUA=y CONFIG_ION=y diff --git a/arch/arm/configs/msm8660_defconfig b/arch/arm/configs/msm8660_defconfig index 1f511bbccc1..fa4ba4ea9aa 100644 --- a/arch/arm/configs/msm8660_defconfig +++ b/arch/arm/configs/msm8660_defconfig @@ -271,7 +271,6 @@ CONFIG_INPUT_KEYRESET=y CONFIG_KEYBOARD_GPIO=y CONFIG_KEYBOARD_MATRIX=y CONFIG_KEYBOARD_PMIC8XXX=y -# CONFIG_KEYBOARD_PMIC8058 is not set CONFIG_INPUT_JOYSTICK=y CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_ATMEL_MAXTOUCH=y @@ -299,7 +298,6 @@ CONFIG_SPI_SPIDEV=m CONFIG_DEBUG_GPIO=y CONFIG_GPIO_SYSFS=y CONFIG_GPIO_SX150X=y -# CONFIG_MPP_PMIC8901 is not set CONFIG_POWER_SUPPLY=y # CONFIG_BATTERY_MSM is not set CONFIG_BATTERY_MSM8X60=y @@ -324,9 +322,9 @@ CONFIG_MEDIA_SUPPORT=y CONFIG_VIDEO_DEV=y # CONFIG_MEDIA_TUNER_CUSTOMISE is not set CONFIG_USB_VIDEO_CLASS=y +CONFIG_IMX074=y CONFIG_WEBCAM_OV9726=y CONFIG_MT9E013=y -CONFIG_IMX074=y CONFIG_MSM_GEMINI=y CONFIG_RADIO_TAVARUA=y CONFIG_ION=y diff --git a/arch/arm/configs/msm8960-perf_defconfig b/arch/arm/configs/msm8960-perf_defconfig index 152cb867cfb..043b82302c7 100644 --- a/arch/arm/configs/msm8960-perf_defconfig +++ b/arch/arm/configs/msm8960-perf_defconfig @@ -311,14 +311,13 @@ CONFIG_VIDEO_DEV=y CONFIG_VIDEO_HELPER_CHIPS_AUTO=y CONFIG_USB_VIDEO_CLASS=y CONFIG_MSM_CAMERA_V4L2=y +CONFIG_IMX074=y CONFIG_MT9M114=y +CONFIG_IMX074_ACT=y CONFIG_MSM_CAMERA_FLASH_SC628A=y +CONFIG_OV2720=y CONFIG_MSM_CAMERA_SENSOR=y CONFIG_MSM_ACTUATOR=y -CONFIG_IMX074=y -CONFIG_IMX074_ACT=y -CONFIG_OV2720=y -CONFIG_S5K3L1YX=y CONFIG_MSM_GEMINI=y CONFIG_S5K3L1YX=y CONFIG_RADIO_IRIS=y @@ -337,7 +336,6 @@ CONFIG_FB_MSM_MDP40=y CONFIG_FB_MSM_OVERLAY=y CONFIG_FB_MSM_OVERLAY0_WRITEBACK=y CONFIG_FB_MSM_OVERLAY1_WRITEBACK=y -CONFIG_FB_MSM_LVDS_MIPI_PANEL_DETECT=y CONFIG_FB_MSM_WRITEBACK_MSM_PANEL=y CONFIG_FB_MSM_MIPI_PANEL_DETECT=y CONFIG_FB_MSM_HDMI_MSM_PANEL=y diff --git a/arch/arm/configs/msm8960_defconfig b/arch/arm/configs/msm8960_defconfig index a326de6a027..f41b396c3c6 100644 --- a/arch/arm/configs/msm8960_defconfig +++ b/arch/arm/configs/msm8960_defconfig @@ -311,15 +311,15 @@ CONFIG_VIDEO_DEV=y CONFIG_VIDEO_HELPER_CHIPS_AUTO=y CONFIG_USB_VIDEO_CLASS=y CONFIG_MSM_CAMERA_V4L2=y +CONFIG_IMX074=y CONFIG_MT9M114=y +CONFIG_IMX074_ACT=y CONFIG_MSM_CAMERA_FLASH_SC628A=y +CONFIG_OV2720=y CONFIG_MSM_CAMERA_SENSOR=y CONFIG_MSM_ACTUATOR=y -CONFIG_IMX074=y -CONFIG_IMX074_ACT=y -CONFIG_OV2720=y -CONFIG_S5K3L1YX=y CONFIG_MSM_GEMINI=y +CONFIG_S5K3L1YX=y CONFIG_RADIO_IRIS=y CONFIG_RADIO_IRIS_TRANSPORT=m CONFIG_ION=y