]> Git Repo - linux.git/commitdiff
Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
authorLinus Torvalds <[email protected]>
Sat, 24 Oct 2020 17:44:18 +0000 (10:44 -0700)
committerLinus Torvalds <[email protected]>
Sat, 24 Oct 2020 17:44:18 +0000 (10:44 -0700)
Pull ARM Devicetree updates from Olof Johansson:
 "As usual, most of the changes are to devicetrees.

  Besides smaller fixes, some refactorings and cleanups, some of the new
  platforms and chips (or significant features) supported are below:

  Broadcom boards:
   - Cisco Meraki MR32 (BCM53016-based)
   - BCM2711 (RPi4) display pipeline support

  Actions Semi boards:
   - Caninos Loucos Labrador SBC (S500-based)
   - RoseapplePi SBC (S500-based)

  Allwinner SoCs/boards:
   - A100 SoC with Perf1 board
   - Mali, DMA, Cetrus and IR support for R40 SoC

  Amlogic boards:
   - Libretch S905x CC V2 board
   - Hardkernel ODROID-N2+ board

  Aspeed boards/platforms:
   - Wistron Mowgli (AST2500-based, Power9 OpenPower server)
   - Facebook Wedge400 (AST2500-based, ToR switch)

  Hisilicon SoC:
   - SD5203 SoC

  Nvidia boards:
   - Tegra234 VDK, for pre-silicon Orin SoC

  NXP i.MX boards:
   - Librem 5 phone
   - i.MX8MM DDR4 EVK
   - Variscite VAR-SOM-MX8MN SoM
   - Symphony board
   - Tolino Shine 2 HD
   - TQMa6 SoM
   - Y Soft IOTA Orion

  Rockchip boards:
   - NanoPi R2S board
   - A95X-Z2 board
   - more Rock-Pi4 variants

  STM32 boards:
   - Odyssey SOM board (STM32MP157CAC-based)
   - DH DRC02 board

  Toshiba SoCs/boards:
   - Visconti SoC and TPMV7708 board"

* tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (638 commits)
  ARM: dts: nspire: Fix SP804 users
  arm64: dts: lg: Fix SP804 users
  arm64: dts: lg: Fix SP805 clocks
  ARM: mstar: Fix up the fallout from moving the dts/dtsi files
  ARM: mstar: Add mstar prefix to all of the dtsi/dts files
  ARM: mstar: Add interrupt to pm_uart
  ARM: mstar: Add interrupt controller to base dtsi
  ARM: dts: meson8: remove two invalid interrupt lines from the GPU node
  arm64: dts: ti: k3-j7200-common-proc-board: Add USB support
  arm64: dts: ti: k3-j7200-common-proc-board: Configure the SERDES lane function
  arm64: dts: ti: k3-j7200-main: Add USB controller
  arm64: dts: ti: k3-j7200-main.dtsi: Add USB to SERDES lane MUX
  arm64: dts: ti: k3-j7200-main: Add SERDES lane control mux
  dt-bindings: ti-serdes-mux: Add defines for J7200 SoC
  ARM: dts: hisilicon: add SD5203 dts
  ARM: dts: hisilicon: fix the system controller compatible nodes
  arm64: dts: zynqmp: Fix leds subnode name for zcu100/ultra96 v1
  arm64: dts: zynqmp: Remove undocumented u-boot properties
  arm64: dts: zynqmp: Remove additional compatible string for i2c IPs
  arm64: dts: zynqmp: Rename buses to be align with simple-bus yaml
  ...

34 files changed:
1  2 
Documentation/devicetree/bindings/arm/actions.yaml
Documentation/devicetree/bindings/arm/qcom.yaml
Documentation/devicetree/bindings/arm/samsung/pmu.yaml
Documentation/devicetree/bindings/arm/stm32/stm32.yaml
Documentation/devicetree/bindings/arm/tegra.yaml
Documentation/devicetree/bindings/gpu/arm,mali-utgard.yaml
Documentation/devicetree/bindings/vendor-prefixes.yaml
MAINTAINERS
arch/arm/boot/dts/am33xx.dtsi
arch/arm/boot/dts/am4372.dtsi
arch/arm/boot/dts/am437x-l4.dtsi
arch/arm/boot/dts/am43x-epos-evm.dts
arch/arm/boot/dts/bcm-nsp.dtsi
arch/arm/boot/dts/bcm2711-rpi-4-b.dts
arch/arm/boot/dts/bcm5301x.dtsi
arch/arm/boot/dts/dra7-l4.dtsi
arch/arm/boot/dts/imx6q-logicpd.dts
arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
arch/arm/boot/dts/imx7d-zii-rmu2.dts
arch/arm/boot/dts/omap4.dtsi
arch/arm/boot/dts/sam9x60.dtsi
arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts
arch/arm64/Kconfig.platforms
arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi
arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi
arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
arch/arm64/boot/dts/freescale/Makefile
arch/arm64/boot/dts/freescale/imx8mp.dtsi
arch/arm64/boot/dts/freescale/imx8mq.dtsi
arch/arm64/boot/dts/nvidia/tegra186.dtsi
arch/arm64/boot/dts/nvidia/tegra194.dtsi
arch/arm64/boot/dts/nvidia/tegra210.dtsi
arch/arm64/boot/dts/qcom/sdm845.dtsi
arch/arm64/configs/defconfig

index 14023f0a8552a20d347be1e7dcbfc5fc3b70dd45,9dd6bd067f4a0f848f04cafe15f5c916433acdaa..fe22c66e9c15a3c71220db32dc2b17c5401316de
@@@ -11,8 -11,6 +11,8 @@@ maintainers
    - Manivannan Sadhasivam <[email protected]>
  
  properties:
 +  $nodename:
 +    const: "/"
    compatible:
      oneOf:
        # The Actions Semi S500 is a quad-core ARM Cortex-A9 SoC.
            - enum:
                - allo,sparky # Allo.com Sparky
                - cubietech,cubieboard6 # Cubietech CubieBoard6
+               - roseapplepi,roseapplepi # RoseapplePi.org RoseapplePi
+           - const: actions,s500
+       - items:
+           - enum:
+               - caninos,labrador-base-m # Labrador Base Board M v1
+           - const: caninos,labrador-v2  # Labrador Core v2
            - const: actions,s500
        - items:
            - enum:
            - const: actions,s500
  
        # The Actions Semi S700 is a quad-core ARM Cortex-A53 SoC.
+       - items:
+           - enum:
+               - caninos,labrador-base-m2 # Labrador Base Board M v2
+           - const: caninos,labrador-v3   # Labrador Core v3
+           - const: actions,s700
        - items:
            - enum:
                - cubietech,cubieboard7 # Cubietech CubieBoard7
index ae6284be9fef5f384a848437480f5056e8e64967,e26b1845004f6f8a0749f8189cd2cefca0cdd997..ad25deba4d8634e4a62c82c28d958b9f2c4ef463
@@@ -40,6 -40,7 +40,7 @@@ description: 
          sdm630
          sdm660
          sdm845
+         sm8250
  
    The 'board' element must be one of the following strings:
  
@@@ -47,6 -48,8 +48,8 @@@
          cp01-c1
          dragonboard
          hk01
+         hk10-c1
+         hk10-c2
          idp
          liquid
          mtp
@@@ -73,8 -76,6 +76,8 @@@
    foundry 2.
  
  properties:
 +  $nodename:
 +    const: "/"
    compatible:
      oneOf:
        - items:
        - items:
            - enum:
                - qcom,ipq8074-hk01
+               - qcom,ipq8074-hk10-c1
+               - qcom,ipq8074-hk10-c2
            - const: qcom,ipq8074
  
        - items:
                - qcom,ipq6018-cp01-c1
            - const: qcom,ipq6018
  
+       - items:
+           - enum:
+               - qcom,qrb5165-rb5
+               - qcom,sm8250-mtp
+           - const: qcom,sm8250
  ...
index cde9c5ec28c8a5342a28942489ff054ccc829028,f67c8851530eb22c0c3609be35671d3786984370..17678d9686c172ac1f88441730547efcbaf3ad05
@@@ -24,6 -24,7 +24,7 @@@ select
            - samsung,exynos5420-pmu
            - samsung,exynos5433-pmu
            - samsung,exynos7-pmu
+           - samsung-s5pv210-pmu
    required:
      - compatible
  
@@@ -40,14 -41,12 +41,15 @@@ properties
            - samsung,exynos5420-pmu
            - samsung,exynos5433-pmu
            - samsung,exynos7-pmu
+           - samsung-s5pv210-pmu
        - const: syscon
  
    reg:
      maxItems: 1
  
 +  assigned-clock-parents: true
 +  assigned-clocks: true
 +
    '#clock-cells':
      const: 1
  
  required:
    - compatible
    - reg
-   - '#clock-cells'
-   - clock-names
-   - clocks
  
  additionalProperties: false
  
+ allOf:
+   - if:
+       properties:
+         compatible:
+           contains:
+             enum:
+               - samsung,exynos3250-pmu
+               - samsung,exynos4210-pmu
+               - samsung,exynos4412-pmu
+               - samsung,exynos5250-pmu
+               - samsung,exynos5410-pmu
+               - samsung,exynos5420-pmu
+               - samsung,exynos5433-pmu
+     then:
+       required:
+         - '#clock-cells'
+         - clock-names
+         - clocks
  examples:
    - |
      #include <dt-bindings/clock/exynos5250.h>
index 696a0101ebccc786fc19235a1a4e95effa5fa0b6,3b318fe15194a0a5249b39b7ffa95a1c7434e136..deacb4e686e83968686d2f038aa10436a5286d4d
@@@ -10,8 -10,6 +10,8 @@@ maintainers
    - Alexandre Torgue <[email protected]>
  
  properties:
 +  $nodename:
 +    const: "/"
    compatible:
      oneOf:
        - items:
            - const: st,stm32mp157c-ev1
            - const: st,stm32mp157c-ed1
            - const: st,stm32mp157
+       - description: Odyssey STM32MP1 SoM based Boards
+         items:
+               - enum:
+                   - seeed,stm32mp157c-odyssey
+               - const: seeed,stm32mp157c-odyssey-som
+               - const: st,stm32mp157
  ...
index b4d53290c5f02793a8a5372950a0e44818cc1183,85006ca503a7bbd0abbfca8465dc39f5bf2b4f9f..8ae44948e8733619f54368d4dc322ba092bdfc98
@@@ -11,8 -11,6 +11,8 @@@ maintainers
    - Jonathan Hunter <[email protected]>
  
  properties:
 +  $nodename:
 +    const: "/"
    compatible:
      oneOf:
        - items:
          items:
            - const: nvidia,p3509-0000+p3668-0000
            - const: nvidia,tegra194
+       - items:
+           - enum:
+               - nvidia,tegra234-vdk
+           - const: nvidia,tegra234
index 53708fe9e0047abec626cd680e3ae02566ecc8e6,d4d785790eaafd8a74c749d679e7ba5c73bbad6e..eceaa176bd57e29c0ea2d01ac8869bc00090d5a7
@@@ -8,7 -8,7 +8,7 @@@ title: ARM Mali Utgard GP
  
  maintainers:
    - Rob Herring <[email protected]>
 -  - Maxime Ripard <m[email protected]>
 +  - Maxime Ripard <m[email protected]>
    - Heiko Stuebner <[email protected]>
  
  properties:
@@@ -25,6 -25,7 +25,7 @@@
                - allwinner,sun4i-a10-mali
                - allwinner,sun7i-a20-mali
                - allwinner,sun8i-h3-mali
+               - allwinner,sun8i-r40-mali
                - allwinner,sun50i-a64-mali
                - rockchip,rk3036-mali
                - rockchip,rk3066-mali
  
    mali-supply: true
  
 +  opp-table: true
 +
    power-domains:
      maxItems: 1
  
@@@ -131,6 -130,7 +132,7 @@@ allOf
              enum:
                - allwinner,sun4i-a10-mali
                - allwinner,sun7i-a20-mali
+               - allwinner,sun8i-r40-mali
                - allwinner,sun50i-a64-mali
                - allwinner,sun50i-h5-mali
                - amlogic,meson8-mali
index 07bdfdd7b31c1fb01fa5618aba5124df26bc6883,639137945c3c9528ab8f52015ab7fd4d56411c35..2735be1a84709587e36ef3f0cb855d14ad6c0391
@@@ -179,6 -179,8 +179,8 @@@ patternProperties
      description: CALAO Systems SAS
    "^calxeda,.*":
      description: Calxeda
+   "^caninos,.*":
+     description: Caninos Loucos Program
    "^capella,.*":
      description: Capella Microsystems, Inc
    "^cascoda,.*":
      description: Ceva, Inc.
    "^checkpoint,.*":
      description: Check Point Software Technologies Ltd.
 +  "^chefree,.*":
 +    description: Chefree Technology Corp.
    "^chipidea,.*":
      description: Chipidea, Inc
    "^chipone,.*":
      description: Denx Software Engineering
    "^devantech,.*":
      description: Devantech, Ltd.
 +  "^dfi,.*":
 +    description: DFI Inc.
    "^dh,.*":
      description: DH electronics GmbH
    "^difrnce,.*":
      description: Gumstix, Inc.
    "^gw,.*":
      description: Gateworks Corporation
 +                 use "gateworks" vendor prefix
 +    deprecated: true
    "^hannstar,.*":
      description: HannStar Display Corporation
    "^haoyu,.*":
      description: Logic Technologies Limited
    "^longcheer,.*":
      description: Longcheer Technology (Shanghai) Co., Ltd.
 +  "^lontium,.*":
 +    description: Lontium Semiconductor Corporation
    "^loongson,.*":
      description: Loongson Technology Corporation Limited
    "^lsi,.*":
      description: Linux Automation GmbH
    "^macnica,.*":
      description: Macnica Americas
 +  "^mantix,.*":
 +    description: Mantix Display Technology Co.,Ltd.
    "^mapleboard,.*":
      description: Mapleboard.org
    "^marvell,.*":
      description: MEMSIC Inc.
    "^menlo,.*":
      description: Menlo Systems GmbH
 +  "^meraki,.*":
 +    description: Cisco Meraki, LLC
    "^merrii,.*":
      description: Merrii Technology Co., Ltd.
    "^micrel,.*":
      description: Poslab Technology Co., Ltd.
    "^pov,.*":
      description: Point of View International B.V.
 +  "^powertip,.*":
 +    description: Powertip Tech. Corp.
    "^powervr,.*":
      description: PowerVR (deprecated, use img)
    "^primux,.*":
      description: Realtek Semiconductor Corp.
    "^renesas,.*":
      description: Renesas Electronics Corporation
 +  "^rex,.*":
 +    description: iMX6 Rex Project
    "^rervision,.*":
      description: Shenzhen Rervision Technology Co., Ltd.
    "^richtek,.*":
      description: Rikomagic Tech Corp. Ltd
    "^riscv,.*":
      description: RISC-V Foundation
 +  "^riot,.*":
 +    description: Embest RIoT
    "^rockchip,.*":
      description: Fuzhou Rockchip Electronics Co., Ltd
    "^rocktech,.*":
      description: Ronbo Electronics
    "^roofull,.*":
      description: Shenzhen Roofull Technology Co, Ltd
+   "^roseapplepi,.*":
+     description: RoseapplePi.org
    "^samsung,.*":
      description: Samsung Semiconductor
    "^samtec,.*":
      description: Schindler
    "^seagate,.*":
      description: Seagate Technology PLC
+   "^seeed,.*":
+     description: Seeed Technology Co., Ltd
    "^seirobotics,.*":
      description: Shenzhen SEI Robotics Co., Ltd
    "^semtech,.*":
      description: Vision Optical Technology Co., Ltd.
    "^vxt,.*":
      description: VXT Ltd
 +  "^wand,.*":
 +    description: Wandbord (Technexion)
    "^waveshare,.*":
      description: Waveshare Electronics
    "^wd,.*":
      description: Shenzhen Xingbangda Display Technology Co., Ltd
    "^xinpeng,.*":
      description: Shenzhen Xinpeng Technology Co., Ltd
 +  "^xiphera,.*":
 +    description: Xiphera Ltd.
    "^xlnx,.*":
      description: Xilinx
    "^xnano,.*":
      description: Yones Toptech Co., Ltd.
    "^ysoft,.*":
      description: Y Soft Corporation a.s.
 +  "^zealz,.*":
 +    description: Zealz
    "^zarlink,.*":
      description: Zarlink Semiconductor
    "^zeitec,.*":
      description: Shenzhen Zidoo Technology Co., Ltd.
    "^zii,.*":
      description: Zodiac Inflight Innovations
 +  "^zinitix,.*":
 +    description: Zinitix Co., Ltd
+   "^zkmagic,.*":
+     description: Shenzhen Zkmagic Technology Co., Ltd.
    "^zte,.*":
      description: ZTE Corp.
    "^zyxel,.*":
diff --combined MAINTAINERS
index bfa9054a8c341f72a95f30702437fcd3b3ec1e13,b681f699e1f7164336475f7eb6af1d2560580d42..e73636b75f29de8644c5c260b60f029e36df635a
@@@ -405,7 -405,7 +405,7 @@@ F: drivers/platform/x86/i2c-multi-insta
  ACPI PMIC DRIVERS
  M:    "Rafael J. Wysocki" <[email protected]>
  M:    Len Brown <[email protected]>
 -R:    Andy Shevchenko <and[email protected]>
 +R:    Andy Shevchenko <and[email protected]>
  R:    Mika Westerberg <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -802,13 -802,6 +802,13 @@@ S:       Maintaine
  F:    Documentation/devicetree/bindings/interrupt-controller/amazon,al-fic.txt
  F:    drivers/irqchip/irq-al-fic.c
  
 +AMAZON ANNAPURNA LABS MEMORY CONTROLLER EDAC
 +M:    Talel Shenhar <[email protected]>
 +M:    Talel Shenhar <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/edac/amazon,al-mc-edac.yaml
 +F:    drivers/edac/al_mc_edac.c
 +
  AMAZON ANNAPURNA LABS THERMAL MMIO DRIVER
  M:    Talel Shenhar <[email protected]>
  S:    Maintained
@@@ -950,12 -943,37 +950,12 @@@ S:      Supporte
  F:    arch/arm64/boot/dts/amd/amd-seattle-xgbe*.dtsi
  F:    drivers/net/ethernet/amd/xgbe/
  
 -ANALOG DEVICES INC AD5686 DRIVER
 -M:    Michael Hennerich <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 -F:    drivers/iio/dac/ad5686*
 -F:    drivers/iio/dac/ad5696*
 -
 -ANALOG DEVICES INC AD5758 DRIVER
 -M:    Michael Hennerich <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 -F:    Documentation/devicetree/bindings/iio/dac/ad5758.txt
 -F:    drivers/iio/dac/ad5758.c
 -
 -ANALOG DEVICES INC AD7091R5 DRIVER
 -M:    Beniamin Bia <[email protected]>
 +AMS AS73211 DRIVER
 +M:    Christian Eggers <[email protected]>
  L:    [email protected]
 -S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 -F:    Documentation/devicetree/bindings/iio/adc/adi,ad7091r5.yaml
 -F:    drivers/iio/adc/ad7091r5.c
 -
 -ANALOG DEVICES INC AD7124 DRIVER
 -M:    Michael Hennerich <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 -F:    Documentation/devicetree/bindings/iio/adc/adi,ad7124.yaml
 -F:    drivers/iio/adc/ad7124.c
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/iio/light/ams,as73211.yaml
 +F:    drivers/iio/light/as73211.c
  
  ANALOG DEVICES INC AD7192 DRIVER
  M:    Alexandru Tachici <[email protected]>
@@@ -973,6 -991,15 +973,6 @@@ W:        http://ez.analog.com/community/linux
  F:    Documentation/devicetree/bindings/iio/adc/adi,ad7292.yaml
  F:    drivers/iio/adc/ad7292.c
  
 -ANALOG DEVICES INC AD7606 DRIVER
 -M:    Michael Hennerich <[email protected]>
 -M:    Beniamin Bia <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 -F:    Documentation/devicetree/bindings/iio/adc/adi,ad7606.yaml
 -F:    drivers/iio/adc/ad7606.c
 -
  ANALOG DEVICES INC AD7768-1 DRIVER
  M:    Michael Hennerich <[email protected]>
  L:    [email protected]
@@@ -1034,6 -1061,7 +1034,6 @@@ F:      drivers/iio/imu/adis16475.
  F:    Documentation/devicetree/bindings/iio/imu/adi,adis16475.yaml
  
  ANALOG DEVICES INC ADM1177 DRIVER
 -M:    Beniamin Bia <[email protected]>
  M:    Michael Hennerich <[email protected]>
  L:    [email protected]
  S:    Supported
  S:    Maintained
  F:    drivers/media/i2c/adv7842*
  
 +ANALOG DEVICES INC ADXRS290 DRIVER
 +M:    Nishant Malpani <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/iio/gyro/adxrs290.c
 +F:    Documentation/devicetree/bindings/iio/gyroscope/adi,adxrs290.yaml
 +
  ANALOG DEVICES INC ASOC CODEC DRIVERS
  M:    Lars-Peter Clausen <[email protected]>
  M:    Nuno Sá <[email protected]>
@@@ -1107,6 -1128,15 +1107,6 @@@ S:     Supporte
  W:    http://ez.analog.com/community/linux-device-drivers
  F:    drivers/dma/dma-axi-dmac.c
  
 -ANALOG DEVICES INC HMC425A DRIVER
 -M:    Beniamin Bia <[email protected]>
 -M:    Michael Hennerich <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 -F:    Documentation/devicetree/bindings/iio/amplifiers/adi,hmc425a.yaml
 -F:    drivers/iio/amplifiers/hmc425a.c
 -
  ANALOG DEVICES INC IIO DRIVERS
  M:    Lars-Peter Clausen <[email protected]>
  M:    Michael Hennerich <[email protected]>
@@@ -1115,11 -1145,8 +1115,11 @@@ W:    http://wiki.analog.com
  W:    http://ez.analog.com/community/linux-device-drivers
  F:    Documentation/ABI/testing/sysfs-bus-iio-frequency-ad9523
  F:    Documentation/ABI/testing/sysfs-bus-iio-frequency-adf4350
 +F:    Documentation/devicetree/bindings/iio/*/adi,*
 +F:    Documentation/devicetree/bindings/iio/dac/ad5758.txt
  F:    drivers/iio/*/ad*
  F:    drivers/iio/adc/ltc249*
 +F:    drivers/iio/amplifiers/hmc425a.c
  F:    drivers/staging/iio/*/ad*
  X:    drivers/iio/*/adjd*
  
@@@ -1259,7 -1286,7 +1259,7 @@@ S:      Supporte
  F:    Documentation/devicetree/bindings/net/apm-xgene-enet.txt
  F:    Documentation/devicetree/bindings/net/apm-xgene-mdio.txt
  F:    drivers/net/ethernet/apm/xgene/
 -F:    drivers/net/phy/mdio-xgene.c
 +F:    drivers/net/mdio/mdio-xgene.c
  
  APPLIED MICRO (APM) X-GENE SOC PMU
  M:    Khuong Dinh <[email protected]>
@@@ -1433,11 -1460,6 +1433,11 @@@ S:    Odd Fixe
  F:    drivers/amba/
  F:    include/linux/amba/bus.h
  
 +ARM PRIMECELL CLCD PL110 DRIVER
 +M:    Russell King <[email protected]>
 +S:    Odd Fixes
 +F:    drivers/video/fbdev/amba-clcd.*
 +
  ARM PRIMECELL KMI PL050 DRIVER
  M:    Russell King <[email protected]>
  S:    Odd Fixes
@@@ -1484,7 -1506,8 +1484,7 @@@ L:      [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/iommu/arm,smmu*
  F:    drivers/iommu/arm/
 -F:    drivers/iommu/io-pgtable-arm-v7s.c
 -F:    drivers/iommu/io-pgtable-arm.c
 +F:    drivers/iommu/io-pgtable-arm*
  
  ARM SUB-ARCHITECTURES
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/arm/actions.yaml
  F:    Documentation/devicetree/bindings/clock/actions,owl-cmu.txt
 -F:    Documentation/devicetree/bindings/dma/owl-dma.txt
 +F:    Documentation/devicetree/bindings/dma/owl-dma.yaml
  F:    Documentation/devicetree/bindings/i2c/i2c-owl.txt
 +F:    Documentation/devicetree/bindings/interrupt-controller/actions,owl-sirq.yaml
  F:    Documentation/devicetree/bindings/mmc/owl-mmc.yaml
 -F:    Documentation/devicetree/bindings/pinctrl/actions,s900-pinctrl.txt
 +F:    Documentation/devicetree/bindings/pinctrl/actions,*
  F:    Documentation/devicetree/bindings/power/actions,owl-sps.txt
  F:    Documentation/devicetree/bindings/timer/actions,owl-timer.txt
  F:    arch/arm/boot/dts/owl-*
@@@ -1514,7 -1536,6 +1514,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/irqchip/irq-owl-sirq.c
  F:    drivers/mmc/host/owl-mmc.c
  F:    drivers/pinctrl/actions/*
  F:    drivers/soc/actions/
@@@ -1602,7 -1623,7 +1602,7 @@@ N:      meso
  
  ARM/Annapurna Labs ALPINE ARCHITECTURE
  M:    Tsahee Zidenberg <[email protected]>
 -M:    Antoine Tenart <a[email protected]>
 +M:    Antoine Tenart <a[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/boot/dts/alpine*
@@@ -1673,6 -1694,7 +1673,6 @@@ F:      arch/arm/mach-cns3xxx
  
  ARM/CAVIUM THUNDER NETWORK DRIVER
  M:    Sunil Goutham <[email protected]>
 -M:    Robert Richter <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    drivers/net/ethernet/cavium/thunder/
@@@ -1725,7 -1747,6 +1725,7 @@@ ARM/CORESIGHT FRAMEWORK AND DRIVER
  M:    Mathieu Poirier <[email protected]>
  R:    Suzuki K Poulose <[email protected]>
  R:    Mike Leach <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-bus-coresight-devices-*
@@@ -2115,6 -2136,7 +2115,7 @@@ M:      Steen Hegelund <Steen.Hegelund@micro
  M:    Microchip Linux Driver Support <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
+ T:    git git://github.com/microchip-ung/linux-upstream.git
  F:    arch/arm64/boot/dts/microchip/
  N:    sparx5
  
@@@ -2130,9 -2152,7 +2131,7 @@@ L:      [email protected]
  S:    Maintained
  W:    http://linux-chenxing.org/
  F:    Documentation/devicetree/bindings/arm/mstar/*
- F:    arch/arm/boot/dts/infinity*.dtsi
- F:    arch/arm/boot/dts/mercury*.dtsi
- F:    arch/arm/boot/dts/mstar-v7.dtsi
+ F:    arch/arm/boot/dts/mstar-*
  F:    arch/arm/mach-mstar/
  
  ARM/NEC MOBILEPRO 900/c MACHINE SUPPORT
@@@ -2199,8 -2219,8 +2198,8 @@@ ARM/OPENMOKO NEO FREERUNNER (GTA02) MAC
  L:    [email protected] (subscribers-only)
  S:    Orphan
  W:    http://wiki.openmoko.org/wiki/Neo_FreeRunner
 -F:    arch/arm/mach-s3c24xx/gta02.h
 -F:    arch/arm/mach-s3c24xx/mach-gta02.c
 +F:    arch/arm/mach-s3c/gta02.h
 +F:    arch/arm/mach-s3c/mach-gta02.c
  
  ARM/Orion SoC/Technologic Systems TS-78xx platform support
  M:    Alexander Clouter <[email protected]>
@@@ -2379,7 -2399,7 +2378,7 @@@ ARM/SAMSUNG EXYNOS ARM ARCHITECTURE
  M:    Kukjin Kim <[email protected]>
  M:    Krzysztof Kozlowski <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  Q:    https://patchwork.kernel.org/project/linux-samsung-soc/list/
  F:    Documentation/arm/samsung/
@@@ -2389,8 -2409,10 +2388,8 @@@ F:     arch/arm/boot/dts/exynos
  F:    arch/arm/boot/dts/s3c*
  F:    arch/arm/boot/dts/s5p*
  F:    arch/arm/mach-exynos*/
 -F:    arch/arm/mach-s3c24*/
 -F:    arch/arm/mach-s3c64xx/
 +F:    arch/arm/mach-s3c/
  F:    arch/arm/mach-s5p*/
 -F:    arch/arm/plat-samsung/
  F:    arch/arm64/boot/dts/exynos/
  F:    drivers/*/*/*s3c24*
  F:    drivers/*/*s3c24*
@@@ -2401,9 -2423,6 +2400,9 @@@ F:      drivers/soc/samsung
  F:    drivers/tty/serial/samsung*
  F:    include/linux/soc/samsung/
  N:    exynos
 +N:    s3c2410
 +N:    s3c64xx
 +N:    s5pv210
  
  ARM/SAMSUNG MOBILE MACHINE SUPPORT
  M:    Kyungmin Park <[email protected]>
@@@ -2422,11 -2441,11 +2421,11 @@@ F:   drivers/media/platform/s5p-g2d
  
  ARM/SAMSUNG S5P SERIES HDMI CEC SUBSYSTEM SUPPORT
  M:    Marek Szyprowski <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/s5p-cec.txt
 -F:    drivers/media/platform/s5p-cec/
 +F:    drivers/media/cec/platform/s5p/
  
  ARM/SAMSUNG S5P SERIES JPEG CODEC SUPPORT
  M:    Andrzej Pietrasiewicz <[email protected]>
@@@ -2485,7 -2504,7 +2484,7 @@@ S:      Maintaine
  F:    drivers/clk/socfpga/
  
  ARM/SOCFPGA EDAC SUPPORT
 -M:    Thor Thayer <[email protected]>
 +M:    Dinh Nguyen <[email protected]>
  S:    Maintained
  F:    drivers/edac/altera_edac.
  
@@@ -2571,7 -2590,7 +2570,7 @@@ L:      [email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/tegra-cec.txt
 -F:    drivers/media/platform/tegra-cec/
 +F:    drivers/media/cec/platform/tegra/
  
  ARM/TETON BGA MACHINE SUPPORT
  M:    "Mark F. Brown" <[email protected]>
@@@ -2616,7 -2635,7 +2615,7 @@@ M:      Tero Kristo <[email protected]
  M:    Nishanth Menon <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
- F:    Documentation/devicetree/bindings/arm/ti/k3.txt
+ F:    Documentation/devicetree/bindings/arm/ti/k3.yaml
  F:    arch/arm64/boot/dts/ti/Makefile
  F:    arch/arm64/boot/dts/ti/k3-*
  F:    include/dt-bindings/pinctrl/k3.h
@@@ -2631,6 -2650,17 +2630,17 @@@ M:    Dmitry Eremin-Solenikov <dbaryshkov@
  M:    Dirk Opfer <[email protected]>
  S:    Maintained
  
+ ARM/TOSHIBA VISCONTI ARCHITECTURE
+ M:    Nobuhiro Iwamatsu <[email protected]>
+ L:    [email protected] (moderated for non-subscribers)
+ S:    Supported
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/iwamatsu/linux-visconti.git
+ F:    Documentation/devicetree/bindings/arm/toshiba.yaml
+ F:    Documentation/devicetree/bindings/pinctrl/toshiba,tmpv7700-pinctrl.yaml
+ F:    arch/arm64/boot/dts/toshiba/
+ F:    drivers/pinctrl/visconti/
+ N:    visconti
  ARM/UNIPHIER ARCHITECTURE
  M:    Masahiro Yamada <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -3239,14 -3269,13 +3249,14 @@@ M:   Daniel Borkmann <[email protected]
  R:    Martin KaFai Lau <[email protected]>
  R:    Song Liu <[email protected]>
  R:    Yonghong Song <[email protected]>
 -R:    Andrii Nakryiko <andrii[email protected]>
 +R:    Andrii Nakryiko <andrii@kernel.org>
  R:    John Fastabend <[email protected]>
  R:    KP Singh <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
 -Q:    https://patchwork.ozlabs.org/project/netdev/list/?delegate=77147
 +W:    https://bpf.io/
 +Q:    https://patchwork.kernel.org/project/netdevbpf/list/?delegate=121173
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git
  F:    Documentation/bpf/
@@@ -3370,7 -3399,6 +3380,7 @@@ M:      Florian Fainelli <[email protected]
  L:    [email protected]
  L:    [email protected] (subscribers-only)
  S:    Supported
 +F:    Documentation/devicetree/bindings/net/dsa/b53.txt
  F:    drivers/net/dsa/b53/*
  F:    include/linux/platform_data/b53.h
  
@@@ -3416,7 -3444,7 +3426,7 @@@ M:      [email protected]
  L:    [email protected]
  S:    Maintained
  F:    arch/arm/boot/dts/bcm470*
 -F:    arch/arm/boot/dts/bcm5301x*.dtsi
 +F:    arch/arm/boot/dts/bcm5301*
  F:    arch/arm/boot/dts/bcm953012*
  F:    arch/arm/mach-bcm/bcm_5301x.c
  
@@@ -3457,14 -3485,6 +3467,14 @@@ F:    drivers/bus/brcmstb_gisb.
  F:    drivers/pci/controller/pcie-brcmstb.c
  N:    brcmstb
  
 +BROADCOM BDC DRIVER
 +M:    Al Cooper <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/usb/brcm,bdc.txt
 +F:    drivers/usb/gadget/udc/bdc/
 +
  BROADCOM BMIPS CPUFREQ DRIVER
  M:    Markus Mayer <[email protected]>
  M:    [email protected]
@@@ -3482,7 -3502,6 +3492,7 @@@ F:      arch/mips/bmips/
  F:    arch/mips/boot/dts/brcm/bcm*.dts*
  F:    arch/mips/include/asm/mach-bmips/*
  F:    arch/mips/kernel/*bmips*
 +F:    drivers/soc/bcm/bcm63xx
  F:    drivers/irqchip/irq-bcm63*
  F:    drivers/irqchip/irq-bcm7*
  F:    drivers/irqchip/irq-brcmstb*
@@@ -3498,17 -3517,13 +3508,17 @@@ F:   drivers/net/ethernet/broadcom/bnx2.
  F:    drivers/net/ethernet/broadcom/bnx2_*
  
  BROADCOM BNX2FC 10 GIGABIT FCOE DRIVER
 -M:    [email protected]
 +M:    Saurav Kashyap <[email protected]>
 +M:    Javed Hasan <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/scsi/bnx2fc/
  
  BROADCOM BNX2I 1/10 GIGABIT iSCSI DRIVER
 -M:    [email protected]
 +M:    Nilesh Javali <[email protected]>
 +M:    Manish Rangankar <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/scsi/bnx2i/
  S:    Maintained
  F:    drivers/phy/broadcom/phy-brcm-usb*
  
 +BROADCOM ETHERNET PHY DRIVERS
 +M:    Florian Fainelli <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/devicetree/bindings/net/broadcom-bcm87xx.txt
 +F:    drivers/net/phy/bcm*.[ch]
 +F:    drivers/net/phy/broadcom.c
 +F:    include/linux/brcmphy.h
 +
  BROADCOM GENET ETHERNET DRIVER
  M:    Doug Berger <[email protected]>
  M:    Florian Fainelli <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
 +F:    Documentation/devicetree/bindings/net/brcm,bcmgenet.txt
 +F:    Documentation/devicetree/bindings/net/brcm,unimac-mdio.txt
  F:    drivers/net/ethernet/broadcom/genet/
 +F:    drivers/net/mdio/mdio-bcm-unimac.c
 +F:    include/linux/platform_data/bcmgenet.h
 +F:    include/linux/platform_data/mdio-bcm-unimac.h
  
  BROADCOM IPROC ARM ARCHITECTURE
  M:    Ray Jui <[email protected]>
@@@ -3843,16 -3843,6 +3853,16 @@@ S:    Orpha
  F:    Documentation/devicetree/bindings/mtd/cadence-nand-controller.txt
  F:    drivers/mtd/nand/raw/cadence-nand-controller.c
  
 +CADENCE USB3 DRD IP DRIVER
 +M:    Peter Chen <[email protected]>
 +M:    Pawel Laszczak <[email protected]>
 +M:    Roger Quadros <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
 +F:    Documentation/devicetree/bindings/usb/cdns-usb3.txt
 +F:    drivers/usb/cdns3/
 +
  CADET FM/AM RADIO RECEIVER DRIVER
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
@@@ -3917,7 -3907,6 +3927,7 @@@ F:      include/net/netns/can.
  F:    include/uapi/linux/can.h
  F:    include/uapi/linux/can/bcm.h
  F:    include/uapi/linux/can/gw.h
 +F:    include/uapi/linux/can/isotp.h
  F:    include/uapi/linux/can/raw.h
  F:    net/can/
  
@@@ -3953,8 -3942,8 +3963,8 @@@ W:      https://wireless.wiki.kernel.org/en/
  F:    drivers/net/wireless/ath/carl9170/
  
  CAVIUM I2C DRIVER
 -M:    Robert Richter <rric[email protected]>
 -S:    Supported
 +M:    Robert Richter <rric@kernel.org>
 +S:    Odd Fixes
  W:    http://www.marvell.com
  F:    drivers/i2c/busses/i2c-octeon*
  F:    drivers/i2c/busses/i2c-thunderx*
@@@ -3969,8 -3958,8 +3979,8 @@@ W:      http://www.marvell.co
  F:    drivers/net/ethernet/cavium/liquidio/
  
  CAVIUM MMC DRIVER
 -M:    Robert Richter <rric[email protected]>
 -S:    Supported
 +M:    Robert Richter <rric@kernel.org>
 +S:    Odd Fixes
  W:    http://www.marvell.com
  F:    drivers/mmc/host/cavium*
  
@@@ -3982,9 -3971,9 +3992,9 @@@ W:      http://www.marvell.co
  F:    drivers/crypto/cavium/cpt/
  
  CAVIUM THUNDERX2 ARM64 SOC
 -M:    Robert Richter <rric[email protected]>
 +M:    Robert Richter <rric@kernel.org>
  L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 +S:    Odd Fixes
  F:    Documentation/devicetree/bindings/arm/cavium-thunder2.txt
  F:    arch/arm64/boot/dts/cavium/thunder2-99xx*
  
@@@ -4036,7 -4025,7 +4046,7 @@@ S:      Supporte
  W:    http://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/cec-gpio.txt
 -F:    drivers/media/platform/cec-gpio/
 +F:    drivers/media/cec/platform/cec-gpio/
  
  CELL BROADBAND ENGINE ARCHITECTURE
  M:    Arnd Bergmann <[email protected]>
@@@ -4106,11 -4095,6 +4116,11 @@@ T:    git git://git.kernel.org/pub/scm/lin
  F:    drivers/char/
  F:    drivers/misc/
  F:    include/linux/miscdevice.h
 +X:    drivers/char/agp/
 +X:    drivers/char/hw_random/
 +X:    drivers/char/ipmi/
 +X:    drivers/char/random.c
 +X:    drivers/char/tpm/
  
  CHECKPATCH
  M:    Andy Whitcroft <[email protected]>
@@@ -4181,7 -4165,6 +4191,7 @@@ CIRRUS LOGIC AUDIO CODEC DRIVER
  M:    James Schulman <[email protected]>
  M:    David Rhodes <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  F:    sound/soc/codecs/cs*
  
@@@ -4259,6 -4242,7 +4269,6 @@@ F:      drivers/net/ethernet/cisco/enic
  CISCO VIC LOW LATENCY NIC DRIVER
  M:    Christian Benvenuti <[email protected]>
  M:    Nelson Escobar <[email protected]>
 -M:    Parvi Kaustubhi <[email protected]>
  S:    Supported
  F:    drivers/infiniband/hw/usnic/
  
@@@ -4268,15 -4252,12 +4278,15 @@@ S:   Maintaine
  F:    .clang-format
  
  CLANG/LLVM BUILD SUPPORT
 +M:    Nathan Chancellor <[email protected]>
 +M:    Nick Desaulniers <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    https://clangbuiltlinux.github.io/
  B:    https://github.com/ClangBuiltLinux/linux/issues
  C:    irc://chat.freenode.net/clangbuiltlinux
  F:    Documentation/kbuild/llvm.rst
 +F:    scripts/clang-tools/
  K:    \b(?i:clang|llvm)\b
  
  CLEANCACHE API
@@@ -4419,7 -4400,12 +4429,7 @@@ S:     Supporte
  T:    git git://git.infradead.org/users/hch/configfs.git
  F:    fs/configfs/
  F:    include/linux/configfs.h
 -
 -CONNECTOR
 -M:    Evgeniy Polyakov <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/connector/
 +F:    samples/configfs/
  
  CONSOLE SUBSYSTEM
  M:    Greg Kroah-Hartman <[email protected]>
  S:    Supported
  F:    drivers/cpuidle/cpuidle-psci.c
  
 +CPUIDLE DRIVER - ARM PSCI PM DOMAIN
 +M:    Ulf Hansson <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/cpuidle/cpuidle-psci.h
 +F:    drivers/cpuidle/cpuidle-psci-domain.c
 +
  CRAMFS FILESYSTEM
  M:    Nicolas Pitre <[email protected]>
  S:    Maintained
@@@ -4725,15 -4703,6 +4735,15 @@@ S:    Supporte
  W:    http://www.chelsio.com
  F:    drivers/crypto/chelsio
  
 +CXGB4 INLINE CRYPTO DRIVER
 +M:    Ayush Sawal <[email protected]>
 +M:    Vinay Kumar Yadav <[email protected]>
 +M:    Rohit Maheshwari <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +W:    http://www.chelsio.com
 +F:    drivers/net/ethernet/chelsio/inline_crypto/
 +
  CXGB4 ETHERNET DRIVER (CXGB4)
  M:    Vishal Kulkarni <[email protected]>
  L:    [email protected]
@@@ -5036,12 -5005,6 +5046,12 @@@ S:    Maintaine
  F:    drivers/base/devcoredump.c
  F:    include/linux/devcoredump.h
  
 +DEVICE DEPENDENCY HELPER SCRIPT
 +M:    Saravana Kannan <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    scripts/dev-needs.sh
 +
  DEVICE DIRECT ACCESS (DAX)
  M:    Dan Williams <[email protected]>
  M:    Vishal Verma <[email protected]>
@@@ -5238,11 -5201,12 +5248,11 @@@ T:   git git://git.infradead.org/users/hc
  F:    include/asm-generic/dma-mapping.h
  F:    include/linux/dma-direct.h
  F:    include/linux/dma-mapping.h
 -F:    include/linux/dma-noncoherent.h
 +F:    include/linux/dma-map-ops.h
  F:    kernel/dma/
  
  DMA-BUF HEAPS FRAMEWORK
  M:    Sumit Semwal <[email protected]>
 -R:    Andrew F. Davis <[email protected]>
  R:    Benjamin Gaignard <[email protected]>
  R:    Liam Mark <[email protected]>
  R:    Laura Abbott <[email protected]>
@@@ -5286,7 -5250,6 +5296,7 @@@ DOCUMENTATIO
  M:    Jonathan Corbet <[email protected]>
  L:    [email protected]
  S:    Maintained
 +P:    Documentation/doc-guide/maintainer-profile.rst
  T:    git git://git.lwn.net/linux.git docs-next
  F:    Documentation/
  F:    scripts/documentation-file-ref-check
@@@ -5408,11 -5371,12 +5418,11 @@@ F:   include/linux/debugfs.
  F:    include/linux/kobj*
  F:    lib/kobj*
  
 -DRIVERS FOR ADAPTIVE VOLTAGE SCALING (AVS)
 -M:    Kevin Hilman <[email protected]>
 +DRIVERS FOR OMAP ADAPTIVE VOLTAGE SCALING (AVS)
  M:    Nishanth Menon <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/power/avs/
 +F:    drivers/soc/ti/smartreflex.c
  F:    include/linux/power/smartreflex.h
  
  DRM DRIVER FOR ALLWINNER DE2 AND DE3 ENGINE
@@@ -5439,7 -5403,7 +5449,7 @@@ F:      drivers/gpu/drm/panel/panel-arm-vers
  
  DRM DRIVER FOR ASPEED BMC GFX
  M:    Joel Stanley <[email protected]>
 -L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    Documentation/devicetree/bindings/gpu/aspeed-gfx.txt
@@@ -5447,10 -5411,7 +5457,10 @@@ F:    drivers/gpu/drm/aspeed
  
  DRM DRIVER FOR AST SERVER GRAPHICS CHIPS
  M:    Dave Airlie <[email protected]>
 -S:    Odd Fixes
 +R:    Thomas Zimmermann <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    drivers/gpu/drm/ast/
  
  DRM DRIVER FOR BOCHS VIRTUAL GPU
@@@ -5524,24 -5485,14 +5534,24 @@@ S:   Maintaine
  F:    drivers/gpu/drm/panel/panel-lvds.c
  F:    Documentation/devicetree/bindings/display/panel/lvds.yaml
  
 +DRM DRIVER FOR MANTIX MLAF057WE51 PANELS
 +M:    Guido Günther <[email protected]>
 +R:    Purism Kernel Team <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/display/panel/mantix,mlaf057we51-x.yaml
 +F:    drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c
 +
  DRM DRIVER FOR MATROX G200/G400 GRAPHICS CARDS
  S:    Orphan / Obsolete
  F:    drivers/gpu/drm/mga/
  F:    include/uapi/drm/mga_drm.h
  
 -DRM DRIVER FOR MGA G200 SERVER GRAPHICS CHIPS
 +DRM DRIVER FOR MGA G200 GRAPHICS CHIPS
  M:    Dave Airlie <[email protected]>
 -S:    Odd Fixes
 +R:    Thomas Zimmermann <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    drivers/gpu/drm/mgag200/
  
  DRM DRIVER FOR MI0283QT
@@@ -5622,13 -5573,12 +5632,13 @@@ S:   Maintaine
  F:    Documentation/devicetree/bindings/display/panel/raydium,rm67191.yaml
  F:    drivers/gpu/drm/panel/panel-raydium-rm67191.c
  
 -DRM DRIVER FOR ROCKTECH JH057N00900 PANELS
 +DRM DRIVER FOR SITRONIX ST7703 PANELS
  M:    Guido Günther <[email protected]>
  R:    Purism Kernel Team <[email protected]>
 +R:    Ondrej Jirman <[email protected]>
  S:    Maintained
 -F:    Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.txt
 -F:    drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c
 +F:    Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml
 +F:    drivers/gpu/drm/panel/panel-sitronix-st7703.c
  
  DRM DRIVER FOR SAVAGE VIDEO CARDS
  S:    Orphan / Obsolete
@@@ -5687,15 -5637,13 +5697,15 @@@ F:   drivers/gpu/drm/panel/panel-tpo-tpg1
  DRM DRIVER FOR USB DISPLAYLINK VIDEO ADAPTERS
  M:    Dave Airlie <[email protected]>
  R:    Sean Paul <[email protected]>
 +R:    Thomas Zimmermann <[email protected]>
  L:    [email protected]
 -S:    Odd Fixes
 +S:    Supported
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    drivers/gpu/drm/udl/
  
  DRM DRIVER FOR VIRTUAL KERNEL MODESETTING (VKMS)
  M:    Rodrigo Siqueira <[email protected]>
 +M:    Melissa Wen <[email protected]>
  R:    Haneen Mohammed <[email protected]>
  R:    Daniel Vetter <[email protected]>
  L:    [email protected]
@@@ -5830,7 -5778,7 +5840,7 @@@ F:      drivers/gpu/drm/gma500
  
  DRM DRIVERS FOR HISILICON
  M:    Xinliang Liu <[email protected]>
 -M:    Rongrong Zou <zourongrong@gmail.com>
 +M:    Tian Tao  <tiantao6@hisilicon.com>
  R:    John Stultz <[email protected]>
  R:    Xinwei Kong <[email protected]>
  R:    Chen Feng <[email protected]>
@@@ -5856,7 -5804,6 +5866,7 @@@ L:      [email protected]
  S:    Supported
  F:    Documentation/devicetree/bindings/display/mediatek/
  F:    drivers/gpu/drm/mediatek/
 +F:    drivers/phy/mediatek/phy-mtk-hdmi*
  
  DRM DRIVERS FOR NVIDIA TEGRA
  M:    Thierry Reding <[email protected]>
@@@ -5878,7 -5825,7 +5888,7 @@@ L:      [email protected]
  S:    Supported
  T:    git git://linuxtv.org/pinchartl/media drm/du/next
  F:    Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.txt
 -F:    Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
 +F:    Documentation/devicetree/bindings/display/bridge/renesas,lvds.yaml
  F:    Documentation/devicetree/bindings/display/renesas,du.txt
  F:    drivers/gpu/drm/rcar-du/
  F:    drivers/gpu/drm/shmobile/
@@@ -6225,27 -6172,28 +6235,27 @@@ F:   Documentation/devicetree/bindings/ed
  F:    drivers/edac/aspeed_edac.c
  
  EDAC-BLUEFIELD
 -M:    Shravan Kumar Ramani <sramani@nvidia.com>
 +M:    Shravan Kumar Ramani <shravankr@nvidia.com>
  S:    Supported
  F:    drivers/edac/bluefield_edac.c
  
  EDAC-CALXEDA
 -M:    Robert Richter <[email protected]>
 +M:    Andre Przywara <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/edac/highbank*
  
  EDAC-CAVIUM OCTEON
  M:    Ralf Baechle <[email protected]>
 -M:    Robert Richter <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/edac/octeon_edac*
  
  EDAC-CAVIUM THUNDERX
 -M:    Robert Richter <rric[email protected]>
 +M:    Robert Richter <rric@kernel.org>
  L:    [email protected]
 -S:    Supported
 +S:    Odd Fixes
  F:    drivers/edac/thunderx_edac*
  
  EDAC-CORE
@@@ -6253,7 -6201,7 +6263,7 @@@ M:      Borislav Petkov <[email protected]
  M:    Mauro Carvalho Chehab <[email protected]>
  M:    Tony Luck <[email protected]>
  R:    James Morse <[email protected]>
 -R:    Robert Richter <rric[email protected]>
 +R:    Robert Richter <rric@kernel.org>
  L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac-for-next
@@@ -6557,6 -6505,7 +6567,6 @@@ F:      net/bridge
  
  ETHERNET PHY LIBRARY
  M:    Andrew Lunn <[email protected]>
 -M:    Florian Fainelli <[email protected]>
  M:    Heiner Kallweit <[email protected]>
  R:    Russell King <[email protected]>
  L:    [email protected]
@@@ -6566,14 -6515,11 +6576,14 @@@ F:   Documentation/devicetree/bindings/ne
  F:    Documentation/devicetree/bindings/net/mdio*
  F:    Documentation/devicetree/bindings/net/qca,ar803x.yaml
  F:    Documentation/networking/phy.rst
 +F:    drivers/net/mdio/
 +F:    drivers/net/mdio/of_mdio.c
 +F:    drivers/net/pcs/
  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/mdio/*.h
  F:    include/linux/of_net.h
  F:    include/linux/phy.h
  F:    include/linux/phy_fixed.h
@@@ -6649,7 -6595,6 +6659,7 @@@ F:      fs/proc/bootconfig.
  F:    include/linux/bootconfig.h
  F:    lib/bootconfig.c
  F:    tools/bootconfig/*
 +F:    tools/bootconfig/scripts/*
  
  EXYNOS DP DRIVER
  M:    Jingoo Han <[email protected]>
  S:    Maintained
  F:    drivers/iommu/exynos-iommu.c
  
 -EZchip NPS platform support
 -M:    Vineet Gupta <[email protected]>
 -M:    Ofer Levi <[email protected]>
 -S:    Supported
 -F:    arch/arc/boot/dts/eznps.dts
 -F:    arch/arc/plat-eznps
 -
  F2FS FILE SYSTEM
  M:    Jaegeuk Kim <[email protected]>
  M:    Chao Yu <[email protected]>
@@@ -6870,17 -6822,14 +6880,17 @@@ F:   drivers/net/ethernet/nvidia/
  
  FPGA DFL DRIVERS
  M:    Wu Hao <[email protected]>
 +R:    Tom Rix <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-bus-dfl
  F:    Documentation/fpga/dfl.rst
  F:    drivers/fpga/dfl*
  F:    include/uapi/linux/fpga-dfl.h
  
  FPGA MANAGER FRAMEWORK
  M:    Moritz Fischer <[email protected]>
 +R:    Tom Rix <[email protected]>
  L:    [email protected]
  S:    Maintained
  W:    http://www.rocketboards.org
  S:    Maintained
  F:    drivers/dma/fsldma.*
  
 +FREESCALE DSPI DRIVER
 +M:    Vladimir Oltean <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/spi/spi-fsl-dspi.txt
 +F:    drivers/spi/spi-fsl-dspi.c
 +F:    include/linux/spi/spi-fsl-dspi.h
 +
  FREESCALE ENETC ETHERNET DRIVERS
  M:    Claudiu Manoil <[email protected]>
  L:    [email protected]
@@@ -7003,7 -6944,7 +7013,7 @@@ M:      Frank Li <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/admin-guide/perf/imx-ddr.rst
 -F:    Documentation/devicetree/bindings/perf/fsl-imx-ddr.txt
 +F:    Documentation/devicetree/bindings/perf/fsl-imx-ddr.yaml
  F:    drivers/perf/fsl_imx8_ddr_perf.c
  
  FREESCALE IMX I2C DRIVER
@@@ -7011,7 -6952,7 +7021,7 @@@ M:      Oleksij Rempel <o.rempel@pengutronix
  R:    Pengutronix Kernel Team <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/i2c/i2c-imx.txt
 +F:    Documentation/devicetree/bindings/i2c/i2c-imx.yaml
  F:    drivers/i2c/busses/i2c-imx.c
  
  FREESCALE IMX LPI2C DRIVER
@@@ -7019,7 -6960,7 +7029,7 @@@ M:      Dong Aisheng <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.txt
 +F:    Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml
  F:    drivers/i2c/busses/i2c-imx-lpi2c.c
  
  FREESCALE QORIQ DPAA ETHERNET DRIVER
@@@ -7242,7 -7183,7 +7252,7 @@@ FUSE: FILESYSTEM IN USERSPAC
  M:    Miklos Szeredi <[email protected]>
  L:    [email protected]
  S:    Maintained
 -W:    http://fuse.sourceforge.net/
 +W:    https://github.com/libfuse/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git
  F:    Documentation/filesystems/fuse.rst
  F:    fs/fuse/
@@@ -7286,7 -7227,7 +7296,7 @@@ F:      drivers/staging/gasket
  GCC PLUGINS
  M:    Kees Cook <[email protected]>
  R:    Emese Revfy <[email protected]>
 -L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  F:    Documentation/kbuild/gcc-plugins.rst
  F:    scripts/Makefile.gcc-plugins
@@@ -7786,8 -7727,8 +7796,8 @@@ F:      Documentation/watchdog/hpwdt.rs
  F:    drivers/watchdog/hpwdt.c
  
  HEWLETT-PACKARD SMART ARRAY RAID DRIVER (hpsa)
 -M:    Don Brace <don.brace@microsemi.com>
 -L:    esc.storagedev@microsemi.com
 +M:    Don Brace <don.brace@microchip.com>
 +L:    storagedev@microchip.com
  L:    [email protected]
  S:    Supported
  F:    Documentation/scsi/hpsa.rst
@@@ -7796,8 -7737,8 +7806,8 @@@ F:      include/linux/cciss*.
  F:    include/uapi/linux/cciss*.h
  
  HFI1 DRIVER
 -M:    Mike Marciniszyn <mike.marciniszyn@intel.com>
 -M:    Dennis Dalessandro <dennis.dalessandro@intel.com>
 +M:    Mike Marciniszyn <mike.marciniszyn@cornelisnetworks.com>
 +M:    Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>
  L:    [email protected]
  S:    Supported
  F:    drivers/infiniband/hw/hfi1
@@@ -7930,13 -7871,6 +7940,13 @@@ W:    http://www.hisilicon.co
  F:    Documentation/devicetree/bindings/net/hisilicon*.txt
  F:    drivers/net/ethernet/hisilicon/
  
 +HIKEY960 ONBOARD USB GPIO HUB DRIVER
 +M:    John Stultz <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/misc/hisi_hikey_usb.c
 +F:    Documentation/devicetree/bindings/misc/hisilicon-hikey-usb.yaml
 +
  HISILICON PMU DRIVER
  M:    Shaokun Zhang <[email protected]>
  S:    Supported
@@@ -7980,12 -7914,6 +7990,12 @@@ F:    drivers/crypto/hisilicon/sec2/sec_cr
  F:    drivers/crypto/hisilicon/sec2/sec_crypto.h
  F:    drivers/crypto/hisilicon/sec2/sec_main.c
  
 +HISILICON STAGING DRIVERS FOR HIKEY 960/970
 +M:    Mauro Carvalho Chehab <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/staging/hikey9xx/
 +
  HISILICON TRUE RANDOM NUMBER GENERATOR V2 SUPPORT
  M:    Zaibo Xu <[email protected]>
  S:    Maintained
@@@ -8338,7 -8266,7 +8348,7 @@@ IA64 (Itanium) PLATFOR
  M:    Tony Luck <[email protected]>
  M:    Fenghua Yu <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Odd Fixes
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git
  F:    Documentation/ia64/
  F:    arch/ia64/
@@@ -8387,9 -8315,8 +8397,9 @@@ S:      Supporte
  F:    drivers/pci/hotplug/rpaphp*
  
  IBM Power SRIOV Virtual NIC Device Driver
 -M:    Thomas Falcon <[email protected]>
 -M:    John Allen <[email protected]>
 +M:    Dany Madden <[email protected]>
 +M:    Lijun Pan <[email protected]>
 +M:    Sukadev Bhattiprolu <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/ibm/ibmvnic.*
@@@ -8403,7 -8330,7 +8413,7 @@@ F:      arch/powerpc/platforms/powernv/copy-
  F:    arch/powerpc/platforms/powernv/vas*
  
  IBM Power Virtual Ethernet Device Driver
 -M:    Thomas Falcon <tlfalcon@linux.ibm.com>
 +M:    Cristobal Forno <cforno12@linux.ibm.com>
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/ibm/ibmveth.*
@@@ -8563,6 -8490,7 +8573,6 @@@ F:      drivers/iio/multiplexer/iio-mux.
  
  IIO SUBSYSTEM AND DRIVERS
  M:    Jonathan Cameron <[email protected]>
 -R:    Hartmut Knaack <[email protected]>
  R:    Lars-Peter Clausen <[email protected]>
  R:    Peter Meerwald-Stadler <[email protected]>
  L:    [email protected]
@@@ -8678,9 -8606,8 +8688,9 @@@ INGENIC JZ47xx SoC
  M:    Paul Cercueil <[email protected]>
  S:    Maintained
  F:    arch/mips/boot/dts/ingenic/
 -F:    arch/mips/include/asm/mach-jz4740/
 -F:    arch/mips/jz4740/
 +F:    arch/mips/generic/board-ingenic.c
 +F:    arch/mips/include/asm/mach-ingenic/
 +F:    arch/mips/ingenic/Kconfig
  F:    drivers/clk/ingenic/
  F:    drivers/dma/dma-jz4780.c
  F:    drivers/gpu/drm/ingenic/
@@@ -8737,7 -8664,7 +8747,7 @@@ F:      drivers/input/input-mt.
  K:    \b(ABS|SYN)_MT_
  
  INSIDE SECURE CRYPTO DRIVER
 -M:    Antoine Tenart <a[email protected]>
 +M:    Antoine Tenart <a[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/crypto/inside-secure/
@@@ -8816,8 -8743,7 +8826,8 @@@ F:      include/drm/i915
  F:    include/uapi/drm/i915_drm.h
  
  INTEL ETHERNET DRIVERS
 -M:    Jeff Kirsher <[email protected]>
 +M:    Jesse Brandeburg <[email protected]>
 +M:    Tony Nguyen <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  W:    http://www.intel.com/support/feedback.htm
@@@ -8916,7 -8842,7 +8926,7 @@@ INTEL IPU3 CSI-2 CIO2 DRIVE
  M:    Yong Zhi <[email protected]>
  M:    Sakari Ailus <[email protected]>
  M:    Bingbu Cao <[email protected]>
 -R:    Tian Shu Qiu <[email protected]>
 +R:    Tianshu Qiu <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/userspace-api/media/v4l/pixfmt-srggb10-ipu3.rst
@@@ -8925,7 -8851,7 +8935,7 @@@ F:      drivers/media/pci/intel/ipu3
  INTEL IPU3 CSI-2 IMGU DRIVER
  M:    Sakari Ailus <[email protected]>
  R:    Bingbu Cao <[email protected]>
 -R:    Tian Shu Qiu <[email protected]>
 +R:    Tianshu Qiu <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/admin-guide/media/ipu3.rst
@@@ -8990,8 -8916,8 +9000,8 @@@ F:      arch/x86/include/asm/intel_punit_ipc
  F:    drivers/platform/x86/intel_punit_ipc.c
  
  INTEL PMC CORE DRIVER
 -M:    Rajneesh Bhardwaj <rajneesh.bhardwaj@intel.com>
 -M:    Vishwanath Somayaji <vishwanath.somayaji@intel.com>
 +M:    Rajneesh Bhardwaj <irenic.rajneesh@gmail.com>
 +M:    David E Box <david.e.box@intel.com>
  L:    [email protected]
  S:    Maintained
  F:    drivers/platform/x86/intel_pmc_core*
@@@ -9004,7 -8930,7 +9014,7 @@@ F:      drivers/gpio/gpio-*cove.
  F:    drivers/gpio/gpio-msic.c
  
  INTEL PMIC MULTIFUNCTION DEVICE DRIVERS
 -R:    Andy Shevchenko <[email protected]>
 +M:    Andy Shevchenko <[email protected]>
  S:    Maintained
  F:    drivers/mfd/intel_msic.c
  F:    drivers/mfd/intel_soc_pmic*
@@@ -9185,7 -9111,6 +9195,7 @@@ L:      [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
  F:    Documentation/devicetree/bindings/iommu/
 +F:    Documentation/userspace-api/iommu.rst
  F:    drivers/iommu/
  F:    include/linux/iommu.h
  F:    include/linux/iova.h
@@@ -9312,7 -9237,7 +9322,7 @@@ F:      drivers/firmware/iscsi_ibft
  
  ISCSI EXTENSIONS FOR RDMA (ISER) INITIATOR
  M:    Sagi Grimberg <[email protected]>
 -M:    Max Gurtovoy <maxg@nvidia.com>
 +M:    Max Gurtovoy <mgurtovoy@nvidia.com>
  L:    [email protected]
  S:    Supported
  W:    http://www.openfabrics.org
@@@ -9568,7 -9493,6 +9578,7 @@@ F:      include/linux/sunrpc
  F:    include/uapi/linux/nfsd/
  F:    include/uapi/linux/sunrpc/
  F:    net/sunrpc/
 +F:    Documentation/filesystems/nfs/
  
  KERNEL SELFTEST FRAMEWORK
  M:    Shuah Khan <[email protected]>
@@@ -9720,7 -9644,7 +9730,7 @@@ F:      security/keys/encrypted-keys
  
  KEYS-TRUSTED
  M:    James Bottomley <[email protected]>
 -M:    Jarkko Sakkinen <jarkko[email protected]>
 +M:    Jarkko Sakkinen <jarkko@kernel.org>
  M:    Mimi Zohar <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -9732,7 -9656,7 +9742,7 @@@ F:      security/keys/trusted-keys
  
  KEYS/KEYRINGS
  M:    David Howells <[email protected]>
 -M:    Jarkko Sakkinen <jarkko[email protected]>
 +M:    Jarkko Sakkinen <jarkko@kernel.org>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/security/keys/core.rst
@@@ -9779,8 -9703,8 +9789,8 @@@ M:      Catalin Marinas <catalin.marinas@arm
  S:    Maintained
  F:    Documentation/dev-tools/kmemleak.rst
  F:    include/linux/kmemleak.h
 -F:    mm/kmemleak-test.c
  F:    mm/kmemleak.c
 +F:    samples/kmemleak/kmemleak-test.c
  
  KMOD KERNEL MODULE LOADER - USERMODE HELPER
  M:    Luis Chamberlain <[email protected]>
@@@ -9809,12 -9733,6 +9819,12 @@@ F:    Documentation/admin-guide/auxdisplay
  F:    drivers/auxdisplay/ks0108.c
  F:    include/linux/ks0108.h
  
 +KTD253 BACKLIGHT DRIVER
 +M:    Linus Walleij <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/leds/backlight/kinetic,ktd253.yaml
 +F:    drivers/video/backlight/ktd253-backlight.c
 +
  L3MDEV
  M:    David Ahern <[email protected]>
  L:    [email protected]
@@@ -9868,8 -9786,8 +9878,8 @@@ F:      drivers/scsi/53c700
  
  LEAKING_ADDRESSES
  M:    Tobin C. Harding <[email protected]>
 -M:    Tycho Andersen <tycho@tycho.ws>
 -L:    [email protected]
 +M:    Tycho Andersen <tycho@tycho.pizza>
 +L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tobin/leaks.git
  F:    scripts/leaking_addresses.pl
@@@ -9940,6 -9858,15 +9950,6 @@@ T:     git git://git.kernel.org/pub/scm/lin
  F:    drivers/ata/pata_arasan_cf.c
  F:    include/linux/pata_arasan_cf_data.h
  
 -LIBATA PATA DRIVERS
 -M:    Bartlomiej Zolnierkiewicz <[email protected]>
 -M:    Jens Axboe <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
 -F:    drivers/ata/ata_generic.c
 -F:    drivers/ata/pata_*.c
 -
  LIBATA PATA FARADAY FTIDE010 AND GEMINI SATA BRIDGE DRIVERS
  M:    Linus Walleij <[email protected]>
  L:    [email protected]
@@@ -10365,13 -10292,6 +10375,13 @@@ S: Maintaine
  W:    http://linux-test-project.github.io/
  T:    git git://github.com/linux-test-project/ltp.git
  
 +LYNX PCS MODULE
 +M:    Ioana Ciornei <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/net/pcs/pcs-lynx.c
 +F:    include/linux/pcs-lynx.h
 +
  M68K ARCHITECTURE
  M:    Geert Uytterhoeven <[email protected]>
  L:    [email protected]
@@@ -10579,7 -10499,7 +10589,7 @@@ M:   Tobias Waldekranz <tobias@waldekranz
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/marvell,mvusb.yaml
 -F:    drivers/net/phy/mdio-mvusb.c
 +F:    drivers/net/mdio/mdio-mvusb.c
  
  MARVELL XENON MMC/SD/SDIO HOST CONTROLLER DRIVER
  M:    Hu Ziji <[email protected]>
  S:    Maintained
  F:    drivers/hid/hid-mcp2221.c
  
 +MCP251XFD SPI-CAN NETWORK DRIVER
 +M:    Marc Kleine-Budde <[email protected]>
 +M:    Manivannan Sadhasivam <[email protected]>
 +R:    Thomas Kopp <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/can/microchip,mcp251xfd.yaml
 +F:    drivers/net/can/spi/mcp251xfd/
 +
  MCP4018 AND MCP4531 MICROCHIP DIGITAL POTENTIOMETER DRIVERS
  M:    Peter Rosin <[email protected]>
  L:    [email protected]
@@@ -11117,7 -11028,6 +11127,7 @@@ F:   drivers/char/hw_random/mtk-rng.
  
  MEDIATEK SWITCH DRIVER
  M:    Sean Wang <[email protected]>
 +M:    Landen Chao <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/dsa/mt7530.*
@@@ -11125,7 -11035,7 +11135,7 @@@ F:   net/dsa/tag_mtk.
  
  MEDIATEK USB3 DRD IP DRIVER
  M:    Chunfeng Yun <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -11172,12 -11082,6 +11182,12 @@@ W: http://www.melfas.co
  F:    Documentation/devicetree/bindings/input/touchscreen/melfas_mip4.txt
  F:    drivers/input/touchscreen/melfas_mip4.c
  
 +MELLANOX BLUEFIELD I2C DRIVER
 +M:    Khalil Blaiech <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/i2c/busses/i2c-mlxbf.c
 +
  MELLANOX ETHERNET DRIVER (mlx4_en)
  M:    Tariq Toukan <[email protected]>
  L:    [email protected]
@@@ -11399,8 -11303,8 +11409,8 @@@ S:   Supporte
  W:    http://linux-meson.com/
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/amlogic,meson-gx-ao-cec.yaml
 -F:    drivers/media/platform/meson/ao-cec-g12a.c
 -F:    drivers/media/platform/meson/ao-cec.c
 +F:    drivers/media/cec/platform/meson/ao-cec-g12a.c
 +F:    drivers/media/cec/platform/meson/ao-cec.c
  
  MESON NAND CONTROLLER DRIVER FOR AMLOGIC SOCS
  M:    Liang Yang <[email protected]>
@@@ -11410,6 -11314,7 +11420,6 @@@ F:   Documentation/devicetree/bindings/mt
  F:    drivers/mtd/nand/raw/meson_*
  
  MESON VIDEO DECODER DRIVER FOR AMLOGIC SOCS
 -M:    Maxime Jourdan <[email protected]>
  M:    Neil Armstrong <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -11429,7 -11334,6 +11439,7 @@@ M:   Hemant Kumar <[email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git
 +F:    Documentation/ABI/stable/sysfs-bus-mhi
  F:    Documentation/mhi/
  F:    drivers/bus/mhi/
  F:    include/linux/mhi.h
@@@ -11623,14 -11527,13 +11633,14 @@@ M:        Microchip Linux Driver Support <UNGL
  L:    [email protected]
  S:    Supported
  F:    Documentation/devicetree/bindings/mips/mscc.txt
 +F:    Documentation/devicetree/bindings/power/reset/ocelot-reset.txt
  F:    arch/mips/boot/dts/mscc/
  F:    arch/mips/configs/generic/board-ocelot.config
  F:    arch/mips/generic/board-ocelot.c
  
  MICROSEMI SMART ARRAY SMARTPQI DRIVER (smartpqi)
 -M:    Don Brace <don.brace@microsemi.com>
 -L:    esc.storagedev@microsemi.com
 +M:    Don Brace <don.brace@microchip.com>
 +L:    storagedev@microchip.com
  L:    [email protected]
  S:    Supported
  F:    Documentation/scsi/smartpqi.rst
@@@ -11688,7 -11591,7 +11698,7 @@@ MIPS GENERIC PLATFOR
  M:    Paul Burton <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    Documentation/devicetree/bindings/power/mti,mips-cpc.txt
 +F:    Documentation/devicetree/bindings/power/mti,mips-cpc.yaml
  F:    arch/mips/generic/
  F:    arch/mips/tools/generic-board-config.sh
  
@@@ -11744,7 -11647,7 +11754,7 @@@ S:   Odd Fixe
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lkundrak/linux-mmp.git
  F:    arch/arm/boot/dts/mmp*
  F:    arch/arm/mach-mmp/
 -F:    linux/soc/mmp/
 +F:    include/linux/soc/mmp/
  
  MMP USB PHY DRIVERS
  R:    Lubomir Rintel <[email protected]>
@@@ -11862,13 -11765,6 +11872,13 @@@ Q: http://patchwork.linuxtv.org/project
  T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/usb/msi2500/
  
 +MSTAR INTERRUPT CONTROLLER DRIVER
 +M:    Mark-PK Tsai <[email protected]>
 +M:    Daniel Palmer <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/interrupt-controller/mstar,mst-intc.yaml
 +F:    drivers/irqchip/irq-mst-intc.c
 +
  MSYSTEMS DISKONCHIP G3 MTD DRIVER
  M:    Robert Jarzmik <[email protected]>
  L:    [email protected]
@@@ -12131,6 -12027,7 +12141,6 @@@ M:   Neil Horman <[email protected]
  L:    [email protected]
  S:    Maintained
  W:    https://fedorahosted.org/dropwatch/
 -F:    include/net/drop_monitor.h
  F:    include/uapi/linux/net_dropmon.h
  F:    net/core/drop_monitor.c
  
@@@ -12144,7 -12041,6 +12154,7 @@@ Q:   http://patchwork.ozlabs.org/project/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
  F:    Documentation/devicetree/bindings/net/
 +F:    drivers/connector/
  F:    drivers/net/
  F:    include/linux/etherdevice.h
  F:    include/linux/fcdevice.h
@@@ -12170,7 -12066,6 +12180,7 @@@ NETWORKING [DSA
  M:    Andrew Lunn <[email protected]>
  M:    Vivien Didelot <[email protected]>
  M:    Florian Fainelli <[email protected]>
 +M:    Vladimir Oltean <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/dsa/
  F:    drivers/net/dsa/
@@@ -12225,7 -12120,6 +12235,7 @@@ F:   net/ipv6/ipcomp6.
  F:    net/ipv6/xfrm*
  F:    net/key/
  F:    net/xfrm/
 +F:    tools/testing/selftests/net/ipsec.c
  
  NETWORKING [IPv4/IPv6]
  M:    "David S. Miller" <[email protected]>
@@@ -12350,7 -12244,6 +12360,7 @@@ F:   include/linux/sunrpc
  F:    include/uapi/linux/nfs*
  F:    include/uapi/linux/sunrpc/
  F:    net/sunrpc/
 +F:    Documentation/filesystems/nfs/
  
  NILFS2 FILESYSTEM
  M:    Ryusuke Konishi <[email protected]>
@@@ -12386,19 -12279,6 +12396,19 @@@ S: Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git
  F:    arch/nios2/
  
 +NITRO ENCLAVES (NE)
 +M:    Andra Paraschiv <[email protected]>
 +M:    Alexandru Vasile <[email protected]>
 +M:    Alexandru Ciobotaru <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +W:    https://aws.amazon.com/ec2/nitro/nitro-enclaves/
 +F:    Documentation/virt/ne_overview.rst
 +F:    drivers/virt/nitro_enclaves/
 +F:    include/linux/nitro_enclaves.h
 +F:    include/uapi/linux/nitro_enclaves.h
 +F:    samples/nitro_enclaves/
 +
  NOHZ, DYNTICKS SUPPORT
  M:    Frederic Weisbecker <[email protected]>
  M:    Thomas Gleixner <[email protected]>
@@@ -12561,26 -12441,11 +12571,26 @@@ F:        drivers/iio/gyro/fxas21002c_core.
  F:    drivers/iio/gyro/fxas21002c_i2c.c
  F:    drivers/iio/gyro/fxas21002c_spi.c
  
 +NXP i.MX 8MQ DCSS DRIVER
 +M:    Laurentiu Palcu <[email protected]>
 +R:    Lucas Stach <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/display/imx/nxp,imx8mq-dcss.yaml
 +F:    drivers/gpu/drm/imx/dcss/
 +
 +NXP PTN5150A CC LOGIC AND EXTCON DRIVER
 +M:    Krzysztof Kozlowski <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/extcon/extcon-ptn5150.yaml
 +F:    drivers/extcon/extcon-ptn5150.c
 +
  NXP SGTL5000 DRIVER
  M:    Fabio Estevam <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 -F:    Documentation/devicetree/bindings/sound/sgtl5000.txt
 +F:    Documentation/devicetree/bindings/sound/sgtl5000.yaml
  F:    sound/soc/codecs/sgtl5000*
  
  NXP SJA1105 ETHERNET SWITCH DRIVER
@@@ -12626,7 -12491,6 +12636,7 @@@ M:   Josh Poimboeuf <[email protected]
  M:    Peter Zijlstra <[email protected]>
  S:    Supported
  F:    tools/objtool/
 +F:    include/linux/objtool.h
  
  OCELOT ETHERNET SWITCH DRIVER
  M:    Microchip Linux Driver Support <[email protected]>
@@@ -12639,7 -12503,6 +12649,7 @@@ F:   drivers/net/dsa/ocelot/
  F:    drivers/net/ethernet/mscc/
  F:    include/soc/mscc/ocelot*
  F:    net/dsa/tag_ocelot.c
 +F:    tools/testing/selftests/drivers/net/ocelot/*
  
  OCXL (Open Coherent Accelerator Processor Interface OpenCAPI) DRIVER
  M:    Frederic Barrat <[email protected]>
@@@ -12889,7 -12752,7 +12899,7 @@@ T:   git git://linuxtv.org/media_tree.gi
  F:    drivers/media/i2c/ov2685.c
  
  OMNIVISION OV2740 SENSOR DRIVER
 -M:    Tianshu Qiu <tian.shu.qiua@intel.com>
 +M:    Tianshu Qiu <[email protected]>
  R:    Shawn Tu <[email protected]>
  R:    Bingbu Cao <[email protected]>
  L:    [email protected]
@@@ -12905,12 -12768,10 +12915,12 @@@ T:        git git://linuxtv.org/media_tree.gi
  F:    drivers/media/i2c/ov5640.c
  
  OMNIVISION OV5647 SENSOR DRIVER
 -M:    Luis Oliveira <[email protected]>
 +M:    Dave Stevenson <[email protected]>
 +M:    Jacopo Mondi <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
 +F:    Documentation/devicetree/bindings/media/i2c/ov5647.yaml
  F:    drivers/media/i2c/ov5647.c
  
  OMNIVISION OV5670 SENSOR DRIVER
@@@ -13011,8 -12872,8 +13021,8 @@@ S:   Maintaine
  F:    drivers/char/hw_random/optee-rng.c
  
  OPA-VNIC DRIVER
 -M:    Dennis Dalessandro <dennis.dalessandro@intel.com>
 -M:    Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
 +M:    Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>
 +M:    Mike Marciniszyn <mike.marciniszyn@cornelisnetworks.com>
  L:    [email protected]
  S:    Supported
  F:    drivers/infiniband/ulp/opa_vnic
@@@ -13173,9 -13034,7 +13183,9 @@@ F:   lib/packing.
  
  PADATA PARALLEL EXECUTION MECHANISM
  M:    Steffen Klassert <[email protected]>
 +M:    Daniel Jordan <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  F:    Documentation/core-api/padata.rst
  F:    include/linux/padata.h
@@@ -13312,7 -13171,6 +13322,7 @@@ F:   drivers/firmware/pcdp.
  
  PCI DRIVER FOR AARDVARK (Marvell Armada 3700)
  M:    Thomas Petazzoni <[email protected]>
 +M:    Pali Rohár <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -13449,7 -13307,7 +13459,7 @@@ PCI DRIVER FOR SAMSUNG EXYNO
  M:    Jingoo Han <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  F:    drivers/pci/controller/dwc/pci-exynos.c
  
@@@ -13582,10 -13440,10 +13592,10 @@@ F:        Documentation/devicetree/bindings/pc
  F:    drivers/pci/controller/dwc/*artpec*
  
  PCIE DRIVER FOR CAVIUM THUNDERX
 -M:    Robert Richter <rric[email protected]>
 +M:    Robert Richter <rric@kernel.org>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
 -S:    Supported
 +S:    Odd Fixes
  F:    drivers/pci/controller/pci-thunder-*
  
  PCIE DRIVER FOR HISILICON
@@@ -13722,18 -13580,12 +13732,18 @@@ F:        kernel/events/
  F:    tools/lib/perf/
  F:    tools/perf/
  
 -PERFORMANCE EVENTS SUBSYSTEM ARM64 PMU EVENTS
 +PERFORMANCE EVENTS TOOLING ARM64
  R:    John Garry <[email protected]>
  R:    Will Deacon <[email protected]>
 +R:    Mathieu Poirier <[email protected]>
 +R:    Leo Yan <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
 +F:    tools/build/feature/test-libopencsd.c
 +F:    tools/perf/arch/arm*/
  F:    tools/perf/pmu-events/arch/arm64/
 +F:    tools/perf/util/arm-spe*
 +F:    tools/perf/util/cs-etm*
  
  PERSONALITY HANDLING
  M:    Christoph Hellwig <[email protected]>
@@@ -13847,16 -13699,17 +13857,16 @@@ PIN CONTROLLER - RENESA
  M:    Geert Uytterhoeven <[email protected]>
  L:    [email protected]
  S:    Supported
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git sh-pfc
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git renesas-pinctrl
  F:    Documentation/devicetree/bindings/pinctrl/renesas,*
 -F:    drivers/pinctrl/pinctrl-rz*
 -F:    drivers/pinctrl/sh-pfc/
 +F:    drivers/pinctrl/renesas/
  
  PIN CONTROLLER - SAMSUNG
  M:    Tomasz Figa <[email protected]>
  M:    Krzysztof Kozlowski <[email protected]>
  M:    Sylwester Nawrocki <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  Q:    https://patchwork.kernel.org/project/linux-samsung-soc/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git
@@@ -14082,7 -13935,6 +14092,7 @@@ PRINT
  M:    Petr Mladek <[email protected]>
  M:    Sergey Senozhatsky <[email protected]>
  R:    Steven Rostedt <[email protected]>
 +R:    John Ogness <[email protected]>
  S:    Maintained
  F:    include/linux/printk.h
  F:    kernel/printk/
@@@ -14313,24 -14165,20 +14323,24 @@@ F:        drivers/firmware/qemu_fw_cfg.
  F:    include/uapi/linux/qemu_fw_cfg.h
  
  QIB DRIVER
 -M:    Dennis Dalessandro <dennis.dalessandro@intel.com>
 -M:    Mike Marciniszyn <mike.marciniszyn@intel.com>
 +M:    Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>
 +M:    Mike Marciniszyn <mike.marciniszyn@cornelisnetworks.com>
  L:    [email protected]
  S:    Supported
  F:    drivers/infiniband/hw/qib/
  
  QLOGIC QL41xxx FCOE DRIVER
 -M:    [email protected]
 +M:    Saurav Kashyap <[email protected]>
 +M:    Javed Hasan <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/scsi/qedf/
  
  QLOGIC QL41xxx ISCSI DRIVER
 -M:    [email protected]
 +M:    Nilesh Javali <[email protected]>
 +M:    Manish Rangankar <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/scsi/qedi/
@@@ -14363,20 -14211,21 +14373,20 @@@ M:        Nilesh Javali <[email protected]
  M:    [email protected]
  L:    [email protected]
  S:    Supported
 -F:    Documentation/scsi/LICENSE.qla2xxx
  F:    drivers/scsi/qla2xxx/
  
  QLOGIC QLA3XXX NETWORK DRIVER
  M:    [email protected]
  L:    [email protected]
  S:    Supported
 -F:    Documentation/networking/device_drivers/ethernet/qlogic/LICENSE.qla3xxx
  F:    drivers/net/ethernet/qlogic/qla3xxx.*
  
  QLOGIC QLA4XXX iSCSI DRIVER
 -M:    [email protected]
 +M:    Nilesh Javali <[email protected]>
 +M:    Manish Rangankar <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
 -F:    Documentation/scsi/LICENSE.qla4xxx
  F:    drivers/scsi/qla4xxx/
  
  QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/power/avs/qcom,cpr.txt
 -F:    drivers/power/avs/qcom-cpr.c
 +F:    drivers/soc/qcom/cpr.c
  
  QUALCOMM CPUFREQ DRIVER MSM8996/APQ8096
  M:    Ilia Lin <[email protected]>
@@@ -14527,7 -14376,7 +14537,7 @@@ M:   Rob Clark <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 -F:    drivers/iommu/qcom_iommu.c
 +F:    drivers/iommu/arm/arm-smmu/qcom_iommu.c
  
  QUALCOMM IPCC MAILBOX DRIVER
  M:    Manivannan Sadhasivam <[email protected]>
@@@ -14724,9 -14573,9 +14734,9 @@@ M:   Niklas Söderlund <niklas.soderlund+
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/i2c/imi,rdacm2x-gmsl.yaml
 -F:    drivers/media/i2c/rdacm20.c
  F:    drivers/media/i2c/max9271.c
  F:    drivers/media/i2c/max9271.h
 +F:    drivers/media/i2c/rdacm20.c
  
  RDC R-321X SoC
  M:    Florian Fainelli <[email protected]>
@@@ -14739,8 -14588,8 +14749,8 @@@ S:   Maintaine
  F:    drivers/net/ethernet/rdc/r6040.c
  
  RDMAVT - RDMA verbs software
 -M:    Dennis Dalessandro <dennis.dalessandro@intel.com>
 -M:    Mike Marciniszyn <mike.marciniszyn@intel.com>
 +M:    Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>
 +M:    Mike Marciniszyn <mike.marciniszyn@cornelisnetworks.com>
  L:    [email protected]
  S:    Supported
  F:    drivers/infiniband/sw/rdmavt
@@@ -15020,11 -14869,8 +15030,11 @@@ F: include/linux/hid-roccat
  
  ROCKCHIP ISP V1 DRIVER
  M:    Helen Koike <[email protected]>
 +M:    Dafna Hirschfeld <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/admin-guide/media/rkisp1.rst
 +F:    Documentation/userspace-api/media/v4l/pixfmt-meta-rkisp1.rst
  F:    drivers/staging/media/rkisp1/
  
  ROCKCHIP RASTER 2D GRAPHIC ACCELERATION UNIT DRIVER
@@@ -15299,14 -15145,6 +15309,14 @@@ F: Documentation/s390/vfio-ccw.rs
  F:    drivers/s390/cio/vfio_ccw*
  F:    include/uapi/linux/vfio_ccw.h
  
 +S390 VFIO-PCI DRIVER
 +M:    Matthew Rosato <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/vfio/pci/vfio_pci_zdev.c
 +F:    include/uapi/linux/vfio_zdev.h
 +
  S390 ZCRYPT DRIVER
  M:    Harald Freudenberger <[email protected]>
  L:    [email protected]
@@@ -15417,17 -15255,16 +15427,17 @@@ F:        include/linux/mfd/samsung
  SAMSUNG S3C24XX/S3C64XX SOC SERIES CAMIF DRIVER
  M:    Sylwester Nawrocki <[email protected]>
  L:    [email protected]
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  F:    drivers/media/platform/s3c-camif/
  F:    include/media/drv-intf/s3c_camif.h
  
  SAMSUNG S3FWRN5 NFC DRIVER
 -M:    Robert Baldyga <[email protected]>
 +M:    Krzysztof Kozlowski <[email protected]>
  M:    Krzysztof Opasiak <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 -S:    Supported
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml
  F:    drivers/nfc/s3fwrn5
  
  SAMSUNG S5C73M3 CAMERA DRIVER
@@@ -15467,7 -15304,7 +15477,7 @@@ SAMSUNG SOC CLOCK DRIVER
  M:    Sylwester Nawrocki <[email protected]>
  M:    Tomasz Figa <[email protected]>
  M:    Chanwoo Choi <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git
  F:    Documentation/devicetree/bindings/clock/exynos*.txt
@@@ -15475,20 -15312,17 +15485,20 @@@ F:        Documentation/devicetree/bindings/cl
  F:    Documentation/devicetree/bindings/clock/samsung,s5p*
  F:    drivers/clk/samsung/
  F:    include/dt-bindings/clock/exynos*.h
 +F:    include/linux/clk/samsung.h
 +F:    include/linux/platform_data/clk-s3c2410.h
  
  SAMSUNG SPI DRIVERS
  M:    Kukjin Kim <[email protected]>
  M:    Krzysztof Kozlowski <[email protected]>
  M:    Andi Shyti <[email protected]>
  L:    [email protected]
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/spi/spi-samsung.txt
  F:    drivers/spi/spi-s3c*
  F:    include/linux/platform_data/spi-s3c64xx.h
 +F:    include/linux/spi/s3c24xx-fiq.h
  
  SAMSUNG SXGBE DRIVERS
  M:    Byungho An <[email protected]>
@@@ -15532,7 -15366,6 +15542,7 @@@ R:   Dietmar Eggemann <dietmar.eggemann@a
  R:    Steven Rostedt <[email protected]> (SCHED_FIFO/SCHED_RR)
  R:    Ben Segall <[email protected]> (CONFIG_CFS_BANDWIDTH)
  R:    Mel Gorman <[email protected]> (CONFIG_NUMA_BALANCING)
 +R:    Daniel Bristot de Oliveira <[email protected]> (SCHED_DEADLINE)
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched/core
@@@ -15654,8 -15487,8 +15664,8 @@@ F:   drivers/mmc/host/sdricoh_cs.
  SECO BOARDS CEC DRIVER
  M:    Ettore Chimenti <[email protected]>
  S:    Maintained
 -F:    drivers/media/platform/seco-cec/seco-cec.c
 -F:    drivers/media/platform/seco-cec/seco-cec.h
 +F:    drivers/media/cec/platform/seco/seco-cec.c
 +F:    drivers/media/cec/platform/seco/seco-cec.h
  
  SECURE COMPUTING
  M:    Kees Cook <[email protected]>
@@@ -15724,7 -15557,6 +15734,7 @@@ F:   include/uapi/linux/sed
  SECURITY CONTACT
  M:    Security Officers <[email protected]>
  S:    Supported
 +F:    Documentation/admin-guide/security-bugs.rst
  
  SECURITY SUBSYSTEM
  M:    James Morris <[email protected]>
@@@ -15748,7 -15580,6 +15758,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
  F:    Documentation/ABI/obsolete/sysfs-selinux-checkreqprot
  F:    Documentation/ABI/obsolete/sysfs-selinux-disable
  F:    Documentation/admin-guide/LSM/SELinux.rst
 +F:    include/trace/events/avc.h
  F:    include/uapi/linux/selinux_netlink.h
  F:    scripts/selinux/
  F:    security/selinux/
  S:    Maintained
  F:    drivers/net/phy/phylink.c
  F:    drivers/net/phy/sfp*
 +F:    include/linux/mdio/mdio-i2c.h
  F:    include/linux/phylink.h
  F:    include/linux/sfp.h
  K:    phylink\.h|struct\s+phylink|\.phylink|>phylink_|phylink_(autoneg|clear|connect|create|destroy|disconnect|ethtool|helper|mac|mii|of|set|start|stop|test|validate)
@@@ -16006,17 -15836,19 +16016,17 @@@ F:        drivers/video/fbdev/simplefb.
  F:    include/linux/platform_data/simplefb.h
  
  SIMTEC EB110ATX (Chalice CATS)
 -M:    Vincent Sanders <[email protected]>
  M:    Simtec Linux Team <[email protected]>
  S:    Supported
  W:    http://www.simtec.co.uk/products/EB110ATX/
  
  SIMTEC EB2410ITX (BAST)
 -M:    Vincent Sanders <[email protected]>
  M:    Simtec Linux Team <[email protected]>
  S:    Supported
  W:    http://www.simtec.co.uk/products/EB2410ITX/
 -F:    arch/arm/mach-s3c24xx/bast-ide.c
 -F:    arch/arm/mach-s3c24xx/bast-irq.c
 -F:    arch/arm/mach-s3c24xx/mach-bast.c
 +F:    arch/arm/mach-s3c/bast-ide.c
 +F:    arch/arm/mach-s3c/bast-irq.c
 +F:    arch/arm/mach-s3c/mach-bast.c
  
  SIOX
  M:    Thorsten Scherer <[email protected]>
@@@ -16055,13 -15887,6 +16065,13 @@@ F: Documentation/fb/sisfb.rs
  F:    drivers/video/fbdev/sis/
  F:    include/video/sisfb.h
  
 +SIS I2C TOUCHSCREEN DRIVER
 +M:    Mika Penttilä <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/input/touchscreen/sis_i2c.txt
 +F:    drivers/input/touchscreen/sis_i2c.c
 +
  SIS USB2VGA DRIVER
  M:    Thomas Winischhofer <[email protected]>
  S:    Maintained
@@@ -16229,6 -16054,7 +16239,6 @@@ F:   include/uapi/rdma/rdma_user_rxe.
  SOFTLOGIC 6x10 MPEG CODEC
  M:    Bluecherry Maintainers <[email protected]>
  M:    Anton Sviridenko <[email protected]>
 -M:    Andrey Utkin <[email protected]>
  M:    Andrey Utkin <[email protected]>
  M:    Ismael Luceno <[email protected]>
  L:    [email protected]
@@@ -16310,7 -16136,7 +16320,7 @@@ M:   Leon Luo <[email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
 -F:    Documentation/devicetree/bindings/media/i2c/imx274.txt
 +F:    Documentation/devicetree/bindings/media/i2c/sony,imx274.yaml
  F:    drivers/media/i2c/imx274.c
  
  SONY IMX290 SENSOR DRIVER
@@@ -16648,6 -16474,7 +16658,6 @@@ F:   drivers/staging/rtl8712
  
  STAGING - SEPS525 LCD CONTROLLER DRIVERS
  M:    Michael Hennerich <[email protected]>
 -M:    Beniamin Bia <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    Documentation/devicetree/bindings/iio/adc/adi,ad7606.yaml
@@@ -16695,7 -16522,7 +16705,7 @@@ STI CEC DRIVE
  M:    Benjamin Gaignard <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/stih-cec.txt
 -F:    drivers/media/platform/sti/cec/
 +F:    drivers/media/cec/platform/sti/
  
  STK1160 USB VIDEO CAPTURE DRIVER
  M:    Ezequiel Garcia <[email protected]>
@@@ -16879,13 -16706,6 +16889,13 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/gpio/snps,dw-apb-gpio.yaml
  F:    drivers/gpio/gpio-dwapb.c
  
 +SYNOPSYS DESIGNWARE APB SSI DRIVER
 +M:    Serge Semin <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml
 +F:    drivers/spi/spi-dw*
 +
  SYNOPSYS DESIGNWARE AXI DMAC DRIVER
  M:    Eugeniy Paltsev <[email protected]>
  S:    Maintained
@@@ -16896,7 -16716,7 +16906,7 @@@ SYNOPSYS DESIGNWARE DMAC DRIVE
  M:    Viresh Kumar <[email protected]>
  R:    Andy Shevchenko <[email protected]>
  S:    Maintained
 -F:    Documentation/devicetree/bindings/dma/snps-dma.txt
 +F:    Documentation/devicetree/bindings/dma/snps,dma-spear1340.yaml
  F:    drivers/dma/dw/
  F:    include/dt-bindings/dma/dw-dmac.h
  F:    include/linux/dma/dw.h
@@@ -16912,8 -16732,8 +16922,8 @@@ SYNOPSYS DESIGNWARE ETHERNET XPCS DRIVE
  M:    Jose Abreu <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    drivers/net/phy/mdio-xpcs.c
 -F:    include/linux/mdio-xpcs.h
 +F:    drivers/net/pcs/pcs-xpcs.c
 +F:    include/linux/pcs/pcs-xpcs.h
  
  SYNOPSYS DESIGNWARE I2C DRIVER
  M:    Jarkko Nikula <[email protected]>
@@@ -17405,8 -17225,8 +17415,8 @@@ S:   Maintaine
  F:    drivers/net/thunderbolt.c
  
  THUNDERX GPIO DRIVER
 -M:    Robert Richter <rric[email protected]>
 -S:    Maintained
 +M:    Robert Richter <rric@kernel.org>
 +S:    Odd Fixes
  F:    drivers/gpio/gpio-thunderx.c
  
  TI AM437X VPFE DRIVER
@@@ -17427,7 -17247,7 +17437,7 @@@ S:   Maintaine
  F:    drivers/thermal/ti-soc-thermal/
  
  TI BQ27XXX POWER SUPPLY DRIVER
 -R:    Andrew F. Davis <afd@ti.com>
 +R:    Dan Murphy <dmurphy@ti.com>
  F:    drivers/power/supply/bq27xxx_battery.c
  F:    drivers/power/supply/bq27xxx_battery_i2c.c
  F:    include/linux/power/bq27xxx_battery.h
@@@ -17701,9 -17521,8 +17711,9 @@@ S:   Supporte
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev
  F:    Documentation/RCU/torture.rst
  F:    kernel/locking/locktorture.c
 -F:    kernel/rcu/rcuperf.c
 +F:    kernel/rcu/rcuscale.c
  F:    kernel/rcu/rcutorture.c
 +F:    kernel/rcu/refscale.c
  F:    kernel/torture.c
  
  TOSHIBA ACPI EXTRAS DRIVER
@@@ -17747,13 -17566,13 +17757,13 @@@ F:        drivers/platform/x86/toshiba-wmi.
  
  TPM DEVICE DRIVER
  M:    Peter Huewe <[email protected]>
 -M:    Jarkko Sakkinen <jarkko[email protected]>
 +M:    Jarkko Sakkinen <jarkko@kernel.org>
  R:    Jason Gunthorpe <[email protected]>
  L:    [email protected]
  S:    Maintained
  W:    https://kernsec.org/wiki/index.php/Linux_Kernel_Integrity
  Q:    https://patchwork.kernel.org/project/linux-integrity/list/
 -T:    git git://git.infradead.org/users/jjs/linux-tpmdd.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git
  F:    drivers/char/tpm/
  
  TRACING
@@@ -17890,7 -17709,6 +17900,7 @@@ S:   Supporte
  W:    http://www.linux-mtd.infradead.org/doc/ubifs.html
  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
 +F:    Documentation/filesystems/ubifs-authentication.rst
  F:    Documentation/filesystems/ubifs.rst
  F:    fs/ubifs/
  
@@@ -18284,6 -18102,14 +18294,6 @@@ T:  git git://linuxtv.org/media_tree.gi
  F:    drivers/media/usb/uvc/
  F:    include/uapi/linux/uvcvideo.h
  
 -USB VISION DRIVER
 -M:    Hans Verkuil <[email protected]>
 -L:    [email protected]
 -S:    Odd Fixes
 -W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 -F:    drivers/staging/media/usbvision/
 -
  USB WEBCAM GADGET
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
@@@ -18413,12 -18239,6 +18423,12 @@@ F: drivers/vfio
  F:    include/linux/vfio.h
  F:    include/uapi/linux/vfio.h
  
 +VFIO FSL-MC DRIVER
 +M:    Diana Craciun <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/vfio/fsl-mc/
 +
  VFIO MEDIATED DEVICE DRIVERS
  M:    Kirti Wankhede <[email protected]>
  L:    [email protected]
@@@ -18443,8 -18263,7 +18453,8 @@@ F:   drivers/gpu/vga/vga_switcheroo.
  F:    include/linux/vga_switcheroo.h
  
  VIA RHINE NETWORK DRIVER
 -S:    Orphan
 +S:    Maintained
 +M:    Kevin Brace <[email protected]>
  F:    drivers/net/ethernet/via/via-rhine.c
  
  VIA SD/MMC CARD CONTROLLER DRIVER
@@@ -18489,8 -18308,10 +18499,8 @@@ S:  Maintaine
  F:    drivers/media/platform/video-mux.c
  
  VIDEOBUF2 FRAMEWORK
 -M:    Pawel Osciak <[email protected]>
 +M:    Tomasz Figa <[email protected]>
  M:    Marek Szyprowski <[email protected]>
 -M:    Kyungmin Park <[email protected]>
 -R:    Tomasz Figa <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/media/common/videobuf2/*
@@@ -18648,7 -18469,6 +18658,7 @@@ VIRTIO MEM DRIVE
  M:    David Hildenbrand <[email protected]>
  L:    [email protected]
  S:    Maintained
 +W:    https://virtio-mem.gitlab.io/
  F:    drivers/virtio/virtio_mem.c
  F:    include/uapi/linux/virtio_mem.h
  
@@@ -18681,14 -18501,6 +18691,14 @@@ W: https://linuxtv.or
  T:    git git://linuxtv.org/media_tree.git
  F:    drivers/media/test-drivers/vivid/*
  
 +VIDTV VIRTUAL DIGITAL TV DRIVER
 +M:    Daniel W. S. Almeida <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +W:    https://linuxtv.org
 +T:    git git://linuxtv.org/media_tree.git
 +F:    drivers/media/test-drivers/vidtv/*
 +
  VLYNQ BUS
  M:    Florian Fainelli <[email protected]>
  L:    [email protected] (subscribers-only)
@@@ -18955,7 -18767,7 +18965,7 @@@ F:   Documentation/devicetree/bindings/mf
  F:    Documentation/devicetree/bindings/regulator/wlf,arizona.yaml
  F:    Documentation/devicetree/bindings/sound/wlf,arizona.yaml
  F:    Documentation/hwmon/wm83??.rst
 -F:    arch/arm/mach-s3c64xx/mach-crag6410*
 +F:    arch/arm/mach-s3c/mach-crag6410*
  F:    drivers/clk/clk-wm83*.c
  F:    drivers/extcon/extcon-arizona.c
  F:    drivers/gpio/gpio-*wm*.c
@@@ -19056,11 -18868,11 +19066,11 @@@ T:        git git://git.kernel.org/pub/scm/lin
  F:    arch/x86/mm/
  
  X86 PLATFORM DRIVERS
 -M:    Darren Hart <[email protected]>
 -M:    Andy Shevchenko <[email protected]>
 +M:    Hans de Goede <[email protected]>
 +M:    Mark Gross <[email protected]>
  L:    [email protected]
 -S:    Odd Fixes
 -T:    git git://git.infradead.org/linux-platform-drivers-x86.git
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
  F:    drivers/platform/olpc/
  F:    drivers/platform/x86/
  
@@@ -19409,16 -19221,6 +19419,16 @@@ T: git git://git.kernel.org/pub/scm/lin
  F:    Documentation/filesystems/zonefs.rst
  F:    fs/zonefs/
  
 +ZR36067 VIDEO FOR LINUX DRIVER
 +M:    Corentin Labbe <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +W:    http://mjpeg.sourceforge.net/driver-zoran/
 +Q:    https://patchwork.linuxtv.org/project/linux-media/list/
 +F:    Documentation/driver-api/media/drivers/zoran.rst
 +F:    drivers/staging/media/zoran/
 +
  ZPOOL COMPRESSED PAGE STORAGE API
  M:    Dan Streetman <[email protected]>
  L:    [email protected]
index 0fab080d61ef12ae2571dd85c76f478f76bca87d,1ab54ee9dd724c7848b72d300f92385a05f73f0a..4c229802413773ace2d1c35a5d759934cc533480
         * for the moment, just use a fake OCP bus entry to represent
         * the whole bus hierarchy.
         */
-       ocp {
+       ocp: ocp {
                compatible = "simple-bus";
                #address-cells = <1>;
                #size-cells = <1>;
                                        <SYSC_IDLE_SMART>;
                        clocks = <&gfx_l3_clkctrl AM3_GFX_L3_GFX_CLKCTRL 0>;
                        clock-names = "fck";
 +                      power-domains = <&prm_gfx>;
                        resets = <&prm_gfx 0>;
                        reset-names = "rstctrl";
                        #address-cells = <1>;
        prm_gfx: prm@1100 {
                compatible = "ti,am3-prm-inst", "ti,omap-prm-inst";
                reg = <0x1100 0x100>;
 +              #power-domain-cells = <0>;
                #reset-cells = <1>;
        };
  };
index 8d47913e212985d7d58e9c52bc68b6de7b6ef7a3,38a7dd64f8df876d77a0250c5399422855fd7f23..878406b120be69f977513e604e890427b4021a84
@@@ -35,8 -35,8 +35,8 @@@
                serial3 = &uart3;
                serial4 = &uart4;
                serial5 = &uart5;
-               ethernet0 = &cpsw_emac0;
-               ethernet1 = &cpsw_emac1;
+               ethernet0 = &cpsw_port1;
+               ethernet1 = &cpsw_port2;
                spi0 = &qspi;
        };
  
                                        <SYSC_IDLE_SMART>;
                        clocks = <&gfx_l3_clkctrl AM4_GFX_L3_GFX_CLKCTRL 0>;
                        clock-names = "fck";
 +                      power-domains = <&prm_gfx>;
                        resets = <&prm_gfx 0>;
                        reset-names = "rstctrl";
                        #address-cells = <1>;
        prm_gfx: prm@400 {
                compatible = "ti,am4-prm-inst", "ti,omap-prm-inst";
                reg = <0x400 0x100>;
 +              #power-domain-cells = <0>;
                #reset-cells = <1>;
        };
  
index 8a67bb29e3b7c79e551cabab8e33ec1083df4f87,d82a6eeaf1b36e929db3cb4fe793619113268321..c220dc3c4e0f3bf103b333614328c73f39a82add
                        ranges = <0x0 0x39000 0x1000>;
                };
  
 -              target-module@3e000 {                   /* 0x44e3e000, ap 34 60.0 */
 +              rtc_target: target-module@3e000 {       /* 0x44e3e000, ap 34 60.0 */
                        compatible = "ti,sysc-omap4-simple", "ti,sysc";
 -                      ti,hwmods = "rtc";
                        reg = <0x3e074 0x4>,
                              <0x3e078 0x4>;
                        reg-names = "rev", "sysc";
                        #size-cells = <1>;
                        ranges = <0x0 0x100000 0x8000>;
  
-                       mac: ethernet@0 {
-                               compatible = "ti,am4372-cpsw","ti,cpsw";
-                               reg = <0x0 0x800
-                                      0x1200 0x100>;
+                       mac_sw: switch@0 {
+                               compatible = "ti,am4372-cpsw","ti,cpsw-switch";
+                               reg = <0x0 0x4000>;
+                               ranges = <0 0 0x4000>;
+                               clocks = <&cpsw_125mhz_gclk>, <&dpll_clksel_mac_clk>;
+                               clock-names = "fck", "50mclk";
+                               assigned-clocks = <&dpll_clksel_mac_clk>;
+                               assigned-clock-rates = <50000000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+                               syscon = <&scm_conf>;
+                               status = "disabled";
                                interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH
                                              GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH
                                              GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH
                                              GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               clocks = <&cpsw_125mhz_gclk>, <&cpsw_cpts_rft_clk>,
-                                        <&dpll_clksel_mac_clk>;
-                               clock-names = "fck", "cpts", "50mclk";
-                               assigned-clocks = <&dpll_clksel_mac_clk>;
-                               assigned-clock-rates = <50000000>;
-                               status = "disabled";
-                               cpdma_channels = <8>;
-                               ale_entries = <1024>;
-                               bd_ram_size = <0x2000>;
-                               mac_control = <0x20>;
-                               slaves = <2>;
-                               active_slave = <0>;
-                               cpts_clock_mult = <0x80000000>;
-                               cpts_clock_shift = <29>;
-                               ranges = <0 0 0x8000>;
-                               syscon = <&scm_conf>;
+                               interrupt-names = "rx_thresh", "rx", "tx", "misc";
  
-                               davinci_mdio: mdio@1000 {
-                                       compatible = "ti,am4372-mdio","ti,cpsw-mdio","ti,davinci_mdio";
-                                       reg = <0x1000 0x100>;
-                                       clocks = <&cpsw_125mhz_clkctrl AM4_CPSW_125MHZ_CPGMAC0_CLKCTRL 0>;
-                                       clock-names = "fck";
+                               ethernet-ports {
                                        #address-cells = <1>;
                                        #size-cells = <0>;
-                                       bus_freq = <1000000>;
-                                       status = "disabled";
+                                       cpsw_port1: port@1 {
+                                               reg = <1>;
+                                               label = "port1";
+                                               mac-address = [ 00 00 00 00 00 00 ];
+                                               phys = <&phy_gmii_sel 1 0>;
+                                       };
+                                       cpsw_port2: port@2 {
+                                               reg = <2>;
+                                               label = "port2";
+                                               mac-address = [ 00 00 00 00 00 00 ];
+                                               phys = <&phy_gmii_sel 2 0>;
+                                       };
                                };
  
-                               cpsw_emac0: slave@200 {
-                                       /* Filled in by U-Boot */
-                                       mac-address = [ 00 00 00 00 00 00 ];
-                                       phys = <&phy_gmii_sel 1 0>;
+                               davinci_mdio_sw: mdio@1000 {
+                                       compatible = "ti,am4372-mdio", "ti,cpsw-mdio","ti,davinci_mdio";
+                                       clocks = <&cpsw_125mhz_gclk>;
+                                       clock-names = "fck";
+                                       #address-cells = <1>;
+                                       #size-cells = <0>;
+                                       bus_freq = <1000000>;
+                                       reg = <0x1000 0x100>;
                                };
  
-                               cpsw_emac1: slave@300 {
-                                       /* Filled in by U-Boot */
-                                       mac-address = [ 00 00 00 00 00 00 ];
-                                       phys = <&phy_gmii_sel 2 0>;
+                               cpts {
+                                       clocks = <&cpsw_cpts_rft_clk>;
+                                       clock-names = "cpts";
                                };
                        };
                };
index 7f3faa36a5e4166e555ccca25478c3fb5b03356d,b19c2fb2a388ce7d698fa9b2d96dd340452bb000..f517d1e843cf4cc2d0803c4f95c77a7f27aa765f
        cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
  };
  
- &mac {
+ &mac_sw {
        pinctrl-names = "default", "sleep";
        pinctrl-0 = <&cpsw_default>;
        pinctrl-1 = <&cpsw_sleep>;
        status = "okay";
-       slaves = <1>;
  };
  
- &davinci_mdio {
+ &davinci_mdio_sw {
        pinctrl-names = "default", "sleep";
        pinctrl-0 = <&davinci_mdio_default>;
        pinctrl-1 = <&davinci_mdio_sleep>;
-       status = "okay";
  
        ethphy0: ethernet-phy@16 {
                reg = <16>;
        };
  };
  
- &cpsw_emac0 {
+ &cpsw_port1 {
        phy-handle = <&ethphy0>;
        phy-mode = "rmii";
        phys = <&phy_gmii_sel 1 1>;
+       ti,dual-emac-pvid = <1>;
+ };
+ &cpsw_port2 {
+       status = "disabled";
  };
  
  &i2c0 {
        status = "okay";
  };
  
 +&rtc_target {
 +      status = "disabled";
 +};
 +
  &tscadc {
        status = "okay";
  
  };
  
  &dss {
-       status = "ok";
+       status = "okay";
  
        pinctrl-names = "default";
        pinctrl-0 = <&dss_pins>;
index c846fa3c244d36555eead3328d3c81d2042a0039,8ba5097157e186e5829860a1b11745db33a488c0..e895f7cb8c9f261171e616abf49a4f9dbf2d0136
                };
  
                qspi: spi@27200 {
 -                      compatible = "brcm,spi-bcm-qspi", "brcm,spi-nsp-qspi";
 +                      compatible = "brcm,spi-nsp-qspi", "brcm,spi-bcm-qspi";
                        reg = <0x027200 0x184>,
                              <0x027000 0x124>,
                              <0x11c408 0x004>,
                };
  
                ccbtimer0: timer@34000 {
-                       compatible = "arm,sp804";
+                       compatible = "arm,sp804", "arm,primecell";
                        reg = <0x34000 0x1000>;
                        interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>,
                                     <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;
                };
  
                ccbtimer1: timer@35000 {
-                       compatible = "arm,sp804";
+                       compatible = "arm,sp804", "arm,primecell";
                        reg = <0x35000 0x1000>;
                        interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>,
                                     <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>;
                        reg = <0x39000 0x1000>;
                        interrupts = <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&iprocslow>, <&iprocslow>;
-                       clock-names = "wdogclk", "apb_pclk";
+                       clock-names = "wdog_clk", "apb_pclk";
                };
  
                lcpll0: lcpll0@3f100 {
index e94244a215afb2fade895750d056fb7cabd308cd,ca24c2c737ab7bcb48a917dd12bb78229351ac2d..09a1182c29363f6b26d90549df8106f9705f86f8
@@@ -4,8 -4,6 +4,8 @@@
  #include "bcm2835-rpi.dtsi"
  #include "bcm283x-rpi-usb-peripheral.dtsi"
  
 +#include <dt-bindings/reset/raspberrypi,firmware-reset.h>
 +
  / {
        compatible = "raspberrypi,4-model-b", "brcm,bcm2711";
        model = "Raspberry Pi 4 Model B";
        };
  };
  
+ &ddc0 {
+       status = "okay";
+ };
+ &ddc1 {
+       status = "okay";
+ };
  &firmware {
        firmware_clocks: clocks {
                compatible = "raspberrypi,firmware-clocks";
                                  "";
                status = "okay";
        };
 +
 +      reset: reset {
 +              compatible = "raspberrypi,firmware-reset";
 +              #reset-cells = <1>;
 +      };
  };
  
  &gpio {
                          "RGMII_TXD3";
  };
  
+ &hdmi0 {
+       clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 0>, <&clk_27MHz>;
+       clock-names = "hdmi", "bvb", "audio", "cec";
+       status = "okay";
+ };
+ &hdmi1 {
+       clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 1>, <&clk_27MHz>;
+       clock-names = "hdmi", "bvb", "audio", "cec";
+       status = "okay";
+ };
+ &hvs {
+       clocks = <&firmware_clocks 4>;
+ };
+ &pixelvalve0 {
+       status = "okay";
+ };
+ &pixelvalve1 {
+       status = "okay";
+ };
+ &pixelvalve2 {
+       status = "okay";
+ };
+ &pixelvalve4 {
+       status = "okay";
+ };
  &pwm1 {
        pinctrl-names = "default";
        pinctrl-0 = <&pwm1_0_gpio40 &pwm1_1_gpio41>;
        };
  };
  
 +&pcie0 {
 +      pci@1,0 {
 +              #address-cells = <3>;
 +              #size-cells = <2>;
 +              ranges;
 +
 +              reg = <0 0 0 0 0>;
 +
 +              usb@1,0 {
 +                      reg = <0x10000 0 0 0 0>;
 +                      resets = <&reset RASPBERRYPI_FIRMWARE_RESET_ID_USB>;
 +              };
 +      };
 +};
 +
  /* uart0 communicates with the BT module */
  &uart0 {
        pinctrl-names = "default";
  &vchiq {
        interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
  };
+ &vc4 {
+       status = "okay";
+ };
+ &vec {
+       status = "disabled";
+ };
index 0016720ce530012119a3e560b6f92db01389c3a6,9d9e8fe3f6ae3c9fbe5ba3d71b265894624737cd..ac3a99cf20793aa3559e0e63398f4196857cf9f2
                        reg = <0x00013000 0x1000>;
                };
  
+               pcie2: pcie@14000 {
+                       reg = <0x00014000 0x1000>;
+               };
                usb2: usb2@21000 {
                        reg = <0x00021000 0x1000>;
  
                };
        };
  
+       pwm: pwm@18002000 {
+               compatible = "brcm,iproc-pwm";
+               reg = <0x18002000 0x28>;
+               clocks = <&osc>;
+               #pwm-cells = <3>;
+               status = "disabled";
+       };
        mdio: mdio@18003000 {
                compatible = "brcm,iproc-mdio";
                reg = <0x18003000 0x8>;
                reg = <0x18105000 0x1000>;
        };
  
+       uart2: serial@18008000 {
+               compatible = "ns16550a";
+               reg = <0x18008000 0x20>;
+               clocks = <&iprocslow>;
+               interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
+               reg-shift = <2>;
+               status = "disabled";
+       };
        i2c0: i2c@18009000 {
                compatible = "brcm,iproc-i2c";
                reg = <0x18009000 0x50>;
                                        function = "spi";
                                };
  
-                               i2c {
+                               pinmux_i2c: i2c {
                                        groups = "i2c_grp";
                                        function = "i2c";
                                };
  
-                               pwm {
+                               pinmux_pwm: pwm {
                                        groups = "pwm0_grp", "pwm1_grp",
                                                 "pwm2_grp", "pwm3_grp";
                                        function = "pwm";
        };
  
        spi@18029200 {
 -              compatible = "brcm,spi-bcm-qspi", "brcm,spi-nsp-qspi";
 +              compatible = "brcm,spi-nsp-qspi", "brcm,spi-bcm-qspi";
                reg = <0x18029200 0x184>,
                      <0x18029000 0x124>,
                      <0x1811b408 0x004>,
index f43b764cc0c7b6565089d2070d30cc5cac45946a,703ba6a26272a52a5135ada85508ddb9516a4702..3bf90d9e33353b366d826b876d0b40101ad01e36
                         */
                        ti,no-idle;
  
-                       mac: ethernet@0 {
-                               compatible = "ti,dra7-cpsw","ti,cpsw";
-                               clocks = <&gmac_main_clk>, <&gmac_clkctrl DRA7_GMAC_GMAC_CLKCTRL 25>;
-                               clock-names = "fck", "cpts";
-                               cpdma_channels = <8>;
-                               ale_entries = <1024>;
-                               bd_ram_size = <0x2000>;
-                               mac_control = <0x20>;
-                               slaves = <2>;
-                               active_slave = <0>;
-                               cpts_clock_mult = <0x784CFE14>;
-                               cpts_clock_shift = <29>;
-                               reg = <0x0 0x1000
-                                      0x1200 0x2e00>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               /*
-                                * rx_thresh_pend
-                                * rx_pend
-                                * tx_pend
-                                * misc_pend
-                                */
-                               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>;
-                               ranges = <0 0 0x4000>;
-                               syscon = <&scm_conf>;
-                               status = "disabled";
-                               davinci_mdio: 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>;
-                               };
-                               cpsw_emac0: slave@200 {
-                                       /* Filled in by U-Boot */
-                                       mac-address = [ 00 00 00 00 00 00 ];
-                                       phys = <&phy_gmii_sel 1>;
-                               };
-                               cpsw_emac1: slave@300 {
-                                       /* Filled in by U-Boot */
-                                       mac-address = [ 00 00 00 00 00 00 ];
-                                       phys = <&phy_gmii_sel 2>;
-                               };
-                       };
                        mac_sw: switch@0 {
                                compatible = "ti,dra7-cpsw-switch","ti,cpsw-switch";
                                reg = <0x0 0x4000>;
  
                rtctarget: target-module@38000 {                        /* 0x48838000, ap 29 12.0 */
                        compatible = "ti,sysc-omap4-simple", "ti,sysc";
 -                      ti,hwmods = "rtcss";
                        reg = <0x38074 0x4>,
                              <0x38078 0x4>;
                        reg-names = "rev", "sysc";
index 8f94364ba484721192383bdd40bb1902f9c02637,0a211b216a27137abfadf19686c62be7e5e9add2..46a4ddedb4236d324f45a8701f326de6d6fdb360
@@@ -9,11 -9,11 +9,11 @@@
  
  / {
        model = "Logic PD i.MX6QD SOM-M3";
-       compatible = "fsl,imx6q";
+       compatible = "logicpd,imx6q-logicpd", "fsl,imx6q";
  
        backlight: backlight-lvds {
                compatible = "pwm-backlight";
 -              pwms = <&pwm3 0 20000>;
 +              pwms = <&pwm3 0 20000 0>;
                brightness-levels = <0 4 8 16 32 64 128 255>;
                default-brightness-level = <6>;
                power-supply = <&reg_lcd>;
index 4d01c3300b975c5dd1046c4b9feec5a6e24ef753,e98935974b5d54523bc32fa6acd368c52061d96b..3c04b5a4f3cb521d7411612e1ee512618c2e83bd
@@@ -5,6 -5,7 +5,7 @@@
  
  #include <dt-bindings/gpio/gpio.h>
  #include <dt-bindings/input/linux-event-codes.h>
+ #include <dt-bindings/interrupt-controller/irq.h>
  
  / {
        /* these are used by bootloader for disabling nodes */
@@@ -22,6 -23,8 +23,6 @@@
  
        gpio-keys {
                compatible = "gpio-keys";
 -              #address-cells = <1>;
 -              #size-cells = <0>;
  
                user-pb {
                        label = "user_pb";
                compatible = "gw,gsc";
                reg = <0x20>;
                interrupt-parent = <&gpio1>;
-               interrupts = <4 GPIO_ACTIVE_LOW>;
+               interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
                interrupt-controller;
                #interrupt-cells = <1>;
                #size-cells = <0>;
index 7cb6153fc650b129abb7436c918b5b4db175e5e0,331b6d259bbaa8d3b5fa4f2a5ccd6e46374a6d34..1065941807e83c8044283e26475bc5cd006c9bc2
@@@ -39,7 -39,7 +39,7 @@@
  &ecspi1 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_ecspi1>;
-       cs-gpios = <&gpio4 19 GPIO_ACTIVE_HIGH>;
+       cs-gpios = <&gpio4 19 GPIO_ACTIVE_LOW>;
        status = "okay";
  
        flash@0 {
@@@ -58,7 -58,7 +58,7 @@@
                          <&clks IMX7D_ENET1_TIME_ROOT_CLK>;
        assigned-clock-parents = <&clks IMX7D_PLL_ENET_MAIN_100M_CLK>;
        assigned-clock-rates = <0>, <100000000>;
 -      phy-mode = "rgmii";
 +      phy-mode = "rgmii-id";
        phy-handle = <&fec1_phy>;
        status = "okay";
  
index eb5780eb26307714b926ec8c2cbc93770e8a4525,6557e69c4e4825402840ceabc642349ca46673e1..d6475cc6a91a7e63c20859f7d9282a726b81919e
                        status = "disabled";
                };
  
-               target-module@56000000 {
+               sgx_module: target-module@56000000 {
                        compatible = "ti,sysc-omap4", "ti,sysc";
                        reg = <0x5600fe00 0x4>,
                              <0x5600fe10 0x4>;
                                                clocks = <&l3_dss_clkctrl OMAP4_DSS_CORE_CLKCTRL 8>,
                                                         <&l3_dss_clkctrl OMAP4_DSS_CORE_CLKCTRL 10>;
                                                clock-names = "fck", "sys_clk";
+                                               #address-cells = <1>;
+                                               #size-cells = <0>;
                                        };
                                };
  
                                                clocks = <&l3_dss_clkctrl OMAP4_DSS_CORE_CLKCTRL 8>,
                                                         <&l3_dss_clkctrl OMAP4_DSS_CORE_CLKCTRL 10>;
                                                clock-names = "fck", "sys_clk";
+                                               #address-cells = <1>;
+                                               #size-cells = <0>;
                                        };
                                };
  
                #reset-cells = <1>;
        };
  
 +      prm_abe: prm@500 {
 +              compatible = "ti,omap4-prm-inst", "ti,omap-prm-inst";
 +              reg = <0x500 0x100>;
 +              #power-domain-cells = <0>;
 +      };
 +
        prm_core: prm@700 {
                compatible = "ti,omap4-prm-inst", "ti,omap-prm-inst";
                reg = <0x700 0x100>;
index 42f76212d47229f69725a3f8625b718fdd7744ac,04ad6b95647158361aa5dc1a336a0692942f5aaa..84066c1298df954145859773d4772e5cbe4538eb
        };
  
        cpus {
-               #address-cells = <0>;
+               #address-cells = <1>;
                #size-cells = <0>;
  
-               cpu {
+               cpu@0 {
                        compatible = "arm,arm926ej-s";
                        device_type = "cpu";
+                       reg = <0>;
                };
        };
  
-       memory {
+       memory@20000000 {
                device_type = "memory";
                reg = <0x20000000 0x10000000>;
        };
@@@ -61,6 -62,9 +62,9 @@@
        sram: sram@300000 {
                compatible = "mmio-sram";
                reg = <0x00300000 0x100000>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+               ranges = <0 0x00300000 0x100000>;
        };
  
        ahb {
                #size-cells = <1>;
                ranges;
  
 +              usb0: gadget@500000 {
 +                      #address-cells = <1>;
 +                      #size-cells = <0>;
 +                      compatible = "microchip,sam9x60-udc";
 +                      reg = <0x00500000 0x100000
 +                              0xf803c000 0x400>;
 +                      interrupts = <23 IRQ_TYPE_LEVEL_HIGH 2>;
 +                      clocks = <&pmc PMC_TYPE_PERIPHERAL 23>, <&pmc PMC_TYPE_CORE PMC_UTMI>;
 +                      clock-names = "pclk", "hclk";
 +                      assigned-clocks = <&pmc PMC_TYPE_CORE PMC_UTMI>;
 +                      assigned-clock-rates = <480000000>;
 +                      status = "disabled";
 +              };
 +
                usb1: ohci@600000 {
                        compatible = "atmel,at91rm9200-ohci", "usb-ohci";
                        reg = <0x00600000 0x100000>;
index ea15073f0c79cef2ab234b6f274993727a7cbcd8,ca6088c878551a4c7135ea4cb22c310192550f9c..2fc62ef0cb3e983bc7beae5ab9e4851ec064fc59
  
  #include "axp22x.dtsi"
  
+ &ir0 {
+       status = "okay";
+ };
  &mmc0 {
        vmmc-supply = <&reg_dcdc1>;
        bus-width = <4>;
  };
  
  &reg_dc1sw {
 -      regulator-min-microvolt = <3000000>;
 -      regulator-max-microvolt = <3000000>;
 +      regulator-min-microvolt = <3300000>;
 +      regulator-max-microvolt = <3300000>;
        regulator-name = "vcc-gmac-phy";
  };
  
  &reg_dcdc1 {
        regulator-always-on;
 -      regulator-min-microvolt = <3000000>;
 -      regulator-max-microvolt = <3000000>;
 -      regulator-name = "vcc-3v0";
 +      regulator-min-microvolt = <3300000>;
 +      regulator-max-microvolt = <3300000>;
 +      regulator-name = "vcc-3v3";
  };
  
  &reg_dcdc2 {
index d235b27cf372c2b9e18a080b4f6b3ea17ba2c19c,dce74d34d18ae6b514c13fccca3f4722adb46b54..6f2494dd6d60b60b5967ddc121d886d4ff00b253
@@@ -80,6 -80,7 +80,6 @@@ config ARCH_EXYNO
        select EXYNOS_CHIPID
        select EXYNOS_PM_DOMAINS if PM_GENERIC_DOMAINS
        select EXYNOS_PMU
 -      select HAVE_S3C2410_WATCHDOG if WATCHDOG
        select HAVE_S3C_RTC if RTC_CLASS
        select PINCTRL
        select PINCTRL_EXYNOS
@@@ -299,6 -300,13 +299,13 @@@ config ARCH_VEXPRES
          This enables support for the ARMv8 software model (Versatile
          Express).
  
+ config ARCH_VISCONTI
+       bool "Toshiba Visconti SoC Family"
+       select PINCTRL
+       select PINCTRL_VISCONTI
+       help
+         This enables support for Toshiba Visconti SoCs Family.
  config ARCH_VULCAN
        def_bool n
  
index 6c6053a18413df73635d7c352f263c5a5d9055f3,6a7b72708d74d8ebb29fa4f7a8116e065d17a758..10489e5086956b816af8ad2b76ebfef02341b7a1
@@@ -67,6 -67,7 +67,7 @@@
  
        timer {
                compatible = "arm,armv8-timer";
+               arm,no-tick-in-suspend;
                interrupts = <GIC_PPI 13
                                (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
                             <GIC_PPI 14
                                     <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>,
                                     <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>,
                                     <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>,
 -                                   <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>,
 -                                   <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
 +                                   <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
                        interrupt-names = "gp",
                                          "gpmmu",
                                          "pp",
                                          "pp2",
                                          "ppmmu2",
                                          "pp3",
 -                                        "ppmmu3",
 -                                        "pmu";
 +                                        "ppmmu3";
                        clocks = <&ccu CLK_BUS_GPU>, <&ccu CLK_GPU>;
                        clock-names = "bus", "core";
                        resets = <&ccu RST_BUS_GPU>;
index 39802066232e1e942cd0e20b11f633332d32c6e0,6a5fc55f0a4e9a24cb9e892087d8fff5ca9076c8..2cfeaf3b0a87685cc270b22f8e6bf862721e529f
                        reg = <0x66090000 0x1000>;
                        interrupts = <GIC_SPI 406 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&iprocslow>, <&iprocslow>;
-                       clock-names = "wdogclk", "apb_pclk";
+                       clock-names = "wdog_clk", "apb_pclk";
                };
  
                gpio_g: gpio@660a0000 {
                };
  
                qspi: spi@66470200 {
 -                      compatible = "brcm,spi-bcm-qspi", "brcm,spi-ns2-qspi";
 +                      compatible = "brcm,spi-ns2-qspi", "brcm,spi-bcm-qspi";
                        reg = <0x66470200 0x184>,
                                <0x66470000 0x124>,
                                <0x67017408 0x004>,
index 24aab3ea3f52399d35aec39abde89ae8250a99b2,6246cce2a15e470d483cae2fe01c5cb1d65b7fd0..829fea23d4ab174bb81df1a4f0b4735b9bd7cadf
@@@ -87,8 -87,8 +87,8 @@@
  
        i2c_max98504: i2c-gpio-0 {
                compatible = "i2c-gpio";
-               gpios = <&gpd0 1 GPIO_ACTIVE_HIGH /* SPK_AMP_SDA */
-                        &gpd0 0 GPIO_ACTIVE_HIGH /* SPK_AMP_SCL */ >;
+               sda-gpios = <&gpd0 1 GPIO_ACTIVE_HIGH>;
+               scl-gpios = <&gpd0 0 GPIO_ACTIVE_HIGH>;
                i2c-gpio,delay-us = <2>;
                #address-cells = <1>;
                #size-cells = <0>;
                reg = <0x27>;
                interrupt-parent = <&gpa1>;
                interrupts = <3 IRQ_TYPE_LEVEL_HIGH>;
 -              s3fwrn5,en-gpios = <&gpf1 4 GPIO_ACTIVE_HIGH>;
 -              s3fwrn5,fw-gpios = <&gpj0 2 GPIO_ACTIVE_HIGH>;
 +              en-gpios = <&gpf1 4 GPIO_ACTIVE_HIGH>;
 +              wake-gpios = <&gpj0 2 GPIO_ACTIVE_HIGH>;
        };
  };
  
index 903c0eb61290d320d719a83c5991e747a5afae61,c7890b6225878f903a6bc580247f00513b363e9c..f8d59433af01bdf4eb9d9efa59fa725150ab704a
@@@ -28,14 -28,18 +28,19 @@@ dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx
  dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx2160a-qds.dtb
  dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx2160a-rdb.dtb
  
 +dtb-$(CONFIG_ARCH_MXC) += imx8mm-beacon-kit.dtb
  dtb-$(CONFIG_ARCH_MXC) += imx8mm-evk.dtb
+ dtb-$(CONFIG_ARCH_MXC) += imx8mm-ddr4-evk.dtb
+ dtb-$(CONFIG_ARCH_MXC) += imx8mm-var-som-symphony.dtb
  dtb-$(CONFIG_ARCH_MXC) += imx8mn-evk.dtb
  dtb-$(CONFIG_ARCH_MXC) += imx8mn-ddr4-evk.dtb
+ dtb-$(CONFIG_ARCH_MXC) += imx8mn-var-som-symphony.dtb
  dtb-$(CONFIG_ARCH_MXC) += imx8mp-evk.dtb
  dtb-$(CONFIG_ARCH_MXC) += imx8mq-evk.dtb
  dtb-$(CONFIG_ARCH_MXC) += imx8mq-hummingboard-pulse.dtb
  dtb-$(CONFIG_ARCH_MXC) += imx8mq-librem5-devkit.dtb
+ dtb-$(CONFIG_ARCH_MXC) += imx8mq-librem5-r2.dtb
+ dtb-$(CONFIG_ARCH_MXC) += imx8mq-librem5-r3.dtb
  dtb-$(CONFIG_ARCH_MXC) += imx8mq-nitrogen.dtb
  dtb-$(CONFIG_ARCH_MXC) += imx8mq-phanbell.dtb
  dtb-$(CONFIG_ARCH_MXC) += imx8mq-pico-pi.dtb
index a5154f13a18e924386e370bd8efd015b7f9a0cc2,cad2dd790bec0b0b60a1b6a3ea50581e311dffc8..6038f66aefc10f3e14fe27bc3842933167bce225
                                reg = <0x30bd0000 0x10000>;
                                interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clk IMX8MP_CLK_SDMA1_ROOT>,
 -                                       <&clk IMX8MP_CLK_SDMA1_ROOT>;
 +                                       <&clk IMX8MP_CLK_AHB>;
                                clock-names = "ipg", "ahb";
                                #dma-cells = <3>;
                                fsl,sdma-ram-script-name = "imx/sdma/sdma-imx7d.bin";
                                reg = <0x30be0000 0x10000>;
                                interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>,
                                             <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>,
-                                            <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
+                                            <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clk IMX8MP_CLK_ENET1_ROOT>,
                                         <&clk IMX8MP_CLK_SIM_ENET_ROOT>,
                                         <&clk IMX8MP_CLK_ENET_TIMER>,
index 561fa792fe5a98508db38a739090551468655a5c,515b6d79c3a5cc97433ec3906eb8e3742ab38ada..5e0e7d0f1bc4eaf3803a40ea1820258cc7b1ff3e
                        tmu: tmu@30260000 {
                                compatible = "fsl,imx8mq-tmu";
                                reg = <0x30260000 0x10000>;
 -                              interrupt = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;
 +                              interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clk IMX8MQ_CLK_TMU_ROOT>;
                                little-endian;
                                fsl,tmu-range = <0xb0000 0xa0026 0x80048 0x70061>;
                                                  <&clk IMX8MQ_VIDEO_PLL1_OUT>;
                                assigned-clock-rates = <0>, <0>, <0>, <594000000>;
                                status = "disabled";
+                               port@0 {
+                                       lcdif_mipi_dsi: endpoint {
+                                               remote-endpoint = <&mipi_dsi_lcdif_in>;
+                                       };
+                               };
                        };
  
                        iomuxc: pinctrl@30330000 {
                        gpc: gpc@303a0000 {
                                compatible = "fsl,imx8mq-gpc";
                                reg = <0x303a0000 0x10000>;
+                               interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>;
                                interrupt-parent = <&gic>;
                                interrupt-controller;
                                #interrupt-cells = <3>;
                                };
                        };
  
+                       mipi_dsi: mipi-dsi@30a00000 {
+                               compatible = "fsl,imx8mq-nwl-dsi";
+                               reg = <0x30a00000 0x300>;
+                               clocks = <&clk IMX8MQ_CLK_DSI_CORE>,
+                                        <&clk IMX8MQ_CLK_DSI_AHB>,
+                                        <&clk IMX8MQ_CLK_DSI_IPG_DIV>,
+                                        <&clk IMX8MQ_CLK_DSI_PHY_REF>,
+                                        <&clk IMX8MQ_CLK_LCDIF_PIXEL>;
+                               clock-names = "core", "rx_esc", "tx_esc", "phy_ref", "lcdif";
+                               assigned-clocks = <&clk IMX8MQ_CLK_DSI_AHB>,
+                                                 <&clk IMX8MQ_CLK_DSI_CORE>,
+                                                 <&clk IMX8MQ_CLK_DSI_IPG_DIV>;
+                               assigned-clock-parents = <&clk IMX8MQ_SYS1_PLL_80M>,
+                                                        <&clk IMX8MQ_SYS1_PLL_266M>;
+                               assigned-clock-rates = <80000000>, <266000000>, <20000000>;
+                               interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
+                               mux-controls = <&mux 0>;
+                               power-domains = <&pgc_mipi>;
+                               phys = <&dphy>;
+                               phy-names = "dphy";
+                               resets = <&src IMX8MQ_RESET_MIPI_DSI_RESET_BYTE_N>,
+                                        <&src IMX8MQ_RESET_MIPI_DSI_DPI_RESET_N>,
+                                        <&src IMX8MQ_RESET_MIPI_DSI_ESC_RESET_N>,
+                                        <&src IMX8MQ_RESET_MIPI_DSI_PCLK_RESET_N>;
+                               reset-names = "byte", "dpi", "esc", "pclk";
+                               status = "disabled";
+                               ports {
+                                       #address-cells = <1>;
+                                       #size-cells = <0>;
+                                       port@0 {
+                                               reg = <0>;
+                                               #address-cells = <1>;
+                                               #size-cells = <0>;
+                                               mipi_dsi_lcdif_in: endpoint@0 {
+                                                       reg = <0>;
+                                                       remote-endpoint = <&lcdif_mipi_dsi>;
+                                               };
+                                       };
+                               };
+                       };
                        dphy: dphy@30a00300 {
                                compatible = "fsl,imx8mq-mipi-dphy";
                                reg = <0x30a00300 0x100>;
                                reg = <0x30be0000 0x10000>;
                                interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>,
                                             <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>,
-                                            <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
+                                            <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clk IMX8MQ_CLK_ENET1_ROOT>,
                                         <&clk IMX8MQ_CLK_ENET1_ROOT>,
                                         <&clk IMX8MQ_CLK_ENET_TIMER>,
index 8eb61dd9921ebf007c3af265e6bc6a2d09c84ca3,7869aeccee1a490396f5bcda04e1ba535e082e1e..0c46ab7bbbf376eecadb9f25b1b74abdd7ed2097
@@@ -85,7 -85,7 +85,7 @@@
                ranges = <0x02900000 0x0 0x02900000 0x200000>;
                status = "disabled";
  
-               dma-controller@2930000 {
+               adma: dma-controller@2930000 {
                        compatible = "nvidia,tegra186-adma";
                        reg = <0x02930000 0x20000>;
                        interrupt-parent = <&agic>;
                        clock-names = "clk";
                        status = "disabled";
                };
+               tegra_ahub: ahub@2900800 {
+                       compatible = "nvidia,tegra186-ahub";
+                       reg = <0x02900800 0x800>;
+                       clocks = <&bpmp TEGRA186_CLK_AHUB>;
+                       clock-names = "ahub";
+                       assigned-clocks = <&bpmp TEGRA186_CLK_AHUB>;
+                       assigned-clock-parents = <&bpmp TEGRA186_CLK_PLL_A_OUT0>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges = <0x02900800 0x02900800 0x11800>;
+                       status = "disabled";
+                       tegra_admaif: admaif@290f000 {
+                               compatible = "nvidia,tegra186-admaif";
+                               reg = <0x0290f000 0x1000>;
+                               dmas = <&adma 1>, <&adma 1>,
+                                      <&adma 2>, <&adma 2>,
+                                      <&adma 3>, <&adma 3>,
+                                      <&adma 4>, <&adma 4>,
+                                      <&adma 5>, <&adma 5>,
+                                      <&adma 6>, <&adma 6>,
+                                      <&adma 7>, <&adma 7>,
+                                      <&adma 8>, <&adma 8>,
+                                      <&adma 9>, <&adma 9>,
+                                      <&adma 10>, <&adma 10>,
+                                      <&adma 11>, <&adma 11>,
+                                      <&adma 12>, <&adma 12>,
+                                      <&adma 13>, <&adma 13>,
+                                      <&adma 14>, <&adma 14>,
+                                      <&adma 15>, <&adma 15>,
+                                      <&adma 16>, <&adma 16>,
+                                      <&adma 17>, <&adma 17>,
+                                      <&adma 18>, <&adma 18>,
+                                      <&adma 19>, <&adma 19>,
+                                      <&adma 20>, <&adma 20>;
+                               dma-names = "rx1", "tx1",
+                                           "rx2", "tx2",
+                                           "rx3", "tx3",
+                                           "rx4", "tx4",
+                                           "rx5", "tx5",
+                                           "rx6", "tx6",
+                                           "rx7", "tx7",
+                                           "rx8", "tx8",
+                                           "rx9", "tx9",
+                                           "rx10", "tx10",
+                                           "rx11", "tx11",
+                                           "rx12", "tx12",
+                                           "rx13", "tx13",
+                                           "rx14", "tx14",
+                                           "rx15", "tx15",
+                                           "rx16", "tx16",
+                                           "rx17", "tx17",
+                                           "rx18", "tx18",
+                                           "rx19", "tx19",
+                                           "rx20", "tx20";
+                               status = "disabled";
+                       };
+                       tegra_i2s1: i2s@2901000 {
+                               compatible = "nvidia,tegra186-i2s",
+                                            "nvidia,tegra210-i2s";
+                               reg = <0x2901000 0x100>;
+                               clocks = <&bpmp TEGRA186_CLK_I2S1>,
+                                        <&bpmp TEGRA186_CLK_I2S1_SYNC_INPUT>;
+                               clock-names = "i2s", "sync_input";
+                               assigned-clocks = <&bpmp TEGRA186_CLK_I2S1>;
+                               assigned-clock-parents = <&bpmp TEGRA186_CLK_PLL_A_OUT0>;
+                               assigned-clock-rates = <1536000>;
+                               sound-name-prefix = "I2S1";
+                               status = "disabled";
+                       };
+                       tegra_i2s2: i2s@2901100 {
+                               compatible = "nvidia,tegra186-i2s",
+                                            "nvidia,tegra210-i2s";
+                               reg = <0x2901100 0x100>;
+                               clocks = <&bpmp TEGRA186_CLK_I2S2>,
+                                        <&bpmp TEGRA186_CLK_I2S2_SYNC_INPUT>;
+                               clock-names = "i2s", "sync_input";
+                               assigned-clocks = <&bpmp TEGRA186_CLK_I2S2>;
+                               assigned-clock-parents = <&bpmp TEGRA186_CLK_PLL_A_OUT0>;
+                               assigned-clock-rates = <1536000>;
+                               sound-name-prefix = "I2S2";
+                               status = "disabled";
+                       };
+                       tegra_i2s3: i2s@2901200 {
+                               compatible = "nvidia,tegra186-i2s",
+                                            "nvidia,tegra210-i2s";
+                               reg = <0x2901200 0x100>;
+                               clocks = <&bpmp TEGRA186_CLK_I2S3>,
+                                        <&bpmp TEGRA186_CLK_I2S3_SYNC_INPUT>;
+                               clock-names = "i2s", "sync_input";
+                               assigned-clocks = <&bpmp TEGRA186_CLK_I2S3>;
+                               assigned-clock-parents = <&bpmp TEGRA186_CLK_PLL_A_OUT0>;
+                               assigned-clock-rates = <1536000>;
+                               sound-name-prefix = "I2S3";
+                               status = "disabled";
+                       };
+                       tegra_i2s4: i2s@2901300 {
+                               compatible = "nvidia,tegra186-i2s",
+                                            "nvidia,tegra210-i2s";
+                               reg = <0x2901300 0x100>;
+                               clocks = <&bpmp TEGRA186_CLK_I2S4>,
+                                        <&bpmp TEGRA186_CLK_I2S4_SYNC_INPUT>;
+                               clock-names = "i2s", "sync_input";
+                               assigned-clocks = <&bpmp TEGRA186_CLK_I2S4>;
+                               assigned-clock-parents = <&bpmp TEGRA186_CLK_PLL_A_OUT0>;
+                               assigned-clock-rates = <1536000>;
+                               sound-name-prefix = "I2S4";
+                               status = "disabled";
+                       };
+                       tegra_i2s5: i2s@2901400 {
+                               compatible = "nvidia,tegra186-i2s",
+                                            "nvidia,tegra210-i2s";
+                               reg = <0x2901400 0x100>;
+                               clocks = <&bpmp TEGRA186_CLK_I2S5>,
+                                        <&bpmp TEGRA186_CLK_I2S5_SYNC_INPUT>;
+                               clock-names = "i2s", "sync_input";
+                               assigned-clocks = <&bpmp TEGRA186_CLK_I2S5>;
+                               assigned-clock-parents = <&bpmp TEGRA186_CLK_PLL_A_OUT0>;
+                               assigned-clock-rates = <1536000>;
+                               sound-name-prefix = "I2S5";
+                               status = "disabled";
+                       };
+                       tegra_i2s6: i2s@2901500 {
+                               compatible = "nvidia,tegra186-i2s",
+                                            "nvidia,tegra210-i2s";
+                               reg = <0x2901500 0x100>;
+                               clocks = <&bpmp TEGRA186_CLK_I2S6>,
+                                        <&bpmp TEGRA186_CLK_I2S6_SYNC_INPUT>;
+                               clock-names = "i2s", "sync_input";
+                               assigned-clocks = <&bpmp TEGRA186_CLK_I2S6>;
+                               assigned-clock-parents = <&bpmp TEGRA186_CLK_PLL_A_OUT0>;
+                               assigned-clock-rates = <1536000>;
+                               sound-name-prefix = "I2S6";
+                               status = "disabled";
+                       };
+                       tegra_dmic1: dmic@2904000 {
+                               compatible = "nvidia,tegra210-dmic";
+                               reg = <0x2904000 0x100>;
+                               clocks = <&bpmp TEGRA186_CLK_DMIC1>;
+                               clock-names = "dmic";
+                               assigned-clocks = <&bpmp TEGRA186_CLK_DMIC1>;
+                               assigned-clock-parents = <&bpmp TEGRA186_CLK_PLL_A_OUT0>;
+                               assigned-clock-rates = <3072000>;
+                               sound-name-prefix = "DMIC1";
+                               status = "disabled";
+                       };
+                       tegra_dmic2: dmic@2904100 {
+                               compatible = "nvidia,tegra210-dmic";
+                               reg = <0x2904100 0x100>;
+                               clocks = <&bpmp TEGRA186_CLK_DMIC2>;
+                               clock-names = "dmic";
+                               assigned-clocks = <&bpmp TEGRA186_CLK_DMIC2>;
+                               assigned-clock-parents = <&bpmp TEGRA186_CLK_PLL_A_OUT0>;
+                               assigned-clock-rates = <3072000>;
+                               sound-name-prefix = "DMIC2";
+                               status = "disabled";
+                       };
+                       tegra_dmic3: dmic@2904200 {
+                               compatible = "nvidia,tegra210-dmic";
+                               reg = <0x2904200 0x100>;
+                               clocks = <&bpmp TEGRA186_CLK_DMIC3>;
+                               clock-names = "dmic";
+                               assigned-clocks = <&bpmp TEGRA186_CLK_DMIC3>;
+                               assigned-clock-parents = <&bpmp TEGRA186_CLK_PLL_A_OUT0>;
+                               assigned-clock-rates = <3072000>;
+                               sound-name-prefix = "DMIC3";
+                               status = "disabled";
+                       };
+                       tegra_dmic4: dmic@2904300 {
+                               compatible = "nvidia,tegra210-dmic";
+                               reg = <0x2904300 0x100>;
+                               clocks = <&bpmp TEGRA186_CLK_DMIC4>;
+                               clock-names = "dmic";
+                               assigned-clocks = <&bpmp TEGRA186_CLK_DMIC4>;
+                               assigned-clock-parents = <&bpmp TEGRA186_CLK_PLL_A_OUT0>;
+                               assigned-clock-rates = <3072000>;
+                               sound-name-prefix = "DMIC4";
+                               status = "disabled";
+                       };
+                       tegra_dspk1: dspk@2905000 {
+                               compatible = "nvidia,tegra186-dspk";
+                               reg = <0x2905000 0x100>;
+                               clocks = <&bpmp TEGRA186_CLK_DSPK1>;
+                               clock-names = "dspk";
+                               assigned-clocks = <&bpmp TEGRA186_CLK_DSPK1>;
+                               assigned-clock-parents = <&bpmp TEGRA186_CLK_PLL_A_OUT0>;
+                               assigned-clock-rates = <12288000>;
+                               sound-name-prefix = "DSPK1";
+                               status = "disabled";
+                       };
+                       tegra_dspk2: dspk@2905100 {
+                               compatible = "nvidia,tegra186-dspk";
+                               reg = <0x2905100 0x100>;
+                               clocks = <&bpmp TEGRA186_CLK_DSPK2>;
+                               clock-names = "dspk";
+                               assigned-clocks = <&bpmp TEGRA186_CLK_DSPK2>;
+                               assigned-clock-parents = <&bpmp TEGRA186_CLK_PLL_A_OUT0>;
+                               assigned-clock-rates = <12288000>;
+                               sound-name-prefix = "DSPK2";
+                               status = "disabled";
+                       };
+               };
        };
  
        mc: memory-controller@2c00000 {
                compatible = "nvidia,tegra186-sdhci";
                reg = <0x0 0x03400000 0x0 0x10000>;
                interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
 -              clocks = <&bpmp TEGRA186_CLK_SDMMC1>;
 -              clock-names = "sdhci";
 +              clocks = <&bpmp TEGRA186_CLK_SDMMC1>,
 +                       <&bpmp TEGRA186_CLK_SDMMC_LEGACY_TM>;
 +              clock-names = "sdhci", "tmclk";
                resets = <&bpmp TEGRA186_RESET_SDMMC1>;
                reset-names = "sdhci";
                interconnects = <&mc TEGRA186_MEMORY_CLIENT_SDMMCRA &emc>,
                compatible = "nvidia,tegra186-sdhci";
                reg = <0x0 0x03420000 0x0 0x10000>;
                interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;
 -              clocks = <&bpmp TEGRA186_CLK_SDMMC2>;
 -              clock-names = "sdhci";
 +              clocks = <&bpmp TEGRA186_CLK_SDMMC2>,
 +                       <&bpmp TEGRA186_CLK_SDMMC_LEGACY_TM>;
 +              clock-names = "sdhci", "tmclk";
                resets = <&bpmp TEGRA186_RESET_SDMMC2>;
                reset-names = "sdhci";
                interconnects = <&mc TEGRA186_MEMORY_CLIENT_SDMMCRAA &emc>,
                compatible = "nvidia,tegra186-sdhci";
                reg = <0x0 0x03440000 0x0 0x10000>;
                interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>;
 -              clocks = <&bpmp TEGRA186_CLK_SDMMC3>;
 -              clock-names = "sdhci";
 +              clocks = <&bpmp TEGRA186_CLK_SDMMC3>,
 +                       <&bpmp TEGRA186_CLK_SDMMC_LEGACY_TM>;
 +              clock-names = "sdhci", "tmclk";
                resets = <&bpmp TEGRA186_RESET_SDMMC3>;
                reset-names = "sdhci";
                interconnects = <&mc TEGRA186_MEMORY_CLIENT_SDMMCR &emc>,
                compatible = "nvidia,tegra186-sdhci";
                reg = <0x0 0x03460000 0x0 0x10000>;
                interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;
 -              clocks = <&bpmp TEGRA186_CLK_SDMMC4>;
 -              clock-names = "sdhci";
 +              clocks = <&bpmp TEGRA186_CLK_SDMMC4>,
 +                       <&bpmp TEGRA186_CLK_SDMMC_LEGACY_TM>;
 +              clock-names = "sdhci", "tmclk";
                assigned-clocks = <&bpmp TEGRA186_CLK_SDMMC4>,
                                  <&bpmp TEGRA186_CLK_PLLC4_VCO>;
                assigned-clock-parents = <&bpmp TEGRA186_CLK_PLLC4_VCO>;
index ca5cb6aef5ee43606bef3eb856a5760787ab851e,311c1c86d9b1fba92228fc67d8206430687bd3b2..e9c90f0f44ff78b011a120776c87b30acf5e7884
@@@ -83,7 -83,7 +83,7 @@@
                        ranges = <0x02900000 0x02900000 0x200000>;
                        status = "disabled";
  
-                       dma-controller@2930000 {
+                       adma: dma-controller@2930000 {
                                compatible = "nvidia,tegra194-adma",
                                             "nvidia,tegra186-adma";
                                reg = <0x02930000 0x20000>;
                                clock-names = "clk";
                                status = "disabled";
                        };
+                       tegra_ahub: ahub@2900800 {
+                               compatible = "nvidia,tegra194-ahub",
+                                            "nvidia,tegra186-ahub";
+                               reg = <0x02900800 0x800>;
+                               clocks = <&bpmp TEGRA194_CLK_AHUB>;
+                               clock-names = "ahub";
+                               assigned-clocks = <&bpmp TEGRA194_CLK_AHUB>;
+                               assigned-clock-parents = <&bpmp TEGRA194_CLK_PLLA_OUT0>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+                               ranges = <0x02900800 0x02900800 0x11800>;
+                               status = "disabled";
+                               tegra_admaif: admaif@290f000 {
+                                       compatible = "nvidia,tegra194-admaif",
+                                                    "nvidia,tegra186-admaif";
+                                       reg = <0x0290f000 0x1000>;
+                                       dmas = <&adma 1>, <&adma 1>,
+                                              <&adma 2>, <&adma 2>,
+                                              <&adma 3>, <&adma 3>,
+                                              <&adma 4>, <&adma 4>,
+                                              <&adma 5>, <&adma 5>,
+                                              <&adma 6>, <&adma 6>,
+                                              <&adma 7>, <&adma 7>,
+                                              <&adma 8>, <&adma 8>,
+                                              <&adma 9>, <&adma 9>,
+                                              <&adma 10>, <&adma 10>,
+                                              <&adma 11>, <&adma 11>,
+                                              <&adma 12>, <&adma 12>,
+                                              <&adma 13>, <&adma 13>,
+                                              <&adma 14>, <&adma 14>,
+                                              <&adma 15>, <&adma 15>,
+                                              <&adma 16>, <&adma 16>,
+                                              <&adma 17>, <&adma 17>,
+                                              <&adma 18>, <&adma 18>,
+                                              <&adma 19>, <&adma 19>,
+                                              <&adma 20>, <&adma 20>;
+                                       dma-names = "rx1", "tx1",
+                                                   "rx2", "tx2",
+                                                   "rx3", "tx3",
+                                                   "rx4", "tx4",
+                                                   "rx5", "tx5",
+                                                   "rx6", "tx6",
+                                                   "rx7", "tx7",
+                                                   "rx8", "tx8",
+                                                   "rx9", "tx9",
+                                                   "rx10", "tx10",
+                                                   "rx11", "tx11",
+                                                   "rx12", "tx12",
+                                                   "rx13", "tx13",
+                                                   "rx14", "tx14",
+                                                   "rx15", "tx15",
+                                                   "rx16", "tx16",
+                                                   "rx17", "tx17",
+                                                   "rx18", "tx18",
+                                                   "rx19", "tx19",
+                                                   "rx20", "tx20";
+                                       status = "disabled";
+                               };
+                               tegra_i2s1: i2s@2901000 {
+                                       compatible = "nvidia,tegra194-i2s",
+                                                    "nvidia,tegra210-i2s";
+                                       reg = <0x2901000 0x100>;
+                                       clocks = <&bpmp TEGRA194_CLK_I2S1>,
+                                                <&bpmp TEGRA194_CLK_I2S1_SYNC_INPUT>;
+                                       clock-names = "i2s", "sync_input";
+                                       assigned-clocks = <&bpmp TEGRA194_CLK_I2S1>;
+                                       assigned-clock-parents = <&bpmp TEGRA194_CLK_PLLA_OUT0>;
+                                       assigned-clock-rates = <1536000>;
+                                       sound-name-prefix = "I2S1";
+                                       status = "disabled";
+                               };
+                               tegra_i2s2: i2s@2901100 {
+                                       compatible = "nvidia,tegra194-i2s",
+                                                    "nvidia,tegra210-i2s";
+                                       reg = <0x2901100 0x100>;
+                                       clocks = <&bpmp TEGRA194_CLK_I2S2>,
+                                                <&bpmp TEGRA194_CLK_I2S2_SYNC_INPUT>;
+                                       clock-names = "i2s", "sync_input";
+                                       assigned-clocks = <&bpmp TEGRA194_CLK_I2S2>;
+                                       assigned-clock-parents = <&bpmp TEGRA194_CLK_PLLA_OUT0>;
+                                       assigned-clock-rates = <1536000>;
+                                       sound-name-prefix = "I2S2";
+                                       status = "disabled";
+                               };
+                               tegra_i2s3: i2s@2901200 {
+                                       compatible = "nvidia,tegra194-i2s",
+                                                    "nvidia,tegra210-i2s";
+                                       reg = <0x2901200 0x100>;
+                                       clocks = <&bpmp TEGRA194_CLK_I2S3>,
+                                                <&bpmp TEGRA194_CLK_I2S3_SYNC_INPUT>;
+                                       clock-names = "i2s", "sync_input";
+                                       assigned-clocks = <&bpmp TEGRA194_CLK_I2S3>;
+                                       assigned-clock-parents = <&bpmp TEGRA194_CLK_PLLA_OUT0>;
+                                       assigned-clock-rates = <1536000>;
+                                       sound-name-prefix = "I2S3";
+                                       status = "disabled";
+                               };
+                               tegra_i2s4: i2s@2901300 {
+                                       compatible = "nvidia,tegra194-i2s",
+                                                    "nvidia,tegra210-i2s";
+                                       reg = <0x2901300 0x100>;
+                                       clocks = <&bpmp TEGRA194_CLK_I2S4>,
+                                                <&bpmp TEGRA194_CLK_I2S4_SYNC_INPUT>;
+                                       clock-names = "i2s", "sync_input";
+                                       assigned-clocks = <&bpmp TEGRA194_CLK_I2S4>;
+                                       assigned-clock-parents = <&bpmp TEGRA194_CLK_PLLA_OUT0>;
+                                       assigned-clock-rates = <1536000>;
+                                       sound-name-prefix = "I2S4";
+                                       status = "disabled";
+                               };
+                               tegra_i2s5: i2s@2901400 {
+                                       compatible = "nvidia,tegra194-i2s",
+                                                    "nvidia,tegra210-i2s";
+                                       reg = <0x2901400 0x100>;
+                                       clocks = <&bpmp TEGRA194_CLK_I2S5>,
+                                                <&bpmp TEGRA194_CLK_I2S5_SYNC_INPUT>;
+                                       clock-names = "i2s", "sync_input";
+                                       assigned-clocks = <&bpmp TEGRA194_CLK_I2S5>;
+                                       assigned-clock-parents = <&bpmp TEGRA194_CLK_PLLA_OUT0>;
+                                       assigned-clock-rates = <1536000>;
+                                       sound-name-prefix = "I2S5";
+                                       status = "disabled";
+                               };
+                               tegra_i2s6: i2s@2901500 {
+                                       compatible = "nvidia,tegra194-i2s",
+                                                    "nvidia,tegra210-i2s";
+                                       reg = <0x2901500 0x100>;
+                                       clocks = <&bpmp TEGRA194_CLK_I2S6>,
+                                                <&bpmp TEGRA194_CLK_I2S6_SYNC_INPUT>;
+                                       clock-names = "i2s", "sync_input";
+                                       assigned-clocks = <&bpmp TEGRA194_CLK_I2S6>;
+                                       assigned-clock-parents = <&bpmp TEGRA194_CLK_PLLA_OUT0>;
+                                       assigned-clock-rates = <1536000>;
+                                       sound-name-prefix = "I2S6";
+                                       status = "disabled";
+                               };
+                               tegra_dmic1: dmic@2904000 {
+                                       compatible = "nvidia,tegra194-dmic",
+                                                    "nvidia,tegra210-dmic";
+                                       reg = <0x2904000 0x100>;
+                                       clocks = <&bpmp TEGRA194_CLK_DMIC1>;
+                                       clock-names = "dmic";
+                                       assigned-clocks = <&bpmp TEGRA194_CLK_DMIC1>;
+                                       assigned-clock-parents = <&bpmp TEGRA194_CLK_PLLA_OUT0>;
+                                       assigned-clock-rates = <3072000>;
+                                       sound-name-prefix = "DMIC1";
+                                       status = "disabled";
+                               };
+                               tegra_dmic2: dmic@2904100 {
+                                       compatible = "nvidia,tegra194-dmic",
+                                                    "nvidia,tegra210-dmic";
+                                       reg = <0x2904100 0x100>;
+                                       clocks = <&bpmp TEGRA194_CLK_DMIC2>;
+                                       clock-names = "dmic";
+                                       assigned-clocks = <&bpmp TEGRA194_CLK_DMIC2>;
+                                       assigned-clock-parents = <&bpmp TEGRA194_CLK_PLLA_OUT0>;
+                                       assigned-clock-rates = <3072000>;
+                                       sound-name-prefix = "DMIC2";
+                                       status = "disabled";
+                               };
+                               tegra_dmic3: dmic@2904200 {
+                                       compatible = "nvidia,tegra194-dmic",
+                                                    "nvidia,tegra210-dmic";
+                                       reg = <0x2904200 0x100>;
+                                       clocks = <&bpmp TEGRA194_CLK_DMIC3>;
+                                       clock-names = "dmic";
+                                       assigned-clocks = <&bpmp TEGRA194_CLK_DMIC3>;
+                                       assigned-clock-parents = <&bpmp TEGRA194_CLK_PLLA_OUT0>;
+                                       assigned-clock-rates = <3072000>;
+                                       sound-name-prefix = "DMIC3";
+                                       status = "disabled";
+                               };
+                               tegra_dmic4: dmic@2904300 {
+                                       compatible = "nvidia,tegra194-dmic",
+                                                    "nvidia,tegra210-dmic";
+                                       reg = <0x2904300 0x100>;
+                                       clocks = <&bpmp TEGRA194_CLK_DMIC4>;
+                                       clock-names = "dmic";
+                                       assigned-clocks = <&bpmp TEGRA194_CLK_DMIC4>;
+                                       assigned-clock-parents = <&bpmp TEGRA194_CLK_PLLA_OUT0>;
+                                       assigned-clock-rates = <3072000>;
+                                       sound-name-prefix = "DMIC4";
+                                       status = "disabled";
+                               };
+                               tegra_dspk1: dspk@2905000 {
+                                       compatible = "nvidia,tegra194-dspk",
+                                                    "nvidia,tegra186-dspk";
+                                       reg = <0x2905000 0x100>;
+                                       clocks = <&bpmp TEGRA194_CLK_DSPK1>;
+                                       clock-names = "dspk";
+                                       assigned-clocks = <&bpmp TEGRA194_CLK_DSPK1>;
+                                       assigned-clock-parents = <&bpmp TEGRA194_CLK_PLLA_OUT0>;
+                                       assigned-clock-rates = <12288000>;
+                                       sound-name-prefix = "DSPK1";
+                                       status = "disabled";
+                               };
+                               tegra_dspk2: dspk@2905100 {
+                                       compatible = "nvidia,tegra194-dspk",
+                                                    "nvidia,tegra186-dspk";
+                                       reg = <0x2905100 0x100>;
+                                       clocks = <&bpmp TEGRA194_CLK_DSPK2>;
+                                       clock-names = "dspk";
+                                       assigned-clocks = <&bpmp TEGRA194_CLK_DSPK2>;
+                                       assigned-clock-parents = <&bpmp TEGRA194_CLK_PLLA_OUT0>;
+                                       assigned-clock-rates = <12288000>;
+                                       sound-name-prefix = "DSPK2";
+                                       status = "disabled";
+                               };
+                       };
                };
  
                pinmux: pinmux@2430000 {
                        clock-names = "div-clk";
                        resets = <&bpmp TEGRA194_RESET_I2C4>;
                        reset-names = "i2c";
+                       pinctrl-0 = <&state_dpaux1_i2c>;
+                       pinctrl-1 = <&state_dpaux1_off>;
+                       pinctrl-names = "default", "idle";
                        status = "disabled";
                };
  
                        clock-names = "div-clk";
                        resets = <&bpmp TEGRA194_RESET_I2C6>;
                        reset-names = "i2c";
+                       pinctrl-0 = <&state_dpaux0_i2c>;
+                       pinctrl-1 = <&state_dpaux0_off>;
+                       pinctrl-names = "default", "idle";
                        status = "disabled";
                };
  
-               gen7_i2c: i2c@31c0000 {
+               /* shares pads with dpaux2 */
+               dp_aux_ch2_i2c: i2c@31c0000 {
                        compatible = "nvidia,tegra194-i2c";
                        reg = <0x031c0000 0x10000>;
                        interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
                        clock-names = "div-clk";
                        resets = <&bpmp TEGRA194_RESET_I2C7>;
                        reset-names = "i2c";
+                       pinctrl-0 = <&state_dpaux2_i2c>;
+                       pinctrl-1 = <&state_dpaux2_off>;
+                       pinctrl-names = "default", "idle";
                        status = "disabled";
                };
  
-               gen9_i2c: i2c@31e0000 {
+               /* shares pads with dpaux3 */
+               dp_aux_ch3_i2c: i2c@31e0000 {
                        compatible = "nvidia,tegra194-i2c";
                        reg = <0x031e0000 0x10000>;
                        interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
                        clock-names = "div-clk";
                        resets = <&bpmp TEGRA194_RESET_I2C9>;
                        reset-names = "i2c";
+                       pinctrl-0 = <&state_dpaux3_i2c>;
+                       pinctrl-1 = <&state_dpaux3_off>;
+                       pinctrl-names = "default", "idle";
                        status = "disabled";
                };
  
                        compatible = "nvidia,tegra194-sdhci";
                        reg = <0x03400000 0x10000>;
                        interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
 -                      clocks = <&bpmp TEGRA194_CLK_SDMMC1>;
 -                      clock-names = "sdhci";
 +                      clocks = <&bpmp TEGRA194_CLK_SDMMC1>,
 +                               <&bpmp TEGRA194_CLK_SDMMC_LEGACY_TM>;
 +                      clock-names = "sdhci", "tmclk";
                        resets = <&bpmp TEGRA194_RESET_SDMMC1>;
                        reset-names = "sdhci";
                        interconnects = <&mc TEGRA194_MEMORY_CLIENT_SDMMCRA &emc>,
                        compatible = "nvidia,tegra194-sdhci";
                        reg = <0x03440000 0x10000>;
                        interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>;
 -                      clocks = <&bpmp TEGRA194_CLK_SDMMC3>;
 -                      clock-names = "sdhci";
 +                      clocks = <&bpmp TEGRA194_CLK_SDMMC3>,
 +                               <&bpmp TEGRA194_CLK_SDMMC_LEGACY_TM>;
 +                      clock-names = "sdhci", "tmclk";
                        resets = <&bpmp TEGRA194_RESET_SDMMC3>;
                        reset-names = "sdhci";
                        interconnects = <&mc TEGRA194_MEMORY_CLIENT_SDMMCR &emc>,
                        compatible = "nvidia,tegra194-sdhci";
                        reg = <0x03460000 0x10000>;
                        interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;
 -                      clocks = <&bpmp TEGRA194_CLK_SDMMC4>;
 -                      clock-names = "sdhci";
 +                      clocks = <&bpmp TEGRA194_CLK_SDMMC4>,
 +                               <&bpmp TEGRA194_CLK_SDMMC_LEGACY_TM>;
 +                      clock-names = "sdhci", "tmclk";
                        assigned-clocks = <&bpmp TEGRA194_CLK_SDMMC4>,
                                          <&bpmp TEGRA194_CLK_PLLC4>;
                        assigned-clock-parents =
  
                gpu@17000000 {
                        compatible = "nvidia,gv11b";
-                       reg = <0x17000000 0x10000000>,
-                             <0x18000000 0x10000000>;
+                       reg = <0x17000000 0x1000000>,
+                             <0x18000000 0x1000000>;
                        interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>,
                                     <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
                        interrupt-names = "stall", "nonstall";
index 8cca2166a446ab7e384ae8236bb4ab95863301b4,0b288308ef8b737dd0fdbae36784457dd0fb5a1a..d47c88950d38d0084df59b6d211602869da94f42
  
                        iommus = <&mc TEGRA_SWGROUP_DC>;
  
+                       nvidia,outputs = <&dsia &dsib &sor0 &sor1>;
                        nvidia,head = <0>;
                };
  
  
                        iommus = <&mc TEGRA_SWGROUP_DCB>;
  
+                       nvidia,outputs = <&dsia &dsib &sor0 &sor1>;
                        nvidia,head = <1>;
                };
  
-               dsi@54300000 {
+               dsia: dsi@54300000 {
                        compatible = "nvidia,tegra210-dsi";
                        reg = <0x0 0x54300000 0x0 0x00040000>;
                        clocks = <&tegra_car TEGRA210_CLK_DSIA>,
                        status = "disabled";
                };
  
-               dsi@54400000 {
+               dsib: dsi@54400000 {
                        compatible = "nvidia,tegra210-dsi";
                        reg = <0x0 0x54400000 0x0 0x00040000>;
                        clocks = <&tegra_car TEGRA210_CLK_DSIB>,
                        status = "disabled";
                };
  
-               sor@54540000 {
+               sor0: sor@54540000 {
                        compatible = "nvidia,tegra210-sor";
                        reg = <0x0 0x54540000 0x0 0x00040000>;
                        interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
                        status = "disabled";
                };
  
-               sor@54580000 {
+               sor1: sor@54580000 {
                        compatible = "nvidia,tegra210-sor1";
                        reg = <0x0 0x54580000 0x0 0x00040000>;
                        interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
                compatible = "nvidia,tegra210-sdhci";
                reg = <0x0 0x700b0000 0x0 0x200>;
                interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
 -              clocks = <&tegra_car TEGRA210_CLK_SDMMC1>;
 -              clock-names = "sdhci";
 +              clocks = <&tegra_car TEGRA210_CLK_SDMMC1>,
 +                       <&tegra_car TEGRA210_CLK_SDMMC_LEGACY>;
 +              clock-names = "sdhci", "tmclk";
                resets = <&tegra_car 14>;
                reset-names = "sdhci";
                pinctrl-names = "sdmmc-3v3", "sdmmc-1v8",
                compatible = "nvidia,tegra210-sdhci";
                reg = <0x0 0x700b0200 0x0 0x200>;
                interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
 -              clocks = <&tegra_car TEGRA210_CLK_SDMMC2>;
 -              clock-names = "sdhci";
 +              clocks = <&tegra_car TEGRA210_CLK_SDMMC2>,
 +                       <&tegra_car TEGRA210_CLK_SDMMC_LEGACY>;
 +              clock-names = "sdhci", "tmclk";
                resets = <&tegra_car 9>;
                reset-names = "sdhci";
                pinctrl-names = "sdmmc-1v8-drv";
                compatible = "nvidia,tegra210-sdhci";
                reg = <0x0 0x700b0400 0x0 0x200>;
                interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
 -              clocks = <&tegra_car TEGRA210_CLK_SDMMC3>;
 -              clock-names = "sdhci";
 +              clocks = <&tegra_car TEGRA210_CLK_SDMMC3>,
 +                       <&tegra_car TEGRA210_CLK_SDMMC_LEGACY>;
 +              clock-names = "sdhci", "tmclk";
                resets = <&tegra_car 69>;
                reset-names = "sdhci";
                pinctrl-names = "sdmmc-3v3", "sdmmc-1v8",
                compatible = "nvidia,tegra210-sdhci";
                reg = <0x0 0x700b0600 0x0 0x200>;
                interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
 -              clocks = <&tegra_car TEGRA210_CLK_SDMMC4>;
 -              clock-names = "sdhci";
 +              clocks = <&tegra_car TEGRA210_CLK_SDMMC4>,
 +                       <&tegra_car TEGRA210_CLK_SDMMC_LEGACY>;
 +              clock-names = "sdhci", "tmclk";
                resets = <&tegra_car 15>;
                reset-names = "sdhci";
                pinctrl-names = "sdmmc-3v3-drv", "sdmmc-1v8-drv";
                        clock-names = "clk";
                        status = "disabled";
                };
+               tegra_ahub: ahub@702d0800 {
+                       compatible = "nvidia,tegra210-ahub";
+                       reg = <0x702d0800 0x800>;
+                       clocks = <&tegra_car TEGRA210_CLK_D_AUDIO>;
+                       clock-names = "ahub";
+                       assigned-clocks = <&tegra_car TEGRA210_CLK_D_AUDIO>;
+                       assigned-clock-parents = <&tegra_car TEGRA210_CLK_PLL_A_OUT0>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges = <0x702d0000 0x702d0000 0x0000e400>;
+                       status = "disabled";
+                       tegra_admaif: admaif@702d0000 {
+                               compatible = "nvidia,tegra210-admaif";
+                               reg = <0x702d0000 0x800>;
+                               dmas = <&adma 1>,  <&adma 1>,
+                                      <&adma 2>,  <&adma 2>,
+                                      <&adma 3>,  <&adma 3>,
+                                      <&adma 4>,  <&adma 4>,
+                                      <&adma 5>,  <&adma 5>,
+                                      <&adma 6>,  <&adma 6>,
+                                      <&adma 7>,  <&adma 7>,
+                                      <&adma 8>,  <&adma 8>,
+                                      <&adma 9>,  <&adma 9>,
+                                      <&adma 10>, <&adma 10>;
+                               dma-names = "rx1",  "tx1",
+                                           "rx2",  "tx2",
+                                           "rx3",  "tx3",
+                                           "rx4",  "tx4",
+                                           "rx5",  "tx5",
+                                           "rx6",  "tx6",
+                                           "rx7",  "tx7",
+                                           "rx8",  "tx8",
+                                           "rx9",  "tx9",
+                                           "rx10", "tx10";
+                               status = "disabled";
+                       };
+                       tegra_i2s1: i2s@702d1000 {
+                               compatible = "nvidia,tegra210-i2s";
+                               reg = <0x702d1000 0x100>;
+                               clocks = <&tegra_car TEGRA210_CLK_I2S0>,
+                                        <&tegra_car TEGRA210_CLK_I2S0_SYNC>;
+                               clock-names = "i2s", "sync_input";
+                               assigned-clocks = <&tegra_car TEGRA210_CLK_I2S0>;
+                               assigned-clock-parents = <&tegra_car TEGRA210_CLK_PLL_A_OUT0>;
+                               assigned-clock-rates = <1536000>;
+                               sound-name-prefix = "I2S1";
+                               status = "disabled";
+                       };
+                       tegra_i2s2: i2s@702d1100 {
+                               compatible = "nvidia,tegra210-i2s";
+                               reg = <0x702d1100 0x100>;
+                               clocks = <&tegra_car TEGRA210_CLK_I2S1>,
+                                        <&tegra_car TEGRA210_CLK_I2S1_SYNC>;
+                               clock-names = "i2s", "sync_input";
+                               assigned-clocks = <&tegra_car TEGRA210_CLK_I2S1>;
+                               assigned-clock-parents = <&tegra_car TEGRA210_CLK_PLL_A_OUT0>;
+                               assigned-clock-rates = <1536000>;
+                               sound-name-prefix = "I2S2";
+                               status = "disabled";
+                       };
+                       tegra_i2s3: i2s@702d1200 {
+                               compatible = "nvidia,tegra210-i2s";
+                               reg = <0x702d1200 0x100>;
+                               clocks = <&tegra_car TEGRA210_CLK_I2S2>,
+                                        <&tegra_car TEGRA210_CLK_I2S2_SYNC>;
+                               clock-names = "i2s", "sync_input";
+                               assigned-clocks = <&tegra_car TEGRA210_CLK_I2S2>;
+                               assigned-clock-parents = <&tegra_car TEGRA210_CLK_PLL_A_OUT0>;
+                               assigned-clock-rates = <1536000>;
+                               sound-name-prefix = "I2S3";
+                               status = "disabled";
+                       };
+                       tegra_i2s4: i2s@702d1300 {
+                               compatible = "nvidia,tegra210-i2s";
+                               reg = <0x702d1300 0x100>;
+                               clocks = <&tegra_car TEGRA210_CLK_I2S3>,
+                                        <&tegra_car TEGRA210_CLK_I2S3_SYNC>;
+                               clock-names = "i2s", "sync_input";
+                               assigned-clocks = <&tegra_car TEGRA210_CLK_I2S3>;
+                               assigned-clock-parents = <&tegra_car TEGRA210_CLK_PLL_A_OUT0>;
+                               assigned-clock-rates = <1536000>;
+                               sound-name-prefix = "I2S4";
+                               status = "disabled";
+                       };
+                       tegra_i2s5: i2s@702d1400 {
+                               compatible = "nvidia,tegra210-i2s";
+                               reg = <0x702d1400 0x100>;
+                               clocks = <&tegra_car TEGRA210_CLK_I2S4>,
+                                        <&tegra_car TEGRA210_CLK_I2S4_SYNC>;
+                               clock-names = "i2s", "sync_input";
+                               assigned-clocks = <&tegra_car TEGRA210_CLK_I2S4>;
+                               assigned-clock-parents = <&tegra_car TEGRA210_CLK_PLL_A_OUT0>;
+                               assigned-clock-rates = <1536000>;
+                               sound-name-prefix = "I2S5";
+                               status = "disabled";
+                       };
+                       tegra_dmic1: dmic@702d4000 {
+                               compatible = "nvidia,tegra210-dmic";
+                               reg = <0x702d4000 0x100>;
+                               clocks = <&tegra_car TEGRA210_CLK_DMIC1>;
+                               clock-names = "dmic";
+                               assigned-clocks = <&tegra_car TEGRA210_CLK_DMIC1>;
+                               assigned-clock-parents = <&tegra_car TEGRA210_CLK_PLL_A_OUT0>;
+                               assigned-clock-rates = <3072000>;
+                               sound-name-prefix = "DMIC1";
+                               status = "disabled";
+                       };
+                       tegra_dmic2: dmic@702d4100 {
+                               compatible = "nvidia,tegra210-dmic";
+                               reg = <0x702d4100 0x100>;
+                               clocks = <&tegra_car TEGRA210_CLK_DMIC2>;
+                               clock-names = "dmic";
+                               assigned-clocks = <&tegra_car TEGRA210_CLK_DMIC2>;
+                               assigned-clock-parents = <&tegra_car TEGRA210_CLK_PLL_A_OUT0>;
+                               assigned-clock-rates = <3072000>;
+                               sound-name-prefix = "DMIC2";
+                               status = "disabled";
+                       };
+                       tegra_dmic3: dmic@702d4200 {
+                               compatible = "nvidia,tegra210-dmic";
+                               reg = <0x702d4200 0x100>;
+                               clocks = <&tegra_car TEGRA210_CLK_DMIC3>;
+                               clock-names = "dmic";
+                               assigned-clocks = <&tegra_car TEGRA210_CLK_DMIC3>;
+                               assigned-clock-parents = <&tegra_car TEGRA210_CLK_PLL_A_OUT0>;
+                               assigned-clock-rates = <3072000>;
+                               sound-name-prefix = "DMIC3";
+                               status = "disabled";
+                       };
+               };
        };
  
        spi@70410000 {
index eca81cffd2c197fbe4bfcbfaf1ff62eb9f0529d5,d3737ffbf8246ff735982d093fdf1886fd4f9fc1..40e8c11f23ab0f336e2ec964769e4aada3d51e92
                        dynamic-power-coefficient = <100>;
                        qcom,freq-domain = <&cpufreq_hw 0>;
                        operating-points-v2 = <&cpu0_opp_table>;
-                       interconnects = <&gladiator_noc MASTER_APPSS_PROC &mem_noc SLAVE_EBI1>,
+                       interconnects = <&gladiator_noc MASTER_APPSS_PROC 3 &mem_noc SLAVE_EBI1 3>,
                                        <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
                        #cooling-cells = <2>;
                        next-level-cache = <&L2_0>;
                        dynamic-power-coefficient = <100>;
                        qcom,freq-domain = <&cpufreq_hw 0>;
                        operating-points-v2 = <&cpu0_opp_table>;
-                       interconnects = <&gladiator_noc MASTER_APPSS_PROC &mem_noc SLAVE_EBI1>,
+                       interconnects = <&gladiator_noc MASTER_APPSS_PROC 3 &mem_noc SLAVE_EBI1 3>,
                                        <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
                        #cooling-cells = <2>;
                        next-level-cache = <&L2_100>;
                        dynamic-power-coefficient = <100>;
                        qcom,freq-domain = <&cpufreq_hw 0>;
                        operating-points-v2 = <&cpu0_opp_table>;
-                       interconnects = <&gladiator_noc MASTER_APPSS_PROC &mem_noc SLAVE_EBI1>,
+                       interconnects = <&gladiator_noc MASTER_APPSS_PROC 3 &mem_noc SLAVE_EBI1 3>,
                                        <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
                        #cooling-cells = <2>;
                        next-level-cache = <&L2_200>;
                        dynamic-power-coefficient = <100>;
                        qcom,freq-domain = <&cpufreq_hw 0>;
                        operating-points-v2 = <&cpu0_opp_table>;
-                       interconnects = <&gladiator_noc MASTER_APPSS_PROC &mem_noc SLAVE_EBI1>,
+                       interconnects = <&gladiator_noc MASTER_APPSS_PROC 3 &mem_noc SLAVE_EBI1 3>,
                                        <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
                        #cooling-cells = <2>;
                        next-level-cache = <&L2_300>;
                        dynamic-power-coefficient = <396>;
                        qcom,freq-domain = <&cpufreq_hw 1>;
                        operating-points-v2 = <&cpu4_opp_table>;
-                       interconnects = <&gladiator_noc MASTER_APPSS_PROC &mem_noc SLAVE_EBI1>,
+                       interconnects = <&gladiator_noc MASTER_APPSS_PROC 3 &mem_noc SLAVE_EBI1 3>,
                                        <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
                        #cooling-cells = <2>;
                        next-level-cache = <&L2_400>;
                        dynamic-power-coefficient = <396>;
                        qcom,freq-domain = <&cpufreq_hw 1>;
                        operating-points-v2 = <&cpu4_opp_table>;
-                       interconnects = <&gladiator_noc MASTER_APPSS_PROC &mem_noc SLAVE_EBI1>,
+                       interconnects = <&gladiator_noc MASTER_APPSS_PROC 3 &mem_noc SLAVE_EBI1 3>,
                                        <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
                        #cooling-cells = <2>;
                        next-level-cache = <&L2_500>;
                        dynamic-power-coefficient = <396>;
                        qcom,freq-domain = <&cpufreq_hw 1>;
                        operating-points-v2 = <&cpu4_opp_table>;
-                       interconnects = <&gladiator_noc MASTER_APPSS_PROC &mem_noc SLAVE_EBI1>,
+                       interconnects = <&gladiator_noc MASTER_APPSS_PROC 3 &mem_noc SLAVE_EBI1 3>,
                                        <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
                        #cooling-cells = <2>;
                        next-level-cache = <&L2_600>;
                        dynamic-power-coefficient = <396>;
                        qcom,freq-domain = <&cpufreq_hw 1>;
                        operating-points-v2 = <&cpu4_opp_table>;
-                       interconnects = <&gladiator_noc MASTER_APPSS_PROC &mem_noc SLAVE_EBI1>,
+                       interconnects = <&gladiator_noc MASTER_APPSS_PROC 3 &mem_noc SLAVE_EBI1 3>,
                                        <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
                        #cooling-cells = <2>;
                        next-level-cache = <&L2_700>;
                qup_opp_table: qup-opp-table {
                        compatible = "operating-points-v2";
  
 -                      opp-19200000 {
 -                              opp-hz = /bits/ 64 <19200000>;
 +                      opp-50000000 {
 +                              opp-hz = /bits/ 64 <50000000>;
                                required-opps = <&rpmhpd_opp_min_svs>;
                        };
  
                                opp-hz = /bits/ 64 <100000000>;
                                required-opps = <&rpmhpd_opp_svs>;
                        };
 +
 +                      opp-128000000 {
 +                              opp-hz = /bits/ 64 <128000000>;
 +                              required-opps = <&rpmhpd_opp_nom>;
 +                      };
                };
  
                qupv3_id_0: geniqup@8c0000 {
                mem_noc: interconnect@1380000 {
                        compatible = "qcom,sdm845-mem-noc";
                        reg = <0 0x01380000 0 0x27200>;
-                       #interconnect-cells = <1>;
+                       #interconnect-cells = <2>;
                        qcom,bcm-voters = <&apps_bcm_voter>;
                };
  
                dc_noc: interconnect@14e0000 {
                        compatible = "qcom,sdm845-dc-noc";
                        reg = <0 0x014e0000 0 0x400>;
-                       #interconnect-cells = <1>;
+                       #interconnect-cells = <2>;
                        qcom,bcm-voters = <&apps_bcm_voter>;
                };
  
                config_noc: interconnect@1500000 {
                        compatible = "qcom,sdm845-config-noc";
                        reg = <0 0x01500000 0 0x5080>;
-                       #interconnect-cells = <1>;
+                       #interconnect-cells = <2>;
                        qcom,bcm-voters = <&apps_bcm_voter>;
                };
  
                system_noc: interconnect@1620000 {
                        compatible = "qcom,sdm845-system-noc";
                        reg = <0 0x01620000 0 0x18080>;
-                       #interconnect-cells = <1>;
+                       #interconnect-cells = <2>;
                        qcom,bcm-voters = <&apps_bcm_voter>;
                };
  
                aggre1_noc: interconnect@16e0000 {
                        compatible = "qcom,sdm845-aggre1-noc";
                        reg = <0 0x016e0000 0 0x15080>;
-                       #interconnect-cells = <1>;
+                       #interconnect-cells = <2>;
                        qcom,bcm-voters = <&apps_bcm_voter>;
                };
  
                aggre2_noc: interconnect@1700000 {
                        compatible = "qcom,sdm845-aggre2-noc";
                        reg = <0 0x01700000 0 0x1f300>;
-                       #interconnect-cells = <1>;
+                       #interconnect-cells = <2>;
                        qcom,bcm-voters = <&apps_bcm_voter>;
                };
  
                mmss_noc: interconnect@1740000 {
                        compatible = "qcom,sdm845-mmss-noc";
                        reg = <0 0x01740000 0 0x1c100>;
-                       #interconnect-cells = <1>;
+                       #interconnect-cells = <2>;
                        qcom,bcm-voters = <&apps_bcm_voter>;
                };
  
                        clocks = <&rpmhcc RPMH_IPA_CLK>;
                        clock-names = "core";
  
-                       interconnects = <&aggre2_noc MASTER_IPA &mem_noc SLAVE_EBI1>,
-                                       <&aggre2_noc MASTER_IPA &system_noc SLAVE_IMEM>,
-                                       <&gladiator_noc MASTER_APPSS_PROC &config_noc SLAVE_IPA_CFG>;
+                       interconnects = <&aggre2_noc MASTER_IPA 0 &mem_noc SLAVE_EBI1 0>,
+                                       <&aggre2_noc MASTER_IPA 0 &system_noc SLAVE_IMEM 0>,
+                                       <&gladiator_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_IPA_CFG 0>;
                        interconnect-names = "memory",
                                             "imem",
                                             "config";
  
                        resets = <&gcc GCC_USB30_PRIM_BCR>;
  
-                       interconnects = <&aggre2_noc MASTER_USB3_0 &mem_noc SLAVE_EBI1>,
-                                       <&gladiator_noc MASTER_APPSS_PROC &config_noc SLAVE_USB3_0>;
+                       interconnects = <&aggre2_noc MASTER_USB3_0 0 &mem_noc SLAVE_EBI1 0>,
+                                       <&gladiator_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_USB3_0 0>;
                        interconnect-names = "usb-ddr", "apps-usb";
  
                        usb_1_dwc3: dwc3@a600000 {
  
                        resets = <&gcc GCC_USB30_SEC_BCR>;
  
-                       interconnects = <&aggre2_noc MASTER_USB3_1 &mem_noc SLAVE_EBI1>,
-                                       <&gladiator_noc MASTER_APPSS_PROC &config_noc SLAVE_USB3_1>;
+                       interconnects = <&aggre2_noc MASTER_USB3_1 0 &mem_noc SLAVE_EBI1 0>,
+                                       <&gladiator_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_USB3_1 0>;
                        interconnect-names = "usb-ddr", "apps-usb";
  
                        usb_2_dwc3: dwc3@a800000 {
                        interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
                        power-domains = <&videocc VENUS_GDSC>,
                                        <&videocc VCODEC0_GDSC>,
-                                       <&videocc VCODEC1_GDSC>;
-                       power-domain-names = "venus", "vcodec0", "vcodec1";
+                                       <&videocc VCODEC1_GDSC>,
+                                       <&rpmhpd SDM845_CX>;
+                       power-domain-names = "venus", "vcodec0", "vcodec1", "cx";
+                       operating-points-v2 = <&venus_opp_table>;
                        clocks = <&videocc VIDEO_CC_VENUS_CTL_CORE_CLK>,
                                 <&videocc VIDEO_CC_VENUS_AHB_CLK>,
                                 <&videocc VIDEO_CC_VENUS_CTL_AXI_CLK>,
                        video-core1 {
                                compatible = "venus-encoder";
                        };
+                       venus_opp_table: venus-opp-table {
+                               compatible = "operating-points-v2";
+                               opp-100000000 {
+                                       opp-hz = /bits/ 64 <100000000>;
+                                       required-opps = <&rpmhpd_opp_min_svs>;
+                               };
+                               opp-200000000 {
+                                       opp-hz = /bits/ 64 <200000000>;
+                                       required-opps = <&rpmhpd_opp_low_svs>;
+                               };
+                               opp-320000000 {
+                                       opp-hz = /bits/ 64 <320000000>;
+                                       required-opps = <&rpmhpd_opp_svs>;
+                               };
+                               opp-380000000 {
+                                       opp-hz = /bits/ 64 <380000000>;
+                                       required-opps = <&rpmhpd_opp_svs_l1>;
+                               };
+                               opp-444000000 {
+                                       opp-hz = /bits/ 64 <444000000>;
+                                       required-opps = <&rpmhpd_opp_nom>;
+                               };
+                               opp-533000097 {
+                                       opp-hz = /bits/ 64 <533000097>;
+                                       required-opps = <&rpmhpd_opp_turbo>;
+                               };
+                       };
                };
  
                videocc: clock-controller@ab00000 {
                        interrupt-controller;
                        #interrupt-cells = <1>;
  
+                       interconnects = <&mmss_noc MASTER_MDP0 0 &mem_noc SLAVE_EBI1 0>,
+                                       <&mmss_noc MASTER_MDP1 0 &mem_noc SLAVE_EBI1 0>;
+                       interconnect-names = "mdp0-mem", "mdp1-mem";
                        iommus = <&apps_smmu 0x880 0x8>,
                                 <&apps_smmu 0xc80 0x8>;
  
  
                        qcom,gmu = <&gmu>;
  
-                       interconnects = <&mem_noc MASTER_GFX3D &mem_noc SLAVE_EBI1>;
+                       interconnects = <&mem_noc MASTER_GFX3D 0 &mem_noc SLAVE_EBI1 0>;
                        interconnect-names = "gfx-mem";
  
                        gpu_opp_table: opp-table {
                gladiator_noc: interconnect@17900000 {
                        compatible = "qcom,sdm845-gladiator-noc";
                        reg = <0 0x17900000 0 0xd080>;
-                       #interconnect-cells = <1>;
+                       #interconnect-cells = <2>;
                        qcom,bcm-voters = <&apps_bcm_voter>;
                };
  
index 6d04b9577b0bddf95a219e6b00e47c0ae590d894,8faadd68f8591f4b0a8210659227dd6b9fda4b57..73c4783e127202240f50a4900396b2d62240d2ee
@@@ -57,6 -57,7 +57,7 @@@ CONFIG_ARCH_THUNDER=
  CONFIG_ARCH_THUNDER2=y
  CONFIG_ARCH_UNIPHIER=y
  CONFIG_ARCH_VEXPRESS=y
+ CONFIG_ARCH_VISCONTI=y
  CONFIG_ARCH_XGENE=y
  CONFIG_ARCH_ZX=y
  CONFIG_ARCH_ZYNQMP=y
@@@ -724,17 -725,6 +725,17 @@@ CONFIG_USB_GADGET=
  CONFIG_USB_RENESAS_USBHS_UDC=m
  CONFIG_USB_RENESAS_USB3=m
  CONFIG_USB_TEGRA_XUDC=m
 +CONFIG_USB_CONFIGFS=m
 +CONFIG_USB_CONFIGFS_SERIAL=y
 +CONFIG_USB_CONFIGFS_ACM=y
 +CONFIG_USB_CONFIGFS_OBEX=y
 +CONFIG_USB_CONFIGFS_NCM=y
 +CONFIG_USB_CONFIGFS_ECM=y
 +CONFIG_USB_CONFIGFS_ECM_SUBSET=y
 +CONFIG_USB_CONFIGFS_RNDIS=y
 +CONFIG_USB_CONFIGFS_EEM=y
 +CONFIG_USB_CONFIGFS_MASS_STORAGE=y
 +CONFIG_USB_CONFIGFS_F_FS=y
  CONFIG_TYPEC=m
  CONFIG_TYPEC_TCPM=m
  CONFIG_TYPEC_FUSB302=m
@@@ -925,7 -915,6 +926,7 @@@ CONFIG_ARCH_TEGRA_194_SOC=
  CONFIG_ARCH_K3_AM6_SOC=y
  CONFIG_ARCH_K3_J721E_SOC=y
  CONFIG_TI_SCI_PM_DOMAINS=y
 +CONFIG_EXTCON_PTN5150=m
  CONFIG_EXTCON_USB_GPIO=y
  CONFIG_EXTCON_USBC_CROS_EC=y
  CONFIG_IIO=y
This page took 0.315397 seconds and 4 git commands to generate.