diff options
| author | Olof Johansson <olof@lixom.net> | 2016-11-08 12:24:01 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-11-08 12:24:01 -0800 |
| commit | 93711a2ba564acb4849fedd3fa0a19d0f197fea3 (patch) | |
| tree | 8678b4915fcd3be46ce5842304aba5ef56b37cf8 /arch/arm/configs | |
| parent | 883bb0c3b69c1d32e0a819b4972c1565aeafcdb0 (diff) | |
| parent | 6e9be8608771192851a3adf59f0ba9240e3f802c (diff) | |
Merge tag 'davinci-for-v4.10/defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/defconfig
Some updates to davinci_all_defconfig for MMC,
LCDC and GPIO/LEDs.
* tag 'davinci-for-v4.10/defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: davinci_all_defconfig: enable LED default-on trigger
ARM: davinci_all_defconfig: build MMC into kernel
ARM: davinci_all_defconfig: enable gpio poweroff driver
ARM: davinci_all_defconfig: enable LCDC DRM driver
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/davinci_all_defconfig | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig index 5e5dd6bc5ed9..b5e978ff177f 100644 --- a/arch/arm/configs/davinci_all_defconfig +++ b/arch/arm/configs/davinci_all_defconfig @@ -116,6 +116,8 @@ CONFIG_SPI_DAVINCI=m CONFIG_PINCTRL_SINGLE=y CONFIG_GPIO_SYSFS=y CONFIG_GPIO_PCA953X=y +CONFIG_POWER_RESET=y +CONFIG_POWER_RESET_GPIO=y CONFIG_WATCHDOG=y CONFIG_DAVINCI_WATCHDOG=m CONFIG_MFD_DM355EVM_MSP=y @@ -123,6 +125,8 @@ CONFIG_TPS6507X=y CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_TPS6507X=y +CONFIG_DRM=m +CONFIG_DRM_TILCDC=m CONFIG_FB=y CONFIG_FIRMWARE_EDID=y CONFIG_FB_DA8XX=y @@ -167,15 +171,16 @@ CONFIG_USB_MASS_STORAGE=m CONFIG_USB_G_SERIAL=m CONFIG_USB_G_PRINTER=m CONFIG_USB_CDC_COMPOSITE=m -CONFIG_MMC=m +CONFIG_MMC=y # CONFIG_MMC_BLOCK_BOUNCE is not set -CONFIG_MMC_DAVINCI=m +CONFIG_MMC_DAVINCI=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=m CONFIG_LEDS_GPIO=m CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_HEARTBEAT=m +CONFIG_LEDS_TRIGGER_DEFAULT_ON=m CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_OMAP=m CONFIG_DMADEVICES=y |