diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-06-29 15:26:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-06-29 15:26:45 -0700 |
| commit | 0873694a339821277d9f2cae7ef981a1283b44f5 (patch) | |
| tree | a8560622ba7360e2edc69a3a406b8d876931550f /arch/arm | |
| parent | e4c8d01865118ab148f77bdb54ec9c0c181d90a3 (diff) | |
| parent | 2b24391767ae6897dff6eeb521f01d495bc27b55 (diff) | |
Merge tag 'soc-defconfig-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC defconfig updates from Arnd Bergmann:
"The arm64 defconfig file gets the usual updates to enable addition
device drivers as well as the sparx5 and realtek SoC platforms.
For arm32, there are only a couple of cleanup patches for imx, renesas
and rockchips"
* tag 'soc-defconfig-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (23 commits)
arm64: defconfig: Enable Rockchip I2S TDM and ES8316 drivers
arm64: defconfig: update RK8XX MFD config
ARM: multi_v7_defconfig: update MFD_RK808 name
arm64: defconfig: Enable UBIFS
arm64: defconfig: enable drivers for Verdin AM62
arm64: defconfig: Build SM6115 display and GPU clock controller drivers
arm64: defconfig: Build display clock controller driver for QCM2290
arm64: defconfig: Build interconnect driver for QCM2290
arm64: defconfig: Build Global Clock Controller driver for QCM2290
arm64: defconfig: Build MSM power manager driver
arm64: defconfig: Enable sc828x0xp lpasscc clock controller
arm64: defconfig: Enable the TI SN65DSI83 driver
arm64: defconfig: Enable Renesas MTU3a counter config
arm64: defconfig: enable Mediatek PMIC key
arm64: defconfig: enable MT6357 regulator
ARM: imx_v6_v7_defconfig: Remove KERNEL_LZO config
arm64: defconfig: Enable ipq6018 apss clock and PLL controller
arm64: defconfig: Enable ARCH_SPARX5 and ARCH_REALTEK
arm64: defconfig: enable FSA4480 driver as module
ARM: shmobile: defconfig: Refresh for v6.4-rc1
...
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/imx_v6_v7_defconfig | 3 | ||||
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/shmobile_defconfig | 3 |
3 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index 4de293da4789..05706696a5fb 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig @@ -1,4 +1,3 @@ -CONFIG_KERNEL_LZO=y CONFIG_SYSVIPC=y CONFIG_NO_HZ_IDLE=y CONFIG_HIGH_RES_TIMERS=y @@ -80,8 +79,6 @@ CONFIG_PCI_IMX6_HOST=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y # CONFIG_STANDALONE is not set -CONFIG_FW_LOADER_USER_HELPER=y -CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y CONFIG_IMX_WEIM=y CONFIG_CONNECTOR=y CONFIG_MTD=y diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 871fffe92187..f0800f806b5f 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -596,7 +596,7 @@ CONFIG_MFD_CPCAP=y CONFIG_MFD_PM8XXX=y CONFIG_MFD_QCOM_RPM=y CONFIG_MFD_SPMI_PMIC=y -CONFIG_MFD_RK808=y +CONFIG_MFD_RK8XX_I2C=y CONFIG_MFD_RN5T618=y CONFIG_MFD_SEC_CORE=y CONFIG_MFD_STMPE=y diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig index 0b21c0a47582..99748cff1ca4 100644 --- a/arch/arm/configs/shmobile_defconfig +++ b/arch/arm/configs/shmobile_defconfig @@ -36,8 +36,8 @@ CONFIG_NET_DSA=y CONFIG_CAN=y CONFIG_PCI=y CONFIG_PCI_MSI=y -CONFIG_PCI_RCAR_GEN2=y CONFIG_PCIE_RCAR_HOST=y +CONFIG_PCI_RCAR_GEN2=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_MTD=y @@ -76,7 +76,6 @@ CONFIG_SERIAL_8250=y # CONFIG_SERIAL_8250_16550A_VARIANTS is not set CONFIG_SERIAL_8250_CONSOLE=y # CONFIG_SERIAL_8250_PCI is not set -# CONFIG_SERIAL_8250_PCI1XXXX is not set CONFIG_SERIAL_8250_DW=y CONFIG_SERIAL_8250_EM=y # CONFIG_SERIAL_8250_PERICOM is not set |