Commit 40285e64 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM defconfig updates from Arnd Bergmann:
 "As usual, we enable newly added device drivers in the various
  defconfig files.

  This time, there is also a larger cleanup series that just reorders
  symbols according to what 'make savedefconfig' outputs and then tracks
  down the most common removed or renamed symbols on top"

* tag 'arm-defconfig-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (43 commits)
  ARM: config: aspeed_g5: Enable PECI
  ARM: configs: aspeed_g4: Remove appended DTB and ATAG
  ARM: configs: aspeed: Refresh defconfigs
  ARM: config: aspeed: Enable namespaces
  ARM: configs: aspeed_g4: Enable IPV6 options
  ARM: configs: aspeed_g4: Enable OCC and NBD drivers
  ARM: configs: aspeed_g5: Enable MCTP stack
  ARM: configs: aspeed_g5: Add PL2303 USB serial driver
  ARM: configs: aspeed_g5: Add TPM TIS I2C driver
  ARM: configs: aspeed_g5: Add mp5023 driver
  ARM: configs: aspeed: Add support for USB flash drives
  arm64: configs: Enable all PMUs provided by Arm
  arm64: defconfig: Enable Synopsys DWC MSHC driver
  arm64: defconfig: Enabled SC8180x configs
  arm64: defconfig: Make TEGRA186_GPC_DMA built-in
  arm64: tegra: Enable Tegra SPI & QSPI in deconfig
  arm64: defconfig: enable newer Qualcomm SoC sound drivers
  ARM: config: ixp4xx: Disable legacy EEPROM driver
  arm64: defconfig: Enable devfreq cooling device
  arm64: defconfig: enable ARCH_NXP
  ...
parents 7782aae4 25631f1f

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -2626,6 +2626,7 @@ F: Documentation/devicetree/bindings/*/qcom* 
F:	Documentation/devicetree/bindings/soc/qcom/

F:	arch/arm/boot/dts/qcom-*.dts

F:	arch/arm/boot/dts/qcom-*.dtsi

F:	arch/arm/configs/qcom_defconfig

F:	arch/arm/mach-qcom/

F:	arch/arm64/boot/dts/qcom/

F:	drivers/*/*/qcom*

arch/arm/configs/aspeed_g4_defconfig

+7 −3
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ CONFIG_IKCONFIG=y 
CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=16

CONFIG_CGROUPS=y

CONFIG_NAMESPACES=y

CONFIG_BLK_DEV_INITRD=y

# CONFIG_RD_BZIP2 is not set

# CONFIG_RD_LZO is not set
@@ -23,12 +24,9 @@ CONFIG_VMSPLIT_2G=y 
CONFIG_AEABI=y

CONFIG_UACCESS_WITH_MEMCPY=y

# CONFIG_ATAGS is not set

CONFIG_ARM_APPENDED_DTB=y

CONFIG_ARM_ATAG_DTB_COMPAT=y

CONFIG_KEXEC=y

CONFIG_JUMP_LABEL=y

CONFIG_STRICT_KERNEL_RWX=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_BLK_DEBUG_FS is not set

# CONFIG_MQ_IOSCHED_DEADLINE is not set

# CONFIG_MQ_IOSCHED_KYBER is not set
@@ -47,7 +45,11 @@ CONFIG_INET=y 
CONFIG_IP_MULTICAST=y

CONFIG_SYN_COOKIES=y

# CONFIG_INET_DIAG is not set

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_IPV6_ROUTE_INFO=y

CONFIG_IPV6_OPTIMISTIC_DAD=y

# CONFIG_IPV6_SIT is not set

CONFIG_IPV6_MULTIPLE_TABLES=y

CONFIG_NETFILTER=y

# CONFIG_NETFILTER_ADVANCED is not set

CONFIG_VLAN_8021Q=y
@@ -66,6 +68,7 @@ CONFIG_MTD_UBI=y 
CONFIG_MTD_UBI_FASTMAP=y

CONFIG_MTD_UBI_BLOCK=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_NBD=y

CONFIG_EEPROM_AT24=y

CONFIG_NETDEVICES=y

CONFIG_NETCONSOLE=y
@@ -145,6 +148,7 @@ CONFIG_SENSORS_ASPEED=y 
CONFIG_SENSORS_IIO_HWMON=y

CONFIG_SENSORS_LM75=y

CONFIG_SENSORS_NCT7904=y

CONFIG_SENSORS_OCC_P8_I2C=y

CONFIG_PMBUS=y

CONFIG_SENSORS_ADM1275=y

CONFIG_SENSORS_IBM_CFFPS=y

arch/arm/configs/aspeed_g5_defconfig

+19 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ CONFIG_IKCONFIG=y 
CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=16

CONFIG_CGROUPS=y

CONFIG_NAMESPACES=y

CONFIG_BLK_DEV_INITRD=y

# CONFIG_RD_BZIP2 is not set

# CONFIG_RD_LZO is not set
@@ -33,7 +34,6 @@ CONFIG_VFP=y 
CONFIG_NEON=y

CONFIG_KERNEL_MODE_NEON=y

CONFIG_JUMP_LABEL=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_BLK_DEBUG_FS is not set

# CONFIG_MQ_IOSCHED_DEADLINE is not set

# CONFIG_MQ_IOSCHED_KYBER is not set
@@ -65,6 +65,7 @@ CONFIG_NETFILTER=y 
# CONFIG_NETFILTER_ADVANCED is not set

CONFIG_VLAN_8021Q=y

CONFIG_NET_NCSI=y

CONFIG_MCTP=y

# CONFIG_WIRELESS is not set

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y
@@ -82,6 +83,8 @@ CONFIG_BLK_DEV_LOOP=y 
CONFIG_BLK_DEV_NBD=y

CONFIG_EEPROM_AT24=y

CONFIG_EEPROM_AT25=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_NETDEVICES=y

CONFIG_NETCONSOLE=y

# CONFIG_NET_VENDOR_ALACRITECH is not set
@@ -119,6 +122,8 @@ CONFIG_FTGMAC100=y 
# CONFIG_NET_VENDOR_WIZNET is not set

CONFIG_BROADCOM_PHY=y

CONFIG_REALTEK_PHY=y

CONFIG_MCTP_SERIAL=y

CONFIG_MCTP_TRANSPORT_I2C=y

# CONFIG_USB_NET_DRIVERS is not set

# CONFIG_WLAN is not set

CONFIG_INPUT_EVDEV=y
@@ -146,6 +151,8 @@ CONFIG_IPMI_KCS_BMC_CDEV_IPMI=y 
CONFIG_IPMI_KCS_BMC_SERIO=y

CONFIG_ASPEED_BT_IPMI_BMC=y

CONFIG_HW_RANDOM_TIMERIOMEM=y

CONFIG_TCG_TPM=y

CONFIG_TCG_TIS_I2C=y

# CONFIG_I2C_COMPAT is not set

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_MUX_GPIO=y
@@ -180,6 +187,7 @@ CONFIG_SENSORS_IR38064=y 
CONFIG_SENSORS_ISL68137=y

CONFIG_SENSORS_LM25066=y

CONFIG_SENSORS_MAX31785=y

CONFIG_SENSORS_MP5023=y

CONFIG_SENSORS_UCD9000=y

CONFIG_SENSORS_UCD9200=y

CONFIG_SENSORS_SBTSI=y
@@ -200,6 +208,9 @@ CONFIG_USB_DYNAMIC_MINORS=y 
CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_ROOT_HUB_TT=y

CONFIG_USB_EHCI_HCD_PLATFORM=y

CONFIG_USB_STORAGE=y

CONFIG_USB_SERIAL=y

CONFIG_USB_SERIAL_PL2303=y

CONFIG_USB_GADGET=y

CONFIG_USB_ASPEED_VHUB=y

CONFIG_USB_CONFIGFS=y
@@ -243,9 +254,13 @@ CONFIG_FSI_MASTER_ASPEED=y 
CONFIG_FSI_SCOM=y

CONFIG_FSI_SBEFIFO=y

CONFIG_FSI_OCC=y

CONFIG_PECI=y

CONFIG_PECI_CPU=y

CONFIG_PECI_ASPEED=y

CONFIG_EXT4_FS=y

CONFIG_FANOTIFY=y

CONFIG_OVERLAY_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_JFFS2_FS=y

# CONFIG_JFFS2_FS_WRITEBUFFER is not set
@@ -261,6 +276,9 @@ CONFIG_PSTORE_PMSG=y 
CONFIG_PSTORE_FTRACE=y

CONFIG_PSTORE_RAM=y

# CONFIG_NETWORK_FILESYSTEMS is not set

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

# CONFIG_SECURITYFS is not set

CONFIG_HARDENED_USERCOPY=y

CONFIG_FORTIFY_SOURCE=y

CONFIG_CRYPTO_HMAC=y

arch/arm/configs/at91_dt_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ CONFIG_IP_PNP_RARP=y 
# CONFIG_INET_DIAG is not set

CONFIG_IPV6_SIT_6RD=y

CONFIG_CAN=y

CONFIG_CAN_AT91=y

CONFIG_CFG80211=y

CONFIG_MAC80211=y

CONFIG_DEVTMPFS=y
@@ -81,6 +80,7 @@ CONFIG_DM9000=y 
# CONFIG_NET_VENDOR_STMICRO is not set

CONFIG_DAVICOM_PHY=y

CONFIG_MICREL_PHY=y

CONFIG_CAN_AT91=y

CONFIG_LIBERTAS=m

CONFIG_LIBERTAS_SDIO=m

CONFIG_LIBERTAS_SPI=m

arch/arm/configs/bcm2835_defconfig

+1 −1
Original line number Diff line number Diff line 
# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_SYSVIPC=y

CONFIG_NO_HZ=y

CONFIG_NO_HZ_IDLE=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_PREEMPT_VOLUNTARY=y

CONFIG_BSD_PROCESS_ACCT=y