Commit 2e50f794 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v4.10-rockchip-defconfig64' of... 

Merge tag 'v4.10-rockchip-defconfig64' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/arm64

Pull "Rockchip defconfig64 changes for 4.10" from Heiko Stübner:

64bit defconfig changes to allow arm64 Rockchip socs
to basically boot.

* tag 'v4.10-rockchip-defconfig64' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: defconfig: allow rk3399-based boards to boot from mmc and usb
  arm64: defconfig: enable RK808 components
  arm64: defconfig: enable I2C and DW MMC controller on rockchip platform
parents a8b76d99 92d22d77

arch/arm64/configs/defconfig

+11 −0
Original line number Diff line number Diff line
@@ -244,6 +244,7 @@ CONFIG_I2C_IMX=y 
CONFIG_I2C_MESON=y

CONFIG_I2C_MV64XXX=y

CONFIG_I2C_QUP=y

CONFIG_I2C_RK3X=y

CONFIG_I2C_TEGRA=y

CONFIG_I2C_UNIPHIER_F=y

CONFIG_I2C_RCAR=y
@@ -292,6 +293,7 @@ CONFIG_S3C2410_WATCHDOG=y 
CONFIG_MESON_GXBB_WATCHDOG=m

CONFIG_MESON_WATCHDOG=m

CONFIG_MFD_MAX77620=y

CONFIG_MFD_RK808=y

CONFIG_MFD_SPMI_PMIC=y

CONFIG_MFD_SEC_CORE=y

CONFIG_MFD_HI655X_PMIC=y
@@ -305,6 +307,7 @@ CONFIG_REGULATOR_MAX77620=y 
CONFIG_REGULATOR_PWM=y

CONFIG_REGULATOR_QCOM_SMD_RPM=y

CONFIG_REGULATOR_QCOM_SPMI=y

CONFIG_REGULATOR_RK808=y

CONFIG_REGULATOR_S2MPS11=y

CONFIG_MEDIA_SUPPORT=m

CONFIG_MEDIA_CAMERA_SUPPORT=y
@@ -375,6 +378,7 @@ CONFIG_MMC_MESON_GX=y 
CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_ACPI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_OF_ARASAN=y

CONFIG_MMC_SDHCI_OF_ESDHC=y

CONFIG_MMC_SDHCI_TEGRA=y

CONFIG_MMC_SDHCI_MSM=y
@@ -383,6 +387,7 @@ CONFIG_MMC_SDHI=y 
CONFIG_MMC_DW=y

CONFIG_MMC_DW_EXYNOS=y

CONFIG_MMC_DW_K3=y

CONFIG_MMC_DW_ROCKCHIP=y

CONFIG_MMC_SUNXI=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y
@@ -398,6 +403,7 @@ CONFIG_RTC_DRV_DS3232=y 
CONFIG_RTC_DRV_EFI=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
@@ -420,6 +426,7 @@ 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_QCOM=y

CONFIG_MSM_GCC_8916=y
@@ -436,17 +443,21 @@ CONFIG_RASPBERRYPI_POWER=y 
CONFIG_QCOM_SMEM=y

CONFIG_QCOM_SMD=y

CONFIG_QCOM_SMD_RPM=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_PWM=y

CONFIG_PWM_BCM2835=m

CONFIG_PWM_ROCKCHIP=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_ROCKCHIP_INNO_USB2=y

CONFIG_PHY_ROCKCHIP_EMMC=y

CONFIG_PHY_XGENE=y

CONFIG_PHY_TEGRA_XUSB=y

CONFIG_ARM_SCPI_PROTOCOL=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE