Merge tag 'soc-drivers-6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

Pull SoC driver updates from Arnd Bergmann:
 "The updates to the mediatek, allwinner, ti, tegra, microchip, stm32,
  samsung, imx, zynq and amlogic platoforms are fairly small maintenance
  changes, either addressing minor mistakes or enabling additional
  hardware.

  The qualcomm platform changes add a number of features and are larger
  than the other ones combined, introducing the use of linux/cleanup.h
  across several drivers, adding support for Snapdragon X1E and other
  SoCs in platform drivers, a new "protection domain mapper" driver, and
  a "shared memory bridge" driver.

  The cznic "turris omnia" router based on Marvell Armada gets a
  platform driver that talks to the board specific microcontroller.

  The reset and cache subsystems get a few minor updates to SoC specific
  drivers, while the ff-a, scmi and optee firmware drivers get some code
  refactoring and new features"

* tag 'soc-drivers-6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (122 commits)
  firmware: turris-mox-rwtm: Initialize completion before mailbox
  firmware: turris-mox-rwtm: Fix checking return value of wait_for_completion_timeout()
  firmware: turris-mox-rwtm: Do not complete if there are no waiters
  MAINTAINERS: drop riscv list from cache controllers
  platform: cznic: turris-omnia-mcu: fix Kconfig dependencies
  bus: sunxi-rsb: Constify struct regmap_bus
  soc: sunxi: sram: Constify struct regmap_config
  platform: cznic: turris-omnia-mcu: Depend on WATCHDOG
  platform: cznic: turris-omnia-mcu: Depend on OF
  soc: samsung: exynos-pmu: add support for PMU_ALIVE non atomic registers
  arm64: stm32: enable scmi regulator for stm32
  firmware: qcom: tzmem: blacklist more platforms for SHM Bridge
  soc: qcom: wcnss: simplify with cleanup.h
  soc: qcom: pdr: simplify with cleanup.h
  soc: qcom: ocmem: simplify with cleanup.h
  soc: qcom: mdt_loader: simplify with cleanup.h
  soc: qcom: llcc: simplify with cleanup.h
  firmware: qcom: tzmem: simplify returning pointer without cleanup
  soc: qcom: socinfo: Add PM6350 PMIC
  arm64: dts: renesas: rz-smarc: Replace fixed regulator for USB VBUS
  ...

diff --combined Documentation/devicetree/bindings/cache/qcom,llcc.yaml
index b9a9f2cf32a1b698d6e26304f2d6bcea2315d8ca,1929116960109f9a97b28a3ee7b3fb773b01d974..68ea5f70b75f031cd8b23cf48d566c3a760dab77
--- 1/Documentation/devicetree/bindings/cache/qcom,llcc.yaml
--- 2/Documentation/devicetree/bindings/cache/qcom,llcc.yaml
+++ b/Documentation/devicetree/bindings/cache/qcom,llcc.yaml
@@@ -21,6 -21,7 +21,7 @@@ properties
    compatible:
      enum:
        - qcom,qdu1000-llcc
+       - qcom,sa8775p-llcc
        - qcom,sc7180-llcc
        - qcom,sc7280-llcc
        - qcom,sc8180x-llcc
@@@ -66,6 -67,7 +67,6 @@@ allOf
          compatible:
            contains:
              enum:
 -              - qcom,qdu1000-llcc
                - qcom,sc7180-llcc
                - qcom,sm6350-llcc
      then:
@@@ -79,6 -81,33 +80,33 @@@
              - const: llcc0_base
              - const: llcc_broadcast_base
  
+   - if:
+       properties:
+         compatible:
+           contains:
+             enum:
+               - qcom,sa8775p-llcc
+     then:
+       properties:
+         reg:
+           items:
+             - description: LLCC0 base register region
+             - description: LLCC1 base register region
+             - description: LLCC2 base register region
+             - description: LLCC3 base register region
+             - description: LLCC4 base register region
+             - description: LLCC5 base register region
+             - description: LLCC broadcast base register region
+         reg-names:
+           items:
+             - const: llcc0_base
+             - const: llcc1_base
+             - const: llcc2_base
+             - const: llcc3_base
+             - const: llcc4_base
+             - const: llcc5_base
+             - const: llcc_broadcast_base
+ 
    - if:
        properties:
          compatible:
@@@ -103,7 -132,6 +131,7 @@@
          compatible:
            contains:
              enum:
 +              - qcom,qdu1000-llcc
                - qcom,sc8180x-llcc
                - qcom,sc8280xp-llcc
                - qcom,x1e80100-llcc
@@@ -141,8 -169,31 +169,31 @@@
                - qcom,sm8150-llcc
                - qcom,sm8250-llcc
                - qcom,sm8350-llcc
+     then:
+       properties:
+         reg:
+           items:
+             - description: LLCC0 base register region
+             - description: LLCC1 base register region
+             - description: LLCC2 base register region
+             - description: LLCC3 base register region
+             - description: LLCC broadcast base register region
+         reg-names:
+           items:
+             - const: llcc0_base
+             - const: llcc1_base
+             - const: llcc2_base
+             - const: llcc3_base
+             - const: llcc_broadcast_base
+ 
+   - if:
+       properties:
+         compatible:
+           contains:
+             enum:
                - qcom,sm8450-llcc
                - qcom,sm8550-llcc
+               - qcom,sm8650-llcc
      then:
        properties:
          reg:
@@@ -151,7 -202,8 +202,8 @@@
              - description: LLCC1 base register region
              - description: LLCC2 base register region
              - description: LLCC3 base register region
-             - description: LLCC broadcast base register region
+             - description: LLCC broadcast OR register region
+             - description: LLCC broadcast AND register region
          reg-names:
            items:
              - const: llcc0_base
@@@ -159,6 -211,7 +211,7 @@@
              - const: llcc2_base
              - const: llcc3_base
              - const: llcc_broadcast_base
+             - const: llcc_broadcast_and_base
  
  additionalProperties: false
  

diff --combined MAINTAINERS
index af4b4c27134205404b121ffddfb21c0eb3ab93d4,68948843ace27fbbe2599f3aafc3d57e3d7d0783..542edd473de85e857d71eb253fb33de757c36298
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -846,6 -846,12 +846,6 @@@ ALPS PS/2 TOUCHPAD DRIVE
  R:    Pali Rohár <[email protected]>
  F:    drivers/input/mouse/alps.*
  
 -ALTERA I2C CONTROLLER DRIVER
 -M:    Thor Thayer <[email protected]>
 -S:    Maintained
 -F:    Documentation/devicetree/bindings/i2c/i2c-altera.txt
 -F:    drivers/i2c/busses/i2c-altera.c
 -
  ALTERA MAILBOX DRIVER
  M:    Mun Yew Tham <[email protected]>
  S:    Maintained
@@@ -865,6 -871,21 +865,6 @@@ L:        [email protected]
  S:    Maintained
  F:    drivers/gpio/gpio-altera.c
  
 -ALTERA SYSTEM MANAGER DRIVER
 -M:    Thor Thayer <[email protected]>
 -S:    Maintained
 -F:    drivers/mfd/altera-sysmgr.c
 -F:    include/linux/mfd/altera-sysmgr.h
 -
 -ALTERA SYSTEM RESOURCE DRIVER FOR ARRIA10 DEVKIT
 -M:    Thor Thayer <[email protected]>
 -S:    Maintained
 -F:    drivers/gpio/gpio-altera-a10sr.c
 -F:    drivers/mfd/altera-a10sr.c
 -F:    drivers/reset/reset-a10sr.c
 -F:    include/dt-bindings/reset/altr,rst-mgr-a10sr.h
 -F:    include/linux/mfd/altera-a10sr.h
 -
  ALTERA TRIPLE SPEED ETHERNET DRIVER
  M:    Joyce Ooi <[email protected]>
  L:    [email protected]
@@@ -1023,7 -1044,7 +1023,7 @@@ M:      Joerg Roedel <[email protected]
  R:    Suravee Suthikulpanit <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git
  F:    drivers/iommu/amd/
  F:    include/linux/amd-iommu.h
  
@@@ -2185,10 -2206,12 +2185,12 @@@ M:   Marek Behún <[email protected]
  S:    Maintained
  W:    https://www.turris.cz/
  F:    Documentation/ABI/testing/debugfs-moxtet
+ F:    Documentation/ABI/testing/sysfs-bus-i2c-devices-turris-omnia-mcu
  F:    Documentation/ABI/testing/sysfs-bus-moxtet-devices
  F:    Documentation/ABI/testing/sysfs-firmware-turris-mox-rwtm
  F:    Documentation/devicetree/bindings/bus/moxtet.txt
  F:    Documentation/devicetree/bindings/firmware/cznic,turris-mox-rwtm.txt
+ F:    Documentation/devicetree/bindings/firmware/cznic,turris-omnia-mcu.yaml
  F:    Documentation/devicetree/bindings/gpio/gpio-moxtet.txt
  F:    Documentation/devicetree/bindings/leds/cznic,turris-omnia-leds.yaml
  F:    Documentation/devicetree/bindings/watchdog/armada-37xx-wdt.txt
@@@ -2197,10 -2220,12 +2199,12 @@@ F:   drivers/firmware/turris-mox-rwtm.
  F:    drivers/gpio/gpio-moxtet.c
  F:    drivers/leds/leds-turris-omnia.c
  F:    drivers/mailbox/armada-37xx-rwtm-mailbox.c
+ F:    drivers/platform/cznic/
  F:    drivers/watchdog/armada_37xx_wdt.c
  F:    include/dt-bindings/bus/moxtet.h
  F:    include/linux/armada-37xx-rwtm-mailbox.h
  F:    include/linux/moxtet.h
+ F:    include/linux/turris-omnia-mcu-interface.h
  
  ARM/FARADAY FA526 PORT
  M:    Hans Ulli Kroll <[email protected]>
@@@ -2871,7 -2896,7 +2875,7 @@@ F:      drivers/edac/altera_edac.[ch
  ARM/SPREADTRUM SoC SUPPORT
  M:    Orson Zhai <[email protected]>
  M:    Baolin Wang <[email protected]>
 -M:    Chunyan Zhang <[email protected]>
 +R:    Chunyan Zhang <[email protected]>
  S:    Maintained
  F:    arch/arm64/boot/dts/sprd
  N:    sprd
@@@ -3549,15 -3574,6 +3553,15 @@@ W:    https://ez.analog.com/linux-software
  F:    Documentation/devicetree/bindings/spi/adi,axi-spi-engine.yaml
  F:    drivers/spi/spi-axi-spi-engine.c
  
 +AXI PWM GENERATOR
 +M:    Michael Hennerich <[email protected]>
 +M:    Nuno Sá <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +W:    https://ez.analog.com/linux-software-drivers
 +F:    Documentation/devicetree/bindings/pwm/adi,axi-pwmgen.yaml
 +F:    drivers/pwm/pwm-axi-pwmgen.c
 +
  AXXIA I2C CONTROLLER
  M:    Krzysztof Adamski <[email protected]>
  L:    [email protected]
@@@ -3589,9 -3605,10 +3593,9 @@@ W:     https://wireless.wiki.kernel.org/en/
  F:    drivers/net/wireless/broadcom/b43/
  
  B43LEGACY WIRELESS DRIVER
 -M:    Larry Finger <[email protected]>
  L:    [email protected]
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/b43
  F:    drivers/net/wireless/broadcom/b43legacy/
  
@@@ -3768,20 -3785,6 +3772,20 @@@ F:    include/linux/blk
  F:    kernel/trace/blktrace.c
  F:    lib/sbitmap.c
  
 +BLOCK LAYER DEVICE DRIVER API [RUST]
 +M:    Andreas Hindborg <[email protected]>
 +R:    Boqun Feng <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +W:    https://rust-for-linux.com
 +B:    https://github.com/Rust-for-Linux/linux/issues
 +C:    https://rust-for-linux.zulipchat.com/#narrow/stream/Block
 +T:    git https://github.com/Rust-for-Linux/linux.git rust-block-next
 +F:    drivers/block/rnull.rs
 +F:    rust/kernel/block.rs
 +F:    rust/kernel/block/
 +
  BLOCK2MTD DRIVER
  M:    Joern Engel <[email protected]>
  L:    [email protected]
@@@ -4084,13 -4087,12 +4088,13 @@@ F:   kernel/bpf/ringbuf.
  
  BPF [SECURITY & LSM] (Security Audit and Enforcement using BPF)
  M:    KP Singh <[email protected]>
 -R:    Matt Bobrowski <[email protected]>
 +M:    Matt Bobrowski <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/bpf/prog_lsm.rst
  F:    include/linux/bpf_lsm.h
  F:    kernel/bpf/bpf_lsm.c
 +F:    kernel/trace/bpf_trace.c
  F:    security/bpf/
  
  BPF [SELFTESTS] (Test Runners & Infrastructure)
@@@ -5137,25 -5139,11 +5141,25 @@@ S:   Maintaine
  F:    Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml
  F:    sound/soc/codecs/cros_ec_codec.*
  
 +CHROMEOS EC CHARGE CONTROL
 +M:    Thomas Weißschuh <[email protected]>
 +S:    Maintained
 +F:    drivers/power/supply/cros_charge-control.c
 +
 +CHROMEOS EC HARDWARE MONITORING
 +M:    Thomas Weißschuh <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/hwmon/cros_ec_hwmon.rst
 +F:    drivers/hwmon/cros_ec_hwmon.c
 +
  CHROMEOS EC SUBDRIVERS
  M:    Benson Leung <[email protected]>
  R:    Guenter Roeck <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    drivers/power/supply/cros_charge-control.c
  F:    drivers/power/supply/cros_usbpd-charger.c
  N:    cros_ec
  N:    cros-ec
@@@ -5551,7 -5539,6 +5555,7 @@@ CONTROL GROUP (CGROUP
  M:    Tejun Heo <[email protected]>
  M:    Zefan Li <[email protected]>
  M:    Johannes Weiner <[email protected]>
 +M:    Michal Koutný <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
@@@ -6255,8 -6242,9 +6259,8 @@@ S:      Maintaine
  F:    drivers/usb/dwc3/
  
  DESIGNWARE XDATA IP DRIVER
 -M:    Gustavo Pimentel <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  F:    Documentation/misc-devices/dw-xdata-pcie.rst
  F:    drivers/misc/dw-xdata-pcie.c
  
@@@ -8498,7 -8486,6 +8502,7 @@@ R:      Darrick J. Wong <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Supported
 +F:    Documentation/filesystems/iomap/*
  F:    fs/iomap/
  F:    include/linux/iomap.h
  
@@@ -8725,7 -8712,7 +8729,7 @@@ FREESCALE DSPI DRIVE
  M:    Vladimir Oltean <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/spi/spi-fsl-dspi.txt
 +F:    Documentation/devicetree/bindings/spi/fsl,dspi*.yaml
  F:    drivers/spi/spi-fsl-dspi.c
  F:    include/linux/spi/spi-fsl-dspi.h
  
@@@ -8850,7 -8837,6 +8854,7 @@@ F:      drivers/spi/spi-fsl-qspi.
  
  FREESCALE QUICC ENGINE LIBRARY
  M:    Qiang Zhao <[email protected]>
 +M:    Christophe Leroy <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/soc/fsl/qe/
@@@ -8900,10 -8886,9 +8904,10 @@@ S:    Maintaine
  F:    drivers/tty/serial/ucc_uart.c
  
  FREESCALE SOC DRIVERS
 +M:    Christophe Leroy <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
 -S:    Orphan
 +S:    Maintained
  F:    Documentation/devicetree/bindings/misc/fsl,dpaa2-console.yaml
  F:    Documentation/devicetree/bindings/soc/fsl/
  F:    drivers/soc/fsl/
@@@ -11175,7 -11160,7 +11179,7 @@@ M:   David Woodhouse <[email protected]
  M:    Lu Baolu <[email protected]>
  L:    [email protected]
  S:    Supported
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git
  F:    drivers/iommu/intel/
  
  INTEL IPU3 CSI-2 CIO2 DRIVER
@@@ -11548,7 -11533,7 +11552,7 @@@ IOMMU DMA-API LAYE
  M:    Robin Murphy <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git
  F:    drivers/iommu/dma-iommu.c
  F:    drivers/iommu/dma-iommu.h
  F:    drivers/iommu/iova.c
@@@ -11560,7 -11545,7 +11564,7 @@@ M:   Will Deacon <[email protected]
  R:    Robin Murphy <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git
  F:    Documentation/devicetree/bindings/iommu/
  F:    Documentation/userspace-api/iommu.rst
  F:    drivers/iommu/
@@@ -11589,7 -11574,7 +11593,7 @@@ F:   include/linux/iosys-map.
  
  IO_URING
  M:    Jens Axboe <[email protected]>
 -R:    Pavel Begunkov <[email protected]>
 +M:    Pavel Begunkov <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.dk/linux-block
@@@ -14492,7 -14477,7 +14496,7 @@@ MEMORY MAPPIN
  M:    Andrew Morton <[email protected]>
  R:    Liam R. Howlett <[email protected]>
  R:    Vlastimil Babka <[email protected]>
 -R:    Lorenzo Stoakes <lstoakes@gmail.com>
 +R:    Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
  L:    [email protected]
  S:    Maintained
  W:    http://www.linux-mm.org
@@@ -14867,6 -14852,7 +14871,7 @@@ MICROCHIP SOC DRIVER
  M:    Conor Dooley <[email protected]>
  S:    Supported
  T:    git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/
+ F:    Documentation/devicetree/bindings/soc/microchip/
  F:    drivers/soc/microchip/
  
  MICROCHIP SPI DRIVER
@@@ -15274,27 -15260,6 +15279,27 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/leds/backlight/mps,mp3309c.yaml
  F:    drivers/video/backlight/mp3309c.c
  
 +MPS MP2891 DRIVER
 +M:    Noah Wang <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/hwmon/mp2891.rst
 +F:    drivers/hwmon/pmbus/mp2891.c
 +
 +MPS MP2993 DRIVER
 +M:    Noah Wang <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/hwmon/mp2993.rst
 +F:    drivers/hwmon/pmbus/mp2993.c
 +
 +MPS MP9941 DRIVER
 +M:    Noah Wang <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/hwmon/mp9941.rst
 +F:    drivers/hwmon/pmbus/mp9941.c
 +
  MR800 AVERMEDIA USB FM RADIO DRIVER
  M:    Alexey Klimov <[email protected]>
  L:    [email protected]
@@@ -16486,7 -16451,7 +16491,7 @@@ F:   arch/arm/boot/dts/ti/omap/am335x-nan
  OMAP1 SUPPORT
  M:    Aaro Koskinen <[email protected]>
  M:    Janusz Krzysztofik <[email protected]>
 -M:    Tony Lindgren <[email protected]>
 +R:    Tony Lindgren <[email protected]>
  L:    [email protected]
  S:    Maintained
  Q:    http://patchwork.kernel.org/project/linux-omap/list/
@@@ -16498,13 -16463,10 +16503,13 @@@ F:        include/linux/platform_data/ams-delt
  F:    include/linux/platform_data/i2c-omap.h
  
  OMAP2+ SUPPORT
 +M:    Aaro Koskinen <[email protected]>
 +M:    Andreas Kemnade <[email protected]>
 +M:    Kevin Hilman <[email protected]>
 +M:    Roger Quadros <[email protected]>
  M:    Tony Lindgren <[email protected]>
  L:    [email protected]
  S:    Maintained
 -W:    http://www.muru.com/linux/omap/
  W:    http://linux.omap.com/
  Q:    http://patchwork.kernel.org/project/linux-omap/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git
@@@ -17391,14 -17353,6 +17396,14 @@@ F: Documentation/driver-api/pci/p2pdma.
  F:    drivers/pci/p2pdma.c
  F:    include/linux/pci-p2pdma.h
  
 +PCI POWER CONTROL
 +M:    Bartosz Golaszewski <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git
 +F:    drivers/pci/pwrctl/*
 +F:    include/linux/pci-pwrctl.h
 +
  PCI SUBSYSTEM
  M:    Bjorn Helgaas <[email protected]>
  L:    [email protected]
@@@ -17582,6 -17536,7 +17587,6 @@@ F:   include/linux/peci.
  PENSANDO ETHERNET DRIVERS
  M:    Shannon Nelson <[email protected]>
  M:    Brett Creeley <[email protected]>
 -M:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    Documentation/networking/device_drivers/ethernet/pensando/ionic.rst
@@@ -17939,14 -17894,6 +17944,14 @@@ F: include/linux/pm_
  F:    include/linux/powercap.h
  F:    kernel/configs/nopm.config
  
 +POWER SEQUENCING
 +M:    Bartosz Golaszewski <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
 +F:    drivers/power/sequencing/
 +F:    include/linux/pwrseq/
 +
  POWER STATE COORDINATION INTERFACE (PSCI)
  M:    Mark Rutland <[email protected]>
  M:    Lorenzo Pieralisi <[email protected]>
@@@ -18267,7 -18214,6 +18272,7 @@@ QCOM AUDIO (ASoC) DRIVER
  M:    Srinivas Kandagatla <[email protected]>
  M:    Banajit Goswami <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Supported
  F:    Documentation/devicetree/bindings/soc/qcom/qcom,apr*
  F:    Documentation/devicetree/bindings/sound/qcom,*
@@@ -18432,7 -18378,7 +18437,7 @@@ M:   Jeff Johnson <[email protected]
  L:    [email protected]
  S:    Supported
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/ath12k
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git
  F:    drivers/net/wireless/ath/ath12k/
  N:    ath12k
  
@@@ -18442,7 -18388,7 +18447,7 @@@ M:   Jeff Johnson <[email protected]
  L:    [email protected]
  S:    Supported
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/ath10k
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git
  F:    drivers/net/wireless/ath/ath10k/
  N:    ath10k
  
@@@ -18453,7 -18399,7 +18458,7 @@@ L:   [email protected]
  S:    Supported
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/ath11k
  B:    https://wireless.wiki.kernel.org/en/users/Drivers/ath11k/bugreport
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git
  F:    drivers/net/wireless/ath/ath11k/
  N:    ath11k
  
@@@ -18462,7 -18408,7 +18467,7 @@@ M:   Toke Høiland-Jørgensen <toke@toke.
  L:    [email protected]
  S:    Maintained
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/ath9k
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git
  F:    Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml
  F:    drivers/net/wireless/ath/ath9k/
  
@@@ -18661,6 -18607,14 +18666,14 @@@ F: Documentation/networking/device_driv
  F:    drivers/net/ethernet/qualcomm/rmnet/
  F:    include/linux/if_rmnet.h
  
+ QUALCOMM TRUST ZONE MEMORY ALLOCATOR
+ M:    Bartosz Golaszewski <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    drivers/firmware/qcom/qcom_tzmem.c
+ F:    drivers/firmware/qcom/qcom_tzmem.h
+ F:    include/linux/firmware/qcom/qcom_tzmem.h
+ 
  QUALCOMM TSENS THERMAL DRIVER
  M:    Amit Kucheria <[email protected]>
  M:    Thara Gopinath <[email protected]>
@@@ -18924,7 -18878,6 +18937,7 @@@ M:   Neeraj Upadhyay <neeraj.upadhyay@ker
  M:    Joel Fernandes <[email protected]>
  M:    Josh Triplett <[email protected]>
  M:    Boqun Feng <[email protected]>
 +M:    Uladzislau Rezki <[email protected]>
  R:    Steven Rostedt <[email protected]>
  R:    Mathieu Desnoyers <[email protected]>
  R:    Lai Jiangshan <[email protected]>
@@@ -19374,7 -19327,7 +19387,7 @@@ F:   drivers/perf/riscv_pmu_legacy.
  F:    drivers/perf/riscv_pmu_sbi.c
  
  RISC-V THEAD SoC SUPPORT
 -M:    Jisheng Zhang <[email protected]>
 +M:    Drew Fustini <[email protected]>
  M:    Guo Ren <[email protected]>
  M:    Fu Wei <[email protected]>
  L:    [email protected]
@@@ -19568,6 -19521,7 +19581,6 @@@ F:   drivers/net/wireless/realtek/rtl818x
  
  RTL8187 WIRELESS DRIVER
  M:    Hin-Tak Leung <[email protected]>
 -M:    Larry Finger <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git https://github.com/pkshih/rtw.git
@@@ -20156,7 -20110,6 +20169,7 @@@ SECURE DIGITAL HOST CONTROLLER INTERFAC
  M:    Haibo Chen <[email protected]>
  L:    [email protected]
  L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  F:    drivers/mmc/host/sdhci-esdhc-imx.c
  
@@@ -21306,6 -21259,7 +21319,6 @@@ W:   http://wiki.laptop.org/go/DCO
  F:    drivers/staging/olpc_dcon/
  
  STAGING - REALTEK RTL8712U DRIVERS
 -M:    Larry Finger <[email protected]>
  M:    Florian Schilhabel <[email protected]>.
  S:    Odd Fixes
  F:    drivers/staging/rtl8712/
@@@ -21339,9 -21293,9 +21352,9 @@@ F:   drivers/staging
  
  STANDALONE CACHE CONTROLLER DRIVERS
  M:    Conor Dooley <[email protected]>
- L:    [email protected]
  S:    Maintained
  T:    git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/
+ F:    Documentation/devicetree/bindings/cache/
  F:    drivers/cache
  
  STARFIRE/DURALAN NETWORK DRIVER
@@@ -21854,6 -21808,7 +21867,7 @@@ F:   drivers/mfd/syscon.
  SYSTEM CONTROL & POWER/MANAGEMENT INTERFACE (SCPI/SCMI) Message Protocol drivers
  M:    Sudeep Holla <[email protected]>
  R:    Cristian Marussi <[email protected]>
+ L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/firmware/arm,sc[mp]i.yaml
@@@ -22583,6 -22538,7 +22597,7 @@@ L:   [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git
+ F:    Documentation/devicetree/bindings/soc/ti/ti,pruss.yaml
  F:    drivers/pmdomain/ti/omap_prm.c
  F:    drivers/soc/ti/*
  
@@@ -22804,7 -22760,7 +22819,7 @@@ M:   Jarkko Sakkinen <[email protected]
  R:    Jason Gunthorpe <[email protected]>
  L:    [email protected]
  S:    Maintained
 -W:    https://gitlab.com/jarkkojs/linux-tpmdd-test
 +W:    https://codeberg.org/jarkko/linux-tpmdd-test
  Q:    https://patchwork.kernel.org/project/linux-integrity/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git
  F:    Documentation/devicetree/bindings/tpm/
@@@ -23703,6 -23659,12 +23718,6 @@@ M:  Kevin Brace <kevinbrace@bracecompute
  S:    Maintained
  F:    drivers/net/ethernet/via/via-rhine.c
  
 -VIA SD/MMC CARD CONTROLLER DRIVER
 -M:    Bruce Chang <[email protected]>
 -M:    Harald Welte <[email protected]>
 -S:    Maintained
 -F:    drivers/mmc/host/via-sdmmc.c
 -
  VIA UNICHROME(PRO)/CHROME9 FRAMEBUFFER DRIVER
  M:    Florian Tobias Schandinat <[email protected]>
  L:    [email protected]
@@@ -23915,8 -23877,8 +23930,8 @@@ S:   Maintaine
  F:    drivers/vhost/scsi.c
  
  VIRTIO I2C DRIVER
 -M:    Conghui Chen <[email protected]>
  M:    Viresh Kumar <[email protected]>
 +R:    "Chen, Jian Jun" <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained

diff --combined drivers/reset/Kconfig
index 6bb5d9e372e4cbf7b032cd99c23cc2659edfff2c,36cfdb81cd345f947dbbb9fdcd4bd53229aee12d..67bce340a87eb7c4143b954901d4b971cf6776af
--- 1/drivers/reset/Kconfig
--- 2/drivers/reset/Kconfig
+++ b/drivers/reset/Kconfig
@@@ -68,7 -68,6 +68,7 @@@ config RESET_BRCMSTB_RESCA
  
  config RESET_GPIO
        tristate "GPIO reset controller"
 +      depends on GPIOLIB
        help
          This enables a generic reset controller for resets attached via
          GPIOs.  Typically for OF platforms this driver expects "reset-gpios"
@@@ -92,6 -91,14 +92,14 @@@ config RESET_IMX
        help
          This enables the reset controller driver for i.MX7 SoCs.
  
+ config RESET_IMX8MP_AUDIOMIX
+       tristate "i.MX8MP AudioMix Reset Driver"
+       depends on ARCH_MXC || COMPILE_TEST
+       select AUXILIARY_BUS
+       default CLK_IMX8MP
+       help
+         This enables the reset controller driver for i.MX8MP AudioMix
+ 
  config RESET_INTEL_GW
        bool "Intel Reset Controller Driver"
        depends on X86 || COMPILE_TEST
@@@ -329,6 -336,12 +337,12 @@@ config RESET_ZYN
        help
          This enables the reset controller driver for Xilinx Zynq SoCs.
  
+ config RESET_ZYNQMP
+       bool "ZYNQMP Reset Driver" if COMPILE_TEST
+       default ARCH_ZYNQMP
+       help
+         This enables the reset controller driver for Xilinx ZynqMP SoCs.
+ 
  source "drivers/reset/starfive/Kconfig"
  source "drivers/reset/sti/Kconfig"
  source "drivers/reset/hisilicon/Kconfig"

diff --combined drivers/soc/qcom/pmic_glink.c
index 65279243072c33e9b17e837ad0afc9b52b27a2b7,8534a9692c4567b5c989f4a53e56bdf3df90fb81..9ebc0ba359477ae0bf3195764d6fabf16cca84dc
--- 1/drivers/soc/qcom/pmic_glink.c
--- 2/drivers/soc/qcom/pmic_glink.c
+++ b/drivers/soc/qcom/pmic_glink.c
@@@ -348,15 -348,11 +348,15 @@@ static void pmic_glink_remove(struct pl
        mutex_unlock(&__pmic_glink_lock);
  }
  
 +static const unsigned long pmic_glink_sc8280xp_client_mask = BIT(PMIC_GLINK_CLIENT_BATT) |
 +                                                           BIT(PMIC_GLINK_CLIENT_ALTMODE);
 +
  static const unsigned long pmic_glink_sm8450_client_mask = BIT(PMIC_GLINK_CLIENT_BATT) |
                                                           BIT(PMIC_GLINK_CLIENT_ALTMODE) |
                                                           BIT(PMIC_GLINK_CLIENT_UCSI);
  
  static const struct of_device_id pmic_glink_of_match[] = {
 +      { .compatible = "qcom,sc8280xp-pmic-glink", .data = &pmic_glink_sc8280xp_client_mask },
        { .compatible = "qcom,pmic-glink", .data = &pmic_glink_sm8450_client_mask },
        {}
  };
@@@ -373,8 -369,17 +373,17 @@@ static struct platform_driver pmic_glin
  
  static int pmic_glink_init(void)
  {
-       platform_driver_register(&pmic_glink_driver);
-       register_rpmsg_driver(&pmic_glink_rpmsg_driver);
+       int ret;
+ 
+       ret = platform_driver_register(&pmic_glink_driver);
+       if (ret < 0)
+               return ret;
+ 
+       ret = register_rpmsg_driver(&pmic_glink_rpmsg_driver);
+       if (ret < 0) {
+               platform_driver_unregister(&pmic_glink_driver);
+               return ret;
+       }
  
        return 0;
  }