Commit f8912147 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'soc-defconfig-6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull SoC defconfig updates from Arnd Bergmann:
 "Only a small set up updates, enabling a few drivers for Artpec, THead,
  Renesas and Broadcom chips, and cleaning out some Qualcomm options
  that were removed previously"

* tag 'soc-defconfig-6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  ARM: configs: u8500: Set NFC_SHDLC as built-in
  riscv: defconfig: Enable MMP_PDMA support for SpacemiT K1 SoC
  riscv: defconfig: run savedefconfig to reorder it
  ARM: defconfig: Remove obsolete CONFIG_USB_EHCI_MSM
  arm64: defconfig: Enable Marvell WiFi-Ex USB driver
  arm64: defconfig: Enable BCM2712 on-chip pin controller driver
  arm64: defconfig: Enable Axis ARTPEC SoC
  ARM: s3c6400_defconfig: Drop MTD_NAND_S3C2410
  ARM: defconfig: pxa: Remove duplicate CONFIG_USB_GPIO_VBUS entry
  ARM: defconfig: cleanup orphaned CONFIGs
  arm64: defconfig: enable i.MX91 pinctrl
  arm64: defconfig: Enable X1P42100 GPUCC driver
  arm64: defconfig: Enable QCS615 clock controllers
  arm64: defconfig: Enable the RZ/V2H(P) RSPI driver
  arm64: defconfig: Enable Renesas RZ/T2H serial SCI
parents 0f048c87 1f76c941

arch/arm/configs/multi_v7_defconfig

+0 −4
Original line number Diff line number Diff line
@@ -87,10 +87,6 @@ CONFIG_SOC_AM33XX=y 
CONFIG_SOC_AM43XX=y

CONFIG_SOC_DRA7XX=y

CONFIG_ARCH_QCOM=y

CONFIG_ARCH_MSM8X60=y

CONFIG_ARCH_MSM8916=y

CONFIG_ARCH_MSM8960=y

CONFIG_ARCH_MSM8974=y

CONFIG_ARCH_ROCKCHIP=y

CONFIG_ARCH_RENESAS=y

CONFIG_ARCH_INTEL_SOCFPGA=y

arch/arm/configs/pxa_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -498,7 +498,6 @@ CONFIG_USB_LEGOTOWER=m 
CONFIG_USB_LCD=m

CONFIG_USB_CYTHERM=m

CONFIG_USB_IDMOUSE=m

CONFIG_USB_GPIO_VBUS=y

CONFIG_USB_GPIO_VBUS=m

CONFIG_USB_ISP1301=m

CONFIG_USB_GADGET=m

arch/arm/configs/qcom_defconfig

+0 −4
Original line number Diff line number Diff line
@@ -10,9 +10,6 @@ CONFIG_EXPERT=y 
CONFIG_KALLSYMS_ALL=y

CONFIG_PROFILING=y

CONFIG_ARCH_QCOM=y

CONFIG_ARCH_MSM8X60=y

CONFIG_ARCH_MSM8960=y

CONFIG_ARCH_MSM8974=y

CONFIG_ARCH_MDM9615=y

CONFIG_SMP=y

CONFIG_ARM_PSCI=y
@@ -187,7 +184,6 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y 
CONFIG_USB_OTG=y

CONFIG_USB_MON=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_MSM=y

CONFIG_USB_ACM=y

CONFIG_USB_DWC3=y

CONFIG_USB_CHIPIDEA=y

arch/arm/configs/s3c6400_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ CONFIG_MODULE_UNLOAD=y 
# CONFIG_BLK_DEV_BSG is not set

CONFIG_MTD=y

CONFIG_MTD_RAW_NAND=y

CONFIG_MTD_NAND_S3C2410=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_EEPROM_AT24=y

arch/arm/configs/u8500_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ CONFIG_MAC80211_LEDS=y 
CONFIG_CAIF=y

CONFIG_NFC=m

CONFIG_NFC_HCI=m

CONFIG_NFC_SHDLC=m

CONFIG_NFC_SHDLC=y

CONFIG_NFC_PN544_I2C=m

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y