Commit 2b90506a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM defconfig updates from Arnd Bergmann:
 "The usual set of defconfig updates, enabling newly added drivers.

  There are platform updates for at91, omap, ux500 and qcom platforms,
  and a number of changes to the arm64 defconfig"

* tag 'arm-defconfig-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (34 commits)
  ARM: configs: qcom_defconfig: Reduce CMA size to 64MB
  ARM: configs: qcom_defconfig: Enable GLINK SMEM driver
  ARM: configs: qcom_defconfig: Enable SDX55 interconnect driver
  ARM: configs: qcom_defconfig: Enable Q6V5_PAS remoteproc driver
  ARM: configs: qcom_defconfig: Enable CPUFreq support
  ARM: configs: qcom_defconfig: Enable SDX55 A7 PLL and APCS clock driver
  ARM: configs: qcom_defconfig: Enable APCS IPC mailbox driver
  ARM: configs: Remove REGULATOR_USERSPACE_CONSUMER
  ARM: configs: ux500: Update for new drivers
  arm64: defconfig: Enable options to support panel display for Mediatek Chromebooks
  arm64: defconfig: Allow mt8173-based boards to boot from usb
  ARM: configs: at91: Modernize UBI defconfig part
  ARM: configs: at91: Add USB Video webcam class
  ARM: configs: at91: Add mtd tests as modules
  ARM: configs: at91: sama5: Add audio MIKROE PROTO board
  ARM: configs: at91: sama5: Enable LAN78XX as module
  ARM: configs: at91: sama5: PIOBU as built-in
  ARM: configs: at91: sama5: MCP16502 regulator as built-in
  ARM: configs: at91: sama5: enable the Hantro G1 engine
  ARM: configs: at91: sama5: update with savedefconfig
  ...
parents 01d71368 028a1e96

arch/arm/configs/at91_dt_defconfig

+4 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ CONFIG_DEVTMPFS_MOUNT=y 
# CONFIG_STANDALONE is not set

# CONFIG_PREVENT_FIRMWARE_BUILD is not set

CONFIG_MTD=y

CONFIG_MTD_TESTS=m

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_DATAFLASH=y
@@ -53,7 +54,7 @@ CONFIG_MTD_RAW_NAND=y 
CONFIG_MTD_NAND_ATMEL=y

CONFIG_MTD_SPI_NOR=y

CONFIG_MTD_UBI=y

CONFIG_MTD_UBI_GLUEBI=y

CONFIG_MTD_UBI_FASTMAP=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_COUNT=4
@@ -131,6 +132,8 @@ CONFIG_MEDIA_SUPPORT_FILTER=y 
# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set

CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_MEDIA_PLATFORM_SUPPORT=y

CONFIG_MEDIA_USB_SUPPORT=y

CONFIG_USB_VIDEO_CLASS=m

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_VIDEO_ATMEL_ISI=y

CONFIG_VIDEO_OV2640=m

arch/arm/configs/ezx_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -213,7 +213,6 @@ CONFIG_POWER_SUPPLY=y 
CONFIG_EZX_PCAP=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_DEBUG=y

CONFIG_REGULATOR_USERSPACE_CONSUMER=y

CONFIG_REGULATOR_PCAP=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_VIDEO_DEV=y

arch/arm/configs/imote2_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -194,7 +194,6 @@ CONFIG_POWER_SUPPLY=y 
CONFIG_PMIC_DA903X=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_DEBUG=y

CONFIG_REGULATOR_USERSPACE_CONSUMER=y

CONFIG_REGULATOR_DA903X=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_VIDEO_DEV=y

arch/arm/configs/omap2plus_defconfig

+150 −1
Original line number Diff line number Diff line
@@ -87,6 +87,155 @@ CONFIG_IP_PNP_DHCP=y 
CONFIG_IP_PNP_BOOTP=y

CONFIG_IP_PNP_RARP=y

CONFIG_NETFILTER=y

CONFIG_NF_CONNTRACK=m

CONFIG_NF_LOG_NETDEV=m

CONFIG_NF_CONNTRACK_ZONES=y

CONFIG_NF_CONNTRACK_EVENTS=y

CONFIG_NF_CONNTRACK_TIMEOUT=y

CONFIG_NF_CONNTRACK_TIMESTAMP=y

CONFIG_NF_CT_NETLINK=m

CONFIG_NF_CT_NETLINK_TIMEOUT=m

CONFIG_NF_CT_NETLINK_HELPER=m

CONFIG_NETFILTER_NETLINK_GLUE_CT=y

CONFIG_NF_TABLES=m

CONFIG_NF_TABLES_INET=y

CONFIG_NF_TABLES_NETDEV=y

CONFIG_NFT_NUMGEN=m

CONFIG_NFT_CT=m

CONFIG_NFT_COUNTER=m

CONFIG_NFT_CONNLIMIT=m

CONFIG_NFT_LOG=m

CONFIG_NFT_LIMIT=m

CONFIG_NFT_MASQ=m

CONFIG_NFT_REDIR=m

CONFIG_NFT_NAT=m

CONFIG_NFT_TUNNEL=m

CONFIG_NFT_OBJREF=m

CONFIG_NFT_QUEUE=m

CONFIG_NFT_QUOTA=m

CONFIG_NFT_REJECT=m

CONFIG_NFT_COMPAT=m

CONFIG_NFT_HASH=m

CONFIG_NFT_FIB_INET=m

CONFIG_NFT_XFRM=m

CONFIG_NFT_SOCKET=m

CONFIG_NFT_OSF=m

CONFIG_NFT_TPROXY=m

CONFIG_NFT_SYNPROXY=m

CONFIG_NFT_DUP_NETDEV=m

CONFIG_NFT_FWD_NETDEV=m

CONFIG_NFT_FIB_NETDEV=m

CONFIG_NFT_REJECT_NETDEV=m

CONFIG_NF_FLOW_TABLE_INET=m

CONFIG_NF_FLOW_TABLE=m

CONFIG_NETFILTER_XT_TARGET_AUDIT=m

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m

CONFIG_NETFILTER_XT_TARGET_CONNMARK=m

CONFIG_NETFILTER_XT_TARGET_CT=m

CONFIG_NETFILTER_XT_TARGET_DSCP=m

CONFIG_NETFILTER_XT_TARGET_HMARK=m

CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m

CONFIG_NETFILTER_XT_TARGET_LED=m

CONFIG_NETFILTER_XT_TARGET_LOG=m

CONFIG_NETFILTER_XT_TARGET_MARK=m

CONFIG_NETFILTER_XT_TARGET_NFLOG=m

CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m

CONFIG_NETFILTER_XT_TARGET_TEE=m

CONFIG_NETFILTER_XT_TARGET_TPROXY=m

CONFIG_NETFILTER_XT_TARGET_TRACE=m

CONFIG_NETFILTER_XT_TARGET_TCPMSS=m

CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m

CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m

CONFIG_NETFILTER_XT_MATCH_BPF=m

CONFIG_NETFILTER_XT_MATCH_CGROUP=m

CONFIG_NETFILTER_XT_MATCH_CLUSTER=m

CONFIG_NETFILTER_XT_MATCH_COMMENT=m

CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m

CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m

CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m

CONFIG_NETFILTER_XT_MATCH_CONNMARK=m

CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m

CONFIG_NETFILTER_XT_MATCH_CPU=m

CONFIG_NETFILTER_XT_MATCH_DCCP=m

CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m

CONFIG_NETFILTER_XT_MATCH_DSCP=m

CONFIG_NETFILTER_XT_MATCH_ESP=m

CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m

CONFIG_NETFILTER_XT_MATCH_HELPER=m

CONFIG_NETFILTER_XT_MATCH_IPCOMP=m

CONFIG_NETFILTER_XT_MATCH_IPRANGE=m

CONFIG_NETFILTER_XT_MATCH_L2TP=m

CONFIG_NETFILTER_XT_MATCH_LENGTH=m

CONFIG_NETFILTER_XT_MATCH_LIMIT=m

CONFIG_NETFILTER_XT_MATCH_MAC=m

CONFIG_NETFILTER_XT_MATCH_MARK=m

CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m

CONFIG_NETFILTER_XT_MATCH_NFACCT=m

CONFIG_NETFILTER_XT_MATCH_OSF=m

CONFIG_NETFILTER_XT_MATCH_OWNER=m

CONFIG_NETFILTER_XT_MATCH_POLICY=m

CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m

CONFIG_NETFILTER_XT_MATCH_QUOTA=m

CONFIG_NETFILTER_XT_MATCH_RATEEST=m

CONFIG_NETFILTER_XT_MATCH_REALM=m

CONFIG_NETFILTER_XT_MATCH_RECENT=m

CONFIG_NETFILTER_XT_MATCH_SCTP=m

CONFIG_NETFILTER_XT_MATCH_SOCKET=m

CONFIG_NETFILTER_XT_MATCH_STATE=m

CONFIG_NETFILTER_XT_MATCH_STATISTIC=m

CONFIG_NETFILTER_XT_MATCH_STRING=m

CONFIG_NETFILTER_XT_MATCH_TCPMSS=m

CONFIG_NETFILTER_XT_MATCH_TIME=m

CONFIG_NETFILTER_XT_MATCH_U32=m

CONFIG_NFT_DUP_IPV4=m

CONFIG_NFT_FIB_IPV4=m

CONFIG_NF_FLOW_TABLE_IPV4=m

CONFIG_IP_NF_IPTABLES=m

CONFIG_IP_NF_MATCH_AH=m

CONFIG_IP_NF_MATCH_ECN=m

CONFIG_IP_NF_MATCH_RPFILTER=m

CONFIG_IP_NF_MATCH_TTL=m

CONFIG_IP_NF_FILTER=m

CONFIG_IP_NF_TARGET_REJECT=m

CONFIG_IP_NF_TARGET_SYNPROXY=m

CONFIG_IP_NF_NAT=m

CONFIG_IP_NF_TARGET_MASQUERADE=m

CONFIG_IP_NF_TARGET_NETMAP=m

CONFIG_IP_NF_TARGET_REDIRECT=m

CONFIG_IP_NF_MANGLE=m

CONFIG_IP_NF_TARGET_CLUSTERIP=m

CONFIG_IP_NF_TARGET_ECN=m

CONFIG_IP_NF_TARGET_TTL=m

CONFIG_IP_NF_RAW=m

CONFIG_IP_NF_SECURITY=m

CONFIG_NFT_DUP_IPV6=m

CONFIG_NFT_FIB_IPV6=m

CONFIG_NF_FLOW_TABLE_IPV6=m

CONFIG_IP6_NF_IPTABLES=m

CONFIG_IP6_NF_MATCH_AH=m

CONFIG_IP6_NF_MATCH_EUI64=m

CONFIG_IP6_NF_MATCH_FRAG=m

CONFIG_IP6_NF_MATCH_OPTS=m

CONFIG_IP6_NF_MATCH_HL=m

CONFIG_IP6_NF_MATCH_IPV6HEADER=m

CONFIG_IP6_NF_MATCH_MH=m

CONFIG_IP6_NF_MATCH_RPFILTER=m

CONFIG_IP6_NF_MATCH_RT=m

CONFIG_IP6_NF_MATCH_SRH=m

CONFIG_IP6_NF_TARGET_HL=m

CONFIG_IP6_NF_FILTER=m

CONFIG_IP6_NF_TARGET_REJECT=m

CONFIG_IP6_NF_TARGET_SYNPROXY=m

CONFIG_IP6_NF_MANGLE=m

CONFIG_IP6_NF_RAW=m

CONFIG_IP6_NF_SECURITY=m

CONFIG_IP6_NF_NAT=m

CONFIG_IP6_NF_TARGET_MASQUERADE=m

CONFIG_IP6_NF_TARGET_NPT=m

CONFIG_NF_TABLES_BRIDGE=m

CONFIG_NFT_BRIDGE_META=m

CONFIG_NFT_BRIDGE_REJECT=m

CONFIG_NF_LOG_BRIDGE=m

CONFIG_BRIDGE=m

CONFIG_BRIDGE_VLAN_FILTERING=y

CONFIG_VLAN_8021Q=m
@@ -137,7 +286,6 @@ CONFIG_PCI_EPF_TEST=m 
CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_OMAP_OCP2SCP=y

CONFIG_SIMPLE_PM_BUS=y

CONFIG_CONNECTOR=m

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y
@@ -165,6 +313,7 @@ CONFIG_SENSORS_TSL2550=m 
CONFIG_SRAM=y

CONFIG_PCI_ENDPOINT_TEST=m

CONFIG_EEPROM_AT24=m

CONFIG_EEPROM_AT25=m

CONFIG_BLK_DEV_SD=y

CONFIG_SCSI_SCAN_ASYNC=y

CONFIG_ATA=y

arch/arm/configs/pxa_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -415,7 +415,6 @@ CONFIG_MFD_TC6393XB=y 
CONFIG_REGULATOR=y

CONFIG_REGULATOR_DEBUG=y

CONFIG_REGULATOR_FIXED_VOLTAGE=m

CONFIG_REGULATOR_USERSPACE_CONSUMER=m

CONFIG_REGULATOR_ACT8865=m

CONFIG_REGULATOR_AS3711=m

CONFIG_REGULATOR_AXP20X=m