tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds f8912147 0f048c87

+16 -14
-4
arch/arm/configs/multi_v7_defconfig
··· 87 87 CONFIG_SOC_AM43XX=y 88 88 CONFIG_SOC_DRA7XX=y 89 89 CONFIG_ARCH_QCOM=y 90 - CONFIG_ARCH_MSM8X60=y 91 - CONFIG_ARCH_MSM8916=y 92 - CONFIG_ARCH_MSM8960=y 93 - CONFIG_ARCH_MSM8974=y 94 90 CONFIG_ARCH_ROCKCHIP=y 95 91 CONFIG_ARCH_RENESAS=y 96 92 CONFIG_ARCH_INTEL_SOCFPGA=y
-1
arch/arm/configs/pxa_defconfig
··· 498 498 CONFIG_USB_LCD=m 499 499 CONFIG_USB_CYTHERM=m 500 500 CONFIG_USB_IDMOUSE=m 501 - CONFIG_USB_GPIO_VBUS=y 502 501 CONFIG_USB_GPIO_VBUS=m 503 502 CONFIG_USB_ISP1301=m 504 503 CONFIG_USB_GADGET=m
-4
arch/arm/configs/qcom_defconfig
··· 10 10 CONFIG_KALLSYMS_ALL=y 11 11 CONFIG_PROFILING=y 12 12 CONFIG_ARCH_QCOM=y 13 - CONFIG_ARCH_MSM8X60=y 14 - CONFIG_ARCH_MSM8960=y 15 - CONFIG_ARCH_MSM8974=y 16 13 CONFIG_ARCH_MDM9615=y 17 14 CONFIG_SMP=y 18 15 CONFIG_ARM_PSCI=y ··· 184 187 CONFIG_USB_OTG=y 185 188 CONFIG_USB_MON=y 186 189 CONFIG_USB_EHCI_HCD=y 187 - CONFIG_USB_EHCI_MSM=y 188 190 CONFIG_USB_ACM=y 189 191 CONFIG_USB_DWC3=y 190 192 CONFIG_USB_CHIPIDEA=y
-1
arch/arm/configs/s3c6400_defconfig
··· 11 11 # CONFIG_BLK_DEV_BSG is not set 12 12 CONFIG_MTD=y 13 13 CONFIG_MTD_RAW_NAND=y 14 - CONFIG_MTD_NAND_S3C2410=y 15 14 CONFIG_BLK_DEV_LOOP=y 16 15 CONFIG_BLK_DEV_RAM=y 17 16 CONFIG_EEPROM_AT24=y
+1 -1
arch/arm/configs/u8500_defconfig
··· 40 40 CONFIG_CAIF=y 41 41 CONFIG_NFC=m 42 42 CONFIG_NFC_HCI=m 43 - CONFIG_NFC_SHDLC=m 43 + CONFIG_NFC_SHDLC=y 44 44 CONFIG_NFC_PN544_I2C=m 45 45 CONFIG_DEVTMPFS=y 46 46 CONFIG_DEVTMPFS_MOUNT=y
+12
arch/arm64/configs/defconfig
··· 38 38 CONFIG_ARCH_SUNXI=y 39 39 CONFIG_ARCH_ALPINE=y 40 40 CONFIG_ARCH_APPLE=y 41 + CONFIG_ARCH_ARTPEC=y 41 42 CONFIG_ARCH_AXIADO=y 42 43 CONFIG_ARCH_BCM=y 43 44 CONFIG_ARCH_BCM2835=y ··· 442 441 CONFIG_MWIFIEX=m 443 442 CONFIG_MWIFIEX_SDIO=m 444 443 CONFIG_MWIFIEX_PCIE=m 444 + CONFIG_MWIFIEX_USB=m 445 445 CONFIG_MT7921E=m 446 446 CONFIG_RSI_91X=m 447 447 CONFIG_WL18XX=m ··· 501 499 CONFIG_SERIAL_IMX=y 502 500 CONFIG_SERIAL_IMX_CONSOLE=y 503 501 CONFIG_SERIAL_SH_SCI=y 502 + CONFIG_SERIAL_RSCI=y 504 503 CONFIG_SERIAL_MSM=y 505 504 CONFIG_SERIAL_MSM_CONSOLE=y 506 505 CONFIG_SERIAL_QCOM_GENI=y ··· 582 579 CONFIG_SPI_ROCKCHIP_SFC=m 583 580 CONFIG_SPI_RPCIF=m 584 581 CONFIG_SPI_RSPI=m 582 + CONFIG_SPI_RZV2H_RSPI=m 585 583 CONFIG_SPI_RZV2M_CSI=m 586 584 CONFIG_SPI_QCOM_QSPI=m 587 585 CONFIG_SPI_QUP=y ··· 596 592 CONFIG_SPI_SPIDEV=m 597 593 CONFIG_SPMI=y 598 594 CONFIG_SPMI_MTK_PMIF=m 595 + CONFIG_PINCTRL_BRCMSTB=y 596 + CONFIG_PINCTRL_BCM2712=y 599 597 CONFIG_PINCTRL_DA9062=m 600 598 CONFIG_PINCTRL_MAX77620=y 601 599 CONFIG_PINCTRL_RK805=m ··· 613 607 CONFIG_PINCTRL_IMX8QXP=y 614 608 CONFIG_PINCTRL_IMX8DXL=y 615 609 CONFIG_PINCTRL_IMX8ULP=y 610 + CONFIG_PINCTRL_IMX91=y 616 611 CONFIG_PINCTRL_IMX93=y 617 612 CONFIG_PINCTRL_MSM=y 618 613 CONFIG_PINCTRL_IPQ5018=y ··· 1368 1361 CONFIG_CLK_X1E80100_GCC=y 1369 1362 CONFIG_CLK_X1E80100_GPUCC=m 1370 1363 CONFIG_CLK_X1E80100_TCSRCC=y 1364 + CONFIG_CLK_X1P42100_GPUCC=m 1371 1365 CONFIG_CLK_QCM2290_GPUCC=m 1372 1366 CONFIG_QCOM_A53PLL=y 1373 1367 CONFIG_QCOM_CLK_APCS_MSM8916=y ··· 1394 1386 CONFIG_MSM_MMCC_8998=m 1395 1387 CONFIG_QCM_GCC_2290=y 1396 1388 CONFIG_QCM_DISPCC_2290=m 1389 + CONFIG_QCS_DISPCC_615=m 1390 + CONFIG_QCS_CAMCC_615=m 1397 1391 CONFIG_QCS_GCC_404=y 1398 1392 CONFIG_QCS_GCC_615=y 1399 1393 CONFIG_QCS_GCC_8300=y 1400 1394 CONFIG_SC_CAMCC_7280=m 1401 1395 CONFIG_SA_CAMCC_8775P=m 1396 + CONFIG_QCS_GPUCC_615=m 1397 + CONFIG_QCS_VIDEOCC_615=m 1402 1398 CONFIG_QDU_GCC_1000=y 1403 1399 CONFIG_SC_CAMCC_8280XP=m 1404 1400 CONFIG_SC_DISPCC_7280=m
+3 -3
arch/riscv/configs/defconfig
··· 135 135 CONFIG_E1000E=y 136 136 CONFIG_R8169=y 137 137 CONFIG_STMMAC_ETH=m 138 + CONFIG_DWMAC_THEAD=m 138 139 CONFIG_MICREL_PHY=y 139 140 CONFIG_MICROSEMI_PHY=y 140 141 CONFIG_MOTORCOMM_PHY=y ··· 153 152 CONFIG_I2C=y 154 153 CONFIG_I2C_CHARDEV=m 155 154 CONFIG_I2C_DESIGNWARE_CORE=y 156 - CONFIG_I2C_DESIGNWARE_PLATFORM=y 157 155 CONFIG_I2C_MV64XXX=m 158 156 CONFIG_SPI=y 159 157 CONFIG_SPI_CADENCE_QUADSPI=m ··· 160 160 CONFIG_SPI_SIFIVE=y 161 161 CONFIG_SPI_SUN6I=y 162 162 # CONFIG_PTP_1588_CLOCK is not set 163 + CONFIG_PINCTRL_TH1520=y 163 164 CONFIG_PINCTRL_SOPHGO_CV1800B=y 164 165 CONFIG_PINCTRL_SOPHGO_CV1812H=y 165 166 CONFIG_PINCTRL_SOPHGO_SG2000=y 166 167 CONFIG_PINCTRL_SOPHGO_SG2002=y 167 - CONFIG_PINCTRL_TH1520=y 168 168 CONFIG_GPIO_DWAPB=y 169 169 CONFIG_GPIO_SIFIVE=y 170 170 CONFIG_GPIO_SPACEMIT_K1=y ··· 241 241 CONFIG_DMADEVICES=y 242 242 CONFIG_DMA_SUN6I=m 243 243 CONFIG_DW_AXI_DMAC=y 244 - CONFIG_DWMAC_THEAD=m 244 + CONFIG_MMP_PDMA=m 245 245 CONFIG_VIRTIO_PCI=y 246 246 CONFIG_VIRTIO_BALLOON=y 247 247 CONFIG_VIRTIO_INPUT=y