iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
i.MX defconfig update for 5.15:

- Enable LTC3676 PMIC, SCSI_LOWLEVEL and KPROBES support in
  imx_v6_v7_defconfig.

* tag 'imx-defconfig-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx_v6_v7_defconfig: enable driver of the LTC3676 PMIC
  ARM: imx_v6_v7_defconfig: Let CONFIG_SCSI_LOWLEVEL be selected
  ARM: imx_v6_v7_defconfig: Select CONFIG_KPROBES

Link: https://lore.kernel.org/r/20210814133853.9981-4-shawnguo@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2021-08-16 23:27:04 +02:00
parent 03bc43c09d 7fd19c58e4
commit 1f69aabe1a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/configs/imx_v6_v7_defconfig
View File

@ -53,6 +53,7 @@ CONFIG_VFP=y
CONFIG_NEON=y CONFIG_NEON=y
CONFIG_PM_DEBUG=y CONFIG_PM_DEBUG=y
CONFIG_PM_TEST_SUSPEND=y CONFIG_PM_TEST_SUSPEND=y
CONFIG_KPROBES=y
CONFIG_MODULES=y CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_UNLOAD=y
CONFIG_MODVERSIONS=y CONFIG_MODVERSIONS=y
@ -119,7 +120,6 @@ CONFIG_BLK_DEV_SD=y
CONFIG_SCSI_CONSTANTS=y CONFIG_SCSI_CONSTANTS=y
CONFIG_SCSI_LOGGING=y CONFIG_SCSI_LOGGING=y
CONFIG_SCSI_SCAN_ASYNC=y CONFIG_SCSI_SCAN_ASYNC=y
# CONFIG_SCSI_LOWLEVEL is not set
CONFIG_ATA=y CONFIG_ATA=y
CONFIG_SATA_AHCI_PLATFORM=y CONFIG_SATA_AHCI_PLATFORM=y
CONFIG_AHCI_IMX=y CONFIG_AHCI_IMX=y
@ -252,6 +252,7 @@ CONFIG_REGULATOR_DA9052=y
CONFIG_REGULATOR_DA9062=y CONFIG_REGULATOR_DA9062=y
CONFIG_REGULATOR_DA9063=y CONFIG_REGULATOR_DA9063=y
CONFIG_REGULATOR_GPIO=y CONFIG_REGULATOR_GPIO=y
CONFIG_REGULATOR_LTC3676=y
CONFIG_REGULATOR_MC13783=y CONFIG_REGULATOR_MC13783=y
CONFIG_REGULATOR_MC13892=y CONFIG_REGULATOR_MC13892=y
CONFIG_REGULATOR_PFUZE100=y CONFIG_REGULATOR_PFUZE100=y