aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/configs/multi_v7_defconfig11
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index c75051b9392c..d160ac4bad21 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -288,6 +288,7 @@ CONFIG_MOUSE_ELAN_I2C=y
288CONFIG_INPUT_TOUCHSCREEN=y 288CONFIG_INPUT_TOUCHSCREEN=y
289CONFIG_TOUCHSCREEN_ADC=m 289CONFIG_TOUCHSCREEN_ADC=m
290CONFIG_TOUCHSCREEN_ATMEL_MXT=m 290CONFIG_TOUCHSCREEN_ATMEL_MXT=m
291CONFIG_TOUCHSCREEN_ELAN=m
291CONFIG_TOUCHSCREEN_MMS114=m 292CONFIG_TOUCHSCREEN_MMS114=m
292CONFIG_TOUCHSCREEN_WM97XX=m 293CONFIG_TOUCHSCREEN_WM97XX=m
293CONFIG_TOUCHSCREEN_ST1232=m 294CONFIG_TOUCHSCREEN_ST1232=m
@@ -349,6 +350,8 @@ CONFIG_SERIAL_DEV_BUS=y
349CONFIG_VIRTIO_CONSOLE=y 350CONFIG_VIRTIO_CONSOLE=y
350CONFIG_HW_RANDOM=y 351CONFIG_HW_RANDOM=y
351CONFIG_HW_RANDOM_ST=y 352CONFIG_HW_RANDOM_ST=y
353CONFIG_TCG_TPM=m
354CONFIG_TCG_TIS_I2C_INFINEON=m
352CONFIG_I2C_CHARDEV=y 355CONFIG_I2C_CHARDEV=y
353CONFIG_I2C_ARB_GPIO_CHALLENGE=m 356CONFIG_I2C_ARB_GPIO_CHALLENGE=m
354CONFIG_I2C_MUX_PCA954x=y 357CONFIG_I2C_MUX_PCA954x=y
@@ -444,9 +447,11 @@ CONFIG_POWER_RESET_RMOBILE=y
444CONFIG_BATTERY_ACT8945A=y 447CONFIG_BATTERY_ACT8945A=y
445CONFIG_BATTERY_CPCAP=m 448CONFIG_BATTERY_CPCAP=m
446CONFIG_BATTERY_SBS=y 449CONFIG_BATTERY_SBS=y
450CONFIG_BATTERY_BQ27XXX=m
447CONFIG_AXP20X_POWER=m 451CONFIG_AXP20X_POWER=m
448CONFIG_BATTERY_MAX17040=m 452CONFIG_BATTERY_MAX17040=m
449CONFIG_BATTERY_MAX17042=m 453CONFIG_BATTERY_MAX17042=m
454CONFIG_CHARGER_GPIO=m
450CONFIG_CHARGER_CPCAP=m 455CONFIG_CHARGER_CPCAP=m
451CONFIG_CHARGER_MAX14577=m 456CONFIG_CHARGER_MAX14577=m
452CONFIG_CHARGER_MAX77693=m 457CONFIG_CHARGER_MAX77693=m
@@ -505,6 +510,7 @@ CONFIG_MFD_AXP20X_RSB=y
505CONFIG_MFD_CROS_EC=m 510CONFIG_MFD_CROS_EC=m
506CONFIG_CROS_EC_I2C=m 511CONFIG_CROS_EC_I2C=m
507CONFIG_CROS_EC_SPI=m 512CONFIG_CROS_EC_SPI=m
513CONFIG_MFD_CROS_EC_CHARDEV=m
508CONFIG_MFD_DA9063=m 514CONFIG_MFD_DA9063=m
509CONFIG_MFD_MAX14577=y 515CONFIG_MFD_MAX14577=y
510CONFIG_MFD_MAX77686=y 516CONFIG_MFD_MAX77686=y
@@ -932,8 +938,12 @@ CONFIG_VF610_ADC=m
932CONFIG_XILINX_XADC=y 938CONFIG_XILINX_XADC=y
933CONFIG_STM32_LPTIMER_CNT=m 939CONFIG_STM32_LPTIMER_CNT=m
934CONFIG_STM32_DAC=m 940CONFIG_STM32_DAC=m
941CONFIG_ROCKCHIP_SARADC=m
942CONFIG_IIO_CROS_EC_SENSORS_CORE=m
943CONFIG_IIO_CROS_EC_SENSORS=m
935CONFIG_MPU3050_I2C=y 944CONFIG_MPU3050_I2C=y
936CONFIG_CM36651=m 945CONFIG_CM36651=m
946CONFIG_IIO_CROS_EC_LIGHT_PROX=m
937CONFIG_SENSORS_ISL29018=y 947CONFIG_SENSORS_ISL29018=y
938CONFIG_SENSORS_ISL29028=y 948CONFIG_SENSORS_ISL29028=y
939CONFIG_AK8975=y 949CONFIG_AK8975=y
@@ -979,6 +989,7 @@ CONFIG_PHY_UNIPHIER_USB2=y
979CONFIG_OMAP_USB2=y 989CONFIG_OMAP_USB2=y
980CONFIG_TI_PIPE3=y 990CONFIG_TI_PIPE3=y
981CONFIG_TWL4030_USB=m 991CONFIG_TWL4030_USB=m
992CONFIG_ROCKCHIP_EFUSE=m
982CONFIG_NVMEM_IMX_OCOTP=y 993CONFIG_NVMEM_IMX_OCOTP=y
983CONFIG_NVMEM_SUNXI_SID=y 994CONFIG_NVMEM_SUNXI_SID=y
984CONFIG_NVMEM_VF610_OCOTP=y 995CONFIG_NVMEM_VF610_OCOTP=y