Merge tag 'amlogic-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/khilma...

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: Olof Johansson <olof@lixom.net>

diff --combined arch/arm64/configs/defconfig
index e1bc2fa127787b16148bafdd0cc909e81b03db78,9e5b478d5e95abc0f74824467e4d01f7f737db72..03f32e0538a0ebca1058ac0a02ec9c1b0b506cd3
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -36,7 -36,6 +36,7 @@@ CONFIG_ARCH_ALPINE=
  CONFIG_ARCH_BCM2835=y
  CONFIG_ARCH_BCM_IPROC=y
  CONFIG_ARCH_BERLIN=y
 +CONFIG_ARCH_BRCMSTB=y
  CONFIG_ARCH_EXYNOS=y
  CONFIG_ARCH_LAYERSCAPE=y
  CONFIG_ARCH_LG1K=y
@@@ -57,6 -56,7 +57,6 @@@ CONFIG_ARCH_THUNDER=
  CONFIG_ARCH_THUNDER2=y
  CONFIG_ARCH_UNIPHIER=y
  CONFIG_ARCH_VEXPRESS=y
 -CONFIG_ARCH_VULCAN=y
  CONFIG_ARCH_XGENE=y
  CONFIG_ARCH_ZX=y
  CONFIG_ARCH_ZYNQMP=y
@@@ -257,6 -257,8 +257,8 @@@ CONFIG_I2C_UNIPHIER_F=
  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 +322,11 @@@ CONFIG_MEDIA_CAMERA_SUPPORT=
  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