Commit 7012d8c4 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'davinci-for-v4.12/defconfig' of...

Merge tag 'davinci-for-v4.12/defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/defconfig

Pull "DaVinci defconfig updates for v4.12" from Sekhar Nori:

DaVinci defconfig updates for enabling
Video capture and display on DA850 and
an ADC driver thats used by Lego EV3.

* tag 'davinci-for-v4.12/defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci_all_defconfig: Enable TI ADS7950
  ARM: davinci_all_defconfig: enable IRQ support for pca953x
  ARM: davinci_all_defconfig: enable VPIF display modules
parents 5758d31a 507c318d
...@@ -121,6 +121,7 @@ CONFIG_PINCTRL_DA850_PUPD=m ...@@ -121,6 +121,7 @@ CONFIG_PINCTRL_DA850_PUPD=m
CONFIG_PINCTRL_SINGLE=y CONFIG_PINCTRL_SINGLE=y
CONFIG_GPIO_SYSFS=y CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_PCA953X=y CONFIG_GPIO_PCA953X=y
CONFIG_GPIO_PCA953X_IRQ=y
CONFIG_POWER_RESET=y CONFIG_POWER_RESET=y
CONFIG_POWER_RESET_GPIO=y CONFIG_POWER_RESET_GPIO=y
CONFIG_WATCHDOG=y CONFIG_WATCHDOG=y
...@@ -133,9 +134,11 @@ CONFIG_REGULATOR_TPS6507X=y ...@@ -133,9 +134,11 @@ CONFIG_REGULATOR_TPS6507X=y
CONFIG_MEDIA_SUPPORT=m CONFIG_MEDIA_SUPPORT=m
CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_VIDEO_DAVINCI_VPIF_DISPLAY=m
CONFIG_VIDEO_DAVINCI_VPIF_CAPTURE=m CONFIG_VIDEO_DAVINCI_VPIF_CAPTURE=m
# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
CONFIG_VIDEO_TVP514X=m CONFIG_VIDEO_TVP514X=m
CONFIG_VIDEO_ADV7343=m
CONFIG_DRM=m CONFIG_DRM=m
CONFIG_DRM_TILCDC=m CONFIG_DRM_TILCDC=m
CONFIG_DRM_DUMB_VGA_DAC=m CONFIG_DRM_DUMB_VGA_DAC=m
...@@ -204,12 +207,10 @@ CONFIG_MEMORY=y ...@@ -204,12 +207,10 @@ CONFIG_MEMORY=y
CONFIG_TI_AEMIF=m CONFIG_TI_AEMIF=m
CONFIG_DA8XX_DDRCTL=y CONFIG_DA8XX_DDRCTL=y
CONFIG_IIO=m CONFIG_IIO=m
CONFIG_IIO_BUFFER=y
CONFIG_IIO_BUFFER_CB=m CONFIG_IIO_BUFFER_CB=m
CONFIG_IIO_KFIFO_BUF=m
CONFIG_IIO_TRIGGER=y
CONFIG_IIO_SW_DEVICE=m CONFIG_IIO_SW_DEVICE=m
CONFIG_IIO_SW_TRIGGER=m CONFIG_IIO_SW_TRIGGER=m
CONFIG_TI_ADS7950=m
CONFIG_IIO_HRTIMER_TRIGGER=m CONFIG_IIO_HRTIMER_TRIGGER=m
CONFIG_IIO_SYSFS_TRIGGER=m CONFIG_IIO_SYSFS_TRIGGER=m
CONFIG_PWM=y CONFIG_PWM=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