From: Arnd Bergmann Date: Wed, 25 Mar 2020 16:19:04 +0000 (+0100) Subject: Merge tag 'imx-defconfig-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/shawng... X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9441e1f8fd5c3bbda4dc1e9610c670a9c741c90a;p=people%2Fms%2Flinux.git Merge tag 'imx-defconfig-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/config i.MX defconfig changes for 5.7: - A seris from Li Yang to make defconfig useful for NXP LS family SoCs. Most drivers are built as module there, but those helping boot system with NFS are enabled built-in. - Enable i.MX8MP pinctrl and i.MX8MM thermal driver support in defconfig. - Enable i.MX DRM driver support for multi_v7_defconfig. - Enable ATMEL_MXT and AD7879 touch support for imx_v6_v7_defconfig. * tag 'imx-defconfig-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (22 commits) arm64: defconfig: Enable e1000 device arm64: defconfig: Enable PHY devices used on QorIQ boards arm64: defconfig: Enable RTC devices for QorIQ boards arm64: defconfig: Enable flash device drivers for QorIQ boards arm64: defconfig: Enable ARM Mali display driver arm64: defconfig: Enable QorIQ GPIO driver arm64: defconfig: Enable QorIQ IFC NAND controller driver arm64: defconfig: Enable ARM SBSA watchdog driver arm64: defconfig: Enable QorIQ cpufreq driver arm64: defconfig: Enable NXP/FSL SPI controller drivers arm64: defconfig: Enable ENETC Ethernet controller and FELIX switch arm64: defconfig: Enable QorIQ DPAA2 drivers arm64: defconfig: Enable QorIQ DPAA1 drivers arm64: defconfig: Enable NXP flexcan driver arm64: defconfig: run through savedefconfig for ordering arm64: defconfig: Enable CONFIG_IMX8MM_THERMAL as module arm64: defconfig: add i.MX system controller thermal support ARM: multi_v7_defconfig: enable drm imx support arm64: defconfig: Enable CONFIG_PCIE_LAYERSCAPE_GEN4 ARM: imx_v6_v7_defconfig: Enable TOUCHSCREEN_AD7879 ... Link: https://lore.kernel.org/r/20200318051918.32579-6-shawnguo@kernel.org Signed-off-by: Arnd Bergmann --- 9441e1f8fd5c3bbda4dc1e9610c670a9c741c90a diff --cc arch/arm64/configs/defconfig index 1d44f8f32d72,0c110182497a..be19c4e4f2f3 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@@ -162,8 -164,7 +164,9 @@@ CONFIG_QRTR_SMD= CONFIG_QRTR_TUN=m CONFIG_BPF_JIT=y CONFIG_CAN=m +CONFIG_CAN_RCAR=m +CONFIG_CAN_RCAR_CANFD=m + CONFIG_CAN_FLEXCAN=m CONFIG_BT=m CONFIG_BT_HIDP=m # CONFIG_BT_HS is not set @@@ -461,7 -485,8 +493,9 @@@ CONFIG_THERMAL_GOV_POWER_ALLOCATOR= CONFIG_CPU_THERMAL=y CONFIG_THERMAL_EMULATION=y CONFIG_QORIQ_THERMAL=m +CONFIG_SUN8I_THERMAL=y + CONFIG_IMX_SC_THERMAL=m + CONFIG_IMX8MM_THERMAL=m CONFIG_ROCKCHIP_THERMAL=m CONFIG_RCAR_THERMAL=y CONFIG_RCAR_GEN3_THERMAL=y @@@ -541,13 -563,11 +576,14 @@@ CONFIG_V4L_MEM2MEM_DRIVERS= CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m CONFIG_VIDEO_SAMSUNG_S5P_MFC=m CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m +CONFIG_VIDEO_RENESAS_FDP1=m CONFIG_VIDEO_RENESAS_FCP=m CONFIG_VIDEO_RENESAS_VSP1=m +CONFIG_SDR_PLATFORM_DRIVERS=y +CONFIG_VIDEO_RCAR_DRIF=m CONFIG_DRM=m CONFIG_DRM_I2C_NXP_TDA998X=m + CONFIG_DRM_MALI_DISPLAY=m CONFIG_DRM_NOUVEAU=m CONFIG_DRM_EXYNOS=m CONFIG_DRM_EXYNOS5433_DECON=y @@@ -739,9 -749,7 +777,8 @@@ CONFIG_COMMON_CLK_RK808= CONFIG_COMMON_CLK_SCPI=y CONFIG_COMMON_CLK_CS2000_CP=y CONFIG_COMMON_CLK_S2MPS11=y - CONFIG_CLK_QORIQ=y CONFIG_COMMON_CLK_PWM=y +CONFIG_COMMON_CLK_VC5=y CONFIG_CLK_RASPBERRYPI=m CONFIG_CLK_IMX8MM=y CONFIG_CLK_IMX8MN=y @@@ -785,13 -790,12 +822,14 @@@ CONFIG_QCOM_SYSMON= CONFIG_RPMSG_QCOM_GLINK_RPM=y CONFIG_RPMSG_QCOM_GLINK_SMEM=m CONFIG_RPMSG_QCOM_SMD=y +CONFIG_SOUNDWIRE=m +CONFIG_SOUNDWIRE_QCOM=m CONFIG_OWL_PM_DOMAINS=y CONFIG_RASPBERRYPI_POWER=y + CONFIG_FSL_DPAA=y + CONFIG_FSL_MC_DPIO=y CONFIG_IMX_SCU_SOC=y CONFIG_QCOM_AOSS_QMP=y - CONFIG_QCOM_COMMAND_DB=y CONFIG_QCOM_GENI_SE=y CONFIG_QCOM_GLINK_SSR=m CONFIG_QCOM_RMTFS_MEM=m @@@ -825,10 -826,8 +862,9 @@@ CONFIG_ARCH_K3_J721E_SOC= CONFIG_TI_SCI_PM_DOMAINS=y CONFIG_EXTCON_USB_GPIO=y CONFIG_EXTCON_USBC_CROS_EC=y - CONFIG_MEMORY=y CONFIG_IIO=y CONFIG_EXYNOS_ADC=y +CONFIG_MAX9611=m CONFIG_QCOM_SPMI_ADC5=m CONFIG_ROCKCHIP_SARADC=m CONFIG_IIO_CROS_EC_SENSORS_CORE=m @@@ -889,9 -889,7 +926,10 @@@ CONFIG_FPGA_REGION= CONFIG_OF_FPGA_REGION=m CONFIG_TEE=y CONFIG_OPTEE=y +CONFIG_SLIMBUS=m +CONFIG_SLIM_QCOM_CTRL=m +CONFIG_SLIM_QCOM_NGD_CTRL=m + CONFIG_MUX_MMIO=y CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y CONFIG_EXT4_FS_POSIX_ACL=y @@@ -920,12 -918,12 +958,13 @@@ CONFIG_NLS_ISO8859_1= CONFIG_SECURITY=y CONFIG_CRYPTO_ECHAINIV=y CONFIG_CRYPTO_ANSI_CPRNG=y + CONFIG_CRYPTO_USER_API_RNG=m CONFIG_CRYPTO_DEV_SUN8I_CE=m CONFIG_CRYPTO_DEV_FSL_CAAM=m - CONFIG_CRYPTO_DEV_HISI_ZIP=m - CONFIG_CRYPTO_USER_API_RNG=m + CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=m CONFIG_CRYPTO_DEV_QCOM_RNG=m +CONFIG_CRYPTO_DEV_CCREE=m + CONFIG_CRYPTO_DEV_HISI_ZIP=m CONFIG_CMA_SIZE_MBYTES=32 CONFIG_PRINTK_TIME=y CONFIG_DEBUG_INFO=y