Merge tag 'qcom-defconfig-for-6.1' of https://git.kernel.org/pub/scm/linux/kernel...

Qualcomm ARM defconfig updates for 6.1

This enables command-db, ocmem, rpmh and rpmhpd drivers in the
multi_v7_defconfig, used on SDX55, SDX65 and MSM8974. For qcom_defconfig
rmtfs-mem, rpmpd, socinfo and qcom-stats are enables as they are used
across MSM8974, MSM8226, MSM8916 and APQ8084.

Lastly the MAINTAINERS entry is updated to include the qcom_defconfig.

* tag 'qcom-defconfig-for-6.1' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  ARM: qcom: include defconfig in MAINTAINERS
  ARM: multi_v7_defconfig: enable more Qualcomm drivers
  ARM: qcom_defconfig: enable more Qualcomm drivers

Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Arnd Bergmann <[email protected]>

diff --combined MAINTAINERS
index 589517372408cab086578bd901a5f29b6d6f7e47,157e1ed8a7924756e80ca6b1d4b56397a44b0369..4d66dc329e87050d53ff9c34b6e0c90a3b79d5b2
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2178,7 -2178,7 +2178,7 @@@ M:      Jean-Marie Verdun <[email protected]
  M:    Nick Hawkins <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/arm/hpe,gxp.yaml
 -F:    Documentation/devicetree/bindings/spi/hpe,gxp-spi.yaml
 +F:    Documentation/devicetree/bindings/spi/hpe,gxp-spifi.yaml
  F:    Documentation/devicetree/bindings/timer/hpe,gxp-timer.yaml
  F:    arch/arm/boot/dts/hpe-bmc*
  F:    arch/arm/boot/dts/hpe-gxp*
@@@ -2588,6 -2588,7 +2588,7 @@@ F:      Documentation/devicetree/bindings/*/
  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*
@@@ -3612,7 -3613,6 +3613,7 @@@ F:      include/linux/find.
  F:    include/linux/nodemask.h
  F:    lib/bitmap.c
  F:    lib/cpumask.c
 +F:    lib/cpumask_kunit.c
  F:    lib/find_bit.c
  F:    lib/find_bit_benchmark.c
  F:    lib/test_bitmap.c
@@@ -3680,7 -3680,6 +3681,7 @@@ F:      Documentation/networking/bonding.rs
  F:    drivers/net/bonding/
  F:    include/net/bond*
  F:    include/uapi/linux/if_bonding.h
 +F:    tools/testing/selftests/drivers/net/bonding/
  
  BOSCH SENSORTEC BMA400 ACCELEROMETER IIO DRIVER
  M:    Dan Robertson <[email protected]>
@@@ -5147,7 -5146,6 +5148,7 @@@ T:      git git://git.samba.org/sfrench/cifs
  F:    Documentation/admin-guide/cifs/
  F:    fs/cifs/
  F:    fs/smbfs_common/
 +F:    include/uapi/linux/cifs
  
  COMPACTPCI HOTPLUG CORE
  M:    Scott Murray <[email protected]>
@@@ -9783,7 -9781,7 +9784,7 @@@ M:      Christian Brauner <[email protected]
  M:    Seth Forshee <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git
 +T:    git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping.git
  F:    Documentation/filesystems/idmappings.rst
  F:    tools/testing/selftests/mount_setattr/
  F:    include/linux/mnt_idmapping.h
@@@ -10660,7 -10658,6 +10661,7 @@@ T:   git git://git.kernel.dk/linux-bloc
  T:    git git://git.kernel.dk/liburing
  F:    io_uring/
  F:    include/linux/io_uring.h
 +F:    include/linux/io_uring_types.h
  F:    include/uapi/linux/io_uring.h
  F:    tools/io_uring/
  

diff --combined arch/arm/configs/multi_v7_defconfig
index 599f0b45ffd4613475a13b5f8c06380a773e176c,d9257854c9418044a82c13cf7a48ed46946e3508..23003a43ffe9ee0c02eb16a920bfc62072955a56
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -1,5 -1,5 +1,5 @@@
  CONFIG_SYSVIPC=y
 -CONFIG_NO_HZ=y
 +CONFIG_NO_HZ_IDLE=y
  CONFIG_HIGH_RES_TIMERS=y
  CONFIG_CGROUPS=y
  CONFIG_BLK_DEV_INITRD=y
@@@ -167,6 -167,12 +167,6 @@@ CONFIG_NET_DSA=
  CONFIG_QRTR=m
  CONFIG_QRTR_SMD=m
  CONFIG_CAN=y
 -CONFIG_CAN_AT91=m
 -CONFIG_CAN_FLEXCAN=m
 -CONFIG_CAN_SUN4I=y
 -CONFIG_CAN_XILINXCAN=y
 -CONFIG_CAN_RCAR=m
 -CONFIG_CAN_MCP251X=y
  CONFIG_BT=m
  CONFIG_BT_HCIUART=m
  CONFIG_BT_HCIUART_BCM=y
@@@ -254,6 -260,7 +254,6 @@@ CONFIG_SATA_HIGHBANK=
  CONFIG_SATA_MV=y
  CONFIG_SATA_RCAR=y
  CONFIG_NETDEVICES=y
 -CONFIG_NET_VENDOR_ASIX=y
  CONFIG_VIRTIO_NET=y
  CONFIG_B53_SPI_DRIVER=m
  CONFIG_B53_MDIO_DRIVER=m
@@@ -293,12 -300,6 +293,12 @@@ CONFIG_MARVELL_PHY=
  CONFIG_AT803X_PHY=y
  CONFIG_ROCKCHIP_PHY=y
  CONFIG_DP83867_PHY=y
 +CONFIG_CAN_AT91=m
 +CONFIG_CAN_FLEXCAN=m
 +CONFIG_CAN_SUN4I=y
 +CONFIG_CAN_XILINXCAN=y
 +CONFIG_CAN_RCAR=m
 +CONFIG_CAN_MCP251X=y
  CONFIG_MDIO_MSCC_MIIM=m
  CONFIG_USB_PEGASUS=y
  CONFIG_USB_RTL8152=m
@@@ -377,6 -378,8 +377,6 @@@ CONFIG_SERIAL_MSM=
  CONFIG_SERIAL_MSM_CONSOLE=y
  CONFIG_SERIAL_VT8500=y
  CONFIG_SERIAL_VT8500_CONSOLE=y
 -CONFIG_SERIAL_OMAP=y
 -CONFIG_SERIAL_OMAP_CONSOLE=y
  CONFIG_SERIAL_BCM63XX=y
  CONFIG_SERIAL_BCM63XX_CONSOLE=y
  CONFIG_SERIAL_XILINX_PS_UART=y
@@@ -462,6 -465,7 +462,6 @@@ CONFIG_SPI_TEGRA20_SLINK=
  CONFIG_SPI_XILINX=y
  CONFIG_SPI_SPIDEV=y
  CONFIG_SPMI=y
 -CONFIG_PTP_1588_CLOCK=y
  CONFIG_PINCTRL_AS3722=y
  CONFIG_PINCTRL_MICROCHIP_SGPIO=y
  CONFIG_PINCTRL_OCELOT=y
@@@ -712,6 -716,7 +712,6 @@@ CONFIG_ROCKCHIP_DW_MIPI_DSI=
  CONFIG_ROCKCHIP_INNO_HDMI=y
  CONFIG_DRM_ATMEL_HLCDC=m
  CONFIG_DRM_RCAR_DU=m
 -CONFIG_DRM_RCAR_LVDS=y
  CONFIG_DRM_SUN4I=m
  CONFIG_DRM_MSM=m
  CONFIG_DRM_FSL_DCU=m
@@@ -778,6 -783,7 +778,6 @@@ CONFIG_SND_ATMEL_SOC_I2S=
  CONFIG_SND_BCM2835_SOC_I2S=m
  CONFIG_SND_IMX_SOC=m
  CONFIG_SND_SOC_FSL_ASOC_CARD=m
 -CONFIG_SND_SOC_FSL_SAI=m
  CONFIG_SND_PXA_SOC_SSP=m
  CONFIG_SND_MMP_SOC_SSPA=m
  CONFIG_SND_PXA910_SOC=m
@@@ -814,7 -820,7 +814,7 @@@ CONFIG_SND_SOC_TEGRA_TRIMSLICE=
  CONFIG_SND_SOC_TEGRA_ALC5632=m
  CONFIG_SND_SOC_TEGRA_MAX98090=m
  CONFIG_SND_SOC_DAVINCI_MCASP=m
 -CONFIG_SND_SOC_AC97=m
 +CONFIG_SND_SOC_AC97_CODEC=m
  CONFIG_SND_SOC_AK4642=m
  CONFIG_SND_SOC_CPCAP=m
  CONFIG_SND_SOC_CS42L51_I2C=m
@@@ -869,6 -875,7 +869,6 @@@ CONFIG_USB_GPIO_VBUS=
  CONFIG_USB_ISP1301=y
  CONFIG_USB_MXS_PHY=y
  CONFIG_USB_GADGET=y
 -CONFIG_USB_FSL_USB2=y
  CONFIG_USB_RENESAS_USBHS_UDC=m
  CONFIG_USB_ASPEED_VHUB=m
  CONFIG_USB_CONFIGFS=m
@@@ -1044,6 -1051,7 +1044,6 @@@ CONFIG_MSM_MMCC_8960=
  CONFIG_MSM_MMCC_8974=y
  CONFIG_HWSPINLOCK=y
  CONFIG_HWSPINLOCK_QCOM=y
 -CONFIG_MICROCHIP_PIT64B=y
  CONFIG_BCM2835_MBOX=y
  CONFIG_QCOM_APCS_IPC=y
  CONFIG_QCOM_IPCC=y
@@@ -1063,9 -1071,13 +1063,13 @@@ CONFIG_ASPEED_LPC_CTRL=
  CONFIG_ASPEED_LPC_SNOOP=m
  CONFIG_ASPEED_P2A_CTRL=m
  CONFIG_RASPBERRYPI_POWER=y
+ CONFIG_QCOM_COMMAND_DB=m
  CONFIG_QCOM_CPR=y
  CONFIG_QCOM_GSBI=y
+ CONFIG_QCOM_OCMEM=m
  CONFIG_QCOM_RMTFS_MEM=m
+ CONFIG_QCOM_RPMH=y
+ CONFIG_QCOM_RPMHPD=y
  CONFIG_QCOM_RPMPD=y
  CONFIG_QCOM_SMEM=y
  CONFIG_QCOM_SMD_RPM=y

diff --combined arch/arm/configs/qcom_defconfig
index 3b84bb1c328de3b06a182bff7dad10cbdb5d2402,0eeefbe60d065ee1e0d7717f31decb2c4b8bea60..0afa62b92de744b6f7230d8f82f63e4c203004c6
--- 1/arch/arm/configs/qcom_defconfig
--- 2/arch/arm/configs/qcom_defconfig
+++ b/arch/arm/configs/qcom_defconfig
@@@ -1,5 -1,5 +1,5 @@@
  CONFIG_SYSVIPC=y
 -CONFIG_NO_HZ=y
 +CONFIG_NO_HZ_IDLE=y
  CONFIG_HIGH_RES_TIMERS=y
  CONFIG_PREEMPT=y
  CONFIG_IKCONFIG=y
@@@ -245,7 -245,6 +245,7 @@@ CONFIG_QCOM_Q6V5_PAS=
  CONFIG_QCOM_Q6V5_PIL=y
  CONFIG_QCOM_WCNSS_PIL=y
  CONFIG_RPMSG_CHAR=y
 +CONFIG_RPMSG_CTRL=y
  CONFIG_RPMSG_QCOM_GLINK_SMEM=y
  CONFIG_RPMSG_QCOM_SMD=y
  CONFIG_QCOM_COMMAND_DB=y
@@@ -254,10 -253,14 +254,14 @@@ CONFIG_QCOM_OCMEM=
  CONFIG_QCOM_PM=y
  CONFIG_QCOM_RPMH=y
  CONFIG_QCOM_RPMHPD=y
+ CONFIG_QCOM_RMTFS_MEM=y
+ CONFIG_QCOM_RPMPD=y
  CONFIG_QCOM_SMEM=y
  CONFIG_QCOM_SMD_RPM=y
  CONFIG_QCOM_SMP2P=y
  CONFIG_QCOM_SMSM=y
+ CONFIG_QCOM_SOCINFO=y
+ CONFIG_QCOM_STATS=y
  CONFIG_QCOM_WCNSS_CTRL=y
  CONFIG_EXTCON_QCOM_SPMI_MISC=y
  CONFIG_IIO=y