Commit ae4dbf8c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-defconfig-5.1' of... 

Merge tag 'imx-defconfig-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/defconfig

i.MX defconfig updates for 5.1:
 - Enable a number of i.MX SoC and driver options in arm64 defconfig.
   The built-in drivers include: clock, pinctrl, power domain, serial,
   MBox, SCU, Ethernet, MMC, regulator and watchdog, which are mostly
   essential for building an useful kernel image for i.MX8 platform,
   booting with rootfs on NFS or eMMC.

* tag 'imx-defconfig-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux

:
  arm64: defconfig: Add IMX2+ watchdog
  arm64: defconfig: Enable PFUZE100 regulator
  arm64: defconfig: enable NXP FlexSPI driver
  arm64: defconfig: Add i.MX8MQ boot necessary configs
  arm64: defconfig: add imx8qxp support
  arm64: defconfig: add i.MX system controller RTC support

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 0e58c23b 90a50f9f

arch/arm64/configs/defconfig

+19 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ CONFIG_ARCH_HISI=y 
CONFIG_ARCH_MEDIATEK=y

CONFIG_ARCH_MESON=y

CONFIG_ARCH_MVEBU=y

CONFIG_ARCH_MXC=y

CONFIG_ARCH_QCOM=y

CONFIG_ARCH_RENESAS=y

CONFIG_ARCH_R8A774A1=y
@@ -113,6 +114,8 @@ CONFIG_ARM_SCPI_PROTOCOL=y 
CONFIG_RASPBERRYPI_FIRMWARE=y

CONFIG_TI_SCI_PROTOCOL=y

CONFIG_EFI_CAPSULE_LOADER=y

CONFIG_IMX_SCU=y

CONFIG_IMX_SCU_PD=y

CONFIG_ACPI=y

CONFIG_ACPI_APEI=y

CONFIG_ACPI_APEI_GHES=y
@@ -245,6 +248,7 @@ CONFIG_NET_XGENE=y 
CONFIG_ATL1C=m

CONFIG_MACB=y

CONFIG_THUNDER_NIC_PF=y

CONFIG_FEC=y

CONFIG_HIX5HD2_GMAC=y

CONFIG_HNS_DSAF=y

CONFIG_HNS_ENET=y
@@ -319,6 +323,8 @@ CONFIG_SERIAL_MESON_CONSOLE=y 
CONFIG_SERIAL_SAMSUNG=y

CONFIG_SERIAL_SAMSUNG_CONSOLE=y

CONFIG_SERIAL_TEGRA=y

CONFIG_SERIAL_IMX=y

CONFIG_SERIAL_IMX_CONSOLE=y

CONFIG_SERIAL_SH_SCI=y

CONFIG_SERIAL_MSM=y

CONFIG_SERIAL_MSM_CONSOLE=y
@@ -326,6 +332,8 @@ CONFIG_SERIAL_QCOM_GENI=y 
CONFIG_SERIAL_QCOM_GENI_CONSOLE=y

CONFIG_SERIAL_XILINX_PS_UART=y

CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y

CONFIG_SERIAL_FSL_LPUART=y

CONFIG_SERIAL_FSL_LPUART_CONSOLE=y

CONFIG_SERIAL_MVEBU_UART=y

CONFIG_SERIAL_DEV_BUS=y

CONFIG_VIRTIO_CONSOLE=y
@@ -362,9 +370,12 @@ CONFIG_SPI_ROCKCHIP=y 
CONFIG_SPI_QUP=y

CONFIG_SPI_S3C64XX=y

CONFIG_SPI_SPIDEV=m

CONFIG_SPI_NXP_FLEXSPI=y

CONFIG_SPMI=y

CONFIG_PINCTRL_SINGLE=y

CONFIG_PINCTRL_MAX77620=y

CONFIG_PINCTRL_IMX8MQ=y

CONFIG_PINCTRL_IMX8QXP=y

CONFIG_PINCTRL_IPQ8074=y

CONFIG_PINCTRL_MSM8916=y

CONFIG_PINCTRL_MSM8994=y
@@ -412,6 +423,7 @@ CONFIG_UNIPHIER_THERMAL=y 
CONFIG_WATCHDOG=y

CONFIG_ARM_SP805_WATCHDOG=y

CONFIG_S3C2410_WATCHDOG=y

CONFIG_IMX2_WDT=y

CONFIG_MESON_GXBB_WATCHDOG=m

CONFIG_MESON_WATCHDOG=m

CONFIG_RENESAS_WDT=y
@@ -437,6 +449,7 @@ CONFIG_REGULATOR_GPIO=y 
CONFIG_REGULATOR_HI6421V530=y

CONFIG_REGULATOR_HI655X=y

CONFIG_REGULATOR_MAX77620=y

CONFIG_REGULATOR_PFUZE100=y

CONFIG_REGULATOR_PWM=y

CONFIG_REGULATOR_QCOM_RPMH=y

CONFIG_REGULATOR_QCOM_SMD_RPM=y
@@ -554,6 +567,7 @@ CONFIG_MMC_SDHCI_PLTFM=y 
CONFIG_MMC_SDHCI_OF_ARASAN=y

CONFIG_MMC_SDHCI_OF_ESDHC=y

CONFIG_MMC_SDHCI_CADENCE=y

CONFIG_MMC_SDHCI_ESDHC_IMX=y

CONFIG_MMC_SDHCI_TEGRA=y

CONFIG_MMC_SDHCI_F_SDH30=y

CONFIG_MMC_MESON_GX=y
@@ -593,6 +607,7 @@ CONFIG_RTC_DRV_PL031=y 
CONFIG_RTC_DRV_SUN6I=y

CONFIG_RTC_DRV_ARMADA38X=y

CONFIG_RTC_DRV_TEGRA=y

CONFIG_RTC_DRV_IMX_SC=m

CONFIG_RTC_DRV_XGENE=y

CONFIG_DMADEVICES=y

CONFIG_DMA_BCM2835=m
@@ -620,6 +635,8 @@ CONFIG_COMMON_CLK_CS2000_CP=y 
CONFIG_COMMON_CLK_S2MPS11=y

CONFIG_CLK_QORIQ=y

CONFIG_COMMON_CLK_PWM=y

CONFIG_CLK_IMX8MQ=y

CONFIG_CLK_IMX8QXP=y

CONFIG_TI_SCI_CLK=y

CONFIG_COMMON_CLK_QCOM=y

CONFIG_QCOM_CLK_SMD_RPM=y
@@ -634,6 +651,7 @@ CONFIG_SDM_GCC_845=y 
CONFIG_HWSPINLOCK=y

CONFIG_HWSPINLOCK_QCOM=y

CONFIG_ARM_MHU=y

CONFIG_IMX_MBOX=y

CONFIG_PLATFORM_MHU=y

CONFIG_BCM2835_MBOX=y

CONFIG_TI_MESSAGE_MANAGER=y
@@ -651,6 +669,7 @@ CONFIG_RPMSG_QCOM_GLINK_RPM=y 
CONFIG_RPMSG_QCOM_GLINK_SMEM=m

CONFIG_RPMSG_QCOM_SMD=y

CONFIG_RASPBERRYPI_POWER=y

CONFIG_IMX_GPCV2_PM_DOMAINS=y

CONFIG_QCOM_COMMAND_DB=y

CONFIG_QCOM_GENI_SE=y

CONFIG_QCOM_GLINK_SSR=m

CRA Git | Maintained and supported by SUSTech CRA and CCSE