Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Dec 2019 20:09:47 +0000 (12:09 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Dec 2019 20:09:47 +0000 (12:09 -0800)
Pull ARM Device-tree updates from Olof Johansson:
 "As always, the bulk of updates.  Some of the news this cycle:

  New SoC descriptions:
   - Broadcom BCM2711
   - Amlogic Meson A1 and G12
   - Freescale S32V234
   - Marvell Armada AP807/AP807-quad and CP115
   - Realtek RTD1293 and RTD1296
   - Rockchip RK3308

  New boards and platforms:
   - Allwinner: NanoPi Duo2
   - Amlogic: Ugoos am6
   - Atmel at91: Overkiz Kizbox2/4
   - Broadcom: RPi4, Luxul XWC-2000
   - Marvell: New Espressobin flavor
   - NXP: i.MX8MN LPDDR4 EVK, i.MX8QXP Colibri, S32V234 EVB, Netronix
     E60K02 and Kobo Clara HD, Kontron N6311 and N6411, OPOS6UL and
     OPOS6ULDev
   - Renesas: Salvator-XS
   - Rockchip: Beelink A1 (rk3308), rk3308 eval boards, rk3399-roc-pc"

* tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (653 commits)
  ARM: dts: logicpd-torpedo: Disable USB Host
  arm: dts: mt6323: add keys, power-controller, rtc and codec
  arm64: dts: mt8183: add systimer0 device node
  dt-bindings: mediatek: update bindings for MT8183 systimer
  arm64: dts: rockchip: fix sdmmc detection on boot on rk3328-roc-cc
  arm64: dts: rockchip: Split rk3399-roc-pc for with and without mezzanine board.
  arm64: dts: rockchip: Add Beelink A1
  dt-bindings: ARM: rockchip: Add Beelink A1
  arm64: dts: rockchip: Add RK3328 audio pipelines
  arm64: dts: ti: k3-j721e-common-proc-board: Add USB ports
  arm64: dts: ti: k3-j721e-main: add USB controller nodes
  ARM: dts: aspeed-g6: Add timer description
  ARM: dts: aspeed: ast2600evb: Enable i2c buses
  ARM: dts: at91: add a dts and dtsi file for kizbox2 based boards
  dt-bindings: arm: at91: Document Kizbox2-2 board binding
  arm64: dts: meson-gx: fix i2c compatible
  arm64: dts: meson-gx: cec node should be disabled by default
  arm64: dts: meson-g12b-odroid-n2: add missing amlogic, s922x compatible
  arm64: dts: meson-gxm: fix gpu irq order
  arm64: dts: meson-g12a: fix gpu irq order
  ...

31 files changed:
1  2 
Documentation/devicetree/bindings/arm/rockchip.yaml
Documentation/devicetree/bindings/gpu/arm,mali-midgard.yaml
Documentation/devicetree/bindings/vendor-prefixes.yaml
MAINTAINERS
arch/arm/boot/dts/am3517.dtsi
arch/arm/boot/dts/aspeed-g5.dtsi
arch/arm/boot/dts/dra7-l4.dtsi
arch/arm/boot/dts/logicpd-torpedo-som.dtsi
arch/arm/boot/dts/omap3-igep0020-rev-f.dts
arch/arm/boot/dts/omap3-igep0030-rev-g.dts
arch/arm/boot/dts/omap3-n900.dts
arch/arm/boot/dts/stm32mp157-pinctrl.dtsi
arch/arm/boot/dts/stm32mp157c-ev1.dts
arch/arm/boot/dts/stm32mp157c.dtsi
arch/arm/boot/dts/sun6i-a31.dtsi
arch/arm/boot/dts/sun8i-a83t.dtsi
arch/arm/boot/dts/sun8i-r40.dtsi
arch/arm/boot/dts/sun9i-a80.dtsi
arch/arm/boot/dts/sunxi-h3-h5.dtsi
arch/arm/configs/keystone_defconfig
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
arch/arm/mach-omap2/omap_hwmod_7xx_data.c
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
arch/arm64/boot/dts/freescale/imx8mm.dtsi
arch/arm64/boot/dts/freescale/imx8mn.dtsi
arch/arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi
arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts

@@@ -40,6 -40,11 +40,11 @@@ properties
            - const: asus,rk3288-tinker-s
            - const: rockchip,rk3288
  
+       - description: Beelink A1
+         items:
+           - const: azw,beelink-a1
+           - const: rockchip,rk3328
        - description: bq Curie 2 tablet
          items:
            - const: mundoreader,bq-curie2
            - const: firefly,firefly-rk3399
            - const: rockchip,rk3399
  
+       - description: Firefly ROC-RK3308-CC
+         items:
+           - const: firefly,roc-rk3308-cc
+           - const: rockchip,rk3308
        - description: Firefly roc-rk3328-cc
          items:
            - const: firefly,roc-rk3328-cc
@@@ -89,7 -99,9 +99,9 @@@
  
        - description: Firefly ROC-RK3399-PC
          items:
-           - const: firefly,roc-rk3399-pc
+           - enum:
+               - firefly,roc-rk3399-pc
+               - firefly,roc-rk3399-pc-mezzanine
            - const: rockchip,rk3399
  
        - description: FriendlyElec NanoPi4 series boards
                - rockchip,rk3288-evb-rk808
            - const: rockchip,rk3288
  
+       - description: Rockchip RK3308 Evaluation board
+         items:
+           - const: rockchip,rk3308-evb
+           - const: rockchip,rk3308
        - description: Rockchip RK3328 Evaluation board
          items:
            - const: rockchip,rk3328-evb
  
        - description: Theobroma Systems RK3368-uQ7 with Haikou baseboard
          items:
 -          - const: tsd,rk3368-uq7-haikou
 +          - const: tsd,rk3368-lion-haikou
            - const: rockchip,rk3368
  
        - description: Theobroma Systems RK3399-Q7 with Haikou baseboard
          items:
 -          - const: tsd,rk3399-q7-haikou
 +          - const: tsd,rk3399-puma-haikou
            - const: rockchip,rk3399
  
        - description: Tronsmart Orion R68 Meta
@@@ -14,14 -14,6 +14,14 @@@ properties
      pattern: '^gpu@[a-f0-9]+$'
    compatible:
      oneOf:
 +      - items:
 +          - enum:
 +             - samsung,exynos5250-mali
 +          - const: arm,mali-t604
 +      - items:
 +          - enum:
 +             - samsung,exynos5420-mali
 +          - const: arm,mali-t628
        - items:
            - enum:
               - allwinner,sun50i-h6-mali
        - items:
            - enum:
               - amlogic,meson-gxm-mali
 +             - realtek,rtd1295-mali
            - const: arm,mali-t820
+       - items:
+           - enum:
+              - arm,juno-mali
+           - const: arm,mali-t624
        - items:
            - enum:
               - rockchip,rk3288-mali
 +             - samsung,exynos5433-mali
            - const: arm,mali-t760
        - items:
            - enum:
               - rockchip,rk3399-mali
            - const: arm,mali-t860
 -      - items:
 -          - enum:
 -             - samsung,exynos5250-mali
 -          - const: arm,mali-t604
 -      - items:
 -          - enum:
 -             - samsung,exynos5433-mali
 -          - const: arm,mali-t760
  
-           # "arm,mali-t624"
 -          # "arm,mali-t628"
            # "arm,mali-t830"
            # "arm,mali-t880"
  
@@@ -70,7 -72,8 +73,7 @@@
        - const: core
        - const: bus
  
 -  mali-supply:
 -    maxItems: 1
 +  mali-supply: true
  
    resets:
      minItems: 1
@@@ -16,7 -16,7 +16,7 @@@ properties: {
  patternProperties:
    # Prefixes which are not vendors, but followed the pattern
    # DO NOT ADD NEW PROPERTIES TO THIS LIST
 -  "^(at25|devbus|dmacap|dsa|exynos|gpio-fan|gpio|gpmc|hdmi|i2c-gpio),.*": true
 +  "^(at25|devbus|dmacap|dsa|exynos|fsi[ab]|gpio-fan|gpio|gpmc|hdmi|i2c-gpio),.*": true
    "^(keypad|m25p|max8952|max8997|max8998|mpmc),.*": true
    "^(pinctrl-single|#pinctrl-single|PowerPC),.*": true
    "^(pl022|pxa-mmc|rcar_sound|rotary-encoder|s5m8767|sdhci),.*": true
      description: Freescale Semiconductor
    "^fujitsu,.*":
      description: Fujitsu Ltd.
 +  "^gardena,.*":
 +    description: GARDENA GmbH
    "^gateworks,.*":
      description: Gateworks Corporation
    "^gcw,.*":
      description: Ortus Technology Co., Ltd.
    "^osddisplays,.*":
      description: OSD Displays
+   "^overkiz,.*":
+     description: Overkiz SAS
    "^ovti,.*":
      description: OmniVision Technologies
    "^oxsemi,.*":
      description: Ubiquiti Networks
    "^udoo,.*":
      description: Udoo
+   "^ugoos,.*":
+     description: Ugoos Industrial Co., Ltd.
    "^uniwest,.*":
      description: United Western Technologies Corp (UniWest)
    "^upisemi,.*":
diff --combined MAINTAINERS
@@@ -1,14 -1,12 +1,14 @@@
 -
 -
 -      List of maintainers and how to submit kernel changes
 +List of maintainers and how to submit kernel changes
 +====================================================
  
  Please try to follow the guidelines below.  This will make things
  easier on the maintainers.  Not all of these guidelines matter for every
  trivial patch so apply some common sense.
  
 -1.    Always _test_ your changes, however small, on at least 4 or
 +Tips for patch submitters
 +-------------------------
 +
 +1.    Always *test* your changes, however small, on at least 4 or
        5 people, preferably many more.
  
  2.    Try to release a few ALPHA test versions to the net. Announce
@@@ -27,7 -25,7 +27,7 @@@
        testing and await feedback.
  
  5.    Make a patch available to the relevant maintainer in the list. Use
 -      'diff -u' to make the patch easy to merge. Be prepared to get your
 +      ``diff -u`` to make the patch easy to merge. Be prepared to get your
        changes sent back with seemingly silly requests about formatting
        and variable names.  These aren't as silly as they seem. One
        job the maintainers (and especially Linus) do is to keep things
@@@ -40,7 -38,7 +40,7 @@@
        See Documentation/process/coding-style.rst for guidance here.
  
        PLEASE CC: the maintainers and mailing lists that are generated
 -      by scripts/get_maintainer.pl.  The results returned by the
 +      by ``scripts/get_maintainer.pl.`` The results returned by the
        script will be best if you have git installed and are making
        your changes in a branch derived from Linus' latest git tree.
        See Documentation/process/submitting-patches.rst for details.
        not represent an immediate threat and are better handled publicly,
        and ideally, should come with a patch proposal. Please do not send
        automated reports to this list either. Such bugs will be handled
 -      better and faster in the usual public places.
 +      better and faster in the usual public places. See
 +      Documentation/admin-guide/security-bugs.rst for details.
  
  8.    Happy hacking.
  
 -Descriptions of section entries:
 +Descriptions of section entries
 +-------------------------------
  
 -      P: Person (obsolete)
 -      M: Mail patches to: FullName <address@domain>
 -      R: Designated reviewer: FullName <address@domain>
 +      M: *Mail* patches to: FullName <address@domain>
 +      R: Designated *Reviewer*: FullName <address@domain>
           These reviewers should be CCed on patches.
 -      L: Mailing list that is relevant to this area
 -      W: Web-page with status/info
 -      B: URI for where to file bugs. A web-page with detailed bug
 +      L: *Mailing list* that is relevant to this area
 +      W: *Web-page* with status/info
 +      B: URI for where to file *bugs*. A web-page with detailed bug
           filing info, a direct bug tracker link, or a mailto: URI.
 -      C: URI for chat protocol, server and channel where developers
 +      C: URI for *chat* protocol, server and channel where developers
           usually hang out, for example irc://server/channel.
 -      Q: Patchwork web based patch tracking system site
 -      T: SCM tree type and location.
 +      Q: *Patchwork* web based patch tracking system site
 +      T: *SCM* tree type and location.
           Type is one of: git, hg, quilt, stgit, topgit
 -      S: Status, one of the following:
 +      S: *Status*, one of the following:
           Supported:   Someone is actually paid to look after this.
           Maintained:  Someone actually looks after it.
           Odd Fixes:   It has a maintainer but they don't have time to do
           Obsolete:    Old code. Something tagged obsolete generally means
                        it has been replaced by a better system and you
                        should be using that.
 -      F: Files and directories with wildcard patterns.
 +      P: Subsystem Profile document for more details submitting
 +         patches to the given subsystem. This is either an in-tree file,
 +         or a URI. See Documentation/maintainer/maintainer-entry-profile.rst
 +         for details.
 +      F: *Files* and directories wildcard patterns.
           A trailing slash includes all files and subdirectory files.
           F:   drivers/net/    all files in and below drivers/net
           F:   drivers/net/*   all files in drivers/net, but not below
           F:   */net/*         all files in "any top level directory"/net
           One pattern per line.  Multiple F: lines acceptable.
 -      N: Files and directories with regex patterns.
 +      N: Files and directories *Regex* patterns.
           N:   [^a-z]tegra     all files whose path contains the word tegra
           One pattern per line.  Multiple N: lines acceptable.
           scripts/get_maintainer.pl has different behavior for files that
           get_maintainer will not look at git log history when an F: pattern
           match occurs.  When an N: match occurs, git log history is used
           to also notify the people that have git commit signatures.
 -      X: Files and directories that are NOT maintained, same rules as F:
 -         Files exclusions are tested before file matches.
 +      X: *Excluded* files and directories that are NOT maintained, same
 +         rules as F:. Files exclusions are tested before file matches.
           Can be useful for excluding a specific subdirectory, for instance:
           F:   net/
           X:   net/ipv6/
           matches all files in and below net excluding net/ipv6/
 -      K: Keyword perl extended regex pattern to match content in a
 -         patch or file.  For instance:
 +      K: *Content regex* (perl extended) pattern match in a patch or file.
 +         For instance:
           K: of_get_profile
              matches patches or files that contain "of_get_profile"
           K: \b(printk|pr_(info|err))\b
              printk, pr_info or pr_err
           One regex pattern per line.  Multiple K: lines acceptable.
  
 -Note: For the hard of thinking, this list is meant to remain in alphabetical
 -order. If you could add yourselves to it in alphabetical order that would be
 -so much easier [Ed]
 +Maintainers List
 +----------------
  
 -Maintainers List (try to look for most precise areas first)
 -
 -              -----------------------------------
 +.. note:: When reading this list, please look for the most precise areas
 +          first. When adding to this list, please keep the entries in
 +          alphabetical order.
  
  3C59X NETWORK DRIVER
  M:    Steffen Klassert <klassert@kernel.org>
@@@ -301,7 -295,7 +301,7 @@@ S: Maintaine
  F:    drivers/net/ethernet/alteon/acenic*
  
  ACER ASPIRE ONE TEMPERATURE AND FAN DRIVER
 -M:    Peter Feuerer <peter@piie.net>
 +M:    Peter Kaestle <peter@piie.net>
  L:    platform-driver-x86@vger.kernel.org
  W:    http://piie.net/?section=acerhdf
  S:    Maintained
@@@ -649,7 -643,7 +649,7 @@@ F: drivers/net/ethernet/alacritech/
  
  FORCEDETH GIGABIT ETHERNET DRIVER
  M:    Rain River <rain.1986.08.12@gmail.com>
 -M:    Zhu Yanjun <yanjun.zhu@oracle.com>
 +M:    Zhu Yanjun <zyjzyj2000@gmail.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    drivers/net/ethernet/nvidia/*
@@@ -688,11 -682,11 +688,11 @@@ S:      Maintaine
  F:    Documentation/devicetree/bindings/opp/sun50i-nvmem-cpufreq.txt
  F:    drivers/cpufreq/sun50i-cpufreq-nvmem.c
  
 -ALLWINNER SECURITY SYSTEM
 +ALLWINNER CRYPTO DRIVERS
  M:    Corentin Labbe <clabbe.montjoie@gmail.com>
  L:    linux-crypto@vger.kernel.org
  S:    Maintained
 -F:    drivers/crypto/sunxi-ss/
 +F:    drivers/crypto/allwinner/
  
  ALLWINNER VPU DRIVER
  M:    Maxime Ripard <mripard@kernel.org>
@@@ -823,7 -817,7 +823,7 @@@ S: Orpha
  F:    drivers/usb/gadget/udc/amd5536udc.*
  
  AMD GEODE PROCESSOR/CHIPSET SUPPORT
 -P:    Andres Salomon <dilinger@queued.net>
 +M:    Andres Salomon <dilinger@queued.net>
  L:    linux-geode@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html
  S:    Supported
@@@ -907,14 -901,6 +907,14 @@@ S:       Supporte
  F:    drivers/iio/adc/ad7124.c
  F:    Documentation/devicetree/bindings/iio/adc/adi,ad7124.yaml
  
 +ANALOG DEVICES INC AD7292 DRIVER
 +M:    Marcelo Schmitt <marcelo.schmitt1@gmail.com>
 +L:    linux-iio@vger.kernel.org
 +W:    http://ez.analog.com/community/linux-device-drivers
 +S:    Supported
 +F:    drivers/iio/adc/ad7292.c
 +F:    Documentation/devicetree/bindings/iio/adc/adi,ad7292.yaml
 +
  ANALOG DEVICES INC AD7606 DRIVER
  M:    Stefan Popa <stefan.popa@analog.com>
  M:    Beniamin Bia <beniamin.bia@analog.com>
@@@ -1016,7 -1002,6 +1016,7 @@@ F:      drivers/media/i2c/adv7842
  
  ANALOG DEVICES INC ASOC CODEC DRIVERS
  M:    Lars-Peter Clausen <lars@metafoo.de>
 +M:    Nuno Sá <nuno.sa@analog.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  W:    http://wiki.analog.com/
  W:    http://ez.analog.com/community/linux-device-drivers
@@@ -1055,7 -1040,6 +1055,7 @@@ F:      drivers/clk/analogbits/
  F:    include/linux/clk/analogbits*
  
  ANDES ARCHITECTURE
 +M:    Nick Hu <nickhu@andestech.com>
  M:    Greentime Hu <green.hu@gmail.com>
  M:    Vincent Chen <deanbo422@gmail.com>
  T:    git https://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git
@@@ -1198,21 -1182,14 +1198,21 @@@ S:   Maintaine
  F:    drivers/media/i2c/aptina-pll.*
  
  AQUANTIA ETHERNET DRIVER (atlantic)
 -M:    Igor Russkikh <igor.russkikh@aquantia.com>
 +M:    Igor Russkikh <irusskikh@marvell.com>
  L:    netdev@vger.kernel.org
  S:    Supported
 -W:    http://www.aquantia.com
 +W:    https://www.marvell.com/
  Q:    http://patchwork.ozlabs.org/project/netdev/list/
  F:    drivers/net/ethernet/aquantia/atlantic/
  F:    Documentation/networking/device_drivers/aquantia/atlantic.txt
  
 +AQUANTIA ETHERNET DRIVER PTP SUBSYSTEM
 +M:    Egor Pomozov <epomozov@marvell.com>
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +W:    http://www.aquantia.com
 +F:    drivers/net/ethernet/aquantia/atlantic/aq_ptp*
 +
  ARC FRAMEBUFFER DRIVER
  M:    Jaya Kumar <jayalk@intworks.biz>
  S:    Maintained
@@@ -1274,7 -1251,6 +1274,7 @@@ F:      Documentation/devicetree/bindings/di
  ARM KOMEDA DRM-KMS DRIVER
  M:    James (Qian) Wang <james.qian.wang@arm.com>
  M:    Liviu Dudau <liviu.dudau@arm.com>
 +M:    Mihail Atanassov <mihail.atanassov@arm.com>
  L:    Mali DP Maintainers <malidp@foss.arm.com>
  S:    Supported
  T:    git git://anongit.freedesktop.org/drm/drm-misc
@@@ -1296,8 -1272,6 +1296,8 @@@ F:      Documentation/gpu/afbc.rs
  ARM MALI PANFROST DRM DRIVER
  M:    Rob Herring <robh@kernel.org>
  M:    Tomeu Vizoso <tomeu.vizoso@collabora.com>
 +R:    Steven Price <steven.price@arm.com>
 +R:    Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
  L:    dri-devel@lists.freedesktop.org
  S:    Supported
  T:    git git://anongit.freedesktop.org/drm/drm-misc
@@@ -1417,7 -1391,6 +1417,7 @@@ F:      drivers/clk/actions
  F:    drivers/clocksource/timer-owl*
  F:    drivers/dma/owl-dma.c
  F:    drivers/i2c/busses/i2c-owl.c
 +F:    drivers/mmc/host/owl-mmc.c
  F:    drivers/pinctrl/actions/*
  F:    drivers/soc/actions/
  F:    include/dt-bindings/power/owl-*
@@@ -1426,7 -1399,6 +1426,7 @@@ F:      Documentation/devicetree/bindings/ar
  F:    Documentation/devicetree/bindings/clock/actions,owl-cmu.txt
  F:    Documentation/devicetree/bindings/dma/owl-dma.txt
  F:    Documentation/devicetree/bindings/i2c/i2c-owl.txt
 +F:    Documentation/devicetree/bindings/mmc/owl-mmc.yaml
  F:    Documentation/devicetree/bindings/pinctrl/actions,s900-pinctrl.txt
  F:    Documentation/devicetree/bindings/power/actions,owl-sps.txt
  F:    Documentation/devicetree/bindings/timer/actions,owl-timer.txt
@@@ -1498,14 -1470,6 +1498,14 @@@ F:    drivers/soc/amlogic
  F:    drivers/rtc/rtc-meson*
  N:    meson
  
 +ARM/Amlogic Meson SoC Crypto Drivers
 +M:    Corentin Labbe <clabbe@baylibre.com>
 +L:    linux-crypto@vger.kernel.org
 +L:    linux-amlogic@lists.infradead.org
 +S:    Maintained
 +F:    drivers/crypto/amlogic/
 +F:    Documentation/devicetree/bindings/crypto/amlogic*
 +
  ARM/Amlogic Meson SoC Sound Drivers
  M:    Jerome Brunet <jbrunet@baylibre.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
@@@ -1565,10 -1529,8 +1565,10 @@@ M:    Manivannan Sadhasivam <manivannan.sa
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm64/boot/dts/bitmain/
 +F:    drivers/clk/clk-bm1880.c
  F:    drivers/pinctrl/pinctrl-bm1880.c
  F:    Documentation/devicetree/bindings/arm/bitmain.yaml
 +F:    Documentation/devicetree/bindings/clock/bitmain,bm1880-clk.yaml
  F:    Documentation/devicetree/bindings/pinctrl/bitmain,bm1880-pinctrl.txt
  
  ARM/CALXEDA HIGHBANK ARCHITECTURE
@@@ -1646,7 -1608,8 +1646,7 @@@ R:      Suzuki K Poulose <suzuki.poulose@arm
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/hwtracing/coresight/*
 -F:    Documentation/trace/coresight.rst
 -F:    Documentation/trace/coresight-cpu-debug.rst
 +F:    Documentation/trace/coresight/*
  F:    Documentation/devicetree/bindings/arm/coresight.txt
  F:    Documentation/devicetree/bindings/arm/coresight-cpu-debug.txt
  F:    Documentation/ABI/testing/sysfs-bus-coresight-devices-*
@@@ -1934,7 -1897,7 +1934,7 @@@ F:      arch/arm/boot/dts/dove
  F:    arch/arm/boot/dts/orion5x*
  T:    git git://git.infradead.org/linux-mvebu.git
  
- ARM/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K SOC support
+ ARM/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K, CN9130 SOC support
  M:    Jason Cooper <jason@lakedaemon.net>
  M:    Andrew Lunn <andrew@lunn.ch>
  M:    Gregory Clement <gregory.clement@bootlin.com>
@@@ -1946,6 -1909,7 +1946,7 @@@ F:      arch/arm/boot/dts/kirkwood
  F:    arch/arm/configs/mvebu_*_defconfig
  F:    arch/arm/mach-mvebu/
  F:    arch/arm64/boot/dts/marvell/armada*
+ F:    arch/arm64/boot/dts/marvell/cn913*
  F:    drivers/cpufreq/armada-37xx-cpufreq.c
  F:    drivers/cpufreq/armada-8k-cpufreq.c
  F:    drivers/cpufreq/mvebu-cpufreq.c
@@@ -2042,7 -2006,6 +2043,7 @@@ 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*
@@@ -2140,7 -2103,6 +2141,7 @@@ S:      Maintaine
  
  ARM/QUALCOMM SUPPORT
  M:    Andy Gross <agross@kernel.org>
 +M:    Bjorn Andersson <bjorn.andersson@linaro.org>
  L:    linux-arm-msm@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/soc/qcom/
@@@ -2189,11 -2151,9 +2190,11 @@@ L:    linux-unisoc@lists.infradead.org (mo
  S:    Maintained
  F:    arch/arm/boot/dts/rda8810pl-*
  F:    drivers/clocksource/timer-rda.c
 +F:    drivers/gpio/gpio-rda.c
  F:    drivers/irqchip/irq-rda-intc.c
  F:    drivers/tty/serial/rda-uart.c
  F:    Documentation/devicetree/bindings/arm/rda.yaml
 +F:    Documentation/devicetree/bindings/gpio/gpio-rda.yaml
  F:    Documentation/devicetree/bindings/interrupt-controller/rda,8810pl-intc.txt
  F:    Documentation/devicetree/bindings/serial/rda,8810pl-uart.txt
  F:    Documentation/devicetree/bindings/timer/rda,8810pl-timer.txt
  ARM/REALTEK ARCHITECTURE
  M:    Andreas Färber <afaerber@suse.de>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +L:    linux-realtek-soc@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm64/boot/dts/realtek/
  F:    Documentation/devicetree/bindings/arm/realtek.yaml
  
  ARM/RENESAS ARM64 ARCHITECTURE
 -M:    Simon Horman <horms@verge.net.au>
  M:    Geert Uytterhoeven <geert+renesas@glider.be>
  M:    Magnus Damm <magnus.damm@gmail.com>
  L:    linux-renesas-soc@vger.kernel.org
  Q:    http://patchwork.kernel.org/project/linux-renesas-soc/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git next
  S:    Supported
  F:    arch/arm64/boot/dts/renesas/
@@@ -2275,7 -2236,8 +2276,7 @@@ F:      drivers/soc/samsung
  F:    include/linux/soc/samsung/
  F:    Documentation/arm/samsung/
  F:    Documentation/devicetree/bindings/arm/samsung/
 -F:    Documentation/devicetree/bindings/sram/samsung-sram.txt
 -F:    Documentation/devicetree/bindings/power/pd-samsung.txt
 +F:    Documentation/devicetree/bindings/power/pd-samsung.yaml
  N:    exynos
  
  ARM/SAMSUNG MOBILE MACHINE SUPPORT
@@@ -2321,10 -2283,12 +2322,10 @@@ S:   Maintaine
  F:    drivers/media/platform/s5p-mfc/
  
  ARM/SHMOBILE ARM ARCHITECTURE
 -M:    Simon Horman <horms@verge.net.au>
  M:    Geert Uytterhoeven <geert+renesas@glider.be>
  M:    Magnus Damm <magnus.damm@gmail.com>
  L:    linux-renesas-soc@vger.kernel.org
  Q:    http://patchwork.kernel.org/project/linux-renesas-soc/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git next
  S:    Supported
  F:    arch/arm/boot/dts/emev2*
@@@ -2364,13 -2328,11 +2365,13 @@@ F:   drivers/edac/altera_edac
  
  ARM/SPREADTRUM SoC SUPPORT
  M:    Orson Zhai <orsonzhai@gmail.com>
 -M:    Baolin Wang <baolin.wang@linaro.org>
 +M:    Baolin Wang <baolin.wang7@gmail.com>
  M:    Chunyan Zhang <zhang.lyra@gmail.com>
  S:    Maintained
  F:    arch/arm64/boot/dts/sprd
  N:    sprd
 +N:    sc27xx
 +N:    sc2731
  
  ARM/STI ARCHITECTURE
  M:    Patrice Chotard <patrice.chotard@st.com>
@@@ -2529,10 -2491,10 +2530,10 @@@ F:   drivers/reset/reset-uniphier.
  F:    drivers/tty/serial/8250/8250_uniphier.c
  N:    uniphier
  
 -ARM/Ux500 CLOCK FRAMEWORK SUPPORT
 +Ux500 CLOCK DRIVERS
  M:    Ulf Hansson <ulf.hansson@linaro.org>
 +L:    linux-clk@vger.kernel.org
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -T:    git git://git.linaro.org/people/ulfh/clk.git
  S:    Maintained
  F:    drivers/clk/ux500/
  
@@@ -2652,7 -2614,6 +2653,7 @@@ S:      Maintaine
  F:    arch/arm64/
  X:    arch/arm64/boot/dts/
  F:    Documentation/arm64/
 +F:    tools/testing/selftests/arm64/
  
  AS3645A LED FLASH CONTROLLER DRIVER
  M:    Sakari Ailus <sakari.ailus@iki.fi>
@@@ -2739,7 -2700,7 +2740,7 @@@ M:      Bartosz Golaszewski <bgolaszewski@ba
  L:    linux-i2c@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
  S:    Maintained
 -F:    Documentation/devicetree/bindings/eeprom/at24.txt
 +F:    Documentation/devicetree/bindings/eeprom/at24.yaml
  F:    drivers/misc/eeprom/at24.c
  
  ATA OVER ETHERNET (AOE) DRIVER
@@@ -2900,6 -2861,7 +2901,6 @@@ AXENTIA ARM DEVICE
  M:    Peter Rosin <peda@axentia.se>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 -F:    Documentation/devicetree/bindings/arm/axentia.txt
  F:    arch/arm/boot/dts/at91-linea.dtsi
  F:    arch/arm/boot/dts/at91-natte.dtsi
  F:    arch/arm/boot/dts/at91-nattis-2-natte-2.dts
@@@ -3094,7 -3056,6 +3095,7 @@@ M:      Daniel Borkmann <daniel@iogearbox.ne
  R:    Martin KaFai Lau <kafai@fb.com>
  R:    Song Liu <songliubraving@fb.com>
  R:    Yonghong Song <yhs@fb.com>
 +R:    Andrii Nakryiko <andriin@fb.com>
  L:    netdev@vger.kernel.org
  L:    bpf@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git
@@@ -3140,7 -3101,7 +3141,7 @@@ S:      Supporte
  F:    arch/arm64/net/
  
  BPF JIT for MIPS (32-BIT AND 64-BIT)
 -M:    Paul Burton <paul.burton@mips.com>
 +M:    Paul Burton <paulburton@kernel.org>
  L:    netdev@vger.kernel.org
  L:    bpf@vger.kernel.org
  S:    Maintained
@@@ -3227,7 -3188,7 +3228,7 @@@ N:      bcm216
  N:    kona
  F:    arch/arm/mach-bcm/
  
 -BROADCOM BCM2835 ARM ARCHITECTURE
 +BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE
  M:    Eric Anholt <eric@anholt.net>
  M:    Stefan Wahren <wahrenst@gmx.net>
  L:    bcm-kernel-feedback-list@broadcom.com
@@@ -3235,7 -3196,6 +3236,7 @@@ L:      linux-rpi-kernel@lists.infradead.or
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  T:    git git://github.com/anholt/linux
  S:    Maintained
 +N:    bcm2711
  N:    bcm2835
  F:    drivers/staging/vc04_services
  
@@@ -3282,6 -3242,8 +3283,6 @@@ S:      Maintaine
  F:    drivers/usb/gadget/udc/bcm63xx_udc.*
  
  BROADCOM BCM7XXX ARM ARCHITECTURE
 -M:    Brian Norris <computersforpeace@gmail.com>
 -M:    Gregory Fong <gregory.0xf0@gmail.com>
  M:    Florian Fainelli <f.fainelli@gmail.com>
  M:    bcm-kernel-feedback-list@broadcom.com
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -3302,6 -3264,7 +3303,6 @@@ S:      Maintaine
  F:    drivers/cpufreq/bmips-cpufreq.c
  
  BROADCOM BMIPS MIPS ARCHITECTURE
 -M:    Kevin Cernekee <cernekee@gmail.com>
  M:    Florian Fainelli <f.fainelli@gmail.com>
  L:    bcm-kernel-feedback-list@broadcom.com
  L:    linux-mips@vger.kernel.org
@@@ -3573,7 -3536,7 +3574,7 @@@ BUS FREQUENCY DRIVER FOR SAMSUNG EXYNO
  M:    Chanwoo Choi <cw00.choi@samsung.com>
  L:    linux-pm@vger.kernel.org
  L:    linux-samsung-soc@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git
  S:    Maintained
  F:    drivers/devfreq/exynos-bus.c
  F:    Documentation/devicetree/bindings/devfreq/exynos-bus.txt
@@@ -3636,13 -3599,6 +3637,13 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/media/cdns,*.txt
  F:    drivers/media/platform/cadence/cdns-csi2*
  
 +CADENCE NAND DRIVER
 +M:    Piotr Sroka <piotrs@cadence.com>
 +L:    linux-mtd@lists.infradead.org
 +S:    Maintained
 +F:    drivers/mtd/nand/raw/cadence-nand-controller.c
 +F:    Documentation/devicetree/bindings/mtd/cadence-nand-controller.txt
 +
  CADET FM/AM RADIO RECEIVER DRIVER
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
@@@ -3674,6 -3630,16 +3675,6 @@@ L:     cake@lists.bufferbloat.net (moderate
  S:    Maintained
  F:    net/sched/sch_cake.c
  
 -CALGARY x86-64 IOMMU
 -M:    Muli Ben-Yehuda <mulix@mulix.org>
 -M:    Jon Mason <jdmason@kudzu.us>
 -L:    iommu@lists.linux-foundation.org
 -S:    Maintained
 -F:    arch/x86/kernel/pci-calgary_64.c
 -F:    arch/x86/kernel/tce_64.c
 -F:    arch/x86/include/asm/calgary.h
 -F:    arch/x86/include/asm/tce.h
 -
  CAN NETWORK DRIVERS
  M:    Wolfgang Grandegger <wg@grandegger.com>
  M:    Marc Kleine-Budde <mkl@pengutronix.de>
@@@ -3716,7 -3682,7 +3717,7 @@@ M:      Oleksij Rempel <o.rempel@pengutronix
  R:    Pengutronix Kernel Team <kernel@pengutronix.de>
  L:    linux-can@vger.kernel.org
  S:    Maintained
 -F:    Documentation/networking/j1939.txt
 +F:    Documentation/networking/j1939.rst
  F:    net/can/j1939/
  F:    include/uapi/linux/can/j1939.h
  
@@@ -3775,6 -3741,7 +3776,6 @@@ F:      drivers/crypto/cavium/cpt
  
  CAVIUM THUNDERX2 ARM64 SOC
  M:    Robert Richter <rrichter@cavium.com>
 -M:    Jayachandran C <jnair@caviumnetworks.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm64/boot/dts/cavium/thunder2-99xx*
@@@ -4307,13 -4274,14 +4308,13 @@@ F:   include/linux/cpufreq.
  F:    include/linux/sched/cpufreq.h
  F:    tools/testing/selftests/cpufreq/
  
 -CPU FREQUENCY DRIVERS - ARM BIG LITTLE
 +CPU FREQUENCY DRIVERS - VEXPRESS SPC ARM BIG LITTLE
  M:    Viresh Kumar <viresh.kumar@linaro.org>
  M:    Sudeep Holla <sudeep.holla@arm.com>
  L:    linux-pm@vger.kernel.org
  W:    http://www.arm.com/products/processors/technologies/biglittleprocessing.php
  S:    Maintained
 -F:    drivers/cpufreq/arm_big_little.h
 -F:    drivers/cpufreq/arm_big_little.c
 +F:    drivers/cpufreq/vexpress-spc-cpufreq.c
  
  CPU POWER MONITORING SUBSYSTEM
  M:    Thomas Renninger <trenn@suse.com>
@@@ -4492,6 -4460,14 +4493,6 @@@ W:     http://www.chelsio.co
  S:    Supported
  F:    drivers/scsi/cxgbi/cxgb3i
  
 -CXGB3 IWARP RNIC DRIVER (IW_CXGB3)
 -M:    Potnuri Bharat Teja <bharat@chelsio.com>
 -L:    linux-rdma@vger.kernel.org
 -W:    http://www.openfabrics.org
 -S:    Supported
 -F:    drivers/infiniband/hw/cxgb3/
 -F:    include/uapi/rdma/cxgb3-abi.h
 -
  CXGB4 CRYPTO DRIVER (chcr)
  M:    Atul Gupta <atul.gupta@chelsio.com>
  L:    linux-crypto@vger.kernel.org
@@@ -4666,14 -4642,6 +4667,14 @@@ M:    "Maciej W. Rozycki" <macro@linux-mip
  S:    Maintained
  F:    drivers/net/fddi/defxx.*
  
 +DEINTERLACE DRIVERS FOR ALLWINNER H3
 +M:    Jernej Skrabec <jernej.skrabec@siol.net>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/platform/sunxi/sun8i-di/
 +F:    Documentation/devicetree/bindings/media/allwinner,sun8i-h3-deinterlace.yaml
 +
  DELL SMBIOS DRIVER
  M:    Pali Rohár <pali.rohar@gmail.com>
  M:    Mario Limonciello <mario.limonciello@dell.com>
@@@ -4798,9 -4766,9 +4799,9 @@@ F:      include/linux/devcoredump.
  DEVICE FREQUENCY (DEVFREQ)
  M:    MyungJoo Ham <myungjoo.ham@samsung.com>
  M:    Kyungmin Park <kyungmin.park@samsung.com>
 -R:    Chanwoo Choi <cw00.choi@samsung.com>
 +M:    Chanwoo Choi <cw00.choi@samsung.com>
  L:    linux-pm@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git
  S:    Maintained
  F:    drivers/devfreq/
  F:    include/linux/devfreq.h
@@@ -4810,11 -4778,10 +4811,11 @@@ F:   include/trace/events/devfreq.
  DEVICE FREQUENCY EVENT (DEVFREQ-EVENT)
  M:    Chanwoo Choi <cw00.choi@samsung.com>
  L:    linux-pm@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git
  S:    Supported
  F:    drivers/devfreq/event/
  F:    drivers/devfreq/devfreq-event.c
 +F:    include/dt-bindings/pmu/exynos_ppmu.h
  F:    include/linux/devfreq-event.h
  F:    Documentation/devicetree/bindings/devfreq/event/
  
@@@ -4916,6 -4883,7 +4917,6 @@@ F:      include/trace/events/fs_dax.
  DEVICE DIRECT ACCESS (DAX)
  M:    Dan Williams <dan.j.williams@intel.com>
  M:    Vishal Verma <vishal.l.verma@intel.com>
 -M:    Keith Busch <keith.busch@intel.com>
  M:    Dave Jiang <dave.jiang@intel.com>
  L:    linux-nvdimm@lists.01.org
  S:    Supported
@@@ -5002,14 -4970,6 +5003,14 @@@ F:    include/linux/dma-direct.
  F:    include/linux/dma-mapping.h
  F:    include/linux/dma-noncoherent.h
  
 +DMC FREQUENCY DRIVER FOR SAMSUNG EXYNOS5422
 +M:    Lukasz Luba <l.luba@partner.samsung.com>
 +L:    linux-pm@vger.kernel.org
 +L:    linux-samsung-soc@vger.kernel.org
 +S:    Maintained
 +F:    drivers/memory/samsung/exynos5422-dmc.c
 +F:    Documentation/devicetree/bindings/memory-controllers/exynos5422-dmc.txt
 +
  DME1737 HARDWARE MONITOR DRIVER
  M:    Juerg Haefliger <juergh@gmail.com>
  L:    linux-hwmon@vger.kernel.org
@@@ -5091,14 -5051,10 +5092,14 @@@ M:   Ioana Radulescu <ruxandra.radulescu@
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    drivers/net/ethernet/freescale/dpaa2/dpaa2-eth*
 +F:    drivers/net/ethernet/freescale/dpaa2/dpaa2-mac*
  F:    drivers/net/ethernet/freescale/dpaa2/dpni*
 +F:    drivers/net/ethernet/freescale/dpaa2/dpmac*
  F:    drivers/net/ethernet/freescale/dpaa2/dpkg.h
  F:    drivers/net/ethernet/freescale/dpaa2/Makefile
  F:    drivers/net/ethernet/freescale/dpaa2/Kconfig
 +F:    Documentation/networking/device_drivers/freescale/dpaa2/ethernet-driver.rst
 +F:    Documentation/networking/device_drivers/freescale/dpaa2/mac-phy-support.rst
  
  DPAA2 ETHERNET SWITCH DRIVER
  M:    Ioana Radulescu <ruxandra.radulescu@nxp.com>
@@@ -5421,22 -5377,12 +5422,22 @@@ F:   include/linux/vga
  
  DRM DRIVERS FOR ALLWINNER A10
  M:    Maxime Ripard <mripard@kernel.org>
 +M:    Chen-Yu Tsai <wens@csie.org>
  L:    dri-devel@lists.freedesktop.org
  S:    Supported
  F:    drivers/gpu/drm/sun4i/
  F:    Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  
 +DRM DRIVER FOR ALLWINNER DE2 AND DE3 ENGINE
 +M:    Maxime Ripard <mripard@kernel.org>
 +M:    Chen-Yu Tsai <wens@csie.org>
 +R:    Jernej Skrabec <jernej.skrabec@siol.net>
 +L:    dri-devel@lists.freedesktop.org
 +S:    Supported
 +F:    drivers/gpu/drm/sun4i/sun8i*
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +
  DRM DRIVERS FOR AMLOGIC SOCS
  M:    Neil Armstrong <narmstrong@baylibre.com>
  L:    dri-devel@lists.freedesktop.org
@@@ -6061,14 -6007,14 +6062,14 @@@ F:   sound/usb/misc/ua101.
  EFI TEST DRIVER
  L:    linux-efi@vger.kernel.org
  M:    Ivan Hu <ivan.hu@canonical.com>
 -M:    Ard Biesheuvel <ard.biesheuvel@linaro.org>
 +M:    Ard Biesheuvel <ardb@kernel.org>
  S:    Maintained
  F:    drivers/firmware/efi/test/
  
  EFI VARIABLE FILESYSTEM
  M:    Matthew Garrett <matthew.garrett@nebula.com>
  M:    Jeremy Kerr <jk@ozlabs.org>
 -M:    Ard Biesheuvel <ard.biesheuvel@linaro.org>
 +M:    Ard Biesheuvel <ardb@kernel.org>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git
  L:    linux-efi@vger.kernel.org
  S:    Maintained
@@@ -6202,12 -6148,10 +6203,12 @@@ S:   Maintaine
  F:    Documentation/ABI/testing/sysfs-class-net-phydev
  F:    Documentation/devicetree/bindings/net/ethernet-phy.yaml
  F:    Documentation/devicetree/bindings/net/mdio*
 +F:    Documentation/devicetree/bindings/net/qca,ar803x.yaml
  F:    Documentation/networking/phy.rst
  F:    drivers/net/phy/
  F:    drivers/of/of_mdio.c
  F:    drivers/of/of_net.c
 +F:    include/dt-bindings/net/qca-ar803x.h
  F:    include/linux/*mdio*.h
  F:    include/linux/of_net.h
  F:    include/linux/phy.h
@@@ -6220,7 -6164,6 +6221,7 @@@ F:      include/uapi/linux/mii.
  
  EXFAT FILE SYSTEM
  M:    Valdis Kletnieks <valdis.kletnieks@vt.edu>
 +L:    linux-fsdevel@vger.kernel.org
  S:    Maintained
  F:    drivers/staging/exfat/
  
@@@ -6250,7 -6193,7 +6251,7 @@@ S:      Supporte
  F:    security/integrity/evm/
  
  EXTENSIBLE FIRMWARE INTERFACE (EFI)
 -M:    Ard Biesheuvel <ard.biesheuvel@linaro.org>
 +M:    Ard Biesheuvel <ardb@kernel.org>
  L:    linux-efi@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git
  S:    Maintained
@@@ -6775,7 -6718,6 +6776,7 @@@ FSNOTIFY: FILESYSTEM NOTIFICATION INFRA
  M:    Jan Kara <jack@suse.cz>
  R:    Amir Goldstein <amir73il@gmail.com>
  L:    linux-fsdevel@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git fsnotify
  S:    Maintained
  F:    fs/notify/
  F:    include/linux/fsnotify*.h
@@@ -6945,7 -6887,7 +6946,7 @@@ L:      linux-pm@vger.kernel.or
  S:    Supported
  F:    drivers/base/power/domain*.c
  F:    include/linux/pm_domain.h
 -F:    Documentation/devicetree/bindings/power/power_domain.txt
 +F:    Documentation/devicetree/bindings/power/power?domain*
  
  GENERIC RESISTIVE TOUCHSCREEN ADC DRIVER
  M:    Eugen Hristev <eugen.hristev@microchip.com>
@@@ -7296,7 -7238,7 +7297,7 @@@ M:      Ohad Ben-Cohen <ohad@wizery.com
  M:    Bjorn Andersson <bjorn.andersson@linaro.org>
  L:    linux-remoteproc@vger.kernel.org
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc.git hwspinlock-next
  F:    Documentation/devicetree/bindings/hwlock/
  F:    Documentation/hwspinlock.txt
  F:    drivers/hwspinlock/
@@@ -7427,25 -7369,6 +7428,25 @@@ F:    include/uapi/linux/if_hippi.
  F:    net/802/hippi.c
  F:    drivers/net/hippi/
  
 +HISILICON SECURITY ENGINE V2 DRIVER (SEC2)
 +M:    Zaibo Xu <xuzaibo@huawei.com>
 +L:    linux-crypto@vger.kernel.org
 +S:    Maintained
 +F:    drivers/crypto/hisilicon/sec2/sec_crypto.c
 +F:    drivers/crypto/hisilicon/sec2/sec_main.c
 +F:    drivers/crypto/hisilicon/sec2/sec_crypto.h
 +F:    drivers/crypto/hisilicon/sec2/sec.h
 +F:    Documentation/ABI/testing/debugfs-hisi-sec
 +
 +HISILICON HIGH PERFORMANCE RSA ENGINE DRIVER (HPRE)
 +M:    Zaibo Xu <xuzaibo@huawei.com>
 +L:    linux-crypto@vger.kernel.org
 +S:    Maintained
 +F:    drivers/crypto/hisilicon/hpre/hpre_crypto.c
 +F:    drivers/crypto/hisilicon/hpre/hpre_main.c
 +F:    drivers/crypto/hisilicon/hpre/hpre.h
 +F:    Documentation/ABI/testing/debugfs-hisi-hpre
 +
  HISILICON NETWORK SUBSYSTEM 3 DRIVER (HNS3)
  M:    Yisen Zhuang <yisen.zhuang@huawei.com>
  M:    Salil Mehta <salil.mehta@huawei.com>
@@@ -7454,11 -7377,6 +7455,11 @@@ W:    http://www.hisilicon.co
  S:    Maintained
  F:    drivers/net/ethernet/hisilicon/hns3/
  
 +HISILICON TRUE RANDOM NUMBER GENERATOR V2 SUPPORT
 +M:    Zaibo Xu <xuzaibo@huawei.com>
 +S:    Maintained
 +F:    drivers/char/hw_random/hisi-trng-v2.c
 +
  HISILICON LPC BUS DRIVER
  M:    john.garry@huawei.com
  W:    http://www.hisilicon.com
@@@ -7504,6 -7422,7 +7505,6 @@@ S:      Maintaine
  F:    drivers/crypto/hisilicon/qm.c
  F:    drivers/crypto/hisilicon/qm.h
  F:    drivers/crypto/hisilicon/sgl.c
 -F:    drivers/crypto/hisilicon/sgl.h
  F:    drivers/crypto/hisilicon/zip/
  F:    Documentation/ABI/testing/debugfs-hisi-zip
  
@@@ -7529,8 -7448,8 +7530,8 @@@ F:      drivers/platform/x86/tc1100-wmi.
  
  HP100:        Driver for HP 10/100 Mbit/s Voice Grade Network Adapter Series
  M:    Jaroslav Kysela <perex@perex.cz>
 -S:    Maintained
 -F:    drivers/net/ethernet/hp/hp100.*
 +S:    Obsolete
 +F:    drivers/staging/hp/hp100.*
  
  HPET: High Precision Event Timers driver
  M:    Clemens Ladisch <clemens@ladisch.de>
@@@ -7631,13 -7550,6 +7632,13 @@@ L:    linux-kernel@vger.kernel.or
  S:    Maintained
  F:    arch/x86/kernel/cpu/hygon.c
  
 +HYNIX HI556 SENSOR DRIVER
 +M:    Shawn Tu <shawnx.tu@intel.com>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/hi556.c
 +
  Hyper-V CORE AND DRIVERS
  M:    "K. Y. Srinivasan" <kys@microsoft.com>
  M:    Haiyang Zhang <haiyangz@microsoft.com>
@@@ -7670,7 -7582,6 +7671,7 @@@ F:      include/uapi/linux/hyperv.
  F:    include/asm-generic/mshyperv.h
  F:    tools/hv/
  F:    Documentation/ABI/stable/sysfs-bus-vmbus
 +F:    Documentation/ABI/testing/debugfs-hyperv
  
  HYPERBUS SUPPORT
  M:    Vignesh Raghavendra <vigneshr@ti.com>
@@@ -7823,7 -7734,7 +7824,7 @@@ F:      drivers/i2c/i2c-stub.
  
  I3C SUBSYSTEM
  M:    Boris Brezillon <bbrezillon@kernel.org>
 -L:    linux-i3c@lists.infradead.org
 +L:    linux-i3c@lists.infradead.org (moderated for non-subscribers)
  C:    irc://chat.freenode.net/linux-i3c
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git
  S:    Maintained
@@@ -7839,12 -7750,6 +7840,12 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/i3c/snps,dw-i3c-master.txt
  F:    drivers/i3c/master/dw*
  
 +I3C DRIVER FOR CADENCE I3C MASTER IP
 +M:      Przemysław Gaj <pgaj@cadence.com>
 +S:      Maintained
 +F:      Documentation/devicetree/bindings/i3c/cdns,i3c-master.txt
 +F:      drivers/i3c/master/i3c-master-cdns.c
 +
  IA64 (Itanium) PLATFORM
  M:    Tony Luck <tony.luck@intel.com>
  M:    Fenghua Yu <fenghua.yu@intel.com>
@@@ -8101,7 -8006,7 +8102,7 @@@ S:      Maintaine
  F:    drivers/usb/atm/ueagle-atm.c
  
  IMGTEC ASCII LCD DRIVER
 -M:    Paul Burton <paul.burton@mips.com>
 +M:    Paul Burton <paulburton@kernel.org>
  S:    Maintained
  F:    Documentation/devicetree/bindings/auxdisplay/img-ascii-lcd.txt
  F:    drivers/auxdisplay/img-ascii-lcd.c
@@@ -8343,7 -8248,7 +8344,7 @@@ F:      Documentation/fb/intelfb.rs
  F:    drivers/video/fbdev/intelfb/
  
  INTEL GPIO DRIVERS
 -M:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 +M:    Andy Shevchenko <andy@kernel.org>
  L:    linux-gpio@vger.kernel.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git
@@@ -8398,14 -8303,11 +8399,14 @@@ F:   drivers/hid/intel-ish-hid
  
  INTEL IOMMU (VT-d)
  M:    David Woodhouse <dwmw2@infradead.org>
 +M:    Lu Baolu <baolu.lu@linux.intel.com>
  L:    iommu@lists.linux-foundation.org
 -T:    git git://git.infradead.org/iommu-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
  S:    Supported
 -F:    drivers/iommu/intel-iommu.c
 +F:    drivers/iommu/dmar.c
 +F:    drivers/iommu/intel*.[ch]
  F:    include/linux/intel-iommu.h
 +F:    include/linux/intel-svm.h
  
  INTEL IOP-ADMA DMA DRIVER
  R:    Dan Williams <dan.j.williams@intel.com>
@@@ -8429,7 -8331,6 +8430,7 @@@ S:      Maintaine
  F:    drivers/staging/media/ipu3/
  F:    Documentation/media/uapi/v4l/pixfmt-meta-intel-ipu3.rst
  F:    Documentation/media/v4l-drivers/ipu3.rst
 +F:    Documentation/media/v4l-drivers/ipu3_rcb.svg
  
  INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
  M:    Krzysztof Halasa <khalasa@piap.pl>
@@@ -8497,7 -8398,7 +8498,7 @@@ F:      arch/x86/include/asm/intel_pmc_ipc.
  F:    arch/x86/include/asm/intel_punit_ipc.h
  
  INTEL PMIC GPIO DRIVERS
 -M:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 +M:    Andy Shevchenko <andy@kernel.org>
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git
  F:    drivers/gpio/gpio-*cove.c
@@@ -8665,13 -8566,12 +8666,13 @@@ F:   include/linux/iova.
  
  IO_URING
  M:    Jens Axboe <axboe@kernel.dk>
 -L:    linux-block@vger.kernel.org
 -L:    linux-fsdevel@vger.kernel.org
 +L:    io-uring@vger.kernel.org
  T:    git git://git.kernel.dk/linux-block
  T:    git git://git.kernel.dk/liburing
  S:    Maintained
  F:    fs/io_uring.c
 +F:    fs/io-wq.c
 +F:    fs/io-wq.h
  F:    include/uapi/linux/io_uring.h
  
  IPMI SUBSYSTEM
@@@ -8944,7 -8844,7 +8945,7 @@@ F:      mm/kasan
  F:    scripts/Makefile.kasan
  
  KCONFIG
 -M:    Masahiro Yamada <yamada.masahiro@socionext.com>
 +M:    Masahiro Yamada <masahiroy@kernel.org>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kconfig
  L:    linux-kbuild@vger.kernel.org
  S:    Maintained
@@@ -8976,7 -8876,7 +8977,7 @@@ S:      Maintaine
  F:    fs/autofs/
  
  KERNEL BUILD + files below scripts/ (unless maintained elsewhere)
 -M:    Masahiro Yamada <yamada.masahiro@socionext.com>
 +M:    Masahiro Yamada <masahiroy@kernel.org>
  M:    Michal Marek <michal.lkml@markovi.net>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git
  L:    linux-kbuild@vger.kernel.org
@@@ -9022,17 -8922,6 +9023,17 @@@ S:    Maintaine
  F:    tools/testing/selftests/
  F:    Documentation/dev-tools/kselftest*
  
 +KERNEL UNIT TESTING FRAMEWORK (KUnit)
 +M:    Brendan Higgins <brendanhiggins@google.com>
 +L:    linux-kselftest@vger.kernel.org
 +L:    kunit-dev@googlegroups.com
 +W:    https://google.github.io/kunit-docs/third_party/kernel/docs/
 +S:    Maintained
 +F:    Documentation/dev-tools/kunit/
 +F:    include/kunit/
 +F:    lib/kunit/
 +F:    tools/testing/kunit/
 +
  KERNEL USERMODE HELPER
  M:    Luis Chamberlain <mcgrof@kernel.org>
  L:    linux-kernel@vger.kernel.org
@@@ -9238,7 -9127,7 +9239,7 @@@ F:      drivers/auxdisplay/ks0108.
  F:    include/linux/ks0108.h
  
  L3MDEV
 -M:    David Ahern <dsa@cumulusnetworks.com>
 +M:    David Ahern <dsahern@kernel.org>
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    net/l3mdev
@@@ -9299,7 -9188,6 +9300,7 @@@ M:      Pavel Machek <pavel@ucw.cz
  R:    Dan Murphy <dmurphy@ti.com>
  L:    linux-leds@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git
  S:    Maintained
  F:    Documentation/devicetree/bindings/leds/
  F:    drivers/leds/
@@@ -9416,7 -9304,6 +9417,7 @@@ M:      Dan Williams <dan.j.williams@intel.c
  M:    Vishal Verma <vishal.l.verma@intel.com>
  M:    Dave Jiang <dave.jiang@intel.com>
  L:    linux-nvdimm@lists.01.org
 +P:    Documentation/nvdimm/maintainer-entry-profile.rst
  Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
  S:    Supported
  F:    drivers/nvdimm/blk.c
@@@ -9427,7 -9314,6 +9428,7 @@@ M:      Vishal Verma <vishal.l.verma@intel.c
  M:    Dan Williams <dan.j.williams@intel.com>
  M:    Dave Jiang <dave.jiang@intel.com>
  L:    linux-nvdimm@lists.01.org
 +P:    Documentation/nvdimm/maintainer-entry-profile.rst
  Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
  S:    Supported
  F:    drivers/nvdimm/btt*
@@@ -9437,7 -9323,6 +9438,7 @@@ M:      Dan Williams <dan.j.williams@intel.c
  M:    Vishal Verma <vishal.l.verma@intel.com>
  M:    Dave Jiang <dave.jiang@intel.com>
  L:    linux-nvdimm@lists.01.org
 +P:    Documentation/nvdimm/maintainer-entry-profile.rst
  Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
  S:    Supported
  F:    drivers/nvdimm/pmem*
@@@ -9454,9 -9339,9 +9455,9 @@@ LIBNVDIMM: NON-VOLATILE MEMORY DEVICE S
  M:    Dan Williams <dan.j.williams@intel.com>
  M:    Vishal Verma <vishal.l.verma@intel.com>
  M:    Dave Jiang <dave.jiang@intel.com>
 -M:    Keith Busch <keith.busch@intel.com>
  M:    Ira Weiny <ira.weiny@intel.com>
  L:    linux-nvdimm@lists.01.org
 +P:    Documentation/nvdimm/maintainer-entry-profile.rst
  Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git
  S:    Supported
@@@ -9613,13 -9498,6 +9614,13 @@@ F:    Documentation/misc-devices/lis3lv02d
  F:    drivers/misc/lis3lv02d/
  F:    drivers/platform/x86/hp_accel.c
  
 +LIST KUNIT TEST
 +M:    David Gow <davidgow@google.com>
 +L:    linux-kselftest@vger.kernel.org
 +L:    kunit-dev@googlegroups.com
 +S:    Maintained
 +F:    lib/list-test.c
 +
  LIVE PATCHING
  M:    Josh Poimboeuf <jpoimboe@redhat.com>
  M:    Jiri Kosina <jikos@kernel.org>
@@@ -9724,13 -9602,6 +9725,13 @@@ S:    Maintaine
  F:    Documentation/admin-guide/ldm.rst
  F:    block/partitions/ldm.*
  
 +LOGITECH HID GAMING KEYBOARDS
 +M:    Hans de Goede <hdegoede@redhat.com>
 +L:    linux-input@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git
 +S:    Maintained
 +F:    drivers/hid/hid-lg-g15.c
 +
  LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
  M:    Sathya Prakash <sathya.prakash@broadcom.com>
  M:    Chaitra P B <chaitra.basappa@broadcom.com>
@@@ -9752,17 -9623,9 +9753,17 @@@ LTC1660 DAC DRIVE
  M:    Marcus Folkesson <marcus.folkesson@gmail.com>
  L:    linux-iio@vger.kernel.org
  S:    Maintained
 -F:    Documentation/devicetree/bindings/iio/dac/ltc1660.txt
 +F:    Documentation/devicetree/bindings/iio/dac/lltc,ltc1660.yaml
  F:    drivers/iio/dac/ltc1660.c
  
 +LTC2983 IIO TEMPERATURE DRIVER
 +M:    Nuno Sá <nuno.sa@analog.com>
 +W:    http://ez.analog.com/community/linux-device-drivers
 +L:    linux-iio@vger.kernel.org
 +S:    Supported
 +F:    drivers/iio/temperature/ltc2983.c
 +F:    Documentation/devicetree/bindings/iio/temperature/adi,ltc2983.yaml
 +
  LTC4261 HARDWARE MONITOR DRIVER
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-hwmon@vger.kernel.org
@@@ -9770,17 -9633,6 +9771,17 @@@ S:    Maintaine
  F:    Documentation/hwmon/ltc4261.rst
  F:    drivers/hwmon/ltc4261.c
  
 +LTC2947 HARDWARE MONITOR DRIVER
 +M:    Nuno Sá <nuno.sa@analog.com>
 +W:    http://ez.analog.com/community/linux-device-drivers
 +L:    linux-hwmon@vger.kernel.org
 +S:    Supported
 +F:    drivers/hwmon/ltc2947-core.c
 +F:    drivers/hwmon/ltc2947-spi.c
 +F:    drivers/hwmon/ltc2947-i2c.c
 +F:    drivers/hwmon/ltc2947.h
 +F:    Documentation/devicetree/bindings/hwmon/adi,ltc2947.yaml
 +
  LTC4306 I2C MULTIPLEXER DRIVER
  M:    Michael Hennerich <michael.hennerich@analog.com>
  W:    http://ez.analog.com/community/linux-device-drivers
@@@ -9889,7 -9741,6 +9890,7 @@@ S:      Maintaine
  F:    drivers/net/dsa/mv88e6xxx/
  F:    include/linux/platform_data/mv88e6xxx.h
  F:    Documentation/devicetree/bindings/net/dsa/marvell.txt
 +F:    Documentation/networking/devlink-params-mv88e6xxx.txt
  
  MARVELL ARMADA DRM SUPPORT
  M:    Russell King <linux@armlinux.org.uk>
@@@ -10014,7 -9865,7 +10015,7 @@@ F:    Documentation/hwmon/max16065.rs
  F:    drivers/hwmon/max16065.c
  
  MAX2175 SDR TUNER DRIVER
 -M:    Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com>
 +M:    Ramesh Shanmugasundaram <rashanmu@gmail.com>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
@@@ -10056,8 -9907,8 +10057,8 @@@ MAXIM MAX77650 PMIC MFD DRIVE
  M:    Bartosz Golaszewski <bgolaszewski@baylibre.com>
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
 -F:    Documentation/devicetree/bindings/*/*max77650.txt
 -F:    Documentation/devicetree/bindings/*/max77650*.txt
 +F:    Documentation/devicetree/bindings/*/*max77650.yaml
 +F:    Documentation/devicetree/bindings/*/max77650*.yaml
  F:    include/linux/mfd/max77650.h
  F:    drivers/mfd/max77650.c
  F:    drivers/regulator/max77650-regulator.c
@@@ -10276,7 -10127,7 +10277,7 @@@ F:   drivers/media/platform/renesas-ceu.
  F:    include/media/drv-intf/renesas-ceu.h
  
  MEDIA DRIVERS FOR RENESAS - DRIF
 -M:    Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com>
 +M:    Ramesh Shanmugasundaram <rashanmu@gmail.com>
  L:    linux-media@vger.kernel.org
  L:    linux-renesas-soc@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
@@@ -10356,6 -10207,7 +10357,6 @@@ F:   drivers/staging/media/tegra-vde
  
  MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
  M:    Mauro Carvalho Chehab <mchehab@kernel.org>
 -P:    LinuxTV.org Project
  L:    linux-media@vger.kernel.org
  W:    https://linuxtv.org
  Q:    http://patchwork.kernel.org/project/linux-media/list/
@@@ -10407,7 -10259,7 +10408,7 @@@ MEDIATEK ETHERNET DRIVE
  M:    Felix Fietkau <nbd@openwrt.org>
  M:    John Crispin <john@phrozen.org>
  M:    Sean Wang <sean.wang@mediatek.com>
 -M:    Nelson Chang <nelson.chang@mediatek.com>
 +M:    Mark Lee <Mark-MC.Lee@mediatek.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    drivers/net/ethernet/mediatek/
@@@ -10419,13 -10271,6 +10420,13 @@@ S: Maintaine
  F:    drivers/net/dsa/mt7530.*
  F:    net/dsa/tag_mtk.c
  
 +MEDIATEK BOARD LEVEL SHUTDOWN DRIVERS
 +M:    Sean Wang <sean.wang@mediatek.com>
 +L:    linux-pm@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/power/reset/mt6323-poweroff.txt
 +F:    drivers/power/reset/mt6323-poweroff.c
 +
  MEDIATEK JPEG DRIVER
  M:    Rick Chang <rick.chang@mediatek.com>
  M:    Bin Liu <bin.liu@mediatek.com>
@@@ -10591,7 -10436,6 +10592,7 @@@ M:   Darren Hart <dvhart@infradead.org
  M:    Vadim Pasternak <vadimp@mellanox.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Supported
 +F:    Documentation/ABI/testing/sysfs-platform-mellanox-bootctl
  F:    drivers/platform/mellanox/
  F:    include/linux/platform_data/mlxreg.h
  
@@@ -10678,12 -10522,8 +10679,12 @@@ F: mm/memblock.
  F:    Documentation/core-api/boot-time-mm.rst
  
  MEMORY MANAGEMENT
 +M:    Andrew Morton <akpm@linux-foundation.org>
  L:    linux-mm@kvack.org
  W:    http://www.linux-mm.org
 +T:    quilt https://ozlabs.org/~akpm/mmotm/
 +T:    quilt https://ozlabs.org/~akpm/mmots/
 +T:    git git://github.com/hnaz/linux-mm.git
  S:    Maintained
  F:    include/linux/mm.h
  F:    include/linux/gfp.h
@@@ -10693,13 -10533,15 +10694,13 @@@ F:        include/linux/vmalloc.
  F:    mm/
  
  MEMORY TECHNOLOGY DEVICES (MTD)
 -M:    David Woodhouse <dwmw2@infradead.org>
 -M:    Brian Norris <computersforpeace@gmail.com>
 -M:    Marek Vasut <marek.vasut@gmail.com>
  M:    Miquel Raynal <miquel.raynal@bootlin.com>
  M:    Richard Weinberger <richard@nod.at>
  M:    Vignesh Raghavendra <vigneshr@ti.com>
  L:    linux-mtd@lists.infradead.org
  W:    http://www.linux-mtd.infradead.org/
  Q:    http://patchwork.ozlabs.org/project/linux-mtd/list/
 +C:    irc://irc.oftc.net/mtd
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/fixes
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/next
  S:    Maintained
@@@ -10744,7 -10586,7 +10745,7 @@@ W:   http://linux-meson.com
  S:    Supported
  F:    drivers/media/platform/meson/ao-cec.c
  F:    drivers/media/platform/meson/ao-cec-g12a.c
 -F:    Documentation/devicetree/bindings/media/meson-ao-cec.txt
 +F:    Documentation/devicetree/bindings/media/amlogic,meson-gx-ao-cec.yaml
  T:    git git://linuxtv.org/media_tree.git
  
  MESON NAND CONTROLLER DRIVER FOR AMLOGIC SOCS
@@@ -10885,7 -10727,7 +10886,7 @@@ M:   Kent Gustavsson <kent@minoris.se
  L:    linux-iio@vger.kernel.org
  S:    Supported
  F:    drivers/iio/adc/mcp3911.c
 -F:    Documentation/devicetree/bindings/iio/adc/mcp3911.txt
 +F:    Documentation/devicetree/bindings/iio/adc/microchip,mcp3911.yaml
  
  MICROCHIP NAND DRIVER
  M:    Tudor Ambarus <tudor.ambarus@microchip.com>
@@@ -10976,7 -10818,6 +10977,7 @@@ M:   Microchip Linux Driver Support <UNGL
  L:    netdev@vger.kernel.org
  S:    Supported
  F:    drivers/net/ethernet/mscc/
 +F:    include/soc/mscc/ocelot*
  
  MICROSOFT SURFACE PRO 3 BUTTON DRIVER
  M:    Chen Yu <yu.c.chen@intel.com>
@@@ -10991,7 -10832,7 +10992,7 @@@ F:   drivers/usb/image/microtek.
  
  MIPS
  M:    Ralf Baechle <ralf@linux-mips.org>
 -M:    Paul Burton <paul.burton@mips.com>
 +M:    Paul Burton <paulburton@kernel.org>
  M:    James Hogan <jhogan@kernel.org>
  L:    linux-mips@vger.kernel.org
  W:    http://www.linux-mips.org/
@@@ -11005,7 -10846,7 +11006,7 @@@ F:   arch/mips
  F:    drivers/platform/mips/
  
  MIPS BOSTON DEVELOPMENT BOARD
 -M:    Paul Burton <paul.burton@mips.com>
 +M:    Paul Burton <paulburton@kernel.org>
  L:    linux-mips@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/clock/img,boston-clock.txt
@@@ -11015,7 -10856,7 +11016,7 @@@ F:   drivers/clk/imgtec/clk-boston.
  F:    include/dt-bindings/clock/boston-clock.h
  
  MIPS GENERIC PLATFORM
 -M:    Paul Burton <paul.burton@mips.com>
 +M:    Paul Burton <paulburton@kernel.org>
  L:    linux-mips@vger.kernel.org
  S:    Supported
  F:    Documentation/devicetree/bindings/power/mti,mips-cpc.txt
@@@ -11031,18 -10872,18 +11032,18 @@@ F:        arch/mips/include/asm/mach-loongson3
  F:    drivers/*/*loongson1*
  F:    drivers/*/*/*loongson1*
  
 -MIPS/LOONGSON2 ARCHITECTURE
 +MIPS/LOONGSON2EF ARCHITECTURE
  M:    Jiaxun Yang <jiaxun.yang@flygoat.com>
  L:    linux-mips@vger.kernel.org
  S:    Maintained
 -F:    arch/mips/loongson64/fuloong-2e/
 -F:    arch/mips/loongson64/lemote-2f/
 -F:    arch/mips/include/asm/mach-loongson64/
 +F:    arch/mips/loongson2ef/
 +F:    arch/mips/include/asm/mach-loongson2ef/
  F:    drivers/*/*loongson2*
  F:    drivers/*/*/*loongson2*
  
 -MIPS/LOONGSON3 ARCHITECTURE
 +MIPS/LOONGSON64 ARCHITECTURE
  M:    Huacai Chen <chenhc@lemote.com>
 +M:    Jiaxun Yang <jiaxun.yang@flygoat.com>
  L:    linux-mips@vger.kernel.org
  S:    Maintained
  F:    arch/mips/loongson64/
@@@ -11069,18 -10910,9 +11070,18 @@@ F: drivers/media/radio/radio-miropcm20
  MMP SUPPORT
  R:    Lubomir Rintel <lkundrak@v3.sk>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lkundrak/linux-mmp.git
  S:    Odd Fixes
  F:    arch/arm/boot/dts/mmp*
  F:    arch/arm/mach-mmp/
 +F:    linux/soc/mmp/
 +
 +MMP USB PHY DRIVERS
 +R:    Lubomir Rintel <lkundrak@v3.sk>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/phy/marvell/phy-mmp3-usb.c
 +F:    drivers/phy/marvell/phy-pxa-usb.c
  
  MMU GATHER AND TLB INVALIDATION
  M:    Will Deacon <will@kernel.org>
@@@ -11579,6 -11411,7 +11580,6 @@@ F:   include/trace/events/tcp.
  NETWORKING [TLS]
  M:    Boris Pismenny <borisp@mellanox.com>
  M:    Aviad Yehezkel <aviadye@mellanox.com>
 -M:    Dave Watson <davejwatson@fb.com>
  M:    John Fastabend <john.fastabend@gmail.com>
  M:    Daniel Borkmann <daniel@iogearbox.net>
  M:    Jakub Kicinski <jakub.kicinski@netronome.com>
@@@ -11715,7 -11548,6 +11716,7 @@@ NSDEP
  M:    Matthias Maennich <maennich@google.com>
  S:    Maintained
  F:    scripts/nsdeps
 +F:    Documentation/core-api/symbol-namespaces.rst
  
  NTB AMD DRIVER
  M:    Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
@@@ -11802,7 -11634,6 +11803,7 @@@ F:   drivers/nvme/target/fcloop.
  NVM EXPRESS TARGET DRIVER
  M:    Christoph Hellwig <hch@lst.de>
  M:    Sagi Grimberg <sagi@grimberg.me>
 +M:    Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
  L:    linux-nvme@lists.infradead.org
  T:    git://git.infradead.org/nvme.git
  W:    http://git.infradead.org/nvme.git
@@@ -11927,8 -11758,6 +11928,8 @@@ F:   arch/arm/boot/dts/*am3
  F:    arch/arm/boot/dts/*am4*
  F:    arch/arm/boot/dts/*am5*
  F:    arch/arm/boot/dts/*dra7*
 +F:    arch/arm/boot/dts/logicpd-som-lv*
 +F:    arch/arm/boot/dts/logicpd-torpedo*
  
  OMAP DISPLAY SUBSYSTEM and FRAMEBUFFER SUPPORT (DSS2)
  L:    linux-omap@vger.kernel.org
@@@ -12486,15 -12315,12 +12487,15 @@@ F:        arch/parisc
  F:    Documentation/parisc/
  F:    drivers/parisc/
  F:    drivers/char/agp/parisc-agp.c
 +F:    drivers/input/misc/hp_sdc_rtc.c
  F:    drivers/input/serio/gscps2.c
 +F:    drivers/input/serio/hp_sdc*
  F:    drivers/parport/parport_gsc.*
  F:    drivers/tty/serial/8250/8250_gsc.c
  F:    drivers/video/fbdev/sti*
  F:    drivers/video/console/sti*
  F:    drivers/video/logo/logo_parisc*
 +F:    include/linux/hp_sdc.h
  
  PARMAN
  M:    Jiri Pirko <jiri@mellanox.com>
@@@ -12621,6 -12447,7 +12622,6 @@@ F:   Documentation/devicetree/bindings/pc
  F:    drivers/pci/controller/dwc/*imx6*
  
  PCI DRIVER FOR INTEL VOLUME MANAGEMENT DEVICE (VMD)
 -M:    Keith Busch <keith.busch@intel.com>
  M:    Jonathan Derrick <jonathan.derrick@intel.com>
  L:    linux-pci@vger.kernel.org
  S:    Supported
@@@ -12663,8 -12490,7 +12664,8 @@@ F:   Documentation/devicetree/bindings/pc
  F:    drivers/pci/controller/pci-tegra.c
  
  PCI DRIVER FOR RENESAS R-CAR
 -M:    Simon Horman <horms@verge.net.au>
 +M:    Marek Vasut <marek.vasut+renesas@gmail.com>
 +M:    Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
  L:    linux-pci@vger.kernel.org
  L:    linux-renesas-soc@vger.kernel.org
  S:    Maintained
@@@ -12946,13 -12772,6 +12947,13 @@@ F: arch/*/events/
  F:    arch/*/events/*/*
  F:    tools/perf/
  
 +PERFORMANCE EVENTS SUBSYSTEM ARM64 PMU EVENTS
 +R:    John Garry <john.garry@huawei.com>
 +R:    Will Deacon <will@kernel.org>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Supported
 +F:    tools/perf/pmu-events/arch/arm64/
 +
  PERSONALITY HANDLING
  M:    Christoph Hellwig <hch@infradead.org>
  L:    linux-abi-devel@lists.sourceforge.net
@@@ -13010,7 -12829,6 +13011,7 @@@ S:   Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git
  F:    samples/pidfd/
  F:    tools/testing/selftests/pidfd/
 +F:    tools/testing/selftests/clone3/
  K:    (?i)pidfd
  K:    (?i)clone3
  K:    \b(clone_args|kernel_clone_args)\b
@@@ -13046,7 -12864,7 +13047,7 @@@ F:   Documentation/devicetree/bindings/pi
  
  PIN CONTROLLER - INTEL
  M:    Mika Westerberg <mika.westerberg@linux.intel.com>
 -M:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 +M:    Andy Shevchenko <andy@kernel.org>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git
  S:    Maintained
  F:    drivers/pinctrl/intel/
@@@ -13176,15 -12994,6 +13177,15 @@@ L: linux-scsi@vger.kernel.or
  S:    Supported
  F:    drivers/scsi/pm8001/
  
 +PM-GRAPH UTILITY
 +M:    "Todd E Brandt" <todd.e.brandt@linux.intel.com>
 +L:    linux-pm@vger.kernel.org
 +W:    https://01.org/pm-graph
 +B:    https://bugzilla.kernel.org/buglist.cgi?component=pm-graph&product=Tools
 +T:    git git://github.com/intel/pm-graph
 +S:    Supported
 +F:    tools/power/pm-graph
 +
  PNP SUPPORT
  M:    "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
  S:    Maintained
@@@ -13317,14 -13126,12 +13318,14 @@@ F:        Documentation/filesystems/proc.tx
  PROC SYSCTL
  M:    Luis Chamberlain <mcgrof@kernel.org>
  M:    Kees Cook <keescook@chromium.org>
 +M:    Iurii Zaikin <yzaikin@google.com>
  L:    linux-kernel@vger.kernel.org
  L:    linux-fsdevel@vger.kernel.org
  S:    Maintained
  F:    fs/proc/proc_sysctl.c
  F:    include/linux/sysctl.h
  F:    kernel/sysctl.c
 +F:    kernel/sysctl-test.c
  F:    tools/testing/selftests/sysctl/
  
  PS3 NETWORK SUPPORT
@@@ -13557,7 -13364,7 +13558,7 @@@ S:   Maintaine
  F:    drivers/scsi/qla1280.[ch]
  
  QLOGIC QLA2XXX FC-SCSI DRIVER
 -M:    qla2xxx-upstream@qlogic.com
 +M:    hmadhani@marvell.com
  L:    linux-scsi@vger.kernel.org
  S:    Supported
  F:    Documentation/scsi/LICENSE.qla2xxx
@@@ -13709,7 -13516,6 +13710,7 @@@ L:   linux-pm@vger.kernel.or
  L:    linux-arm-msm@vger.kernel.org
  S:    Maintained
  F:    drivers/thermal/qcom/
 +F:    Documentation/devicetree/bindings/thermal/qcom-tsens.yaml
  
  QUALCOMM VENUS VIDEO ACCELERATOR DRIVER
  M:    Stanimir Varbanov <stanimir.varbanov@linaro.org>
@@@ -13802,6 -13608,7 +13803,6 @@@ S:   Maintaine
  F:    arch/mips/ralink
  
  RALINK RT2X00 WIRELESS LAN DRIVER
 -P:    rt2x00 project
  M:    Stanislaw Gruszka <sgruszka@redhat.com>
  M:    Helmut Schaa <helmut.schaa@googlemail.com>
  L:    linux-wireless@vger.kernel.org
@@@ -14008,7 -13815,7 +14009,7 @@@ R:   Sergei Shtylyov <sergei.shtylyov@cog
  L:    netdev@vger.kernel.org
  L:    linux-renesas-soc@vger.kernel.org
  F:    Documentation/devicetree/bindings/net/renesas,*.txt
 -F:    Documentation/devicetree/bindings/net/sh_eth.txt
 +F:    Documentation/devicetree/bindings/net/renesas,*.yaml
  F:    drivers/net/ethernet/renesas/
  F:    include/linux/sh_eth.h
  
@@@ -14049,7 -13856,6 +14050,7 @@@ F:   include/dt-bindings/reset
  F:    include/linux/reset.h
  F:    include/linux/reset/
  F:    include/linux/reset-controller.h
 +K:      \b(?:devm_|of_)?reset_control(?:ler_[a-z]+|_[a-z_]+)?\b
  
  RESTARTABLE SEQUENCES SUPPORT
  M:    Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
@@@ -14099,7 -13905,7 +14100,7 @@@ F:   drivers/mtd/nand/raw/r852.
  
  RISC-V ARCHITECTURE
  M:    Paul Walmsley <paul.walmsley@sifive.com>
 -M:    Palmer Dabbelt <palmer@sifive.com>
 +M:    Palmer Dabbelt <palmer@dabbelt.com>
  M:    Albert Ou <aou@eecs.berkeley.edu>
  L:    linux-riscv@lists.infradead.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git
@@@ -14138,6 -13944,7 +14139,6 @@@ S:   Supporte
  F:    drivers/net/ethernet/rocker/
  
  ROCKETPORT DRIVER
 -P:    Comtrol Corp.
  W:    http://www.comtrol.com
  S:    Maintained
  F:    Documentation/driver-api/serial/rocket.rst
@@@ -14149,12 -13956,6 +14150,12 @@@ L: linux-serial@vger.kernel.or
  S:    Odd Fixes
  F:    drivers/tty/serial/rp2.*
  
 +ROHM BH1750 AMBIENT LIGHT SENSOR DRIVER
 +M:    Tomasz Duszynski <tduszyns@gmail.com>
 +S:    Maintained
 +F:    drivers/iio/light/bh1750.c
 +F:    Documentation/devicetree/bindings/iio/light/bh1750.yaml
 +
  ROHM MULTIFUNCTION BD9571MWV-M PMIC DEVICE DRIVERS
  M:    Marek Vasut <marek.vasut+renesas@gmail.com>
  L:    linux-kernel@vger.kernel.org
@@@ -14416,7 -14217,7 +14417,7 @@@ L:   linux-crypto@vger.kernel.or
  L:    linux-samsung-soc@vger.kernel.org
  S:    Maintained
  F:    drivers/crypto/exynos-rng.c
 -F:    Documentation/devicetree/bindings/rng/samsung,exynos4-rng.txt
 +F:    Documentation/devicetree/bindings/rng/samsung,exynos4-rng.yaml
  
  SAMSUNG EXYNOS TRUE RANDOM NUMBER GENERATOR (TRNG) DRIVER
  M:    Łukasz Stelmach <l.stelmach@samsung.com>
@@@ -14491,8 -14292,8 +14492,8 @@@ M:   Kamil Konieczny <k.konieczny@partner
  L:    linux-crypto@vger.kernel.org
  L:    linux-samsung-soc@vger.kernel.org
  S:    Maintained
 -F:    Documentation/devicetree/bindings/crypto/samsung-slimsss.txt
 -F:    Documentation/devicetree/bindings/crypto/samsung-sss.txt
 +F:    Documentation/devicetree/bindings/crypto/samsung-slimsss.yaml
 +F:    Documentation/devicetree/bindings/crypto/samsung-sss.yaml
  F:    drivers/crypto/s5p-sss.c
  
  SAMSUNG S5P/EXYNOS4 SOC SERIES CAMERA SUBSYSTEM DRIVERS
@@@ -14980,14 -14781,8 +14981,14 @@@ F: drivers/media/usb/siano
  F:    drivers/media/usb/siano/
  F:    drivers/media/mmc/siano/
  
 +SIFIVE PDMA DRIVER
 +M:    Green Wan <green.wan@sifive.com>
 +S:    Maintained
 +F:    drivers/dma/sf-pdma/
 +F:    Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml
 +
  SIFIVE DRIVERS
 -M:    Palmer Dabbelt <palmer@sifive.com>
 +M:    Palmer Dabbelt <palmer@dabbelt.com>
  M:    Paul Walmsley <paul.walmsley@sifive.com>
  L:    linux-riscv@lists.infradead.org
  T:    git git://github.com/sifive/riscv-linux.git
@@@ -14997,7 -14792,7 +14998,7 @@@ N:   sifiv
  
  SIFIVE FU540 SYSTEM-ON-CHIP
  M:    Paul Walmsley <paul.walmsley@sifive.com>
 -M:    Palmer Dabbelt <palmer@sifive.com>
 +M:    Palmer Dabbelt <palmer@dabbelt.com>
  L:    linux-riscv@lists.infradead.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/sifive.git
  S:    Supported
@@@ -15012,11 -14807,6 +15013,11 @@@ S: Maintaine
  F:    drivers/input/touchscreen/silead.c
  F:    drivers/platform/x86/touchscreen_dmi.c
  
 +SILICON LABS WIRELESS DRIVERS (for WFxxx series)
 +M:    Jérôme Pouiller <jerome.pouiller@silabs.com>
 +S:    Supported
 +F:    drivers/staging/wfx/
 +
  SILICON MOTION SM712 FRAME BUFFER DRIVER
  M:    Sudip Mukherjee <sudipm.mukherjee@gmail.com>
  M:    Teddy Wang <teddy.wang@siliconmotion.com>
@@@ -15045,13 -14835,15 +15046,13 @@@ F:        drivers/video/fbdev/simplefb.
  F:    include/linux/platform_data/simplefb.h
  
  SIMTEC EB110ATX (Chalice CATS)
 -P:    Ben Dooks
 -P:    Vincent Sanders <vince@simtec.co.uk>
 +M:    Vincent Sanders <vince@simtec.co.uk>
  M:    Simtec Linux Team <linux@simtec.co.uk>
  W:    http://www.simtec.co.uk/products/EB110ATX/
  S:    Supported
  
  SIMTEC EB2410ITX (BAST)
 -P:    Ben Dooks
 -P:    Vincent Sanders <vince@simtec.co.uk>
 +M:    Vincent Sanders <vince@simtec.co.uk>
  M:    Simtec Linux Team <linux@simtec.co.uk>
  W:    http://www.simtec.co.uk/products/EB2410ITX/
  S:    Supported
@@@ -15214,7 -15006,7 +15215,7 @@@ F:   include/media/soc_camera.
  F:    drivers/staging/media/soc_camera/
  
  SOCIONEXT SYNQUACER I2C DRIVER
 -M:    Ard Biesheuvel <ard.biesheuvel@linaro.org>
 +M:    Ard Biesheuvel <ardb@kernel.org>
  L:    linux-i2c@vger.kernel.org
  S:    Maintained
  F:    drivers/i2c/busses/i2c-synquacer.c
@@@ -15349,14 -15141,6 +15350,14 @@@ S: Maintaine
  F:    drivers/media/i2c/imx274.c
  F:    Documentation/devicetree/bindings/media/i2c/imx274.txt
  
 +SONY IMX290 SENSOR DRIVER
 +M:    Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/imx290.c
 +F:    Documentation/devicetree/bindings/media/i2c/imx290.txt
 +
  SONY IMX319 SENSOR DRIVER
  M:    Bingbu Cao <bingbu.cao@intel.com>
  L:    linux-media@vger.kernel.org
@@@ -15504,6 -15288,7 +15505,6 @@@ F:   arch/arm/boot/dts/spear
  F:    arch/arm/mach-spear/
  
  SPI NOR SUBSYSTEM
 -M:    Marek Vasut <marek.vasut@gmail.com>
  M:    Tudor Ambarus <tudor.ambarus@microchip.com>
  L:    linux-mtd@lists.infradead.org
  W:    http://www.linux-mtd.infradead.org/
@@@ -15680,14 -15465,6 +15681,14 @@@ L: linux-wireless@vger.kernel.or
  S:    Supported
  F:    drivers/staging/wilc1000/
  
 +STAGING - SEPS525 LCD CONTROLLER DRIVERS
 +M:    Michael Hennerich <michael.hennerich@analog.com>
 +M:    Beniamin Bia <beniamin.bia@analog.com>
 +L:    linux-fbdev@vger.kernel.org
 +S:    Supported
 +F:    drivers/staging/fbtft/fb_seps525.c
 +F:    Documentation/devicetree/bindings/iio/adc/adi,ad7606.yaml
 +
  STAGING SUBSYSTEM
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
@@@ -15766,7 -15543,7 +15767,7 @@@ SUN4I LOW RES ADC ATTACHED TABLET KEYS 
  M:    Hans de Goede <hdegoede@redhat.com>
  L:    linux-input@vger.kernel.org
  S:    Maintained
 -F:    Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt
 +F:    Documentation/devicetree/bindings/input/allwinner,sun4i-a10-lradc-keys.yaml
  F:    drivers/input/keyboard/sun4i-lradc-keys.c
  
  SUNDANCE NETWORK DRIVER
@@@ -15978,13 -15755,6 +15979,13 @@@ F: drivers/hwtracing/stm
  F:    include/linux/stm.h
  F:    include/uapi/linux/stm.h
  
 +SYSTEM76 ACPI DRIVER
 +M:    Jeremy Soller <jeremy@system76.com>
 +M:    System76 Product Development <productdev@system76.com>
 +L:    platform-driver-x86@vger.kernel.org
 +S:    Maintained
 +F:    drivers/platform/x86/system76_acpi.c
 +
  SYSV FILESYSTEM
  M:    Christoph Hellwig <hch@infradead.org>
  S:    Maintained
@@@ -16333,15 -16103,6 +16334,15 @@@ F: Documentation/driver-api/thermal/cpu
  F:    drivers/thermal/cpu_cooling.c
  F:    include/linux/cpu_cooling.h
  
 +THERMAL DRIVER FOR AMLOGIC SOCS
 +M:    Guillaume La Roque <glaroque@baylibre.com>
 +L:    linux-pm@vger.kernel.org
 +L:    linux-amlogic@lists.infradead.org
 +W:    http://linux-meson.com/
 +S:    Supported
 +F:    drivers/thermal/amlogic_thermal.c
 +F:    Documentation/devicetree/bindings/thermal/amlogic,thermal.yaml
 +
  THINKPAD ACPI EXTRAS DRIVER
  M:    Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br>
  L:    ibm-acpi-devel@lists.sourceforge.net
@@@ -16446,12 -16207,6 +16447,12 @@@ S: Maintaine
  F:    drivers/media/platform/davinci/
  F:    include/media/davinci/
  
 +TI ENHANCED QUADRATURE ENCODER PULSE (eQEP) DRIVER
 +R:    David Lechner <david@lechnology.com>
 +L:    linux-iio@vger.kernel.org
 +F:    Documentation/devicetree/bindings/counter/ti-eqep.yaml
 +F:    drivers/counter/ti-eqep.c
 +
  TI ETHERNET SWITCH DRIVER (CPSW)
  R:    Grygorii Strashko <grygorii.strashko@ti.com>
  L:    linux-omap@vger.kernel.org
@@@ -16549,7 -16304,6 +16550,7 @@@ W:   http://linuxtv.org
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  S:    Maintained
  F:    drivers/media/platform/ti-vpe/
 +F:    Documentation/devicetree/bindings/media/ti,vpe.yaml
  
  TI WILINK WIRELESS DRIVERS
  L:    linux-wireless@vger.kernel.org
@@@ -16620,13 -16374,6 +16621,13 @@@ S: Maintaine
  F:    Documentation/hwmon/tmp401.rst
  F:    drivers/hwmon/tmp401.c
  
 +TMP513 HARDWARE MONITOR DRIVER
 +M:    Eric Tremblay <etremblay@distech-controls.com>
 +L:    linux-hwmon@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/hwmon/tmp513.rst
 +F:    drivers/hwmon/tmp513.c
 +
  TMPFS (SHMEM FILESYSTEM)
  M:    Hugh Dickins <hughd@google.com>
  L:    linux-mm@kvack.org
@@@ -16838,9 -16585,10 +16839,9 @@@ F:  drivers/media/pci/tw686x
  
  UBI FILE SYSTEM (UBIFS)
  M:    Richard Weinberger <richard@nod.at>
 -M:    Artem Bityutskiy <dedekind1@gmail.com>
 -M:    Adrian Hunter <adrian.hunter@intel.com>
  L:    linux-mtd@lists.infradead.org
 -T:    git git://git.infradead.org/ubifs-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git next
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git fixes
  W:    http://www.linux-mtd.infradead.org/doc/ubifs.html
  S:    Supported
  F:    Documentation/filesystems/ubifs.txt
@@@ -16955,11 -16703,11 +16956,11 @@@ S:        Maintaine
  F:    drivers/scsi/ufs/ufs-mediatek*
  
  UNSORTED BLOCK IMAGES (UBI)
 -M:    Artem Bityutskiy <dedekind1@gmail.com>
  M:    Richard Weinberger <richard@nod.at>
  W:    http://www.linux-mtd.infradead.org/
  L:    linux-mtd@lists.infradead.org
 -T:    git git://git.infradead.org/ubifs-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git next
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git fixes
  S:    Supported
  F:    drivers/mtd/ubi/
  F:    include/linux/mtd/ubi.h
@@@ -17019,6 -16767,13 +17020,6 @@@ W:  http://www.linux-usb.org/usbne
  S:    Maintained
  F:    drivers/net/usb/dm9601.c
  
 -USB DIAMOND RIO500 DRIVER
 -M:    Cesar Miquel <miquel@df.uba.ar>
 -L:    rio500-users@lists.sourceforge.net
 -W:    http://rio500.sourceforge.net
 -S:    Maintained
 -F:    drivers/usb/misc/rio500*
 -
  USB EHCI DRIVER
  M:    Alan Stern <stern@rowland.harvard.edu>
  L:    linux-usb@vger.kernel.org
@@@ -17446,7 -17201,6 +17447,7 @@@ F:   include/media/videobuf2-
  
  VIMC VIRTUAL MEDIA CONTROLLER DRIVER
  M:    Helen Koike <helen.koike@collabora.com>
 +R:    Shuah Khan <skhan@linuxfoundation.org>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
  W:    https://linuxtv.org
@@@ -17462,7 -17216,6 +17463,7 @@@ F:   virt/lib
  
  VIRTIO AND VHOST VSOCK DRIVER
  M:    Stefan Hajnoczi <stefanha@redhat.com>
 +M:    Stefano Garzarella <sgarzare@redhat.com>
  L:    kvm@vger.kernel.org
  L:    virtualization@lists.linux-foundation.org
  L:    netdev@vger.kernel.org
@@@ -17594,14 -17347,6 +17595,14 @@@ S: Maintaine
  F:    drivers/input/serio/userio.c
  F:    include/uapi/linux/userio.h
  
 +VITESSE FELIX ETHERNET SWITCH DRIVER
 +M:    Vladimir Oltean <vladimir.oltean@nxp.com>
 +M:    Claudiu Manoil <claudiu.manoil@nxp.com>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/dsa/ocelot/*
 +F:    net/dsa/tag_ocelot.c
 +
  VIVID VIRTUAL VIDEO DRIVER
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
@@@ -17695,25 -17440,13 +17696,25 @@@ F:        include/linux/regulator
  K:    regulator_get_optional
  
  VRF
 -M:    David Ahern <dsa@cumulusnetworks.com>
 +M:    David Ahern <dsahern@kernel.org>
  M:    Shrijeet Mukherjee <shrijeet@gmail.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    drivers/net/vrf.c
  F:    Documentation/networking/vrf.txt
  
 +VSPRINTF
 +M:    Petr Mladek <pmladek@suse.com>
 +M:    Steven Rostedt <rostedt@goodmis.org>
 +M:    Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
 +R:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 +R:    Rasmus Villemoes <linux@rasmusvillemoes.dk>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk.git
 +S:    Maintained
 +F:    lib/vsprintf.c
 +F:    lib/test_printf.c
 +F:    Documentation/core-api/printk-formats.rst
 +
  VT1211 HARDWARE MONITOR DRIVER
  M:    Juerg Haefliger <juergh@gmail.com>
  L:    linux-hwmon@vger.kernel.org
@@@ -17728,8 -17461,10 +17729,8 @@@ S:  Maintaine
  F:    drivers/hwmon/vt8231.c
  
  VUB300 USB to SDIO/SD/MMC bridge chip
 -M:    Tony Olech <tony.olech@elandigitalsystems.com>
  L:    linux-mmc@vger.kernel.org
 -L:    linux-usb@vger.kernel.org
 -S:    Supported
 +S:    Orphan
  F:    drivers/mmc/host/vub300.c
  
  W1 DALLAS'S 1-WIRE BUS
@@@ -18306,7 -18041,6 +18307,7 @@@ F:   Documentation/vm/zsmalloc.rs
  ZSWAP COMPRESSED SWAP CACHING
  M:    Seth Jennings <sjenning@redhat.com>
  M:    Dan Streetman <ddstreet@ieee.org>
 +M:    Vitaly Wool <vitaly.wool@konsulko.com>
  L:    linux-mm@kvack.org
  S:    Maintained
  F:    mm/zswap.c
                can = &hecc;
        };
  
 +      cpus {
 +              cpu: cpu@0 {
 +                      /* Based on OMAP3630 variants OPP50 and OPP100 */
 +                      operating-points-v2 = <&cpu0_opp_table>;
 +
 +                      clock-latency = <300000>; /* From legacy driver */
 +              };
 +      };
 +
 +      cpu0_opp_table: opp-table {
 +              compatible = "operating-points-v2-ti-cpu";
 +              syscon = <&scm_conf>;
 +              /*
 +               * AM3517 TRM only lists 600MHz @ 1.2V, but omap36xx
 +               * appear to operate at 300MHz as well. Since AM3517 only
 +               * lists one operating voltage, it will remain fixed at 1.2V
 +               */
 +              opp50-300000000 {
 +                      opp-hz = /bits/ 64 <300000000>;
 +                      opp-microvolt = <1200000>;
 +                      opp-supported-hw = <0xffffffff 0xffffffff>;
 +                      opp-suspend;
 +              };
 +
 +              opp100-600000000 {
 +                      opp-hz = /bits/ 64 <600000000>;
 +                      opp-microvolt = <1200000>;
 +                      opp-supported-hw = <0xffffffff 0xffffffff>;
 +              };
 +      };
 +
        ocp@68000000 {
                am35x_otg_hs: am35x_otg_hs@5c040000 {
                        compatible = "ti,omap3-musb";
        };
  };
  
+ /* Not currently working, probably needs at least different clocks */
+ &rng_target {
+       status = "disabled";
+       /delete-property/ clocks;
+ };
  /* Table Table 5-79 of the TRM shows 480ab000 is reserved */
  &usb_otg_hs {
        status = "disabled";
                        flash@0 {
                                reg = < 0 >;
                                compatible = "jedec,spi-nor";
+                               spi-max-frequency = <50000000>;
                                status = "disabled";
                        };
                        flash@1 {
                                reg = < 1 >;
                                compatible = "jedec,spi-nor";
+                               spi-max-frequency = <50000000>;
                                status = "disabled";
                        };
                        flash@2 {
                                reg = < 2 >;
                                compatible = "jedec,spi-nor";
+                               spi-max-frequency = <50000000>;
                                status = "disabled";
                        };
                };
                        flash@0 {
                                reg = < 0 >;
                                compatible = "jedec,spi-nor";
+                               spi-max-frequency = <50000000>;
                                status = "disabled";
                        };
                        flash@1 {
                                reg = < 1 >;
                                compatible = "jedec,spi-nor";
+                               spi-max-frequency = <50000000>;
                                status = "disabled";
                        };
                };
                        flash@0 {
                                reg = < 0 >;
                                compatible = "jedec,spi-nor";
+                               spi-max-frequency = <50000000>;
                                status = "disabled";
                        };
                        flash@1 {
                                reg = < 1 >;
                                compatible = "jedec,spi-nor";
+                               spi-max-frequency = <50000000>;
                                status = "disabled";
                        };
                };
                                #reset-cells = <1>;
  
                                pinctrl: pinctrl {
-                                       compatible = "aspeed,g5-pinctrl";
+                                       compatible = "aspeed,ast2500-pinctrl";
                                        aspeed,external-nodes = <&gfx &lhc>;
  
                                };
                                #gpio-cells = <2>;
                                gpio-controller;
                                compatible = "aspeed,ast2500-gpio";
-                               reg = <0x1e780000 0x1000>;
+                               reg = <0x1e780000 0x200>;
                                interrupts = <20>;
                                gpio-ranges = <&pinctrl 0 0 232>;
                                clocks = <&syscon ASPEED_CLK_APB>;
                                #interrupt-cells = <2>;
                        };
  
+                       sgpio: sgpio@1e780200 {
+                               #gpio-cells = <2>;
+                               compatible = "aspeed,ast2500-sgpio";
+                               gpio-controller;
+                               interrupts = <40>;
+                               reg = <0x1e780200 0x0100>;
+                               clocks = <&syscon ASPEED_CLK_APB>;
+                               interrupt-controller;
+                               ngpios = <8>;
+                               bus-frequency = <12000000>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&pinctrl_sgpm_default>;
+                               status = "disabled";
+                       };
                        rtc: rtc@1e781000 {
                                compatible = "aspeed,ast2500-rtc";
                                reg = <0x1e781000 0x18>;
                                interrupts = <8>;
                                clocks = <&syscon ASPEED_CLK_APB>;
                                no-loopback-test;
 +                              aspeed,sirq-polarity-sense = <&syscon 0x70 25>;
                                status = "disabled";
                        };
  
  
                target-module@f4000 {                   /* 0x4a0f4000, ap 23 04.0 */
                        compatible = "ti,sysc-omap4", "ti,sysc";
-                       ti,hwmods = "mailbox1";
                        reg = <0xf4000 0x4>,
                              <0xf4010 0x4>;
                        reg-names = "rev", "sysc";
  
                target-module@90000 {                   /* 0x48090000, ap 55 12.0 */
                        compatible = "ti,sysc-omap2", "ti,sysc";
-                       ti,hwmods = "rng";
                        reg = <0x91fe0 0x4>,
                              <0x91fe4 0x4>;
                        reg-names = "rev", "sysc";
  
                target-module@b2000 {                   /* 0x480b2000, ap 37 52.0 */
                        compatible = "ti,sysc-omap2", "ti,sysc";
-                       ti,hwmods = "hdq1w";
                        reg = <0xb2000 0x4>,
                              <0xb2014 0x4>,
                              <0xb2018 0x4>;
                                        phys = <&phy_gmii_sel 2>;
                                };
                        };
 +
 +                      mac_sw: switch@0 {
 +                              compatible = "ti,dra7-cpsw-switch","ti,cpsw-switch";
 +                              reg = <0x0 0x4000>;
 +                              ranges = <0 0 0x4000>;
 +                              clocks = <&gmac_main_clk>;
 +                              clock-names = "fck";
 +                              #address-cells = <1>;
 +                              #size-cells = <1>;
 +                              syscon = <&scm_conf>;
 +                              status = "disabled";
 +
 +                              interrupts = <GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH>,
 +                                           <GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH>,
 +                                           <GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH>,
 +                                           <GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH>;
 +                              interrupt-names = "rx_thresh", "rx", "tx", "misc";
 +
 +                              ethernet-ports {
 +                                      #address-cells = <1>;
 +                                      #size-cells = <0>;
 +
 +                                      cpsw_port1: port@1 {
 +                                              reg = <1>;
 +                                              label = "port1";
 +                                              mac-address = [ 00 00 00 00 00 00 ];
 +                                              phys = <&phy_gmii_sel 1>;
 +                                      };
 +
 +                                      cpsw_port2: port@2 {
 +                                              reg = <2>;
 +                                              label = "port2";
 +                                              mac-address = [ 00 00 00 00 00 00 ];
 +                                              phys = <&phy_gmii_sel 2>;
 +                                      };
 +                              };
 +
 +                              davinci_mdio_sw: mdio@1000 {
 +                                      compatible = "ti,cpsw-mdio","ti,davinci_mdio";
 +                                      clocks = <&gmac_main_clk>;
 +                                      clock-names = "fck";
 +                                      #address-cells = <1>;
 +                                      #size-cells = <0>;
 +                                      bus_freq = <1000000>;
 +                                      reg = <0x1000 0x100>;
 +                              };
 +
 +                              cpts {
 +                                      clocks = <&gmac_clkctrl DRA7_GMAC_GMAC_CLKCTRL 25>;
 +                                      clock-names = "cpts";
 +                              };
 +                      };
                };
        };
  };
  
                target-module@2000 {                    /* 0x48802000, ap 95 7c.0 */
                        compatible = "ti,sysc-omap4", "ti,sysc";
-                       ti,hwmods = "mailbox13";
                        reg = <0x2000 0x4>,
                              <0x2010 0x4>;
                        reg-names = "rev", "sysc";
  
                target-module@3a000 {                   /* 0x4883a000, ap 33 3e.0 */
                        compatible = "ti,sysc-omap4", "ti,sysc";
-                       ti,hwmods = "mailbox2";
                        reg = <0x3a000 0x4>,
                              <0x3a010 0x4>;
                        reg-names = "rev", "sysc";
  
                target-module@3c000 {                   /* 0x4883c000, ap 35 3a.0 */
                        compatible = "ti,sysc-omap4", "ti,sysc";
-                       ti,hwmods = "mailbox3";
                        reg = <0x3c000 0x4>,
                              <0x3c010 0x4>;
                        reg-names = "rev", "sysc";
  
                target-module@3e000 {                   /* 0x4883e000, ap 37 46.0 */
                        compatible = "ti,sysc-omap4", "ti,sysc";
-                       ti,hwmods = "mailbox4";
                        reg = <0x3e000 0x4>,
                              <0x3e010 0x4>;
                        reg-names = "rev", "sysc";
  
                target-module@40000 {                   /* 0x48840000, ap 39 64.0 */
                        compatible = "ti,sysc-omap4", "ti,sysc";
-                       ti,hwmods = "mailbox5";
                        reg = <0x40000 0x4>,
                              <0x40010 0x4>;
                        reg-names = "rev", "sysc";
  
                target-module@42000 {                   /* 0x48842000, ap 41 4e.0 */
                        compatible = "ti,sysc-omap4", "ti,sysc";
-                       ti,hwmods = "mailbox6";
                        reg = <0x42000 0x4>,
                              <0x42010 0x4>;
                        reg-names = "rev", "sysc";
  
                target-module@44000 {                   /* 0x48844000, ap 43 42.0 */
                        compatible = "ti,sysc-omap4", "ti,sysc";
-                       ti,hwmods = "mailbox7";
                        reg = <0x44000 0x4>,
                              <0x44010 0x4>;
                        reg-names = "rev", "sysc";
  
                target-module@46000 {                   /* 0x48846000, ap 45 48.0 */
                        compatible = "ti,sysc-omap4", "ti,sysc";
-                       ti,hwmods = "mailbox8";
                        reg = <0x46000 0x4>,
                              <0x46010 0x4>;
                        reg-names = "rev", "sysc";
  
                target-module@5e000 {                   /* 0x4885e000, ap 69 6c.0 */
                        compatible = "ti,sysc-omap4", "ti,sysc";
-                       ti,hwmods = "mailbox9";
                        reg = <0x5e000 0x4>,
                              <0x5e010 0x4>;
                        reg-names = "rev", "sysc";
  
                target-module@60000 {                   /* 0x48860000, ap 71 4a.0 */
                        compatible = "ti,sysc-omap4", "ti,sysc";
-                       ti,hwmods = "mailbox10";
                        reg = <0x60000 0x4>,
                              <0x60010 0x4>;
                        reg-names = "rev", "sysc";
  
                target-module@62000 {                   /* 0x48862000, ap 73 74.0 */
                        compatible = "ti,sysc-omap4", "ti,sysc";
-                       ti,hwmods = "mailbox11";
                        reg = <0x62000 0x4>,
                              <0x62010 0x4>;
                        reg-names = "rev", "sysc";
  
                target-module@64000 {                   /* 0x48864000, ap 67 52.0 */
                        compatible = "ti,sysc-omap4", "ti,sysc";
-                       ti,hwmods = "mailbox12";
                        reg = <0x64000 0x4>,
                              <0x64010 0x4>;
                        reg-names = "rev", "sysc";
  
                target-module@4000 {                    /* 0x4ae14000, ap 7 28.0 */
                        compatible = "ti,sysc-omap2", "ti,sysc";
-                       ti,hwmods = "wd_timer2";
                        reg = <0x4000 0x4>,
                              <0x4010 0x4>,
                              <0x4014 0x4>;
        };
  };
  
+ /* The Torpedo doesn't route the USB host pins */
+ &usbhshost {
+       status = "disabled";
+ };
  &gpmc {
        ranges = <0 0 0x30000000 0x1000000>;    /* CS0: 16MB for NAND */
  
  &twl_gpio {
        ti,use-leds;
  };
 +
 +&twl_keypad {
 +      status = "disabled";
 +};
@@@ -10,7 -10,7 +10,7 @@@
  
  / {
        model = "IGEPv2 Rev. F (TI OMAP AM/DM37x)";
 -      compatible = "isee,omap3-igep0020-rev-f", "ti,omap36xx", "ti,omap3";
 +      compatible = "isee,omap3-igep0020-rev-f", "ti,omap3630", "ti,omap36xx", "ti,omap3";
  
        /* Regulator to trigger the WL_EN signal of the Wifi module */
        lbep5clwmc_wlen: regulator-lbep5clwmc-wlen {
                interrupts = <17 IRQ_TYPE_EDGE_RISING>; /* gpio 177 */
        };
  };
+ &uart2 {
+       bluetooth {
+               compatible = "ti,wl1835-st";
+               enable-gpios = <&gpio5 9 GPIO_ACTIVE_HIGH>; /* gpio 137 */
+               max-speed = <300000>;
+       };
+ };
@@@ -10,7 -10,7 +10,7 @@@
  
  / {
        model = "IGEP COM MODULE Rev. G (TI OMAP AM/DM37x)";
 -      compatible = "isee,omap3-igep0030-rev-g", "ti,omap36xx", "ti,omap3";
 +      compatible = "isee,omap3-igep0030-rev-g", "ti,omap3630", "ti,omap36xx", "ti,omap3";
  
        /* Regulator to trigger the WL_EN signal of the Wifi module */
        lbep5clwmc_wlen: regulator-lbep5clwmc-wlen {
                interrupts = <8 IRQ_TYPE_EDGE_RISING>; /* gpio 136 */
        };
  };
+ &uart2 {
+       bluetooth {
+               compatible = "ti,wl1835-st";
+               enable-gpios = <&gpio5 9 GPIO_ACTIVE_HIGH>; /* gpio 137 */
+               max-speed = <300000>;
+       };
+ };
                pwms = <&pwm9 0 26316 0>; /* 38000 Hz */
        };
  
 +      rom_rng: rng {
 +              compatible = "nokia,n900-rom-rng";
 +              clocks = <&rng_ick>;
 +              clock-names = "ick";
 +      };
 +
        /* controlled (enabled/disabled) directly by bcm2048 and wl1251 */
        vctcxo: vctcxo {
                compatible = "fixed-clock";
        };
  };
  
+ /* RNG not directly accessible on n900, see omap3-rom-rng instead */
+ &rng_target {
+       status = "disabled";
+ };
  &usb_otg_hs {
        interface-type = <0>;
        usb-phy = <&usb2_phy>;
                                status = "disabled";
                        };
  
+                       adc12_ain_pins_a: adc12-ain-0 {
+                               pins {
+                                       pinmux = <STM32_PINMUX('C', 3, ANALOG)>, /* ADC1 in13 */
+                                                <STM32_PINMUX('F', 12, ANALOG)>, /* ADC1 in6 */
+                                                <STM32_PINMUX('F', 13, ANALOG)>, /* ADC2 in2 */
+                                                <STM32_PINMUX('F', 14, ANALOG)>; /* ADC2 in6 */
+                               };
+                       };
+                       adc12_usb_cc_pins_a: adc12-usb-cc-pins-0 {
+                               pins {
+                                       pinmux = <STM32_PINMUX('A', 4, ANALOG)>, /* ADC12 in18 */
+                                                <STM32_PINMUX('A', 5, ANALOG)>; /* ADC12 in19 */
+                               };
+                       };
                        cec_pins_a: cec-0 {
                                pins {
                                        pinmux = <STM32_PINMUX('A', 15, AF4)>;
                                };
                        };
  
+                       dac_ch1_pins_a: dac-ch1 {
+                               pins {
+                                       pinmux = <STM32_PINMUX('A', 4, ANALOG)>;
+                               };
+                       };
+                       dac_ch2_pins_a: dac-ch2 {
+                               pins {
+                                       pinmux = <STM32_PINMUX('A', 5, ANALOG)>;
+                               };
+                       };
                        dcmi_pins_a: dcmi-0 {
                                pins {
                                        pinmux = <STM32_PINMUX('H', 8,  AF13)>,/* DCMI_HSYNC */
                                                 <STM32_PINMUX('F', 6, AF9)>; /* QSPI_BK1_IO3 */
                                        bias-disable;
                                        drive-push-pull;
 -                                      slew-rate = <3>;
 +                                      slew-rate = <1>;
                                };
                                pins2 {
                                        pinmux = <STM32_PINMUX('B', 6, AF10)>; /* QSPI_BK1_NCS */
                                        bias-pull-up;
                                        drive-push-pull;
 -                                      slew-rate = <3>;
 +                                      slew-rate = <1>;
                                };
                        };
  
                                                 <STM32_PINMUX('G', 7, AF11)>; /* QSPI_BK2_IO3 */
                                        bias-disable;
                                        drive-push-pull;
 -                                      slew-rate = <3>;
 +                                      slew-rate = <1>;
                                };
                                pins2 {
                                        pinmux = <STM32_PINMUX('C', 0, AF10)>; /* QSPI_BK2_NCS */
                                        bias-pull-up;
                                        drive-push-pull;
 -                                      slew-rate = <3>;
 +                                      slew-rate = <1>;
                                };
                        };
  
@@@ -32,7 -32,6 +32,6 @@@
  
        joystick {
                compatible = "gpio-keys";
-               #size-cells = <0>;
                pinctrl-0 = <&joystick_pins>;
                pinctrl-names = "default";
                button-0 {
  
        ov5640: camera@3c {
                compatible = "ovti,ov5640";
 -              pinctrl-names = "default";
 -              pinctrl-0 = <&ov5640_pins>;
                reg = <0x3c>;
                clocks = <&clk_ext_camera>;
                clock-names = "xclk";
                DOVDD-supply = <&v2v8>;
 -              powerdown-gpios = <&stmfx_pinctrl 18 GPIO_ACTIVE_HIGH>;
 -              reset-gpios = <&stmfx_pinctrl 19 GPIO_ACTIVE_LOW>;
 +              powerdown-gpios = <&stmfx_pinctrl 18 (GPIO_ACTIVE_HIGH | GPIO_PUSH_PULL)>;
 +              reset-gpios = <&stmfx_pinctrl 19 (GPIO_ACTIVE_LOW | GPIO_PUSH_PULL)>;
                rotation = <180>;
                status = "okay";
  
  
                        joystick_pins: joystick {
                                pins = "gpio0", "gpio1", "gpio2", "gpio3", "gpio4";
 -                              drive-push-pull;
                                bias-pull-down;
                        };
 -
 -                      ov5640_pins: camera {
 -                              pins = "agpio2", "agpio3"; /* stmfx pins 18 & 19 */
 -                              drive-push-pull;
 -                              output-low;
 -                      };
                };
        };
  };
  
  &usbh_ehci {
        phys = <&usbphyc_port0>;
-       phy-names = "usb";
        status = "okay";
  };
  
  &usbotg_hs {
        dr_mode = "peripheral";
        phys = <&usbphyc_port1 0>;
-       phy-names = "usb2-phy";
        status = "okay";
  };
  
                        interrupt-names = "int0", "int1";
                        clocks = <&rcc CK_HSE>, <&rcc FDCAN_K>;
                        clock-names = "hclk", "cclk";
 -                      bosch,mram-cfg = <0x1400 0 0 32 0 0 2 2>;
 +                      bosch,mram-cfg = <0x0 0 0 32 0 0 2 2>;
                        status = "disabled";
                };
  
                        interrupt-names = "int0", "int1";
                        clocks = <&rcc CK_HSE>, <&rcc FDCAN_K>;
                        clock-names = "hclk", "cclk";
 -                      bosch,mram-cfg = <0x0 0 0 32 0 0 2 2>;
 +                      bosch,mram-cfg = <0x1400 0 0 32 0 0 2 2>;
                        status = "disabled";
                };
  
                        #reset-cells = <1>;
                };
  
+               pwr_regulators: pwr@50001000 {
+                       compatible = "st,stm32mp1,pwr-reg";
+                       reg = <0x50001000 0x10>;
+                       reg11: reg11 {
+                               regulator-name = "reg11";
+                               regulator-min-microvolt = <1100000>;
+                               regulator-max-microvolt = <1100000>;
+                       };
+                       reg18: reg18 {
+                               regulator-name = "reg18";
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <1800000>;
+                       };
+                       usb33: usb33 {
+                               regulator-name = "usb33";
+                               regulator-min-microvolt = <3300000>;
+                               regulator-max-microvolt = <3300000>;
+                       };
+               };
                exti: interrupt-controller@5000d000 {
                        compatible = "st,stm32mp1-exti", "syscon";
                        interrupt-controller;
                                 <&ccu CLK_PLL_VIDEO1_2X>;
                        clock-names = "ahb", "mod", "ddc", "pll-0", "pll-1";
                        resets = <&ccu RST_AHB1_HDMI>;
-                       reset-names = "ahb";
                        dma-names = "ddc-tx", "ddc-rx", "audio-tx";
                        dmas = <&dma 13>, <&dma 13>, <&dma 14>;
                        status = "disabled";
                        clocks = <&ccu CLK_AHB1_EHCI0>;
                        resets = <&ccu RST_AHB1_EHCI0>;
                        phys = <&usbphy 1>;
 +                      phy-names = "usb";
                        status = "disabled";
                };
  
                        clocks = <&ccu CLK_AHB1_OHCI0>, <&ccu CLK_USB_OHCI0>;
                        resets = <&ccu RST_AHB1_OHCI0>;
                        phys = <&usbphy 1>;
 +                      phy-names = "usb";
                        status = "disabled";
                };
  
                        clocks = <&ccu CLK_AHB1_EHCI1>;
                        resets = <&ccu RST_AHB1_EHCI1>;
                        phys = <&usbphy 2>;
 +                      phy-names = "usb";
                        status = "disabled";
                };
  
                        clocks = <&ccu CLK_AHB1_OHCI1>, <&ccu CLK_USB_OHCI1>;
                        resets = <&ccu RST_AHB1_OHCI1>;
                        phys = <&usbphy 2>;
 +                      phy-names = "usb";
                        status = "disabled";
                };
  
                sid: eeprom@1c14000 {
                        compatible = "allwinner,sun8i-a83t-sid";
                        reg = <0x1c14000 0x400>;
+               };
+               crypto: crypto@1c15000 {
+                       compatible = "allwinner,sun8i-a83t-crypto";
+                       reg = <0x01c15000 0x1000>;
+                       interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
+                       resets = <&ccu RST_BUS_SS>;
+                       clocks = <&ccu CLK_BUS_SS>, <&ccu CLK_SS>;
+                       clock-names = "bus", "mod";
                };
  
                usb_otg: usb@1c19000 {
                        clocks = <&ccu CLK_BUS_EHCI0>;
                        resets = <&ccu RST_BUS_EHCI0>;
                        phys = <&usbphy 1>;
 +                      phy-names = "usb";
                        status = "disabled";
                };
  
                        clocks = <&ccu CLK_BUS_OHCI0>, <&ccu CLK_USB_OHCI0>;
                        resets = <&ccu RST_BUS_OHCI0>;
                        phys = <&usbphy 1>;
 +                      phy-names = "usb";
                        status = "disabled";
                };
  
                        clocks = <&ccu CLK_BUS_EHCI1>;
                        resets = <&ccu RST_BUS_EHCI1>;
                        phys = <&usbphy 2>;
 +                      phy-names = "usb";
                        status = "disabled";
                };
  
                        #phy-cells = <1>;
                };
  
+               crypto: crypto@1c15000 {
+                       compatible = "allwinner,sun8i-r40-crypto";
+                       reg = <0x01c15000 0x1000>;
+                       interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&ccu CLK_BUS_CE>, <&ccu CLK_CE>;
+                       clock-names = "bus", "mod";
+                       resets = <&ccu RST_BUS_CE>;
+               };
                ehci1: usb@1c19000 {
                        compatible = "allwinner,sun8i-r40-ehci", "generic-ehci";
                        reg = <0x01c19000 0x100>;
                        clocks = <&ccu CLK_BUS_EHCI1>;
                        resets = <&ccu RST_BUS_EHCI1>;
                        phys = <&usbphy 1>;
 +                      phy-names = "usb";
                        status = "disabled";
                };
  
                                 <&ccu CLK_USB_OHCI1>;
                        resets = <&ccu RST_BUS_OHCI1>;
                        phys = <&usbphy 1>;
 +                      phy-names = "usb";
                        status = "disabled";
                };
  
                        clocks = <&ccu CLK_BUS_EHCI2>;
                        resets = <&ccu RST_BUS_EHCI2>;
                        phys = <&usbphy 2>;
 +                      phy-names = "usb";
                        status = "disabled";
                };
  
                                 <&ccu CLK_USB_OHCI2>;
                        resets = <&ccu RST_BUS_OHCI2>;
                        phys = <&usbphy 2>;
 +                      phy-names = "usb";
                        status = "disabled";
                };
  
                        clocks = <&usb_clocks CLK_BUS_HCI0>;
                        resets = <&usb_clocks RST_USB0_HCI>;
                        phys = <&usbphy1>;
 +                      phy-names = "usb";
                        status = "disabled";
                };
  
                                 <&usb_clocks CLK_USB_OHCI0>;
                        resets = <&usb_clocks RST_USB0_HCI>;
                        phys = <&usbphy1>;
 +                      phy-names = "usb";
                        status = "disabled";
                };
  
                        clocks = <&usb_clocks CLK_BUS_HCI1>;
                        resets = <&usb_clocks RST_USB1_HCI>;
                        phys = <&usbphy2>;
 +                      phy-names = "usb";
                        status = "disabled";
                };
  
                        clocks = <&usb_clocks CLK_BUS_HCI2>;
                        resets = <&usb_clocks RST_USB2_HCI>;
                        phys = <&usbphy3>;
 +                      phy-names = "usb";
                        status = "disabled";
                };
  
                                 <&usb_clocks CLK_USB_OHCI2>;
                        resets = <&usb_clocks RST_USB2_HCI>;
                        phys = <&usbphy3>;
 +                      phy-names = "usb";
                        status = "disabled";
                };
  
                        reg = <0x01700000 0x100>;
                };
  
+               crypto: crypto@1c02000 {
+                       compatible = "allwinner,sun9i-a80-crypto";
+                       reg = <0x01c02000 0x1000>;
+                       interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
+                       resets = <&ccu RST_BUS_SS>;
+                       clocks = <&ccu CLK_BUS_SS>, <&ccu CLK_SS>;
+                       clock-names = "bus", "mod";
+               };
                mmc0: mmc@1c0f000 {
                        compatible = "allwinner,sun9i-a80-mmc";
                        reg = <0x01c0f000 0x1000>;
                        compatible = "allwinner,sun6i-a31-wdt";
                        reg = <0x06000ca0 0x20>;
                        interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&osc24M>;
                };
  
                pio: pinctrl@6000800 {
                        compatible = "allwinner,sun6i-a31-wdt";
                        reg = <0x08001000 0x20>;
                        interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&osc24M>;
                };
  
                prcm@8001400 {
                compatible = "simple-bus";
                #address-cells = <1>;
                #size-cells = <1>;
+               dma-ranges;
                ranges;
  
                display_clocks: clock@1000000 {
                        clocks = <&ccu CLK_BUS_EHCI1>, <&ccu CLK_BUS_OHCI1>;
                        resets = <&ccu RST_BUS_EHCI1>, <&ccu RST_BUS_OHCI1>;
                        phys = <&usbphy 1>;
 +                      phy-names = "usb";
                        status = "disabled";
                };
  
                                 <&ccu CLK_USB_OHCI1>;
                        resets = <&ccu RST_BUS_EHCI1>, <&ccu RST_BUS_OHCI1>;
                        phys = <&usbphy 1>;
 +                      phy-names = "usb";
                        status = "disabled";
                };
  
                        clocks = <&ccu CLK_BUS_EHCI2>, <&ccu CLK_BUS_OHCI2>;
                        resets = <&ccu RST_BUS_EHCI2>, <&ccu RST_BUS_OHCI2>;
                        phys = <&usbphy 2>;
 +                      phy-names = "usb";
                        status = "disabled";
                };
  
                                 <&ccu CLK_USB_OHCI2>;
                        resets = <&ccu RST_BUS_EHCI2>, <&ccu RST_BUS_OHCI2>;
                        phys = <&usbphy 2>;
 +                      phy-names = "usb";
                        status = "disabled";
                };
  
                        clocks = <&ccu CLK_BUS_EHCI3>, <&ccu CLK_BUS_OHCI3>;
                        resets = <&ccu RST_BUS_EHCI3>, <&ccu RST_BUS_OHCI3>;
                        phys = <&usbphy 3>;
 +                      phy-names = "usb";
                        status = "disabled";
                };
  
                                 <&ccu CLK_USB_OHCI3>;
                        resets = <&ccu RST_BUS_EHCI3>, <&ccu RST_BUS_OHCI3>;
                        phys = <&usbphy 3>;
 +                      phy-names = "usb";
                        status = "disabled";
                };
  
                                function = "uart2";
                        };
  
+                       uart2_rts_cts_pins: uart2-rts-cts-pins {
+                               pins = "PA2", "PA3";
+                               function = "uart2";
+                       };
                        uart3_pins: uart3-pins {
                                pins = "PA13", "PA14";
                                function = "uart3";
                        };
                };
  
+               mbus: dram-controller@1c62000 {
+                       compatible = "allwinner,sun8i-h3-mbus";
+                       reg = <0x01c62000 0x1000>;
+                       clocks = <&ccu 113>;
+                       dma-ranges = <0x00000000 0x40000000 0xc0000000>;
+                       #interconnect-cells = <1>;
+               };
                spi0: spi@1c68000 {
                        compatible = "allwinner,sun8i-h3-spi";
                        reg = <0x01c68000 0x1000>;
@@@ -11,6 -11,7 +11,6 @@@ CONFIG_CGROUP_CPUACCT=
  CONFIG_CGROUP_SCHED=y
  CONFIG_BLK_CGROUP=y
  CONFIG_BLK_DEV_INITRD=y
 -CONFIG_SYSCTL_SYSCALL=y
  CONFIG_KALLSYMS_ALL=y
  # CONFIG_ELF_CORE is not set
  # CONFIG_BASE_FULL is not set
@@@ -134,6 -135,7 +134,7 @@@ CONFIG_BLK_DEV_SD=
  CONFIG_NETDEVICES=y
  CONFIG_TI_KEYSTONE_NETCP=y
  CONFIG_TI_KEYSTONE_NETCP_ETHSS=y
+ CONFIG_TI_CPTS=y
  CONFIG_MARVELL_PHY=y
  CONFIG_SERIAL_8250=y
  CONFIG_SERIAL_8250_CONSOLE=y
@@@ -790,7 -790,7 +790,7 @@@ static struct omap_hwmod_class omap44xx
        .sysc           = &omap44xx_sha0_sysc,
  };
  
 -struct omap_hwmod omap44xx_sha0_hwmod = {
 +static struct omap_hwmod omap44xx_sha0_hwmod = {
        .name           = "sham",
        .class          = &omap44xx_sha0_hwmod_class,
        .clkdm_name     = "l4_secure_clkdm",
@@@ -974,7 -974,7 +974,7 @@@ static struct omap_hwmod omap44xx_des_h
        },
  };
  
 -struct omap_hwmod_ocp_if omap44xx_l3_main_2__des = {
 +static struct omap_hwmod_ocp_if omap44xx_l3_main_2__des = {
        .master         = &omap44xx_l3_main_2_hwmod,
        .slave          = &omap44xx_des_hwmod,
        .clk            = "l3_div_ck",
@@@ -1061,40 -1061,6 +1061,6 @@@ static struct omap_hwmod omap44xx_gpmc_
        },
  };
  
- /*
-  * 'hdq1w' class
-  * hdq / 1-wire serial interface controller
-  */
- static struct omap_hwmod_class_sysconfig omap44xx_hdq1w_sysc = {
-       .rev_offs       = 0x0000,
-       .sysc_offs      = 0x0014,
-       .syss_offs      = 0x0018,
-       .sysc_flags     = (SYSC_HAS_AUTOIDLE | SYSC_HAS_SOFTRESET |
-                          SYSS_HAS_RESET_STATUS),
-       .sysc_fields    = &omap_hwmod_sysc_type1,
- };
- static struct omap_hwmod_class omap44xx_hdq1w_hwmod_class = {
-       .name   = "hdq1w",
-       .sysc   = &omap44xx_hdq1w_sysc,
- };
- /* hdq1w */
- static struct omap_hwmod omap44xx_hdq1w_hwmod = {
-       .name           = "hdq1w",
-       .class          = &omap44xx_hdq1w_hwmod_class,
-       .clkdm_name     = "l4_per_clkdm",
-       .flags          = HWMOD_INIT_NO_RESET, /* XXX temporary */
-       .main_clk       = "func_12m_fclk",
-       .prcm = {
-               .omap4 = {
-                       .clkctrl_offs = OMAP4_CM_L4PER_HDQ1W_CLKCTRL_OFFSET,
-                       .context_offs = OMAP4_RM_L4PER_HDQ1W_CONTEXT_OFFSET,
-                       .modulemode   = MODULEMODE_SWCTRL,
-               },
-       },
- };
  
  /*
   * 'hsi' class
@@@ -1288,180 -1254,6 +1254,6 @@@ static struct omap_hwmod omap44xx_kbd_h
        },
  };
  
- /*
-  * 'mailbox' class
-  * mailbox module allowing communication between the on-chip processors using a
-  * queued mailbox-interrupt mechanism.
-  */
- static struct omap_hwmod_class_sysconfig omap44xx_mailbox_sysc = {
-       .rev_offs       = 0x0000,
-       .sysc_offs      = 0x0010,
-       .sysc_flags     = (SYSC_HAS_RESET_STATUS | SYSC_HAS_SIDLEMODE |
-                          SYSC_HAS_SOFTRESET),
-       .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),
-       .sysc_fields    = &omap_hwmod_sysc_type2,
- };
- static struct omap_hwmod_class omap44xx_mailbox_hwmod_class = {
-       .name   = "mailbox",
-       .sysc   = &omap44xx_mailbox_sysc,
- };
- /* mailbox */
- static struct omap_hwmod omap44xx_mailbox_hwmod = {
-       .name           = "mailbox",
-       .class          = &omap44xx_mailbox_hwmod_class,
-       .clkdm_name     = "l4_cfg_clkdm",
-       .prcm = {
-               .omap4 = {
-                       .clkctrl_offs = OMAP4_CM_L4CFG_MAILBOX_CLKCTRL_OFFSET,
-                       .context_offs = OMAP4_RM_L4CFG_MAILBOX_CONTEXT_OFFSET,
-               },
-       },
- };
- /*
-  * 'mcasp' class
-  * multi-channel audio serial port controller
-  */
- /* The IP is not compliant to type1 / type2 scheme */
- static struct omap_hwmod_class_sysconfig omap44xx_mcasp_sysc = {
-       .rev_offs       = 0,
-       .sysc_offs      = 0x0004,
-       .sysc_flags     = SYSC_HAS_SIDLEMODE,
-       .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
-                          SIDLE_SMART_WKUP),
-       .sysc_fields    = &omap_hwmod_sysc_type_mcasp,
- };
- static struct omap_hwmod_class omap44xx_mcasp_hwmod_class = {
-       .name   = "mcasp",
-       .sysc   = &omap44xx_mcasp_sysc,
- };
- /* mcasp */
- static struct omap_hwmod omap44xx_mcasp_hwmod = {
-       .name           = "mcasp",
-       .class          = &omap44xx_mcasp_hwmod_class,
-       .clkdm_name     = "abe_clkdm",
-       .main_clk       = "func_mcasp_abe_gfclk",
-       .prcm = {
-               .omap4 = {
-                       .clkctrl_offs = OMAP4_CM1_ABE_MCASP_CLKCTRL_OFFSET,
-                       .context_offs = OMAP4_RM_ABE_MCASP_CONTEXT_OFFSET,
-                       .modulemode   = MODULEMODE_SWCTRL,
-               },
-       },
- };
- /*
-  * 'mcbsp' class
-  * multi channel buffered serial port controller
-  */
- static struct omap_hwmod_class_sysconfig omap44xx_mcbsp_sysc = {
-       .rev_offs       = -ENODEV,
-       .sysc_offs      = 0x008c,
-       .sysc_flags     = (SYSC_HAS_CLOCKACTIVITY | SYSC_HAS_ENAWAKEUP |
-                          SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET),
-       .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),
-       .sysc_fields    = &omap_hwmod_sysc_type1,
- };
- static struct omap_hwmod_class omap44xx_mcbsp_hwmod_class = {
-       .name   = "mcbsp",
-       .sysc   = &omap44xx_mcbsp_sysc,
- };
- /* mcbsp1 */
- static struct omap_hwmod_opt_clk mcbsp1_opt_clks[] = {
-       { .role = "pad_fck", .clk = "pad_clks_ck" },
-       { .role = "prcm_fck", .clk = "mcbsp1_sync_mux_ck" },
- };
- static struct omap_hwmod omap44xx_mcbsp1_hwmod = {
-       .name           = "mcbsp1",
-       .class          = &omap44xx_mcbsp_hwmod_class,
-       .clkdm_name     = "abe_clkdm",
-       .main_clk       = "func_mcbsp1_gfclk",
-       .prcm = {
-               .omap4 = {
-                       .clkctrl_offs = OMAP4_CM1_ABE_MCBSP1_CLKCTRL_OFFSET,
-                       .context_offs = OMAP4_RM_ABE_MCBSP1_CONTEXT_OFFSET,
-                       .modulemode   = MODULEMODE_SWCTRL,
-               },
-       },
-       .opt_clks       = mcbsp1_opt_clks,
-       .opt_clks_cnt   = ARRAY_SIZE(mcbsp1_opt_clks),
- };
- /* mcbsp2 */
- static struct omap_hwmod_opt_clk mcbsp2_opt_clks[] = {
-       { .role = "pad_fck", .clk = "pad_clks_ck" },
-       { .role = "prcm_fck", .clk = "mcbsp2_sync_mux_ck" },
- };
- static struct omap_hwmod omap44xx_mcbsp2_hwmod = {
-       .name           = "mcbsp2",
-       .class          = &omap44xx_mcbsp_hwmod_class,
-       .clkdm_name     = "abe_clkdm",
-       .main_clk       = "func_mcbsp2_gfclk",
-       .prcm = {
-               .omap4 = {
-                       .clkctrl_offs = OMAP4_CM1_ABE_MCBSP2_CLKCTRL_OFFSET,
-                       .context_offs = OMAP4_RM_ABE_MCBSP2_CONTEXT_OFFSET,
-                       .modulemode   = MODULEMODE_SWCTRL,
-               },
-       },
-       .opt_clks       = mcbsp2_opt_clks,
-       .opt_clks_cnt   = ARRAY_SIZE(mcbsp2_opt_clks),
- };
- /* mcbsp3 */
- static struct omap_hwmod_opt_clk mcbsp3_opt_clks[] = {
-       { .role = "pad_fck", .clk = "pad_clks_ck" },
-       { .role = "prcm_fck", .clk = "mcbsp3_sync_mux_ck" },
- };
- static struct omap_hwmod omap44xx_mcbsp3_hwmod = {
-       .name           = "mcbsp3",
-       .class          = &omap44xx_mcbsp_hwmod_class,
-       .clkdm_name     = "abe_clkdm",
-       .main_clk       = "func_mcbsp3_gfclk",
-       .prcm = {
-               .omap4 = {
-                       .clkctrl_offs = OMAP4_CM1_ABE_MCBSP3_CLKCTRL_OFFSET,
-                       .context_offs = OMAP4_RM_ABE_MCBSP3_CONTEXT_OFFSET,
-                       .modulemode   = MODULEMODE_SWCTRL,
-               },
-       },
-       .opt_clks       = mcbsp3_opt_clks,
-       .opt_clks_cnt   = ARRAY_SIZE(mcbsp3_opt_clks),
- };
- /* mcbsp4 */
- static struct omap_hwmod_opt_clk mcbsp4_opt_clks[] = {
-       { .role = "pad_fck", .clk = "pad_clks_ck" },
-       { .role = "prcm_fck", .clk = "mcbsp4_sync_mux_ck" },
- };
- static struct omap_hwmod omap44xx_mcbsp4_hwmod = {
-       .name           = "mcbsp4",
-       .class          = &omap44xx_mcbsp_hwmod_class,
-       .clkdm_name     = "l4_per_clkdm",
-       .main_clk       = "per_mcbsp4_gfclk",
-       .prcm = {
-               .omap4 = {
-                       .clkctrl_offs = OMAP4_CM_L4PER_MCBSP4_CLKCTRL_OFFSET,
-                       .context_offs = OMAP4_RM_L4PER_MCBSP4_CONTEXT_OFFSET,
-                       .modulemode   = MODULEMODE_SWCTRL,
-               },
-       },
-       .opt_clks       = mcbsp4_opt_clks,
-       .opt_clks_cnt   = ARRAY_SIZE(mcbsp4_opt_clks),
- };
  
  /*
   * 'mcpdm' class
@@@ -2294,51 -2086,6 +2086,6 @@@ static struct omap_hwmod omap44xx_usb_h
        .flags          = HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY,
  };
  
- /*
-  * 'usb_otg_hs' class
-  * high-speed on-the-go universal serial bus (usb_otg_hs) controller
-  */
- static struct omap_hwmod_class_sysconfig omap44xx_usb_otg_hs_sysc = {
-       .rev_offs       = 0x0400,
-       .sysc_offs      = 0x0404,
-       .syss_offs      = 0x0408,
-       .sysc_flags     = (SYSC_HAS_AUTOIDLE | SYSC_HAS_ENAWAKEUP |
-                          SYSC_HAS_MIDLEMODE | SYSC_HAS_SIDLEMODE |
-                          SYSC_HAS_SOFTRESET | SYSS_HAS_RESET_STATUS),
-       .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
-                          SIDLE_SMART_WKUP | MSTANDBY_FORCE | MSTANDBY_NO |
-                          MSTANDBY_SMART),
-       .sysc_fields    = &omap_hwmod_sysc_type1,
- };
- static struct omap_hwmod_class omap44xx_usb_otg_hs_hwmod_class = {
-       .name   = "usb_otg_hs",
-       .sysc   = &omap44xx_usb_otg_hs_sysc,
- };
- /* usb_otg_hs */
- static struct omap_hwmod_opt_clk usb_otg_hs_opt_clks[] = {
-       { .role = "xclk", .clk = "usb_otg_hs_xclk" },
- };
- static struct omap_hwmod omap44xx_usb_otg_hs_hwmod = {
-       .name           = "usb_otg_hs",
-       .class          = &omap44xx_usb_otg_hs_hwmod_class,
-       .clkdm_name     = "l3_init_clkdm",
-       .flags          = HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY,
-       .main_clk       = "usb_otg_hs_ick",
-       .prcm = {
-               .omap4 = {
-                       .clkctrl_offs = OMAP4_CM_L3INIT_USB_OTG_CLKCTRL_OFFSET,
-                       .context_offs = OMAP4_RM_L3INIT_USB_OTG_CONTEXT_OFFSET,
-                       .modulemode   = MODULEMODE_HWCTRL,
-               },
-       },
-       .opt_clks       = usb_otg_hs_opt_clks,
-       .opt_clks_cnt   = ARRAY_SIZE(usb_otg_hs_opt_clks),
- };
  /*
   * 'usb_tll_hs' class
   * usb_tll_hs module is the adapter on the usb_host_hs ports
@@@ -2546,14 -2293,6 +2293,6 @@@ static struct omap_hwmod_ocp_if omap44x
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
  };
  
- /* usb_otg_hs -> l3_main_2 */
- static struct omap_hwmod_ocp_if omap44xx_usb_otg_hs__l3_main_2 = {
-       .master         = &omap44xx_usb_otg_hs_hwmod,
-       .slave          = &omap44xx_l3_main_2_hwmod,
-       .clk            = "l3_div_ck",
-       .user           = OCP_USER_MPU | OCP_USER_SDMA,
- };
  /* l3_main_1 -> l3_main_3 */
  static struct omap_hwmod_ocp_if omap44xx_l3_main_1__l3_main_3 = {
        .master         = &omap44xx_l3_main_1_hwmod,
@@@ -2898,14 -2637,6 +2637,6 @@@ static struct omap_hwmod_ocp_if omap44x
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
  };
  
- /* l4_per -> hdq1w */
- static struct omap_hwmod_ocp_if omap44xx_l4_per__hdq1w = {
-       .master         = &omap44xx_l4_per_hwmod,
-       .slave          = &omap44xx_hdq1w_hwmod,
-       .clk            = "l4_div_ck",
-       .user           = OCP_USER_MPU | OCP_USER_SDMA,
- };
  /* l4_cfg -> hsi */
  static struct omap_hwmod_ocp_if omap44xx_l4_cfg__hsi = {
        .master         = &omap44xx_l4_cfg_hwmod,
@@@ -2954,62 -2685,6 +2685,6 @@@ static struct omap_hwmod_ocp_if omap44x
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
  };
  
- /* l4_cfg -> mailbox */
- static struct omap_hwmod_ocp_if omap44xx_l4_cfg__mailbox = {
-       .master         = &omap44xx_l4_cfg_hwmod,
-       .slave          = &omap44xx_mailbox_hwmod,
-       .clk            = "l4_div_ck",
-       .user           = OCP_USER_MPU | OCP_USER_SDMA,
- };
- /* l4_abe -> mcasp */
- static struct omap_hwmod_ocp_if omap44xx_l4_abe__mcasp = {
-       .master         = &omap44xx_l4_abe_hwmod,
-       .slave          = &omap44xx_mcasp_hwmod,
-       .clk            = "ocp_abe_iclk",
-       .user           = OCP_USER_MPU,
- };
- /* l4_abe -> mcasp (dma) */
- static struct omap_hwmod_ocp_if omap44xx_l4_abe__mcasp_dma = {
-       .master         = &omap44xx_l4_abe_hwmod,
-       .slave          = &omap44xx_mcasp_hwmod,
-       .clk            = "ocp_abe_iclk",
-       .user           = OCP_USER_SDMA,
- };
- /* l4_abe -> mcbsp1 */
- static struct omap_hwmod_ocp_if omap44xx_l4_abe__mcbsp1 = {
-       .master         = &omap44xx_l4_abe_hwmod,
-       .slave          = &omap44xx_mcbsp1_hwmod,
-       .clk            = "ocp_abe_iclk",
-       .user           = OCP_USER_MPU | OCP_USER_SDMA,
- };
- /* l4_abe -> mcbsp2 */
- static struct omap_hwmod_ocp_if omap44xx_l4_abe__mcbsp2 = {
-       .master         = &omap44xx_l4_abe_hwmod,
-       .slave          = &omap44xx_mcbsp2_hwmod,
-       .clk            = "ocp_abe_iclk",
-       .user           = OCP_USER_MPU | OCP_USER_SDMA,
- };
- /* l4_abe -> mcbsp3 */
- static struct omap_hwmod_ocp_if omap44xx_l4_abe__mcbsp3 = {
-       .master         = &omap44xx_l4_abe_hwmod,
-       .slave          = &omap44xx_mcbsp3_hwmod,
-       .clk            = "ocp_abe_iclk",
-       .user           = OCP_USER_MPU | OCP_USER_SDMA,
- };
- /* l4_per -> mcbsp4 */
- static struct omap_hwmod_ocp_if omap44xx_l4_per__mcbsp4 = {
-       .master         = &omap44xx_l4_per_hwmod,
-       .slave          = &omap44xx_mcbsp4_hwmod,
-       .clk            = "l4_div_ck",
-       .user           = OCP_USER_MPU | OCP_USER_SDMA,
- };
  /* l4_abe -> mcpdm */
  static struct omap_hwmod_ocp_if omap44xx_l4_abe__mcpdm = {
        .master         = &omap44xx_l4_abe_hwmod,
@@@ -3242,14 -2917,6 +2917,6 @@@ static struct omap_hwmod_ocp_if omap44x
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
  };
  
- /* l4_cfg -> usb_otg_hs */
- static struct omap_hwmod_ocp_if omap44xx_l4_cfg__usb_otg_hs = {
-       .master         = &omap44xx_l4_cfg_hwmod,
-       .slave          = &omap44xx_usb_otg_hs_hwmod,
-       .clk            = "l4_div_ck",
-       .user           = OCP_USER_MPU | OCP_USER_SDMA,
- };
  /* l4_cfg -> usb_tll_hs */
  static struct omap_hwmod_ocp_if omap44xx_l4_cfg__usb_tll_hs = {
        .master         = &omap44xx_l4_cfg_hwmod,
@@@ -3296,7 -2963,6 +2963,6 @@@ static struct omap_hwmod_ocp_if *omap44
        &omap44xx_l4_cfg__l3_main_2,
        /* &omap44xx_usb_host_fs__l3_main_2, */
        &omap44xx_usb_host_hs__l3_main_2,
-       &omap44xx_usb_otg_hs__l3_main_2,
        &omap44xx_l3_main_1__l3_main_3,
        &omap44xx_l3_main_2__l3_main_3,
        &omap44xx_l4_cfg__l3_main_3,
        &omap44xx_l4_per__elm,
        &omap44xx_l4_cfg__fdif,
        &omap44xx_l3_main_2__gpmc,
-       &omap44xx_l4_per__hdq1w,
        &omap44xx_l4_cfg__hsi,
        &omap44xx_l3_main_2__ipu,
        &omap44xx_l3_main_2__iss,
        /* &omap44xx_iva__sl2if, */
        &omap44xx_l3_main_2__iva,
        &omap44xx_l4_wkup__kbd,
-       &omap44xx_l4_cfg__mailbox,
-       &omap44xx_l4_abe__mcasp,
-       &omap44xx_l4_abe__mcasp_dma,
-       &omap44xx_l4_abe__mcbsp1,
-       &omap44xx_l4_abe__mcbsp2,
-       &omap44xx_l4_abe__mcbsp3,
-       &omap44xx_l4_per__mcbsp4,
        &omap44xx_l4_abe__mcpdm,
        &omap44xx_l3_main_2__mmu_ipu,
        &omap44xx_l4_cfg__mmu_dsp,
        &omap44xx_l4_per__timer11,
        /* &omap44xx_l4_cfg__usb_host_fs, */
        &omap44xx_l4_cfg__usb_host_hs,
-       &omap44xx_l4_cfg__usb_otg_hs,
        &omap44xx_l4_cfg__usb_tll_hs,
        &omap44xx_mpu__emif1,
        &omap44xx_mpu__emif2,
@@@ -24,7 -24,6 +24,6 @@@
  #include "cm1_7xx.h"
  #include "cm2_7xx.h"
  #include "prm7xx.h"
- #include "wd_timer.h"
  #include "soc.h"
  
  /* Base offset for all DRA7XX interrupts external to MPUSS */
@@@ -683,7 -682,7 +682,7 @@@ static struct omap_hwmod_class dra7xx_s
        .sysc           = &dra7xx_sha0_sysc,
  };
  
 -struct omap_hwmod dra7xx_sha0_hwmod = {
 +static struct omap_hwmod dra7xx_sha0_hwmod = {
        .name           = "sham",
        .class          = &dra7xx_sha0_hwmod_class,
        .clkdm_name     = "l4sec_clkdm",
@@@ -772,229 -771,7 +771,7 @@@ static struct omap_hwmod dra7xx_gpmc_hw
        },
  };
  
- /*
-  * 'hdq1w' class
-  *
-  */
- static struct omap_hwmod_class_sysconfig dra7xx_hdq1w_sysc = {
-       .rev_offs       = 0x0000,
-       .sysc_offs      = 0x0014,
-       .syss_offs      = 0x0018,
-       .sysc_flags     = (SYSC_HAS_AUTOIDLE | SYSC_HAS_SOFTRESET |
-                          SYSS_HAS_RESET_STATUS),
-       .sysc_fields    = &omap_hwmod_sysc_type1,
- };
  
- static struct omap_hwmod_class dra7xx_hdq1w_hwmod_class = {
-       .name   = "hdq1w",
-       .sysc   = &dra7xx_hdq1w_sysc,
- };
- /* hdq1w */
- static struct omap_hwmod dra7xx_hdq1w_hwmod = {
-       .name           = "hdq1w",
-       .class          = &dra7xx_hdq1w_hwmod_class,
-       .clkdm_name     = "l4per_clkdm",
-       .flags          = HWMOD_INIT_NO_RESET,
-       .main_clk       = "func_12m_fclk",
-       .prcm = {
-               .omap4 = {
-                       .clkctrl_offs = DRA7XX_CM_L4PER_HDQ1W_CLKCTRL_OFFSET,
-                       .context_offs = DRA7XX_RM_L4PER_HDQ1W_CONTEXT_OFFSET,
-                       .modulemode   = MODULEMODE_SWCTRL,
-               },
-       },
- };
- /*
-  * 'mailbox' class
-  *
-  */
- static struct omap_hwmod_class_sysconfig dra7xx_mailbox_sysc = {
-       .rev_offs       = 0x0000,
-       .sysc_offs      = 0x0010,
-       .sysc_flags     = (SYSC_HAS_RESET_STATUS | SYSC_HAS_SIDLEMODE |
-                          SYSC_HAS_SOFTRESET),
-       .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),
-       .sysc_fields    = &omap_hwmod_sysc_type2,
- };
- static struct omap_hwmod_class dra7xx_mailbox_hwmod_class = {
-       .name   = "mailbox",
-       .sysc   = &dra7xx_mailbox_sysc,
- };
- /* mailbox1 */
- static struct omap_hwmod dra7xx_mailbox1_hwmod = {
-       .name           = "mailbox1",
-       .class          = &dra7xx_mailbox_hwmod_class,
-       .clkdm_name     = "l4cfg_clkdm",
-       .prcm = {
-               .omap4 = {
-                       .clkctrl_offs = DRA7XX_CM_L4CFG_MAILBOX1_CLKCTRL_OFFSET,
-                       .context_offs = DRA7XX_RM_L4CFG_MAILBOX1_CONTEXT_OFFSET,
-               },
-       },
- };
- /* mailbox2 */
- static struct omap_hwmod dra7xx_mailbox2_hwmod = {
-       .name           = "mailbox2",
-       .class          = &dra7xx_mailbox_hwmod_class,
-       .clkdm_name     = "l4cfg_clkdm",
-       .prcm = {
-               .omap4 = {
-                       .clkctrl_offs = DRA7XX_CM_L4CFG_MAILBOX2_CLKCTRL_OFFSET,
-                       .context_offs = DRA7XX_RM_L4CFG_MAILBOX2_CONTEXT_OFFSET,
-               },
-       },
- };
- /* mailbox3 */
- static struct omap_hwmod dra7xx_mailbox3_hwmod = {
-       .name           = "mailbox3",
-       .class          = &dra7xx_mailbox_hwmod_class,
-       .clkdm_name     = "l4cfg_clkdm",
-       .prcm = {
-               .omap4 = {
-                       .clkctrl_offs = DRA7XX_CM_L4CFG_MAILBOX3_CLKCTRL_OFFSET,
-                       .context_offs = DRA7XX_RM_L4CFG_MAILBOX3_CONTEXT_OFFSET,
-               },
-       },
- };
- /* mailbox4 */
- static struct omap_hwmod dra7xx_mailbox4_hwmod = {
-       .name           = "mailbox4",
-       .class          = &dra7xx_mailbox_hwmod_class,
-       .clkdm_name     = "l4cfg_clkdm",
-       .prcm = {
-               .omap4 = {
-                       .clkctrl_offs = DRA7XX_CM_L4CFG_MAILBOX4_CLKCTRL_OFFSET,
-                       .context_offs = DRA7XX_RM_L4CFG_MAILBOX4_CONTEXT_OFFSET,
-               },
-       },
- };
- /* mailbox5 */
- static struct omap_hwmod dra7xx_mailbox5_hwmod = {
-       .name           = "mailbox5",
-       .class          = &dra7xx_mailbox_hwmod_class,
-       .clkdm_name     = "l4cfg_clkdm",
-       .prcm = {
-               .omap4 = {
-                       .clkctrl_offs = DRA7XX_CM_L4CFG_MAILBOX5_CLKCTRL_OFFSET,
-                       .context_offs = DRA7XX_RM_L4CFG_MAILBOX5_CONTEXT_OFFSET,
-               },
-       },
- };
- /* mailbox6 */
- static struct omap_hwmod dra7xx_mailbox6_hwmod = {
-       .name           = "mailbox6",
-       .class          = &dra7xx_mailbox_hwmod_class,
-       .clkdm_name     = "l4cfg_clkdm",
-       .prcm = {
-               .omap4 = {
-                       .clkctrl_offs = DRA7XX_CM_L4CFG_MAILBOX6_CLKCTRL_OFFSET,
-                       .context_offs = DRA7XX_RM_L4CFG_MAILBOX6_CONTEXT_OFFSET,
-               },
-       },
- };
- /* mailbox7 */
- static struct omap_hwmod dra7xx_mailbox7_hwmod = {
-       .name           = "mailbox7",
-       .class          = &dra7xx_mailbox_hwmod_class,
-       .clkdm_name     = "l4cfg_clkdm",
-       .prcm = {
-               .omap4 = {
-                       .clkctrl_offs = DRA7XX_CM_L4CFG_MAILBOX7_CLKCTRL_OFFSET,
-                       .context_offs = DRA7XX_RM_L4CFG_MAILBOX7_CONTEXT_OFFSET,
-               },
-       },
- };
- /* mailbox8 */
- static struct omap_hwmod dra7xx_mailbox8_hwmod = {
-       .name           = "mailbox8",
-       .class          = &dra7xx_mailbox_hwmod_class,
-       .clkdm_name     = "l4cfg_clkdm",
-       .prcm = {
-               .omap4 = {
-                       .clkctrl_offs = DRA7XX_CM_L4CFG_MAILBOX8_CLKCTRL_OFFSET,
-                       .context_offs = DRA7XX_RM_L4CFG_MAILBOX8_CONTEXT_OFFSET,
-               },
-       },
- };
- /* mailbox9 */
- static struct omap_hwmod dra7xx_mailbox9_hwmod = {
-       .name           = "mailbox9",
-       .class          = &dra7xx_mailbox_hwmod_class,
-       .clkdm_name     = "l4cfg_clkdm",
-       .prcm = {
-               .omap4 = {
-                       .clkctrl_offs = DRA7XX_CM_L4CFG_MAILBOX9_CLKCTRL_OFFSET,
-                       .context_offs = DRA7XX_RM_L4CFG_MAILBOX9_CONTEXT_OFFSET,
-               },
-       },
- };
- /* mailbox10 */
- static struct omap_hwmod dra7xx_mailbox10_hwmod = {
-       .name           = "mailbox10",
-       .class          = &dra7xx_mailbox_hwmod_class,
-       .clkdm_name     = "l4cfg_clkdm",
-       .prcm = {
-               .omap4 = {
-                       .clkctrl_offs = DRA7XX_CM_L4CFG_MAILBOX10_CLKCTRL_OFFSET,
-                       .context_offs = DRA7XX_RM_L4CFG_MAILBOX10_CONTEXT_OFFSET,
-               },
-       },
- };
- /* mailbox11 */
- static struct omap_hwmod dra7xx_mailbox11_hwmod = {
-       .name           = "mailbox11",
-       .class          = &dra7xx_mailbox_hwmod_class,
-       .clkdm_name     = "l4cfg_clkdm",
-       .prcm = {
-               .omap4 = {
-                       .clkctrl_offs = DRA7XX_CM_L4CFG_MAILBOX11_CLKCTRL_OFFSET,
-                       .context_offs = DRA7XX_RM_L4CFG_MAILBOX11_CONTEXT_OFFSET,
-               },
-       },
- };
- /* mailbox12 */
- static struct omap_hwmod dra7xx_mailbox12_hwmod = {
-       .name           = "mailbox12",
-       .class          = &dra7xx_mailbox_hwmod_class,
-       .clkdm_name     = "l4cfg_clkdm",
-       .prcm = {
-               .omap4 = {
-                       .clkctrl_offs = DRA7XX_CM_L4CFG_MAILBOX12_CLKCTRL_OFFSET,
-                       .context_offs = DRA7XX_RM_L4CFG_MAILBOX12_CONTEXT_OFFSET,
-               },
-       },
- };
- /* mailbox13 */
- static struct omap_hwmod dra7xx_mailbox13_hwmod = {
-       .name           = "mailbox13",
-       .class          = &dra7xx_mailbox_hwmod_class,
-       .clkdm_name     = "l4cfg_clkdm",
-       .prcm = {
-               .omap4 = {
-                       .clkctrl_offs = DRA7XX_CM_L4CFG_MAILBOX13_CLKCTRL_OFFSET,
-                       .context_offs = DRA7XX_RM_L4CFG_MAILBOX13_CONTEXT_OFFSET,
-               },
-       },
- };
  
  /*
   * 'mpu' class
@@@ -1655,34 -1432,6 +1432,6 @@@ static struct omap_hwmod dra7xx_des_hwm
        },
  };
  
- /* rng */
- static struct omap_hwmod_class_sysconfig dra7xx_rng_sysc = {
-       .rev_offs       = 0x1fe0,
-       .sysc_offs      = 0x1fe4,
-       .sysc_flags     = SYSC_HAS_AUTOIDLE | SYSC_HAS_SIDLEMODE,
-       .idlemodes      = SIDLE_FORCE | SIDLE_NO,
-       .sysc_fields    = &omap_hwmod_sysc_type1,
- };
- static struct omap_hwmod_class dra7xx_rng_hwmod_class = {
-       .name           = "rng",
-       .sysc           = &dra7xx_rng_sysc,
- };
- static struct omap_hwmod dra7xx_rng_hwmod = {
-       .name           = "rng",
-       .class          = &dra7xx_rng_hwmod_class,
-       .flags          = HWMOD_SWSUP_SIDLE,
-       .clkdm_name     = "l4sec_clkdm",
-       .prcm = {
-               .omap4 = {
-                       .clkctrl_offs = DRA7XX_CM_L4SEC_RNG_CLKCTRL_OFFSET,
-                       .context_offs = DRA7XX_RM_L4SEC_RNG_CONTEXT_OFFSET,
-                       .modulemode   = MODULEMODE_HWCTRL,
-               },
-       },
- };
  /*
   * 'usb_otg_ss' class
   *
@@@ -1815,43 -1564,6 +1564,6 @@@ static struct omap_hwmod dra7xx_vcp2_hw
        },
  };
  
- /*
-  * 'wd_timer' class
-  *
-  */
- static struct omap_hwmod_class_sysconfig dra7xx_wd_timer_sysc = {
-       .rev_offs       = 0x0000,
-       .sysc_offs      = 0x0010,
-       .syss_offs      = 0x0014,
-       .sysc_flags     = (SYSC_HAS_EMUFREE | SYSC_HAS_SIDLEMODE |
-                          SYSC_HAS_SOFTRESET | SYSS_HAS_RESET_STATUS),
-       .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
-                          SIDLE_SMART_WKUP),
-       .sysc_fields    = &omap_hwmod_sysc_type1,
- };
- static struct omap_hwmod_class dra7xx_wd_timer_hwmod_class = {
-       .name           = "wd_timer",
-       .sysc           = &dra7xx_wd_timer_sysc,
-       .pre_shutdown   = &omap2_wd_timer_disable,
-       .reset          = &omap2_wd_timer_reset,
- };
- /* wd_timer2 */
- static struct omap_hwmod dra7xx_wd_timer2_hwmod = {
-       .name           = "wd_timer2",
-       .class          = &dra7xx_wd_timer_hwmod_class,
-       .clkdm_name     = "wkupaon_clkdm",
-       .main_clk       = "sys_32k_ck",
-       .prcm = {
-               .omap4 = {
-                       .clkctrl_offs = DRA7XX_CM_WKUPAON_WD_TIMER2_CLKCTRL_OFFSET,
-                       .context_offs = DRA7XX_RM_WKUPAON_WD_TIMER2_CONTEXT_OFFSET,
-                       .modulemode   = MODULEMODE_SWCTRL,
-               },
-       },
- };
  
  
  /*
@@@ -2090,118 -1802,6 +1802,6 @@@ static struct omap_hwmod_ocp_if dra7xx_
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
  };
  
- /* l4_per1 -> hdq1w */
- static struct omap_hwmod_ocp_if dra7xx_l4_per1__hdq1w = {
-       .master         = &dra7xx_l4_per1_hwmod,
-       .slave          = &dra7xx_hdq1w_hwmod,
-       .clk            = "l3_iclk_div",
-       .user           = OCP_USER_MPU | OCP_USER_SDMA,
- };
- /* l4_cfg -> mailbox1 */
- static struct omap_hwmod_ocp_if dra7xx_l4_cfg__mailbox1 = {
-       .master         = &dra7xx_l4_cfg_hwmod,
-       .slave          = &dra7xx_mailbox1_hwmod,
-       .clk            = "l3_iclk_div",
-       .user           = OCP_USER_MPU | OCP_USER_SDMA,
- };
- /* l4_per3 -> mailbox2 */
- static struct omap_hwmod_ocp_if dra7xx_l4_per3__mailbox2 = {
-       .master         = &dra7xx_l4_per3_hwmod,
-       .slave          = &dra7xx_mailbox2_hwmod,
-       .clk            = "l3_iclk_div",
-       .user           = OCP_USER_MPU | OCP_USER_SDMA,
- };
- /* l4_per3 -> mailbox3 */
- static struct omap_hwmod_ocp_if dra7xx_l4_per3__mailbox3 = {
-       .master         = &dra7xx_l4_per3_hwmod,
-       .slave          = &dra7xx_mailbox3_hwmod,
-       .clk            = "l3_iclk_div",
-       .user           = OCP_USER_MPU | OCP_USER_SDMA,
- };
- /* l4_per3 -> mailbox4 */
- static struct omap_hwmod_ocp_if dra7xx_l4_per3__mailbox4 = {
-       .master         = &dra7xx_l4_per3_hwmod,
-       .slave          = &dra7xx_mailbox4_hwmod,
-       .clk            = "l3_iclk_div",
-       .user           = OCP_USER_MPU | OCP_USER_SDMA,
- };
- /* l4_per3 -> mailbox5 */
- static struct omap_hwmod_ocp_if dra7xx_l4_per3__mailbox5 = {
-       .master         = &dra7xx_l4_per3_hwmod,
-       .slave          = &dra7xx_mailbox5_hwmod,
-       .clk            = "l3_iclk_div",
-       .user           = OCP_USER_MPU | OCP_USER_SDMA,
- };
- /* l4_per3 -> mailbox6 */
- static struct omap_hwmod_ocp_if dra7xx_l4_per3__mailbox6 = {
-       .master         = &dra7xx_l4_per3_hwmod,
-       .slave          = &dra7xx_mailbox6_hwmod,
-       .clk            = "l3_iclk_div",
-       .user           = OCP_USER_MPU | OCP_USER_SDMA,
- };
- /* l4_per3 -> mailbox7 */
- static struct omap_hwmod_ocp_if dra7xx_l4_per3__mailbox7 = {
-       .master         = &dra7xx_l4_per3_hwmod,
-       .slave          = &dra7xx_mailbox7_hwmod,
-       .clk            = "l3_iclk_div",
-       .user           = OCP_USER_MPU | OCP_USER_SDMA,
- };
- /* l4_per3 -> mailbox8 */
- static struct omap_hwmod_ocp_if dra7xx_l4_per3__mailbox8 = {
-       .master         = &dra7xx_l4_per3_hwmod,
-       .slave          = &dra7xx_mailbox8_hwmod,
-       .clk            = "l3_iclk_div",
-       .user           = OCP_USER_MPU | OCP_USER_SDMA,
- };
- /* l4_per3 -> mailbox9 */
- static struct omap_hwmod_ocp_if dra7xx_l4_per3__mailbox9 = {
-       .master         = &dra7xx_l4_per3_hwmod,
-       .slave          = &dra7xx_mailbox9_hwmod,
-       .clk            = "l3_iclk_div",
-       .user           = OCP_USER_MPU | OCP_USER_SDMA,
- };
- /* l4_per3 -> mailbox10 */
- static struct omap_hwmod_ocp_if dra7xx_l4_per3__mailbox10 = {
-       .master         = &dra7xx_l4_per3_hwmod,
-       .slave          = &dra7xx_mailbox10_hwmod,
-       .clk            = "l3_iclk_div",
-       .user           = OCP_USER_MPU | OCP_USER_SDMA,
- };
- /* l4_per3 -> mailbox11 */
- static struct omap_hwmod_ocp_if dra7xx_l4_per3__mailbox11 = {
-       .master         = &dra7xx_l4_per3_hwmod,
-       .slave          = &dra7xx_mailbox11_hwmod,
-       .clk            = "l3_iclk_div",
-       .user           = OCP_USER_MPU | OCP_USER_SDMA,
- };
- /* l4_per3 -> mailbox12 */
- static struct omap_hwmod_ocp_if dra7xx_l4_per3__mailbox12 = {
-       .master         = &dra7xx_l4_per3_hwmod,
-       .slave          = &dra7xx_mailbox12_hwmod,
-       .clk            = "l3_iclk_div",
-       .user           = OCP_USER_MPU | OCP_USER_SDMA,
- };
- /* l4_per3 -> mailbox13 */
- static struct omap_hwmod_ocp_if dra7xx_l4_per3__mailbox13 = {
-       .master         = &dra7xx_l4_per3_hwmod,
-       .slave          = &dra7xx_mailbox13_hwmod,
-       .clk            = "l3_iclk_div",
-       .user           = OCP_USER_MPU | OCP_USER_SDMA,
- };
  /* l4_cfg -> mpu */
  static struct omap_hwmod_ocp_if dra7xx_l4_cfg__mpu = {
        .master         = &dra7xx_l4_cfg_hwmod,
@@@ -2442,13 -2042,6 +2042,6 @@@ static struct omap_hwmod_ocp_if dra7xx_
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
  };
  
- /* l4_per1 -> rng */
- static struct omap_hwmod_ocp_if dra7xx_l4_per1__rng = {
-       .master         = &dra7xx_l4_per1_hwmod,
-       .slave          = &dra7xx_rng_hwmod,
-       .user           = OCP_USER_MPU,
- };
  /* l4_per3 -> usb_otg_ss1 */
  static struct omap_hwmod_ocp_if dra7xx_l4_per3__usb_otg_ss1 = {
        .master         = &dra7xx_l4_per3_hwmod,
@@@ -2513,14 -2106,6 +2106,6 @@@ static struct omap_hwmod_ocp_if dra7xx_
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
  };
  
- /* l4_wkup -> wd_timer2 */
- static struct omap_hwmod_ocp_if dra7xx_l4_wkup__wd_timer2 = {
-       .master         = &dra7xx_l4_wkup_hwmod,
-       .slave          = &dra7xx_wd_timer2_hwmod,
-       .clk            = "wkupaon_iclk_mux",
-       .user           = OCP_USER_MPU | OCP_USER_SDMA,
- };
  /* l4_per2 -> epwmss0 */
  static struct omap_hwmod_ocp_if dra7xx_l4_per2__epwmss0 = {
        .master         = &dra7xx_l4_per2_hwmod,
@@@ -2575,20 -2160,6 +2160,6 @@@ static struct omap_hwmod_ocp_if *dra7xx
        &dra7xx_l3_main_1__sha0,
        &dra7xx_l4_per1__elm,
        &dra7xx_l3_main_1__gpmc,
-       &dra7xx_l4_per1__hdq1w,
-       &dra7xx_l4_cfg__mailbox1,
-       &dra7xx_l4_per3__mailbox2,
-       &dra7xx_l4_per3__mailbox3,
-       &dra7xx_l4_per3__mailbox4,
-       &dra7xx_l4_per3__mailbox5,
-       &dra7xx_l4_per3__mailbox6,
-       &dra7xx_l4_per3__mailbox7,
-       &dra7xx_l4_per3__mailbox8,
-       &dra7xx_l4_per3__mailbox9,
-       &dra7xx_l4_per3__mailbox10,
-       &dra7xx_l4_per3__mailbox11,
-       &dra7xx_l4_per3__mailbox12,
-       &dra7xx_l4_per3__mailbox13,
        &dra7xx_l4_cfg__mpu,
        &dra7xx_l4_cfg__ocp2scp1,
        &dra7xx_l4_cfg__ocp2scp3,
        &dra7xx_l4_per2__vcp1,
        &dra7xx_l3_main_1__vcp2,
        &dra7xx_l4_per2__vcp2,
-       &dra7xx_l4_wkup__wd_timer2,
        &dra7xx_l4_per2__epwmss0,
        &dra7xx_l4_per2__epwmss1,
        &dra7xx_l4_per2__epwmss2,
  /* GP-only hwmod links */
  static struct omap_hwmod_ocp_if *dra7xx_gp_hwmod_ocp_ifs[] __initdata = {
        &dra7xx_l4_wkup__timer12,
-       &dra7xx_l4_per1__rng,
        NULL,
  };
  
                clock-output-names = "ext-osc32k";
        };
  
+       pmu {
+               compatible = "arm,cortex-a53-pmu";
+               interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>;
+               interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>;
+       };
        psci {
                compatible = "arm,psci-0.2";
                method = "smc";
                        reg = <0x1c14000 0x400>;
                };
  
+               crypto: crypto@1c15000 {
+                       compatible = "allwinner,sun50i-a64-crypto";
+                       reg = <0x01c15000 0x1000>;
+                       interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&ccu CLK_BUS_CE>, <&ccu CLK_CE>;
+                       clock-names = "bus", "mod";
+                       resets = <&ccu RST_BUS_CE>;
+               };
                usb_otg: usb@1c19000 {
                        compatible = "allwinner,sun8i-a33-musb";
                        reg = <0x01c19000 0x0400>;
                        resets = <&ccu RST_BUS_OHCI1>,
                                 <&ccu RST_BUS_EHCI1>;
                        phys = <&usbphy 1>;
 +                      phy-names = "usb";
                        status = "disabled";
                };
  
                                 <&ccu CLK_USB_OHCI1>;
                        resets = <&ccu RST_BUS_OHCI1>;
                        phys = <&usbphy 1>;
 +                      phy-names = "usb";
                        status = "disabled";
                };
  
        status = "okay";
  };
  
+ &gpu {
+       mali-supply = <&reg_dcdcc>;
+       status = "okay";
+ };
  &hdmi {
        status = "okay";
  };
                        };
  
                        reg_dcdcc: dcdcc {
+                               regulator-enable-ramp-delay = <32000>;
                                regulator-min-microvolt = <810000>;
                                regulator-max-microvolt = <1080000>;
                                regulator-name = "vdd-gpu";
  };
  
  &r_ir {
 +      linux,rc-map-name = "rc-beelink-gs1";
        status = "okay";
  };
  
                        allwinner,sram = <&ve_sram 1>;
                };
  
+               gpu: gpu@1800000 {
+                       compatible = "allwinner,sun50i-h6-mali",
+                                    "arm,mali-t720";
+                       reg = <0x01800000 0x4000>;
+                       interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "job", "mmu", "gpu";
+                       clocks = <&ccu CLK_GPU>, <&ccu CLK_BUS_GPU>;
+                       clock-names = "core", "bus";
+                       resets = <&ccu RST_BUS_GPU>;
+                       status = "disabled";
+               };
+               crypto: crypto@1904000 {
+                       compatible = "allwinner,sun50i-h6-crypto";
+                       reg = <0x01904000 0x1000>;
+                       interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&ccu CLK_BUS_CE>, <&ccu CLK_CE>, <&ccu CLK_MBUS_CE>;
+                       clock-names = "bus", "mod", "ram";
+                       resets = <&ccu RST_BUS_CE>;
+               };
                syscon: syscon@3000000 {
                        compatible = "allwinner,sun50i-h6-system-control",
                                     "allwinner,sun50i-a64-system-control";
                                pins = "PH0", "PH1";
                                function = "uart0";
                        };
+                       uart1_pins: uart1-pins {
+                               pins = "PG6", "PG7";
+                               function = "uart1";
+                       };
+                       uart1_rts_cts_pins: uart1-rts-cts-pins {
+                               pins = "PG8", "PG9";
+                               function = "uart1";
+                       };
                };
  
                gic: interrupt-controller@3021000 {
                        status = "disabled";
                };
  
+               dwc3: dwc3@5200000 {
+                       compatible = "snps,dwc3";
+                       reg = <0x05200000 0x10000>;
+                       interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&ccu CLK_BUS_XHCI>,
+                                <&ccu CLK_BUS_XHCI>,
+                                <&rtc 0>;
+                       clock-names = "ref", "bus_early", "suspend";
+                       resets = <&ccu RST_BUS_XHCI>;
+                       /*
+                        * The datasheet of the chip doesn't declare the
+                        * peripheral function, and there's no boards known
+                        * to have a USB Type-B port routed to the port.
+                        * In addition, no one has tested the peripheral
+                        * function yet.
+                        * So set the dr_mode to "host" in the DTSI file.
+                        */
+                       dr_mode = "host";
+                       phys = <&usb3phy>;
+                       phy-names = "usb3-phy";
+                       status = "disabled";
+               };
+               usb3phy: phy@5210000 {
+                       compatible = "allwinner,sun50i-h6-usb3-phy";
+                       reg = <0x5210000 0x10000>;
+                       clocks = <&ccu CLK_USB_PHY1>;
+                       resets = <&ccu RST_USB_PHY1>;
+                       #phy-cells = <0>;
+                       status = "disabled";
+               };
                ehci3: usb@5311000 {
                        compatible = "allwinner,sun50i-h6-ehci", "generic-ehci";
                        reg = <0x05311000 0x100>;
                        resets = <&ccu RST_BUS_OHCI3>,
                                 <&ccu RST_BUS_EHCI3>;
                        phys = <&usb2phy 3>;
 +                      phy-names = "usb";
                        status = "disabled";
                };
  
                                 <&ccu CLK_USB_OHCI3>;
                        resets = <&ccu RST_BUS_OHCI3>;
                        phys = <&usb2phy 3>;
 +                      phy-names = "usb";
                        status = "disabled";
                };
  
                                      "tcon-tv0";
                        clock-output-names = "tcon-top-tv0";
                        resets = <&ccu RST_BUS_TCON_TOP>;
-                       reset-names = "rst";
                        #clock-cells = <1>;
  
                        ports {
        status = "okay";
  
        i2c-mux@77 {
 -              compatible = "nxp,pca9847";
 +              compatible = "nxp,pca9547";
                reg = <0x77>;
                #address-cells = <1>;
                #size-cells = <0>;
        };
  
        fpga@66 {
-               #address-cells = <1>;
-               #size-cells = <0>;
                compatible = "fsl,ls1028aqds-fpga", "fsl,fpga-qixis-i2c",
                             "simple-mfd";
                reg = <0x66>;
@@@ -12,7 -12,6 +12,6 @@@
  #include "imx8mm-pinfunc.h"
  
  / {
-       compatible = "fsl,imx8mm";
        interrupt-parent = <&gic>;
        #address-cells = <2>;
        #size-cells = <2>;
                        };
  
                        sdma2: dma-controller@302c0000 {
 -                              compatible = "fsl,imx8mm-sdma", "fsl,imx7d-sdma";
 +                              compatible = "fsl,imx8mm-sdma", "fsl,imx8mq-sdma";
                                reg = <0x302c0000 0x10000>;
                                interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clk IMX8MM_CLK_SDMA2_ROOT>,
                        };
  
                        sdma3: dma-controller@302b0000 {
 -                              compatible = "fsl,imx8mm-sdma", "fsl,imx7d-sdma";
 +                              compatible = "fsl,imx8mm-sdma", "fsl,imx8mq-sdma";
                                reg = <0x302b0000 0x10000>;
                                interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clk IMX8MM_CLK_SDMA3_ROOT>,
                        };
  
                        ocotp: ocotp-ctrl@30350000 {
-                               compatible = "fsl,imx8mm-ocotp", "fsl,imx7d-ocotp", "syscon";
+                               compatible = "fsl,imx8mm-ocotp", "syscon";
                                reg = <0x30350000 0x10000>;
                                clocks = <&clk IMX8MM_CLK_OCOTP_ROOT>;
                                /* For nvmem subnodes */
                                                <&clk IMX8MM_CLK_AUDIO_AHB>,
                                                <&clk IMX8MM_CLK_IPG_AUDIO_ROOT>,
                                                <&clk IMX8MM_SYS_PLL3>,
-                                               <&clk IMX8MM_VIDEO_PLL1>;
+                                               <&clk IMX8MM_VIDEO_PLL1>,
+                                               <&clk IMX8MM_AUDIO_PLL1>,
+                                               <&clk IMX8MM_AUDIO_PLL2>;
                                assigned-clock-parents = <&clk IMX8MM_SYS_PLL3_OUT>,
                                                         <&clk IMX8MM_SYS_PLL1_800M>;
                                assigned-clock-rates = <0>,
                                                        <400000000>,
                                                        <400000000>,
                                                        <750000000>,
-                                                       <594000000>;
+                                                       <594000000>,
+                                                       <393216000>,
+                                                       <361267200>;
                        };
  
                        src: reset-controller@30390000 {
                                         <&clk IMX8MM_CLK_NAND_USDHC_BUS>,
                                         <&clk IMX8MM_CLK_USDHC1_ROOT>;
                                clock-names = "ipg", "ahb", "per";
-                               assigned-clocks = <&clk IMX8MM_CLK_USDHC1>;
-                               assigned-clock-rates = <400000000>;
                                fsl,tuning-start-tap = <20>;
                                fsl,tuning-step= <2>;
                                bus-width = <4>;
                                         <&clk IMX8MM_CLK_NAND_USDHC_BUS>,
                                         <&clk IMX8MM_CLK_USDHC3_ROOT>;
                                clock-names = "ipg", "ahb", "per";
-                               assigned-clocks = <&clk IMX8MM_CLK_USDHC3_ROOT>;
-                               assigned-clock-rates = <400000000>;
                                fsl,tuning-start-tap = <20>;
                                fsl,tuning-step= <2>;
                                bus-width = <4>;
                        };
  
                        sdma1: dma-controller@30bd0000 {
 -                              compatible = "fsl,imx8mm-sdma", "fsl,imx7d-sdma";
 +                              compatible = "fsl,imx8mm-sdma", "fsl,imx8mq-sdma";
                                reg = <0x30bd0000 0x10000>;
                                interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clk IMX8MM_CLK_SDMA1_ROOT>,
@@@ -11,7 -11,6 +11,6 @@@
  #include "imx8mn-pinfunc.h"
  
  / {
-       compatible = "fsl,imx8mn";
        interrupt-parent = <&gic>;
        #address-cells = <2>;
        #size-cells = <2>;
                #address-cells = <1>;
                #size-cells = <0>;
  
+               idle-states {
+                       entry-method = "psci";
+                       cpu_pd_wait: cpu-pd-wait {
+                               compatible = "arm,idle-state";
+                               arm,psci-suspend-param = <0x0010033>;
+                               local-timer-stop;
+                               entry-latency-us = <1000>;
+                               exit-latency-us = <700>;
+                               min-residency-us = <2700>;
+                       };
+               };
                A53_0: cpu@0 {
                        device_type = "cpu";
                        compatible = "arm,cortex-a53";
@@@ -54,6 -66,7 +66,7 @@@
                        operating-points-v2 = <&a53_opp_table>;
                        nvmem-cells = <&cpu_speed_grade>;
                        nvmem-cell-names = "speed_grade";
+                       cpu-idle-states = <&cpu_pd_wait>;
                };
  
                A53_1: cpu@1 {
@@@ -65,6 -78,7 +78,7 @@@
                        enable-method = "psci";
                        next-level-cache = <&A53_L2>;
                        operating-points-v2 = <&a53_opp_table>;
+                       cpu-idle-states = <&cpu_pd_wait>;
                };
  
                A53_2: cpu@2 {
@@@ -76,6 -90,7 +90,7 @@@
                        enable-method = "psci";
                        next-level-cache = <&A53_L2>;
                        operating-points-v2 = <&a53_opp_table>;
+                       cpu-idle-states = <&cpu_pd_wait>;
                };
  
                A53_3: cpu@3 {
                        enable-method = "psci";
                        next-level-cache = <&A53_L2>;
                        operating-points-v2 = <&a53_opp_table>;
+                       cpu-idle-states = <&cpu_pd_wait>;
                };
  
                A53_L2: l2-cache0 {
                        };
  
                        sdma3: dma-controller@302b0000 {
 -                              compatible = "fsl,imx8mn-sdma", "fsl,imx7d-sdma";
 +                              compatible = "fsl,imx8mn-sdma", "fsl,imx8mq-sdma";
                                reg = <0x302b0000 0x10000>;
                                interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clk IMX8MN_CLK_SDMA3_ROOT>,
                        };
  
                        sdma2: dma-controller@302c0000 {
 -                              compatible = "fsl,imx8mn-sdma", "fsl,imx7d-sdma";
 +                              compatible = "fsl,imx8mn-sdma", "fsl,imx8mq-sdma";
                                reg = <0x302c0000 0x10000>;
                                interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clk IMX8MN_CLK_SDMA2_ROOT>,
                        };
  
                        ocotp: ocotp-ctrl@30350000 {
-                               compatible = "fsl,imx8mn-ocotp", "fsl,imx7d-ocotp", "syscon";
+                               compatible = "fsl,imx8mn-ocotp", "fsl,imx8mm-ocotp", "syscon";
                                reg = <0x30350000 0x10000>;
                                clocks = <&clk IMX8MN_CLK_OCOTP_ROOT>;
                                #address-cells = <1>;
                        };
  
                        src: reset-controller@30390000 {
-                               compatible = "fsl,imx8mn-src", "syscon";
+                               compatible = "fsl,imx8mn-src", "fsl,imx8mq-src", "syscon";
                                reg = <0x30390000 0x10000>;
                                interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
                                #reset-cells = <1>;
                                #pwm-cells = <2>;
                                status = "disabled";
                        };
+                       system_counter: timer@306a0000 {
+                               compatible = "nxp,sysctr-timer";
+                               reg = <0x306a0000 0x20000>;
+                               interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>;
+                               clocks = <&osc_24m>;
+                               clock-names = "per";
+                       };
                };
  
                aips3: bus@30800000 {
                                         <&clk IMX8MN_CLK_NAND_USDHC_BUS>,
                                         <&clk IMX8MN_CLK_USDHC1_ROOT>;
                                clock-names = "ipg", "ahb", "per";
-                               assigned-clocks = <&clk IMX8MN_CLK_USDHC1>;
-                               assigned-clock-rates = <400000000>;
                                fsl,tuning-start-tap = <20>;
                                fsl,tuning-step= <2>;
                                bus-width = <4>;
                                         <&clk IMX8MN_CLK_NAND_USDHC_BUS>,
                                         <&clk IMX8MN_CLK_USDHC3_ROOT>;
                                clock-names = "ipg", "ahb", "per";
-                               assigned-clocks = <&clk IMX8MN_CLK_USDHC3_ROOT>;
-                               assigned-clock-rates = <400000000>;
                                fsl,tuning-start-tap = <20>;
                                fsl,tuning-step= <2>;
                                bus-width = <4>;
                        };
  
                        sdma1: dma-controller@30bd0000 {
 -                              compatible = "fsl,imx8mn-sdma", "fsl,imx7d-sdma";
 +                              compatible = "fsl,imx8mn-sdma", "fsl,imx8mq-sdma";
                                reg = <0x30bd0000 0x10000>;
                                interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clk IMX8MN_CLK_SDMA1_ROOT>,
                        interrupt-controller;
                        interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;
                };
+               ddr-pmu@3d800000 {
+                       compatible = "fsl,imx8mn-ddr-pmu", "fsl,imx8m-ddr-pmu";
+                       reg = <0x3d800000 0x400000>;
+                       interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
+               };
        };
  
        usbphynop1: usbphynop1 {
        reg_3p3_main: regulator-3p3-main {
                compatible = "regulator-fixed";
                vin-supply = <&reg_12p0_main>;
-               regulator-name = "3V3V_MAIN";
+               regulator-name = "3V3_MAIN";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               regulator-always-on;
+       };
+       reg_gen_3p3: regulator-gen-3p3 {
+               compatible = "regulator-fixed";
+               vin-supply = <&reg_3p3_main>;
+               regulator-name = "GEN_3V3";
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
                regulator-always-on;
@@@ -72,7 -81,7 +81,7 @@@
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_reg_usdhc2>;
                compatible = "regulator-fixed";
-               vin-supply = <&reg_3p3_main>;
+               vin-supply = <&reg_gen_3p3>;
                regulator-name = "3V3_SD";
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
@@@ -88,7 -97,7 +97,7 @@@
                regulator-name = "0V9_ARM";
                regulator-min-microvolt = <900000>;
                regulator-max-microvolt = <1000000>;
 -              gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>;
 +              gpios = <&gpio3 16 GPIO_ACTIVE_HIGH>;
                states = <1000000 0x1
                           900000 0x0>;
                regulator-always-on;
        pinctrl-0 = <&pinctrl_i2c1>;
        status = "okay";
  
+       accelerometer@1c {
+               compatible = "fsl,mma8451";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_accel>;
+               reg = <0x1c>;
+               interrupt-parent = <&gpio3>;
+               interrupts = <20 IRQ_TYPE_LEVEL_LOW>;
+               interrupt-names = "INT2";
+               vdd-supply = <&reg_gen_3p3>;
+               vddio-supply = <&reg_gen_3p3>;
+       };
        ucs1002: charger@32 {
                compatible = "microchip,ucs1002";
                pinctrl-names = "default";
                reg = <0x2c>;
                reset-gpios = <&gpio3 25 GPIO_ACTIVE_LOW>;
        };
+       watchdog@38 {
+               compatible = "zii,rave-wdt";
+               reg = <0x38>;
+       };
  };
  
  &i2c4 {
  };
  
  &usdhc1 {
+       assigned-clocks = <&clk IMX8MQ_CLK_USDHC1>;
+       assigned-clock-rates = <400000000>;
        pinctrl-names = "default", "state_100mhz", "state_200mhz";
        pinctrl-0 = <&pinctrl_usdhc1>;
        pinctrl-1 = <&pinctrl_usdhc1_100mhz>;
  };
  
  &usdhc2 {
+       assigned-clocks = <&clk IMX8MQ_CLK_USDHC2>;
+       assigned-clock-rates = <200000000>;
        pinctrl-names = "default", "state_100mhz", "state_200mhz";
        pinctrl-0 = <&pinctrl_usdhc2>;
        pinctrl-1 = <&pinctrl_usdhc2_100mhz>;
  };
  
  &iomuxc {
+       pinctrl_accel: accelgrp {
+               fsl,pins = <
+                       MX8MQ_IOMUXC_SAI5_RXC_GPIO3_IO20                0x41
+               >;
+       };
        pinctrl_fec1: fec1grp {
                fsl,pins = <
                        MX8MQ_IOMUXC_ENET_MDC_ENET1_MDC                 0x3
                gpio = <&gpiosb 0 GPIO_ACTIVE_HIGH>;
        };
  
 -      usb3_phy: usb3-phy {
 -              compatible = "usb-nop-xceiv";
 -              vcc-supply = <&exp_usb3_vbus>;
 -      };
 -
        vsdc_reg: vsdc-reg {
                compatible = "regulator-gpio";
                regulator-name = "vsdc";
                /* enabled by U-Boot if SFP module is present */
                status = "disabled";
        };
+       firmware {
+               turris-mox-rwtm {
+                       compatible = "cznic,turris-mox-rwtm";
+                       mboxes = <&rwtm 0>;
+                       status = "okay";
+               };
+       };
  };
  
  &i2c0 {
        status = "okay";
  };
  
 +&comphy2 {
 +      connector {
 +              compatible = "usb-a-connector";
 +              phy-supply = <&exp_usb3_vbus>;
 +      };
 +};
 +
  &usb3 {
        status = "okay";
        phys = <&comphy2 0>;
 -      usb-phy = <&usb3_phy>;
  };
  
  &mdio {
                reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
        };
  
+       sound {
+               compatible = "audio-graph-card";
+               label = "rockchip,rk3399";
+               dais = <&i2s1_p0>;
+       };
        vcc12v_dcin: vcc12v-dcin {
                compatible = "regulator-fixed";
                regulator-name = "vcc12v_dcin";
                regulator-always-on;
                regulator-boot-on;
                regulator-min-microvolt = <800000>;
 -              regulator-max-microvolt = <1400000>;
 +              regulator-max-microvolt = <1700000>;
                vin-supply = <&vcc5v0_sys>;
        };
  };
        rk808: pmic@1b {
                compatible = "rockchip,rk808";
                reg = <0x1b>;
 -              interrupt-parent = <&gpio1>;
 -              interrupts = <21 IRQ_TYPE_LEVEL_LOW>;
 +              interrupt-parent = <&gpio3>;
 +              interrupts = <10 IRQ_TYPE_LEVEL_LOW>;
                #clock-cells = <1>;
                clock-output-names = "xin32k", "rk808-clkout2";
                pinctrl-names = "default";
        i2c-scl-rising-time-ns = <300>;
        i2c-scl-falling-time-ns = <15>;
        status = "okay";
+       es8316: codec@11 {
+               compatible = "everest,es8316";
+               reg = <0x11>;
+               clocks = <&cru SCLK_I2S_8CH_OUT>;
+               clock-names = "mclk";
+               #sound-dai-cells = <0>;
+               port {
+                       es8316_p0_0: endpoint {
+                               remote-endpoint = <&i2s1_p0_0>;
+                       };
+               };
+       };
  };
  
  &i2c3 {
        rockchip,playback-channels = <2>;
        rockchip,capture-channels = <2>;
        status = "okay";
+       i2s1_p0: port {
+               i2s1_p0_0: endpoint {
+                       dai-format = "i2s";
+                       mclk-fs = <256>;
+                       remote-endpoint = <&es8316_p0_0>;
+               };
+       };
  };
  
  &i2s2 {
  
        pmic {
                pmic_int_l: pmic-int-l {
 -                      rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
 +                      rockchip,pins = <3 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>;
                };
  
                vsel1_gpio: vsel1-gpio {
  
  &sdmmc {
        bus-width = <4>;
 -      cap-mmc-highspeed;
        cap-sd-highspeed;
        cd-gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
        disable-wp;
  
  &sdhci {
        bus-width = <8>;
 -      mmc-hs400-1_8v;
 -      mmc-hs400-enhanced-strobe;
 +      mmc-hs200-1_8v;
        non-removable;
        status = "okay";
  };