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

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

Pull ARM defconfig updates from Arnd Bergmann:
 "These are the usual trivial changes to enable a couple of newly added
  device drivers and remove lines for Kconfig options that are no longer
  needed"

* tag 'soc-defconfig-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (24 commits)
  arm64: defconfig: enable DisplayPort altmode support
  arm64: defconfig: enable CONFIG_TYPEC_QCOM_PMIC
  arm64: defconfig: add various drivers for Amlogic based boards
  ARM: config: aspeed: Remove FIRMWARE_MEMMAP
  ARM: config: aspeed_g5: Enable SSIF BMC driver
  ARM: config: aspeed: Add Ampere SMPro drivers
  ARM: config: aspeed: Add new FSI drivers
  arm64: defconfig: Enable TPS6593 PMIC for SK-AM62A
  ARM: exynos_defconfig: add driver for ISL29018
  ARM: multi_v7_defconfig: add drivers for S5C73M3 & S5K6A3 camera sensors
  arm64: defconfig: Enable RZ/G3S (R9A08G045) SoC
  ARM: multi_v7_defconfig: add tm2-touchkey driver
  ARM: exynos_defconfig: replace SATA_AHCI_PLATFORM with AHCI_DWC driver
  ARM: multi_v7_defconfig: add AHCI_DWC driver
  ARM: multi_v7_defconfig: make Exynos related PHYs modules
  ARM: s5pv210_defconfig: enable IIO required by MAX17040
  ARM: shmobile: defconfig: Refresh for v6.6-rc3
  ARM: defconfig: cleanup orphaned CONFIGs
  arm64: defconfig: Enable Samsung DSIM driver
  arm64: defconfig: Enable CONFIG_USB_MASS_STORAGE
  ...
parents 385903a7 216da5eb

arch/arm/configs/aspeed_g4_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ CONFIG_NET_NCSI=y 
CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

# CONFIG_PREVENT_FIRMWARE_BUILD is not set

CONFIG_FIRMWARE_MEMMAP=y

CONFIG_MTD=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_PARTITIONED_MASTER=y

arch/arm/configs/aspeed_g5_defconfig

+7 −1
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ CONFIG_MCTP=y 
CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

# CONFIG_PREVENT_FIRMWARE_BUILD is not set

CONFIG_FIRMWARE_MEMMAP=y

CONFIG_MTD=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_PARTITIONED_MASTER=y
@@ -81,6 +80,8 @@ CONFIG_MTD_UBI_FASTMAP=y 
CONFIG_MTD_UBI_BLOCK=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_NBD=y

CONFIG_SMPRO_ERRMON=y

CONFIG_SMPRO_MISC=y

CONFIG_EEPROM_AT24=y

CONFIG_EEPROM_AT25=y

CONFIG_SCSI=y
@@ -150,6 +151,7 @@ CONFIG_ASPEED_KCS_IPMI_BMC=y 
CONFIG_IPMI_KCS_BMC_CDEV_IPMI=y

CONFIG_IPMI_KCS_BMC_SERIO=y

CONFIG_ASPEED_BT_IPMI_BMC=y

CONFIG_SSIF_IPMI_BMC=y

CONFIG_HW_RANDOM_TIMERIOMEM=y

CONFIG_TCG_TPM=y

CONFIG_TCG_TIS_I2C=y
@@ -173,6 +175,7 @@ CONFIG_GPIO_PCA953X_IRQ=y 
CONFIG_W1=y

CONFIG_W1_MASTER_GPIO=y

CONFIG_W1_SLAVE_THERM=y

CONFIG_SENSORS_SMPRO=y

CONFIG_SENSORS_ADT7475=y

CONFIG_SENSORS_ASPEED=y

CONFIG_SENSORS_IIO_HWMON=y
@@ -194,6 +197,7 @@ CONFIG_SENSORS_SBTSI=y 
CONFIG_SENSORS_TMP421=y

CONFIG_SENSORS_W83773G=y

CONFIG_WATCHDOG_SYSFS=y

CONFIG_MFD_SMPRO=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_MEDIA_SUPPORT_FILTER=y

CONFIG_MEDIA_PLATFORM_SUPPORT=y
@@ -251,9 +255,11 @@ CONFIG_FSI_MASTER_GPIO=y 
CONFIG_FSI_MASTER_HUB=y

CONFIG_FSI_MASTER_AST_CF=y

CONFIG_FSI_MASTER_ASPEED=y

CONFIG_FSI_MASTER_I2CR=y

CONFIG_FSI_SCOM=y

CONFIG_FSI_SBEFIFO=y

CONFIG_FSI_OCC=y

CONFIG_I2CR_SCOM=y

CONFIG_PECI=y

CONFIG_PECI_CPU=y

CONFIG_PECI_ASPEED=y

arch/arm/configs/exynos_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ CONFIG_BLK_DEV_SD=y 
CONFIG_CHR_DEV_SG=y

CONFIG_ATA=y

# CONFIG_SATA_PMP is not set

CONFIG_SATA_AHCI_PLATFORM=y

CONFIG_AHCI_DWC=y

# CONFIG_ATA_SFF is not set

CONFIG_MD=y

CONFIG_BLK_DEV_DM=y
@@ -322,6 +322,7 @@ CONFIG_EXYNOS_ADC=y 
CONFIG_STMPE_ADC=y

CONFIG_CM36651=y

CONFIG_AK8975=y

CONFIG_SENSORS_ISL29018=y

CONFIG_PWM=y

CONFIG_PWM_SAMSUNG=y

CONFIG_PHY_EXYNOS5250_SATA=y

arch/arm/configs/keystone_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ CONFIG_IP_NF_MATCH_TTL=y 
CONFIG_IP_NF_FILTER=y

CONFIG_IP_NF_TARGET_REJECT=y

CONFIG_IP_NF_MANGLE=y

CONFIG_IP_NF_TARGET_CLUSTERIP=y

CONFIG_IP_NF_TARGET_ECN=y

CONFIG_IP_NF_TARGET_TTL=y

CONFIG_IP_NF_RAW=y

arch/arm/configs/multi_v7_defconfig

+6 −1
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ CONFIG_SATA_AHCI=y 
CONFIG_SATA_AHCI_PLATFORM=y

CONFIG_AHCI_BRCM=y

CONFIG_AHCI_DM816=y

CONFIG_AHCI_DWC=m

CONFIG_AHCI_ST=y

CONFIG_AHCI_IMX=y

CONFIG_AHCI_SUNXI=y
@@ -314,6 +315,7 @@ CONFIG_KEYBOARD_PXA27x=m 
CONFIG_KEYBOARD_SAMSUNG=m

CONFIG_KEYBOARD_ST_KEYSCAN=y

CONFIG_KEYBOARD_SPEAR=y

CONFIG_KEYBOARD_TM2_TOUCHKEY=m

CONFIG_KEYBOARD_CROS_EC=m

CONFIG_MOUSE_PS2_ELANTECH=y

CONFIG_MOUSE_CYAPA=m
@@ -691,6 +693,8 @@ CONFIG_VIDEO_STI_HVA=m 
CONFIG_VIDEO_STM32_DCMI=m

CONFIG_V4L_TEST_DRIVERS=y

CONFIG_VIDEO_VIVID=m

CONFIG_VIDEO_S5C73M3=m

CONFIG_VIDEO_S5K6A3=m

CONFIG_VIDEO_ADV7180=m

CONFIG_VIDEO_ADV7604=m

CONFIG_VIDEO_ADV7604_CEC=y
@@ -857,7 +861,6 @@ CONFIG_USB_MUSB_HDRC=m 
CONFIG_USB_MUSB_SUNXI=m

CONFIG_USB_MUSB_TUSB6010=m

CONFIG_USB_MUSB_OMAP2PLUS=m

CONFIG_USB_MUSB_AM35X=m

CONFIG_USB_MUSB_DSPS=m

CONFIG_USB_MUSB_UX500=m

CONFIG_USB_UX500_DMA=y
@@ -1203,6 +1206,8 @@ CONFIG_PHY_QCOM_USB_HS=y 
CONFIG_PHY_RCAR_GEN2=m

CONFIG_PHY_ROCKCHIP_DP=m

CONFIG_PHY_ROCKCHIP_USB=y

CONFIG_PHY_EXYNOS_DP_VIDEO=m

CONFIG_PHY_EXYNOS_MIPI_VIDEO=m

CONFIG_PHY_SAMSUNG_USB2=m

CONFIG_PHY_EXYNOS5250_SATA=m

CONFIG_PHY_UNIPHIER_USB2=y