Commit 672b6804 authored by Olof Johansson's avatar Olof Johansson

Merge tag 'omap-for-v4.10/defconfig-signed' of...

Merge tag 'omap-for-v4.10/defconfig-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/defconfig

Defconfig changes for omaps for v4.10 merge window:

- Enable tsc2004 touchscreen as a loadable module

- Enable REGULATOR_GPIO, dra71-evm needs this for MMC voltage

- Enable LP873x PMICs for dra71x-evm

- Run make savedefconfig to save some space and make it
  easier to generate minimal patches against it

* tag 'omap-for-v4.10/defconfig-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: omap2plus_defconfig: Run make savedefconfig to save some space
  ARM: omap2plus_defconfig: Enable LP873X support
  ARM: omap2plus_defconfig: Enable REGULATOR_GPIO
  ARM: omap2plus_defconfig: Enable TOUCHSCREEN_TSC2004
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 7f9b2b15 9c106e4e
CONFIG_KERNEL_LZMA=y CONFIG_KERNEL_LZMA=y
CONFIG_SYSVIPC=y CONFIG_SYSVIPC=y
CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE=y
CONFIG_FHANDLE=y
CONFIG_AUDIT=y CONFIG_AUDIT=y
CONFIG_NO_HZ=y CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y CONFIG_HIGH_RES_TIMERS=y
...@@ -40,7 +39,6 @@ CONFIG_ARCH_MULTI_V6=y ...@@ -40,7 +39,6 @@ CONFIG_ARCH_MULTI_V6=y
CONFIG_POWER_AVS_OMAP=y CONFIG_POWER_AVS_OMAP=y
CONFIG_POWER_AVS_OMAP_CLASS3=y CONFIG_POWER_AVS_OMAP_CLASS3=y
CONFIG_OMAP_RESET_CLOCKS=y CONFIG_OMAP_RESET_CLOCKS=y
CONFIG_OMAP_MUX_DEBUG=y
CONFIG_ARCH_OMAP2=y CONFIG_ARCH_OMAP2=y
CONFIG_ARCH_OMAP3=y CONFIG_ARCH_OMAP3=y
CONFIG_ARCH_OMAP4=y CONFIG_ARCH_OMAP4=y
...@@ -50,7 +48,6 @@ CONFIG_SOC_AM43XX=y ...@@ -50,7 +48,6 @@ CONFIG_SOC_AM43XX=y
CONFIG_SOC_DRA7XX=y CONFIG_SOC_DRA7XX=y
CONFIG_ARM_THUMBEE=y CONFIG_ARM_THUMBEE=y
CONFIG_ARM_ERRATA_411920=y CONFIG_ARM_ERRATA_411920=y
CONFIG_ARM_ERRATA_430973=y
CONFIG_SMP=y CONFIG_SMP=y
CONFIG_NR_CPUS=2 CONFIG_NR_CPUS=2
CONFIG_CMA=y CONFIG_CMA=y
...@@ -62,7 +59,6 @@ CONFIG_ARM_ATAG_DTB_COMPAT=y ...@@ -62,7 +59,6 @@ CONFIG_ARM_ATAG_DTB_COMPAT=y
CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200" CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200"
CONFIG_KEXEC=y CONFIG_KEXEC=y
CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_STAT_DETAILS=y
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
CONFIG_CPU_FREQ_GOV_POWERSAVE=y CONFIG_CPU_FREQ_GOV_POWERSAVE=y
CONFIG_CPU_FREQ_GOV_USERSPACE=y CONFIG_CPU_FREQ_GOV_USERSPACE=y
...@@ -205,6 +201,7 @@ CONFIG_TOUCHSCREEN_ADS7846=m ...@@ -205,6 +201,7 @@ CONFIG_TOUCHSCREEN_ADS7846=m
CONFIG_TOUCHSCREEN_EDT_FT5X06=m CONFIG_TOUCHSCREEN_EDT_FT5X06=m
CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
CONFIG_TOUCHSCREEN_PIXCIR=m CONFIG_TOUCHSCREEN_PIXCIR=m
CONFIG_TOUCHSCREEN_TSC2004=m
CONFIG_TOUCHSCREEN_TSC2005=m CONFIG_TOUCHSCREEN_TSC2005=m
CONFIG_TOUCHSCREEN_TSC2007=m CONFIG_TOUCHSCREEN_TSC2007=m
CONFIG_INPUT_MISC=y CONFIG_INPUT_MISC=y
...@@ -240,14 +237,14 @@ CONFIG_GPIO_PALMAS=y ...@@ -240,14 +237,14 @@ CONFIG_GPIO_PALMAS=y
CONFIG_GPIO_TWL4030=y CONFIG_GPIO_TWL4030=y
CONFIG_W1=m CONFIG_W1=m
CONFIG_HDQ_MASTER_OMAP=m CONFIG_HDQ_MASTER_OMAP=m
CONFIG_POWER_AVS=y
CONFIG_POWER_RESET=y
CONFIG_BATTERY_BQ27XXX=m CONFIG_BATTERY_BQ27XXX=m
CONFIG_CHARGER_ISP1704=m CONFIG_CHARGER_ISP1704=m
CONFIG_CHARGER_TWL4030=m CONFIG_CHARGER_TWL4030=m
CONFIG_CHARGER_BQ2415X=m CONFIG_CHARGER_BQ2415X=m
CONFIG_CHARGER_BQ24190=m CONFIG_CHARGER_BQ24190=m
CONFIG_CHARGER_BQ24735=m CONFIG_CHARGER_BQ24735=m
CONFIG_POWER_RESET=y
CONFIG_POWER_AVS=y
CONFIG_HWMON=m CONFIG_HWMON=m
CONFIG_SENSORS_GPIO_FAN=m CONFIG_SENSORS_GPIO_FAN=m
CONFIG_SENSORS_LM75=m CONFIG_SENSORS_LM75=m
...@@ -267,10 +264,13 @@ CONFIG_TWL4030_WATCHDOG=m ...@@ -267,10 +264,13 @@ CONFIG_TWL4030_WATCHDOG=m
CONFIG_MFD_TI_AM335X_TSCADC=m CONFIG_MFD_TI_AM335X_TSCADC=m
CONFIG_MFD_PALMAS=y CONFIG_MFD_PALMAS=y
CONFIG_MFD_TPS65217=y CONFIG_MFD_TPS65217=y
CONFIG_MFD_TI_LP873X=y
CONFIG_MFD_TPS65218=y CONFIG_MFD_TPS65218=y
CONFIG_MFD_TPS65910=y CONFIG_MFD_TPS65910=y
CONFIG_TWL6040_CORE=y CONFIG_TWL6040_CORE=y
CONFIG_REGULATOR_GPIO=y
CONFIG_REGULATOR_LP872X=y CONFIG_REGULATOR_LP872X=y
CONFIG_REGULATOR_LP873X=y
CONFIG_REGULATOR_PALMAS=y CONFIG_REGULATOR_PALMAS=y
CONFIG_REGULATOR_PBIAS=y CONFIG_REGULATOR_PBIAS=y
CONFIG_REGULATOR_TI_ABB=y CONFIG_REGULATOR_TI_ABB=y
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment