From 9ecba2eb25d90c01c403bb4021b98b6e148306d1 Mon Sep 17 00:00:00 2001 From: Andrey Zhizhikin Date: Mon, 8 Nov 2021 12:49:05 +0000 Subject: [PATCH] linux-fslc: re-sync configs with upstream Re-sync layer configuration files with following from upstream: arch/arm64/configs/defconfig -> armv8a/defconfig arch/arm/configs/imx_v6_v7_defconfig -> defconfig All remaining config files are currently in-sync with upstream and do not require any further modifications. Upstream kernel sync commit: b6abb62daa55 ("Linux 5.15.1") Signed-off-by: Andrey Zhizhikin --- recipes-kernel/linux/linux-fslc/armv8a/defconfig | 2 +- recipes-kernel/linux/linux-fslc/defconfig | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/recipes-kernel/linux/linux-fslc/armv8a/defconfig b/recipes-kernel/linux/linux-fslc/armv8a/defconfig index 65a142a3..198f7e4c 100644 --- a/recipes-kernel/linux/linux-fslc/armv8a/defconfig +++ b/recipes-kernel/linux/linux-fslc/armv8a/defconfig @@ -246,7 +246,6 @@ CONFIG_DEVTMPFS_MOUNT=y CONFIG_FW_LOADER_USER_HELPER=y CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y CONFIG_HISILICON_LPC=y -CONFIG_SIMPLE_PM_BUS=y CONFIG_FSL_MC_BUS=y CONFIG_TEGRA_ACONNECT=m CONFIG_GNSS=m @@ -974,6 +973,7 @@ CONFIG_TI_SCI_CLK=y CONFIG_COMMON_CLK_QCOM=y CONFIG_QCOM_A53PLL=y CONFIG_QCOM_CLK_APCS_MSM8916=y +CONFIG_QCOM_CLK_APCC_MSM8996=y CONFIG_QCOM_CLK_SMD_RPM=y CONFIG_QCOM_CLK_RPMH=y CONFIG_IPQ_GCC_8074=y diff --git a/recipes-kernel/linux/linux-fslc/defconfig b/recipes-kernel/linux/linux-fslc/defconfig index 2ab6b937..7078f912 100644 --- a/recipes-kernel/linux/linux-fslc/defconfig +++ b/recipes-kernel/linux/linux-fslc/defconfig @@ -120,7 +120,6 @@ CONFIG_BLK_DEV_SD=y CONFIG_SCSI_CONSTANTS=y CONFIG_SCSI_LOGGING=y CONFIG_SCSI_SCAN_ASYNC=y -# CONFIG_SCSI_LOWLEVEL is not set CONFIG_ATA=y CONFIG_SATA_AHCI_PLATFORM=y CONFIG_AHCI_IMX=y @@ -252,6 +251,7 @@ CONFIG_REGULATOR_DA9052=y CONFIG_REGULATOR_DA9062=y CONFIG_REGULATOR_DA9063=y CONFIG_REGULATOR_GPIO=y +CONFIG_REGULATOR_LTC3676=y CONFIG_REGULATOR_MC13783=y CONFIG_REGULATOR_MC13892=y CONFIG_REGULATOR_PFUZE100=y @@ -291,6 +291,7 @@ CONFIG_DRM_IMX_LDB=y CONFIG_DRM_IMX_HDMI=y CONFIG_DRM_ETNAVIV=y CONFIG_DRM_MXSFB=y +CONFIG_FB=y CONFIG_FB_MODE_HELPERS=y CONFIG_LCD_CLASS_DEVICE=y CONFIG_LCD_L4F00242T03=y -- 2.40.1