aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/configs/multi_v7_defconfig15
1 files changed, 13 insertions, 2 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 1aab5350212e..cc60a6506319 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -289,6 +289,7 @@ CONFIG_MOUSE_ELAN_I2C=y
289CONFIG_INPUT_TOUCHSCREEN=y 289CONFIG_INPUT_TOUCHSCREEN=y
290CONFIG_TOUCHSCREEN_ADC=m 290CONFIG_TOUCHSCREEN_ADC=m
291CONFIG_TOUCHSCREEN_ATMEL_MXT=m 291CONFIG_TOUCHSCREEN_ATMEL_MXT=m
292CONFIG_TOUCHSCREEN_ELAN=m
292CONFIG_TOUCHSCREEN_MMS114=m 293CONFIG_TOUCHSCREEN_MMS114=m
293CONFIG_TOUCHSCREEN_WM97XX=m 294CONFIG_TOUCHSCREEN_WM97XX=m
294CONFIG_TOUCHSCREEN_ST1232=m 295CONFIG_TOUCHSCREEN_ST1232=m
@@ -351,6 +352,8 @@ CONFIG_SERIAL_DEV_BUS=y
351CONFIG_VIRTIO_CONSOLE=y 352CONFIG_VIRTIO_CONSOLE=y
352CONFIG_HW_RANDOM=y 353CONFIG_HW_RANDOM=y
353CONFIG_HW_RANDOM_ST=y 354CONFIG_HW_RANDOM_ST=y
355CONFIG_TCG_TPM=m
356CONFIG_TCG_TIS_I2C_INFINEON=m
354CONFIG_I2C_CHARDEV=y 357CONFIG_I2C_CHARDEV=y
355CONFIG_I2C_ARB_GPIO_CHALLENGE=m 358CONFIG_I2C_ARB_GPIO_CHALLENGE=m
356CONFIG_I2C_MUX_PCA954x=y 359CONFIG_I2C_MUX_PCA954x=y
@@ -447,9 +450,11 @@ CONFIG_POWER_RESET_RMOBILE=y
447CONFIG_BATTERY_ACT8945A=y 450CONFIG_BATTERY_ACT8945A=y
448CONFIG_BATTERY_CPCAP=m 451CONFIG_BATTERY_CPCAP=m
449CONFIG_BATTERY_SBS=y 452CONFIG_BATTERY_SBS=y
453CONFIG_BATTERY_BQ27XXX=m
450CONFIG_AXP20X_POWER=m 454CONFIG_AXP20X_POWER=m
451CONFIG_BATTERY_MAX17040=m 455CONFIG_BATTERY_MAX17040=m
452CONFIG_BATTERY_MAX17042=m 456CONFIG_BATTERY_MAX17042=m
457CONFIG_CHARGER_GPIO=m
453CONFIG_CHARGER_CPCAP=m 458CONFIG_CHARGER_CPCAP=m
454CONFIG_CHARGER_MAX14577=m 459CONFIG_CHARGER_MAX14577=m
455CONFIG_CHARGER_MAX77693=m 460CONFIG_CHARGER_MAX77693=m
@@ -507,6 +512,9 @@ CONFIG_MFD_AC100=y
507CONFIG_MFD_AXP20X_I2C=y 512CONFIG_MFD_AXP20X_I2C=y
508CONFIG_MFD_AXP20X_RSB=y 513CONFIG_MFD_AXP20X_RSB=y
509CONFIG_MFD_CROS_EC=m 514CONFIG_MFD_CROS_EC=m
515CONFIG_CROS_EC_I2C=m
516CONFIG_CROS_EC_SPI=m
517CONFIG_MFD_CROS_EC_CHARDEV=m
510CONFIG_MFD_DA9063=m 518CONFIG_MFD_DA9063=m
511CONFIG_MFD_MAX14577=y 519CONFIG_MFD_MAX14577=y
512CONFIG_MFD_MAX77686=y 520CONFIG_MFD_MAX77686=y
@@ -889,8 +897,6 @@ CONFIG_SERIO_NVEC_PS2=y
889CONFIG_NVEC_POWER=y 897CONFIG_NVEC_POWER=y
890CONFIG_NVEC_PAZ00=y 898CONFIG_NVEC_PAZ00=y
891CONFIG_STAGING_BOARD=y 899CONFIG_STAGING_BOARD=y
892CONFIG_CROS_EC_I2C=m
893CONFIG_CROS_EC_SPI=m
894CONFIG_COMMON_CLK_MAX77686=y 900CONFIG_COMMON_CLK_MAX77686=y
895CONFIG_COMMON_CLK_RK808=m 901CONFIG_COMMON_CLK_RK808=m
896CONFIG_COMMON_CLK_S2MPS11=m 902CONFIG_COMMON_CLK_S2MPS11=m
@@ -953,8 +959,12 @@ CONFIG_VF610_ADC=m
953CONFIG_XILINX_XADC=y 959CONFIG_XILINX_XADC=y
954CONFIG_STM32_LPTIMER_CNT=m 960CONFIG_STM32_LPTIMER_CNT=m
955CONFIG_STM32_DAC=m 961CONFIG_STM32_DAC=m
962CONFIG_ROCKCHIP_SARADC=m
963CONFIG_IIO_CROS_EC_SENSORS_CORE=m
964CONFIG_IIO_CROS_EC_SENSORS=m
956CONFIG_MPU3050_I2C=y 965CONFIG_MPU3050_I2C=y
957CONFIG_CM36651=m 966CONFIG_CM36651=m
967CONFIG_IIO_CROS_EC_LIGHT_PROX=m
958CONFIG_SENSORS_ISL29018=y 968CONFIG_SENSORS_ISL29018=y
959CONFIG_SENSORS_ISL29028=y 969CONFIG_SENSORS_ISL29028=y
960CONFIG_AK8975=y 970CONFIG_AK8975=y
@@ -1001,6 +1011,7 @@ CONFIG_OMAP_USB2=y
1001CONFIG_TI_PIPE3=y 1011CONFIG_TI_PIPE3=y
1002CONFIG_TWL4030_USB=m 1012CONFIG_TWL4030_USB=m
1003CONFIG_MESON_MX_EFUSE=m 1013CONFIG_MESON_MX_EFUSE=m
1014CONFIG_ROCKCHIP_EFUSE=m
1004CONFIG_NVMEM_IMX_OCOTP=y 1015CONFIG_NVMEM_IMX_OCOTP=y
1005CONFIG_NVMEM_SUNXI_SID=y 1016CONFIG_NVMEM_SUNXI_SID=y
1006CONFIG_NVMEM_VF610_OCOTP=y 1017CONFIG_NVMEM_VF610_OCOTP=y