Merge tag 'usb-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

Pull USB and Thunderbolt updates from Greg KH:
 "Here is the big set of USB and Thunderbolt driver changes for
  5.12-rc1.

  It's been an active set of development in these subsystems for the
  past few months:

   - loads of typec features added for new hardware

   - xhci features and bugfixes

   - dwc3 features added for more hardware support

   - dwc2 fixes and new hardware support

   - cdns3 driver updates for more hardware support

   - gadget driver cleanups and minor fixes

   - usb-serial fixes, new driver, and more devices supported

   - thunderbolt feature additions for new hardware

   - lots of other tiny fixups and additions

  The chrome driver changes are in here as well, as they depended on
  some of the typec changes, and the maintainer acked them.

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'usb-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (300 commits)
  dt-bindings: usb: mediatek: musb: add mt8516 compatbile
  dt-bindings: usb: mtk-xhci: add compatible for mt2701 and mt7623
  dt-bindings: usb: mtk-xhci: add optional assigned clock properties
  Documentation: connector: Update the description of sink-vdos
  usb: misc: usb3503: Fix logic in usb3503_init()
  dt-bindings: usb: usb-device: fix typo in required properties
  usb: Replace lkml.org links with lore
  dt-bindings: usb: dwc3: add description for rk3328
  dt-bindings: usb: convert rockchip,dwc3.txt to yaml
  usb: quirks: add quirk to start video capture on ELMO L-12F document camera reliable
  USB: quirks: sort quirk entries
  USB: serial: drop bogus to_usb_serial_port() checks
  USB: serial: make remove callback return void
  USB: serial: drop if with an always false condition
  usb: gadget: Assign boolean values to a bool variable
  usb: typec: tcpm: Get Sink VDO from fwnode
  dt-bindings: connector: Add SVDM VDO properties
  usb: typec: displayport: Fill the negotiated SVDM Version in the header
  usb: typec: ucsi: Determine common SVDM Version
  usb: typec: tcpm: Determine common SVDM Version
  ...

diff --combined Documentation/devicetree/bindings/net/btusb.txt
index c51dd99dc0d3cb7361e1f2f2789a25e41069edbc,a9c3f4277f695de74e9ea2442d6503e0013135c5..f546b1f7dd6d24c637e156162ed12e4ec96704c3
--- 1/Documentation/devicetree/bindings/net/btusb.txt
--- 2/Documentation/devicetree/bindings/net/btusb.txt
+++ b/Documentation/devicetree/bindings/net/btusb.txt
@@@ -4,7 -4,7 +4,7 @@@ Generic Bluetooth controller over USB (
  Required properties:
  
    - compatible : should comply with the format "usbVID,PID" specified in
-                Documentation/devicetree/bindings/usb/usb-device.txt
+                Documentation/devicetree/bindings/usb/usb-device.yaml
                 At the time of writing, the only OF supported devices
                 (more may be added later) are:
  
@@@ -38,7 -38,7 +38,7 @@@ Following example uses irq pin number 
        compatible = "usb1286,204e";
        reg = <1>;
        interrupt-parent = <&gpio0>;
 -      interrupt-name = "wakeup";
 +      interrupt-names = "wakeup";
        interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
      };
  };

diff --combined MAINTAINERS
index e4a24ea18fe910bdbb78b3205a6c68ac0948daf3,96eba81489c97289503233f0b2a4cf4973281cf3..618968c13798a22984399d393e1be7857ac4457b
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1511,7 -1511,6 +1511,7 @@@ ARM/ACTIONS SEMI ARCHITECTUR
  M:    Andreas Färber <[email protected]>
  M:    Manivannan Sadhasivam <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/arm/actions.yaml
  F:    Documentation/devicetree/bindings/clock/actions,owl-cmu.txt
@@@ -1779,6 -1778,19 +1779,6 @@@ F:     drivers/net/ethernet/cortina
  F:    drivers/pinctrl/pinctrl-gemini.c
  F:    drivers/rtc/rtc-ftrtc010.c
  
 -ARM/CSR SIRFPRIMA2 MACHINE SUPPORT
 -M:    Barry Song <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux.git
 -F:    arch/arm/boot/dts/prima2*
 -F:    arch/arm/mach-prima2/
 -F:    drivers/clk/sirf/
 -F:    drivers/clocksource/timer-atlas7.c
 -F:    drivers/clocksource/timer-prima2.c
 -X:    drivers/gnss
 -N:    [^a-z]sirf
 -
  ARM/CZ.NIC TURRIS MOX SUPPORT
  M:    Marek Behun <[email protected]>
  S:    Maintained
@@@ -1794,6 -1806,13 +1794,6 @@@ F:     drivers/firmware/turris-mox-rwtm.
  F:    drivers/gpio/gpio-moxtet.c
  F:    include/linux/moxtet.h
  
 -ARM/ENERGY MICRO (SILICON LABS) EFM32 SUPPORT
 -M:    Uwe Kleine-König <[email protected]>
 -R:    Pengutronix Kernel Team <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -N:    efm32
 -
  ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6)
  M:    Robert Jarzmik <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -2071,7 -2090,7 +2071,7 @@@ M:      Chunfeng Yun <chunfeng.yun@mediatek.
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
- F:    Documentation/devicetree/bindings/phy/phy-mtk-*
+ F:    Documentation/devicetree/bindings/phy/mediatek,*
  F:    drivers/phy/mediatek/
  
  ARM/Microchip (AT91) SoC support
@@@ -2136,7 -2155,7 +2136,7 @@@ ARM/NEC MOBILEPRO 900/c MACHINE SUPPOR
  M:    Michael Petchkovsky <[email protected]>
  S:    Maintained
  
 -ARM/NOMADIK/U300/Ux500 ARCHITECTURES
 +ARM/NOMADIK/Ux500 ARCHITECTURES
  M:    Linus Walleij <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -2145,23 -2164,35 +2145,23 @@@ F:   Documentation/devicetree/bindings/ar
  F:    Documentation/devicetree/bindings/arm/ux500.yaml
  F:    Documentation/devicetree/bindings/arm/ux500/
  F:    Documentation/devicetree/bindings/i2c/i2c-nomadik.txt
 -F:    Documentation/devicetree/bindings/i2c/i2c-stu300.txt
  F:    arch/arm/boot/dts/ste-*
  F:    arch/arm/mach-nomadik/
 -F:    arch/arm/mach-u300/
  F:    arch/arm/mach-ux500/
  F:    drivers/clk/clk-nomadik.c
 -F:    drivers/clk/clk-u300.c
  F:    drivers/clocksource/clksrc-dbx500-prcmu.c
 -F:    drivers/clocksource/timer-u300.c
 -F:    drivers/dma/coh901318*
  F:    drivers/dma/ste_dma40*
  F:    drivers/hwspinlock/u8500_hsem.c
  F:    drivers/i2c/busses/i2c-nomadik.c
 -F:    drivers/i2c/busses/i2c-stu300.c
  F:    drivers/iio/adc/ab8500-gpadc.c
 -F:    drivers/mfd/ab3100*
  F:    drivers/mfd/ab8500*
  F:    drivers/mfd/abx500*
  F:    drivers/mfd/db8500*
  F:    drivers/mfd/dbx500*
  F:    drivers/pinctrl/nomadik/
 -F:    drivers/pinctrl/pinctrl-coh901*
 -F:    drivers/pinctrl/pinctrl-u300.c
 -F:    drivers/rtc/rtc-ab3100.c
  F:    drivers/rtc/rtc-ab8500.c
 -F:    drivers/rtc/rtc-coh901331.c
  F:    drivers/rtc/rtc-pl031.c
  F:    drivers/soc/ux500/
 -F:    drivers/watchdog/coh901327_wdt.c
  
  ARM/NUVOTON NPCM ARCHITECTURE
  M:    Avi Fishman <[email protected]>
@@@ -2383,8 -2414,6 +2383,8 @@@ F:      drivers/*/*s5pv210
  F:    drivers/memory/samsung/
  F:    drivers/soc/samsung/
  F:    drivers/tty/serial/samsung*
 +F:    include/linux/platform_data/*s3c*
 +F:    include/linux/serial_s3c.h
  F:    include/linux/soc/samsung/
  N:    exynos
  N:    s3c2410
@@@ -2528,6 -2557,13 +2528,6 @@@ F:     arch/arm/boot/dts/berlin
  F:    arch/arm/mach-berlin/
  F:    arch/arm64/boot/dts/synaptics/
  
 -ARM/TANGO ARCHITECTURE
 -M:    Marc Gonzalez <[email protected]>
 -M:    Mans Rullgard <[email protected]>
 -L:    [email protected]
 -S:    Odd Fixes
 -N:    tango
 -
  ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
  M:    Lennert Buytenhek <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -2605,13 -2641,9 +2605,13 @@@ L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/iwamatsu/linux-visconti.git
  F:    Documentation/devicetree/bindings/arm/toshiba.yaml
 +F:    Documentation/devicetree/bindings/net/toshiba,visconti-dwmac.yaml
  F:    Documentation/devicetree/bindings/pinctrl/toshiba,tmpv7700-pinctrl.yaml
 +F:    Documentation/devicetree/bindings/watchdog/toshiba,visconti-wdt.yaml
  F:    arch/arm64/boot/dts/toshiba/
 +F:    drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c
  F:    drivers/pinctrl/visconti/
 +F:    drivers/watchdog/visconti_wdt.c
  N:    visconti
  
  ARM/UNIPHIER ARCHITECTURE
@@@ -2691,6 -2723,40 +2691,6 @@@ S:     Maintaine
  F:    arch/arm/mach-pxa/include/mach/z2.h
  F:    arch/arm/mach-pxa/z2.c
  
 -ARM/ZTE ARCHITECTURE
 -M:    Jun Nie <[email protected]>
 -M:    Shawn Guo <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -F:    Documentation/devicetree/bindings/arm/zte.yaml
 -F:    Documentation/devicetree/bindings/clock/zx2967*.txt
 -F:    Documentation/devicetree/bindings/dma/zxdma.txt
 -F:    Documentation/devicetree/bindings/gpio/zx296702-gpio.txt
 -F:    Documentation/devicetree/bindings/i2c/i2c-zx2967.txt
 -F:    Documentation/devicetree/bindings/mmc/zx-dw-mshc.txt
 -F:    Documentation/devicetree/bindings/pinctrl/pinctrl-zx.txt
 -F:    Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt
 -F:    Documentation/devicetree/bindings/soc/zte/
 -F:    Documentation/devicetree/bindings/sound/zte,*.txt
 -F:    Documentation/devicetree/bindings/thermal/zx2967-thermal.txt
 -F:    Documentation/devicetree/bindings/watchdog/zte,zx2967-wdt.txt
 -F:    arch/arm/boot/dts/zx2967*
 -F:    arch/arm/mach-zx/
 -F:    arch/arm64/boot/dts/zte/
 -F:    drivers/clk/zte/
 -F:    drivers/dma/zx_dma.c
 -F:    drivers/gpio/gpio-zx.c
 -F:    drivers/i2c/busses/i2c-zx2967.c
 -F:    drivers/mmc/host/dw_mmc-zx.*
 -F:    drivers/pinctrl/zte/
 -F:    drivers/soc/zte/
 -F:    drivers/thermal/zx2967_thermal.c
 -F:    drivers/watchdog/zx2967_wdt.c
 -F:    include/dt-bindings/clock/zx2967*.h
 -F:    include/dt-bindings/soc/zte,*.h
 -F:    sound/soc/codecs/zx_aud96p22.c
 -F:    sound/soc/zte/
 -
  ARM/ZYNQ ARCHITECTURE
  M:    Michal Simek <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -2699,7 -2765,6 +2699,7 @@@ W:      http://wiki.xilinx.co
  T:    git https://github.com/Xilinx/linux-xlnx.git
  F:    Documentation/devicetree/bindings/i2c/cdns,i2c-r1p10.yaml
  F:    Documentation/devicetree/bindings/i2c/xlnx,xps-iic-2.00.a.yaml
 +F:    Documentation/devicetree/bindings/spi/xlnx,zynq-qspi.yaml
  F:    arch/arm/mach-zynq/
  F:    drivers/block/xsysace.c
  F:    drivers/clocksource/timer-cadence-ttc.c
@@@ -2722,14 -2787,6 +2722,14 @@@ F:    arch/arm64
  F:    tools/testing/selftests/arm64/
  X:    arch/arm64/boot/dts/
  
 +ARROW SPEEDCHIPS XRS7000 SERIES ETHERNET SWITCH DRIVER
 +M:    George McCollister <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/dsa/arrow,xrs700x.yaml
 +F:    drivers/net/dsa/xrs700x/*
 +F:    net/dsa/tag_xrs700x.c
 +
  AS3645A LED FLASH CONTROLLER DRIVER
  M:    Sakari Ailus <[email protected]>
  L:    [email protected]
@@@ -3342,7 -3399,6 +3342,7 @@@ L:      [email protected] (sub
  S:    Supported
  F:    Documentation/devicetree/bindings/net/dsa/brcm,b53.yaml
  F:    drivers/net/dsa/b53/*
 +F:    include/linux/dsa/brcm.h
  F:    include/linux/platform_data/b53.h
  
  BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE
@@@ -3380,15 -3436,6 +3380,15 @@@ F:    Documentation/devicetree/bindings/mi
  F:    arch/mips/bcm47xx/*
  F:    arch/mips/include/asm/mach-bcm47xx/*
  
 +BROADCOM BCM4908 ETHERNET DRIVER
 +M:    Rafał Miłecki <[email protected]>
 +M:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/brcm,bcm4908-enet.yaml
 +F:    drivers/net/ethernet/broadcom/bcm4908_enet.*
 +F:    drivers/net/ethernet/broadcom/unimac.h
 +
  BROADCOM BCM5301X ARM ARCHITECTURE
  M:    Hauke Mehrtens <[email protected]>
  M:    Rafał Miłecki <[email protected]>
@@@ -3577,7 -3624,6 +3577,7 @@@ S:      Supporte
  F:    Documentation/devicetree/bindings/net/brcm,bcmgenet.txt
  F:    Documentation/devicetree/bindings/net/brcm,unimac-mdio.txt
  F:    drivers/net/ethernet/broadcom/genet/
 +F:    drivers/net/ethernet/broadcom/unimac.h
  F:    drivers/net/mdio/mdio-bcm-unimac.c
  F:    include/linux/platform_data/bcmgenet.h
  F:    include/linux/platform_data/mdio-bcm-unimac.h
@@@ -3611,15 -3657,6 +3611,15 @@@ N:    bcm8831
  N:    hr2
  N:    stingray
  
 +BROADCOM IPROC GBIT ETHERNET DRIVER
 +M:    Rafał Miłecki <[email protected]>
 +M:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/brcm,amac.txt
 +F:    drivers/net/ethernet/broadcom/bgmac*
 +F:    drivers/net/ethernet/broadcom/unimac.h
 +
  BROADCOM KONA GPIO DRIVER
  M:    Ray Jui <[email protected]>
  L:    [email protected]
@@@ -3645,16 -3682,6 +3645,16 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/firmware/broadcom/*
  
 +BROADCOM PMB (POWER MANAGEMENT BUS) DRIVER
 +M:    Rafał Miłecki <[email protected]>
 +M:    Florian Fainelli <[email protected]>
 +M:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +T:    git git://github.com/broadcom/stblinux.git
 +F:    drivers/soc/bcm/bcm-pmb.c
 +F:    include/dt-bindings/soc/bcm-pmb.h
 +
  BROADCOM SPECIFIC AMBA DRIVER (BCMA)
  M:    Rafał Miłecki <[email protected]>
  L:    [email protected]
@@@ -3709,7 -3736,6 +3709,7 @@@ L:      [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/broadcom/bcmsysport.*
 +F:    drivers/net/ethernet/broadcom/unimac.h
  
  BROADCOM TG3 GIGABIT ETHERNET DRIVER
  M:    Siva Reddy Kallam <[email protected]>
@@@ -3817,6 -3843,14 +3817,6 @@@ F:     drivers/irqchip/irq-csky-
  N:    csky
  K:    csky
  
 -C6X ARCHITECTURE
 -M:    Mark Salter <[email protected]>
 -M:    Aurelien Jacquiot <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -W:    http://www.linux-c6x.org/wiki/index.php/Main_Page
 -F:    arch/c6x/
 -
  CA8210 IEEE-802.15.4 RADIO DRIVER
  M:    Harry Morris <[email protected]>
  L:    [email protected]
@@@ -3855,6 -3889,15 +3855,15 @@@ S:    Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
  F:    Documentation/devicetree/bindings/usb/cdns,usb3.yaml
  F:    drivers/usb/cdns3/
+ X:    drivers/usb/cdns3/cdnsp*
+ 
+ CADENCE USBSSP DRD IP DRIVER
+ M:    Pawel Laszczak <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
+ F:    drivers/usb/cdns3/
+ X:    drivers/usb/cdns3/cdns3*
  
  CADET FM/AM RADIO RECEIVER DRIVER
  M:    Hans Verkuil <[email protected]>
@@@ -3896,10 -3939,8 +3905,10 @@@ T:    git git://git.kernel.org/pub/scm/lin
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git
  F:    Documentation/devicetree/bindings/net/can/
  F:    drivers/net/can/
 +F:    include/linux/can/bittiming.h
  F:    include/linux/can/dev.h
  F:    include/linux/can/led.h
 +F:    include/linux/can/length.h
  F:    include/linux/can/platform/
  F:    include/linux/can/rx-offload.h
  F:    include/uapi/linux/can/error.h
@@@ -3915,7 -3956,6 +3924,7 @@@ W:      https://github.com/linux-ca
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git
  F:    Documentation/networking/can.rst
 +F:    include/linux/can/can-ml.h
  F:    include/linux/can/core.h
  F:    include/linux/can/skb.h
  F:    include/net/netns/can.h
@@@ -4437,7 -4477,7 +4446,7 @@@ F:      include/linux/console
  
  CONTROL GROUP (CGROUP)
  M:    Tejun Heo <[email protected]>
 -M:    Li Zefan <lizefan@huawei.com>
 +M:    Zefan Li <lizefan.x@bytedance.com>
  M:    Johannes Weiner <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -4461,9 -4501,11 +4470,9 @@@ F:     block/blk-throttle.
  F:    include/linux/blk-cgroup.h
  
  CONTROL GROUP - CPUSET
 -M:    Li Zefan <lizefan@huawei.com>
 +M:    Zefan Li <lizefan.x@bytedance.com>
  L:    [email protected]
  S:    Maintained
 -W:    http://www.bullopensource.org/cpuset/
 -W:    http://oss.sgi.com/projects/cpusets/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
  F:    Documentation/admin-guide/cgroup-v1/cpusets.rst
  F:    include/linux/cpuset.h
@@@ -6024,6 -6066,14 +6033,6 @@@ T:     git git://anongit.freedesktop.org/dr
  F:    Documentation/devicetree/bindings/display/xlnx/
  F:    drivers/gpu/drm/xlnx/
  
 -DRM DRIVERS FOR ZTE ZX
 -M:    Shawn Guo <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -T:    git git://anongit.freedesktop.org/drm/drm-misc
 -F:    Documentation/devicetree/bindings/display/zte,vou.txt
 -F:    drivers/gpu/drm/zte/
 -
  DRM PANEL DRIVERS
  M:    Thierry Reding <[email protected]>
  R:    Sam Ravnborg <[email protected]>
@@@ -9183,11 -9233,10 +9192,11 @@@ F:   include/linux/tboot.
  
  INTEL SGX
  M:    Jarkko Sakkinen <[email protected]>
 +R:    Dave Hansen <[email protected]>
  L:    [email protected]
  S:    Supported
  Q:    https://patchwork.kernel.org/project/intel-sgx/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-sgx.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/sgx
  F:    Documentation/x86/sgx.rst
  F:    arch/x86/entry/vdso/vsgx.S
  F:    arch/x86/include/uapi/asm/sgx.h
@@@ -9519,18 -9568,16 +9528,18 @@@ F:   Documentation/hwmon/k8temp.rs
  F:    drivers/hwmon/k8temp.c
  
  KASAN
 -M:    Andrey Ryabinin <aryabinin@virtuozzo.com>
 +M:    Andrey Ryabinin <ryabinin.a.a@gmail.com>
  R:    Alexander Potapenko <[email protected]>
 +R:    Andrey Konovalov <[email protected]>
  R:    Dmitry Vyukov <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/dev-tools/kasan.rst
 -F:    arch/*/include/asm/kasan.h
 +F:    arch/*/include/asm/*kasan.h
  F:    arch/*/mm/kasan_init*
  F:    include/linux/kasan*.h
 -F:    lib/test_kasan.c
 +F:    lib/Kconfig.kasan
 +F:    lib/test_kasan*.c
  F:    mm/kasan/
  F:    scripts/Makefile.kasan
  
@@@ -9545,7 -9592,7 +9554,7 @@@ F:      scripts/kconfig
  
  KCOV
  R:    Dmitry Vyukov <[email protected]>
 -R:    Andrey Konovalov <andreyknvl@google.com>
 +R:    Andrey Konovalov <andreyknvl@gmail.com>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/dev-tools/kcov.rst
@@@ -10649,8 -10696,6 +10658,8 @@@ M:   Sunil Goutham <[email protected]
  M:    Linu Cherian <[email protected]>
  M:    Geetha sowjanya <[email protected]>
  M:    Jerin Jacob <[email protected]>
 +M:    hariprasad <[email protected]>
 +M:    Subbaraya Sundeep <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    Documentation/networking/device_drivers/ethernet/marvell/octeontx2.rst
@@@ -11229,6 -11274,8 +11238,8 @@@ L:   [email protected]
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
+ F:    Documentation/devicetree/bindings/usb/mediatek,*
+ F:    drivers/usb/host/xhci-mtk*
  F:    drivers/usb/mtu3/
  
  MEGACHIPS STDPXXXX-GE-B850V3-FW LVDS/DP++ BRIDGES
@@@ -12481,14 -12528,6 +12492,14 @@@ F: include/net/nfc
  F:    include/uapi/linux/nfc.h
  F:    net/nfc/
  
 +NFC VIRTUAL NCI DEVICE DRIVER
 +M:    Bongsu Jeon <[email protected]>
 +L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Supported
 +F:    drivers/nfc/virtual_ncidev.c
 +F:    tools/testing/selftests/nci/
 +
  NFS, SUNRPC, AND LOCKD CLIENTS
  M:    Trond Myklebust <[email protected]>
  M:    Anna Schumaker <[email protected]>
@@@ -12800,7 -12839,6 +12811,7 @@@ F:   drivers/net/dsa/ocelot/
  F:    drivers/net/ethernet/mscc/
  F:    include/soc/mscc/ocelot*
  F:    net/dsa/tag_ocelot.c
 +F:    net/dsa/tag_ocelot_8021q.c
  F:    tools/testing/selftests/drivers/net/ocelot/*
  
  OCXL (Open Coherent Accelerator Processor Interface OpenCAPI) DRIVER
@@@ -12860,7 -12898,7 +12871,7 @@@ S:   Orpha
  F:    drivers/video/fbdev/omap/
  
  OMAP GENERAL PURPOSE MEMORY CONTROLLER SUPPORT
 -M:    Roger Quadros <rogerq@ti.com>
 +M:    Roger Quadros <rogerq@kernel.org>
  M:    Tony Lindgren <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -13950,6 -13988,15 +13961,6 @@@ L:  [email protected]
  S:    Maintained
  F:    drivers/hid/hid-picolcd*
  
 -PICOXCELL SUPPORT
 -M:    Jamie Iles <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Supported
 -T:    git git://github.com/jamieiles/linux-2.6-ji.git
 -F:    arch/arm/boot/dts/picoxcell*
 -F:    arch/arm/mach-picoxcell/
 -F:    drivers/crypto/picoxcell*
 -
  PIDFD API
  M:    Christian Brauner <[email protected]>
  L:    [email protected]
@@@ -17176,7 -17223,6 +17187,7 @@@ F:   drivers/mfd/syscon.
  
  SYSTEM CONTROL & POWER/MANAGEMENT INTERFACE (SCPI/SCMI) Message Protocol drivers
  M:    Sudeep Holla <[email protected]>
 +R:    Cristian Marussi <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/arm/arm,sc[mp]i.txt
@@@ -17184,7 -17230,6 +17195,7 @@@ F:   drivers/clk/clk-sc[mp]i.
  F:    drivers/cpufreq/sc[mp]i-cpufreq.c
  F:    drivers/firmware/arm_scmi/
  F:    drivers/firmware/arm_scpi.c
 +F:    drivers/regulator/scmi-regulator.c
  F:    drivers/reset/reset-scmi.c
  F:    include/linux/sc[mp]i_protocol.h
  F:    include/trace/events/scmi.h
@@@ -17810,7 -17855,7 +17821,7 @@@ M:   Dan Murphy <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/can/tcan4x5x.txt
 -F:    drivers/net/can/m_can/tcan4x5x.c
 +F:    drivers/net/can/m_can/tcan4x5x*
  
  TI TRF7970A NFC DRIVER
  M:    Mark Greer <[email protected]>

diff --combined arch/arm/configs/tegra_defconfig
index 46c73263ed410d508e9e94bb9f641f40d4941de9,ae0709265493ea305391365e6422b2304ac9fbcf..13ef3e4dcbb79940824c071d014548dd3aeed937
--- 1/arch/arm/configs/tegra_defconfig
--- 2/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@@ -167,7 -167,6 +167,7 @@@ CONFIG_SENSORS_LM95245=
  CONFIG_THERMAL=y
  CONFIG_THERMAL_STATISTICS=y
  CONFIG_CPU_THERMAL=y
 +CONFIG_TEGRA_SOCTHERM=m
  CONFIG_WATCHDOG=y
  CONFIG_MAX77620_WATCHDOG=y
  CONFIG_TEGRA_WATCHDOG=y
@@@ -238,12 -237,13 +238,13 @@@ CONFIG_USB=
  CONFIG_USB_XHCI_HCD=y
  CONFIG_USB_XHCI_TEGRA=y
  CONFIG_USB_EHCI_HCD=y
- CONFIG_USB_EHCI_TEGRA=y
  CONFIG_USB_ACM=y
  CONFIG_USB_WDM=y
  CONFIG_USB_STORAGE=y
  CONFIG_USB_CHIPIDEA=y
  CONFIG_USB_CHIPIDEA_UDC=y
+ CONFIG_USB_CHIPIDEA_HOST=y
+ CONFIG_USB_CHIPIDEA_TEGRA=y
  CONFIG_USB_GADGET=y
  CONFIG_MMC=y
  CONFIG_MMC_BLOCK_MINORS=16

diff --combined arch/arm64/boot/dts/freescale/imx8mp.dtsi
index f55e3f749d384bd0b2460f9b81180d21a9d138ff,88615874041d6fc2d8a355b0a7ecee4e572fed27..c7523fd4eae9b533bd0960d40383502e3ecfc239
--- 1/arch/arm64/boot/dts/freescale/imx8mp.dtsi
--- 2/arch/arm64/boot/dts/freescale/imx8mp.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
@@@ -218,12 -218,10 +218,12 @@@
        };
  
        soc@0 {
 -              compatible = "simple-bus";
 +              compatible = "fsl,imx8mp-soc", "simple-bus";
                #address-cells = <1>;
                #size-cells = <1>;
                ranges = <0x0 0x0 0x0 0x3e000000>;
 +              nvmem-cells = <&imx8mp_uid>;
 +              nvmem-cell-names = "soc_unique_id";
  
                aips1: bus@30000000 {
                        compatible = "fsl,aips-bus", "simple-bus";
@@@ -330,17 -328,9 +330,17 @@@
                                #address-cells = <1>;
                                #size-cells = <1>;
  
 +                              imx8mp_uid: unique-id@420 {
 +                                      reg = <0x8 0x8>;
 +                              };
 +
                                cpu_speed_grade: speed-grade@10 {
                                        reg = <0x10 4>;
                                };
 +
 +                              eth_mac1: mac-address@90 {
 +                                      reg = <0x90 6>;
 +                              };
                        };
  
                        anatop: anatop@30360000 {
@@@ -772,18 -762,13 +772,18 @@@
                                assigned-clocks = <&clk IMX8MP_CLK_ENET_AXI>,
                                                  <&clk IMX8MP_CLK_ENET_TIMER>,
                                                  <&clk IMX8MP_CLK_ENET_REF>,
 -                                                <&clk IMX8MP_CLK_ENET_TIMER>;
 +                                                <&clk IMX8MP_CLK_ENET_PHY_REF>;
                                assigned-clock-parents = <&clk IMX8MP_SYS_PLL1_266M>,
                                                         <&clk IMX8MP_SYS_PLL2_100M>,
 -                                                       <&clk IMX8MP_SYS_PLL2_125M>;
 -                              assigned-clock-rates = <0>, <0>, <125000000>, <100000000>;
 +                                                       <&clk IMX8MP_SYS_PLL2_125M>,
 +                                                       <&clk IMX8MP_SYS_PLL2_50M>;
 +                              assigned-clock-rates = <0>, <100000000>, <125000000>, <0>;
                                fsl,num-tx-queues = <3>;
                                fsl,num-rx-queues = <3>;
 +                              nvmem-cells = <&eth_mac1>;
 +                              nvmem-cell-names = "mac-address";
 +                              fsl,stop-mode = <&gpr 0x10 3>;
 +                              nvmem_macaddr_swap;
                                status = "disabled";
                        };
                };
@@@ -803,5 -788,87 +803,87 @@@
                        reg = <0x3d800000 0x400000>;
                        interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
                };
+ 
+               usb3_phy0: usb-phy@381f0040 {
+                       compatible = "fsl,imx8mp-usb-phy";
+                       reg = <0x381f0040 0x40>;
+                       clocks = <&clk IMX8MP_CLK_USB_PHY_ROOT>;
+                       clock-names = "phy";
+                       assigned-clocks = <&clk IMX8MP_CLK_USB_PHY_REF>;
+                       assigned-clock-parents = <&clk IMX8MP_CLK_24M>;
+                       #phy-cells = <0>;
+                       status = "disabled";
+               };
+ 
+               usb3_0: usb@32f10100 {
+                       compatible = "fsl,imx8mp-dwc3";
+                       reg = <0x32f10100 0x8>;
+                       clocks = <&clk IMX8MP_CLK_HSIO_ROOT>,
+                                <&clk IMX8MP_CLK_USB_ROOT>;
+                       clock-names = "hsio", "suspend";
+                       interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       dma-ranges = <0x40000000 0x40000000 0xc0000000>;
+                       ranges;
+                       status = "disabled";
+ 
+                       usb_dwc3_0: dwc3@38100000 {
+                               compatible = "snps,dwc3";
+                               reg = <0x38100000 0x10000>;
+                               clocks = <&clk IMX8MP_CLK_HSIO_AXI>,
+                                        <&clk IMX8MP_CLK_USB_CORE_REF>,
+                                        <&clk IMX8MP_CLK_USB_ROOT>;
+                               clock-names = "bus_early", "ref", "suspend";
+                               assigned-clocks = <&clk IMX8MP_CLK_HSIO_AXI>;
+                               assigned-clock-parents = <&clk IMX8MP_SYS_PLL2_500M>;
+                               assigned-clock-rates = <500000000>;
+                               interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
+                               phys = <&usb3_phy0>, <&usb3_phy0>;
+                               phy-names = "usb2-phy", "usb3-phy";
+                               snps,dis-u2-freeclk-exists-quirk;
+                       };
+ 
+               };
+ 
+               usb3_phy1: usb-phy@382f0040 {
+                       compatible = "fsl,imx8mp-usb-phy";
+                       reg = <0x382f0040 0x40>;
+                       clocks = <&clk IMX8MP_CLK_USB_PHY_ROOT>;
+                       clock-names = "phy";
+                       assigned-clocks = <&clk IMX8MP_CLK_USB_PHY_REF>;
+                       assigned-clock-parents = <&clk IMX8MP_CLK_24M>;
+                       #phy-cells = <0>;
+               };
+ 
+               usb3_1: usb@32f10108 {
+                       compatible = "fsl,imx8mp-dwc3";
+                       reg = <0x32f10108 0x8>;
+                       clocks = <&clk IMX8MP_CLK_HSIO_ROOT>,
+                                <&clk IMX8MP_CLK_USB_ROOT>;
+                       clock-names = "hsio", "suspend";
+                       interrupts = <GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       dma-ranges = <0x40000000 0x40000000 0xc0000000>;
+                       ranges;
+                       status = "disabled";
+ 
+                       usb_dwc3_1: dwc3@38200000 {
+                               compatible = "snps,dwc3";
+                               reg = <0x38200000 0x10000>;
+                               clocks = <&clk IMX8MP_CLK_HSIO_AXI>,
+                                        <&clk IMX8MP_CLK_USB_CORE_REF>,
+                                        <&clk IMX8MP_CLK_USB_ROOT>;
+                               clock-names = "bus_early", "ref", "suspend";
+                               assigned-clocks = <&clk IMX8MP_CLK_HSIO_AXI>;
+                               assigned-clock-parents = <&clk IMX8MP_SYS_PLL2_500M>;
+                               assigned-clock-rates = <500000000>;
+                               interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
+                               phys = <&usb3_phy1>, <&usb3_phy1>;
+                               phy-names = "usb2-phy", "usb3-phy";
+                               snps,dis-u2-freeclk-exists-quirk;
+                       };
+               };
        };
  };