Merge tag 'renesas-arm64-defconfig-for-v4.13' of https://git.kernel.org/pub/scm/linux...

Renesas ARM64 Based SoC Defconfig Updates for v4.13

* Enable Simple Sound Card support

* tag 'renesas-arm64-defconfig-for-v4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  arm64: defconfig: enable Simple Sound Card support

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --combined arch/arm64/configs/defconfig
index 03f32e0538a0ebca1058ac0a02ec9c1b0b506cd3,1bbac74a0c449e1cc2d423089a616d1b44000a34..ebf794fcd3cdaec121e878a862a94e6744c022d5
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -30,13 -30,13 +30,13 @@@ CONFIG_PROFILING=
  CONFIG_JUMP_LABEL=y
  CONFIG_MODULES=y
  CONFIG_MODULE_UNLOAD=y
 -# CONFIG_BLK_DEV_BSG is not set
  # CONFIG_IOSCHED_DEADLINE is not set
  CONFIG_ARCH_SUNXI=y
  CONFIG_ARCH_ALPINE=y
  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,19 -57,21 +57,19 @@@ 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
  CONFIG_PCI=y
 -CONFIG_PCI_MSI=y
  CONFIG_PCI_IOV=y
 -CONFIG_PCI_AARDVARK=y
 -CONFIG_PCIE_RCAR=y
 -CONFIG_PCI_HOST_GENERIC=y
 -CONFIG_PCI_XGENE=y
  CONFIG_PCI_LAYERSCAPE=y
  CONFIG_PCI_HISI=y
  CONFIG_PCIE_QCOM=y
  CONFIG_PCIE_ARMADA_8K=y
 +CONFIG_PCI_AARDVARK=y
 +CONFIG_PCIE_RCAR=y
 +CONFIG_PCI_HOST_GENERIC=y
 +CONFIG_PCI_XGENE=y
  CONFIG_ARM64_VA_BITS_48=y
  CONFIG_SCHED_MC=y
  CONFIG_NUMA=y
@@@ -78,11 -80,12 +78,11 @@@ CONFIG_KSM=
  CONFIG_TRANSPARENT_HUGEPAGE=y
  CONFIG_CMA=y
  CONFIG_SECCOMP=y
 -CONFIG_XEN=y
  CONFIG_KEXEC=y
  CONFIG_CRASH_DUMP=y
 +CONFIG_XEN=y
  # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
  CONFIG_COMPAT=y
 -CONFIG_CPU_IDLE=y
  CONFIG_HIBERNATION=y
  CONFIG_ARM_CPUIDLE=y
  CONFIG_CPU_FREQ=y
@@@ -152,8 -155,8 +152,8 @@@ CONFIG_MTD_SPI_NOR=
  CONFIG_BLK_DEV_LOOP=y
  CONFIG_BLK_DEV_NBD=m
  CONFIG_VIRTIO_BLK=y
 -CONFIG_EEPROM_AT25=m
  CONFIG_SRAM=y
 +CONFIG_EEPROM_AT25=m
  # CONFIG_SCSI_PROC_FS is not set
  CONFIG_BLK_DEV_SD=y
  CONFIG_SCSI_SAS_ATA=y
@@@ -165,8 -168,8 +165,8 @@@ CONFIG_AHCI_CEVA=
  CONFIG_AHCI_MVEBU=y
  CONFIG_AHCI_XGENE=y
  CONFIG_AHCI_QORIQ=y
 -CONFIG_SATA_RCAR=y
  CONFIG_SATA_SIL24=y
 +CONFIG_SATA_RCAR=y
  CONFIG_PATA_PLATFORM=y
  CONFIG_PATA_OF_PLATFORM=y
  CONFIG_NETDEVICES=y
@@@ -183,17 -186,18 +183,17 @@@ CONFIG_HNS_ENET=
  CONFIG_E1000E=y
  CONFIG_IGB=y
  CONFIG_IGBVF=y
 -CONFIG_MVPP2=y
  CONFIG_MVNETA=y
 +CONFIG_MVPP2=y
  CONFIG_SKY2=y
  CONFIG_RAVB=y
  CONFIG_SMC91X=y
  CONFIG_SMSC911X=y
  CONFIG_STMMAC_ETH=m
 -CONFIG_REALTEK_PHY=m
 +CONFIG_MDIO_BUS_MUX_MMIOREG=y
  CONFIG_MESON_GXL_PHY=m
  CONFIG_MICREL_PHY=y
 -CONFIG_MDIO_BUS_MUX=y
 -CONFIG_MDIO_BUS_MUX_MMIOREG=y
 +CONFIG_REALTEK_PHY=m
  CONFIG_USB_PEGASUS=m
  CONFIG_USB_RTL8150=m
  CONFIG_USB_RTL8152=m
@@@ -226,14 -230,14 +226,14 @@@ CONFIG_SERIAL_8250_UNIPHIER=
  CONFIG_SERIAL_OF_PLATFORM=y
  CONFIG_SERIAL_AMBA_PL011=y
  CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 +CONFIG_SERIAL_MESON=y
 +CONFIG_SERIAL_MESON_CONSOLE=y
  CONFIG_SERIAL_SAMSUNG=y
  CONFIG_SERIAL_SAMSUNG_CONSOLE=y
  CONFIG_SERIAL_TEGRA=y
  CONFIG_SERIAL_SH_SCI=y
  CONFIG_SERIAL_SH_SCI_NR_UARTS=11
  CONFIG_SERIAL_SH_SCI_CONSOLE=y
 -CONFIG_SERIAL_MESON=y
 -CONFIG_SERIAL_MESON_CONSOLE=y
  CONFIG_SERIAL_MSM=y
  CONFIG_SERIAL_MSM_CONSOLE=y
  CONFIG_SERIAL_XILINX_PS_UART=y
@@@ -257,16 -261,14 +257,16 @@@ 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
  CONFIG_SPI_ORION=y
  CONFIG_SPI_PL022=y
  CONFIG_SPI_QUP=y
 -CONFIG_SPI_SPIDEV=m
  CONFIG_SPI_S3C64XX=y
 +CONFIG_SPI_SPIDEV=m
  CONFIG_SPMI=y
  CONFIG_PINCTRL_SINGLE=y
  CONFIG_PINCTRL_MAX77620=y
@@@ -284,30 -286,33 +284,30 @@@ CONFIG_GPIO_PCA953X=
  CONFIG_GPIO_PCA953X_IRQ=y
  CONFIG_GPIO_MAX77620=y
  CONFIG_POWER_RESET_MSM=y
 -CONFIG_BATTERY_BQ27XXX=y
  CONFIG_POWER_RESET_XGENE=y
  CONFIG_POWER_RESET_SYSCON=y
 +CONFIG_BATTERY_BQ27XXX=y
 +CONFIG_SENSORS_ARM_SCPI=y
  CONFIG_SENSORS_LM90=m
  CONFIG_SENSORS_INA2XX=m
 -CONFIG_SENSORS_ARM_SCPI=y
 -CONFIG_THERMAL=y
 -CONFIG_THERMAL_EMULATION=y
  CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
  CONFIG_CPU_THERMAL=y
 -CONFIG_BCM2835_THERMAL=y
 +CONFIG_THERMAL_EMULATION=y
  CONFIG_EXYNOS_THERMAL=y
  CONFIG_WATCHDOG=y
 -CONFIG_BCM2835_WDT=y
 -CONFIG_RENESAS_WDT=y
  CONFIG_S3C2410_WATCHDOG=y
  CONFIG_MESON_GXBB_WATCHDOG=m
  CONFIG_MESON_WATCHDOG=m
 +CONFIG_RENESAS_WDT=y
 +CONFIG_BCM2835_WDT=y
 +CONFIG_MFD_CROS_EC=y
 +CONFIG_MFD_CROS_EC_I2C=y
  CONFIG_MFD_EXYNOS_LPASS=m
 +CONFIG_MFD_HI655X_PMIC=y
  CONFIG_MFD_MAX77620=y
 -CONFIG_MFD_RK808=y
  CONFIG_MFD_SPMI_PMIC=y
 +CONFIG_MFD_RK808=y
  CONFIG_MFD_SEC_CORE=y
 -CONFIG_MFD_HI655X_PMIC=y
 -CONFIG_REGULATOR=y
 -CONFIG_MFD_CROS_EC=y
 -CONFIG_MFD_CROS_EC_I2C=y
  CONFIG_REGULATOR_FIXED_VOLTAGE=y
  CONFIG_REGULATOR_GPIO=y
  CONFIG_REGULATOR_HI655X=y
@@@ -322,11 -327,6 +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
@@@ -345,12 -345,13 +345,12 @@@ CONFIG_DRM_EXYNOS_DSI=
  CONFIG_DRM_EXYNOS_HDMI=y
  CONFIG_DRM_EXYNOS_MIC=y
  CONFIG_DRM_RCAR_DU=m
 -CONFIG_DRM_RCAR_HDMI=y
  CONFIG_DRM_RCAR_LVDS=y
  CONFIG_DRM_RCAR_VSP=y
  CONFIG_DRM_TEGRA=m
 -CONFIG_DRM_VC4=m
  CONFIG_DRM_PANEL_SIMPLE=m
  CONFIG_DRM_I2C_ADV7511=m
 +CONFIG_DRM_VC4=m
  CONFIG_DRM_HISI_KIRIN=m
  CONFIG_DRM_MESON=m
  CONFIG_FB=y
@@@ -365,37 -366,40 +365,38 @@@ CONFIG_SOUND=
  CONFIG_SND=y
  CONFIG_SND_SOC=y
  CONFIG_SND_BCM2835_SOC_I2S=m
 -CONFIG_SND_SOC_RCAR=y
  CONFIG_SND_SOC_SAMSUNG=y
 +CONFIG_SND_SOC_RCAR=y
  CONFIG_SND_SOC_AK4613=y
+ CONFIG_SND_SIMPLE_CARD=y
  CONFIG_USB=y
  CONFIG_USB_OTG=y
  CONFIG_USB_XHCI_HCD=y
 -CONFIG_USB_XHCI_PLATFORM=y
 -CONFIG_USB_XHCI_RCAR=y
 -CONFIG_USB_EHCI_EXYNOS=y
  CONFIG_USB_XHCI_TEGRA=y
  CONFIG_USB_EHCI_HCD=y
  CONFIG_USB_EHCI_MSM=y
 +CONFIG_USB_EHCI_EXYNOS=y
  CONFIG_USB_EHCI_HCD_PLATFORM=y
 -CONFIG_USB_OHCI_EXYNOS=y
  CONFIG_USB_OHCI_HCD=y
 +CONFIG_USB_OHCI_EXYNOS=y
  CONFIG_USB_OHCI_HCD_PLATFORM=y
  CONFIG_USB_RENESAS_USBHS=m
  CONFIG_USB_STORAGE=y
 -CONFIG_USB_DWC2=y
  CONFIG_USB_DWC3=y
 +CONFIG_USB_DWC2=y
  CONFIG_USB_CHIPIDEA=y
  CONFIG_USB_CHIPIDEA_UDC=y
  CONFIG_USB_CHIPIDEA_HOST=y
  CONFIG_USB_ISP1760=y
  CONFIG_USB_HSIC_USB3503=y
  CONFIG_USB_MSM_OTG=y
 +CONFIG_USB_QCOM_8X16_PHY=y
  CONFIG_USB_ULPI=y
  CONFIG_USB_GADGET=y
  CONFIG_USB_RENESAS_USBHS_UDC=m
  CONFIG_MMC=y
  CONFIG_MMC_BLOCK_MINORS=32
  CONFIG_MMC_ARMMMCI=y
 -CONFIG_MMC_MESON_GX=y
  CONFIG_MMC_SDHCI=y
  CONFIG_MMC_SDHCI_ACPI=y
  CONFIG_MMC_SDHCI_PLTFM=y
@@@ -403,7 -407,6 +404,7 @@@ CONFIG_MMC_SDHCI_OF_ARASAN=
  CONFIG_MMC_SDHCI_OF_ESDHC=y
  CONFIG_MMC_SDHCI_CADENCE=y
  CONFIG_MMC_SDHCI_TEGRA=y
 +CONFIG_MMC_MESON_GX=y
  CONFIG_MMC_SDHCI_MSM=y
  CONFIG_MMC_SPI=y
  CONFIG_MMC_SDHI=y
@@@ -412,31 -415,32 +413,31 @@@ CONFIG_MMC_DW_EXYNOS=
  CONFIG_MMC_DW_K3=y
  CONFIG_MMC_DW_ROCKCHIP=y
  CONFIG_MMC_SUNXI=y
 -CONFIG_MMC_SDHCI_XENON=y
  CONFIG_MMC_BCM2835=y
 +CONFIG_MMC_SDHCI_XENON=y
  CONFIG_NEW_LEDS=y
  CONFIG_LEDS_CLASS=y
  CONFIG_LEDS_GPIO=y
  CONFIG_LEDS_PWM=y
  CONFIG_LEDS_SYSCON=y
 -CONFIG_LEDS_TRIGGERS=y
 -CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
  CONFIG_LEDS_TRIGGER_HEARTBEAT=y
  CONFIG_LEDS_TRIGGER_CPU=y
 +CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
  CONFIG_RTC_CLASS=y
  CONFIG_RTC_DRV_MAX77686=y
 +CONFIG_RTC_DRV_RK808=m
  CONFIG_RTC_DRV_S5M=y
  CONFIG_RTC_DRV_DS3232=y
  CONFIG_RTC_DRV_EFI=y
 +CONFIG_RTC_DRV_S3C=y
  CONFIG_RTC_DRV_PL031=y
  CONFIG_RTC_DRV_SUN6I=y
 -CONFIG_RTC_DRV_RK808=m
  CONFIG_RTC_DRV_TEGRA=y
  CONFIG_RTC_DRV_XGENE=y
 -CONFIG_RTC_DRV_S3C=y
  CONFIG_DMADEVICES=y
 +CONFIG_DMA_BCM2835=m
  CONFIG_MV_XOR_V2=y
  CONFIG_PL330_DMA=y
 -CONFIG_DMA_BCM2835=m
  CONFIG_TEGRA20_APB_DMA=y
  CONFIG_QCOM_BAM_DMA=y
  CONFIG_QCOM_HIDMA_MGMT=y
@@@ -449,53 -453,52 +450,53 @@@ CONFIG_VIRTIO_BALLOON=
  CONFIG_VIRTIO_MMIO=y
  CONFIG_XEN_GNTDEV=y
  CONFIG_XEN_GRANT_DEV_ALLOC=y
 +CONFIG_COMMON_CLK_RK808=y
  CONFIG_COMMON_CLK_SCPI=y
  CONFIG_COMMON_CLK_CS2000_CP=y
  CONFIG_COMMON_CLK_S2MPS11=y
 -CONFIG_COMMON_CLK_PWM=y
 -CONFIG_COMMON_CLK_RK808=y
  CONFIG_CLK_QORIQ=y
 +CONFIG_COMMON_CLK_PWM=y
  CONFIG_COMMON_CLK_QCOM=y
 +CONFIG_QCOM_CLK_SMD_RPM=y
  CONFIG_MSM_GCC_8916=y
  CONFIG_MSM_GCC_8994=y
  CONFIG_MSM_MMCC_8996=y
  CONFIG_HWSPINLOCK_QCOM=y
 -CONFIG_MAILBOX=y
  CONFIG_ARM_MHU=y
  CONFIG_PLATFORM_MHU=y
  CONFIG_BCM2835_MBOX=y
  CONFIG_HI6220_MBOX=y
  CONFIG_ARM_SMMU=y
  CONFIG_ARM_SMMU_V3=y
 +CONFIG_RPMSG_QCOM_SMD=y
  CONFIG_RASPBERRYPI_POWER=y
  CONFIG_QCOM_SMEM=y
 -CONFIG_QCOM_SMD=y
  CONFIG_QCOM_SMD_RPM=y
 +CONFIG_QCOM_SMP2P=y
 +CONFIG_QCOM_SMSM=y
  CONFIG_ROCKCHIP_PM_DOMAINS=y
  CONFIG_ARCH_TEGRA_132_SOC=y
  CONFIG_ARCH_TEGRA_210_SOC=y
  CONFIG_ARCH_TEGRA_186_SOC=y
  CONFIG_EXTCON_USB_GPIO=y
 +CONFIG_IIO=y
 +CONFIG_EXYNOS_ADC=y
  CONFIG_PWM=y
  CONFIG_PWM_BCM2835=m
 +CONFIG_PWM_MESON=m
  CONFIG_PWM_ROCKCHIP=y
 +CONFIG_PWM_SAMSUNG=y
  CONFIG_PWM_TEGRA=m
 -CONFIG_PWM_MESON=m
 -CONFIG_COMMON_RESET_HI6220=y
  CONFIG_PHY_RCAR_GEN3_USB2=y
  CONFIG_PHY_HI6220_USB=y
 +CONFIG_PHY_SUN4I_USB=y
  CONFIG_PHY_ROCKCHIP_INNO_USB2=y
  CONFIG_PHY_ROCKCHIP_EMMC=y
 -CONFIG_PHY_SUN4I_USB=y
  CONFIG_PHY_XGENE=y
  CONFIG_PHY_TEGRA_XUSB=y
  CONFIG_ARM_SCPI_PROTOCOL=y
 -CONFIG_ACPI=y
 -CONFIG_IIO=y
 -CONFIG_EXYNOS_ADC=y
 -CONFIG_PWM_SAMSUNG=y
  CONFIG_RASPBERRYPI_FIRMWARE=y
 +CONFIG_ACPI=y
  CONFIG_EXT2_FS=y
  CONFIG_EXT3_FS=y
  CONFIG_EXT4_FS_POSIX_ACL=y
@@@ -509,6 -512,7 +510,6 @@@ CONFIG_FUSE_FS=
  CONFIG_CUSE=m
  CONFIG_OVERLAY_FS=m
  CONFIG_VFAT_FS=y
 -CONFIG_TMPFS=y
  CONFIG_HUGETLBFS=y
  CONFIG_CONFIGFS_FS=y
  CONFIG_EFIVAR_FS=y
@@@ -536,9 -540,11 +537,9 @@@ CONFIG_MEMTEST=
  CONFIG_SECURITY=y
  CONFIG_CRYPTO_ECHAINIV=y
  CONFIG_CRYPTO_ANSI_CPRNG=y
 -CONFIG_CRYPTO_DEV_SAFEXCEL=m
  CONFIG_ARM64_CRYPTO=y
  CONFIG_CRYPTO_SHA1_ARM64_CE=y
  CONFIG_CRYPTO_SHA2_ARM64_CE=y
  CONFIG_CRYPTO_GHASH_ARM64_CE=y
  CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
  CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
 -# CONFIG_CRYPTO_AES_ARM64_NEON_BLK is not set