]> Git Repo - linux.git/commitdiff
Merge tag 'soc-dt-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
authorLinus Torvalds <[email protected]>
Thu, 2 Nov 2023 00:37:04 +0000 (14:37 -1000)
committerLinus Torvalds <[email protected]>
Thu, 2 Nov 2023 00:37:04 +0000 (14:37 -1000)
Pull SoC DT updates from Arnd Bergmann:
 "There are a couple new SoCs that are supported for the first time:

   - AMD Pensando Elba is a data processing unit based on Cortex-A72 CPU
     cores

   - Sophgo makes RISC-V based chips, and we now support the CV1800B
     chip used in the milkv-duo board and the massive sg2042 chip in the
     milkv-pioneer, a 64-core developer workstation.

   - Qualcomm Snapdragon 720G (sm7125) is a close relative of Snapdragon
     7c and gets added with some Xiaomi phones

   - Renesas gains support for the R8A779F4 (R-Car S4-8) automotive SoC
     and the RZ/G3S (R9A08G045) embedded SoC.

  There are also a bunch of newly supported machines that use already
  supported chips. On the 32-bit side, we have:

   - USRobotics USR8200 is a NAS/Firewall/router based on the ancient
     Intel IXP4xx platform

   - A couple of machines based on the NXP i.MX5 and i.MX6 platforms

   - One machine each for Allwinner V3s, Aspeed AST2600, Microchip
     sama5d29 and ST STM32mp157

  The other ones all use arm64 cores on chips from allwinner, amlogic,
  freescale, mediatek, qualcomm and rockchip"

* tag 'soc-dt-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (641 commits)
  ARM: dts: BCM5301X: Set switch ports for Linksys EA9200
  ARM: dts: BCM5301X: Set fixed-link for extra Netgear R8000 CPU ports
  ARM: dts: BCM5301X: Explicitly disable unused switch CPU ports
  ARM: dts: BCM5301X: Relicense Vivek's code to the GPL 2.0+ / MIT
  ARM: dts: BCM5301X: Relicense Felix's code to the GPL 2.0+ / MIT
  ARM: dts: BCM5301X: Set MAC address for Asus RT-AC87U
  arm64: dts: socionext: add missing cache properties
  riscv: dts: thead: convert isa detection to new properties
  arm64: dts: Update cache properties for socionext
  arm64: dts: ti: k3-am654-idk: Add ICSSG Ethernet ports
  arm64: dts: ti: k3-am654-icssg2: add ICSSG2 Ethernet support
  arm64: dts: ti: k3-am65-main: Add ICSSG IEP nodes
  arm64: dts: ti: k3-am62p5-sk: Updates for SK EVM
  arm64: dts: ti: k3-am62p: Add nodes for more IPs
  arm64: dts: rockchip: Add Turing RK1 SoM support
  dt-bindings: arm: rockchip: Add Turing RK1
  dt-bindings: vendor-prefixes: add turing
  arm64: dts: rockchip: Add DFI to rk3588s
  arm64: dts: rockchip: Add DFI to rk356x
  arm64: dts: rockchip: Always enable DFI on rk3399
  ...

12 files changed:
1  2 
Documentation/devicetree/bindings/riscv/cpus.yaml
Documentation/devicetree/bindings/vendor-prefixes.yaml
MAINTAINERS
arch/arm/boot/dts/rockchip/rk3128.dtsi
arch/arm/boot/dts/ti/omap/motorola-mapphone-common.dtsi
arch/arm64/boot/dts/freescale/imx93.dtsi
arch/arm64/boot/dts/mediatek/mt8195-demo.dts
arch/arm64/boot/dts/qcom/apq8096-db820c.dts
arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi
arch/arm64/boot/dts/qcom/sm8150.dtsi
arch/arm64/boot/dts/rockchip/rk3399.dtsi
arch/riscv/boot/dts/thead/th1520.dtsi

index 97e8441eda1c2bf63f4321115a28c7cfd57e1c71,185a0191bad6c9470a7592bf2bffda64f8364a93..f392e367d673f5c2c8853379c1955b906211c41e
@@@ -47,6 -47,7 +47,7 @@@ properties
                - sifive,u74-mc
                - thead,c906
                - thead,c910
+               - thead,c920
            - const: riscv
        - items:
            - enum:
@@@ -91,7 -92,6 +92,7 @@@
  
    interrupt-controller:
      type: object
 +    additionalProperties: false
      description: Describes the CPU's local interrupt controller
  
      properties:
index 3f7624c73ed03ec6b34e0960a207167321e2a29c,d9f63f53915aa8f0735551937da536ddc1e6c4c1..309b94c328c8493dab72efbc9c1df87f6d3d609d
@@@ -59,6 -59,8 +59,8 @@@ patternProperties
      description: AD Holdings Plc.
    "^adi,.*":
      description: Analog Devices, Inc.
+   "^adieng,.*":
+     description: ADI Engineering, Inc.
    "^advantech,.*":
      description: Advantech Corporation
    "^aeroflexgaisler,.*":
      description: Arasan Chip Systems
    "^archermind,.*":
      description: ArcherMind Technology (Nanjing) Co., Ltd.
+   "^arcom,.*":
+     description: Arcom Controllers
    "^arctic,.*":
      description: Arctic Sand
    "^arcx,.*":
      description: Shanghai Belling Co., Ltd.
    "^bhf,.*":
      description: Beckhoff Automation GmbH & Co. KG
+   "^bigtreetech,.*":
+     description: Shenzhen BigTree Tech Co., LTD
    "^bitmain,.*":
      description: Bitmain Technologies
    "^blutek,.*":
      description: FocalTech Systems Co.,Ltd
    "^forlinx,.*":
      description: Baoding Forlinx Embedded Technology Co., Ltd.
+   "^freecom,.*":
+     description: Freecom Gmbh
    "^frida,.*":
      description: Shenzhen Frida LCD Co., Ltd.
    "^friendlyarm,.*":
      description: FX Technology Ltd.
    "^gardena,.*":
      description: GARDENA GmbH
+   "^gateway,.*":
+     description: Gateway Communications
    "^gateworks,.*":
      description: Gateworks Corporation
    "^gcw,.*":
      description: GE Fanuc Intelligent Platforms Embedded Systems, Inc.
    "^gemei,.*":
      description: Gemei Digital Technology Co., Ltd.
+   "^gemtek,.*":
+     description: Gemtek Technology Co., Ltd.
    "^genesys,.*":
      description: Genesys Logic, Inc.
    "^geniatech,.*":
      description: Shenzhen Huiding Technology Co., Ltd.
    "^google,.*":
      description: Google, Inc.
+   "^goramo,.*":
+     description: Goramo Gorecki
    "^gplus,.*":
      description: GPLUS
    "^grinn,.*":
      description: Mantix Display Technology Co.,Ltd.
    "^mapleboard,.*":
      description: Mapleboard.org
 +  "^marantec,.*":
 +    description: Marantec electronics GmbH
    "^marvell,.*":
      description: Marvell Technology Group Ltd.
    "^maxbotix,.*":
      description: MikroElektronika d.o.o.
    "^mikrotik,.*":
      description: MikroTik
+   "^milkv,.*":
+     description: MilkV Technology Co., Ltd
    "^miniand,.*":
      description: Miniand Tech
    "^minix,.*":
      description: MiraMEMS Sensing Technology Co., Ltd.
    "^mitsubishi,.*":
      description: Mitsubishi Electric Corporation
 +  "^mitsumi,.*":
 +    description: Mitsumi Electric Co., Ltd.
    "^mixel,.*":
      description: Mixel, Inc.
    "^miyoo,.*":
      description: Powertip Tech. Corp.
    "^powervr,.*":
      description: PowerVR (deprecated, use img)
 +  "^powkiddy,.*":
 +    description: Powkiddy
    "^primux,.*":
      description: Primux Trading, S.L.
    "^probox2,.*":
      description: Solomon Systech Limited
    "^sony,.*":
      description: Sony Corporation
+   "^sophgo,.*":
+     description: Sophgo Technology Inc.
    "^sourceparts,.*":
      description: Source Parts Inc.
    "^spansion,.*":
      description: Truly Semiconductors Limited
    "^tsd,.*":
      description: Theobroma Systems Design und Consulting GmbH
+   "^turing,.*":
+     description: Turing Machines, Inc.
    "^tyan,.*":
      description: Tyan Computer Corporation
    "^u-blox,.*":
      description: United Radiant Technology Corporation
    "^usi,.*":
      description: Universal Scientific Industrial Co., Ltd.
+   "^usr,.*":
+     description: U.S. Robotics Corporation
    "^utoo,.*":
      description: Aigo Digital Technology Co., Ltd.
    "^v3,.*":
diff --combined MAINTAINERS
index ce2edd0d18f2eea49e238dfa51b0a4a73162a819,41cb028a4be6f60f6cf69c206389a9e66d30ffb1..e391d9ae3b12ef1a13264176ccad1814f757f489
@@@ -378,9 -378,8 +378,9 @@@ F: drivers/acpi/viot.
  F:    include/linux/acpi_viot.h
  
  ACPI WMI DRIVER
 +M:    Armin Wolf <[email protected]>
  L:    [email protected]
 -S:    Orphan
 +S:    Maintained
  F:    Documentation/driver-api/wmi.rst
  F:    Documentation/wmi/
  F:    drivers/platform/x86/wmi.c
@@@ -471,6 -470,7 +471,6 @@@ F: drivers/hwmon/adm1029.
  ADM8211 WIRELESS DRIVER
  L:    [email protected]
  S:    Orphan
 -W:    https://wireless.wiki.kernel.org/
  F:    drivers/net/wireless/admtek/adm8211.*
  
  ADP1653 FLASH CONTROLLER DRIVER
@@@ -1460,6 -1460,7 +1460,6 @@@ F:      drivers/hwmon/applesmc.
  APPLETALK NETWORK LAYER
  L:    [email protected]
  S:    Odd fixes
 -F:    drivers/net/appletalk/
  F:    include/linux/atalk.h
  F:    include/uapi/linux/atalk.h
  F:    net/appletalk/
@@@ -1584,17 -1585,6 +1584,17 @@@ F:    arch/arm/include/asm/arch_timer.
  F:    arch/arm64/include/asm/arch_timer.h
  F:    drivers/clocksource/arm_arch_timer.c
  
 +ARM GENERIC INTERRUPT CONTROLLER DRIVERS
 +M:    Marc Zyngier <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/interrupt-controller/arm,gic*
 +F:    arch/arm/include/asm/arch_gicv3.h
 +F:    arch/arm64/include/asm/arch_gicv3.h
 +F:    drivers/irqchip/irq-gic*.[ch]
 +F:    include/linux/irqchip/arm-gic*.h
 +F:    include/linux/irqchip/arm-vgic-info.h
 +
  ARM HDLCD DRM DRIVER
  M:    Liviu Dudau <[email protected]>
  S:    Supported
@@@ -1636,13 -1626,13 +1636,13 @@@ F:   drivers/gpu/drm/arm/display/include
  F:    drivers/gpu/drm/arm/display/komeda/
  
  ARM MALI PANFROST DRM DRIVER
 +M:    Boris Brezillon <[email protected]>
  M:    Rob Herring <[email protected]>
 -M:    Tomeu Vizoso <[email protected]>
  R:    Steven Price <[email protected]>
 -R:    Alyssa Rosenzweig <[email protected]>
  L:    [email protected]
  S:    Supported
  T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    Documentation/gpu/panfrost.rst
  F:    drivers/gpu/drm/panfrost/
  F:    include/uapi/drm/panfrost_drm.h
  
@@@ -1798,7 -1788,7 +1798,7 @@@ F:      drivers/irqchip/irq-owl-sirq.
  F:    drivers/mmc/host/owl-mmc.c
  F:    drivers/net/ethernet/actions/
  F:    drivers/pinctrl/actions/*
 -F:    drivers/soc/actions/
 +F:    drivers/pmdomain/actions/
  F:    include/dt-bindings/power/owl-*
  F:    include/dt-bindings/reset/actions,*
  F:    include/linux/soc/actions/
@@@ -1973,12 -1963,12 +1973,12 @@@ F:   drivers/irqchip/irq-aspeed-i2c-ic.
  
  ARM/ASPEED MACHINE SUPPORT
  M:    Joel Stanley <[email protected]>
 -R:    Andrew Jeffery <andrew@aj.id.au>
 +R:    Andrew Jeffery <andrew@codeconstruct.com.au>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  Q:    https://patchwork.ozlabs.org/project/linux-aspeed/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git
  F:    Documentation/devicetree/bindings/arm/aspeed/
  F:    arch/arm/boot/dts/aspeed/
  F:    arch/arm/mach-aspeed/
@@@ -2221,28 -2211,21 +2221,28 @@@ F:   arch/arm/boot/dts/ti/omap/omap3-igep
  ARM/INTEL IXP4XX ARM ARCHITECTURE
  M:    Linus Walleij <[email protected]>
  M:    Imre Kaloz <[email protected]>
 -M:    Krzysztof Halasa <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/arm/intel-ixp4xx.yaml
 -F:    Documentation/devicetree/bindings/gpio/intel,ixp4xx-gpio.txt
 +F:    Documentation/devicetree/bindings/gpio/intel,ixp4xx-gpio.yaml
  F:    Documentation/devicetree/bindings/interrupt-controller/intel,ixp4xx-interrupt.yaml
  F:    Documentation/devicetree/bindings/memory-controllers/intel,ixp4xx-expansion*
 +F:    Documentation/devicetree/bindings/rng/intel,ixp46x-rng.yaml
  F:    Documentation/devicetree/bindings/timer/intel,ixp4xx-timer.yaml
  F:    arch/arm/boot/dts/intel/ixp/
  F:    arch/arm/mach-ixp4xx/
  F:    drivers/bus/intel-ixp4xx-eb.c
 +F:    drivers/char/hw_random/ixp4xx-rng.c
  F:    drivers/clocksource/timer-ixp4xx.c
  F:    drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c
  F:    drivers/gpio/gpio-ixp4xx.c
  F:    drivers/irqchip/irq-ixp4xx.c
 +F:    drivers/net/ethernet/xscale/ixp4xx_eth.c
 +F:    drivers/net/wan/ixp4xx_hss.c
 +F:    drivers/soc/ixp4xx/ixp4xx-npe.c
 +F:    drivers/soc/ixp4xx/ixp4xx-qmgr.c
 +F:    include/linux/soc/ixp4xx/npe.h
 +F:    include/linux/soc/ixp4xx/qmgr.h
  
  ARM/INTEL KEEMBAY ARCHITECTURE
  M:    Paul J. Murphy <[email protected]>
@@@ -2344,7 -2327,7 +2344,7 @@@ F:      drivers/rtc/rtc-mt7622.
  
  ARM/Mediatek SoC support
  M:    Matthias Brugger <[email protected]>
 -R:    AngeloGioacchino Del Regno <[email protected]>
 +M:    AngeloGioacchino Del Regno <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
@@@ -3075,7 -3058,7 +3075,7 @@@ F:      Documentation/devicetree/bindings/pe
  F:    drivers/peci/controller/peci-aspeed.c
  
  ASPEED PINCTRL DRIVERS
 -M:    Andrew Jeffery <andrew@aj.id.au>
 +M:    Andrew Jeffery <andrew@codeconstruct.com.au>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
@@@ -3092,7 -3075,7 +3092,7 @@@ F:      drivers/irqchip/irq-aspeed-scu-ic.
  F:    include/dt-bindings/interrupt-controller/aspeed-scu-ic.h
  
  ASPEED SD/MMC DRIVER
 -M:    Andrew Jeffery <andrew@aj.id.au>
 +M:    Andrew Jeffery <andrew@codeconstruct.com.au>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
@@@ -3481,14 -3464,6 +3481,14 @@@ W:    http://bcache.evilpiepirate.or
  C:    irc://irc.oftc.net/bcache
  F:    drivers/md/bcache/
  
 +BCACHEFS
 +M:    Kent Overstreet <[email protected]>
 +R:    Brian Foster <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +C:    irc://irc.oftc.net/bcache
 +F:    fs/bcachefs/
 +
  BDISP ST MEDIA DRIVER
  M:    Fabien Dessenne <[email protected]>
  L:    [email protected]
@@@ -3621,10 -3596,9 +3621,10 @@@ F:    Documentation/devicetree/bindings/ii
  F:    drivers/iio/accel/bma400*
  
  BPF JIT for ARM
 -M:    Shubham Bansal <[email protected]>
 +M:    Russell King <[email protected]>
 +M:    Puranjay Mohan <[email protected]>
  L:    [email protected]
 -S:    Odd Fixes
 +S:    Maintained
  F:    arch/arm/net/
  
  BPF JIT for ARM64
  S:    Odd Fixes
  K:    (?:\b|_)bpf(?:\b|_)
  
 +BPF [NETKIT] (BPF-programmable network device)
 +M:    Daniel Borkmann <[email protected]>
 +M:    Nikolay Aleksandrov <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/net/netkit.c
 +F:    include/net/netkit.h
 +
  BPF [NETWORKING] (struct_ops, reuseport)
  M:    Martin KaFai Lau <[email protected]>
  L:    [email protected]
@@@ -4117,7 -4082,7 +4117,7 @@@ F:      drivers/net/wireless/broadcom/brcm80
  
  BROADCOM BRCMSTB GPIO DRIVER
  M:    Doug Berger <[email protected]>
 -M:    Florian Fainelli <florian.fainelli@broadcom>
 +M:    Florian Fainelli <florian.fainelli@broadcom.com>
  R:    Broadcom internal kernel review list <[email protected]>
  S:    Supported
  F:    Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.yaml
@@@ -4355,7 -4320,8 +4355,7 @@@ F:      drivers/net/ethernet/broadcom/bcmsys
  F:    drivers/net/ethernet/broadcom/unimac.h
  
  BROADCOM TG3 GIGABIT ETHERNET DRIVER
 -M:    Siva Reddy Kallam <[email protected]>
 -M:    Prashant Sreedharan <[email protected]>
 +M:    Pavan Chebbi <[email protected]>
  M:    Michael Chan <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -4828,13 -4794,6 +4828,13 @@@ X:    drivers/char/ipmi
  X:    drivers/char/random.c
  X:    drivers/char/tpm/
  
 +CHARGERLAB POWER-Z HARDWARE MONITOR DRIVER
 +M:    Thomas Weißschuh <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/hwmon/powerz.rst
 +F:    drivers/hwmon/powerz.c
 +
  CHECKPATCH
  M:    Andy Whitcroft <[email protected]>
  M:    Joe Perches <[email protected]>
@@@ -5091,14 -5050,6 +5091,14 @@@ T:    git git://git.kernel.org/pub/scm/lin
  F:    Documentation/devicetree/bindings/timer/
  F:    drivers/clocksource/
  
 +CLOSURES
 +M:    Kent Overstreet <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +C:    irc://irc.oftc.net/bcache
 +F:    include/linux/closure.h
 +F:    lib/closure.c
 +
  CMPC ACPI DRIVER
  M:    Thadeu Lima de Souza Cascardo <[email protected]>
  M:    Daniel Oliveira Nascimento <[email protected]>
@@@ -5358,6 -5309,12 +5358,6 @@@ M:     Bence Csókás <[email protected]
  S:    Maintained
  F:    drivers/i2c/busses/i2c-cp2615.c
  
 -CPMAC ETHERNET DRIVER
 -M:    Florian Fainelli <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/net/ethernet/ti/cpmac.c
 -
  CPU FREQUENCY DRIVERS - VEXPRESS SPC ARM BIG LITTLE
  M:    Viresh Kumar <[email protected]>
  M:    Sudeep Holla <[email protected]>
@@@ -6028,9 -5985,8 +6028,9 @@@ F:      include/linux/devm-helpers.
  DEVICE-MAPPER  (LVM)
  M:    Alasdair Kergon <[email protected]>
  M:    Mike Snitzer <[email protected]>
 -M:    [email protected]
 -L:    [email protected]
 +M:    Mikulas Patocka <[email protected]>
 +M:    [email protected]
 +L:    [email protected]
  S:    Maintained
  W:    http://sources.redhat.com/dm
  Q:    http://patchwork.kernel.org/project/dm-devel/list/
@@@ -6176,7 -6132,6 +6176,7 @@@ L:      [email protected] (mode
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    Documentation/driver-api/dma-buf.rst
 +F:    Documentation/userspace-api/dma-buf-alloc-exchange.rst
  F:    drivers/dma-buf/
  F:    include/linux/*fence.h
  F:    include/linux/dma-buf.h
@@@ -6379,17 -6334,6 +6379,17 @@@ F:    Documentation/networking/device_driv
  F:    drivers/net/ethernet/freescale/dpaa2/dpaa2-switch*
  F:    drivers/net/ethernet/freescale/dpaa2/dpsw*
  
 +DPLL SUBSYSTEM
 +M:    Vadim Fedorenko <[email protected]>
 +M:    Arkadiusz Kubalewski <[email protected]>
 +M:    Jiri Pirko <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/driver-api/dpll.rst
 +F:    drivers/dpll/*
 +F:    include/linux/dpll.h
 +F:    include/uapi/linux/dpll.h
 +
  DRBD DRIVER
  M:    Philipp Reisner <[email protected]>
  M:    Lars Ellenberg <[email protected]>
@@@ -6669,7 -6613,6 +6669,7 @@@ S:      Maintaine
  B:    https://gitlab.freedesktop.org/drm/msm/-/issues
  T:    git https://gitlab.freedesktop.org/drm/msm.git
  F:    Documentation/devicetree/bindings/display/msm/
 +F:    drivers/gpu/drm/ci/xfails/msm*
  F:    drivers/gpu/drm/msm/
  F:    include/uapi/drm/msm_drm.h
  
@@@ -6704,7 -6647,6 +6704,7 @@@ F:      drivers/gpu/drm/panel/panel-novatek-
  DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS
  M:    Karol Herbst <[email protected]>
  M:    Lyude Paul <[email protected]>
 +M:    Danilo Krummrich <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -6805,7 -6747,7 +6805,7 @@@ F:      drivers/gpu/drm/panel/panel-sitronix
  DRM DRIVER FOR SITRONIX ST7703 PANELS
  M:    Guido Günther <[email protected]>
  R:    Purism Kernel Team <[email protected]>
 -R:    Ondrej Jirman <meg[email protected]>
 +R:    Ondrej Jirman <meg[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml
  F:    drivers/gpu/drm/panel/panel-sitronix-st7703.c
@@@ -6821,8 -6763,7 +6821,8 @@@ DRM DRIVER FOR SOLOMON SSD130X OLED DIS
  M:    Javier Martinez Canillas <[email protected]>
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
 -F:    Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml
 +F:    Documentation/devicetree/bindings/display/solomon,ssd-common.yaml
 +F:    Documentation/devicetree/bindings/display/solomon,ssd13*.yaml
  F:    drivers/gpu/drm/solomon/ssd130x*
  
  DRM DRIVER FOR ST-ERICSSON MCDE
@@@ -6917,26 -6858,12 +6917,26 @@@ M:   Thomas Zimmermann <tzimmermann@suse.
  S:    Maintained
  W:    https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html
  T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    Documentation/devicetree/bindings/display/
 +F:    Documentation/devicetree/bindings/gpu/
  F:    Documentation/gpu/
 -F:    drivers/gpu/drm/*
 +F:    drivers/gpu/drm/
  F:    drivers/gpu/vga/
 -F:    include/drm/drm*
 +F:    include/drm/drm
  F:    include/linux/vga*
 -F:    include/uapi/drm/drm*
 +F:    include/uapi/drm/
 +X:    drivers/gpu/drm/amd/
 +X:    drivers/gpu/drm/armada/
 +X:    drivers/gpu/drm/etnaviv/
 +X:    drivers/gpu/drm/exynos/
 +X:    drivers/gpu/drm/i915/
 +X:    drivers/gpu/drm/kmb/
 +X:    drivers/gpu/drm/mediatek/
 +X:    drivers/gpu/drm/msm/
 +X:    drivers/gpu/drm/nouveau/
 +X:    drivers/gpu/drm/radeon/
 +X:    drivers/gpu/drm/renesas/
 +X:    drivers/gpu/drm/tegra/
  
  DRM DRIVERS FOR ALLWINNER A10
  M:    Maxime Ripard <[email protected]>
@@@ -6957,7 -6884,6 +6957,7 @@@ T:      git git://anongit.freedesktop.org/dr
  F:    Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.yaml
  F:    Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml
  F:    Documentation/gpu/meson.rst
 +F:    drivers/gpu/drm/ci/xfails/meson*
  F:    drivers/gpu/drm/meson/
  
  DRM DRIVERS FOR ATMEL HLCDC
@@@ -6981,9 -6907,7 +6981,9 @@@ T:      git git://anongit.freedesktop.org/dr
  F:    Documentation/devicetree/bindings/display/bridge/
  F:    drivers/gpu/drm/bridge/
  F:    drivers/gpu/drm/drm_bridge.c
 +F:    drivers/gpu/drm/drm_bridge_connector.c
  F:    include/drm/drm_bridge.h
 +F:    include/drm/drm_bridge_connector.h
  
  DRM DRIVERS FOR EXYNOS
  M:    Inki Dae <[email protected]>
@@@ -7007,12 -6931,10 +7007,12 @@@ F:   Documentation/devicetree/bindings/di
  F:    Documentation/devicetree/bindings/display/fsl,tcon.txt
  F:    drivers/gpu/drm/fsl-dcu/
  
 -DRM DRIVERS FOR FREESCALE IMX
 +DRM DRIVERS FOR FREESCALE IMX 5/6
  M:    Philipp Zabel <[email protected]>
  L:    [email protected]
  S:    Maintained
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +T:    git git://git.pengutronix.de/git/pza/linux
  F:    Documentation/devicetree/bindings/display/imx/
  F:    drivers/gpu/drm/imx/ipuv3/
  F:    drivers/gpu/ipu-v3/
@@@ -7031,7 -6953,7 +7031,7 @@@ DRM DRIVERS FOR GMA500 (Poulsbo, Moores
  M:    Patrik Jakobsson <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://github.com/patjak/drm-gma500
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    drivers/gpu/drm/gma500/
  
  DRM DRIVERS FOR HISILICON
@@@ -7070,7 -6992,6 +7070,7 @@@ L:      [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    Documentation/devicetree/bindings/display/mediatek/
 +F:    drivers/gpu/drm/ci/xfails/mediatek*
  F:    drivers/gpu/drm/mediatek/
  F:    drivers/phy/mediatek/phy-mtk-dp.c
  F:    drivers/phy/mediatek/phy-mtk-hdmi*
@@@ -7111,7 -7032,6 +7111,7 @@@ L:      [email protected]
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    Documentation/devicetree/bindings/display/rockchip/
 +F:    drivers/gpu/drm/ci/xfails/rockchip*
  F:    drivers/gpu/drm/rockchip/
  
  DRM DRIVERS FOR STI
@@@ -7208,7 -7128,7 +7208,7 @@@ F:      Documentation/devicetree/bindings/di
  F:    drivers/gpu/drm/xlnx/
  
  DRM GPU SCHEDULER
 -M:    Luben Tuikov <luben.tuikov@amd.com>
 +M:    Luben Tuikov <ltuikov89@gmail.com>
  L:    [email protected]
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
@@@ -7217,7 -7137,6 +7217,7 @@@ F:      include/drm/gpu_scheduler.
  
  DRM PANEL DRIVERS
  M:    Neil Armstrong <[email protected]>
 +R:    Jessica Zhang <[email protected]>
  R:    Sam Ravnborg <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -8173,7 -8092,7 +8173,7 @@@ F:      include/linux/arm_ffa.
  
  FIRMWARE LOADER (request_firmware)
  M:    Luis Chamberlain <[email protected]>
 -M:    Russ Weight <russ[email protected]>
 +M:    Russ Weight <russ[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/firmware_class/
@@@ -8695,8 -8614,6 +8695,8 @@@ L:      [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/hardening
  F:    Documentation/kbuild/gcc-plugins.rst
 +F:    include/linux/stackleak.h
 +F:    kernel/stackleak.c
  F:    scripts/Makefile.gcc-plugins
  F:    scripts/gcc-plugins/
  
@@@ -8812,13 -8729,6 +8812,13 @@@ S:    Supporte
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git
  F:    drivers/pmdomain/
  
 +GENERIC RADIX TREE
 +M:    Kent Overstreet <[email protected]>
 +S:    Supported
 +C:    irc://irc.oftc.net/bcache
 +F:    include/linux/generic-radix-tree.h
 +F:    lib/generic-radix-tree.c
 +
  GENERIC RESISTIVE TOUCHSCREEN ADC DRIVER
  M:    Eugen Hristev <[email protected]>
  L:    [email protected]
@@@ -9155,7 -9065,6 +9155,7 @@@ T:      git https://git.kernel.org/pub/scm/l
  F:    Documentation/ABI/testing/debugfs-driver-habanalabs
  F:    Documentation/ABI/testing/sysfs-driver-habanalabs
  F:    drivers/accel/habanalabs/
 +F:    include/linux/habanalabs/
  F:    include/trace/events/habanalabs.h
  F:    include/uapi/drm/habanalabs_accel.h
  
@@@ -9621,8 -9530,10 +9621,8 @@@ F:     Documentation/devicetree/bindings/ii
  F:    drivers/iio/pressure/mprls0025pa.c
  
  HOST AP DRIVER
 -M:    Jouni Malinen <[email protected]>
  L:    [email protected]
  S:    Obsolete
 -W:    http://w1.fi/hostap-driver.html
  F:    drivers/net/wireless/intersil/hostap/
  
  HP BIOSCFG DRIVER
@@@ -10523,6 -10434,7 +10523,6 @@@ F:   drivers/platform/x86/intel/atomisp2/
  
  INTEL BIOS SAR INT1092 DRIVER
  M:    Shravan Sudhakar <[email protected]>
 -M:    Intel Corporation <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/platform/x86/intel/int1092/
@@@ -10562,7 -10474,6 +10562,7 @@@ C:   irc://irc.oftc.net/intel-gf
  T:    git git://anongit.freedesktop.org/drm-intel
  F:    Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon
  F:    Documentation/gpu/i915.rst
 +F:    drivers/gpu/drm/ci/xfails/i915*
  F:    drivers/gpu/drm/i915/
  F:    include/drm/i915*
  F:    include/uapi/drm/i915_drm.h
  S:    Maintained
  F:    drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c
  
 -INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
 -M:    Krzysztof Halasa <[email protected]>
 -S:    Maintained
 -F:    drivers/net/ethernet/xscale/ixp4xx_eth.c
 -F:    drivers/net/wan/ixp4xx_hss.c
 -F:    drivers/soc/ixp4xx/ixp4xx-npe.c
 -F:    drivers/soc/ixp4xx/ixp4xx-qmgr.c
 -F:    include/linux/soc/ixp4xx/npe.h
 -F:    include/linux/soc/ixp4xx/qmgr.h
 -
 -INTEL IXP4XX RANDOM NUMBER GENERATOR SUPPORT
 -M:    Deepak Saxena <[email protected]>
 -S:    Maintained
 -F:    Documentation/devicetree/bindings/rng/intel,ixp46x-rng.yaml
 -F:    drivers/char/hw_random/ixp4xx-rng.c
 -
  INTEL KEEM BAY DRM DRIVER
  M:    Anitha Chrisanthus <[email protected]>
  M:    Edmund Dea <[email protected]>
@@@ -10773,7 -10700,7 +10773,7 @@@ F:   drivers/mfd/intel-m10-bmc
  F:    include/linux/mfd/intel-m10-bmc.h
  
  INTEL MAX10 BMC SECURE UPDATES
 -M:    Russ Weight <russell.h.weight@intel.com>
 +M:    Peter Colberg <peter.colberg@intel.com>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update
@@@ -10953,6 -10880,7 +10953,6 @@@ F:   drivers/platform/x86/intel/wmi/thund
  
  INTEL WWAN IOSM DRIVER
  M:    M Chetan Kumar <[email protected]>
 -M:    Intel Corporation <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/wwan/iosm/
@@@ -11134,7 -11062,7 +11134,7 @@@ F:   Documentation/devicetree/bindings/so
  F:    sound/soc/codecs/sma*
  
  IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
 -M:    Marc Zyngier <[email protected]>
 +M:    Thomas Gleixner <[email protected]>
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
  F:    Documentation/core-api/irq/irq-domain.rst
@@@ -11153,6 -11081,7 +11153,6 @@@ F:   lib/group_cpus.
  
  IRQCHIP DRIVERS
  M:    Thomas Gleixner <[email protected]>
 -M:    Marc Zyngier <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
@@@ -11463,20 -11392,16 +11463,20 @@@ F:        usr
  
  KERNEL HARDENING (not covered by other areas)
  M:    Kees Cook <[email protected]>
 +R:    Gustavo A. R. Silva <[email protected]>
  L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/hardening
  F:    Documentation/ABI/testing/sysfs-kernel-oops_count
  F:    Documentation/ABI/testing/sysfs-kernel-warn_count
 +F:    arch/*/configs/hardening.config
  F:    include/linux/overflow.h
  F:    include/linux/randomize_kstack.h
 +F:    kernel/configs/hardening.config
  F:    mm/usercopy.c
  K:    \b(add|choose)_random_kstack_offset\b
  K:    \b__check_(object_size|heap_object)\b
 +K:    \b__counted_by\b
  
  KERNEL JANITORS
  L:    [email protected]
@@@ -12526,14 -12451,6 +12526,14 @@@ F: drivers/hwmon/ltc2947-i2c.
  F:    drivers/hwmon/ltc2947-spi.c
  F:    drivers/hwmon/ltc2947.h
  
 +LTC2991 HARDWARE MONITOR DRIVER
 +M:    Antoniu Miclaus <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +W:    https://ez.analog.com/linux-software-drivers
 +F:    Documentation/devicetree/bindings/hwmon/adi,ltc2991.yaml
 +F:    drivers/hwmon/ltc2991.c
 +
  LTC2983 IIO TEMPERATURE DRIVER
  M:    Nuno Sá <[email protected]>
  L:    [email protected]
@@@ -13585,6 -13502,7 +13585,6 @@@ F:   net/dsa/tag_mtk.
  
  MEDIATEK T7XX 5G WWAN MODEM DRIVER
  M:    Chandrashekar Devegowda <[email protected]>
 -M:    Intel Corporation <[email protected]>
  R:    Chiranjeevi Rapolu <[email protected]>
  R:    Liu Haijun <[email protected]>
  R:    M Chetan Kumar <[email protected]>
@@@ -13605,7 -13523,7 +13605,7 @@@ F:   drivers/usb/mtu3
  
  MEGACHIPS STDPXXXX-GE-B850V3-FW LVDS/DP++ BRIDGES
  M:    Peter Senna Tschudin <[email protected]>
 -M:    Martin Donnelly <martin.donnell[email protected]>
 +M:    Ian Ray <ian.ra[email protected]>
  M:    Martyn Welch <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/display/bridge/megachips-stdpxxxx-ge-b850v3-fw.txt
@@@ -13928,10 -13846,9 +13928,10 @@@ F: Documentation/devicetree/bindings/me
  F:    drivers/staging/media/meson/vdec/
  
  METHODE UDPU SUPPORT
 -M:    Vladimir Vid <vladimir.vid@sartura.hr>
 +M:    Robert Marko <robert.marko@sartura.hr>
  S:    Maintained
 -F:    arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
 +F:    arch/arm64/boot/dts/marvell/armada-3720-eDPU.dts
 +F:    arch/arm64/boot/dts/marvell/armada-3720-uDPU.*
  
  MHI BUS
  M:    Manivannan Sadhasivam <[email protected]>
@@@ -14110,7 -14027,7 +14110,7 @@@ F:   Documentation/devicetree/bindings/ii
  F:    drivers/iio/adc/mcp3911.c
  
  MICROCHIP MMC/SD/SDIO MCI DRIVER
 -M:    Ludovic Desroches <ludovic.desroche[email protected]>
 +M:    Aubin Constans <aubin.constan[email protected]>
  S:    Maintained
  F:    drivers/mmc/host/atmel-mci.c
  
@@@ -14429,11 -14346,9 +14429,11 @@@ MIPS/LOONGSON1 ARCHITECTUR
  M:    Keguang Zhang <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/devicetree/bindings/*/loongson,ls1*.yaml
  F:    arch/mips/include/asm/mach-loongson32/
  F:    arch/mips/loongson32/
  F:    drivers/*/*loongson1*
 +F:    drivers/net/ethernet/stmicro/stmmac/dwmac-loongson1.c
  
  MIPS/LOONGSON2EF ARCHITECTURE
  M:    Jiaxun Yang <[email protected]>
@@@ -14461,11 -14376,6 +14461,11 @@@ W: https://linuxtv.or
  T:    git git://linuxtv.org/media_tree.git
  F:    drivers/media/radio/radio-miropcm20*
  
 +MITSUMI MM8013 FG DRIVER
 +M:    Konrad Dybcio <[email protected]>
 +F:    Documentation/devicetree/bindings/power/supply/mitsumi,mm8013.yaml
 +F:    drivers/power/supply/mm8013.c
 +
  MMP SUPPORT
  R:    Lubomir Rintel <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -15036,7 -14946,7 +15036,7 @@@ K:   macse
  K:    \bmdo_
  
  NETWORKING [MPTCP]
 -M:    Matthieu Baerts <matt[email protected]>
 +M:    Matthieu Baerts <matt[email protected]>
  M:    Mat Martineau <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -15045,11 -14955,10 +15045,11 @@@ W:        https://github.com/multipath-tcp/mpt
  B:    https://github.com/multipath-tcp/mptcp_net-next/issues
  T:    git https://github.com/multipath-tcp/mptcp_net-next.git export-net
  T:    git https://github.com/multipath-tcp/mptcp_net-next.git export
 +F:    Documentation/netlink/specs/mptcp.yaml
  F:    Documentation/networking/mptcp-sysctl.rst
  F:    include/net/mptcp.h
  F:    include/trace/events/mptcp.h
 -F:    include/uapi/linux/mptcp.h
 +F:    include/uapi/linux/mptcp*.h
  F:    net/mptcp/
  F:    tools/testing/selftests/bpf/*/*mptcp*.c
  F:    tools/testing/selftests/net/mptcp/
@@@ -15222,7 -15131,7 +15222,7 @@@ NOLIBC HEADER FIL
  M:    Willy Tarreau <[email protected]>
  M:    Thomas Weißschuh <[email protected]>
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wtarreau/nolibc.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc.git
  F:    tools/include/nolibc/
  F:    tools/testing/selftests/nolibc/
  
@@@ -15442,7 -15351,6 +15442,7 @@@ M:   Laurentiu Palcu <laurentiu.palcu@oss
  R:    Lucas Stach <[email protected]>
  L:    [email protected]
  S:    Maintained
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    Documentation/devicetree/bindings/display/imx/nxp,imx8mq-dcss.yaml
  F:    drivers/gpu/drm/imx/dcss/
  
@@@ -16063,7 -15971,6 +16063,7 @@@ F:   Documentation/ABI/testing/sysfs-firm
  F:    drivers/of/
  F:    include/linux/of*.h
  F:    scripts/dtc/
 +F:    tools/testing/selftests/dt/
  K:    of_overlay_notifier_
  K:    of_overlay_fdt_apply
  K:    of_overlay_remove
@@@ -17694,7 -17601,6 +17694,7 @@@ M:   Kalle Valo <[email protected]
  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
  F:    drivers/net/wireless/ath/ath12k/
  
@@@ -17956,7 -17862,6 +17956,7 @@@ C:   irc://irc.oftc.net/radeo
  T:    git https://gitlab.freedesktop.org/agd5f/linux.git
  F:    Documentation/gpu/amdgpu/
  F:    drivers/gpu/drm/amd/
 +F:    drivers/gpu/drm/ci/xfails/amd*
  F:    drivers/gpu/drm/radeon/
  F:    include/uapi/drm/amdgpu_drm.h
  F:    include/uapi/drm/radeon_drm.h
@@@ -18021,6 -17926,7 +18021,6 @@@ F:   arch/mips/boot/dts/ralink/mt7621
  
  RALINK RT2X00 WIRELESS LAN DRIVER
  M:    Stanislaw Gruszka <[email protected]>
 -M:    Helmut Schaa <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/wireless/ralink/rt2x00/
@@@ -18225,6 -18131,8 +18225,6 @@@ REALTEK WIRELESS DRIVER (rtlwifi family
  M:    Ping-Ke Shih <[email protected]>
  L:    [email protected]
  S:    Maintained
 -W:    https://wireless.wiki.kernel.org/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
  F:    drivers/net/wireless/realtek/rtlwifi/
  
  REALTEK WIRELESS DRIVER (rtw88)
@@@ -18752,6 -18660,7 +18752,6 @@@ F:   drivers/media/dvb-frontends/rtl2832_
  RTL8180 WIRELESS DRIVER
  L:    [email protected]
  S:    Orphan
 -W:    https://wireless.wiki.kernel.org/
  F:    drivers/net/wireless/realtek/rtl818x/rtl8180/
  
  RTL8187 WIRELESS DRIVER
@@@ -18759,12 -18668,14 +18759,12 @@@ M:        Hin-Tak Leung <[email protected]
  M:    Larry Finger <[email protected]>
  L:    [email protected]
  S:    Maintained
 -W:    https://wireless.wiki.kernel.org/
  F:    drivers/net/wireless/realtek/rtl818x/rtl8187/
  
  RTL8XXXU WIRELESS DRIVER (rtl8xxxu)
  M:    Jes Sorensen <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jes/linux.git rtl8xxxu-devel
  F:    drivers/net/wireless/realtek/rtl8xxxu/
  
  RTRS TRANSPORT DRIVERS
@@@ -18797,10 -18708,9 +18797,10 @@@ R: Andreas Hindborg <a.hindborg@samsung
  R:    Alice Ryhl <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    https://github.com/Rust-for-Linux/linux
 +W:    https://rust-for-linux.com
  B:    https://github.com/Rust-for-Linux/linux/issues
  C:    zulip://rust-for-linux.zulipchat.com
 +P:    https://rust-for-linux.com/contributing
  T:    git https://github.com/Rust-for-Linux/linux.git rust-next
  F:    Documentation/rust/
  F:    rust/
@@@ -19335,8 -19245,7 +19335,8 @@@ F:   Documentation/devicetree/bindings/mm
  F:    drivers/mmc/host/sdhci*
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) MICROCHIP DRIVER
 -M:    Eugen Hristev <[email protected]>
 +M:    Aubin Constans <[email protected]>
 +R:    Eugen Hristev <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/mmc/host/sdhci-of-at91.c
@@@ -19493,7 -19402,6 +19493,7 @@@ F:   drivers/net/ethernet/sfc
  
  SFCTEMP HWMON DRIVER
  M:    Emil Renner Berthing <[email protected]>
 +M:    Hal Feng <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/hwmon/starfive,jh71x0-temp.yaml
@@@ -20155,6 -20063,13 +20155,13 @@@ F: drivers/char/sonypi.
  F:    drivers/platform/x86/sony-laptop.c
  F:    include/linux/sony-laptop.h
  
+ SOPHGO DEVICETREES
+ M:    Chao Wei <[email protected]>
+ M:    Chen Wang <[email protected]>
+ S:    Maintained
+ F:    arch/riscv/boot/dts/sophgo/
+ F:    Documentation/devicetree/bindings/riscv/sophgo.yaml
  SOUND
  M:    Jaroslav Kysela <[email protected]>
  M:    Takashi Iwai <[email protected]>
@@@ -20581,7 -20496,6 +20588,7 @@@ F:   include/dt-bindings/clock/starfive?j
  STARFIVE JH71X0 PINCTRL DRIVERS
  M:    Emil Renner Berthing <[email protected]>
  M:    Jianlong Huang <[email protected]>
 +M:    Hal Feng <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/pinctrl/starfive,jh71*.yaml
@@@ -20605,10 -20519,9 +20612,10 @@@ F: drivers/usb/cdns3/cdns3-starfive.
  
  STARFIVE JH71XX PMU CONTROLLER DRIVER
  M:    Walker Chen <[email protected]>
 +M:    Changhuang Liang <[email protected]>
  S:    Supported
  F:    Documentation/devicetree/bindings/power/starfive*
 -F:    drivers/pmdomain/starfive/jh71xx-pmu.c
 +F:    drivers/pmdomain/starfive/
  F:    include/dt-bindings/power/starfive,jh7110-pmu.h
  
  STARFIVE SOC DRIVERS
@@@ -20616,6 -20529,7 +20623,6 @@@ M:   Conor Dooley <[email protected]
  S:    Maintained
  T:    git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/
  F:    Documentation/devicetree/bindings/soc/starfive/
 -F:    drivers/soc/starfive/
  
  STARFIVE TRNG DRIVER
  M:    Jia Jie Ho <[email protected]>
@@@ -21455,8 -21369,8 +21462,8 @@@ F:   drivers/media/radio/radio-raremono.
  THERMAL
  M:    Rafael J. Wysocki <[email protected]>
  M:    Daniel Lezcano <[email protected]>
 -R:    Amit Kucheria <[email protected]>
  R:    Zhang Rui <[email protected]>
 +R:    Lukasz Luba <[email protected]>
  L:    [email protected]
  S:    Supported
  Q:    https://patchwork.kernel.org/project/linux-pm/list/
  S:    Orphan
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/wl12xx
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/wl1251
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git
  F:    drivers/net/wireless/ti/
  
  TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER
@@@ -21923,9 -21838,11 +21930,11 @@@ W: https://www.tq-group.com/en/products
  F:    arch/arm/boot/dts/imx*mba*.dts*
  F:    arch/arm/boot/dts/imx*tqma*.dts*
  F:    arch/arm/boot/dts/mba*.dtsi
+ F:    arch/arm64/boot/dts/freescale/fsl-*tqml*.dts*
  F:    arch/arm64/boot/dts/freescale/imx*mba*.dts*
  F:    arch/arm64/boot/dts/freescale/imx*tqma*.dts*
  F:    arch/arm64/boot/dts/freescale/mba*.dtsi
+ F:    arch/arm64/boot/dts/freescale/tqml*.dts*
  F:    drivers/gpio/gpio-tqmx86.c
  F:    drivers/mfd/tqmx86.c
  F:    drivers/watchdog/tqmx86_wdt.c
  L:    [email protected]
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    drivers/gpu/drm/ci/xfails/virtio*
  F:    drivers/gpu/drm/virtio/
  F:    include/uapi/linux/virtio_gpu.h
  
@@@ -23132,7 -23048,7 +23141,7 @@@ F:   drivers/scsi/vmw_pvscsi.
  F:    drivers/scsi/vmw_pvscsi.h
  
  VMWARE VIRTUAL PTP CLOCK DRIVER
 -M:    Deep Shah <sdeep@vmware.com>
 +M:    Jeff Sipek <jsipek@vmware.com>
  R:    Ajay Kaher <[email protected]>
  R:    Alexey Makhalov <[email protected]>
  R:    VMware PV-Drivers Reviewers <[email protected]>
@@@ -23779,11 -23695,6 +23788,11 @@@ F: Documentation/devicetree/bindings/gp
  F:    drivers/gpio/gpio-xilinx.c
  F:    drivers/gpio/gpio-zynq.c
  
 +XILINX LL TEMAC ETHERNET DRIVER
 +L:    [email protected]
 +S:    Orphan
 +F:    drivers/net/ethernet/xilinx/ll_temac*
 +
  XILINX PWM DRIVER
  M:    Sean Anderson <[email protected]>
  S:    Maintained
@@@ -23816,13 -23727,6 +23825,13 @@@ F: Documentation/devicetree/bindings/me
  F:    drivers/media/platform/xilinx/
  F:    include/uapi/linux/xilinx-v4l2-controls.h
  
 +XILINX VERSAL EDAC DRIVER
 +M:    Shubhrajyoti Datta <[email protected]>
 +M:    Sai Krishna Potthuri <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/memory-controllers/xlnx,versal-ddrmc-edac.yaml
 +F:    drivers/edac/versal_edac.c
 +
  XILINX WATCHDOG DRIVER
  M:    Srinivas Neeli <[email protected]>
  R:    Shubhrajyoti Datta <[email protected]>
index 88a4b0d6d928d4c2e0636a2a026bfec645129338,71964262cd5ff83c524b38d6e0b64becc1572d9f..7bf557c995614980a513a44915e579be6abe0304
@@@ -27,6 -27,7 +27,7 @@@
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
+               enable-method = "rockchip,rk3036-smp";
  
                cpu0: cpu@f00 {
                        device_type = "cpu";
                        reg = <0xf00>;
                        clock-latency = <40000>;
                        clocks = <&cru ARMCLK>;
-                       operating-points = <
-                               /* KHz    uV */
-                                816000 1000000
-                       >;
+                       resets = <&cru SRST_CORE0>;
+                       operating-points-v2 = <&cpu_opp_table>;
                        #cooling-cells = <2>; /* min followed by max */
                };
  
                        device_type = "cpu";
                        compatible = "arm,cortex-a7";
                        reg = <0xf01>;
+                       resets = <&cru SRST_CORE1>;
+                       operating-points-v2 = <&cpu_opp_table>;
                };
  
                cpu2: cpu@f02 {
                        device_type = "cpu";
                        compatible = "arm,cortex-a7";
                        reg = <0xf02>;
+                       resets = <&cru SRST_CORE2>;
+                       operating-points-v2 = <&cpu_opp_table>;
                };
  
                cpu3: cpu@f03 {
                        device_type = "cpu";
                        compatible = "arm,cortex-a7";
                        reg = <0xf03>;
+                       resets = <&cru SRST_CORE3>;
+                       operating-points-v2 = <&cpu_opp_table>;
+               };
+       };
+       cpu_opp_table: opp-table-0 {
+               compatible = "operating-points-v2";
+               opp-shared;
+               opp-216000000 {
+                       opp-hz = /bits/ 64 <216000000>;
+                       opp-microvolt = <950000 950000 1325000>;
+               };
+               opp-408000000 {
+                       opp-hz = /bits/ 64 <408000000>;
+                       opp-microvolt = <950000 950000 1325000>;
+               };
+               opp-600000000 {
+                       opp-hz = /bits/ 64 <600000000>;
+                       opp-microvolt = <950000 950000 1325000>;
+               };
+               opp-696000000 {
+                       opp-hz = /bits/ 64 <696000000>;
+                       opp-microvolt = <975000 975000 1325000>;
+               };
+               opp-816000000 {
+                       opp-hz = /bits/ 64 <816000000>;
+                       opp-microvolt = <1075000 1075000 1325000>;
+                       opp-suspend;
+               };
+               opp-1008000000 {
+                       opp-hz = /bits/ 64 <1008000000>;
+                       opp-microvolt = <1200000 1200000 1325000>;
+               };
+               opp-1200000000 {
+                       opp-hz = /bits/ 64 <1200000000>;
+                       opp-microvolt = <1325000 1325000 1325000>;
                };
        };
  
                compatible = "arm,armv7-timer";
                interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>,
                             <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>,
 -                           <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
 +                           <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>,
 +                           <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
                arm,cpu-registers-not-fw-configured;
                clock-frequency = <24000000>;
        };
                #clock-cells = <0>;
        };
  
+       imem: sram@10080000 {
+               compatible = "mmio-sram";
+               reg = <0x10080000 0x2000>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+               ranges = <0 0x10080000 0x2000>;
+               smp-sram@0 {
+                       compatible = "rockchip,rk3066-smp-sram";
+                       reg = <0x00 0x10>;
+               };
+       };
        pmu: syscon@100a0000 {
                compatible = "rockchip,rk3128-pmu", "syscon", "simple-mfd";
                reg = <0x100a0000 0x1000>;
                compatible = "rockchip,rk3128-timer", "rockchip,rk3288-timer";
                reg = <0x20044000 0x20>;
                interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
 -              clocks = <&cru PCLK_TIMER>, <&xin24m>;
 +              clocks = <&cru PCLK_TIMER>, <&cru SCLK_TIMER0>;
                clock-names = "pclk", "timer";
        };
  
                compatible = "rockchip,rk3128-timer", "rockchip,rk3288-timer";
                reg = <0x20044020 0x20>;
                interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
 -              clocks = <&cru PCLK_TIMER>, <&xin24m>;
 +              clocks = <&cru PCLK_TIMER>, <&cru SCLK_TIMER1>;
                clock-names = "pclk", "timer";
        };
  
                compatible = "rockchip,rk3128-timer", "rockchip,rk3288-timer";
                reg = <0x20044040 0x20>;
                interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>;
 -              clocks = <&cru PCLK_TIMER>, <&xin24m>;
 +              clocks = <&cru PCLK_TIMER>, <&cru SCLK_TIMER2>;
                clock-names = "pclk", "timer";
        };
  
                compatible = "rockchip,rk3128-timer", "rockchip,rk3288-timer";
                reg = <0x20044060 0x20>;
                interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
 -              clocks = <&cru PCLK_TIMER>, <&xin24m>;
 +              clocks = <&cru PCLK_TIMER>, <&cru SCLK_TIMER3>;
                clock-names = "pclk", "timer";
        };
  
                compatible = "rockchip,rk3128-timer", "rockchip,rk3288-timer";
                reg = <0x20044080 0x20>;
                interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
 -              clocks = <&cru PCLK_TIMER>, <&xin24m>;
 +              clocks = <&cru PCLK_TIMER>, <&cru SCLK_TIMER4>;
                clock-names = "pclk", "timer";
        };
  
                compatible = "rockchip,rk3128-timer", "rockchip,rk3288-timer";
                reg = <0x200440a0 0x20>;
                interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
 -              clocks = <&cru PCLK_TIMER>, <&xin24m>;
 +              clocks = <&cru PCLK_TIMER>, <&cru SCLK_TIMER5>;
                clock-names = "pclk", "timer";
        };
  
  
        i2c0: i2c@20072000 {
                compatible = "rockchip,rk3128-i2c", "rockchip,rk3288-i2c";
 -              reg = <20072000 0x1000>;
 +              reg = <0x20072000 0x1000>;
                interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
                clock-names = "i2c";
                clocks = <&cru PCLK_I2C0>;
                interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
                arm,pl330-broken-no-flushp;
 +              arm,pl330-periph-burst;
                clocks = <&cru ACLK_DMAC>;
                clock-names = "apb_pclk";
                #dma-cells = <1>;
index d2d516d113baa7a33b3dba06ccede72623369e80,ead5700e9f60f73772919d90ba9640efe86792ee..a2bb3609c94feb258e4220bd3d87cba3a85b3e68
@@@ -67,7 -67,8 +67,8 @@@
        fsusb1_phy: usb-phy@1 {
                compatible = "motorola,mapphone-mdm6600";
                pinctrl-0 = <&usb_mdm6600_pins>;
-               pinctrl-names = "default";
+               pinctrl-1 = <&usb_mdm6600_sleep_pins>;
+               pinctrl-names = "default", "sleep";
                enable-gpios = <&gpio3 31 GPIO_ACTIVE_LOW>;     /* gpio_95 */
                power-gpios = <&gpio2 22 GPIO_ACTIVE_HIGH>;     /* gpio_54 */
                reset-gpios = <&gpio2 17 GPIO_ACTIVE_HIGH>;     /* gpio_49 */
                >;
        };
  
+       /* Modem sleep pins to keep gpio_49 high with internal pull */
+       usb_mdm6600_sleep_pins: usb-mdm6600-sleep-pins {
+               pinctrl-single,pins = <
+               OMAP4_IOPAD(0x0d8, PIN_INPUT | MUX_MODE3)
+               OMAP4_IOPAD(0x07c, PIN_OUTPUT | MUX_MODE3)
+               OMAP4_IOPAD(0x072, PIN_INPUT_PULLUP | MUX_MODE7) /* Keep gpio_49 reset high */
+               OMAP4_IOPAD(0x14e, PIN_OUTPUT | MUX_MODE3)
+               OMAP4_IOPAD(0x150, PIN_OFF_OUTPUT_LOW | PIN_INPUT | MUX_MODE3)
+               OMAP4_IOPAD(0x07e, PIN_INPUT | MUX_MODE3)
+               OMAP4_IOPAD(0x07a, PIN_INPUT | MUX_MODE3)
+               OMAP4_IOPAD(0x078, PIN_INPUT | MUX_MODE3)
+               OMAP4_IOPAD(0x094, PIN_OUTPUT | MUX_MODE3)
+               OMAP4_IOPAD(0x096, PIN_OUTPUT | MUX_MODE3)
+               OMAP4_IOPAD(0x142, PIN_OUTPUT | MUX_MODE3)
+               >;
+       };
        usb_ulpi_pins: usb-ulpi-pins {
                pinctrl-single,pins = <
                OMAP4_IOPAD(0x196, MUX_MODE7)
  /* Configure pwm clock source for timers 8 & 9 */
  &timer8 {
        assigned-clocks = <&abe_clkctrl OMAP4_TIMER8_CLKCTRL 24>;
 -      assigned-clock-parents = <&sys_clkin_ck>;
 +      assigned-clock-parents = <&sys_32k_ck>;
  };
  
  &timer9 {
        assigned-clocks = <&l4_per_clkctrl OMAP4_TIMER9_CLKCTRL 24>;
 -      assigned-clock-parents = <&sys_clkin_ck>;
 +      assigned-clock-parents = <&sys_32k_ck>;
  };
  
  /*
  &uart3 {
        interrupts-extended = <&wakeupgen GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH
                               &omap4_pmx_core 0x17c>;
 +      overrun-throttle-ms = <500>;
  };
  
  &uart4 {
index dcf6e4846ac9def75627e3e428ae481c385818da,4a0d604fd0dba77854f6274237d9f55d49b12fc6..ceccf476644072156319648f406610c827ee0792
                        #size-cells = <1>;
                        ranges;
  
 -                      anomix_ns_gpr: syscon@44210000 {
+                       edma1: dma-controller@44000000 {
+                               compatible = "fsl,imx93-edma3";
+                               reg = <0x44000000 0x200000>;
+                               #dma-cells = <3>;
+                               dma-channels = <31>;
+                               interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>,  //  0: Reserved
+                                            <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>,  //  1: CANFD1
+                                            <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>,  //  2: Reserved
+                                            <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>,  //  3: GPIO1 CH0
+                                            <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>,  //  4: GPIO1 CH1
+                                            <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>, //  5: I3C1 TO Bus
+                                            <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>, //  6: I3C1 From Bus
+                                            <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>, //  7: LPI2C1 M TX
+                                            <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>, //  8: LPI2C1 S TX
+                                            <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>, //  9: LPI2C2 M RX
+                                            <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>, // 10: LPI2C2 S RX
+                                            <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>, // 11: LPSPI1 TX
+                                            <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>, // 12: LPSPI1 RX
+                                            <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>, // 13: LPSPI2 TX
+                                            <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>, // 14: LPSPI2 RX
+                                            <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>, // 15: LPTMR1
+                                            <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>, // 16: LPUART1 TX
+                                            <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>, // 17: LPUART1 RX
+                                            <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>, // 18: LPUART2 TX
+                                            <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>, // 19: LPUART2 RX
+                                            <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>, // 20: S400
+                                            <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>, // 21: SAI TX
+                                            <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>, // 22: SAI RX
+                                            <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>, // 23: TPM1 CH0/CH2
+                                            <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>, // 24: TPM1 CH1/CH3
+                                            <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>, // 25: TPM1 Overflow
+                                            <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>, // 26: TMP2 CH0/CH2
+                                            <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>, // 27: TMP2 CH1/CH3
+                                            <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>, // 28: TMP2 Overflow
+                                            <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>, // 29: PDM
+                                            <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>; // 30: ADC1
+                               clocks = <&clk IMX93_CLK_EDMA1_GATE>;
+                               clock-names = "dma";
+                       };
 +                      aonmix_ns_gpr: syscon@44210000 {
                                compatible = "fsl,imx93-aonmix-ns-syscfg", "syscon";
                                reg = <0x44210000 0x1000>;
                        };
                                interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clk IMX93_CLK_LPUART1_GATE>;
                                clock-names = "ipg";
+                               dmas = <&edma1 17 0 1>, <&edma1 16 0 0>;
+                               dma-names = "rx", "tx";
                                status = "disabled";
                        };
  
                                interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clk IMX93_CLK_LPUART2_GATE>;
                                clock-names = "ipg";
+                               dmas = <&edma1 19 0 1>, <&edma1 18 0 0>;
+                               dma-names = "rx", "tx";
                                status = "disabled";
                        };
  
                                assigned-clock-parents = <&clk IMX93_CLK_SYS_PLL_PFD1_DIV2>;
                                assigned-clock-rates = <40000000>;
                                fsl,clk-source = /bits/ 8 <0>;
 +                              fsl,stop-mode = <&aonmix_ns_gpr 0x14 0>;
                                status = "disabled";
                        };
  
                        tmu: tmu@44482000 {
                                compatible = "fsl,qoriq-tmu";
                                reg = <0x44482000 0x1000>;
+                               interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clk IMX93_CLK_TMC_GATE>;
                                little-endian;
                                fsl,tmu-range = <0x800000da 0x800000e9
                        #size-cells = <1>;
                        ranges;
  
+                       edma2: dma-controller@42000000 {
+                               compatible = "fsl,imx93-edma4";
+                               reg = <0x42000000 0x210000>;
+                               #dma-cells = <3>;
+                               shared-interrupt;
+                               dma-channels = <64>;
+                               interrupts = <GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 129 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 129 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 132 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 132 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 135 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 135 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH>;
+                               clocks = <&clk IMX93_CLK_EDMA2_GATE>;
+                               clock-names = "dma";
+                       };
                        wakeupmix_gpr: syscon@42420000 {
                                compatible = "fsl,imx93-wakeupmix-syscfg", "syscon";
                                reg = <0x42420000 0x1000>;
                                interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clk IMX93_CLK_LPUART3_GATE>;
                                clock-names = "ipg";
+                               dmas = <&edma2 18 0 1>, <&edma2 17 0 0>;
+                               dma-names = "rx", "tx";
                                status = "disabled";
                        };
  
                                interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clk IMX93_CLK_LPUART4_GATE>;
                                clock-names = "ipg";
+                               dmas = <&edma2 20 0 1>, <&edma2 19 0 0>;
+                               dma-names = "rx", "tx";
                                status = "disabled";
                        };
  
                                interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clk IMX93_CLK_LPUART5_GATE>;
                                clock-names = "ipg";
+                               dmas = <&edma2 22 0 1>, <&edma2 21 0 0>;
+                               dma-names = "rx", "tx";
                                status = "disabled";
                        };
  
                                interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clk IMX93_CLK_LPUART6_GATE>;
                                clock-names = "ipg";
+                               dmas = <&edma2 24 0 1>, <&edma2 23 0 0>;
+                               dma-names = "rx", "tx";
                                status = "disabled";
                        };
  
                                assigned-clock-parents = <&clk IMX93_CLK_SYS_PLL_PFD1_DIV2>;
                                assigned-clock-rates = <40000000>;
                                fsl,clk-source = /bits/ 8 <0>;
 +                              fsl,stop-mode = <&wakeupmix_gpr 0x0c 2>;
                                status = "disabled";
                        };
  
                                interrupts = <GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clk IMX93_CLK_LPUART7_GATE>;
                                clock-names = "ipg";
+                               dmas = <&edma2 88 0 1>, <&edma2 87 0 0>;
+                               dma-names = "rx", "tx";
                                status = "disabled";
                        };
  
                                interrupts = <GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clk IMX93_CLK_LPUART8_GATE>;
                                clock-names = "ipg";
+                               dmas =  <&edma2 90 0 1>, <&edma2 89 0 0>;
+                               dma-names = "rx", "tx";
                                status = "disabled";
                        };
  
                };
  
                gpio2: gpio@43810080 {
-                       compatible = "fsl,imx93-gpio", "fsl,imx7ulp-gpio";
-                       reg = <0x43810080 0x1000>, <0x43810040 0x40>;
+                       compatible = "fsl,imx93-gpio", "fsl,imx8ulp-gpio";
+                       reg = <0x43810000 0x1000>;
                        gpio-controller;
                        #gpio-cells = <2>;
-                       interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>;
                        interrupt-controller;
                        #interrupt-cells = <2>;
                        clocks = <&clk IMX93_CLK_GPIO2_GATE>,
                };
  
                gpio3: gpio@43820080 {
-                       compatible = "fsl,imx93-gpio", "fsl,imx7ulp-gpio";
-                       reg = <0x43820080 0x1000>, <0x43820040 0x40>;
+                       compatible = "fsl,imx93-gpio", "fsl,imx8ulp-gpio";
+                       reg = <0x43820000 0x1000>;
                        gpio-controller;
                        #gpio-cells = <2>;
-                       interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
                        interrupt-controller;
                        #interrupt-cells = <2>;
                        clocks = <&clk IMX93_CLK_GPIO3_GATE>,
                };
  
                gpio4: gpio@43830080 {
-                       compatible = "fsl,imx93-gpio", "fsl,imx7ulp-gpio";
-                       reg = <0x43830080 0x1000>, <0x43830040 0x40>;
+                       compatible = "fsl,imx93-gpio", "fsl,imx8ulp-gpio";
+                       reg = <0x43830000 0x1000>;
                        gpio-controller;
                        #gpio-cells = <2>;
-                       interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>;
                        interrupt-controller;
                        #interrupt-cells = <2>;
                        clocks = <&clk IMX93_CLK_GPIO4_GATE>,
                };
  
                gpio1: gpio@47400080 {
-                       compatible = "fsl,imx93-gpio", "fsl,imx7ulp-gpio";
-                       reg = <0x47400080 0x1000>, <0x47400040 0x40>;
+                       compatible = "fsl,imx93-gpio", "fsl,imx8ulp-gpio";
+                       reg = <0x47400000 0x1000>;
                        gpio-controller;
                        #gpio-cells = <2>;
-                       interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
                        interrupt-controller;
                        #interrupt-cells = <2>;
                        clocks = <&clk IMX93_CLK_GPIO1_GATE>,
index 5d635085fe3fd0cc6534dd0bd045bbf8642de59b,937120f3ff5912328e5b64fefdb3ef5415707f9e..69c7f3954ae59a8008a257807d31f227ba1cd2a8
@@@ -48,7 -48,7 +48,7 @@@
  
        memory@40000000 {
                device_type = "memory";
 -              reg = <0 0x40000000 0 0x80000000>;
 +              reg = <0 0x40000000 0x2 0x00000000>;
        };
  
        reserved-memory {
                #size-cells = <2>;
                ranges;
  
 -              /* 2 MiB reserved for ARM Trusted Firmware (BL31) */
 -              bl31_secmon_reserved: secmon@54600000 {
 -                      no-map;
 -                      reg = <0 0x54600000 0x0 0x200000>;
 -              };
 -
 -              /* 12 MiB reserved for OP-TEE (BL32)
 +              /*
 +               * 12 MiB reserved for OP-TEE (BL32)
                 * +-----------------------+ 0x43e0_0000
                 * |      SHMEM 2MiB       |
                 * +-----------------------+ 0x43c0_0000
                        no-map;
                        reg = <0 0x43200000 0 0x00c00000>;
                };
 +
 +              scp_mem: memory@50000000 {
 +                      compatible = "shared-dma-pool";
 +                      reg = <0 0x50000000 0 0x2900000>;
 +                      no-map;
 +              };
 +
 +              vpu_mem: memory@53000000 {
 +                      compatible = "shared-dma-pool";
 +                      reg = <0 0x53000000 0 0x1400000>; /* 20 MB */
 +              };
 +
 +              /* 2 MiB reserved for ARM Trusted Firmware (BL31) */
 +              bl31_secmon_mem: memory@54600000 {
 +                      no-map;
 +                      reg = <0 0x54600000 0x0 0x200000>;
 +              };
 +
 +              snd_dma_mem: memory@60000000 {
 +                      compatible = "shared-dma-pool";
 +                      reg = <0 0x60000000 0 0x1100000>;
 +                      no-map;
 +              };
 +
 +              apu_mem: memory@62000000 {
 +                      compatible = "shared-dma-pool";
 +                      reg = <0 0x62000000 0 0x1400000>; /* 20 MB */
 +              };
        };
  };
  
  &eth {
-       phy-mode ="rgmii-id";
+       phy-mode = "rgmii-id";
        phy-handle = <&ethernet_phy0>;
        snps,reset-gpio = <&pio 93 GPIO_ACTIVE_HIGH>;
        snps,reset-delays-us = <0 10000 80000>;
index 3067a4091a7afbd16bdfd764ff43f7e163308dd2,d2aaff3e0d02ee9aa23b64dec74be48997148df3..e8148b3d6c50c670d6bc8045e42074162dc1c6d9
                stdout-path = "serial0:115200n8";
        };
  
 -      clocks {
 -              divclk4: divclk4 {
 -                      compatible = "fixed-clock";
 -                      #clock-cells = <0>;
 -                      clock-frequency = <32768>;
 -                      clock-output-names = "divclk4";
 +      div1_mclk: divclk1 {
 +              compatible = "gpio-gate-clock";
 +              pinctrl-0 = <&audio_mclk>;
 +              pinctrl-names = "default";
 +              clocks = <&rpmcc RPM_SMD_DIV_CLK1>;
 +              #clock-cells = <0>;
 +              enable-gpios = <&pm8994_gpios 15 0>;
 +      };
  
 -                      pinctrl-names = "default";
 -                      pinctrl-0 = <&divclk4_pin_a>;
 -              };
 +      divclk4: divclk4 {
 +              compatible = "fixed-clock";
 +              #clock-cells = <0>;
 +              clock-frequency = <32768>;
 +              clock-output-names = "divclk4";
  
 -              div1_mclk: divclk1 {
 -                      compatible = "gpio-gate-clock";
 -                      pinctrl-0 = <&audio_mclk>;
 -                      pinctrl-names = "default";
 -                      clocks = <&rpmcc RPM_SMD_DIV_CLK1>;
 -                      #clock-cells = <0>;
 -                      enable-gpios = <&pm8994_gpios 15 0>;
 -              };
 +              pinctrl-names = "default";
 +              pinctrl-0 = <&divclk4_pin_a>;
        };
  
        gpio-keys {
  
        vdda-phy-supply = <&vreg_l28a_0p925>;
        vdda-pll-supply = <&vreg_l12a_1p8>;
-       vddp-ref-clk-supply = <&vreg_l25a_1p2>;
  };
  
  &ufshc {
        vcc-supply = <&vreg_l20a_2p95>;
        vccq-supply = <&vreg_l25a_1p2>;
        vccq2-supply = <&vreg_s4a_1p8>;
+       vdd-hba-supply = <&vreg_l25a_1p2>;
  
        vcc-max-microamp = <600000>;
        vccq-max-microamp = <450000>;
index 06f8ff624181fc1dde3fa825a86f15dee6249a9e,87b3a035a88b1ebb637496147a839bfbdc52ae8f..5ab583be9e0a00019c1b331fda951690baf8e378
  #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
  
  / {
 -      clocks {
 -              divclk1_cdc: divclk1 {
 -                      compatible = "gpio-gate-clock";
 -                      clocks = <&rpmcc RPM_SMD_DIV_CLK1>;
 -                      #clock-cells = <0>;
 -                      enable-gpios = <&pm8994_gpios 15 GPIO_ACTIVE_HIGH>;
 +      divclk1_cdc: divclk1 {
 +              compatible = "gpio-gate-clock";
 +              clocks = <&rpmcc RPM_SMD_DIV_CLK1>;
 +              #clock-cells = <0>;
 +              enable-gpios = <&pm8994_gpios 15 GPIO_ACTIVE_HIGH>;
  
 -                      pinctrl-names = "default";
 -                      pinctrl-0 = <&divclk1_default>;
 -              };
 +              pinctrl-names = "default";
 +              pinctrl-0 = <&divclk1_default>;
 +      };
  
 -              divclk4: divclk4 {
 -                      compatible = "fixed-clock";
 -                      #clock-cells = <0>;
 -                      clock-frequency = <32768>;
 -                      clock-output-names = "divclk4";
 +      divclk4: divclk4 {
 +              compatible = "fixed-clock";
 +              #clock-cells = <0>;
 +              clock-frequency = <32768>;
 +              clock-output-names = "divclk4";
  
 -                      pinctrl-names = "default";
 -                      pinctrl-0 = <&divclk4_pin_a>;
 -              };
 +              pinctrl-names = "default";
 +              pinctrl-0 = <&divclk4_pin_a>;
        };
  
        gpio-keys {
                        no-map;
  
                        qcom,client-id = <1>;
-                       qcom,vmid = <15>;
+                       qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
                };
  
                /delete-node/ mba@91500000;
        vcc-supply = <&vreg_l20a_2p95>;
        vccq-supply = <&vreg_l25a_1p2>;
        vccq2-supply = <&vreg_s4a_1p8>;
+       vdd-hba-supply = <&vreg_l25a_1p2>;
  
        vcc-max-microamp = <600000>;
        vccq-max-microamp = <450000>;
  
        vdda-phy-supply = <&vreg_l28a_0p925>;
        vdda-pll-supply = <&vreg_l12a_1p8>;
-       vddp-ref-clk-supply = <&vreg_l25a_1p2>;
  };
  
  &venus {
index 06c53000bb74d47634a5460f2e18f244154e9f8a,b7629f145fd1aad69c509ad35311f4a154236634..97623af13464c26d5ef30d62257819e014afdec4
@@@ -5,7 -5,9 +5,9 @@@
   */
  
  #include <dt-bindings/dma/qcom-gpi.h>
+ #include <dt-bindings/firmware/qcom,scm.h>
  #include <dt-bindings/interrupt-controller/arm-gic.h>
+ #include <dt-bindings/phy/phy-qcom-qmp.h>
  #include <dt-bindings/power/qcom-rpmpd.h>
  #include <dt-bindings/soc/qcom,rpmh-rsc.h>
  #include <dt-bindings/clock/qcom,rpmh.h>
                        no-map;
  
                        qcom,client-id = <1>;
-                       qcom,vmid = <15>;
+                       qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
                };
  
                camera_mem: memory@8b700000 {
  
                        power-domains = <&gcc PCIE_0_GDSC>;
  
-                       phys = <&pcie0_lane>;
+                       phys = <&pcie0_phy>;
                        phy-names = "pciephy";
  
                        perst-gpio = <&tlmm 35 GPIO_ACTIVE_HIGH>;
  
                pcie0_phy: phy@1c06000 {
                        compatible = "qcom,sm8150-qmp-gen3x1-pcie-phy";
-                       reg = <0 0x01c06000 0 0x1c0>;
-                       #address-cells = <2>;
-                       #size-cells = <2>;
-                       ranges;
+                       reg = <0 0x01c06000 0 0x1000>;
                        clocks = <&gcc GCC_PCIE_PHY_AUX_CLK>,
                                 <&gcc GCC_PCIE_0_CFG_AHB_CLK>,
-                                <&gcc GCC_PCIE0_PHY_REFGEN_CLK>;
-                       clock-names = "aux", "cfg_ahb", "refgen";
+                                <&gcc GCC_PCIE_0_CLKREF_CLK>,
+                                <&gcc GCC_PCIE0_PHY_REFGEN_CLK>,
+                                <&gcc GCC_PCIE_0_PIPE_CLK>;
+                       clock-names = "aux",
+                                     "cfg_ahb",
+                                     "ref",
+                                     "refgen",
+                                     "pipe";
+                       clock-output-names = "pcie_0_pipe_clk";
+                       #clock-cells = <0>;
+                       #phy-cells = <0>;
  
                        resets = <&gcc GCC_PCIE_0_PHY_BCR>;
                        reset-names = "phy";
                        assigned-clock-rates = <100000000>;
  
                        status = "disabled";
-                       pcie0_lane: phy@1c06200 {
-                               reg = <0 0x01c06200 0 0x170>, /* tx */
-                                     <0 0x01c06400 0 0x200>, /* rx */
-                                     <0 0x01c06800 0 0x1f0>, /* pcs */
-                                     <0 0x01c06c00 0 0xf4>; /* "pcs_lane" same as pcs_misc? */
-                               clocks = <&gcc GCC_PCIE_0_PIPE_CLK>;
-                               clock-names = "pipe0";
-                               #phy-cells = <0>;
-                               clock-output-names = "pcie_0_pipe_clk";
-                       };
                };
  
                pcie1: pci@1c08000 {
  
                        power-domains = <&gcc PCIE_1_GDSC>;
  
-                       phys = <&pcie1_lane>;
+                       phys = <&pcie1_phy>;
                        phy-names = "pciephy";
  
                        perst-gpio = <&tlmm 102 GPIO_ACTIVE_HIGH>;
  
                pcie1_phy: phy@1c0e000 {
                        compatible = "qcom,sm8150-qmp-gen3x2-pcie-phy";
-                       reg = <0 0x01c0e000 0 0x1c0>;
-                       #address-cells = <2>;
-                       #size-cells = <2>;
-                       ranges;
+                       reg = <0 0x01c0e000 0 0x1000>;
                        clocks = <&gcc GCC_PCIE_PHY_AUX_CLK>,
                                 <&gcc GCC_PCIE_1_CFG_AHB_CLK>,
-                                <&gcc GCC_PCIE1_PHY_REFGEN_CLK>;
-                       clock-names = "aux", "cfg_ahb", "refgen";
+                                <&gcc GCC_PCIE_1_CLKREF_CLK>,
+                                <&gcc GCC_PCIE1_PHY_REFGEN_CLK>,
+                                <&gcc GCC_PCIE_1_PIPE_CLK>;
+                       clock-names = "aux",
+                                     "cfg_ahb",
+                                     "ref",
+                                     "refgen",
+                                     "pipe";
+                       clock-output-names = "pcie_1_pipe_clk";
+                       #clock-cells = <0>;
+                       #phy-cells = <0>;
  
                        resets = <&gcc GCC_PCIE_1_PHY_BCR>;
                        reset-names = "phy";
                        assigned-clock-rates = <100000000>;
  
                        status = "disabled";
-                       pcie1_lane: phy@1c0e200 {
-                               reg = <0 0x01c0e200 0 0x170>, /* tx0 */
-                                     <0 0x01c0e400 0 0x200>, /* rx0 */
-                                     <0 0x01c0ea00 0 0x1f0>, /* pcs */
-                                     <0 0x01c0e600 0 0x170>, /* tx1 */
-                                     <0 0x01c0e800 0 0x200>, /* rx1 */
-                                     <0 0x01c0ee00 0 0xf4>; /* "pcs_com" same as pcs_misc? */
-                               clocks = <&gcc GCC_PCIE_1_PIPE_CLK>;
-                               clock-names = "pipe0";
-                               #phy-cells = <0>;
-                               clock-output-names = "pcie_1_pipe_clk";
-                       };
                };
  
                ufs_mem_hc: ufshc@1d84000 {
                        resets = <&gcc GCC_QUSB2PHY_SEC_BCR>;
                };
  
-               usb_1_qmpphy: phy@88e9000 {
-                       compatible = "qcom,sm8150-qmp-usb3-phy";
-                       reg = <0 0x088e9000 0 0x18c>,
-                             <0 0x088e8000 0 0x10>;
-                       status = "disabled";
-                       #address-cells = <2>;
-                       #size-cells = <2>;
-                       ranges;
+               usb_1_qmpphy: phy@88e8000 {
+                       compatible = "qcom,sm8150-qmp-usb3-dp-phy";
+                       reg = <0 0x088e8000 0 0x3000>;
  
                        clocks = <&gcc GCC_USB3_PRIM_PHY_AUX_CLK>,
-                                <&rpmhcc RPMH_CXO_CLK>,
                                 <&gcc GCC_USB3_PRIM_CLKREF_CLK>,
-                                <&gcc GCC_USB3_PRIM_PHY_COM_AUX_CLK>;
-                       clock-names = "aux", "ref_clk_src", "ref", "com_aux";
+                                <&gcc GCC_USB3_PRIM_PHY_COM_AUX_CLK>,
+                                <&gcc GCC_USB3_PRIM_PHY_PIPE_CLK>;
+                       clock-names = "aux",
+                                     "ref",
+                                     "com_aux",
+                                     "usb3_pipe";
  
                        resets = <&gcc GCC_USB3_DP_PHY_PRIM_BCR>,
                                 <&gcc GCC_USB3_PHY_PRIM_BCR>;
                        reset-names = "phy", "common";
  
-                       usb_1_ssphy: phy@88e9200 {
-                               reg = <0 0x088e9200 0 0x200>,
-                                     <0 0x088e9400 0 0x200>,
-                                     <0 0x088e9c00 0 0x218>,
-                                     <0 0x088e9600 0 0x200>,
-                                     <0 0x088e9800 0 0x200>,
-                                     <0 0x088e9a00 0 0x100>;
-                               #clock-cells = <0>;
-                               #phy-cells = <0>;
-                               clocks = <&gcc GCC_USB3_PRIM_PHY_PIPE_CLK>;
-                               clock-names = "pipe0";
-                               clock-output-names = "usb3_phy_pipe_clk_src";
-                       };
+                       #clock-cells = <1>;
+                       #phy-cells = <1>;
+                       status = "disabled";
                };
  
                usb_2_qmpphy: phy@88eb000 {
                                iommus = <&apps_smmu 0x140 0>;
                                snps,dis_u2_susphy_quirk;
                                snps,dis_enblslpm_quirk;
-                               phys = <&usb_1_hsphy>, <&usb_1_ssphy>;
+                               phys = <&usb_1_hsphy>, <&usb_1_qmpphy QMP_USB43DP_USB3_PHY>;
                                phy-names = "usb2-phy", "usb3-phy";
                        };
                };
                                 <&mdss_dsi0_phy 1>,
                                 <&mdss_dsi1_phy 0>,
                                 <&mdss_dsi1_phy 1>,
-                                <0>,
-                                <0>;
+                                <&usb_1_qmpphy QMP_USB43DP_DP_LINK_CLK>,
+                                <&usb_1_qmpphy QMP_USB43DP_DP_VCO_DIV_CLK>;
                        clock-names = "bi_tcxo",
                                      "dsi0_phy_pll_out_byteclk",
                                      "dsi0_phy_pll_out_dsiclk",
  
                pdc: interrupt-controller@b220000 {
                        compatible = "qcom,sm8150-pdc", "qcom,pdc";
 -                      reg = <0 0x0b220000 0 0x400>;
 +                      reg = <0 0x0b220000 0 0x30000>;
                        qcom,pdc-ranges = <0 480 94>, <94 609 31>,
                                          <125 63 1>;
                        #interrupt-cells = <2>;
index 5bc2d4faeea6df18d529976f0fa43a9c73c5cad7,e3972ef668f8c17dc213b7a70597d9dd6287a8f7..faf02e59d6c73ccc573dd52f357953bc17d68742
                interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH 0>;
                clocks = <&cru PCLK_DDR_MON>;
                clock-names = "pclk_ddr_mon";
-               status = "disabled";
        };
  
        vpu: video-codec@ff650000 {
                                        <4 RK_PA0 1 &pcfg_pull_none>;
                        };
  
 +                      i2s0_2ch_bus_bclk_off: i2s0-2ch-bus-bclk-off {
 +                              rockchip,pins =
 +                                      <3 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>,
 +                                      <3 RK_PD1 1 &pcfg_pull_none>,
 +                                      <3 RK_PD2 1 &pcfg_pull_none>,
 +                                      <3 RK_PD3 1 &pcfg_pull_none>,
 +                                      <3 RK_PD7 1 &pcfg_pull_none>,
 +                                      <4 RK_PA0 1 &pcfg_pull_none>;
 +                      };
 +
                        i2s0_8ch_bus: i2s0-8ch-bus {
                                rockchip,pins =
                                        <3 RK_PD0 1 &pcfg_pull_none>,
index ff364709a6dfafd8393d3ff12dcaac2081700868,723f654872460ca444d29d42d8a87472d4d115a0..ba4d2c673ac8d33e229765bfdcff674aaf40f93c
@@@ -20,6 -20,9 +20,9 @@@
                        compatible = "thead,c910", "riscv";
                        device_type = "cpu";
                        riscv,isa = "rv64imafdc";
+                       riscv,isa-base = "rv64i";
+                       riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr",
+                                              "zifencei", "zihpm";
                        reg = <0>;
                        i-cache-block-size = <64>;
                        i-cache-size = <65536>;
@@@ -41,6 -44,9 +44,9 @@@
                        compatible = "thead,c910", "riscv";
                        device_type = "cpu";
                        riscv,isa = "rv64imafdc";
+                       riscv,isa-base = "rv64i";
+                       riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr",
+                                              "zifencei", "zihpm";
                        reg = <1>;
                        i-cache-block-size = <64>;
                        i-cache-size = <65536>;
@@@ -62,6 -68,9 +68,9 @@@
                        compatible = "thead,c910", "riscv";
                        device_type = "cpu";
                        riscv,isa = "rv64imafdc";
+                       riscv,isa-base = "rv64i";
+                       riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr",
+                                              "zifencei", "zihpm";
                        reg = <2>;
                        i-cache-block-size = <64>;
                        i-cache-size = <65536>;
@@@ -83,6 -92,9 +92,9 @@@
                        compatible = "thead,c910", "riscv";
                        device_type = "cpu";
                        riscv,isa = "rv64imafdc";
+                       riscv,isa-base = "rv64i";
+                       riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr",
+                                              "zifencei", "zihpm";
                        reg = <3>;
                        i-cache-block-size = <64>;
                        i-cache-size = <65536>;
                interrupt-parent = <&plic>;
                #address-cells = <2>;
                #size-cells = <2>;
 +              dma-noncoherent;
                ranges;
  
                plic: interrupt-controller@ffd8000000 {
This page took 0.202001 seconds and 4 git commands to generate.