Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77b0611f authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'amlogic-defconfig' of... 

Merge tag 'amlogic-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/arm64

Amlogic arm64 defconfig changes for v4.13
- enable meson SPICC as module
- enable IR core, decoders and Meson IR device

* tag 'amlogic-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic

:
  ARM64: defconfig: enable meson SPICC as module
  ARM64: defconfig: enable IR core, decoders and Meson IR device

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents a91ca5e3 b4cb6f0a

arch/arm64/configs/defconfig

+7 −0
Original line number Diff line number Diff line
@@ -257,6 +257,8 @@ CONFIG_I2C_UNIPHIER_F=y 
CONFIG_I2C_RCAR=y

CONFIG_I2C_CROS_EC_TUNNEL=y

CONFIG_SPI=y

CONFIG_SPI_MESON_SPICC=m

CONFIG_SPI_MESON_SPIFC=m

CONFIG_SPI_BCM2835=m

CONFIG_SPI_BCM2835AUX=m

CONFIG_SPI_MESON_SPIFC=m
@@ -320,6 +322,11 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y 
CONFIG_MEDIA_ANALOG_TV_SUPPORT=y

CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y

CONFIG_MEDIA_CONTROLLER=y

CONFIG_MEDIA_RC_SUPPORT=y

CONFIG_RC_CORE=m

CONFIG_RC_DEVICES=y

CONFIG_RC_DECODERS=y

CONFIG_IR_MESON=m

CONFIG_VIDEO_V4L2_SUBDEV_API=y

# CONFIG_DVB_NET is not set

CONFIG_V4L_MEM2MEM_DRIVERS=y