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

Commit 753ac9b1 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 defconfig updates for v4.10
- enable I2C driver
- enable SPI, watchdog and HW random as modules

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

:
  ARM64: configs: Activate Internal PHY for Meson GXL
  ARM64: configs: Add Platform MHU in defconfig
  ARM64: defconfig: Enable MMC related configs

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents e65b8fb7 88c9cb7c

arch/arm64/configs/defconfig

+7 −0
Original line number Diff line number Diff line
@@ -184,7 +184,10 @@ CONFIG_SMC91X=y 
CONFIG_SMSC911X=y

CONFIG_STMMAC_ETH=m

CONFIG_REALTEK_PHY=m

CONFIG_MESON_GXL_PHY=m

CONFIG_MICREL_PHY=y

CONFIG_MDIO_BUS_MUX=y

CONFIG_MDIO_BUS_MUX_MMIOREG=y

CONFIG_USB_PEGASUS=m

CONFIG_USB_RTL8150=m

CONFIG_USB_RTL8152=m
@@ -357,6 +360,7 @@ 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,6 +407,7 @@ CONFIG_XEN_GRANT_DEV_ALLOC=y 
CONFIG_COMMON_CLK_SCPI=y

CONFIG_COMMON_CLK_CS2000_CP=y

CONFIG_COMMON_CLK_S2MPS11=y

CONFIG_COMMON_CLK_PWM=y

CONFIG_CLK_QORIQ=y

CONFIG_COMMON_CLK_QCOM=y

CONFIG_MSM_GCC_8916=y
@@ -411,6 +416,7 @@ CONFIG_MSM_MMCC_8996=y 
CONFIG_HWSPINLOCK_QCOM=y

CONFIG_MAILBOX=y

CONFIG_ARM_MHU=y

CONFIG_PLATFORM_MHU=y

CONFIG_HI6220_MBOX=y

CONFIG_ARM_SMMU=y

CONFIG_QCOM_SMEM=y
@@ -421,6 +427,7 @@ CONFIG_ARCH_TEGRA_210_SOC=y 
CONFIG_EXTCON_USB_GPIO=y

CONFIG_PWM=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