mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-06-08 08:39:36 -04:00
Merge tag 'qcom-defconfig-for-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/defconfig
Qualcomm ARM defconfig updates for 5.12 This enables various device drivers found on the newly introduced Qualcomm SDX55 platform in the qcom_defconfig. Due to kernel image size constraints the qcom_defconfig is used instead of multi_v7_defconfig, for now. * tag 'qcom-defconfig-for-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: ARM: qcom_defconfig: Enable Command DB driver ARM: qcom_defconfig: Enable RPMh power domain driver ARM: qcom_defconfig: Enable ARM PSCI support ARM: qcom_defconfig: Enable watchdog driver ARM: qcom_defconfig: Enable RPMh regulator ARM: qcom_defconfig: Enable ARM SMMU ARM: qcom_defconfig: Enable DWC3 controller and PHYs ARM: qcom_defconfig: Enable UBI file system ARM: qcom_defconfig: Enable MTD UBI driver ARM: qcom_defconfig: Enable SMEM partition parser ARM: qcom_defconfig: Enable SDX55 GCC driver ARM: qcom_defconfig: Enable SDX55 pinctrl driver ARM: qcom_defconfig: Enable RPMh drivers Link: https://lore.kernel.org/r/20210204052236.388783-1-bjorn.andersson@linaro.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
@@ -66,6 +66,8 @@ CONFIG_MTD_M25P80=y
|
||||
CONFIG_MTD_RAW_NAND=y
|
||||
CONFIG_MTD_NAND_QCOM=y
|
||||
CONFIG_MTD_SPI_NOR=y
|
||||
CONFIG_MTD_QCOMSMEM_PARTS=y
|
||||
CONFIG_MTD_UBI=y
|
||||
CONFIG_BLK_DEV_LOOP=y
|
||||
CONFIG_BLK_DEV_RAM=y
|
||||
CONFIG_QCOM_COINCELL=y
|
||||
@@ -124,6 +126,7 @@ CONFIG_I2C_QUP=y
|
||||
CONFIG_SPI=y
|
||||
CONFIG_SPI_QUP=y
|
||||
CONFIG_SPMI=y
|
||||
CONFIG_PINCTRL_MSM=y
|
||||
CONFIG_PINCTRL_APQ8064=y
|
||||
CONFIG_PINCTRL_APQ8084=y
|
||||
CONFIG_PINCTRL_IPQ4019=y
|
||||
@@ -132,6 +135,7 @@ CONFIG_PINCTRL_MSM8660=y
|
||||
CONFIG_PINCTRL_MSM8960=y
|
||||
CONFIG_PINCTRL_MDM9615=y
|
||||
CONFIG_PINCTRL_MSM8X74=y
|
||||
CONFIG_PINCTRL_SDX55=y
|
||||
CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
|
||||
CONFIG_PINCTRL_QCOM_SSBI_PMIC=y
|
||||
CONFIG_GPIOLIB=y
|
||||
@@ -150,6 +154,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
|
||||
CONFIG_REGULATOR_QCOM_RPM=y
|
||||
CONFIG_REGULATOR_QCOM_SMD_RPM=y
|
||||
CONFIG_REGULATOR_QCOM_SPMI=y
|
||||
CONFIG_REGULATOR_QCOM_RPMH=y
|
||||
CONFIG_MEDIA_SUPPORT=y
|
||||
CONFIG_DRM=y
|
||||
CONFIG_DRM_MSM=m
|
||||
@@ -192,6 +197,7 @@ CONFIG_USB_CONFIGFS_ECM=y
|
||||
CONFIG_USB_CONFIGFS_F_FS=y
|
||||
CONFIG_USB_ULPI_BUS=y
|
||||
CONFIG_USB_ETH=m
|
||||
CONFIG_USB_DWC3=y
|
||||
CONFIG_MMC=y
|
||||
CONFIG_MMC_BLOCK_MINORS=32
|
||||
CONFIG_MMC_ARMMMCI=y
|
||||
@@ -211,6 +217,7 @@ CONFIG_QCOM_BAM_DMA=y
|
||||
CONFIG_STAGING=y
|
||||
CONFIG_COMMON_CLK_QCOM=y
|
||||
CONFIG_QCOM_CLK_RPM=y
|
||||
CONFIG_QCOM_CLK_RPMH=y
|
||||
CONFIG_QCOM_CLK_SMD_RPM=y
|
||||
CONFIG_APQ_MMCC_8084=y
|
||||
CONFIG_IPQ_GCC_4019=y
|
||||
@@ -220,7 +227,9 @@ CONFIG_MSM_LCC_8960=y
|
||||
CONFIG_MDM_LCC_9615=y
|
||||
CONFIG_MSM_MMCC_8960=y
|
||||
CONFIG_MSM_MMCC_8974=y
|
||||
CONFIG_SDX_GCC_55=y
|
||||
CONFIG_MSM_IOMMU=y
|
||||
CONFIG_ARM_SMMU=y
|
||||
CONFIG_HWSPINLOCK=y
|
||||
CONFIG_HWSPINLOCK_QCOM=y
|
||||
CONFIG_MAILBOX=y
|
||||
@@ -230,6 +239,7 @@ CONFIG_QCOM_Q6V5_PIL=y
|
||||
CONFIG_QCOM_WCNSS_PIL=y
|
||||
CONFIG_RPMSG_CHAR=y
|
||||
CONFIG_RPMSG_QCOM_SMD=y
|
||||
CONFIG_QCOM_COMMAND_DB=y
|
||||
CONFIG_QCOM_GSBI=y
|
||||
CONFIG_QCOM_OCMEM=y
|
||||
CONFIG_QCOM_PM=y
|
||||
@@ -237,6 +247,8 @@ CONFIG_QCOM_SMEM=y
|
||||
CONFIG_QCOM_SMD_RPM=y
|
||||
CONFIG_QCOM_SMP2P=y
|
||||
CONFIG_QCOM_SMSM=y
|
||||
CONFIG_QCOM_RPMH=y
|
||||
CONFIG_QCOM_RPMHPD=y
|
||||
CONFIG_QCOM_WCNSS_CTRL=y
|
||||
CONFIG_EXTCON_QCOM_SPMI_MISC=y
|
||||
CONFIG_IIO=y
|
||||
@@ -256,6 +268,8 @@ CONFIG_PHY_QCOM_APQ8064_SATA=y
|
||||
CONFIG_PHY_QCOM_IPQ806X_SATA=y
|
||||
CONFIG_PHY_QCOM_USB_HS=y
|
||||
CONFIG_PHY_QCOM_USB_HSIC=y
|
||||
CONFIG_PHY_QCOM_QMP=y
|
||||
CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2=y
|
||||
CONFIG_QCOM_QFPROM=y
|
||||
CONFIG_INTERCONNECT=y
|
||||
CONFIG_INTERCONNECT_QCOM=y
|
||||
@@ -267,6 +281,7 @@ CONFIG_FUSE_FS=y
|
||||
CONFIG_VFAT_FS=y
|
||||
CONFIG_TMPFS=y
|
||||
CONFIG_JFFS2_FS=y
|
||||
CONFIG_UBIFS_FS=y
|
||||
CONFIG_NFS_FS=y
|
||||
CONFIG_NFS_V3_ACL=y
|
||||
CONFIG_NFS_V4=y
|
||||
@@ -282,3 +297,6 @@ CONFIG_DYNAMIC_DEBUG=y
|
||||
CONFIG_DEBUG_INFO=y
|
||||
CONFIG_MAGIC_SYSRQ=y
|
||||
# CONFIG_SCHED_DEBUG is not set
|
||||
CONFIG_WATCHDOG=y
|
||||
CONFIG_QCOM_WDT=y
|
||||
CONFIG_ARM_PSCI=y
|
||||
|
||||
Reference in New Issue
Block a user