Merge tag 'riscv-sophgo-dt-for-v6.9' of https://github.com/sophgo/linux into soc/dt

RISC-V Devicetrees for v6.9

Sophgo:
Added reset support for SG2042.
Also updated maintainer information for SOPHGO vendor support.

Signed-off-by: Chen Wang <unicorn_wang@outlook.com>
* tag 'riscv-sophgo-dt-for-v6.9' of https://github.com/sophgo/linux:
  MAINTAINERS: Setup proper info for SOPHGO vendor support
  riscv: dts: add resets property for uart node
  riscv: dts: add reset generator for Sophgo SG2042 SoC

Link: https://lore.kernel.org/r/MA0P287MB2822315119DA51FF95EE3071FE5D2@MA0P287MB2822.INDP287.PROD.OUTLOOK.COM
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --combined MAINTAINERS
index fe8a12dc8bd72641431d2a85a1fb722f7aade7ed,e5e6cbb298c52d804c4320736d25c5060f2cae26..5d02fbe529c091d2515d76b7dfc71b71354285a0
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -4169,14 -4169,14 +4169,14 @@@ F:   drivers/firmware/broadcom/tee_bnxt_f
  F:    drivers/net/ethernet/broadcom/bnxt/
  F:    include/linux/firmware/broadcom/tee_bnxt_fw.h
  
 -BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER
 -M:    Arend van Spriel <aspriel@gmail.com>
 -M:    Franky Lin <franky.lin@broadcom.com>
 -M:    Hante Meuleman <hante.meuleman@broadcom.com>
 +BROADCOM BRCM80211 IEEE802.11 WIRELESS DRIVERS
 +M:    Arend van Spriel <arend.vanspriel@broadcom.com>
  L:    linux-wireless@vger.kernel.org
 +L:    brcm80211@lists.linux.dev
  L:    brcm80211-dev-list.pdl@broadcom.com
  S:    Supported
  F:    drivers/net/wireless/broadcom/brcm80211/
 +F:    include/linux/platform_data/brcmfmac.h
  
  BROADCOM BRCMSTB GPIO DRIVER
  M:    Doug Berger <opendmb@gmail.com>
@@@ -5378,7 -5378,7 +5378,7 @@@ CONTROL GROUP - MEMORY RESOURCE CONTROL
  M:    Johannes Weiner <hannes@cmpxchg.org>
  M:    Michal Hocko <mhocko@kernel.org>
  M:    Roman Gushchin <roman.gushchin@linux.dev>
 -M:    Shakeel Butt <shakeelb@google.com>
 +M:    Shakeel Butt <shakeel.butt@linux.dev>
  R:    Muchun Song <muchun.song@linux.dev>
  L:    cgroups@vger.kernel.org
  L:    linux-mm@kvack.org
@@@ -5610,11 -5610,6 +5610,11 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/net/can/ctu,ctucanfd.yaml
  F:    drivers/net/can/ctucanfd/
  
 +CVE ASSIGNMENT CONTACT
 +M:    CVE Assignment Team <cve@kernel.org>
 +S:    Maintained
 +F:    Documentation/process/cve.rst
 +
  CW1200 WLAN driver
  S:    Orphan
  F:    drivers/net/wireless/st/cw1200/
@@@ -10096,7 -10091,7 +10096,7 @@@ L:   linux-i2c@vger.kernel.or
  S:    Maintained
  W:    https://i2c.wiki.kernel.org/
  Q:    https://patchwork.ozlabs.org/project/linux-i2c/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git
  F:    Documentation/devicetree/bindings/i2c/
  F:    drivers/i2c/algos/
  F:    drivers/i2c/busses/
@@@ -10288,7 -10283,7 +10288,7 @@@ F:   drivers/scsi/ibmvscsi/ibmvscsi
  F:    include/scsi/viosrp.h
  
  IBM Power Virtual SCSI Device Target Driver
 -M:    Michael Cyr <mikecyr@linux.ibm.com>
 +M:    Tyrel Datwyler <tyreld@linux.ibm.com>
  L:    linux-scsi@vger.kernel.org
  L:    target-devel@vger.kernel.org
  S:    Supported
@@@ -10476,8 -10471,7 +10476,8 @@@ M:   Donald Robson <donald.robson@imgtec.
  M:    Matt Coster <matt.coster@imgtec.com>
  S:    Supported
  T:    git git://anongit.freedesktop.org/drm/drm-misc
 -F:    Documentation/devicetree/bindings/gpu/img,powervr.yaml
 +F:    Documentation/devicetree/bindings/gpu/img,powervr-rogue.yaml
 +F:    Documentation/devicetree/bindings/gpu/img,powervr-sgx.yaml
  F:    Documentation/gpu/imagination/
  F:    drivers/gpu/drm/imagination/
  F:    include/uapi/drm/pvr_drm.h
@@@ -10807,11 -10801,11 +10807,11 @@@ F:        drivers/gpio/gpio-tangier.
  
  INTEL GVT-g DRIVERS (Intel GPU Virtualization)
  M:    Zhenyu Wang <zhenyuw@linux.intel.com>
 -M:    Zhi Wang <zhi.a.wang@intel.com>
 +M:    Zhi Wang <zhi.wang.linux@gmail.com>
  L:    intel-gvt-dev@lists.freedesktop.org
  L:    intel-gfx@lists.freedesktop.org
  S:    Supported
 -W:    https://01.org/igvt-g
 +W:    https://github.com/intel/gvt-linux/wiki
  T:    git https://github.com/intel/gvt-linux.git
  F:    drivers/gpu/drm/i915/gvt/
  
@@@ -11133,6 -11127,7 +11133,6 @@@ S:   Supporte
  F:    drivers/net/wireless/intel/iwlegacy/
  
  INTEL WIRELESS WIFI LINK (iwlwifi)
 -M:    Gregory Greenman <gregory.greenman@intel.com>
  M:    Miri Korenblit <miriam.rachel.korenblit@intel.com>
  L:    linux-wireless@vger.kernel.org
  S:    Supported
@@@ -11730,7 -11725,6 +11730,7 @@@ F:   fs/smb/server
  KERNEL UNIT TESTING FRAMEWORK (KUnit)
  M:    Brendan Higgins <brendanhiggins@google.com>
  M:    David Gow <davidgow@google.com>
 +R:    Rae Moar <rmoar@google.com>
  L:    linux-kselftest@vger.kernel.org
  L:    kunit-dev@googlegroups.com
  S:    Maintained
@@@ -12909,8 -12903,6 +12909,8 @@@ M:   Alejandro Colomar <alx@kernel.org
  L:    linux-man@vger.kernel.org
  S:    Maintained
  W:    http://www.kernel.org/doc/man-pages
 +T:    git git://git.kernel.org/pub/scm/docs/man-pages/man-pages.git
 +T:    git git://www.alejandro-colomar.es/src/alx/linux/man-pages/man-pages.git
  
  MANAGEMENT COMPONENT TRANSPORT PROTOCOL (MCTP)
  M:    Jeremy Kerr <jk@codeconstruct.com.au>
@@@ -15186,7 -15178,6 +15186,7 @@@ F:   Documentation/networking/net_cacheli
  F:    drivers/connector/
  F:    drivers/net/
  F:    include/dt-bindings/net/
 +F:    include/linux/cn_proc.h
  F:    include/linux/etherdevice.h
  F:    include/linux/fcdevice.h
  F:    include/linux/fddidevice.h
@@@ -15194,7 -15185,6 +15194,7 @@@ F:   include/linux/hippidevice.
  F:    include/linux/if_*
  F:    include/linux/inetdevice.h
  F:    include/linux/netdevice.h
 +F:    include/uapi/linux/cn_proc.h
  F:    include/uapi/linux/if_*
  F:    include/uapi/linux/netdevice.h
  X:    drivers/net/wireless/
@@@ -15243,8 -15233,6 +15243,8 @@@ F:   Documentation/networking
  F:    Documentation/networking/net_cachelines/
  F:    Documentation/process/maintainer-netdev.rst
  F:    Documentation/userspace-api/netlink/
 +F:    include/linux/framer/framer-provider.h
 +F:    include/linux/framer/framer.h
  F:    include/linux/in.h
  F:    include/linux/indirect_call_wrapper.h
  F:    include/linux/net.h
@@@ -15332,7 -15320,7 +15332,7 @@@ K:   \bmdo
  NETWORKING [MPTCP]
  M:    Matthieu Baerts <matttbe@kernel.org>
  M:    Mat Martineau <martineau@kernel.org>
 -R:    Geliang Tang <geliang.tang@linux.dev>
 +R:    Geliang Tang <geliang@kernel.org>
  L:    netdev@vger.kernel.org
  L:    mptcp@lists.linux.dev
  S:    Maintained
@@@ -16845,7 -16833,6 +16845,7 @@@ F:   drivers/pci/controller/dwc/*designwa
  
  PCI DRIVER FOR TI DRA7XX/J721E
  M:    Vignesh Raghavendra <vigneshr@ti.com>
 +R:    Siddharth Vadapalli <s-vadapalli@ti.com>
  L:    linux-omap@vger.kernel.org
  L:    linux-pci@vger.kernel.org
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -16870,8 -16857,9 +16870,8 @@@ F:   Documentation/devicetree/bindings/pc
  F:    drivers/pci/controller/pcie-xilinx-cpm.c
  
  PCI ENDPOINT SUBSYSTEM
 -M:    Lorenzo Pieralisi <lpieralisi@kernel.org>
 +M:    Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
  M:    Krzysztof Wilczyński <kw@linux.com>
 -R:    Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
  R:    Kishon Vijay Abraham I <kishon@kernel.org>
  L:    linux-pci@vger.kernel.org
  S:    Supported
@@@ -17191,7 -17179,7 +17191,7 @@@ R:   John Garry <john.g.garry@oracle.com
  R:    Will Deacon <will@kernel.org>
  R:    James Clark <james.clark@arm.com>
  R:    Mike Leach <mike.leach@linaro.org>
 -R:    Leo Yan <leo.yan@linaro.org>
 +R:    Leo Yan <leo.yan@linux.dev>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
  F:    tools/build/feature/test-libopencsd.c
@@@ -18094,6 -18082,7 +18094,6 @@@ F:   drivers/net/ethernet/qualcomm/emac
  
  QUALCOMM ETHQOS ETHERNET DRIVER
  M:    Vinod Koul <vkoul@kernel.org>
 -R:    Bhupesh Sharma <bhupesh.sharma@linaro.org>
  L:    netdev@vger.kernel.org
  L:    linux-arm-msm@vger.kernel.org
  S:    Maintained
@@@ -18440,7 -18429,7 +18440,7 @@@ S:   Supporte
  F:    drivers/infiniband/sw/rdmavt
  
  RDS - RELIABLE DATAGRAM SOCKETS
 -M:    Santosh Shilimkar <santosh.shilimkar@oracle.com>
 +M:    Allison Henderson <allison.henderson@oracle.com>
  L:    netdev@vger.kernel.org
  L:    linux-rdma@vger.kernel.org
  L:    rds-devel@oss.oracle.com (moderated for non-subscribers)
@@@ -18859,6 -18848,7 +18859,7 @@@ F:   Documentation/devicetree/bindings/ri
  F:    arch/riscv/boot/dts/
  X:    arch/riscv/boot/dts/allwinner/
  X:    arch/riscv/boot/dts/renesas/
+ X:    arch/riscv/boot/dts/sophgo/
  
  RISC-V PMU DRIVERS
  M:    Atish Patra <atishp@atishpatra.org>
@@@ -20457,12 -20447,13 +20458,13 @@@ F:        drivers/char/sonypi.
  F:    drivers/platform/x86/sony-laptop.c
  F:    include/linux/sony-laptop.h
  
- SOPHGO DEVICETREES
- M:    Chao Wei <chao.wei@sophgo.com>
+ SOPHGO DEVICETREES and DRIVERS
  M:    Chen Wang <unicorn_wang@outlook.com>
+ M:    Inochi Amaoto <inochiama@outlook.com>
+ T:    git https://github.com/sophgo/linux.git
  S:    Maintained
- F:    arch/riscv/boot/dts/sophgo/
- F:    Documentation/devicetree/bindings/riscv/sophgo.yaml
+ N:    sophgo
+ K:    sophgo
  
  SOUND
  M:    Jaroslav Kysela <perex@perex.cz>
@@@ -22018,14 -22009,6 +22020,14 @@@ F: Documentation/devicetree/bindings/me
  F:    drivers/media/i2c/ds90*
  F:    include/media/i2c/ds90*
  
 +TI HDC302X HUMIDITY DRIVER
 +M:    Javier Carrasco <javier.carrasco.cruz@gmail.com>
 +M:    Li peiyu <579lpy@gmail.com>
 +L:    linux-iio@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/iio/humidity/ti,hdc3020.yaml
 +F:    drivers/iio/humidity/hdc3020.c
 +
  TI ICSSG ETHERNET DRIVER (ICSSG)
  R:    MD Danish Anwar <danishanwar@ti.com>
  R:    Roger Quadros <rogerq@kernel.org>
@@@ -22881,8 -22864,9 +22883,8 @@@ S:   Maintaine
  F:    drivers/usb/typec/mux/pi3usb30532.c
  
  USB TYPEC PORT CONTROLLER DRIVERS
 -M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-usb@vger.kernel.org
 -S:    Maintained
 +S:    Orphan
  F:    drivers/usb/typec/tcpm/
  
  USB UHCI DRIVER
@@@ -24359,6 -24343,13 +24361,6 @@@ T:  git git://git.kernel.org/pub/scm/lin
  F:    Documentation/filesystems/zonefs.rst
  F:    fs/zonefs/
  
 -ZPOOL COMPRESSED PAGE STORAGE API
 -M:    Dan Streetman <ddstreet@ieee.org>
 -L:    linux-mm@kvack.org
 -S:    Maintained
 -F:    include/linux/zpool.h
 -F:    mm/zpool.c
 -
  ZR36067 VIDEO FOR LINUX DRIVER
  M:    Corentin Labbe <clabbe@baylibre.com>
  L:    mjpeg-users@lists.sourceforge.net
@@@ -24410,9 -24401,7 +24412,9 @@@ M:   Nhat Pham <nphamcs@gmail.com
  L:    linux-mm@kvack.org
  S:    Maintained
  F:    Documentation/admin-guide/mm/zswap.rst
 +F:    include/linux/zpool.h
  F:    include/linux/zswap.h
 +F:    mm/zpool.c
  F:    mm/zswap.c
  
  THE REST