]> Git Repo - J-linux.git/commitdiff
Merge tag 'arm-dt-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
authorLinus Torvalds <[email protected]>
Thu, 24 Mar 2022 01:37:22 +0000 (18:37 -0700)
committerLinus Torvalds <[email protected]>
Thu, 24 Mar 2022 01:37:22 +0000 (18:37 -0700)
Pull ARM devicetree updates from Arnd Bergmann:
 "After a somewhat quiet 5.17 release, the size of the DT changes is a
  bit larger again. There are nine new SoC that get added, all of them
  related to existing platforms:

   - Airoha (formerly Mediatek/EcoNet) EN7523 networking SoC and EVB

   - Mediatek mt6582 tablet platform with the Prestigio PMT5008 3G
     tablet

   - Microchip Lan966 networking SoC and it evaluation board

   - Qualcomm Snapdragon 625/632 midrange phone SoCs, with the LG Nexus
     5X and Fairphone FP3 phones

   - Renesas RZ/G2LC and RZ/V2L general-purpose embedded SoCs, along
     with their evaluation boards

   - Samsung Exynos 850 phone SoC and reference board

   - Samsung Exynos7885 with the Samsung Galaxy A8 (2018) phone

   - Tesla FSD (Fully Self-Driving), an automotive SoC loosely derived
     from the Samsung Exynos family.

   - TI K3/AM62 SoC and reference board

  Support for additional functionality in existing dts files is added
  all over the place: Samsung, Renesas, Mstar, wpcm450, OMAP, AT91,
  Allwinner, i.MX, Tegra, Aspeed, Oxnas, Qualcomm, Mediatek, and
  Broadcom.

  Samsung has a rework for its pinctrl schema that is a bit tricky and
  requires driver changes to be included here.

  A few more platforms only have smaller cleanups and DT Schema fixes,
  this includes SoCFPGA, ux500, ixp4xx, STi, Xilinx Zynq, LG, and Juno.

  The new machines are really too many to list, but I'll do it anyway:

  Allwinner:
   - A20-Marsboard development board

  Amlogic:
   - Amediatek X96-AIR (Amlogic S905X3)
   - CYX A95XF3-AIR (Amlogic S905X3)
   - Haochuangy H96-Max (Amlogic S905X3)
   - Amlogic AQ222 (Amlogic S4)
   - OSMC Vero 4K+ (Amlogic S905D)

  Arm Juno:
   - Separate DT depending on SCMI firmware version

  Aspeed:
   - Quanta S6Q BMC (AST2600)
   - ASRock ROMED8HM3 (AST2500)

  Broadcom:
   - Raspberry Pi Zero 2 W

  Marvell MVEBU/Armada:
   - Ctera C200 V1 NAS (kirkwood)
   - Ctera C200 V2 NAS (armada-370)

  Mstar:
   - DongShanPiOne, a low-end embedded board
   - Miyoo Mini handheld game console

  NXP i.MX:
   - Numerous i.MX8M Mini based boards in even more variations, but
    none based on other SoCs this time:
    Protonic PRT8MM, emCON-MX8M Mini, Toradex Verdin, and
    Gateworks GW7903

  Qualcomm:
   - Google Herobrine R1 Chromebook platform (Snapdragon 7c Gen 3)
   - SHIFT6mq phone (Snapdragon 845)
   - Samsung Galaxy Book2 (Snapdragon 850)
   - Snapdragon 8 Gen 1 Hardware Development Kit

  TI OMAP:
   - SanCloud BeagleBone Enhanced WiFi

  Rockchip:
   - Pine64 PineNote ereader tablet (rk356x)
   - Bananapi-R2-Pro (rk356x)

  STM32:
   - emtrion emSBS-Argon embedded board (stm32mp157c)"

* tag 'arm-dt-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (627 commits)
  arm64: dts: n5x: drop invalid property and fix edac node name
  arm64: dts: fsd: Add the MCT support
  arm64: dts: stingray: Fix spi clock name
  arm64: dts: ns2: Fix spi clock name
  ARM: dts: rockchip: Update regulator name for PX3
  ARM: dts: rockchip: Add #clock-cells value for rk805
  arm64: dts: rockchip: Add #clock-cells value for rk805
  arm64: dts: rockchip: Remove vcc13 and vcc14 for rk808
  arm64: dts: rockchip: Fix SDIO regulator supply properties on rk3399-firefly
  ARM: dts: at91: sama7g5: Add NAND support
  ARM: dts: at91: sama7g5: add eic node
  ARM: dts: at91: sama7g5: Remove unused properties in i2c nodes
  ARM: dts: at91: sam9x60ek: modify vdd_1v5 regulator to vdd_1v15
  arm64: dts: lg: align pl330 node name with dtschema
  arm64: dts: lg: add dma-cells to pl330 node
  arm64: dts: juno: align pl330 node name with dtschema
  arm64: dts: broadcom: Fix sata nodename
  arm64: dts: n5x: add sdr edac support
  arm64: dts: agilex/stratix10: add clock-names to USB DWC2 node
  dt-bindings: usb: dwc2: add disable-over-current
  ...

28 files changed:
1  2 
Documentation/devicetree/bindings/arm/atmel-at91.yaml
Documentation/devicetree/bindings/arm/qcom.yaml
Documentation/devicetree/bindings/usb/dwc2.yaml
Documentation/devicetree/bindings/vendor-prefixes.yaml
MAINTAINERS
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/bcm2711.dtsi
arch/arm/boot/dts/rk3288.dtsi
arch/arm/boot/dts/ste-ux500-samsung-skomer.dts
arch/arm64/Kconfig.platforms
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
arch/arm64/boot/dts/freescale/imx8mm.dtsi
arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi
arch/arm64/boot/dts/freescale/imx8mq.dtsi
arch/arm64/boot/dts/freescale/mba8mx.dtsi
arch/arm64/boot/dts/intel/socfpga_agilex.dtsi
arch/arm64/boot/dts/marvell/armada-37xx.dtsi
arch/arm64/boot/dts/nvidia/tegra194.dtsi
arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
arch/arm64/boot/dts/qcom/sm8350.dtsi
arch/arm64/boot/dts/qcom/sm8450.dtsi
arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
arch/arm64/boot/dts/rockchip/rk3568.dtsi
arch/arm64/boot/dts/rockchip/rk356x.dtsi
arch/arm64/configs/defconfig

index ff91df04f9f46080c283d85ebaf43c0ce8e715b4,9d46ff78739f87242452553c0b8f8d2aa47c96c9..4e495e03264b79056a3d199f90ff2288183017ef
@@@ -8,8 -8,7 +8,8 @@@ title: Atmel AT91 device tree bindings
  
  maintainers:
    - Alexandre Belloni <[email protected]>
 -  - Ludovic Desroches <[email protected]>
 +  - Claudiu Beznea <[email protected]>
 +  - Nicolas Ferre <[email protected]>
  
  description: |
    Boards with a SoC of the Atmel AT91 or SMART family shall have the following
@@@ -175,6 -174,15 +175,15 @@@ properties
            - const: microchip,lan9668
            - const: microchip,lan966
  
+       - description: Kontron KSwitch D10 MMT series
+         items:
+           - enum:
+               - kontron,kswitch-d10-mmt-8g
+               - kontron,kswitch-d10-mmt-6g-2gs
+           - const: kontron,s1921
+           - const: microchip,lan9668
+           - const: microchip,lan966
        - items:
            - enum:
                - atmel,sams70j19
index 04ff0b55bb85c911a9e8e8e7a391313059b083c0,f4336ea0c6a74ace6dc974d4b66b90e43893ba45..129cdd246223a9b9e7f134aeee5ed5ae175221c3
@@@ -42,12 -42,14 +42,13 @@@ description: 
          sc7180
          sc7280
          sdm630
+         sdm632
          sdm660
          sdm845
          sdx55
          sdx65
          sm7225
          sm8150
 -        sdx65
          sm8250
          sm8350
          sm8450
@@@ -172,7 -174,21 +173,21 @@@ properties
            - const: qcom,apq8094
  
        - items:
-           - const: qcom,msm8996-mtp
+           - enum:
+               - arrow,apq8096-db820c
+               - inforce,ifc6640
+           - const: qcom,apq8096-sbc
+           - const: qcom,apq8096
+       - items:
+           - enum:
+               - qcom,msm8996-mtp
+               - sony,dora-row
+               - sony,kagura-row
+               - sony,keyaki-row
+               - xiaomi,gemini
+               - xiaomi,scorpio
+           - const: qcom,msm8996
  
        - items:
            - enum:
                - google,senor
            - const: qcom,sc7280
  
+       - items:
+           - enum:
+               - fairphone,fp3
+           - const: qcom,sdm632
        - items:
            - enum:
                - xiaomi,lavender
                - qcom,sdx65-mtp
            - const: qcom,sdx65
  
 -      - items:
 -          - enum:
 -              - qcom,sdx65-mtp
 -          - const: qcom,sdx65
 -
        - items:
            - enum:
                - qcom,ipq6018-cp01
  
        - items:
            - enum:
+               - qcom,sm8450-hdk
                - qcom,sm8450-qrd
            - const: qcom,sm8450
  
index 481aaa09f3f2bbfaa6b112001820fc3dbd328c11,1addab83f4fd2da139280cdbea3b2a23db112d25..4cebce682d16eb38d146c347f7a6a223fe2a633a
@@@ -41,6 -41,7 +41,7 @@@ properties
                - amlogic,meson8b-usb
                - amlogic,meson-gxbb-usb
                - amlogic,meson-g12a-usb
+               - intel,socfpga-agilex-hsotg
            - const: snps,dwc2
        - const: amcc,dwc-otg
        - const: apm,apm82181-dwc-otg
@@@ -53,7 -54,6 +54,7 @@@
            - const: st,stm32mp15-hsotg
            - const: snps,dwc2
        - const: samsung,s3c6400-hsotg
 +      - const: intel,socfpga-agilex-hsotg
  
    reg:
      maxItems: 1
      items:
        - const: otg
  
+   disable-over-current:
+     type: boolean
+     description: whether to disable detection of over-current condition.
+   iommus:
+     maxItems: 1
    resets:
      items:
        - description: common reset
index 047a83a089ceea0f22965271ee272b796b26938f,32c374d44e239eff8e1ca04cea818d3eccd62a9d..baed2b007d0e754c5bb5be6639759cae2703b73c
@@@ -23,6 -23,8 +23,8 @@@ patternProperties
    "^(simple-audio-card|st-plgpio|st-spics|ts),.*": true
  
    # Keep list in alphabetical order.
+   "^100ask,.*":
+     description: Baiwen.com (100ask).
    "^70mai,.*":
      description: 70mai Co., Ltd.
    "^8dev,.*":
@@@ -61,6 -63,8 +63,8 @@@
      description: Aeroflex Gaisler AB
    "^aesop,.*":
      description: AESOP Embedded Forum
+   "^airoha,.*":
+     description: Airoha
    "^al,.*":
      description: Annapurna Labs
    "^alcatel,.*":
      description: Hangzhou C-SKY Microsystems Co., Ltd
    "^csq,.*":
      description: Shenzen Chuangsiqi Technology Co.,Ltd.
+   "^ctera,.*":
+     description: CTERA Networks Intl.
    "^cubietech,.*":
      description: Cubietech, Ltd.
    "^cui,.*":
      description: CUI Devices
    "^cypress,.*":
      description: Cypress Semiconductor Corporation
+   "^cyx,.*":
+     description: Shenzhen CYX Industrial Co., Ltd
    "^cznic,.*":
      description: CZ.NIC, z.s.p.o.
    "^dallas,.*":
      deprecated: true
    "^hannstar,.*":
      description: HannStar Display Corporation
+   "^haochuangyi,.*":
+     description: Shenzhen Haochuangyi Technology Co.,Ltd
    "^haoyu,.*":
      description: Haoyu Microelectronic Co. Ltd.
    "^hardkernel,.*":
      description: MiraMEMS Sensing Technology Co., Ltd.
    "^mitsubishi,.*":
      description: Mitsubishi Electric Corporation
+   "^miyoo,.*":
+     description: Miyoo
    "^mntre,.*":
      description: MNT Research GmbH
    "^modtronix,.*":
      description: Ortus Technology Co., Ltd.
    "^osddisplays,.*":
      description: OSD Displays
+   "^osmc,.*":
+     description: Sam Nazarko Trading Ltd. (Open Source Media Centre)
    "^ouya,.*":
      description: Ouya Inc.
    "^overkiz,.*":
      description: Shenzhen Techstar Electronics Co., Ltd.
    "^terasic,.*":
      description: Terasic Inc.
+   "^tesla,.*":
+     description: Tesla, Inc.
    "^tfc,.*":
      description: Three Five Corp
    "^thead,.*":
      description: Vertexcom Technologies, Inc.
    "^via,.*":
      description: VIA Technologies, Inc.
 +  "^vicor,.*":
 +    description: Vicor Corporation
    "^videostrong,.*":
      description: Videostrong Technology Co., Ltd.
    "^virtio,.*":
      description: WinLink Co., Ltd
    "^winstar,.*":
      description: Winstar Display Corp.
+   "^wirelesstag,.*":
+     description: Wireless Tag (qiming yunduan)
    "^wits,.*":
      description: Shenzhen Merrii Technology Co., Ltd. (WITS)
    "^wlf,.*":
diff --combined MAINTAINERS
index db425a745b9b0457a856e5eda8d1bd50c9b7a63b,e643bab47eee56dc5989ad8ec7ced372c97c7e19..ea9d74b6236fa0e317444a4884edb6cc41a89c00
@@@ -389,11 -389,11 +389,11 @@@ L:      [email protected]
  S:    Maintained
  F:    drivers/acpi/arm64
  
 -ACPI I2C MULTI INSTANTIATE DRIVER
 +ACPI SERIAL MULTI INSTANTIATE DRIVER
  M:    Hans de Goede <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/platform/x86/i2c-multi-instantiate.c
 +F:    drivers/platform/x86/serial-multi-instantiate.c
  
  ACPI PCC(Platform Communication Channel) MAILBOX DRIVER
  M:    Sudeep Holla <[email protected]>
@@@ -1002,7 -1002,6 +1002,7 @@@ L:      [email protected]
  S:    Supported
  F:    Documentation/admin-guide/pm/amd-pstate.rst
  F:    drivers/cpufreq/amd-pstate*
 +F:    tools/power/x86/amd_pstate_tracer/amd_pstate_trace.py
  
  AMD PTDMA DRIVER
  M:    Sanjay R Mehta <[email protected]>
@@@ -1032,15 -1031,6 +1032,15 @@@ S:    Maintaine
  F:    Documentation/hid/amd-sfh*
  F:    drivers/hid/amd-sfh-hid/
  
 +AMPHION VPU CODEC V4L2 DRIVER
 +M:    Ming Qian <[email protected]>
 +M:    Shijie Qin <[email protected]>
 +M:    Zhou Peng <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/media/amphion,vpu.yaml
 +F:    drivers/media/platform/amphion/
 +
  AMS AS73211 DRIVER
  M:    Christian Eggers <[email protected]>
  L:    [email protected]
@@@ -1239,6 -1229,18 +1239,6 @@@ S:     Supporte
  F:    drivers/clk/analogbits/*
  F:    include/linux/clk/analogbits*
  
 -ANDES ARCHITECTURE
 -M:    Nick Hu <[email protected]>
 -M:    Greentime Hu <[email protected]>
 -M:    Vincent Chen <[email protected]>
 -S:    Supported
 -T:    git https://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git
 -F:    Documentation/devicetree/bindings/interrupt-controller/andestech,ativic32.txt
 -F:    Documentation/devicetree/bindings/nds32/
 -F:    arch/nds32/
 -N:    nds32
 -K:    nds32
 -
  ANDROID CONFIG FRAGMENTS
  M:    Rob Herring <[email protected]>
  S:    Supported
@@@ -1618,7 -1620,6 +1618,7 @@@ M:      Olof Johansson <[email protected]
  M:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 +C:    irc://irc.libera.chat/armlinux
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git
  F:    arch/arm/boot/dts/Makefile
  F:    arch/arm64/boot/dts/Makefile
  ARM SUB-ARCHITECTURES
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 +C:    irc://irc.libera.chat/armlinux
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git
  F:    arch/arm/mach-*/
  F:    arch/arm/plat-*/
@@@ -1685,9 -1685,9 +1685,9 @@@ S:      Maintaine
  F:    drivers/clk/sunxi/
  
  ARM/Allwinner sunXi SoC support
- M:    Maxime Ripard <[email protected]>
  M:    Chen-Yu Tsai <[email protected]>
- R:    Jernej Skrabec <[email protected]>
+ M:    Jernej Skrabec <[email protected]>
+ M:    Samuel Holland <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git
@@@ -1767,7 -1767,7 +1767,7 @@@ T:      git https://github.com/AsahiLinux/li
  F:    Documentation/devicetree/bindings/arm/apple.yaml
  F:    Documentation/devicetree/bindings/arm/apple/*
  F:    Documentation/devicetree/bindings/i2c/apple,i2c.yaml
 -F:    Documentation/devicetree/bindings/interrupt-controller/apple,aic.yaml
 +F:    Documentation/devicetree/bindings/interrupt-controller/apple,*
  F:    Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml
  F:    Documentation/devicetree/bindings/pci/apple,pcie.yaml
  F:    Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml
@@@ -1780,7 -1780,6 +1780,7 @@@ F:      drivers/irqchip/irq-apple-aic.
  F:    drivers/mailbox/apple-mailbox.c
  F:    drivers/pinctrl/pinctrl-apple-gpio.c
  F:    drivers/soc/apple/*
 +F:    drivers/watchdog/apple_wdt.c
  F:    include/dt-bindings/interrupt-controller/apple-aic.h
  F:    include/dt-bindings/pinctrl/apple.h
  F:    include/linux/apple-mailbox.h
@@@ -2117,6 -2116,13 +2117,6 @@@ F:     Documentation/devicetree/bindings/ar
  F:    arch/arm64/boot/dts/intel/keembay-evm.dts
  F:    arch/arm64/boot/dts/intel/keembay-soc.dtsi
  
 -ARM/INTEL RESEARCH IMOTE/STARGATE 2 MACHINE SUPPORT
 -M:    Jonathan Cameron <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -F:    arch/arm/mach-pxa/stargate2.c
 -F:    drivers/pcmcia/pxa2xx_stargate2.c
 -
  ARM/INTEL XSC3 (MANZANO) ARM CORE
  M:    Lennert Buytenhek <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -2245,7 -2251,7 +2245,7 @@@ F:      drivers/phy/mediatek
  ARM/Microchip (AT91) SoC support
  M:    Nicolas Ferre <[email protected]>
  M:    Alexandre Belloni <[email protected]>
 -M:    Ludovic Desroches <ludovic.desroches@microchip.com>
 +M:    Claudiu Beznea <claudiu.beznea@microchip.com>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  W:    http://www.linux4sam.org
@@@ -2358,6 -2364,7 +2358,7 @@@ L:      [email protected] (moderated 
  S:    Supported
  F:    Documentation/devicetree/bindings/*/*/*npcm*
  F:    Documentation/devicetree/bindings/*/*npcm*
+ F:    Documentation/devicetree/bindings/arm/npcm/*
  F:    arch/arm/boot/dts/nuvoton-npcm*
  F:    arch/arm/mach-npcm/
  F:    drivers/*/*npcm*
@@@ -2368,6 -2375,7 +2369,7 @@@ ARM/NUVOTON WPCM450 ARCHITECTUR
  M:    Jonathan Neuschäfer <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
+ W:    https://github.com/neuschaefer/wpcm450/wiki
  F:    Documentation/devicetree/bindings/*/*wpcm*
  F:    arch/arm/boot/dts/nuvoton-wpcm450*
  F:    arch/arm/mach-npcm/wpcm450.c
@@@ -2522,6 -2530,7 +2524,7 @@@ M:      Magnus Damm <[email protected]
  L:    [email protected]
  S:    Supported
  Q:    http://patchwork.kernel.org/project/linux-renesas-soc/list/
+ C:    irc://irc.libera.chat/renesas-soc
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git next
  F:    Documentation/devicetree/bindings/arm/renesas.yaml
  F:    arch/arm64/boot/dts/renesas/
@@@ -2563,14 -2572,11 +2566,14 @@@ F:   sound/soc/rockchip
  N:    rockchip
  
  ARM/SAMSUNG S3C, S5P AND EXYNOS ARM ARCHITECTURES
 -M:    Krzysztof Kozlowski <[email protected]>
 +M:    Krzysztof Kozlowski <[email protected]>
 +R:    Alim Akhtar <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Maintained
 +C:    irc://irc.libera.chat/linux-exynos
  Q:    https://patchwork.kernel.org/project/linux-samsung-soc/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git
  F:    Documentation/arm/samsung/
  F:    Documentation/devicetree/bindings/arm/samsung/
  F:    Documentation/devicetree/bindings/power/pd-samsung.yaml
@@@ -2605,7 -2611,7 +2608,7 @@@ M:      Łukasz Stelmach <l.stelmach@samsung
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Maintained
 -F:    drivers/media/platform/s5p-g2d/
 +F:    drivers/media/platform/samsung/s5p-g2d/
  
  ARM/SAMSUNG S5P SERIES HDMI CEC SUBSYSTEM SUPPORT
  M:    Marek Szyprowski <[email protected]>
@@@ -2622,7 -2628,7 +2625,7 @@@ M:      Sylwester Nawrocki <s.nawrocki@samsu
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Maintained
 -F:    drivers/media/platform/s5p-jpeg/
 +F:    drivers/media/platform/samsung/s5p-jpeg/
  
  ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT
  M:    Marek Szyprowski <[email protected]>
@@@ -2630,7 -2636,7 +2633,7 @@@ M:      Andrzej Hajda <[email protected]
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Maintained
 -F:    drivers/media/platform/s5p-mfc/
 +F:    drivers/media/platform/samsung/s5p-mfc/
  
  ARM/SHMOBILE ARM ARCHITECTURE
  M:    Geert Uytterhoeven <[email protected]>
@@@ -2638,6 -2644,7 +2641,7 @@@ M:      Magnus Damm <[email protected]
  L:    [email protected]
  S:    Supported
  Q:    http://patchwork.kernel.org/project/linux-renesas-soc/list/
+ C:    irc://irc.libera.chat/renesas-soc
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git next
  F:    Documentation/devicetree/bindings/arm/renesas.yaml
  F:    arch/arm/boot/dts/emev2*
@@@ -2699,7 -2706,7 +2703,7 @@@ F:      drivers/clocksource/clksrc_st_lpc.
  F:    drivers/cpufreq/sti-cpufreq.c
  F:    drivers/dma/st_fdma*
  F:    drivers/i2c/busses/i2c-st.c
 -F:    drivers/media/platform/sti/c8sectpfe/
 +F:    drivers/media/platform/st/sti/c8sectpfe/
  F:    drivers/media/rc/st_rc.c
  F:    drivers/mmc/host/sdhci-st.c
  F:    drivers/phy/st/phy-miphy28lp.c
@@@ -2730,7 -2737,7 +2734,7 @@@ N:      stm3
  N:    stm
  
  ARM/Synaptics SoC support
 -M:    Jisheng Zhang <[email protected]>
 +M:    Jisheng Zhang <[email protected]>
  M:    Sebastian Hesselbarth <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -2751,6 -2758,14 +2755,14 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/media/tegra-cec.txt
  F:    drivers/media/cec/platform/tegra/
  
+ ARM/TESLA FSD SoC SUPPORT
+ M:    Alim Akhtar <[email protected]>
+ M:    [email protected]
+ L:    [email protected] (moderated for non-subscribers)
+ L:    [email protected]
+ S:    Maintained
+ F:    arch/arm64/boot/dts/tesla*
  ARM/TETON BGA MACHINE SUPPORT
  M:    "Mark F. Brown" <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -3015,7 -3030,7 +3027,7 @@@ L:      [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/aspeed-video.txt
 -F:    drivers/media/platform/aspeed-video.c
 +F:    drivers/media/platform/aspeed/
  
  ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS
  M:    Corentin Chary <[email protected]>
  S:    Maintained
  F:    drivers/hwmon/asus_wmi_ec_sensors.c
  
 +ASUS EC HARDWARE MONITOR DRIVER
 +M:    Eugene Shalygin <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/hwmon/asus-ec-sensors.c
 +
  ASUS WIRELESS RADIO CONTROL DRIVER
  M:    João Paulo Rechi Vita <[email protected]>
  L:    [email protected]
@@@ -3136,9 -3145,11 +3148,9 @@@ W:     https://wireless.wiki.kernel.org/en/
  F:    drivers/net/wireless/ath/ath5k/
  
  ATHEROS ATH6KL WIRELESS DRIVER
 -M:    Kalle Valo <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Orphan
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/ath6kl
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
  F:    drivers/net/wireless/ath/ath6kl/
  
  ATI_REMOTE2 DRIVER
@@@ -3195,7 -3206,6 +3207,7 @@@ ATOMIC INFRASTRUCTUR
  M:    Will Deacon <[email protected]>
  M:    Peter Zijlstra <[email protected]>
  R:    Boqun Feng <[email protected]>
 +R:    Mark Rutland <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    arch/*/include/asm/atomic*.h
@@@ -3377,7 -3387,7 +3389,7 @@@ L:      [email protected]
  S:    Supported
  W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
 -F:    drivers/media/platform/sti/bdisp
 +F:    drivers/media/platform/st/sti/bdisp
  
  BECKHOFF CX5020 ETHERCAT MASTER DRIVER
  M:    Dariusz Marcinkiewicz <[email protected]>
@@@ -3438,7 -3448,6 +3450,7 @@@ F:      Documentation/ABI/stable/sysfs-bloc
  F:    Documentation/block/
  F:    block/
  F:    drivers/block/
 +F:    include/linux/bio.h
  F:    include/linux/blk*
  F:    kernel/trace/blktrace.c
  F:    lib/sbitmap.c
@@@ -3904,7 -3913,7 +3916,7 @@@ M:      Scott Branden <[email protected]
  M:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 -T:    git git://github.com/broadcom/cygnus-linux.git
 +T:    git git://github.com/broadcom/stblinux.git
  F:    arch/arm64/boot/dts/broadcom/northstar2/*
  F:    arch/arm64/boot/dts/broadcom/stingray/*
  F:    drivers/clk/bcm/clk-ns*
@@@ -4242,7 -4251,7 +4254,7 @@@ L:      [email protected]
  S:    Orphan
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/admin-guide/media/cafe_ccic*
 -F:    drivers/media/platform/marvell-ccic/
 +F:    drivers/media/platform/marvell/
  
  CAIF NETWORK LAYER
  L:    [email protected]
@@@ -4546,7 -4555,6 +4558,7 @@@ F:      drivers/platform/chrome
  
  CHROMEOS EC CODEC DRIVER
  M:    Cheng-Yi Chiang <[email protected]>
 +M:    Tzung-Bi Shih <[email protected]>
  R:    Guenter Roeck <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml
@@@ -4766,7 -4774,7 +4778,7 @@@ M:      Philipp Zabel <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/coda.yaml
 -F:    drivers/media/platform/coda/
 +F:    drivers/media/platform/chips-media/
  
  CODE OF CONDUCT
  M:    Greg Kroah-Hartman <[email protected]>
@@@ -4912,8 -4920,7 +4924,8 @@@ F:      kernel/cgroup/cpuset.
  CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)
  M:    Johannes Weiner <[email protected]>
  M:    Michal Hocko <[email protected]>
 -M:    Vladimir Davydov <[email protected]>
 +M:    Roman Gushchin <[email protected]>
 +M:    Shakeel Butt <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -5316,7 -5323,6 +5328,7 @@@ DATA ACCESS MONITO
  M:    SeongJae Park <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-kernel-mm-damon
  F:    Documentation/admin-guide/mm/damon/
  F:    Documentation/vm/damon/
  F:    include/linux/damon.h
@@@ -5410,7 -5416,6 +5422,7 @@@ F:      drivers/platform/x86/dell/dell-rbtn.
  DELL LAPTOP SMM DRIVER
  M:    Pali Rohár <[email protected]>
  S:    Maintained
 +F:    Documentation/ABI/obsolete/procfs-i8k
  F:    drivers/hwmon/dell-smm-hwmon.c
  F:    include/uapi/linux/i8k.h
  
@@@ -5480,7 -5485,7 +5492,7 @@@ L:      [email protected]
  S:    Supported
  W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
 -F:    drivers/media/platform/sti/delta
 +F:    drivers/media/platform/st/sti/delta
  
  DELTA AHE-50DC FAN CONTROL MODULE DRIVER
  M:    Zev Weiss <[email protected]>
@@@ -5779,7 -5784,7 +5791,7 @@@ F:      tools/testing/selftests/dma
  
  DMA-BUF HEAPS FRAMEWORK
  M:    Sumit Semwal <[email protected]>
 -R:    Benjamin Gaignard <benjamin.gaignard@linaro.org>
 +R:    Benjamin Gaignard <benjamin.gaignard@collabora.com>
  R:    Liam Mark <[email protected]>
  R:    Laura Abbott <[email protected]>
  R:    Brian Starkey <[email protected]>
@@@ -6308,8 -6313,8 +6320,8 @@@ T:      git git://anongit.freedesktop.org/dr
  F:    drivers/gpu/drm/vboxvideo/
  
  DRM DRIVER FOR VMWARE VIRTUAL GPU
 -M:    "VMware Graphics" <[email protected]>
  M:    Zack Rusin <[email protected]>
 +R:    VMware Graphics Reviewers <[email protected]>
  L:    [email protected]
  S:    Supported
  T:    git git://anongit.freedesktop.org/drm/drm-misc
@@@ -6509,7 -6514,7 +6521,7 @@@ F:      Documentation/devicetree/bindings/di
  F:    drivers/gpu/drm/rockchip/
  
  DRM DRIVERS FOR STI
 -M:    Benjamin Gaignard <[email protected]>
 +M:    Alain Volmat <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
@@@ -6518,8 -6523,8 +6530,8 @@@ F:      drivers/gpu/drm/st
  
  DRM DRIVERS FOR STM
  M:    Yannick Fertre <[email protected]>
 +M:    Raphael Gallais-Pou <[email protected]>
  M:    Philippe Cornu <[email protected]>
 -M:    Benjamin Gaignard <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  S:    Maintained
  F:    drivers/edac/sb_edac.c
  
 -EDAC-SIFIVE
 -M:    Yash Shah <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    drivers/edac/sifive_edac.c
 -
  EDAC-SKYLAKE
  M:    Tony Luck <[email protected]>
  L:    [email protected]
@@@ -7183,7 -7194,7 +7195,7 @@@ F:      drivers/net/can/usb/etas_es58x
  
  ETHERNET BRIDGE
  M:    Roopa Prabhu <[email protected]>
 -M:    Nikolay Aleksandrov <[email protected]>
 +M:    Nikolay Aleksandrov <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Maintained
@@@ -7226,9 -7237,6 +7238,9 @@@ F:      net/core/of_net.
  EXEC & BINFMT API
  R:    Eric Biederman <[email protected]>
  R:    Kees Cook <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/execve
  F:    arch/alpha/kernel/binfmt_loader.c
  F:    arch/x86/ia32/ia32_aout.c
  F:    fs/*binfmt_*.c
@@@ -7236,7 -7244,6 +7248,7 @@@ F:      fs/exec.
  F:    include/linux/binfmts.h
  F:    include/linux/elf.h
  F:    include/uapi/linux/binfmts.h
 +F:    include/uapi/linux/elf.h
  F:    tools/testing/selftests/exec/
  N:    asm/elf.h
  N:    binfmt
@@@ -7272,9 -7279,7 +7284,9 @@@ Extended Verification Module (EVM
  M:    Mimi Zohar <[email protected]>
  L:    [email protected]
  S:    Supported
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity.git
  F:    security/integrity/evm/
 +F:    security/integrity/
  
  EXTENSIBLE FIRMWARE INTERFACE (EFI)
  M:    Ard Biesheuvel <[email protected]>
@@@ -7582,12 -7587,6 +7594,12 @@@ S:    Maintaine
  W:    http://floatingpoint.sourceforge.net/emulator/index.html
  F:    arch/x86/math-emu/
  
 +FRAMEBUFFER CORE
 +M:    Daniel Vetter <[email protected]>
 +F:    drivers/video/fbdev/core/
 +S:    Odd Fixes
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +
  FRAMEBUFFER LAYER
  M:    Helge Deller <[email protected]>
  L:    [email protected]
@@@ -7751,7 -7750,8 +7763,7 @@@ M:      Qiang Zhao <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/soc/fsl/qe/
 -F:    include/soc/fsl/*qe*.h
 -F:    include/soc/fsl/*ucc*.h
 +F:    include/soc/fsl/qe/
  
  FREESCALE QUICC ENGINE UCC ETHERNET DRIVER
  M:    Li Yang <[email protected]>
@@@ -7782,7 -7782,6 +7794,7 @@@ F:      Documentation/devicetree/bindings/mi
  F:    Documentation/devicetree/bindings/soc/fsl/
  F:    drivers/soc/fsl/
  F:    include/linux/fsl/
 +F:    include/soc/fsl/
  
  FREESCALE SOC FS_ENET DRIVER
  M:    Pantelis Antoniou <[email protected]>
@@@ -7793,10 -7792,10 +7805,10 @@@ F:   drivers/net/ethernet/freescale/fs_en
  F:    include/linux/fs_enet_pd.h
  
  FREESCALE SOC SOUND DRIVERS
 -M:    Nicolin Chen <nicoleotsuka@gmail.com>
 +M:    Shengjiu Wang <shengjiu.wang@gmail.com>
  M:    Xiubo Li <[email protected]>
  R:    Fabio Estevam <[email protected]>
 -R:    Shengjiu Wang <shengjiu.wang@gmail.com>
 +R:    Nicolin Chen <nicoleotsuka@gmail.com>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Maintained
@@@ -8650,7 -8649,7 +8662,7 @@@ S:      Maintaine
  F:    drivers/gpio/gpio-hisi.c
  
  HISILICON HIGH PERFORMANCE RSA ENGINE DRIVER (HPRE)
 -M:    Zaibo Xu <xuzaibo@huawei.com>
 +M:    Longfang Liu <liulongfang@huawei.com>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/ABI/testing/debugfs-hisi-hpre
@@@ -8730,8 -8729,8 +8742,8 @@@ F:      Documentation/devicetree/bindings/sc
  F:    drivers/scsi/hisi_sas/
  
  HISILICON SECURITY ENGINE V2 DRIVER (SEC2)
 -M:    Zaibo Xu <[email protected]>
  M:    Kai Ye <[email protected]>
 +M:    Longfang Liu <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/ABI/testing/debugfs-hisi-sec
@@@ -8762,7 -8761,7 +8774,7 @@@ F:      Documentation/devicetree/bindings/mf
  F:    drivers/mfd/hi6421-spmi-pmic.c
  
  HISILICON TRUE RANDOM NUMBER GENERATOR V2 SUPPORT
 -M:    Zaibo Xu <xuzaibo@huawei.com>
 +M:    Weili Qian <qianweili@huawei.com>
  S:    Maintained
  F:    drivers/crypto/hisilicon/trng/trng.c
  
@@@ -8876,7 -8875,7 +8888,7 @@@ L:      [email protected]
  S:    Supported
  W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
 -F:    drivers/media/platform/sti/hva
 +F:    drivers/media/platform/st/sti/hva
  
  HWPOISON MEMORY FAILURE HANDLING
  M:    Naoya Horiguchi <[email protected]>
  S:    Maintained
  F:    drivers/media/i2c/hi846.c
  
 +HYNIX HI847 SENSOR DRIVER
 +M:    Shawn Tu <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/i2c/hi847.c
 +
  Hyper-V/Azure CORE AND DRIVERS
  M:    "K. Y. Srinivasan" <[email protected]>
  M:    Haiyang Zhang <[email protected]>
@@@ -9271,15 -9264,6 +9283,15 @@@ S:    Maintaine
  W:    https://github.com/o2genum/ideapad-slidebar
  F:    drivers/input/misc/ideapad_slidebar.c
  
 +IDMAPPED MOUNTS
 +M:    Christian Brauner <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git
 +F:    Documentation/filesystems/idmappings.rst
 +F:    tools/testing/selftests/mount_setattr/
 +F:    include/linux/mnt_idmapping.h
 +
  IDT VersaClock 5 CLOCK DRIVER
  M:    Luca Ceresoli <[email protected]>
  S:    Maintained
@@@ -9537,7 -9521,6 +9549,7 @@@ L:      [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity.git
  F:    security/integrity/ima/
 +F:    security/integrity/
  
  INTEL 810/815 FRAMEBUFFER DRIVER
  M:    Antonino Daplas <[email protected]>
  F:    Documentation/devicetree/bindings/counter/interrupt-counter.yaml
  F:    drivers/counter/interrupt-cnt.c
  
 +INTERSIL ISL7998X VIDEO DECODER DRIVER
 +M:    Michael Tretter <[email protected]>
 +R:    Pengutronix Kernel Team <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/media/i2c/isil,isl79987.yaml
 +F:    drivers/media/i2c/isl7998x.c
 +
  INVENSENSE ICM-426xx IMU DRIVER
  M:    Jean-Baptiste Maneyrol <[email protected]>
  L:    [email protected]
@@@ -10338,7 -10313,7 +10350,7 @@@ M:   Mikhail Ulyanov <mikhail.ulyanov@cog
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 -F:    drivers/media/platform/rcar_jpu.c
 +F:    drivers/media/platform/renesas/rcar_jpu.c
  
  JSM Neo PCI based serial card
  L:    [email protected]
@@@ -10477,8 -10452,6 +10489,8 @@@ KERNEL REGRESSION
  M:    Thorsten Leemhuis <[email protected]>
  L:    [email protected]
  S:    Supported
 +F:    Documentation/admin-guide/reporting-regressions.rst
 +F:    Documentation/process/handling-regressions.rst
  
  KERNEL SELFTEST FRAMEWORK
  M:    Shuah Khan <[email protected]>
@@@ -10684,14 -10657,6 +10696,14 @@@ F: include/linux/keyctl.
  F:    include/uapi/linux/keyctl.h
  F:    security/keys/
  
 +KEYS/KEYRINGS_INTEGRITY
 +M:    Jarkko Sakkinen <[email protected]>
 +M:    Mimi Zohar <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    security/integrity/platform_certs
 +
  KFENCE
  M:    Alexander Potapenko <[email protected]>
  M:    Marco Elver <[email protected]>
@@@ -11162,17 -11127,12 +11174,17 @@@ F:        lib/list-test.
  LITEX PLATFORM
  M:    Karol Gugala <[email protected]>
  M:    Mateusz Holenko <[email protected]>
 +M:    Gabriel Somlo <[email protected]>
 +M:    Joel Stanley <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/*/litex,*.yaml
  F:    arch/openrisc/boot/dts/or1klitex.dts
 -F:    drivers/soc/litex/litex_soc_ctrl.c
 -F:    drivers/tty/serial/liteuart.c
  F:    include/linux/litex.h
 +F:    drivers/tty/serial/liteuart.c
 +F:    drivers/soc/litex/*
 +F:    drivers/net/ethernet/litex/*
 +F:    drivers/mmc/host/litex_mmc.c
 +N:    litex
  
  LIVE PATCHING
  M:    Josh Poimboeuf <[email protected]>
@@@ -11712,7 -11672,7 +11724,7 @@@ F:   drivers/iio/proximity/mb1232.
  
  MAXIM MAX17040 FAMILY FUEL GAUGE DRIVERS
  R:    Iskren Chernev <[email protected]>
 -R:    Krzysztof Kozlowski <krz[email protected]>
 +R:    Krzysztof Kozlowski <krz[email protected]>
  R:    Marek Szyprowski <[email protected]>
  R:    Matheus Castello <[email protected]>
  L:    [email protected]
@@@ -11722,7 -11682,7 +11734,7 @@@ F:   drivers/power/supply/max17040_batter
  
  MAXIM MAX17042 FAMILY FUEL GAUGE DRIVERS
  R:    Hans de Goede <[email protected]>
 -R:    Krzysztof Kozlowski <krz[email protected]>
 +R:    Krzysztof Kozlowski <krz[email protected]>
  R:    Marek Szyprowski <[email protected]>
  R:    Sebastian Krzyszkowiak <[email protected]>
  R:    Purism Kernel Team <[email protected]>
@@@ -11756,7 -11716,7 +11768,7 @@@ MAXIM MAX77802 PMIC REGULATOR DEVICE DR
  M:    Javier Martinez Canillas <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    Documentation/devicetree/bindings/*/*max77802.txt
 +F:    Documentation/devicetree/bindings/*/*max77802.yaml
  F:    drivers/regulator/max77802-regulator.c
  F:    include/dt-bindings/*/*max77802.h
  
@@@ -11767,26 -11727,23 +11779,26 @@@ F:        Documentation/devicetree/bindings/po
  F:    drivers/power/supply/max77976_charger.c
  
  MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS
 -M:    Krzysztof Kozlowski <krz[email protected]>
 +M:    Krzysztof Kozlowski <krz[email protected]>
  M:    Bartlomiej Zolnierkiewicz <[email protected]>
  L:    [email protected]
  S:    Supported
 +F:    Documentation/devicetree/bindings/power/supply/maxim,max14577.yaml
  F:    drivers/power/supply/max14577_charger.c
  F:    drivers/power/supply/max77693_charger.c
  
  MAXIM PMIC AND MUIC DRIVERS FOR EXYNOS BASED BOARDS
  M:    Chanwoo Choi <[email protected]>
 -M:    Krzysztof Kozlowski <krz[email protected]>
 +M:    Krzysztof Kozlowski <krz[email protected]>
  M:    Bartlomiej Zolnierkiewicz <[email protected]>
  L:    [email protected]
  S:    Supported
 +F:    Documentation/devicetree/bindings/*/maxim,max14577.yaml
  F:    Documentation/devicetree/bindings/*/maxim,max77686.yaml
 +F:    Documentation/devicetree/bindings/*/maxim,max77843.yaml
  F:    Documentation/devicetree/bindings/clock/maxim,max77686.txt
 -F:    Documentation/devicetree/bindings/mfd/max14577.txt
  F:    Documentation/devicetree/bindings/mfd/max77693.txt
 +F:    drivers/*/*max77843.c
  F:    drivers/*/max14577*.c
  F:    drivers/*/max77686*.c
  F:    drivers/*/max77693*.c
@@@ -11882,7 -11839,7 +11894,7 @@@ M:   Philipp Zabel <[email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
 -F:    drivers/media/platform/imx-pxp.[ch]
 +F:    drivers/media/platform/nxp/imx-pxp.[ch]
  
  MEDIA DRIVERS FOR ASCOT2E
  M:    Sergey Kozlov <[email protected]>
@@@ -11947,10 -11904,10 +11959,10 @@@ L:        [email protected]
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/admin-guide/media/imx7.rst
 +F:    Documentation/devicetree/bindings/media/nxp,imx-mipi-csi2.yaml
  F:    Documentation/devicetree/bindings/media/nxp,imx7-csi.yaml
 -F:    Documentation/devicetree/bindings/media/nxp,imx7-mipi-csi2.yaml
 +F:    drivers/media/platform/imx/imx-mipi-csis.c
  F:    drivers/staging/media/imx/imx7-media-csi.c
 -F:    drivers/staging/media/imx/imx7-mipi-csis.c
  
  MEDIA DRIVERS FOR HELENE
  M:    Abylay Ospan <[email protected]>
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/nvidia,tegra-vde.txt
 -F:    drivers/staging/media/tegra-vde/
 +F:    drivers/media/platform/nvidia/tegra-vde/
  
  MEDIA DRIVERS FOR RENESAS - CEU
  M:    Jacopo Mondi <[email protected]>
  S:    Supported
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/renesas,ceu.yaml
 -F:    drivers/media/platform/renesas-ceu.c
 +F:    drivers/media/platform/renesas/renesas-ceu.c
  F:    include/media/drv-intf/renesas-ceu.h
  
  MEDIA DRIVERS FOR RENESAS - DRIF
  S:    Supported
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/renesas,drif.yaml
 -F:    drivers/media/platform/rcar_drif.c
 +F:    drivers/media/platform/renesas/rcar_drif.c
  
  MEDIA DRIVERS FOR RENESAS - FCP
  M:    Laurent Pinchart <[email protected]>
  S:    Supported
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/renesas,fcp.yaml
 -F:    drivers/media/platform/rcar-fcp.c
 +F:    drivers/media/platform/renesas/rcar-fcp.c
  F:    include/media/rcar-fcp.h
  
  MEDIA DRIVERS FOR RENESAS - FDP1
  S:    Supported
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/renesas,fdp1.yaml
 -F:    drivers/media/platform/rcar_fdp1.c
 +F:    drivers/media/platform/renesas/rcar_fdp1.c
  
  MEDIA DRIVERS FOR RENESAS - VIN
  M:    Niklas Söderlund <[email protected]>
@@@ -12054,8 -12011,8 +12066,8 @@@ T:   git git://linuxtv.org/media_tree.gi
  F:    Documentation/devicetree/bindings/media/renesas,csi2.yaml
  F:    Documentation/devicetree/bindings/media/renesas,isp.yaml
  F:    Documentation/devicetree/bindings/media/renesas,vin.yaml
 -F:    drivers/media/platform/rcar-isp.c
 -F:    drivers/media/platform/rcar-vin/
 +F:    drivers/media/platform/renesas/rcar-isp.c
 +F:    drivers/media/platform/renesas/rcar-vin/
  
  MEDIA DRIVERS FOR RENESAS - VSP1
  M:    Laurent Pinchart <[email protected]>
  S:    Supported
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/renesas,vsp1.yaml
 -F:    drivers/media/platform/vsp1/
 +F:    drivers/media/platform/renesas/vsp1/
  
  MEDIA DRIVERS FOR ST STV0910 DEMODULATOR ICs
  L:    [email protected]
  S:    Supported
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml
 -F:    drivers/media/platform/stm32/stm32-dcmi.c
 +F:    drivers/media/platform/st/stm32/stm32-dcmi.c
  
  MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
  M:    Mauro Carvalho Chehab <[email protected]>
@@@ -12171,7 -12128,7 +12183,7 @@@ M:   Rick Chang <[email protected]
  M:    Bin Liu <[email protected]>
  S:    Supported
  F:    Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.txt
 -F:    drivers/media/platform/mtk-jpeg/
 +F:    drivers/media/platform/mediatek/jpeg/
  
  MEDIATEK MDP DRIVER
  M:    Minghsiu Tsai <[email protected]>
@@@ -12179,8 -12136,8 +12191,8 @@@ M:   Houlong Wei <[email protected]
  M:    Andrew-CT Chen <[email protected]>
  S:    Supported
  F:    Documentation/devicetree/bindings/media/mediatek-mdp.txt
 -F:    drivers/media/platform/mtk-mdp/
 -F:    drivers/media/platform/mtk-vpu/
 +F:    drivers/media/platform/mediatek/mdp/
 +F:    drivers/media/platform/mediatek/vpu/
  
  MEDIATEK MEDIA DRIVER
  M:    Tiffany Lin <[email protected]>
@@@ -12188,8 -12145,8 +12200,8 @@@ M:   Andrew-CT Chen <andrew-ct.chen@media
  S:    Supported
  F:    Documentation/devicetree/bindings/media/mediatek-vcodec.txt
  F:    Documentation/devicetree/bindings/media/mediatek-vpu.txt
 -F:    drivers/media/platform/mtk-vcodec/
 -F:    drivers/media/platform/mtk-vpu/
 +F:    drivers/media/platform/mediatek/vcodec/
 +F:    drivers/media/platform/mediatek/vpu/
  
  MEDIATEK MMC/SD/SDIO DRIVER
  M:    Chaotian Jing <[email protected]>
@@@ -12468,7 -12425,7 +12480,7 @@@ F:   include/linux/memblock.
  F:    mm/memblock.c
  
  MEMORY CONTROLLER DRIVERS
 -M:    Krzysztof Kozlowski <krz[email protected]>
 +M:    Krzysztof Kozlowski <krz[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git
  S:    Supported
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/amlogic,axg-ge2d.yaml
 -F:    drivers/media/platform/meson/ge2d/
 +F:    drivers/media/platform/amlogic/meson-ge2d/
  
  MESON NAND CONTROLLER DRIVER FOR AMLOGIC SOCS
  M:    Liang Yang <[email protected]>
  S:    Supported
  F:    sound/soc/atmel
  
 +MICROCHIP CSI2DC DRIVER
 +M:    Eugen Hristev <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/devicetree/bindings/media/microchip,csi2dc.yaml
 +F:    drivers/media/platform/atmel/microchip-csi2dc.c
 +
  MICROCHIP ECC DRIVER
  M:    Tudor Ambarus <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    Documentation/devicetree/bindings/media/atmel,isc.yaml
  F:    Documentation/devicetree/bindings/media/microchip,xisc.yaml
 -F:    drivers/media/platform/atmel/atmel-isc-base.c
 -F:    drivers/media/platform/atmel/atmel-isc-regs.h
 -F:    drivers/media/platform/atmel/atmel-isc.h
 -F:    drivers/media/platform/atmel/atmel-sama5d2-isc.c
 -F:    drivers/media/platform/atmel/atmel-sama7g5-isc.c
 +F:    drivers/media/platform/atmel/atmel-isc*
 +F:    drivers/media/platform/atmel/atmel-sama*-isc*
  F:    include/linux/atmel-isc-media.h
  
  MICROCHIP ISI DRIVER
@@@ -13362,8 -13315,8 +13374,8 @@@ W:   http://www.iptables.org
  W:    http://www.nftables.org/
  Q:    http://patchwork.ozlabs.org/project/netfilter-devel/list/
  C:    irc://irc.libera.chat/netfilter
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git
  F:    include/linux/netfilter*
  F:    include/linux/netfilter/
  F:    include/net/netfilter/
@@@ -13420,7 -13373,6 +13432,7 @@@ F:   net/core/drop_monitor.
  NETWORKING DRIVERS
  M:    "David S. Miller" <[email protected]>
  M:    Jakub Kicinski <[email protected]>
 +M:    Paolo Abeni <[email protected]>
  L:    [email protected]
  S:    Maintained
  Q:    https://patchwork.kernel.org/project/netdevbpf/list/
@@@ -13467,7 -13419,6 +13479,7 @@@ F:   tools/testing/selftests/drivers/net/
  NETWORKING [GENERAL]
  M:    "David S. Miller" <[email protected]>
  M:    Jakub Kicinski <[email protected]>
 +M:    Paolo Abeni <[email protected]>
  L:    [email protected]
  S:    Maintained
  Q:    https://patchwork.kernel.org/project/netdevbpf/list/
@@@ -13611,7 -13562,7 +13623,7 @@@ F:   include/uapi/linux/nexthop.
  F:    net/ipv4/nexthop.c
  
  NFC SUBSYSTEM
 -M:    Krzysztof Kozlowski <krz[email protected]>
 +M:    Krzysztof Kozlowski <krz[email protected]>
  L:    [email protected] (subscribers-only)
  L:    [email protected]
  S:    Maintained
@@@ -13632,7 -13583,7 +13644,7 @@@ F:   tools/testing/selftests/nci
  
  NFS, SUNRPC, AND LOCKD CLIENTS
  M:    Trond Myklebust <[email protected]>
 -M:    Anna Schumaker <anna[email protected]>
 +M:    Anna Schumaker <anna@kernel.org>
  L:    [email protected]
  S:    Maintained
  W:    http://client.linux-nfs.org
@@@ -13745,7 -13696,7 +13757,7 @@@ F:   scripts/nsdep
  NTB AMD DRIVER
  M:    Sanjay R Mehta <[email protected]>
  M:    Shyam Sundar S K <[email protected]>
 -L:    [email protected]
 +L:    [email protected]
  S:    Supported
  F:    drivers/ntb/hw/amd/
  
@@@ -13753,7 -13704,7 +13765,7 @@@ NTB DRIVER COR
  M:    Jon Mason <[email protected]>
  M:    Dave Jiang <[email protected]>
  M:    Allen Hubbe <[email protected]>
 -L:    [email protected]
 +L:    [email protected]
  S:    Supported
  W:    https://github.com/jonmason/ntb/wiki
  T:    git git://github.com/jonmason/ntb.git
@@@ -13765,13 -13716,13 +13777,13 @@@ F:        tools/testing/selftests/ntb
  
  NTB IDT DRIVER
  M:    Serge Semin <[email protected]>
 -L:    [email protected]
 +L:    [email protected]
  S:    Supported
  F:    drivers/ntb/hw/idt/
  
  NTB INTEL DRIVER
  M:    Dave Jiang <[email protected]>
 -L:    [email protected]
 +L:    [email protected]
  S:    Supported
  W:    https://github.com/davejiang/linux/wiki
  T:    git https://github.com/davejiang/linux.git
@@@ -13925,7 -13876,7 +13937,7 @@@ F:   Documentation/devicetree/bindings/re
  F:    drivers/regulator/pf8x00-regulator.c
  
  NXP PTN5150A CC LOGIC AND EXTCON DRIVER
 -M:    Krzysztof Kozlowski <krz[email protected]>
 +M:    Krzysztof Kozlowski <krz[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/extcon/extcon-ptn5150.yaml
@@@ -14138,7 -14089,7 +14150,7 @@@ M:   Laurent Pinchart <laurent.pinchart@i
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/ti,omap3isp.txt
 -F:    drivers/media/platform/omap3isp/
 +F:    drivers/media/platform/ti/omap3isp/
  F:    drivers/staging/media/omap4iss/
  
  OMAP MMC SUPPORT
@@@ -14246,12 -14197,6 +14258,12 @@@ M: Harald Welte <[email protected]
  S:    Maintained
  F:    drivers/char/pcmcia/cm4040_cs.*
  
 +OMNIVISION OG01A1B SENSOR DRIVER
 +M:    Shawn Tu <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/i2c/og01a1b.c
 +
  OMNIVISION OV02A10 SENSOR DRIVER
  M:    Dongchun Zhu <[email protected]>
  L:    [email protected]
@@@ -14260,13 -14205,6 +14272,13 @@@ T: git git://linuxtv.org/media_tree.gi
  F:    Documentation/devicetree/bindings/media/i2c/ovti,ov02a10.yaml
  F:    drivers/media/i2c/ov02a10.c
  
 +OMNIVISION OV08D10 SENSOR DRIVER
 +M:    Jimmy Su <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +T:    git git://linuxtv.org/media_tree.git
 +F:    drivers/media/i2c/ov08d10.c
 +
  OMNIVISION OV13858 SENSOR DRIVER
  M:    Sakari Ailus <[email protected]>
  L:    [email protected]
@@@ -14463,7 -14401,6 +14475,7 @@@ M:   Rob Herring <[email protected]
  M:    Frank Rowand <[email protected]>
  L:    [email protected]
  S:    Maintained
 +C:    irc://irc.libera.chat/devicetree
  W:    http://www.devicetree.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
  F:    Documentation/ABI/testing/sysfs-firmware-ofw
@@@ -14475,7 -14412,6 +14487,7 @@@ OPEN FIRMWARE AND FLATTENED DEVICE TRE
  M:    Rob Herring <[email protected]>
  L:    [email protected]
  S:    Maintained
 +C:    irc://irc.libera.chat/devicetree
  Q:    http://patchwork.ozlabs.org/project/devicetree-bindings/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
  F:    Documentation/devicetree/
@@@ -14662,9 -14598,8 +14674,9 @@@ F:   include/uapi/linux/ppdev.
  
  PARAVIRT_OPS INTERFACE
  M:    Juergen Gross <[email protected]>
 -M:    Deep Shah <[email protected]>
 -M:    "VMware, Inc." <[email protected]>
 +M:    Srivatsa S. Bhat (VMware) <[email protected]>
 +R:    Alexey Makhalov <[email protected]>
 +R:    VMware PV-Drivers Reviewers <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -15210,7 -15145,7 +15222,7 @@@ M:   Ingo Molnar <[email protected]
  M:    Arnaldo Carvalho de Melo <[email protected]>
  R:    Mark Rutland <[email protected]>
  R:    Alexander Shishkin <[email protected]>
 -R:    Jiri Olsa <jolsa@redhat.com>
 +R:    Jiri Olsa <jolsa@kernel.org>
  R:    Namhyung Kim <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -15365,16 -15300,14 +15377,16 @@@ F:        drivers/pinctrl/renesas
  
  PIN CONTROLLER - SAMSUNG
  M:    Tomasz Figa <[email protected]>
 -M:    Krzysztof Kozlowski <krz[email protected]>
 +M:    Krzysztof Kozlowski <krz[email protected]>
  M:    Sylwester Nawrocki <[email protected]>
 +R:    Alim Akhtar <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Maintained
 +C:    irc://irc.libera.chat/linux-exynos
  Q:    https://patchwork.kernel.org/project/linux-samsung-soc/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git
- F:    Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt
+ F:    Documentation/devicetree/bindings/pinctrl/samsung,pinctrl*yaml
  F:    drivers/pinctrl/samsung/
  F:    include/dt-bindings/pinctrl/samsung.h
  
@@@ -15593,7 -15526,6 +15605,7 @@@ F:   drivers/net/ppp/pptp.
  
  PRESSURE STALL INFORMATION (PSI)
  M:    Johannes Weiner <[email protected]>
 +M:    Suren Baghdasaryan <[email protected]>
  S:    Maintained
  F:    include/linux/psi*
  F:    kernel/sched/psi.c
@@@ -15629,7 -15561,6 +15641,7 @@@ M:   Iurii Zaikin <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl-next
  F:    fs/proc/proc_sysctl.c
  F:    include/linux/sysctl.h
  F:    kernel/sysctl-test.c
@@@ -15977,7 -15908,6 +15989,7 @@@ S:   Supporte
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/ath10k
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
  F:    drivers/net/wireless/ath/ath10k/
 +F:    Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt
  
  QUALCOMM ATHEROS ATH11K WIRELESS DRIVER
  M:    Kalle Valo <[email protected]>
@@@ -15985,12 -15915,11 +15997,12 @@@ L:        [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
  F:    drivers/net/wireless/ath/ath11k/
 +F:    Documentation/devicetree/bindings/net/wireless/qcom,ath11k.txt
  
  QUALCOMM ATHEROS ATH9K WIRELESS DRIVER
 -M:    [email protected]
 +M:    Toke Høiland-Jørgensen <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/ath9k
  F:    Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml
  F:    drivers/net/wireless/ath/ath9k/
@@@ -16065,6 -15994,14 +16077,6 @@@ F:  Documentation/devicetree/bindings/mi
  F:    drivers/misc/fastrpc.c
  F:    include/uapi/misc/fastrpc.h
  
 -QUALCOMM GENERIC INTERFACE I2C DRIVER
 -M:    Akash Asthana <[email protected]>
 -M:    Mukesh Savaliya <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -S:    Supported
 -F:    drivers/i2c/busses/i2c-qcom-geni.c
 -
  QUALCOMM HEXAGON ARCHITECTURE
  M:    Brian Cain <[email protected]>
  L:    [email protected]
@@@ -16136,8 -16073,8 +16148,8 @@@ F:   Documentation/devicetree/bindings/mt
  F:    drivers/mtd/nand/raw/qcom_nandc.c
  
  QUALCOMM RMNET DRIVER
 -M:    Subash Abhinov Kasiviswanathan <[email protected]>
 -M:    Sean Tranchetti <[email protected]>
 +M:    Subash Abhinov Kasiviswanathan <[email protected]>
 +M:    Sean Tranchetti <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/networking/device_drivers/cellular/qualcomm/rmnet.rst
@@@ -16163,10 -16100,11 +16175,10 @@@ F:        Documentation/devicetree/bindings/me
  F:    drivers/media/platform/qcom/venus/
  
  QUALCOMM WCN36XX WIRELESS DRIVER
 -M:    Kalle Valo <kvalo@kernel.org>
 +M:    Loic Poulain <loic.poulain@linaro.org>
  L:    [email protected]
  S:    Supported
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/wcn36xx
 -T:    git git://github.com/KrasnikovEugene/wcn36xx.git
  F:    drivers/net/wireless/ath/wcn36xx/
  
  QUANTENNA QTNFMAC WIRELESS DRIVER
@@@ -16268,7 -16206,6 +16280,7 @@@ M:   Jason A. Donenfeld <[email protected]
  T:    git https://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git
  S:    Maintained
  F:    drivers/char/random.c
 +F:    drivers/virt/vmgenid.c
  
  RAPIDIO SUBSYSTEM
  M:    Matt Porter <[email protected]>
@@@ -16383,8 -16320,6 +16395,8 @@@ F:   tools/testing/selftests/resctrl
  
  READ-COPY UPDATE (RCU)
  M:    "Paul E. McKenney" <[email protected]>
 +M:    Frederic Weisbecker <[email protected]> (kernel/rcu/tree_nocb.h)
 +M:    Neeraj Upadhyay <[email protected]> (kernel/rcu/tasks.h)
  M:    Josh Triplett <[email protected]>
  R:    Steven Rostedt <[email protected]>
  R:    Mathieu Desnoyers <[email protected]>
@@@ -16432,7 -16367,6 +16444,7 @@@ F:   drivers/watchdog/realtek_otto_wdt.
  
  REALTEK RTL83xx SMI DSA ROUTER CHIPS
  M:    Linus Walleij <[email protected]>
 +M:    Alvin Šipraga <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/dsa/realtek-smi.txt
  F:    drivers/net/dsa/realtek-smi*
@@@ -16701,7 -16635,8 +16713,7 @@@ F:   Documentation/devicetree/bindings/so
  F:    sound/soc/rockchip/rockchip_i2s_tdm.*
  
  ROCKCHIP ISP V1 DRIVER
 -M:    Helen Koike <[email protected]>
 -M:    Dafna Hirschfeld <[email protected]>
 +M:    Dafna Hirschfeld <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -16894,8 -16829,8 +16906,8 @@@ F:   drivers/video/fbdev/savage
  S390
  M:    Heiko Carstens <[email protected]>
  M:    Vasily Gorbik <[email protected]>
 -M:    Christian Borntraeger <borntraeger@linux.ibm.com>
 -R:    Alexander Gordeev <agordeev@linux.ibm.com>
 +M:    Alexander Gordeev <agordeev@linux.ibm.com>
 +R:    Christian Borntraeger <borntraeger@linux.ibm.com>
  R:    Sven Schnelle <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -17010,7 -16945,7 +17022,7 @@@ W:   http://www.ibm.com/developerworks/li
  F:    drivers/s390/scsi/zfcp_*
  
  S3C ADC BATTERY DRIVER
 -M:    Krzysztof Kozlowski <krz[email protected]>
 +M:    Krzysztof Kozlowski <krz[email protected]>
  L:    [email protected]
  S:    Odd Fixes
  F:    drivers/power/supply/s3c_adc_battery.c
@@@ -17055,7 -16990,7 +17067,7 @@@ F:   Documentation/admin-guide/LSM/SafeSe
  F:    security/safesetid/
  
  SAMSUNG AUDIO (ASoC) DRIVERS
 -M:    Krzysztof Kozlowski <krz[email protected]>
 +M:    Krzysztof Kozlowski <krz[email protected]>
  M:    Sylwester Nawrocki <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
@@@ -17063,7 -16998,7 +17075,7 @@@ F:   Documentation/devicetree/bindings/so
  F:    sound/soc/samsung/
  
  SAMSUNG EXYNOS PSEUDO RANDOM NUMBER GENERATOR (RNG) DRIVER
 -M:    Krzysztof Kozlowski <krz[email protected]>
 +M:    Krzysztof Kozlowski <krz[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -17098,7 -17033,7 +17110,7 @@@ S:   Maintaine
  F:    drivers/platform/x86/samsung-laptop.c
  
  SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS
 -M:    Krzysztof Kozlowski <krz[email protected]>
 +M:    Krzysztof Kozlowski <krz[email protected]>
  M:    Bartlomiej Zolnierkiewicz <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -17120,11 -17055,11 +17132,11 @@@ M:        Sylwester Nawrocki <sylvester.nawroc
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 -F:    drivers/media/platform/s3c-camif/
 +F:    drivers/media/platform/samsung/s3c-camif/
  F:    include/media/drv-intf/s3c_camif.h
  
  SAMSUNG S3FWRN5 NFC DRIVER
 -M:    Krzysztof Kozlowski <krz[email protected]>
 +M:    Krzysztof Kozlowski <krz[email protected]>
  M:    Krzysztof Opasiak <[email protected]>
  L:    [email protected] (subscribers-only)
  S:    Maintained
@@@ -17146,7 -17081,7 +17158,7 @@@ S:   Supporte
  F:    drivers/media/i2c/s5k5baf.c
  
  SAMSUNG S5P Security SubSystem (SSS) DRIVER
 -M:    Krzysztof Kozlowski <krz[email protected]>
 +M:    Krzysztof Kozlowski <krz[email protected]>
  M:    Vladimir Zapolskiy <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -17160,13 -17095,12 +17172,13 @@@ M:        Sylwester Nawrocki <s.nawrocki@samsu
  L:    [email protected]
  S:    Supported
  Q:    https://patchwork.linuxtv.org/project/linux-media/list/
 -F:    drivers/media/platform/exynos4-is/
 +F:    drivers/media/platform/samsung/exynos4-is/
  
  SAMSUNG SOC CLOCK DRIVERS
  M:    Sylwester Nawrocki <[email protected]>
  M:    Tomasz Figa <[email protected]>
  M:    Chanwoo Choi <[email protected]>
 +R:    Alim Akhtar <[email protected]>
  L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git
@@@ -17181,12 -17115,12 +17193,12 @@@ F:        include/linux/clk/samsung.
  F:    include/linux/platform_data/clk-s3c2410.h
  
  SAMSUNG SPI DRIVERS
 -M:    Krzysztof Kozlowski <krz[email protected]>
 +M:    Krzysztof Kozlowski <krz[email protected]>
  M:    Andi Shyti <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/spi/spi-samsung.txt
 +F:    Documentation/devicetree/bindings/spi/samsung,spi*.yaml
  F:    drivers/spi/spi-s3c*
  F:    include/linux/platform_data/spi-s3c64xx.h
  F:    include/linux/spi/s3c24xx-fiq.h
@@@ -17198,12 -17132,11 +17210,12 @@@ S:        Supporte
  F:    drivers/net/ethernet/samsung/sxgbe/
  
  SAMSUNG THERMAL DRIVER
 -M:    Bartlomiej Zolnierkiewicz <[email protected]>
 +M:    Bartlomiej Zolnierkiewicz <[email protected]>
 +M:    Krzysztof Kozlowski <[email protected]>
  L:    [email protected]
  L:    [email protected]
 -S:    Supported
 -T:    git https://github.com/lmajewski/linux-samsung-thermal.git
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/thermal/samsung,exynos-thermal.yaml
  F:    drivers/thermal/samsung/
  
  SAMSUNG USB2 PHY DRIVER
@@@ -17595,7 -17528,7 +17607,7 @@@ F:   include/media/i2c/rj54n1cb0c.
  SH_VOU V4L2 OUTPUT DRIVER
  L:    [email protected]
  S:    Orphan
 -F:    drivers/media/platform/sh_vou.c
 +F:    drivers/media/platform/renesas/sh_vou.c
  F:    include/media/drv-intf/sh_vou.h
  
  SI2157 MEDIA DRIVER
@@@ -17804,21 -17737,6 +17816,21 @@@ S: Maintaine
  W:    http://www.winischhofer.at/linuxsisusbvga.shtml
  F:    drivers/usb/misc/sisusbvga/
  
 +SL28 CPLD MFD DRIVER
 +M:    Michael Walle <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/gpio/kontron,sl28cpld-gpio.yaml
 +F:    Documentation/devicetree/bindings/hwmon/kontron,sl28cpld-hwmon.yaml
 +F:    Documentation/devicetree/bindings/interrupt-controller/kontron,sl28cpld-intc.yaml
 +F:    Documentation/devicetree/bindings/mfd/kontron,sl28cpld.yaml
 +F:    Documentation/devicetree/bindings/pwm/kontron,sl28cpld-pwm.yaml
 +F:    Documentation/devicetree/bindings/watchdog/kontron,sl28cpld-wdt.yaml
 +F:    drivers/gpio/gpio-sl28cpld.c
 +F:    drivers/hwmon/sl28cpld-hwmon.c
 +F:    drivers/irqchip/irq-sl28cpld.c
 +F:    drivers/pwm/pwm-sl28cpld.c
 +F:    drivers/watchdog/sl28cpld_wdt.c
 +
  SLAB ALLOCATOR
  M:    Christoph Lameter <[email protected]>
  M:    Pekka Enberg <[email protected]>
@@@ -17826,10 -17744,8 +17838,10 @@@ M: David Rientjes <[email protected]
  M:    Joonsoo Kim <[email protected]>
  M:    Andrew Morton <[email protected]>
  M:    Vlastimil Babka <[email protected]>
 +R:    Roman Gushchin <[email protected]>
  L:    [email protected]
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git
  F:    include/linux/sl?b*.h
  F:    mm/sl?b*
  
@@@ -18367,8 -18283,7 +18379,8 @@@ F:   Documentation/devicetree/bindings/ii
  F:    drivers/iio/imu/st_lsm6dsx/
  
  ST MIPID02 CSI-2 TO PARALLEL BRIDGE DRIVER
 -M:    Mickael Guene <[email protected]>
 +M:    Benjamin Mugnier <[email protected]>
 +M:    Sylvain Petinot <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
@@@ -18538,7 -18453,7 +18550,7 @@@ F:   Documentation/devicetree/bindings/so
  F:    sound/soc/sti/
  
  STI CEC DRIVER
 -M:    Benjamin Gaignard <[email protected]>
 +M:    Alain Volmat <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/stih-cec.txt
  F:    drivers/media/cec/platform/sti/
@@@ -18607,13 -18522,6 +18619,13 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/rtc/sunplus,sp7021-rtc.yaml
  F:    drivers/rtc/rtc-sunplus.c
  
 +SUNPLUS SPI CONTROLLER INTERFACE DRIVER
 +M:    Li-hao Kuo <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/spi/spi-sunplus-sp7021.yaml
 +F:    drivers/spi/spi-sunplus-sp7021.c
 +
  SUPERH
  M:    Yoshinori Sato <[email protected]>
  M:    Rich Felker <[email protected]>
@@@ -19165,7 -19073,6 +19177,7 @@@ TEXAS INSTRUMENTS ASoC DRIVER
  M:    Peter Ujfalusi <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 +F:    Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml
  F:    sound/soc/ti/
  
  TEXAS INSTRUMENTS' DAC7612 DAC DRIVER
@@@ -19346,7 -19253,7 +19358,7 @@@ S:   Maintaine
  W:    https://linuxtv.org
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
 -F:    drivers/media/platform/am437x/
 +F:    drivers/media/platform/ti/am437x/
  
  TI BANDGAP AND THERMAL DRIVER
  M:    Eduardo Valentin <[email protected]>
@@@ -19405,7 -19312,7 +19417,7 @@@ S:   Maintaine
  W:    https://linuxtv.org
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
 -F:    drivers/media/platform/davinci/
 +F:    drivers/media/platform/ti/davinci/
  F:    include/media/davinci/
  
  TI ENHANCED QUADRATURE ENCODER PULSE (eQEP) DRIVER
@@@ -19491,8 -19398,7 +19503,8 @@@ W:   http://linuxtv.org
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  F:    Documentation/devicetree/bindings/media/ti,cal.yaml
  F:    Documentation/devicetree/bindings/media/ti,vpe.yaml
 -F:    drivers/media/platform/ti-vpe/
 +F:    drivers/media/platform/ti/cal/
 +F:    drivers/media/platform/ti/vpe/
  
  TI WILINK WIRELESS DRIVERS
  L:    [email protected]
@@@ -19563,15 -19469,6 +19575,15 @@@ S: Maintaine
  F:    Documentation/hwmon/tmp401.rst
  F:    drivers/hwmon/tmp401.c
  
 +TMP464 HARDWARE MONITOR DRIVER
 +M:    Agathe Porte <[email protected]>
 +M:    Guenter Roeck <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/hwmon/ti,tmp464.yaml
 +F:    Documentation/hwmon/tmp464.rst
 +F:    drivers/hwmon/tmp464.c
 +
  TMP513 HARDWARE MONITOR DRIVER
  M:    Eric Tremblay <[email protected]>
  L:    [email protected]
@@@ -19710,14 -19607,6 +19722,14 @@@ F: Documentation/trace/timerlat-tracer.
  F:    Documentation/trace/hwlat_detector.rst
  F:    arch/*/kernel/trace.c
  
 +Real-time Linux Analysis (RTLA) tools
 +M:    Daniel Bristot de Oliveira <[email protected]>
 +M:    Steven Rostedt <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/tools/rtla/
 +F:    tools/tracing/rtla/
 +
  TRADITIONAL CHINESE DOCUMENTATION
  M:    Hu Haowen <[email protected]>
  L:    [email protected]
@@@ -20465,8 -20354,8 +20477,8 @@@ F:   drivers/media/common/videobuf2/
  F:    include/media/videobuf2-*
  
  VIMC VIRTUAL MEDIA CONTROLLER DRIVER
 -M:    Helen Koike <[email protected]>
 -R:    Shuah Khan <[email protected]>
 +M:    Shuah Khan <[email protected]>
 +R:    Kieran Bingham <[email protected]>
  L:    [email protected]
  S:    Maintained
  W:    https://linuxtv.org
@@@ -20721,33 -20610,30 +20733,33 @@@ F:        tools/testing/vsock
  
  VMWARE BALLOON DRIVER
  M:    Nadav Amit <[email protected]>
 -M:    "VMware, Inc." <[email protected]>
 +R:    VMware PV-Drivers Reviewers <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/misc/vmw_balloon.c
  
  VMWARE HYPERVISOR INTERFACE
 -M:    Deep Shah <[email protected]>
 -M:    "VMware, Inc." <[email protected]>
 +M:    Srivatsa S. Bhat (VMware) <[email protected]>
 +M:    Alexey Makhalov <[email protected]>
 +R:    VMware PV-Drivers Reviewers <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Supported
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/vmware
  F:    arch/x86/include/asm/vmware.h
  F:    arch/x86/kernel/cpu/vmware.c
  
  VMWARE PVRDMA DRIVER
  M:    Bryan Tan <[email protected]>
  M:    Vishnu Dasa <[email protected]>
 -M:    VMware PV-Drivers <[email protected]>
 +R:    VMware PV-Drivers Reviewers <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/infiniband/hw/vmw_pvrdma/
  
  VMware PVSCSI driver
  M:    Vishal Bhakta <[email protected]>
 -M:    VMware PV-Drivers <[email protected]>
 +R:    VMware PV-Drivers Reviewers <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/scsi/vmw_pvscsi.c
@@@ -20755,7 -20641,7 +20767,7 @@@ F:   drivers/scsi/vmw_pvscsi.
  
  VMWARE VIRTUAL PTP CLOCK DRIVER
  M:    Vivek Thampi <[email protected]>
 -M:    "VMware, Inc." <[email protected]>
 +R:    VMware PV-Drivers Reviewers <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/ptp/ptp_vmw.c
  VMWARE VMCI DRIVER
  M:    Jorgen Hansen <[email protected]>
  M:    Vishnu Dasa <[email protected]>
 +R:    VMware PV-Drivers Reviewers <[email protected]>
  L:    [email protected]
 -L:    [email protected] (private)
  S:    Maintained
  F:    drivers/misc/vmw_vmci/
  
  VMWARE VMMOUSE SUBDRIVER
 -M:    "VMware Graphics" <[email protected]>
 -M:    "VMware, Inc." <[email protected]>
 +M:    Zack Rusin <[email protected]>
 +R:    VMware Graphics Reviewers <[email protected]>
 +R:    VMware PV-Drivers Reviewers <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/input/mouse/vmmouse.c
@@@ -20779,7 -20664,7 +20791,7 @@@ F:   drivers/input/mouse/vmmouse.
  
  VMWARE VMXNET3 ETHERNET DRIVER
  M:    Ronak Doshi <[email protected]>
 -M:    [email protected]
 +R:    VMware PV-Drivers Reviewers <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/vmxnet3/
  S:    Maintained
  W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
 -F:    drivers/media/tuners/tuner-xc2028.*
 +F:    drivers/media/tuners/xc2028.*
  
  XDP (eXpress Data Path)
  M:    Alexei Starovoitov <[email protected]>
@@@ -21375,11 -21260,6 +21387,11 @@@ T: git https://github.com/Xilinx/linux-
  F:    Documentation/devicetree/bindings/phy/xlnx,zynqmp-psgtr.yaml
  F:    drivers/phy/xilinx/phy-zynqmp.c
  
 +XILINX ZYNQMP SHA3 DRIVER
 +M:    Harsha <[email protected]>
 +S:    Maintained
 +F:    drivers/crypto/xilinx/zynqmp-sha.c
 +
  XILINX EVENT MANAGEMENT DRIVER
  M:    Abhyuday Godhasara <[email protected]>
  S:    Maintained
@@@ -21560,6 -21440,7 +21572,6 @@@ THE RES
  M:    Linus Torvalds <[email protected]>
  L:    [email protected]
  S:    Buried alive in reporters
 -Q:    http://patchwork.kernel.org/project/LKML/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
  F:    *
  F:    */
diff --combined arch/arm/Kconfig
index 2366a7ffbd9f4baa98f0e6ebda1e7ef6210716d9,160881d7c5d0e558411654ef6381346968ca796b..c1251856ef772ca2aedda000ce878a74349bdb15
@@@ -5,7 -5,6 +5,7 @@@ config AR
        select ARCH_32BIT_OFF_T
        select ARCH_CORRECT_STACKTRACE_ON_KRETPROBE if HAVE_KRETPROBES && FRAME_POINTER && !ARM_UNWIND
        select ARCH_HAS_BINFMT_FLAT
 +      select ARCH_HAS_CURRENT_STACK_POINTER
        select ARCH_HAS_DEBUG_VIRTUAL if MMU
        select ARCH_HAS_DMA_WRITE_COMBINE if !ARM_DMA_MEM_BUFFERABLE
        select ARCH_HAS_ELF_RANDOMIZE
@@@ -38,7 -37,6 +38,7 @@@
        select ARCH_USE_CMPXCHG_LOCKREF
        select ARCH_USE_MEMTEST
        select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT if MMU
 +      select ARCH_WANT_GENERAL_HUGETLB
        select ARCH_WANT_IPC_PARSE_VERSION
        select ARCH_WANT_LD_ORPHAN_WARN
        select BINFMT_FLAT_ARGVP_ENVP_ON_STACK
@@@ -60,7 -58,6 +60,7 @@@
        select GENERIC_CPU_AUTOPROBE
        select GENERIC_EARLY_IOREMAP
        select GENERIC_IDLE_POLL_SETUP
 +      select GENERIC_IRQ_MULTI_HANDLER
        select GENERIC_IRQ_PROBE
        select GENERIC_IRQ_SHOW
        select GENERIC_IRQ_SHOW_LEVEL
@@@ -95,8 -92,8 +95,8 @@@
        select HAVE_EXIT_THREAD
        select HAVE_FAST_GUP if ARM_LPAE
        select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL
 -      select HAVE_FUNCTION_GRAPH_TRACER if !THUMB2_KERNEL && !CC_IS_CLANG
 -      select HAVE_FUNCTION_TRACER if !XIP_KERNEL && !(THUMB2_KERNEL && CC_IS_CLANG)
 +      select HAVE_FUNCTION_GRAPH_TRACER
 +      select HAVE_FUNCTION_TRACER if !XIP_KERNEL
        select HAVE_GCC_PLUGINS
        select HAVE_HW_BREAKPOINT if PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7)
        select HAVE_IRQ_TIME_ACCOUNTING
        select PERF_USE_VMALLOC
        select RTC_LIB
        select SYS_SUPPORTS_APM_EMULATION
 -      select THREAD_INFO_IN_TASK if CURRENT_POINTER_IN_TPIDRURO
 +      select THREAD_INFO_IN_TASK
 +      select HAVE_ARCH_VMAP_STACK if MMU && ARM_HAS_GROUP_RELOCS
        select TRACE_IRQFLAGS_SUPPORT if !CPU_V7M
        # Above selects are sorted alphabetically; please add new ones
        # according to that.  Thanks.
          Europe.  There is an ARM Linux project with a web page at
          <http://www.arm.linux.org.uk/>.
  
 +config ARM_HAS_GROUP_RELOCS
 +      def_bool y
 +      depends on !LD_IS_LLD || LLD_VERSION >= 140000
 +      depends on !COMPILE_TEST
 +      help
 +        Whether or not to use R_ARM_ALU_PC_Gn or R_ARM_LDR_PC_Gn group
 +        relocations, which have been around for a long time, but were not
 +        supported in LLD until version 14. The combined range is -/+ 256 MiB,
 +        which is usually sufficient, but not for allyesconfig, so we disable
 +        this feature when doing compile testing.
 +
  config ARM_HAS_SG_CHAIN
        bool
  
@@@ -233,12 -218,18 +233,12 @@@ config ARCH_MAY_HAVE_PC_FD
  config ARCH_SUPPORTS_UPROBES
        def_bool y
  
 -config ARCH_HAS_DMA_SET_COHERENT_MASK
 -      bool
 -
  config GENERIC_ISA_DMA
        bool
  
  config FIQ
        bool
  
 -config NEED_RET_TO_USER
 -      bool
 -
  config ARCH_MTD_XIP
        bool
  
@@@ -276,7 -267,7 +276,7 @@@ config PHYS_OFFSE
        hex "Physical address of main memory" if MMU
        depends on !ARM_PATCH_PHYS_VIRT
        default DRAM_BASE if !MMU
 -      default 0x00000000 if ARCH_FOOTBRIDGE || ARCH_IXP4XX
 +      default 0x00000000 if ARCH_FOOTBRIDGE
        default 0x10000000 if ARCH_OMAP1 || ARCH_RPC
        default 0x30000000 if ARCH_S3C24XX
        default 0xa0000000 if ARCH_IOP32X || ARCH_PXA
@@@ -304,17 -295,6 +304,17 @@@ config MM
          Select if you want MMU-based virtualised addressing space
          support by paged memory management. If unsure, say 'Y'.
  
 +config ARM_SINGLE_ARMV7M
 +      def_bool !MMU
 +      select ARM_NVIC
 +      select AUTO_ZRELADDR
 +      select TIMER_OF
 +      select COMMON_CLK
 +      select CPU_V7M
 +      select NO_IOPORT_MAP
 +      select SPARSE_IRQ
 +      select USE_OF
 +
  config ARCH_MMAP_RND_BITS_MIN
        default 8
  
@@@ -329,11 -309,12 +329,11 @@@ config ARCH_MMAP_RND_BITS_MA
  #
  choice
        prompt "ARM system type"
 -      default ARM_SINGLE_ARMV7M if !MMU
 -      default ARCH_MULTIPLATFORM if MMU
 +      depends on MMU
 +      default ARCH_MULTIPLATFORM
  
  config ARCH_MULTIPLATFORM
        bool "Allow multiple platforms to be selected"
 -      depends on MMU
        select ARCH_FLATMEM_ENABLE
        select ARCH_SPARSEMEM_ENABLE
        select ARCH_SELECT_MEMORY_MODEL
        select AUTO_ZRELADDR
        select TIMER_OF
        select COMMON_CLK
 -      select GENERIC_IRQ_MULTI_HANDLER
        select HAVE_PCI
        select PCI_DOMAINS_GENERIC if PCI
        select SPARSE_IRQ
        select USE_OF
  
 -config ARM_SINGLE_ARMV7M
 -      bool "ARMv7-M based platforms (Cortex-M0/M3/M4)"
 -      depends on !MMU
 -      select ARM_NVIC
 -      select AUTO_ZRELADDR
 -      select TIMER_OF
 -      select COMMON_CLK
 -      select CPU_V7M
 -      select NO_IOPORT_MAP
 -      select SPARSE_IRQ
 -      select USE_OF
 -
  config ARCH_EP93XX
        bool "EP93xx-based"
        select ARCH_SPARSEMEM_ENABLE
        select ARM_AMBA
        imply ARM_PATCH_PHYS_VIRT
        select ARM_VIC
 -      select GENERIC_IRQ_MULTI_HANDLER
        select AUTO_ZRELADDR
        select CLKSRC_MMIO
        select CPU_ARM920T
@@@ -365,6 -360,7 +365,6 @@@ config ARCH_FOOTBRIDG
        bool "FootBridge"
        select CPU_SA110
        select FOOTBRIDGE
 -      select NEED_MACH_IO_H if !MMU
        select NEED_MACH_MEMORY_H
        help
          Support for systems based on the DC21285 companion chip
  
  config ARCH_IOP32X
        bool "IOP32x-based"
 -      depends on MMU
        select CPU_XSCALE
        select GPIO_IOP
        select GPIOLIB
 -      select NEED_RET_TO_USER
        select FORCE_PCI
        select PLAT_IOP
        help
  
  config ARCH_IXP4XX
        bool "IXP4xx-based"
 -      depends on MMU
 -      select ARCH_HAS_DMA_SET_COHERENT_MASK
        select ARCH_SUPPORTS_BIG_ENDIAN
 +      select ARM_PATCH_PHYS_VIRT
        select CPU_XSCALE
 -      select DMABOUNCE if PCI
 -      select GENERIC_IRQ_MULTI_HANDLER
        select GPIO_IXP4XX
        select GPIOLIB
        select HAVE_PCI
        select IXP4XX_IRQ
        select IXP4XX_TIMER
 -      # With the new PCI driver this is not needed
 -      select NEED_MACH_IO_H if IXP4XX_PCI_LEGACY
 +      select SPARSE_IRQ
        select USB_EHCI_BIG_ENDIAN_DESC
        select USB_EHCI_BIG_ENDIAN_MMIO
        help
  config ARCH_DOVE
        bool "Marvell Dove"
        select CPU_PJ4
 -      select GENERIC_IRQ_MULTI_HANDLER
        select GPIOLIB
        select HAVE_PCI
        select MVEBU_MBUS
  
  config ARCH_PXA
        bool "PXA2xx/PXA3xx-based"
 -      depends on MMU
        select ARCH_MTD_XIP
        select ARM_CPU_SUSPEND if PM
        select AUTO_ZRELADDR
        select CLKSRC_MMIO
        select TIMER_OF
        select CPU_XSCALE if !CPU_XSC3
 -      select GENERIC_IRQ_MULTI_HANDLER
        select GPIO_PXA
        select GPIOLIB
        select IRQ_DOMAIN
  
  config ARCH_RPC
        bool "RiscPC"
 -      depends on MMU
        depends on !CC_IS_CLANG && GCC_VERSION < 90100 && GCC_VERSION >= 60000
        select ARCH_ACORN
        select ARCH_MAY_HAVE_PC_FDC
@@@ -458,6 -464,7 +458,6 @@@ config ARCH_SA110
        select COMMON_CLK
        select CPU_FREQ
        select CPU_SA1100
 -      select GENERIC_IRQ_MULTI_HANDLER
        select GPIOLIB
        select IRQ_DOMAIN
        select ISA
@@@ -472,6 -479,7 +472,6 @@@ config ARCH_S3C24X
        select CLKSRC_SAMSUNG_PWM
        select GPIO_SAMSUNG
        select GPIOLIB
 -      select GENERIC_IRQ_MULTI_HANDLER
        select NEED_MACH_IO_H
        select S3C2410_WATCHDOG
        select SAMSUNG_ATAGS
  
  config ARCH_OMAP1
        bool "TI OMAP1"
 -      depends on MMU
        select ARCH_OMAP
        select CLKSRC_MMIO
        select GENERIC_IRQ_CHIP
 -      select GENERIC_IRQ_MULTI_HANDLER
        select GPIOLIB
        select HAVE_LEGACY_CLK
        select IRQ_DOMAIN
@@@ -563,6 -573,18 +563,18 @@@ config ARCH_VIR
        select HAVE_ARM_ARCH_TIMER
        select ARCH_SUPPORTS_BIG_ENDIAN
  
+ config ARCH_AIROHA
+       bool "Airoha SoC Support"
+       depends on ARCH_MULTI_V7
+       select ARM_AMBA
+       select ARM_GIC
+       select ARM_GIC_V3
+       select ARM_PSCI
+       select HAVE_ARM_ARCH_TIMER
+       select COMMON_CLK
+       help
+         Support for Airoha EN7523 SoCs
  #
  # This is sorted alphabetically by mach-* pathname.  However, plat-*
  # Kconfigs may be included either alphabetically (according to the
@@@ -1154,12 -1176,7 +1166,12 @@@ config SMP_ON_U
  
  config CURRENT_POINTER_IN_TPIDRURO
        def_bool y
 -      depends on SMP && CPU_32v6K && !CPU_V6
 +      depends on CPU_32v6K && !CPU_V6
 +
 +config IRQSTACKS
 +      def_bool y
 +      select HAVE_IRQ_EXIT_ON_IRQ_STACK
 +      select HAVE_SOFTIRQ_ON_OWN_STACK
  
  config ARM_CPU_TOPOLOGY
        bool "Support cpu topology definition"
@@@ -1503,6 -1520,9 +1515,6 @@@ config HW_PERF_EVENT
        def_bool y
        depends on ARM_PMU
  
 -config ARCH_WANT_GENERAL_HUGETLB
 -      def_bool y
 -
  config ARM_MODULE_PLTS
        bool "Use PLTs to allow module memory to spill over into vmalloc area"
        depends on MODULES
@@@ -1600,14 -1620,10 +1612,14 @@@ config XE
        help
          Say Y if you want to run Linux in a Virtual Machine on Xen on ARM.
  
 +config CC_HAVE_STACKPROTECTOR_TLS
 +      def_bool $(cc-option,-mtp=cp15 -mstack-protector-guard=tls -mstack-protector-guard-offset=0)
 +
  config STACKPROTECTOR_PER_TASK
        bool "Use a unique stack canary value for each task"
 -      depends on GCC_PLUGINS && STACKPROTECTOR && THREAD_INFO_IN_TASK && !XIP_DEFLATED_DATA
 -      select GCC_PLUGIN_ARM_SSP_PER_TASK
 +      depends on STACKPROTECTOR && CURRENT_POINTER_IN_TPIDRURO && !XIP_DEFLATED_DATA
 +      depends on GCC_PLUGINS || CC_HAVE_STACKPROTECTOR_TLS
 +      select GCC_PLUGIN_ARM_SSP_PER_TASK if !CC_HAVE_STACKPROTECTOR_TLS
        default y
        help
          Due to the fact that GCC uses an ordinary symbol reference from
diff --combined arch/arm/Makefile
index e943624cbf8714badc7be043efd82a0128a49eb7,34baf885573ab07535196a69bfd3ab0a7fe725ba..a2391b8de5a556a8bef253b32c0cbd04680b55c8
@@@ -160,6 -160,7 +160,7 @@@ textofs-$(CONFIG_ARCH_AXXIA) := 0x00308
  # Machine directory name.  This list is sorted alphanumerically
  # by CONFIG_* macro name.
  machine-$(CONFIG_ARCH_ACTIONS)                += actions
+ machine-$(CONFIG_ARCH_AIROHA)         += airoha
  machine-$(CONFIG_ARCH_ALPINE)         += alpine
  machine-$(CONFIG_ARCH_ARTPEC)         += artpec
  machine-$(CONFIG_ARCH_ASPEED)           += aspeed
@@@ -275,14 -276,6 +276,14 @@@ endi
  
  ifeq ($(CONFIG_STACKPROTECTOR_PER_TASK),y)
  prepare: stack_protector_prepare
 +ifeq ($(CONFIG_CC_HAVE_STACKPROTECTOR_TLS),y)
 +stack_protector_prepare: prepare0
 +      $(eval KBUILD_CFLAGS += \
 +              -mstack-protector-guard=tls \
 +              -mstack-protector-guard-offset=$(shell  \
 +                      awk '{if ($$2 == "TSK_STACK_CANARY") print $$3;}'\
 +                              include/generated/asm-offsets.h))
 +else
  stack_protector_prepare: prepare0
        $(eval SSP_PLUGIN_CFLAGS := \
                -fplugin-arg-arm_ssp_per_task_plugin-offset=$(shell     \
        $(eval KBUILD_CFLAGS += $(SSP_PLUGIN_CFLAGS))
        $(eval GCC_PLUGINS_CFLAGS += $(SSP_PLUGIN_CFLAGS))
  endif
 +endif
  
  all:  $(notdir $(KBUILD_IMAGE))
  
index e41eca79c9504a51ef3fa5b643af128e3db92f06,ef21d19a855cffa8d0140e0d3ffd50d25f9eedea..7c16f8a2b738df6ac8dcb6eb3c4f053cb778cd05
@@@ -93,6 -93,7 +93,7 @@@ dtb-$(CONFIG_ARCH_BCM2835) += 
        bcm2837-rpi-3-b.dtb \
        bcm2837-rpi-3-b-plus.dtb \
        bcm2837-rpi-cm3-io3.dtb \
+       bcm2837-rpi-zero-2-w.dtb \
        bcm2711-rpi-400.dtb \
        bcm2711-rpi-4-b.dtb \
        bcm2711-rpi-cm4-io.dtb \
@@@ -187,6 -188,8 +188,8 @@@ dtb-$(CONFIG_ARCH_DAVINCI) += 
        da850-lego-ev3.dtb
  dtb-$(CONFIG_ARCH_DIGICOLOR) += \
        cx92755_equinox.dtb
+ dtb-$(CONFIG_ARCH_AIROHA) += \
+       en7523-evb.dtb
  dtb-$(CONFIG_ARCH_EXYNOS3) += \
        exynos3250-artik5-eval.dtb \
        exynos3250-monk.dtb \
@@@ -221,6 -224,8 +224,8 @@@ dtb-$(CONFIG_ARCH_EXYNOS5) += 
        exynos5420-arndale-octa.dtb \
        exynos5420-peach-pit.dtb \
        exynos5420-smdk5420.dtb \
+       exynos5420-chagall-wifi.dtb \
+       exynos5420-klimt-wifi.dtb \
        exynos5422-odroidhc1.dtb \
        exynos5422-odroidxu3.dtb \
        exynos5422-odroidxu3-lite.dtb \
@@@ -269,7 -274,7 +274,7 @@@ dtb-$(CONFIG_ARCH_IXP4XX) += 
        intel-ixp42x-dlink-dsm-g600.dtb \
        intel-ixp42x-gateworks-gw2348.dtb \
        intel-ixp43x-gateworks-gw2358.dtb \
-       intel-ixp42x-netgear-wg302v2.dtb \
+       intel-ixp42x-netgear-wg302v1.dtb \
        intel-ixp42x-arcom-vulcan.dtb \
        intel-ixp42x-gateway-7001.dtb
  dtb-$(CONFIG_ARCH_KEYSTONE) += \
  dtb-$(CONFIG_MACH_KIRKWOOD) += \
        kirkwood-b3.dtb \
        kirkwood-blackarmor-nas220.dtb \
+       kirkwood-c200-v1.dtb \
        kirkwood-cloudbox.dtb \
        kirkwood-d2net.dtb \
        kirkwood-db-88f6281.dtb \
@@@ -735,6 -741,8 +741,8 @@@ dtb-$(CONFIG_SOC_IMX7D) += 
  dtb-$(CONFIG_SOC_IMX7ULP) += \
        imx7ulp-com.dtb \
        imx7ulp-evk.dtb
+ dtb-$(CONFIG_SOC_LAN966) += \
+       lan966x-pcb8291.dtb
  dtb-$(CONFIG_SOC_LS1021A) += \
        ls1021a-moxa-uc-8410a.dtb \
        ls1021a-qds.dtb \
@@@ -806,7 -814,6 +814,7 @@@ dtb-$(CONFIG_ARCH_OMAP3) += 
        logicpd-som-lv-37xx-devkit.dtb \
        omap3430-sdp.dtb \
        omap3-beagle.dtb \
 +      omap3-beagle-ab4.dtb \
        omap3-beagle-xm.dtb \
        omap3-beagle-xm-ab.dtb \
        omap3-cm-t3517.dtb \
@@@ -895,6 -902,7 +903,7 @@@ dtb-$(CONFIG_SOC_AM33XX) += 
        am335x-regor-rdk.dtb \
        am335x-sancloud-bbe.dtb \
        am335x-sancloud-bbe-lite.dtb \
+       am335x-sancloud-bbe-extended-wifi.dtb \
        am335x-shc.dtb \
        am335x-sbc-t335.dtb \
        am335x-sl50.dtb \
@@@ -1162,6 -1170,7 +1171,7 @@@ dtb-$(CONFIG_ARCH_STM32) += 
        stm32mp157c-dhcom-picoitx.dtb \
        stm32mp157c-dk2.dtb \
        stm32mp157c-ed1.dtb \
+       stm32mp157c-emsbc-argon.dtb \
        stm32mp157c-ev1.dtb \
        stm32mp157c-lxa-mc1.dtb \
        stm32mp157c-odyssey.dtb
@@@ -1229,6 -1238,7 +1239,7 @@@ dtb-$(CONFIG_MACH_SUN7I) += 
        sun7i-a20-bananapro.dtb \
        sun7i-a20-cubieboard2.dtb \
        sun7i-a20-cubietruck.dtb \
+       sun7i-a20-haoyu-marsboard.dtb \
        sun7i-a20-hummingbird.dtb \
        sun7i-a20-itead-ibox.dtb \
        sun7i-a20-i12-tvbox.dtb \
@@@ -1416,6 -1426,7 +1427,7 @@@ dtb-$(CONFIG_ARCH_ZYNQ) += 
        zynq-zybo.dtb \
        zynq-zybo-z7.dtb
  dtb-$(CONFIG_MACH_ARMADA_370) += \
+       armada-370-c200-v2.dtb \
        armada-370-db.dtb \
        armada-370-dlink-dns327l.dtb \
        armada-370-mirabox.dtb \
@@@ -1493,6 -1504,9 +1505,9 @@@ dtb-$(CONFIG_ARCH_MEDIATEK) += 
  dtb-$(CONFIG_ARCH_MILBEAUT) += milbeaut-m10v-evb.dtb
  dtb-$(CONFIG_ARCH_MSTARV7) += \
        mstar-infinity-msc313-breadbee_crust.dtb \
+       mstar-infinity2m-ssd202d-100ask-dongshanpione.dtb \
+       mstar-infinity2m-ssd202d-miyoo-mini.dtb \
+       mstar-infinity2m-ssd202d-wirelesstag-ido-sbc2d06-v1b-22w.dtb \
        mstar-infinity2m-ssd202d-ssd201htv2.dtb \
        mstar-infinity2m-ssd202d-unitv2.dtb \
        mstar-infinity3-msc313e-breadbee.dtb \
@@@ -1506,6 -1520,7 +1521,7 @@@ dtb-$(CONFIG_ARCH_ASPEED) += 
        aspeed-bmc-arm-centriq2400-rep.dtb \
        aspeed-bmc-arm-stardragon4800-rep2.dtb \
        aspeed-bmc-asrock-e3c246d4i.dtb \
+       aspeed-bmc-asrock-romed8hm3.dtb \
        aspeed-bmc-bytedance-g220a.dtb \
        aspeed-bmc-facebook-bletchley.dtb \
        aspeed-bmc-facebook-cloudripper.dtb \
        aspeed-bmc-opp-zaius.dtb \
        aspeed-bmc-portwell-neptune.dtb \
        aspeed-bmc-quanta-q71l.dtb \
+       aspeed-bmc-quanta-s6q.dtb \
        aspeed-bmc-supermicro-x11spi.dtb \
        aspeed-bmc-inventec-transformers.dtb \
        aspeed-bmc-tyan-s7106.dtb \
index 21294f775a20f2e58bcb9fcfda944fbb72064607,0f2f26dc5ec65d72bd2864f56b619a0ef9fd0bc8..89af57482bc8fa1778e1ec9ed679afc78e36f590
  
                hvs: hvs@7e400000 {
                        compatible = "brcm,bcm2711-hvs";
 +                      reg = <0x7e400000 0x8000>;
                        interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
                };
  
                #size-cells = <0>;
                enable-method = "brcm,bcm2836-smp"; // for ARM 32-bit
  
+               /* Source for d/i-cache-line-size and d/i-cache-sets
+                * https://developer.arm.com/documentation/100095/0003
+                * /Level-1-Memory-System/About-the-L1-memory-system?lang=en
+                * Source for d/i-cache-size
+                * https://www.raspberrypi.com/documentation/computers
+                * /processors.html#bcm2711
+                */
                cpu0: cpu@0 {
                        device_type = "cpu";
                        compatible = "arm,cortex-a72";
                        reg = <0>;
                        enable-method = "spin-table";
                        cpu-release-addr = <0x0 0x000000d8>;
+                       d-cache-size = <0x8000>;
+                       d-cache-line-size = <64>;
+                       d-cache-sets = <256>; // 32KiB(size)/64(line-size)=512ways/2-way set
+                       i-cache-size = <0xc000>;
+                       i-cache-line-size = <64>;
+                       i-cache-sets = <256>; // 48KiB(size)/64(line-size)=768ways/3-way set
+                       next-level-cache = <&l2>;
                };
  
                cpu1: cpu@1 {
                        reg = <1>;
                        enable-method = "spin-table";
                        cpu-release-addr = <0x0 0x000000e0>;
+                       d-cache-size = <0x8000>;
+                       d-cache-line-size = <64>;
+                       d-cache-sets = <256>; // 32KiB(size)/64(line-size)=512ways/2-way set
+                       i-cache-size = <0xc000>;
+                       i-cache-line-size = <64>;
+                       i-cache-sets = <256>; // 48KiB(size)/64(line-size)=768ways/3-way set
+                       next-level-cache = <&l2>;
                };
  
                cpu2: cpu@2 {
                        reg = <2>;
                        enable-method = "spin-table";
                        cpu-release-addr = <0x0 0x000000e8>;
+                       d-cache-size = <0x8000>;
+                       d-cache-line-size = <64>;
+                       d-cache-sets = <256>; // 32KiB(size)/64(line-size)=512ways/2-way set
+                       i-cache-size = <0xc000>;
+                       i-cache-line-size = <64>;
+                       i-cache-sets = <256>; // 48KiB(size)/64(line-size)=768ways/3-way set
+                       next-level-cache = <&l2>;
                };
  
                cpu3: cpu@3 {
                        reg = <3>;
                        enable-method = "spin-table";
                        cpu-release-addr = <0x0 0x000000f0>;
+                       d-cache-size = <0x8000>;
+                       d-cache-line-size = <64>;
+                       d-cache-sets = <256>; // 32KiB(size)/64(line-size)=512ways/2-way set
+                       i-cache-size = <0xc000>;
+                       i-cache-line-size = <64>;
+                       i-cache-sets = <256>; // 48KiB(size)/64(line-size)=768ways/3-way set
+                       next-level-cache = <&l2>;
+               };
+               /* Source for d/i-cache-line-size and d/i-cache-sets
+                *  https://developer.arm.com/documentation/100095/0003
+                *  /Level-2-Memory-System/About-the-L2-memory-system?lang=en
+                *  Source for d/i-cache-size
+                *  https://www.raspberrypi.com/documentation/computers
+                *  /processors.html#bcm2711
+                */
+               l2: l2-cache0 {
+                       compatible = "cache";
+                       cache-size = <0x100000>;
+                       cache-line-size = <64>;
+                       cache-sets = <1024>; // 1MiB(size)/64(line-size)=16384ways/16-way set
+                       cache-level = <2>;
                };
        };
  
index 45a9d9b908d2a1a3ecb15340383f1c744ef62724,85d56c63e49ad6fe93b4aaa2867c316cd058fb20..26b9bbe310af25e7cd382b8068c34a2edf43e698
                status = "disabled";
        };
  
 -      crypto: cypto-controller@ff8a0000 {
 +      crypto: crypto@ff8a0000 {
                compatible = "rockchip,rk3288-crypto";
                reg = <0x0 0xff8a0000 0x0 0x4000>;
                interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;
                clock-names = "aclk", "hclk", "sclk", "apb_pclk";
                resets = <&cru SRST_CRYPTO>;
                reset-names = "crypto-rst";
-               status = "okay";
        };
  
        iep_mmu: iommu@ff900800 {
index f8c5899fbdba0554476bc79af16eb72d45349016,ce104f9552d35c584be36f429835ca74592fddb6..dcb03ce7cbd4a03da0cf7d6b803a8296ed180049
                compatible = "samsung,eb485159lu";
        };
  
+       thermal-zones {
+               battery-thermal {
+                       /* This zone will be polled by the battery temperature code */
+                       polling-delay = <0>;
+                       polling-delay-passive = <0>;
+                       thermal-sensors = <&bat_therm>;
+               };
+       };
+       bat_therm: thermistor {
+               compatible = "samsung,1404-001221";
+               io-channels = <&gpadc 0x02>; /* BatTemp */
+               pullup-uv = <1800000>;
+               pullup-ohm = <230000>;
+               pulldown-ohm = <0>;
+               #thermal-sensor-cells = <0>;
+       };
        /* TI TXS0206 level translator for 2.9 V */
        sd_level_translator: regulator-gpio {
                compatible = "regulator-fixed";
                        cap-sd-highspeed;
                        cap-mmc-highspeed;
                        /* All direction control is used */
 -                      st,sig-dir-cmd;
 -                      st,sig-dir-dat0;
 -                      st,sig-dir-dat2;
 -                      st,sig-dir-dat31;
                        st,sig-pin-fbclk;
                        full-pwr-cycle;
                        vmmc-supply = <&ab8500_ldo_aux3_reg>;
  
                prcmu@80157000 {
                        ab8505 {
-                               ab8500_usb {
+                               phy {
                                        pinctrl-names = "default", "sleep";
                                        pinctrl-0 = <&usb_a_1_default>;
                                        pinctrl-1 = <&usb_a_1_sleep>;
                                };
  
-                               ab8505-regulators {
+                               regulator {
                                        ab8500_ldo_aux1 {
                                                /* Used for VDD for sensors */
                                                regulator-name = "AUX1";
index 21697449d762fa990873cbb5fd1f33365b8e3862,739254493d6acdcb36eabe058e644d3ec82500b6..30b123cde02c506f5fe8a4be98a7191293292fd5
@@@ -268,6 -268,12 +268,12 @@@ config ARCH_TEGR
        help
          This enables support for the NVIDIA Tegra SoC family.
  
+ config ARCH_TESLA_FSD
+       bool "ARMv8 based Tesla platform"
+       depends on ARCH_EXYNOS
+       help
+         Support for ARMv8 based Tesla platforms.
  config ARCH_SPRD
        bool "Spreadtrum SoC platform"
        help
@@@ -309,6 -315,9 +315,6 @@@ config ARCH_VISCONT
        help
          This enables support for Toshiba Visconti SoCs Family.
  
 -config ARCH_VULCAN
 -      def_bool n
 -
  config ARCH_XGENE
        bool "AppliedMicro X-Gene SOC Family"
        help
index f84d4b489e0bad31810364804e8f076b98757d6a,6d99c23261fbacebfaebf5f53cefdf56bae7dead..45947c1031c429c558d13dba0e42f944eb992c19
                        no-map;
                };
  
 +              /* 32 MiB reserved for ARM Trusted Firmware (BL32) */
 +              secmon_reserved_bl32: secmon@5300000 {
 +                      reg = <0x0 0x05300000 0x0 0x2000000>;
 +                      no-map;
 +              };
 +
                linux,cma {
                        compatible = "shared-dma-pool";
                        reusable;
                                                };
                                        };
  
+                                       pwm_f_z_pins: pwm-f-z {
+                                               mux {
+                                                       groups = "pwm_f_z";
+                                                       function = "pwm_f";
+                                                       bias-disable;
+                                               };
+                                       };
+                                       pwm_f_a_pins: pwm-f-a {
+                                               mux {
+                                                       groups = "pwm_f_a";
+                                                       function = "pwm_f";
+                                                       bias-disable;
+                                               };
+                                       };
                                        pwm_f_x_pins: pwm-f-x {
                                                mux {
                                                        groups = "pwm_f_x";
                                                };
                                        };
  
+                                       uart_ao_b_2_3_pins: uart-ao-b-2-3 {
+                                               mux {
+                                                       groups = "uart_ao_b_tx_2",
+                                                                "uart_ao_b_rx_3";
+                                                       function = "uart_ao_b";
+                                                       bias-disable;
+                                               };
+                                       };
+                                       uart_ao_b_8_9_pins: uart-ao-b-8-9 {
+                                               mux {
+                                                       groups = "uart_ao_b_tx_8",
+                                                                "uart_ao_b_rx_9";
+                                                       function = "uart_ao_b";
+                                                       bias-disable;
+                                               };
+                                       };
+                                       uart_ao_b_cts_rts_pins: uart-ao-b-cts-rts {
+                                               mux {
+                                                       groups = "uart_ao_b_cts",
+                                                                "uart_ao_b_rts";
+                                                       function = "uart_ao_b";
+                                                       bias-disable;
+                                               };
+                                       };
                                        pwm_a_e_pins: pwm-a-e {
                                                mux {
                                                        groups = "pwm_a_e";
index 0c7a72c51a313a172e9fb289092a4bcdf18d420b,2692f3a497e43f21e5536f1b7598ae32a34a9ced..1ee05677c2dd05b28c4addf8869578a8160f5b8b
                        };
  
                        gpr: iomuxc-gpr@30340000 {
-                               compatible = "fsl,imx8mm-iomuxc-gpr", "syscon";
+                               compatible = "fsl,imx8mm-iomuxc-gpr", "fsl,imx6q-iomuxc-gpr", "syscon";
                                reg = <0x30340000 0x10000>;
                        };
  
                                                clocks = <&clk IMX8MM_CLK_VPU_DEC_ROOT>;
                                                assigned-clocks = <&clk IMX8MM_CLK_VPU_BUS>;
                                                assigned-clock-parents = <&clk IMX8MM_SYS_PLL1_800M>;
 -                                              resets = <&src IMX8MQ_RESET_VPU_RESET>;
                                        };
  
                                        pgc_vpu_g1: power-domain@7 {
                                reg = <0x32e50200 0x200>;
                        };
  
+                       pcie_phy: pcie-phy@32f00000 {
+                               compatible = "fsl,imx8mm-pcie-phy";
+                               reg = <0x32f00000 0x10000>;
+                               clocks = <&clk IMX8MM_CLK_PCIE1_PHY>;
+                               clock-names = "ref";
+                               assigned-clocks = <&clk IMX8MM_CLK_PCIE1_PHY>;
+                               assigned-clock-rates = <100000000>;
+                               assigned-clock-parents = <&clk IMX8MM_SYS_PLL2_100M>;
+                               resets = <&src IMX8MQ_RESET_PCIEPHY>;
+                               reset-names = "pciephy";
+                               #phy-cells = <0>;
+                               status = "disabled";
+                       };
                };
  
                dma_apbh: dma-controller@33000000 {
                        status = "disabled";
                };
  
+               pcie0: pcie@33800000 {
+                       compatible = "fsl,imx8mm-pcie";
+                       reg = <0x33800000 0x400000>, <0x1ff00000 0x80000>;
+                       reg-names = "dbi", "config";
+                       #address-cells = <3>;
+                       #size-cells = <2>;
+                       device_type = "pci";
+                       bus-range = <0x00 0xff>;
+                       ranges =  <0x81000000 0 0x00000000 0x1ff80000 0 0x00010000 /* downstream I/O 64KB */
+                                  0x82000000 0 0x18000000 0x18000000 0 0x07f00000>; /* non-prefetchable memory */
+                       num-lanes = <1>;
+                       num-viewport = <4>;
+                       interrupts = <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "msi";
+                       #interrupt-cells = <1>;
+                       interrupt-map-mask = <0 0 0 0x7>;
+                       interrupt-map = <0 0 0 1 &gic GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>,
+                                       <0 0 0 2 &gic GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>,
+                                       <0 0 0 3 &gic GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
+                                       <0 0 0 4 &gic GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>;
+                       fsl,max-link-speed = <2>;
+                       linux,pci-domain = <0>;
+                       power-domains = <&pgc_pcie>;
+                       resets = <&src IMX8MQ_RESET_PCIE_CTRL_APPS_EN>,
+                                <&src IMX8MQ_RESET_PCIE_CTRL_APPS_TURNOFF>;
+                       reset-names = "apps", "turnoff";
+                       phys = <&pcie_phy>;
+                       phy-names = "pcie-phy";
+                       status = "disabled";
+               };
                gpu_3d: gpu@38000000 {
                        compatible = "vivante,gc";
                        reg = <0x38000000 0x8000>;
                        power-domains = <&pgc_gpu>;
                };
  
+               vpu_g1: video-codec@38300000 {
+                       compatible = "nxp,imx8mm-vpu-g1";
+                       reg = <0x38300000 0x10000>;
+                       interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&clk IMX8MM_CLK_VPU_G1_ROOT>;
+                       power-domains = <&vpu_blk_ctrl IMX8MM_VPUBLK_PD_G1>;
+               };
+               vpu_g2: video-codec@38310000 {
+                       compatible = "nxp,imx8mq-vpu-g2";
+                       reg = <0x38310000 0x10000>;
+                       interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&clk IMX8MM_CLK_VPU_G2_ROOT>;
+                       power-domains = <&vpu_blk_ctrl IMX8MM_VPUBLK_PD_G2>;
+               };
                vpu_blk_ctrl: blk-ctrl@38330000 {
                        compatible = "fsl,imx8mm-vpu-blk-ctrl", "syscon";
                        reg = <0x38330000 0x100>;
                                 <&clk IMX8MM_CLK_VPU_G2_ROOT>,
                                 <&clk IMX8MM_CLK_VPU_H1_ROOT>;
                        clock-names = "g1", "g2", "h1";
+                       assigned-clocks = <&clk IMX8MM_CLK_VPU_G1>,
+                                         <&clk IMX8MM_CLK_VPU_G2>;
+                       assigned-clock-parents = <&clk IMX8MM_VPU_PLL_OUT>,
+                                                <&clk IMX8MM_VPU_PLL_OUT>;
+                       assigned-clock-rates = <600000000>,
+                                              <600000000>;
                        #power-domain-cells = <1>;
                };
  
index 2d4a472af6a9b3cc3b52bcd7dada7873608fa278,4429a0471bad38460309077ab3e1ce394b9024c6..05c16376b4d8c97f1797e07b0de3f4d23edca99e
  
  &ddrc {
        operating-points-v2 = <&ddrc_opp_table>;
+       status = "okay";
  
        ddrc_opp_table: opp-table {
                compatible = "operating-points-v2";
        status = "okay";
  
        ports {
 -              port@1 {
 -                      reg = <1>;
 +              port@0 {
 +                      reg = <0>;
  
                        mipi1_sensor_ep: endpoint {
                                remote-endpoint = <&camera1_ep>;
index e92ebb6147e6d72ca27e5cb34504d3d219a58f49,c4d48952b3b8c04de849e72845e0e4c4c9132c35..5b3e849f554d1d611c3e914ea5ccee9ba8d6b5a3
                                assigned-clock-rates = <0>, <0>, <0>, <594000000>;
                                status = "disabled";
  
 -                              port@0 {
 +                              port {
                                        lcdif_mipi_dsi: endpoint {
                                                remote-endpoint = <&mipi_dsi_lcdif_in>;
                                        };
                                        pgc_vpu: power-domain@6 {
                                                #power-domain-cells = <0>;
                                                reg = <IMX8M_POWER_DOMAIN_VPU>;
-                                               clocks = <&clk IMX8MQ_CLK_VPU_DEC_ROOT>;
+                                               clocks = <&clk IMX8MQ_CLK_VPU_DEC_ROOT>,
+                                                        <&clk IMX8MQ_CLK_VPU_G1_ROOT>,
+                                                        <&clk IMX8MQ_CLK_VPU_G2_ROOT>;
+                                               assigned-clocks = <&clk IMX8MQ_CLK_VPU_G1>,
+                                                                 <&clk IMX8MQ_CLK_VPU_G2>,
+                                                                 <&clk IMX8MQ_CLK_VPU_BUS>,
+                                                                 <&clk IMX8MQ_VPU_PLL_BYPASS>;
+                                               assigned-clock-parents = <&clk IMX8MQ_VPU_PLL_OUT>,
+                                                                        <&clk IMX8MQ_VPU_PLL_OUT>,
+                                                                        <&clk IMX8MQ_SYS1_PLL_800M>,
+                                                                        <&clk IMX8MQ_VPU_PLL>;
+                                               assigned-clock-rates = <600000000>,
+                                                                      <600000000>,
+                                                                      <800000000>,
+                                                                      <0>;
                                        };
  
                                        pgc_disp: power-domain@7 {
                                        #address-cells = <1>;
                                        #size-cells = <0>;
  
 -                                      port@0 {
 -                                              reg = <0>;
 +                                      port@1 {
 +                                              reg = <1>;
  
                                                csi1_mipi_ep: endpoint {
                                                        remote-endpoint = <&csi1_ep>;
                                        #address-cells = <1>;
                                        #size-cells = <0>;
  
 -                                      port@0 {
 -                                              reg = <0>;
 +                                      port@1 {
 +                                              reg = <1>;
  
                                                csi2_mipi_ep: endpoint {
                                                        remote-endpoint = <&csi2_ep>;
                        status = "disabled";
                };
  
-               vpu: video-codec@38300000 {
-                       compatible = "nxp,imx8mq-vpu";
-                       reg = <0x38300000 0x10000>,
-                             <0x38310000 0x10000>,
-                             <0x38320000 0x10000>;
-                       reg-names = "g1", "g2", "ctrl";
-                       interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
-                       interrupt-names = "g1", "g2";
+               vpu_g1: video-codec@38300000 {
+                       compatible = "nxp,imx8mq-vpu-g1";
+                       reg = <0x38300000 0x10000>;
+                       interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&clk IMX8MQ_CLK_VPU_G1_ROOT>;
+                       power-domains = <&vpu_blk_ctrl IMX8MQ_VPUBLK_PD_G1>;
+               };
+               vpu_g2: video-codec@38310000 {
+                       compatible = "nxp,imx8mq-vpu-g2";
+                       reg = <0x38310000 0x10000>;
+                       interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&clk IMX8MQ_CLK_VPU_G2_ROOT>;
+                       power-domains = <&vpu_blk_ctrl IMX8MQ_VPUBLK_PD_G2>;
+               };
+               vpu_blk_ctrl: blk-ctrl@38320000 {
+                       compatible = "fsl,imx8mq-vpu-blk-ctrl";
+                       reg = <0x38320000 0x100>;
+                       power-domains = <&pgc_vpu>, <&pgc_vpu>, <&pgc_vpu>;
+                       power-domain-names = "bus", "g1", "g2";
                        clocks = <&clk IMX8MQ_CLK_VPU_G1_ROOT>,
-                                <&clk IMX8MQ_CLK_VPU_G2_ROOT>,
-                                <&clk IMX8MQ_CLK_VPU_DEC_ROOT>;
-                       clock-names = "g1", "g2", "bus";
-                       assigned-clocks = <&clk IMX8MQ_CLK_VPU_G1>,
-                                         <&clk IMX8MQ_CLK_VPU_G2>,
-                                         <&clk IMX8MQ_CLK_VPU_BUS>,
-                                         <&clk IMX8MQ_VPU_PLL_BYPASS>;
-                       assigned-clock-parents = <&clk IMX8MQ_VPU_PLL_OUT>,
-                                                <&clk IMX8MQ_VPU_PLL_OUT>,
-                                                <&clk IMX8MQ_SYS1_PLL_800M>,
-                                                <&clk IMX8MQ_VPU_PLL>;
-                       assigned-clock-rates = <600000000>, <600000000>,
-                                              <800000000>, <0>;
-                       power-domains = <&pgc_vpu>;
+                                <&clk IMX8MQ_CLK_VPU_G2_ROOT>;
+                       clock-names = "g1", "g2";
+                       #power-domain-cells = <1>;
                };
  
                pcie0: pcie@33800000 {
                                 <&clk IMX8MQ_DRAM_PLL_OUT>,
                                 <&clk IMX8MQ_CLK_DRAM_ALT>,
                                 <&clk IMX8MQ_CLK_DRAM_APB>;
+                       status = "disabled";
                };
  
                ddr-pmu@3d800000 {
index ce6d5bdba0a893444f35cedf83844615beddbfdd,3ea34b3a55f8922e87d202b58560c5deb8704065..c2f0f1a1566c56071dc63823178660e0f2bd6939
                };
        };
  
+       pcie0_refclk: pcie0-refclk {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <100000000>;
+       };
        reg_hub_vbus: regulator-hub-vbus {
                compatible = "regulator-fixed";
                regulator-name = "MBA8MX_HUB_VBUS";
@@@ -91,7 -97,7 +97,7 @@@
  
        sound {
                compatible = "fsl,imx-audio-tlv320aic32x4";
 -              model = "tqm-tlv320aic32";
 +              model = "imx-audio-tlv320aic32x4";
                ssi-controller = <&sai3>;
                audio-codec = <&tlv320aic3x04>;
        };
index f4270cf1899624ca4722ac3a412288fa9ee6dfb2,e593d7797d318df47bdf56ffcfe3e01956d83731..c78371703e764fd85c31ffdfc9136c15075ed913
                        status = "disabled";
                };
  
-               mmc: dwmmc0@ff808000 {
+               mmc: mmc@ff808000 {
                        #address-cells = <1>;
                        #size-cells = <0>;
                        compatible = "altr,socfpga-dw-mshc";
                        reg = <0xffe00000 0x40000>;
                };
  
-               pdma: pdma@ffda0000 {
+               pdma: dma-controller@ffda0000 {
                        compatible = "arm,pl330", "arm,primecell";
                        reg = <0xffda0000 0x1000>;
                        interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>,
                };
  
                usb0: usb@ffb00000 {
 -                      compatible = "snps,dwc2";
 +                      compatible = "intel,socfpga-agilex-hsotg", "snps,dwc2";
                        reg = <0xffb00000 0x40000>;
                        interrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>;
                        phys = <&usbphy0>;
                        resets = <&rst USB0_RESET>, <&rst USB0_OCP_RESET>;
                        reset-names = "dwc2", "dwc2-ecc";
                        clocks = <&clkmgr AGILEX_USB_CLK>;
+                       clock-names = "otg";
                        iommus = <&smmu 6>;
                        status = "disabled";
                };
  
                usb1: usb@ffb40000 {
 -                      compatible = "snps,dwc2";
 +                      compatible = "intel,socfpga-agilex-hsotg", "snps,dwc2";
                        reg = <0xffb40000 0x40000>;
                        interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;
                        phys = <&usbphy0>;
index fb78ef613b29248982176074c58e875710b6a03c,c0de8d10e58c99ef979b1a837476d084a8cbc139..30233de58bb31626f2bacb382805128b97559449
                        bus-range = <0x00 0xff>;
                        interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
                        #interrupt-cells = <1>;
+                       clocks = <&sb_periph_clk 13>;
                        msi-parent = <&pcie0>;
                        msi-controller;
                        /*
                         * (totaling 127 MiB) for MEM.
                         */
                        ranges = <0x82000000 0 0xe8000000   0 0xe8000000   0 0x07f00000   /* Port 0 MEM */
 -                                0x81000000 0 0xefff0000   0 0xefff0000   0 0x00010000>; /* Port 0 IO */
 +                                0x81000000 0 0x00000000   0 0xefff0000   0 0x00010000>; /* Port 0 IO */
                        interrupt-map-mask = <0 0 0 7>;
                        interrupt-map = <0 0 0 1 &pcie_intc 0>,
                                        <0 0 0 2 &pcie_intc 1>,
index aaa00da5351dfa71be46801c15a1179e40d0eb34,c28bf4d8eb038ede1532dc0dbf147c46265e56dc..751ebe5e950688162c1ec945f2bca319588904c3
                        snps,rxpbl = <8>;
                };
  
+               gpcdma: dma-controller@2600000 {
+                       compatible = "nvidia,tegra194-gpcdma",
+                                    "nvidia,tegra186-gpcdma";
+                       reg = <0x2600000 0x210000>;
+                       resets = <&bpmp TEGRA194_RESET_GPCDMA>;
+                       reset-names = "gpcdma";
+                       interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
+                       #dma-cells = <1>;
+                       iommus = <&smmu TEGRA194_SID_GPCDMA_0>;
+                       dma-coherent;
+                       status = "okay";
+               };
                aconnect@2900000 {
                        compatible = "nvidia,tegra194-aconnect",
                                     "nvidia,tegra210-aconnect";
                                                    "rx19", "tx19",
                                                    "rx20", "tx20";
                                        status = "disabled";
+                                       interconnects = <&mc TEGRA194_MEMORY_CLIENT_APEDMAR &emc>,
+                                                       <&mc TEGRA194_MEMORY_CLIENT_APEDMAW &emc>;
+                                       interconnect-names = "dma-mem", "write";
+                                       iommus = <&smmu TEGRA194_SID_APE>;
                                };
  
                                tegra_i2s1: i2s@2901000 {
                        #iommu-cells = <1>;
  
                        nvidia,memory-controller = <&mc>;
 -                      status = "okay";
 +                      status = "disabled";
                };
  
                smmu: iommu@12000000 {
        };
  
        pmu {
-               compatible = "arm,armv8-pmuv3";
+               compatible = "nvidia,carmel-pmu";
                interrupts = <GIC_SPI 384 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 385 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 386 IRQ_TYPE_LEVEL_HIGH>,
                 * for 8x and 11.025x sample rate streams.
                 */
                assigned-clock-rates = <258000000>;
-               interconnects = <&mc TEGRA194_MEMORY_CLIENT_APEDMAR &emc>,
-                               <&mc TEGRA194_MEMORY_CLIENT_APEDMAW &emc>;
-               interconnect-names = "dma-mem", "write";
-               iommus = <&smmu TEGRA194_SID_APE>;
        };
  
        tcu: serial {
index e2b9ec134cb10ab4274962de2273bd0f6c469efc,fd1261901ab5e665e8661aca721c8598b479bb79..f1619b3f97ef80d059ced01196aadbec5809a3a6
                };
        };
  
-       panel {
-               compatible = "boe,nv133fhm-n61";
-               no-hpd;
-               ports {
-                       port {
-                               panel_in_edp: endpoint {
-                                       remote-endpoint = <&sn65dsi86_out>;
-                               };
-                       };
-               };
-       };
        /* Reserved memory changes for IPA */
        reserved-memory {
                wlan_msa_mem: memory@8c400000 {
  
                clock-frequency = <19200000>;
        };
+       backlight: backlight {
+               compatible = "pwm-backlight";
+               pwms = <&sn65dsi86 1000000>;
+               enable-gpios = <&tlmm 11 GPIO_ACTIVE_HIGH>;
+       };
  };
  
  &adsp_pas {
                clock-names = "refclk";
  
                no-hpd;
+               #pwm-cells = <1>;
  
                ports {
                        #address-cells = <1>;
                                };
                        };
                };
+               aux-bus {
+                       panel: panel {
+                               compatible = "boe,nv133fhm-n61";
+                               backlight = <&backlight>;
+                               port {
+                                       panel_in_edp: endpoint {
+                                               remote-endpoint = <&sn65dsi86_out>;
+                                       };
+                               };
+                       };
+               };
        };
  };
  
  
        qcom,snoc-host-cap-8bit-quirk;
  };
 +
 +&crypto {
 +      /* FIXME: qce_start triggers an SError */
 +      status= "disable";
 +};
index 4b19744bcfb34ecde260460e4e81855518d2a11a,4fb835e8f54d9f6a5a0bfce28c5ebf15cd1d98bb..d242bab69c2e323a5b05d03eaccd8cdb259cfad4
                        clock-frequency = <32000>;
                        #clock-cells = <0>;
                };
 +
 +              ufs_phy_rx_symbol_0_clk: ufs-phy-rx-symbol-0 {
 +                      compatible = "fixed-clock";
 +                      clock-frequency = <1000>;
 +                      #clock-cells = <0>;
 +              };
 +
 +              ufs_phy_rx_symbol_1_clk: ufs-phy-rx-symbol-1 {
 +                      compatible = "fixed-clock";
 +                      clock-frequency = <1000>;
 +                      #clock-cells = <0>;
 +              };
 +
 +              ufs_phy_tx_symbol_0_clk: ufs-phy-tx-symbol-0 {
 +                      compatible = "fixed-clock";
 +                      clock-frequency = <1000>;
 +                      #clock-cells = <0>;
 +              };
        };
  
        cpus {
                                 <0>,
                                 <0>,
                                 <0>,
 -                               <0>,
 -                               <0>,
 -                               <0>,
 +                               <&ufs_phy_rx_symbol_0_clk>,
 +                               <&ufs_phy_rx_symbol_1_clk>,
 +                               <&ufs_phy_tx_symbol_0_clk>,
                                 <0>,
                                 <0>;
                };
                        interconnect-names = "memory",
                                             "config";
  
+                       qcom,qmp = <&aoss_qmp>;
                        qcom,smem-states = <&ipa_smp2p_out 0>,
                                           <&ipa_smp2p_out 1>;
                        qcom,smem-state-names = "ipa-clock-enabled-valid",
                        qcom,tcs-offset = <0xd00>;
                        qcom,drv-id = <2>;
                        qcom,tcs-config = <ACTIVE_TCS  2>, <SLEEP_TCS   3>,
-                                         <WAKE_TCS    3>, <CONTROL_TCS 1>;
+                                         <WAKE_TCS    3>, <CONTROL_TCS 0>;
  
                        rpmhcc: clock-controller {
                                compatible = "qcom,sm8350-rpmh-clk";
                                <75000000 300000000>,
                                <0 0>,
                                <0 0>,
 -                              <75000000 300000000>,
 -                              <75000000 300000000>;
 +                              <0>,
 +                              <0>;
                        status = "disabled";
                };
  
                        };
                };
  
-               gpu-thermal-top {
+               gpu-top-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
  
                        };
                };
  
-               gpu-thermal-bottom {
+               gpu-bottom-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
  
                        };
                };
  
-               modem1-thermal-top {
+               modem1-top-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
  
                        };
                };
  
-               modem2-thermal-top {
+               modem2-top-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
  
                        };
                };
  
-               modem3-thermal-top {
+               modem3-top-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
  
                        };
                };
  
-               modem4-thermal-top {
+               modem4-top-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
  
                        };
                };
  
-               camera-thermal-top {
+               camera-top-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
  
                        };
                };
  
-               cam-thermal-bottom {
+               cam-bottom-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
  
index 02b97e838c4742e3e60fb034b1c51d3460ae033f,0cd5af8c03bda2356b7ea5821ca9c9c713a8d6c0..934e29b9e153b5c73b33115a6e4aee8019c8b2bb
@@@ -7,7 -7,9 +7,9 @@@
  #include <dt-bindings/clock/qcom,gcc-sm8450.h>
  #include <dt-bindings/clock/qcom,rpmh.h>
  #include <dt-bindings/gpio/gpio.h>
+ #include <dt-bindings/mailbox/qcom-ipcc.h>
  #include <dt-bindings/power/qcom-rpmpd.h>
+ #include <dt-bindings/interconnect/qcom,sm8450.h>
  #include <dt-bindings/soc/qcom,rpmh-rsc.h>
  
  / {
                                compatible = "arm,idle-state";
                                idle-state-name = "silver-rail-power-collapse";
                                arm,psci-suspend-param = <0x40000004>;
-                               entry-latency-us = <274>;
-                               exit-latency-us = <480>;
-                               min-residency-us = <3934>;
+                               entry-latency-us = <800>;
+                               exit-latency-us = <750>;
+                               min-residency-us = <4090>;
                                local-timer-stop;
                        };
  
                                compatible = "arm,idle-state";
                                idle-state-name = "gold-rail-power-collapse";
                                arm,psci-suspend-param = <0x40000004>;
-                               entry-latency-us = <327>;
-                               exit-latency-us = <1502>;
-                               min-residency-us = <4488>;
+                               entry-latency-us = <600>;
+                               exit-latency-us = <1550>;
+                               min-residency-us = <4791>;
                                local-timer-stop;
                        };
                };
                        CLUSTER_SLEEP_0: cluster-sleep-0 {
                                compatible = "domain-idle-state";
                                idle-state-name = "cluster-l3-off";
-                               arm,psci-suspend-param = <0x4100c344>;
-                               entry-latency-us = <584>;
-                               exit-latency-us = <2332>;
-                               min-residency-us = <6118>;
+                               arm,psci-suspend-param = <0x41000044>;
+                               entry-latency-us = <1050>;
+                               exit-latency-us = <2500>;
+                               min-residency-us = <5309>;
                                local-timer-stop;
                        };
  
                                compatible = "domain-idle-state";
                                idle-state-name = "cluster-power-collapse";
                                arm,psci-suspend-param = <0x4100c344>;
-                               entry-latency-us = <2893>;
-                               exit-latency-us = <4023>;
-                               min-residency-us = <9987>;
+                               entry-latency-us = <2700>;
+                               exit-latency-us = <3500>;
+                               min-residency-us = <13959>;
                                local-timer-stop;
                        };
                };
                };
        };
  
+       clk_virt: interconnect@0 {
+               compatible = "qcom,sm8450-clk-virt";
+               #interconnect-cells = <2>;
+               qcom,bcm-voters = <&apps_bcm_voter>;
+       };
+       mc_virt: interconnect@1 {
+               compatible = "qcom,sm8450-mc-virt";
+               #interconnect-cells = <2>;
+               qcom,bcm-voters = <&apps_bcm_voter>;
+       };
        memory@a0000000 {
                device_type = "memory";
                /* We expect the bootloader to fill in the size */
  
                CLUSTER_PD: cpu-cluster0 {
                        #power-domain-cells = <0>;
-                       domain-idle-states = <&CLUSTER_SLEEP_0>;
+                       domain-idle-states = <&CLUSTER_SLEEP_0>, <&CLUSTER_SLEEP_1>;
                };
        };
  
                        no-map;
                };
  
+               rmtfs_mem: memory@9fd00000 {
+                       compatible = "qcom,rmtfs-mem";
+                       reg = <0x0 0x9fd00000 0x0 0x280000>;
+                       no-map;
+                       qcom,client-id = <1>;
+                       qcom,vmid = <15>;
+               };
                global_sync_mem: memory@a6f00000 {
                        reg = <0x0 0xa6f00000 0x0 0x100000>;
                        no-map;
                };
        };
  
+       smp2p-adsp {
+               compatible = "qcom,smp2p";
+               qcom,smem = <443>, <429>;
+               interrupts-extended = <&ipcc IPCC_CLIENT_LPASS
+                                            IPCC_MPROC_SIGNAL_SMP2P
+                                            IRQ_TYPE_EDGE_RISING>;
+               mboxes = <&ipcc IPCC_CLIENT_LPASS
+                               IPCC_MPROC_SIGNAL_SMP2P>;
+               qcom,local-pid = <0>;
+               qcom,remote-pid = <2>;
+               smp2p_adsp_out: master-kernel {
+                       qcom,entry-name = "master-kernel";
+                       #qcom,smem-state-cells = <1>;
+               };
+               smp2p_adsp_in: slave-kernel {
+                       qcom,entry-name = "slave-kernel";
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+               };
+       };
+       smp2p-cdsp {
+               compatible = "qcom,smp2p";
+               qcom,smem = <94>, <432>;
+               interrupts-extended = <&ipcc IPCC_CLIENT_CDSP
+                                            IPCC_MPROC_SIGNAL_SMP2P
+                                            IRQ_TYPE_EDGE_RISING>;
+               mboxes = <&ipcc IPCC_CLIENT_CDSP
+                               IPCC_MPROC_SIGNAL_SMP2P>;
+               qcom,local-pid = <0>;
+               qcom,remote-pid = <5>;
+               smp2p_cdsp_out: master-kernel {
+                       qcom,entry-name = "master-kernel";
+                       #qcom,smem-state-cells = <1>;
+               };
+               smp2p_cdsp_in: slave-kernel {
+                       qcom,entry-name = "slave-kernel";
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+               };
+       };
+       smp2p-modem {
+               compatible = "qcom,smp2p";
+               qcom,smem = <435>, <428>;
+               interrupts-extended = <&ipcc IPCC_CLIENT_MPSS
+                                            IPCC_MPROC_SIGNAL_SMP2P
+                                            IRQ_TYPE_EDGE_RISING>;
+               mboxes = <&ipcc IPCC_CLIENT_MPSS
+                               IPCC_MPROC_SIGNAL_SMP2P>;
+               qcom,local-pid = <0>;
+               qcom,remote-pid = <1>;
+               smp2p_modem_out: master-kernel {
+                       qcom,entry-name = "master-kernel";
+                       #qcom,smem-state-cells = <1>;
+               };
+               smp2p_modem_in: slave-kernel {
+                       qcom,entry-name = "slave-kernel";
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+               };
+               ipa_smp2p_out: ipa-ap-to-modem {
+                       qcom,entry-name = "ipa";
+                       #qcom,smem-state-cells = <1>;
+               };
+               ipa_smp2p_in: ipa-modem-to-ap {
+                       qcom,entry-name = "ipa";
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+               };
+       };
+       smp2p-slpi {
+               compatible = "qcom,smp2p";
+               qcom,smem = <481>, <430>;
+               interrupts-extended = <&ipcc IPCC_CLIENT_SLPI
+                                            IPCC_MPROC_SIGNAL_SMP2P
+                                            IRQ_TYPE_EDGE_RISING>;
+               mboxes = <&ipcc IPCC_CLIENT_SLPI
+                               IPCC_MPROC_SIGNAL_SMP2P>;
+               qcom,local-pid = <0>;
+               qcom,remote-pid = <3>;
+               smp2p_slpi_out: master-kernel {
+                       qcom,entry-name = "master-kernel";
+                       #qcom,smem-state-cells = <1>;
+               };
+               smp2p_slpi_in: slave-kernel {
+                       qcom,entry-name = "slave-kernel";
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+               };
+       };
        soc: soc@0 {
                #address-cells = <2>;
                #size-cells = <2>;
                        };
                };
  
+               config_noc: interconnect@1500000 {
+                       compatible = "qcom,sm8450-config-noc";
+                       reg = <0 0x01500000 0 0x1c000>;
+                       #interconnect-cells = <2>;
+                       qcom,bcm-voters = <&apps_bcm_voter>;
+               };
+               system_noc: interconnect@1680000 {
+                       compatible = "qcom,sm8450-system-noc";
+                       reg = <0 0x01680000 0 0x1e200>;
+                       #interconnect-cells = <2>;
+                       qcom,bcm-voters = <&apps_bcm_voter>;
+               };
+               pcie_noc: interconnect@16c0000 {
+                       compatible = "qcom,sm8450-pcie-anoc";
+                       reg = <0 0x016c0000 0 0xe280>;
+                       #interconnect-cells = <2>;
+                       qcom,bcm-voters = <&apps_bcm_voter>;
+               };
+               aggre1_noc: interconnect@16e0000 {
+                       compatible = "qcom,sm8450-aggre1-noc";
+                       reg = <0 0x016e0000 0 0x1c080>;
+                       #interconnect-cells = <2>;
+                       clocks = <&gcc GCC_AGGRE_UFS_PHY_AXI_CLK>,
+                                <&gcc GCC_AGGRE_USB3_PRIM_AXI_CLK>;
+                       qcom,bcm-voters = <&apps_bcm_voter>;
+               };
+               aggre2_noc: interconnect@1700000 {
+                       compatible = "qcom,sm8450-aggre2-noc";
+                       reg = <0 0x01700000 0 0x31080>;
+                       #interconnect-cells = <2>;
+                       qcom,bcm-voters = <&apps_bcm_voter>;
+                       clocks = <&gcc GCC_AGGRE_NOC_PCIE_0_AXI_CLK>,
+                                <&gcc GCC_AGGRE_NOC_PCIE_1_AXI_CLK>,
+                                <&gcc GCC_AGGRE_UFS_PHY_AXI_CLK>,
+                                <&rpmhcc RPMH_IPA_CLK>;
+               };
+               mmss_noc: interconnect@1740000 {
+                       compatible = "qcom,sm8450-mmss-noc";
+                       reg = <0 0x01740000 0 0x1f080>;
+                       #interconnect-cells = <2>;
+                       qcom,bcm-voters = <&apps_bcm_voter>;
+               };
                tcsr_mutex: hwlock@1f40000 {
                        compatible = "qcom,tcsr-mutex";
                        reg = <0x0 0x01f40000 0x0 0x40000>;
                        };
                };
  
+               remoteproc_slpi: remoteproc@2400000 {
+                       compatible = "qcom,sm8450-slpi-pas";
+                       reg = <0 0x02400000 0 0x4000>;
+                       interrupts-extended = <&pdc 9 IRQ_TYPE_LEVEL_HIGH>,
+                                             <&smp2p_slpi_in 0 IRQ_TYPE_EDGE_RISING>,
+                                             <&smp2p_slpi_in 1 IRQ_TYPE_EDGE_RISING>,
+                                             <&smp2p_slpi_in 2 IRQ_TYPE_EDGE_RISING>,
+                                             <&smp2p_slpi_in 3 IRQ_TYPE_EDGE_RISING>;
+                       interrupt-names = "wdog", "fatal", "ready",
+                                         "handover", "stop-ack";
+                       clocks = <&rpmhcc RPMH_CXO_CLK>;
+                       clock-names = "xo";
+                       power-domains = <&rpmhpd SM8450_LCX>,
+                                       <&rpmhpd SM8450_LMX>;
+                       power-domain-names = "lcx", "lmx";
+                       memory-region = <&slpi_mem>;
+                       qcom,qmp = <&aoss_qmp>;
+                       qcom,smem-states = <&smp2p_slpi_out 0>;
+                       qcom,smem-state-names = "stop";
+                       status = "disabled";
+                       glink-edge {
+                               interrupts-extended = <&ipcc IPCC_CLIENT_SLPI
+                                                            IPCC_MPROC_SIGNAL_GLINK_QMP
+                                                            IRQ_TYPE_EDGE_RISING>;
+                               mboxes = <&ipcc IPCC_CLIENT_SLPI
+                                               IPCC_MPROC_SIGNAL_GLINK_QMP>;
+                               label = "slpi";
+                               qcom,remote-pid = <3>;
+                       };
+               };
+               remoteproc_adsp: remoteproc@30000000 {
+                       compatible = "qcom,sm8450-adsp-pas";
+                       reg = <0 0x030000000 0 0x100>;
+                       interrupts-extended = <&pdc 6 IRQ_TYPE_LEVEL_HIGH>,
+                                             <&smp2p_adsp_in 0 IRQ_TYPE_EDGE_RISING>,
+                                             <&smp2p_adsp_in 1 IRQ_TYPE_EDGE_RISING>,
+                                             <&smp2p_adsp_in 2 IRQ_TYPE_EDGE_RISING>,
+                                             <&smp2p_adsp_in 3 IRQ_TYPE_EDGE_RISING>;
+                       interrupt-names = "wdog", "fatal", "ready",
+                                         "handover", "stop-ack";
+                       clocks = <&rpmhcc RPMH_CXO_CLK>;
+                       clock-names = "xo";
+                       power-domains = <&rpmhpd SM8450_LCX>,
+                                       <&rpmhpd SM8450_LMX>;
+                       power-domain-names = "lcx", "lmx";
+                       memory-region = <&adsp_mem>;
+                       qcom,qmp = <&aoss_qmp>;
+                       qcom,smem-states = <&smp2p_adsp_out 0>;
+                       qcom,smem-state-names = "stop";
+                       status = "disabled";
+                       remoteproc_adsp_glink: glink-edge {
+                               interrupts-extended = <&ipcc IPCC_CLIENT_LPASS
+                                                            IPCC_MPROC_SIGNAL_GLINK_QMP
+                                                            IRQ_TYPE_EDGE_RISING>;
+                               mboxes = <&ipcc IPCC_CLIENT_LPASS
+                                               IPCC_MPROC_SIGNAL_GLINK_QMP>;
+                               label = "lpass";
+                               qcom,remote-pid = <2>;
+                       };
+               };
+               remoteproc_cdsp: remoteproc@32300000 {
+                       compatible = "qcom,sm8450-cdsp-pas";
+                       reg = <0 0x032300000 0 0x1400000>;
+                       interrupts-extended = <&intc GIC_SPI 578 IRQ_TYPE_LEVEL_HIGH>,
+                                             <&smp2p_cdsp_in 0 IRQ_TYPE_EDGE_RISING>,
+                                             <&smp2p_cdsp_in 1 IRQ_TYPE_EDGE_RISING>,
+                                             <&smp2p_cdsp_in 2 IRQ_TYPE_EDGE_RISING>,
+                                             <&smp2p_cdsp_in 3 IRQ_TYPE_EDGE_RISING>;
+                       interrupt-names = "wdog", "fatal", "ready",
+                                         "handover", "stop-ack";
+                       clocks = <&rpmhcc RPMH_CXO_CLK>;
+                       clock-names = "xo";
+                       power-domains = <&rpmhpd SM8450_CX>,
+                                       <&rpmhpd SM8450_MXC>;
+                       power-domain-names = "cx", "mxc";
+                       memory-region = <&cdsp_mem>;
+                       qcom,qmp = <&aoss_qmp>;
+                       qcom,smem-states = <&smp2p_cdsp_out 0>;
+                       qcom,smem-state-names = "stop";
+                       status = "disabled";
+                       glink-edge {
+                               interrupts-extended = <&ipcc IPCC_CLIENT_CDSP
+                                                            IPCC_MPROC_SIGNAL_GLINK_QMP
+                                                            IRQ_TYPE_EDGE_RISING>;
+                               mboxes = <&ipcc IPCC_CLIENT_CDSP
+                                               IPCC_MPROC_SIGNAL_GLINK_QMP>;
+                               label = "cdsp";
+                               qcom,remote-pid = <5>;
+                       };
+               };
+               remoteproc_mpss: remoteproc@4080000 {
+                       compatible = "qcom,sm8450-mpss-pas";
+                       reg = <0x0 0x04080000 0x0 0x4040>;
+                       interrupts-extended = <&intc GIC_SPI 264 IRQ_TYPE_LEVEL_HIGH>,
+                                             <&smp2p_modem_in 0 IRQ_TYPE_EDGE_RISING>,
+                                             <&smp2p_modem_in 1 IRQ_TYPE_EDGE_RISING>,
+                                             <&smp2p_modem_in 2 IRQ_TYPE_EDGE_RISING>,
+                                             <&smp2p_modem_in 3 IRQ_TYPE_EDGE_RISING>,
+                                             <&smp2p_modem_in 7 IRQ_TYPE_EDGE_RISING>;
+                       interrupt-names = "wdog", "fatal", "ready", "handover",
+                                         "stop-ack", "shutdown-ack";
+                       clocks = <&rpmhcc RPMH_CXO_CLK>;
+                       clock-names = "xo";
+                       power-domains = <&rpmhpd 0>,
+                                       <&rpmhpd 12>;
+                       power-domain-names = "cx", "mss";
+                       memory-region = <&mpss_mem>;
+                       qcom,qmp = <&aoss_qmp>;
+                       qcom,smem-states = <&smp2p_modem_out 0>;
+                       qcom,smem-state-names = "stop";
+                       status = "disabled";
+                       glink-edge {
+                               interrupts-extended = <&ipcc IPCC_CLIENT_MPSS
+                                                            IPCC_MPROC_SIGNAL_GLINK_QMP
+                                                            IRQ_TYPE_EDGE_RISING>;
+                               mboxes = <&ipcc IPCC_CLIENT_MPSS
+                                               IPCC_MPROC_SIGNAL_GLINK_QMP>;
+                               interrupts = <GIC_SPI 449 IRQ_TYPE_EDGE_RISING>;
+                               label = "modem";
+                               qcom,remote-pid = <1>;
+                       };
+               };
                pdc: interrupt-controller@b220000 {
                        compatible = "qcom,sm8450-pdc", "qcom,pdc";
                        reg = <0 0x0b220000 0 0x30000>, <0 0x174000f0 0 0x64>;
                        interrupt-controller;
                };
  
+               aoss_qmp: power-controller@c300000 {
+                       compatible = "qcom,sm8450-aoss-qmp", "qcom,aoss-qmp";
+                       reg = <0 0x0c300000 0 0x400>;
+                       interrupts-extended = <&ipcc IPCC_CLIENT_AOP IPCC_MPROC_SIGNAL_GLINK_QMP
+                                                    IRQ_TYPE_EDGE_RISING>;
+                       mboxes = <&ipcc IPCC_CLIENT_AOP IPCC_MPROC_SIGNAL_GLINK_QMP>;
+                       #clock-cells = <0>;
+               };
+               ipcc: mailbox@ed18000 {
+                       compatible = "qcom,sm8450-ipcc", "qcom,ipcc";
+                       reg = <0 0x0ed18000 0 0x1000>;
+                       interrupts = <GIC_SPI 229 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-controller;
+                       #interrupt-cells = <3>;
+                       #mbox-cells = <2>;
+               };
                tlmm: pinctrl@f100000 {
                        compatible = "qcom,sm8450-tlmm";
                        reg = <0 0x0f100000 0 0x300000>;
                        compatible = "qcom,sm8450-smmu-500", "arm,mmu-500";
                        reg = <0 0x15000000 0 0x100000>;
                        #iommu-cells = <2>;
 -                      #global-interrupts = <2>;
 +                      #global-interrupts = <1>;
                        interrupts =    <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>,
                                        <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>,
                                        <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>,
                                        <GIC_SPI 412 IRQ_TYPE_LEVEL_HIGH>,
                                        <GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH>,
                                        <GIC_SPI 707 IRQ_TYPE_LEVEL_HIGH>,
 +                                      <GIC_SPI 423 IRQ_TYPE_LEVEL_HIGH>,
                                        <GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH>,
                                        <GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH>,
                                        <GIC_SPI 690 IRQ_TYPE_LEVEL_HIGH>,
                        #freq-domain-cells = <1>;
                };
  
+               gem_noc: interconnect@19100000 {
+                       compatible = "qcom,sm8450-gem-noc";
+                       reg = <0 0x19100000 0 0xbb800>;
+                       #interconnect-cells = <2>;
+                       qcom,bcm-voters = <&apps_bcm_voter>;
+               };
+               system-cache-controller@19200000 {
+                       compatible = "qcom,sm8450-llcc";
+                       reg = <0 0x19200000 0 0x580000>, <0 0x19a00000 0 0x80000>;
+                       reg-names = "llcc_base", "llcc_broadcast_base";
+                       interrupts = <GIC_SPI 266 IRQ_TYPE_LEVEL_HIGH>;
+               };
                ufs_mem_hc: ufshc@1d84000 {
                        compatible = "qcom,sm8450-ufshc", "qcom,ufshc",
                                     "jedec,ufs-2.0";
  
                        iommus = <&apps_smmu 0xe0 0x0>;
  
+                       interconnects = <&aggre1_noc MASTER_UFS_MEM &mc_virt SLAVE_EBI1>,
+                                       <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_UFS_MEM_CFG>;
+                       interconnect-names = "ufs-ddr", "cpu-ufs";
                        clock-names =
                                "core_clk",
                                "bus_aggr_clk",
                                 <&gcc GCC_USB30_PRIM_MASTER_CLK>,
                                 <&gcc GCC_AGGRE_USB3_PRIM_AXI_CLK>,
                                 <&gcc GCC_USB30_PRIM_MOCK_UTMI_CLK>,
 -                               <&gcc GCC_USB30_PRIM_SLEEP_CLK>;
 +                               <&gcc GCC_USB30_PRIM_SLEEP_CLK>,
 +                               <&gcc GCC_USB3_0_CLKREF_EN>;
                        clock-names = "cfg_noc", "core", "iface", "mock_utmi",
 -                                    "sleep";
 +                                    "sleep", "xo";
  
                        assigned-clocks = <&gcc GCC_USB30_PRIM_MOCK_UTMI_CLK>,
                                          <&gcc GCC_USB30_PRIM_MASTER_CLK>;
                                phy-names = "usb2-phy", "usb3-phy";
                        };
                };
+               nsp_noc: interconnect@320c0000 {
+                       compatible = "qcom,sm8450-nsp-noc";
+                       reg = <0 0x320c0000 0 0x10000>;
+                       #interconnect-cells = <2>;
+                       qcom,bcm-voters = <&apps_bcm_voter>;
+               };
+               lpass_ag_noc: interconnect@3c40000 {
+                       compatible = "qcom,sm8450-lpass-ag-noc";
+                       reg = <0 0x3c40000 0 0x17200>;
+                       #interconnect-cells = <2>;
+                       qcom,bcm-voters = <&apps_bcm_voter>;
+               };
        };
  
        timer {
index 08fa00364b42f0f4a509cf0c5613ebd79fe56a9d,b91fb0b078b971b3ba6e0698632eda5bad1d295b..b1ac3a89f259cdcab1842f2e161774a554f814a6
                };
        };
  
 +      extcon_usb3: extcon-usb3 {
 +              compatible = "linux,extcon-usb-gpio";
 +              id-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_HIGH>;
 +              pinctrl-names = "default";
 +              pinctrl-0 = <&usb3_id>;
 +      };
 +
        clkin_gmac: external-gmac-clock {
                compatible = "fixed-clock";
                clock-frequency = <125000000>;
                regulator-min-microvolt = <5000000>;
                regulator-max-microvolt = <5000000>;
        };
+       vdd_log: vdd-log {
+               compatible = "pwm-regulator";
+               pwms = <&pwm2 0 25000 1>;
+               pwm-supply = <&vcc5v0_sys>;
+               regulator-name = "vdd_log";
+               regulator-min-microvolt = <800000>;
+               regulator-max-microvolt = <1400000>;
+               regulator-always-on;
+               regulator-boot-on;
+       };
  };
  
  &cpu_b0 {
                          <4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
                };
        };
 +
 +      usb3 {
 +              usb3_id: usb3-id {
 +                      rockchip,pins =
 +                        <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
 +              };
 +      };
  };
  
  &sdhci {
 +      /*
 +       * Signal integrity isn't great at 200MHz but 100MHz has proven stable
 +       * enough.
 +       */
 +      max-frequency = <100000000>;
 +
        bus-width = <8>;
        mmc-hs400-1_8v;
        mmc-hs400-enhanced-strobe;
index d9eb92d5909907cc219992f3a21959763b4ba6a6,6af09d2df60029c32992876fffc4f1eb18003d64..dd7f4b9b686b81e1c23910c4f29efc961e4197e5
                };
        };
  
+       sdio_pwrseq: sdio-pwrseq {
+               compatible = "mmc-pwrseq-simple";
+               clocks = <&rk817 1>;
+               clock-names = "ext_clock";
+               pinctrl-names = "default";
+               pinctrl-0 = <&wifi_enable_h>;
+               post-power-on-delay-ms = <100>;
+               power-off-delay-us = <5000000>;
+               reset-gpios = <&gpio2 RK_PC2 GPIO_ACTIVE_LOW>;
+       };
        spdif_dit: spdif-dit {
                compatible = "linux,spdif-dit";
                #sound-dai-cells = <0>;
                vin-supply = <&vcc12v_dcin>;
        };
  
+       /* all four ports are controlled by one gpio
+        * the host ports are sourced from vcc5v0_usb
+        * the otg port is sourced from vcc5v0_midu
+        */
+       vcc5v0_usb20_host: vcc5v0_usb20_host {
+               compatible = "regulator-fixed";
+               enable-active-high;
+               gpio = <&gpio4 RK_PB5 GPIO_ACTIVE_HIGH>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&vcc5v0_usb20_host_en>;
+               regulator-name = "vcc5v0_usb20_host";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               vin-supply = <&vcc5v0_usb>;
+       };
        vcc3v3_sd: vcc3v3_sd {
                compatible = "regulator-fixed";
                enable-active-low;
                regulator-max-microvolt = <4400000>;
                vin-supply = <&vbus>;
        };
+       /* sourced from vcc_sys, sdio module operates internally at 3.3v */
+       vcc_wl: vcc_wl {
+               compatible = "regulator-fixed";
+               regulator-name = "vcc_wl";
+               regulator-always-on;
+               regulator-boot-on;
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               vin-supply = <&vcc_sys>;
+       };
  };
  
  &cpu0 {
        status = "okay";
  };
  
+ &gpu {
+       mali-supply = <&vdd_gpu>;
+       status = "okay";
+ };
  &i2c0 {
        status = "okay";
  
                        vcc_ddr: DCDC_REG3 {
                                regulator-always-on;
                                regulator-boot-on;
 -                              regulator-min-microvolt = <1100000>;
 -                              regulator-max-microvolt = <1100000>;
                                regulator-initial-mode = <0x2>;
                                regulator-name = "vcc_ddr";
                                regulator-state-mem {
        };
  };
  
+ /* i2c3 is exposed on con40
+  * pin 3 - i2c3_sda_m0, pullup to vcc_3v3
+  * pin 5 - i2c3_scl_m0, pullup to vcc_3v3
+  */
+ &i2c3 {
+       status = "okay";
+ };
  &i2s1_8ch {
        pinctrl-names = "default";
        pinctrl-0 = <&i2s1m0_sclktx
                };
        };
  
+       usb2 {
+               vcc5v0_usb20_host_en: vcc5v0-usb20-host-en {
+                       rockchip,pins = <4 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
+               };
+       };
+       sdio-pwrseq {
+               wifi_enable_h: wifi-enable-h {
+                       rockchip,pins = <2 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
+               };
+       };
        vcc_sd {
                vcc_sd_h: vcc-sd-h {
                        rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
        };
  };
  
+ &pmu_io_domains {
+       pmuio1-supply = <&vcc3v3_pmu>;
+       pmuio2-supply = <&vcc3v3_pmu>;
+       vccio1-supply = <&vccio_acodec>;
+       vccio2-supply = <&vcc_1v8>;
+       vccio3-supply = <&vccio_sd>;
+       vccio4-supply = <&vcc_1v8>;
+       vccio5-supply = <&vcc_3v3>;
+       vccio6-supply = <&vcc1v8_dvp>;
+       vccio7-supply = <&vcc_3v3>;
+       status = "okay";
+ };
  &sdhci {
        bus-width = <8>;
        mmc-hs200-1_8v;
        status = "okay";
  };
  
+ &sdmmc1 {
+       bus-width = <4>;
+       cap-sd-highspeed;
+       cap-sdio-irq;
+       keep-power-in-suspend;
+       mmc-pwrseq = <&sdio_pwrseq>;
+       non-removable;
+       pinctrl-names = "default";
+       pinctrl-0 = <&sdmmc1_bus4 &sdmmc1_cmd &sdmmc1_clk>;
+       sd-uhs-sdr104;
+       vmmc-supply = <&vcc_wl>;
+       vqmmc-supply = <&vcc_1v8>;
+       status = "okay";
+ };
+ /* spdif is exposed on con40 pin 18 */
  &spdif {
        status = "okay";
  };
  
+ /* spi1 is exposed on con40
+  * pin 11 - spi1_mosi_m1
+  * pin 13 - spi1_miso_m1
+  * pin 15 - spi1_clk_m1
+  * pin 17 - spi1_cs0_m1
+  */
  &spi1 {
        pinctrl-names = "default";
        pinctrl-0 = <&spi1m1_cs0 &spi1m1_pins>;
        status = "okay";
  };
  
+ /* uart0 is exposed on con40
+  * pin 12 - uart0_tx
+  * pin 14 - uart0_rx
+  */
  &uart0 {
        pinctrl-names = "default";
        pinctrl-0 = <&uart0_xfer>;
        };
  };
  
+ /* uart2 is exposed on con40
+  * pin 8 - uart2_tx_m0_debug
+  * pin 10 - uart2_rx_m0_debug
+  */
  &uart2 {
        status = "okay";
  };
+ &usb_host0_ehci {
+       status = "okay";
+ };
+ &usb_host0_ohci {
+       status = "okay";
+ };
+ &usb_host1_ehci {
+       status = "okay";
+ };
+ &usb_host1_ohci {
+       status = "okay";
+ };
+ &usb2phy1 {
+       status = "okay";
+ };
+ &usb2phy1_host {
+       phy-supply = <&vcc5v0_usb20_host>;
+       status = "okay";
+ };
+ &usb2phy1_otg {
+       phy-supply = <&vcc5v0_usb20_host>;
+       status = "okay";
+ };
index d91df1cde73631947d2ad49b01f31e0ed0229c27,91a0b798b85709902d06ca7f1c4cc00642526a38..5b0f528d68180572e653edd0d79a05c58b970880
@@@ -8,6 -8,11 +8,11 @@@
  / {
        compatible = "rockchip,rk3568";
  
+       pipe_phy_grf0: syscon@fdc70000 {
+               compatible = "rockchip,rk3568-pipe-phy-grf", "syscon";
+               reg = <0x0 0xfdc70000 0x0 0x1000>;
+       };
        qos_pcie3x1: qos@fe190080 {
                compatible = "rockchip,rk3568-qos", "syscon";
                reg = <0x0 0xfe190080 0x0 0x20>;
                clocks = <&cru SCLK_GMAC0>, <&cru SCLK_GMAC0_RX_TX>,
                         <&cru SCLK_GMAC0_RX_TX>, <&cru CLK_MAC0_REFOUT>,
                         <&cru ACLK_GMAC0>, <&cru PCLK_GMAC0>,
 -                       <&cru SCLK_GMAC0_RX_TX>, <&cru CLK_GMAC0_PTP_REF>,
 -                       <&cru PCLK_XPCS>;
 +                       <&cru SCLK_GMAC0_RX_TX>, <&cru CLK_GMAC0_PTP_REF>;
                clock-names = "stmmaceth", "mac_clk_rx",
                              "mac_clk_tx", "clk_mac_refout",
                              "aclk_mac", "pclk_mac",
 -                            "clk_mac_speed", "ptp_ref",
 -                            "pclk_xpcs";
 +                            "clk_mac_speed", "ptp_ref";
                resets = <&cru SRST_A_GMAC0>;
                reset-names = "stmmaceth";
                rockchip,grf = <&grf>;
                        queue0 {};
                };
        };
+       combphy0: phy@fe820000 {
+               compatible = "rockchip,rk3568-naneng-combphy";
+               reg = <0x0 0xfe820000 0x0 0x100>;
+               clocks = <&pmucru CLK_PCIEPHY0_REF>,
+                        <&cru PCLK_PIPEPHY0>,
+                        <&cru PCLK_PIPE>;
+               clock-names = "ref", "apb", "pipe";
+               assigned-clocks = <&pmucru CLK_PCIEPHY0_REF>;
+               assigned-clock-rates = <100000000>;
+               resets = <&cru SRST_PIPEPHY0>;
+               rockchip,pipe-grf = <&pipegrf>;
+               rockchip,pipe-phy-grf = <&pipe_phy_grf0>;
+               #phy-cells = <1>;
+               status = "disabled";
+       };
  };
  
  &cpu0_opp_table {
index 8ccce54ee8e728e9cef67ed1f85f7d14b54f25cc,5c6cae76c18000068c40278f1a30307b6c4dd7bf..7cdef800cb3cec33b5250f24ac7f7bf905356d95
                };
        };
  
+       gpu_opp_table: opp-table-1 {
+               compatible = "operating-points-v2";
+               opp-200000000 {
+                       opp-hz = /bits/ 64 <200000000>;
+                       opp-microvolt = <825000>;
+               };
+               opp-300000000 {
+                       opp-hz = /bits/ 64 <300000000>;
+                       opp-microvolt = <825000>;
+               };
+               opp-400000000 {
+                       opp-hz = /bits/ 64 <400000000>;
+                       opp-microvolt = <825000>;
+               };
+               opp-600000000 {
+                       opp-hz = /bits/ 64 <600000000>;
+                       opp-microvolt = <825000>;
+               };
+               opp-700000000 {
+                       opp-hz = /bits/ 64 <700000000>;
+                       opp-microvolt = <900000>;
+               };
+               opp-800000000 {
+                       opp-hz = /bits/ 64 <800000000>;
+                       opp-microvolt = <1000000>;
+               };
+       };
        pmu {
                compatible = "arm,cortex-a55-pmu";
                interrupts = <GIC_SPI 228 IRQ_TYPE_LEVEL_HIGH>,
                msi-controller;
        };
  
+       usb_host0_ehci: usb@fd800000 {
+               compatible = "generic-ehci";
+               reg = <0x0 0xfd800000 0x0 0x40000>;
+               interrupts = <GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>;
+               clocks = <&cru HCLK_USB2HOST0>, <&cru HCLK_USB2HOST0_ARB>,
+                        <&cru PCLK_USB>;
+               phys = <&usb2phy1_otg>;
+               phy-names = "usb";
+               status = "disabled";
+       };
+       usb_host0_ohci: usb@fd840000 {
+               compatible = "generic-ohci";
+               reg = <0x0 0xfd840000 0x0 0x40000>;
+               interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>;
+               clocks = <&cru HCLK_USB2HOST0>, <&cru HCLK_USB2HOST0_ARB>,
+                        <&cru PCLK_USB>;
+               phys = <&usb2phy1_otg>;
+               phy-names = "usb";
+               status = "disabled";
+       };
+       usb_host1_ehci: usb@fd880000 {
+               compatible = "generic-ehci";
+               reg = <0x0 0xfd880000 0x0 0x40000>;
+               interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;
+               clocks = <&cru HCLK_USB2HOST1>, <&cru HCLK_USB2HOST1_ARB>,
+                        <&cru PCLK_USB>;
+               phys = <&usb2phy1_host>;
+               phy-names = "usb";
+               status = "disabled";
+       };
+       usb_host1_ohci: usb@fd8c0000 {
+               compatible = "generic-ohci";
+               reg = <0x0 0xfd8c0000 0x0 0x40000>;
+               interrupts = <GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>;
+               clocks = <&cru HCLK_USB2HOST1>, <&cru HCLK_USB2HOST1_ARB>,
+                        <&cru PCLK_USB>;
+               phys = <&usb2phy1_host>;
+               phy-names = "usb";
+               status = "disabled";
+       };
        pmugrf: syscon@fdc20000 {
                compatible = "rockchip,rk3568-pmugrf", "syscon", "simple-mfd";
                reg = <0x0 0xfdc20000 0x0 0x10000>;
                };
        };
  
+       pipegrf: syscon@fdc50000 {
+               compatible = "rockchip,rk3568-pipe-grf", "syscon";
+               reg = <0x0 0xfdc50000 0x0 0x1000>;
+       };
        grf: syscon@fdc60000 {
                compatible = "rockchip,rk3568-grf", "syscon", "simple-mfd";
                reg = <0x0 0xfdc60000 0x0 0x10000>;
        };
  
+       pipe_phy_grf1: syscon@fdc80000 {
+               compatible = "rockchip,rk3568-pipe-phy-grf", "syscon";
+               reg = <0x0 0xfdc80000 0x0 0x1000>;
+       };
+       pipe_phy_grf2: syscon@fdc90000 {
+               compatible = "rockchip,rk3568-pipe-phy-grf", "syscon";
+               reg = <0x0 0xfdc90000 0x0 0x1000>;
+       };
+       usb2phy0_grf: syscon@fdca0000 {
+               compatible = "rockchip,rk3568-usb2phy-grf", "syscon";
+               reg = <0x0 0xfdca0000 0x0 0x8000>;
+       };
+       usb2phy1_grf: syscon@fdca8000 {
+               compatible = "rockchip,rk3568-usb2phy-grf", "syscon";
+               reg = <0x0 0xfdca8000 0x0 0x8000>;
+       };
        pmucru: clock-controller@fdd00000 {
                compatible = "rockchip,rk3568-pmucru";
                reg = <0x0 0xfdd00000 0x0 0x1000>;
                };
        };
  
+       gpu: gpu@fde60000 {
+               compatible = "rockchip,rk3568-mali", "arm,mali-bifrost";
+               reg = <0x0 0xfde60000 0x0 0x4000>;
+               interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;
+               interrupt-names = "job", "mmu", "gpu";
+               clocks = <&scmi_clk 1>, <&cru CLK_GPU>;
+               clock-names = "gpu", "bus";
+               #cooling-cells = <2>;
+               operating-points-v2 = <&gpu_opp_table>;
+               power-domains = <&power RK3568_PD_GPU>;
+               status = "disabled";
+       };
        sdmmc2: mmc@fe000000 {
                compatible = "rockchip,rk3568-dw-mshc", "rockchip,rk3288-dw-mshc";
                reg = <0x0 0xfe000000 0x0 0x4000>;
                status = "disabled";
        };
  
 -      dmac0: dmac@fe530000 {
+       i2s3_2ch: i2s@fe430000 {
+               compatible = "rockchip,rk3568-i2s-tdm";
+               reg = <0x0 0xfe430000 0x0 0x1000>;
+               interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
+               clocks = <&cru MCLK_I2S3_2CH_TX>, <&cru MCLK_I2S3_2CH_RX>,
+                        <&cru HCLK_I2S3_2CH>;
+               clock-names = "mclk_tx", "mclk_rx", "hclk";
+               dmas = <&dmac1 6>, <&dmac1 7>;
+               dma-names = "tx", "rx";
+               resets = <&cru SRST_M_I2S3_2CH_TX>, <&cru SRST_M_I2S3_2CH_RX>;
+               reset-names = "tx-m", "rx-m";
+               rockchip,grf = <&grf>;
+               #sound-dai-cells = <0>;
+               status = "disabled";
+       };
+       pdm: pdm@fe440000 {
+               compatible = "rockchip,rk3568-pdm";
+               reg = <0x0 0xfe440000 0x0 0x1000>;
+               interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
+               clocks = <&cru MCLK_PDM>, <&cru HCLK_PDM>;
+               clock-names = "pdm_clk", "pdm_hclk";
+               dmas = <&dmac1 9>;
+               dma-names = "rx";
+               pinctrl-0 = <&pdmm0_clk
+                            &pdmm0_clk1
+                            &pdmm0_sdi0
+                            &pdmm0_sdi1
+                            &pdmm0_sdi2
+                            &pdmm0_sdi3>;
+               pinctrl-names = "default";
+               resets = <&cru SRST_M_PDM>;
+               reset-names = "pdm-m";
+               #sound-dai-cells = <0>;
+               status = "disabled";
+       };
 +      dmac0: dma-controller@fe530000 {
                compatible = "arm,pl330", "arm,primecell";
                reg = <0x0 0xfe530000 0x0 0x4000>;
                interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>,
                #dma-cells = <1>;
        };
  
 -      dmac1: dmac@fe550000 {
 +      dmac1: dma-controller@fe550000 {
                compatible = "arm,pl330", "arm,primecell";
                reg = <0x0 0xfe550000 0x0 0x4000>;
                interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>,
                        polling-delay = <1000>; /* milliseconds */
  
                        thermal-sensors = <&tsadc 1>;
+                       trips {
+                               gpu_threshold: gpu-threshold {
+                                       temperature = <70000>;
+                                       hysteresis = <2000>;
+                                       type = "passive";
+                               };
+                               gpu_target: gpu-target {
+                                       temperature = <75000>;
+                                       hysteresis = <2000>;
+                                       type = "passive";
+                               };
+                               gpu_crit: gpu-crit {
+                                       temperature = <95000>;
+                                       hysteresis = <2000>;
+                                       type = "critical";
+                               };
+                       };
+                       cooling-maps {
+                               map0 {
+                                       trip = <&gpu_target>;
+                                       cooling-device =
+                                               <&gpu THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+                               };
+                       };
                };
        };
  
                status = "disabled";
        };
  
+       combphy1: phy@fe830000 {
+               compatible = "rockchip,rk3568-naneng-combphy";
+               reg = <0x0 0xfe830000 0x0 0x100>;
+               clocks = <&pmucru CLK_PCIEPHY1_REF>,
+                        <&cru PCLK_PIPEPHY1>,
+                        <&cru PCLK_PIPE>;
+               clock-names = "ref", "apb", "pipe";
+               assigned-clocks = <&pmucru CLK_PCIEPHY1_REF>;
+               assigned-clock-rates = <100000000>;
+               resets = <&cru SRST_PIPEPHY1>;
+               rockchip,pipe-grf = <&pipegrf>;
+               rockchip,pipe-phy-grf = <&pipe_phy_grf1>;
+               #phy-cells = <1>;
+               status = "disabled";
+       };
+       combphy2: phy@fe840000 {
+               compatible = "rockchip,rk3568-naneng-combphy";
+               reg = <0x0 0xfe840000 0x0 0x100>;
+               clocks = <&pmucru CLK_PCIEPHY2_REF>,
+                        <&cru PCLK_PIPEPHY2>,
+                        <&cru PCLK_PIPE>;
+               clock-names = "ref", "apb", "pipe";
+               assigned-clocks = <&pmucru CLK_PCIEPHY2_REF>;
+               assigned-clock-rates = <100000000>;
+               resets = <&cru SRST_PIPEPHY2>;
+               rockchip,pipe-grf = <&pipegrf>;
+               rockchip,pipe-phy-grf = <&pipe_phy_grf2>;
+               #phy-cells = <1>;
+               status = "disabled";
+       };
+       usb2phy0: usb2phy@fe8a0000 {
+               compatible = "rockchip,rk3568-usb2phy";
+               reg = <0x0 0xfe8a0000 0x0 0x10000>;
+               clocks = <&pmucru CLK_USBPHY0_REF>;
+               clock-names = "phyclk";
+               clock-output-names = "clk_usbphy0_480m";
+               interrupts = <GIC_SPI 135 IRQ_TYPE_LEVEL_HIGH>;
+               rockchip,usbgrf = <&usb2phy0_grf>;
+               #clock-cells = <0>;
+               status = "disabled";
+               usb2phy0_host: host-port {
+                       #phy-cells = <0>;
+                       status = "disabled";
+               };
+               usb2phy0_otg: otg-port {
+                       #phy-cells = <0>;
+                       status = "disabled";
+               };
+       };
+       usb2phy1: usb2phy@fe8b0000 {
+               compatible = "rockchip,rk3568-usb2phy";
+               reg = <0x0 0xfe8b0000 0x0 0x10000>;
+               clocks = <&pmucru CLK_USBPHY1_REF>;
+               clock-names = "phyclk";
+               clock-output-names = "clk_usbphy1_480m";
+               interrupts = <GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>;
+               rockchip,usbgrf = <&usb2phy1_grf>;
+               #clock-cells = <0>;
+               status = "disabled";
+               usb2phy1_host: host-port {
+                       #phy-cells = <0>;
+                       status = "disabled";
+               };
+               usb2phy1_otg: otg-port {
+                       #phy-cells = <0>;
+                       status = "disabled";
+               };
+       };
        pinctrl: pinctrl {
                compatible = "rockchip,rk3568-pinctrl";
                rockchip,grf = <&grf>;
index 0a2fe757c45456e26734006b3ee3c310fb24ceea,415fb3aca4b388d93cb9fc8d40b34a811279a3f3..50aa3d75ab4f4df6da3d57cb83d37ca2418b4635
@@@ -3,19 -3,17 +3,19 @@@ CONFIG_POSIX_MQUEUE=
  CONFIG_AUDIT=y
  CONFIG_NO_HZ_IDLE=y
  CONFIG_HIGH_RES_TIMERS=y
 +CONFIG_BPF_SYSCALL=y
 +CONFIG_BPF_JIT=y
  CONFIG_PREEMPT=y
  CONFIG_IRQ_TIME_ACCOUNTING=y
  CONFIG_BSD_PROCESS_ACCT=y
  CONFIG_BSD_PROCESS_ACCT_V3=y
 +CONFIG_TASKSTATS=y
  CONFIG_TASK_XACCT=y
  CONFIG_TASK_IO_ACCOUNTING=y
  CONFIG_IKCONFIG=y
  CONFIG_IKCONFIG_PROC=y
  CONFIG_NUMA_BALANCING=y
  CONFIG_MEMCG=y
 -CONFIG_MEMCG_SWAP=y
  CONFIG_BLK_CGROUP=y
  CONFIG_CGROUP_PIDS=y
  CONFIG_CGROUP_HUGETLB=y
@@@ -23,7 -21,6 +23,7 @@@ CONFIG_CPUSETS=
  CONFIG_CGROUP_DEVICE=y
  CONFIG_CGROUP_CPUACCT=y
  CONFIG_CGROUP_PERF=y
 +CONFIG_CGROUP_BPF=y
  CONFIG_USER_NS=y
  CONFIG_SCHED_AUTOGROUP=y
  CONFIG_BLK_DEV_INITRD=y
@@@ -57,6 -54,7 +57,7 @@@ CONFIG_ARCH_SEATTLE=
  CONFIG_ARCH_INTEL_SOCFPGA=y
  CONFIG_ARCH_SYNQUACER=y
  CONFIG_ARCH_TEGRA=y
+ CONFIG_ARCH_TESLA_FSD=y
  CONFIG_ARCH_SPRD=y
  CONFIG_ARCH_THUNDER=y
  CONFIG_ARCH_THUNDER2=y
@@@ -69,6 -67,7 +70,6 @@@ CONFIG_ARM64_VA_BITS_48=
  CONFIG_SCHED_MC=y
  CONFIG_SCHED_SMT=y
  CONFIG_NUMA=y
 -CONFIG_SECCOMP=y
  CONFIG_KEXEC=y
  CONFIG_KEXEC_FILE=y
  CONFIG_CRASH_DUMP=y
@@@ -86,6 -85,7 +87,6 @@@ CONFIG_CPU_FREQ_GOV_POWERSAVE=
  CONFIG_CPU_FREQ_GOV_USERSPACE=y
  CONFIG_CPU_FREQ_GOV_ONDEMAND=y
  CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 -CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
  CONFIG_CPUFREQ_DT=y
  CONFIG_ACPI_CPPC_CPUFREQ=m
  CONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM=m
@@@ -97,8 -97,16 +98,8 @@@ CONFIG_ARM_QCOM_CPUFREQ_HW=
  CONFIG_ARM_RASPBERRYPI_CPUFREQ=m
  CONFIG_ARM_SCMI_CPUFREQ=y
  CONFIG_ARM_TEGRA186_CPUFREQ=y
 +CONFIG_ARM_MEDIATEK_CPUFREQ=y
  CONFIG_QORIQ_CPUFREQ=y
 -CONFIG_ARM_SCMI_PROTOCOL=y
 -CONFIG_ARM_SCPI_PROTOCOL=y
 -CONFIG_RASPBERRYPI_FIRMWARE=y
 -CONFIG_INTEL_STRATIX10_SERVICE=y
 -CONFIG_INTEL_STRATIX10_RSU=m
 -CONFIG_QCOM_SCM=y
 -CONFIG_EFI_CAPSULE_LOADER=y
 -CONFIG_IMX_SCU=y
 -CONFIG_IMX_SCU_PD=y
  CONFIG_ACPI=y
  CONFIG_ACPI_APEI=y
  CONFIG_ACPI_APEI_GHES=y
@@@ -120,7 -128,6 +121,7 @@@ CONFIG_CRYPTO_AES_ARM64_CE_BLK=
  CONFIG_CRYPTO_CHACHA20_NEON=m
  CONFIG_CRYPTO_AES_ARM64_BS=m
  CONFIG_JUMP_LABEL=y
 +CONFIG_SECCOMP=y
  CONFIG_MODULES=y
  CONFIG_MODULE_UNLOAD=y
  # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
@@@ -176,13 -183,14 +177,13 @@@ CONFIG_NET_ACT_GATE=
  CONFIG_QRTR=m
  CONFIG_QRTR_SMD=m
  CONFIG_QRTR_TUN=m
 -CONFIG_BPF_JIT=y
  CONFIG_CAN=m
 +CONFIG_CAN_FLEXCAN=m
  CONFIG_CAN_RCAR=m
  CONFIG_CAN_RCAR_CANFD=m
 -CONFIG_CAN_FLEXCAN=m
 +CONFIG_CAN_MCP251XFD=m
  CONFIG_BT=m
  CONFIG_BT_HIDP=m
 -# CONFIG_BT_HS is not set
  # CONFIG_BT_LE is not set
  CONFIG_BT_LEDS=y
  # CONFIG_BT_DEBUGFS is not set
@@@ -191,9 -199,6 +192,9 @@@ CONFIG_BT_HCIUART=
  CONFIG_BT_HCIUART_LL=y
  CONFIG_BT_HCIUART_BCM=y
  CONFIG_BT_HCIUART_QCA=y
 +CONFIG_BT_HCIUART_MRVL=y
 +CONFIG_BT_MRVL=m
 +CONFIG_BT_MRVL_SDIO=m
  CONFIG_BT_QCOMSMD=m
  CONFIG_CFG80211=m
  CONFIG_MAC80211=m
@@@ -206,7 -211,6 +207,7 @@@ CONFIG_NFC_NCI=
  CONFIG_NFC_S3FWRN5_I2C=m
  CONFIG_PCI=y
  CONFIG_PCIEPORTBUS=y
 +CONFIG_PCIEAER=y
  CONFIG_PCI_IOV=y
  CONFIG_PCI_PASID=y
  CONFIG_HOTPLUG_PCI=y
@@@ -225,6 -229,7 +226,6 @@@ CONFIG_PCIE_ROCKCHIP_HOST=
  CONFIG_PCIE_BRCMSTB=m
  CONFIG_PCI_IMX6=y
  CONFIG_PCI_LAYERSCAPE=y
 -CONFIG_PCIE_LAYERSCAPE_GEN4=y
  CONFIG_PCI_HISI=y
  CONFIG_PCIE_QCOM=y
  CONFIG_PCIE_ARMADA_8K=y
@@@ -232,7 -237,6 +233,7 @@@ CONFIG_PCIE_KIRIN=
  CONFIG_PCIE_HISI_STB=y
  CONFIG_PCIE_TEGRA194_HOST=m
  CONFIG_PCIE_VISCONTI_HOST=y
 +CONFIG_PCIE_LAYERSCAPE_GEN4=y
  CONFIG_PCI_ENDPOINT=y
  CONFIG_PCI_ENDPOINT_CONFIGFS=y
  CONFIG_PCI_EPF_TEST=m
@@@ -240,15 -244,8 +241,15 @@@ CONFIG_DEVTMPFS=
  CONFIG_DEVTMPFS_MOUNT=y
  CONFIG_FW_LOADER_USER_HELPER=y
  CONFIG_HISILICON_LPC=y
 -CONFIG_FSL_MC_BUS=y
  CONFIG_TEGRA_ACONNECT=m
 +CONFIG_ARM_SCMI_PROTOCOL=y
 +CONFIG_ARM_SCPI_PROTOCOL=y
 +CONFIG_RASPBERRYPI_FIRMWARE=y
 +CONFIG_INTEL_STRATIX10_SERVICE=y
 +CONFIG_INTEL_STRATIX10_RSU=m
 +CONFIG_EFI_CAPSULE_LOADER=y
 +CONFIG_IMX_SCU=y
 +CONFIG_IMX_SCU_PD=y
  CONFIG_GNSS=m
  CONFIG_GNSS_MTK_SERIAL=m
  CONFIG_MTD=y
@@@ -263,12 -260,13 +264,12 @@@ CONFIG_MTD_PHYSMAP_OF=
  CONFIG_MTD_DATAFLASH=y
  CONFIG_MTD_SST25L=y
  CONFIG_MTD_RAW_NAND=y
 +CONFIG_MTD_NAND_BRCMNAND=m
  CONFIG_MTD_NAND_DENALI_DT=y
  CONFIG_MTD_NAND_MARVELL=y
  CONFIG_MTD_NAND_FSL_IFC=y
  CONFIG_MTD_NAND_QCOM=y
  CONFIG_MTD_SPI_NOR=y
 -CONFIG_MTK_DEVAPC=m
 -CONFIG_SPI_CADENCE_QUADSPI=y
  CONFIG_BLK_DEV_LOOP=y
  CONFIG_BLK_DEV_NBD=m
  CONFIG_VIRTIO_BLK=y
@@@ -293,7 -291,6 +294,7 @@@ CONFIG_SCSI_UFS_EXYNOS=
  CONFIG_ATA=y
  CONFIG_SATA_AHCI=y
  CONFIG_SATA_AHCI_PLATFORM=y
 +CONFIG_AHCI_BRCM=m
  CONFIG_AHCI_CEVA=y
  CONFIG_AHCI_MVEBU=y
  CONFIG_AHCI_XGENE=y
@@@ -313,13 -310,11 +314,13 @@@ CONFIG_MACVTAP=
  CONFIG_TUN=y
  CONFIG_VETH=m
  CONFIG_VIRTIO_NET=y
 +CONFIG_NET_DSA_BCM_SF2=m
  CONFIG_NET_DSA_MSCC_FELIX=m
  CONFIG_AMD_XGBE=y
  CONFIG_NET_XGENE=y
  CONFIG_ATL1C=m
  CONFIG_BCMGENET=m
 +CONFIG_SYSTEMPORT=m
  CONFIG_BNX2X=m
  CONFIG_MACB=y
  CONFIG_THUNDER_NIC_PF=y
@@@ -348,7 -343,6 +349,7 @@@ CONFIG_MLX5_CORE=
  CONFIG_MLX5_CORE_EN=y
  CONFIG_QCOM_EMAC=m
  CONFIG_RMNET=m
 +CONFIG_R8169=m
  CONFIG_SH_ETH=y
  CONFIG_RAVB=y
  CONFIG_SMC91X=y
@@@ -358,11 -352,13 +359,11 @@@ CONFIG_SNI_NETSEC=
  CONFIG_STMMAC_ETH=m
  CONFIG_TI_K3_AM65_CPSW_NUSS=y
  CONFIG_QCOM_IPA=m
 -CONFIG_MDIO_BUS_MUX_MMIOREG=y
 -CONFIG_MDIO_BUS_MUX_MULTIPLEXER=y
 +CONFIG_MESON_GXL_PHY=m
  CONFIG_AQUANTIA_PHY=y
  CONFIG_BCM54140_PHY=m
  CONFIG_MARVELL_PHY=m
  CONFIG_MARVELL_10G_PHY=m
 -CONFIG_MESON_GXL_PHY=m
  CONFIG_MICREL_PHY=y
  CONFIG_MICROSEMI_PHY=y
  CONFIG_AT803X_PHY=y
@@@ -370,9 -366,6 +371,9 @@@ CONFIG_REALTEK_PHY=
  CONFIG_ROCKCHIP_PHY=y
  CONFIG_DP83867_PHY=y
  CONFIG_VITESSE_PHY=y
 +CONFIG_MDIO_BUS_MUX_MULTIPLEXER=y
 +CONFIG_MDIO_BUS_MUX_MMIOREG=y
 +CONFIG_USB_BRCMSTB=m
  CONFIG_USB_PEGASUS=m
  CONFIG_USB_RTL8150=m
  CONFIG_USB_RTL8152=m
@@@ -390,7 -383,6 +391,7 @@@ CONFIG_ATH10K_SNOC=
  CONFIG_WCN36XX=m
  CONFIG_BRCMFMAC=m
  CONFIG_MWIFIEX=m
 +CONFIG_MWIFIEX_SDIO=m
  CONFIG_MWIFIEX_PCIE=m
  CONFIG_WL18XX=m
  CONFIG_WLCORE_SDIO=m
@@@ -482,7 -474,6 +483,7 @@@ CONFIG_SPI=
  CONFIG_SPI_ARMADA_3700=y
  CONFIG_SPI_BCM2835=m
  CONFIG_SPI_BCM2835AUX=m
 +CONFIG_SPI_CADENCE_QUADSPI=y
  CONFIG_SPI_DESIGNWARE=m
  CONFIG_SPI_DW_DMA=y
  CONFIG_SPI_DW_MMIO=m
@@@ -497,7 -488,6 +498,7 @@@ CONFIG_SPI_ORION=
  CONFIG_SPI_PL022=y
  CONFIG_SPI_ROCKCHIP=y
  CONFIG_SPI_RPCIF=m
 +CONFIG_SPI_RSPI=m
  CONFIG_SPI_QCOM_QSPI=m
  CONFIG_SPI_QUP=y
  CONFIG_SPI_QCOM_GENI=m
@@@ -506,8 -496,8 +507,8 @@@ CONFIG_SPI_SH_MSIOF=
  CONFIG_SPI_SUN6I=y
  CONFIG_SPI_SPIDEV=m
  CONFIG_SPMI=y
 -CONFIG_PINCTRL_SINGLE=y
  CONFIG_PINCTRL_MAX77620=y
 +CONFIG_PINCTRL_SINGLE=y
  CONFIG_PINCTRL_OWL=y
  CONFIG_PINCTRL_S700=y
  CONFIG_PINCTRL_S900=y
@@@ -535,7 -525,6 +536,7 @@@ CONFIG_PINCTRL_SDM845=
  CONFIG_PINCTRL_SM8150=y
  CONFIG_PINCTRL_SM8250=y
  CONFIG_PINCTRL_SM8350=y
 +CONFIG_PINCTRL_SM8450=y
  CONFIG_PINCTRL_LPASS_LPI=m
  CONFIG_GPIO_ALTERA=m
  CONFIG_GPIO_DAVINCI=y
@@@ -556,6 -545,9 +557,6 @@@ CONFIG_GPIO_PCA953X_IRQ=
  CONFIG_GPIO_BD9571MWV=m
  CONFIG_GPIO_MAX77620=y
  CONFIG_GPIO_SL28CPLD=m
 -CONFIG_POWER_AVS=y
 -CONFIG_QCOM_CPR=y
 -CONFIG_ROCKCHIP_IODOMAIN=y
  CONFIG_POWER_RESET_MSM=y
  CONFIG_POWER_RESET_QCOM_PON=m
  CONFIG_POWER_RESET_XGENE=y
@@@ -563,13 -555,12 +564,13 @@@ CONFIG_POWER_RESET_SYSCON=
  CONFIG_SYSCON_REBOOT_MODE=y
  CONFIG_BATTERY_SBS=m
  CONFIG_BATTERY_BQ27XXX=y
 -CONFIG_SENSORS_ARM_SCMI=y
  CONFIG_BATTERY_MAX17042=m
  CONFIG_CHARGER_BQ25890=m
  CONFIG_CHARGER_BQ25980=m
 +CONFIG_SENSORS_ARM_SCMI=y
  CONFIG_SENSORS_ARM_SCPI=y
  CONFIG_SENSORS_JC42=m
 +CONFIG_SENSORS_LM75=m
  CONFIG_SENSORS_LM90=m
  CONFIG_SENSORS_PWM_FAN=m
  CONFIG_SENSORS_RASPBERRYPI_HWMON=m
@@@ -579,21 -570,20 +580,21 @@@ CONFIG_SENSORS_INA3221=
  CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
  CONFIG_CPU_THERMAL=y
  CONFIG_THERMAL_EMULATION=y
 -CONFIG_QORIQ_THERMAL=m
 -CONFIG_SUN8I_THERMAL=y
  CONFIG_IMX_SC_THERMAL=m
  CONFIG_IMX8MM_THERMAL=m
 +CONFIG_QORIQ_THERMAL=m
 +CONFIG_SUN8I_THERMAL=y
  CONFIG_ROCKCHIP_THERMAL=m
  CONFIG_RCAR_THERMAL=y
  CONFIG_RCAR_GEN3_THERMAL=y
 +CONFIG_RZG2L_THERMAL=y
  CONFIG_ARMADA_THERMAL=y
  CONFIG_BCM2711_THERMAL=m
  CONFIG_BCM2835_THERMAL=m
  CONFIG_BRCMSTB_THERMAL=m
  CONFIG_EXYNOS_THERMAL=y
 -CONFIG_TEGRA_BPMP_THERMAL=m
  CONFIG_TEGRA_SOCTHERM=m
 +CONFIG_TEGRA_BPMP_THERMAL=m
  CONFIG_QCOM_TSENS=y
  CONFIG_QCOM_SPMI_TEMP_ALARM=m
  CONFIG_QCOM_LMH=m
@@@ -602,8 -592,8 +603,8 @@@ CONFIG_WATCHDOG=
  CONFIG_SL28CPLD_WATCHDOG=m
  CONFIG_ARM_SP805_WATCHDOG=y
  CONFIG_ARM_SBSA_WATCHDOG=y
 -CONFIG_ARM_SMC_WATCHDOG=y
  CONFIG_S3C2410_WATCHDOG=y
 +CONFIG_BCM7038_WDT=m
  CONFIG_DW_WATCHDOG=y
  CONFIG_SUNXI_WATCHDOG=m
  CONFIG_IMX2_WDT=y
@@@ -611,9 -601,7 +612,9 @@@ CONFIG_IMX_SC_WDT=
  CONFIG_QCOM_WDT=m
  CONFIG_MESON_GXBB_WATCHDOG=m
  CONFIG_MESON_WATCHDOG=m
 +CONFIG_ARM_SMC_WATCHDOG=y
  CONFIG_RENESAS_WDT=y
 +CONFIG_RENESAS_RZG2LWDT=y
  CONFIG_UNIPHIER_WATCHDOG=y
  CONFIG_BCM2835_WDT=y
  CONFIG_MFD_ALTERA_SYSMGR=y
@@@ -665,16 -653,16 +666,16 @@@ CONFIG_MEDIA_CAMERA_SUPPORT=
  CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
  CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
  CONFIG_MEDIA_SDR_SUPPORT=y
 -CONFIG_MEDIA_CONTROLLER=y
 -CONFIG_VIDEO_V4L2_SUBDEV_API=y
  CONFIG_MEDIA_PLATFORM_SUPPORT=y
  # CONFIG_DVB_NET is not set
  CONFIG_MEDIA_USB_SUPPORT=y
  CONFIG_USB_VIDEO_CLASS=m
  CONFIG_V4L_PLATFORM_DRIVERS=y
 +CONFIG_VIDEO_QCOM_CAMSS=m
  CONFIG_VIDEO_RCAR_CSI2=m
  CONFIG_VIDEO_RCAR_VIN=m
  CONFIG_VIDEO_SUN6I_CSI=m
 +CONFIG_VIDEO_RCAR_ISP=m
  CONFIG_V4L_MEM2MEM_DRIVERS=y
  CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
  CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
@@@ -688,6 -676,7 +689,6 @@@ CONFIG_VIDEO_RCAR_DRIF=
  CONFIG_VIDEO_IMX219=m
  CONFIG_VIDEO_OV5640=m
  CONFIG_VIDEO_OV5645=m
 -CONFIG_VIDEO_QCOM_CAMSS=m
  CONFIG_DRM=m
  CONFIG_DRM_I2C_NXP_TDA998X=m
  CONFIG_DRM_MALI_DISPLAY=m
@@@ -708,30 -697,30 +709,30 @@@ CONFIG_ROCKCHIP_INNO_HDMI=
  CONFIG_ROCKCHIP_LVDS=y
  CONFIG_DRM_RCAR_DU=m
  CONFIG_DRM_RCAR_DW_HDMI=m
 +CONFIG_DRM_RCAR_MIPI_DSI=m
  CONFIG_DRM_SUN4I=m
  CONFIG_DRM_SUN6I_DSI=m
  CONFIG_DRM_SUN8I_DW_HDMI=m
  CONFIG_DRM_SUN8I_MIXER=m
  CONFIG_DRM_MSM=m
  CONFIG_DRM_TEGRA=m
 +CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m
  CONFIG_DRM_PANEL_LVDS=m
  CONFIG_DRM_PANEL_SIMPLE=m
  CONFIG_DRM_PANEL_EDP=m
 -CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m
  CONFIG_DRM_PANEL_MANTIX_MLAF057WE51=m
  CONFIG_DRM_PANEL_RAYDIUM_RM67191=m
  CONFIG_DRM_PANEL_SITRONIX_ST7703=m
  CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
 -CONFIG_DRM_DISPLAY_CONNECTOR=m
  CONFIG_DRM_LONTIUM_LT8912B=m
 -CONFIG_DRM_NWL_MIPI_DSI=m
  CONFIG_DRM_LONTIUM_LT9611=m
 +CONFIG_DRM_LONTIUM_LT9611UXC=m
 +CONFIG_DRM_NWL_MIPI_DSI=m
  CONFIG_DRM_PARADE_PS8640=m
  CONFIG_DRM_SII902X=m
  CONFIG_DRM_SIMPLE_BRIDGE=m
  CONFIG_DRM_THINE_THC63LVD1024=m
  CONFIG_DRM_TI_SN65DSI86=m
 -CONFIG_DRM_LONTIUM_LT9611UXC=m
  CONFIG_DRM_I2C_ADV7511=m
  CONFIG_DRM_I2C_ADV7511_AUDIO=y
  CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
@@@ -762,14 -751,15 +763,14 @@@ CONFIG_SND_HDA_TEGRA=
  CONFIG_SND_HDA_CODEC_HDMI=m
  CONFIG_SND_SOC=y
  CONFIG_SND_BCM2835_SOC_I2S=m
 -CONFIG_SND_SOC_FSL_SAI=m
  CONFIG_SND_SOC_FSL_ASRC=m
  CONFIG_SND_SOC_FSL_MICFIL=m
  CONFIG_SND_SOC_FSL_EASRC=m
  CONFIG_SND_IMX_SOC=m
  CONFIG_SND_SOC_IMX_SGTL5000=m
  CONFIG_SND_SOC_IMX_SPDIF=m
 -CONFIG_SND_SOC_IMX_AUDMIX=m
  CONFIG_SND_SOC_FSL_ASOC_CARD=m
 +CONFIG_SND_SOC_IMX_AUDMIX=m
  CONFIG_SND_MESON_AXG_SOUND_CARD=m
  CONFIG_SND_MESON_GX_SOUND_CARD=m
  CONFIG_SND_SOC_QCOM=m
@@@ -816,18 -806,18 +817,18 @@@ CONFIG_SND_SOC_WM8960=
  CONFIG_SND_SOC_WM8962=m
  CONFIG_SND_SOC_WM8978=m
  CONFIG_SND_SOC_WSA881X=m
 +CONFIG_SND_SOC_NAU8822=m
  CONFIG_SND_SOC_LPASS_WSA_MACRO=m
  CONFIG_SND_SOC_LPASS_VA_MACRO=m
  CONFIG_SND_SIMPLE_CARD=m
  CONFIG_SND_AUDIO_GRAPH_CARD=m
 +CONFIG_SND_AUDIO_GRAPH_CARD2=m
  CONFIG_HID_MULTITOUCH=m
  CONFIG_I2C_HID_ACPI=m
  CONFIG_I2C_HID_OF=m
 -CONFIG_USB_CONN_GPIO=m
  CONFIG_USB=y
  CONFIG_USB_OTG=y
  CONFIG_USB_XHCI_HCD=y
 -CONFIG_USB_XHCI_PCI=m
  CONFIG_USB_XHCI_PCI_RENESAS=m
  CONFIG_USB_XHCI_TEGRA=y
  CONFIG_USB_EHCI_HCD=y
@@@ -840,10 -830,6 +841,10 @@@ CONFIG_USB_RENESAS_USBHS_HCD=
  CONFIG_USB_RENESAS_USBHS=m
  CONFIG_USB_ACM=m
  CONFIG_USB_STORAGE=y
 +CONFIG_USB_CDNS_SUPPORT=m
 +CONFIG_USB_CDNS3=m
 +CONFIG_USB_CDNS3_GADGET=y
 +CONFIG_USB_CDNS3_HOST=y
  CONFIG_USB_MTU3=y
  CONFIG_USB_MUSB_HDRC=y
  CONFIG_USB_MUSB_SUNXI=y
@@@ -878,8 -864,8 +879,8 @@@ CONFIG_TYPEC=
  CONFIG_TYPEC_TCPM=m
  CONFIG_TYPEC_TCPCI=m
  CONFIG_TYPEC_FUSB302=m
 -CONFIG_TYPEC_HD3SS3220=m
  CONFIG_TYPEC_TPS6598X=m
 +CONFIG_TYPEC_HD3SS3220=m
  CONFIG_MMC=y
  CONFIG_MMC_BLOCK_MINORS=32
  CONFIG_MMC_ARMMMCI=y
@@@ -950,18 -936,16 +951,18 @@@ CONFIG_RTC_DRV_TEGRA=
  CONFIG_RTC_DRV_SNVS=m
  CONFIG_RTC_DRV_IMX_SC=m
  CONFIG_RTC_DRV_XGENE=y
 +CONFIG_RTC_DRV_MT6397=m
  CONFIG_DMADEVICES=y
  CONFIG_DMA_BCM2835=y
  CONFIG_DMA_SUN6I=m
  CONFIG_FSL_EDMA=y
 -CONFIG_IMX_SDMA=y
 +CONFIG_IMX_SDMA=m
  CONFIG_K3_DMA=y
  CONFIG_MV_XOR=y
  CONFIG_MV_XOR_V2=y
  CONFIG_OWL_DMA=y
  CONFIG_PL330_DMA=y
 +CONFIG_TEGRA186_GPC_DMA=m
  CONFIG_TEGRA20_APB_DMA=y
  CONFIG_TEGRA210_ADMA=m
  CONFIG_QCOM_BAM_DMA=y
@@@ -979,6 -963,7 +980,6 @@@ CONFIG_VIRTIO_BALLOON=
  CONFIG_VIRTIO_MMIO=y
  CONFIG_XEN_GNTDEV=y
  CONFIG_XEN_GRANT_DEV_ALLOC=y
 -CONFIG_MFD_CROS_EC_DEV=y
  CONFIG_STAGING=y
  CONFIG_STAGING_MEDIA=y
  CONFIG_VIDEO_HANTRO=m
@@@ -988,14 -973,15 +989,14 @@@ CONFIG_CROS_EC=
  CONFIG_CROS_EC_I2C=y
  CONFIG_CROS_EC_SPI=y
  CONFIG_CROS_EC_CHARDEV=m
 -CONFIG_COMMON_CLK_SCMI=y
  CONFIG_COMMON_CLK_RK808=y
 +CONFIG_COMMON_CLK_SCMI=y
  CONFIG_COMMON_CLK_SCPI=y
  CONFIG_COMMON_CLK_CS2000_CP=y
  CONFIG_COMMON_CLK_FSL_SAI=y
  CONFIG_COMMON_CLK_S2MPS11=y
  CONFIG_COMMON_CLK_PWM=y
  CONFIG_COMMON_CLK_VC5=y
 -CONFIG_COMMON_CLK_ZYNQMP=y
  CONFIG_COMMON_CLK_BD718XX=m
  CONFIG_CLK_RASPBERRYPI=m
  CONFIG_CLK_IMX8MM=y
@@@ -1011,8 -997,8 +1012,8 @@@ CONFIG_QCOM_CLK_APCS_MSM8916=
  CONFIG_QCOM_CLK_APCC_MSM8996=y
  CONFIG_QCOM_CLK_SMD_RPM=y
  CONFIG_QCOM_CLK_RPMH=y
 -CONFIG_IPQ_GCC_8074=y
  CONFIG_IPQ_GCC_6018=y
 +CONFIG_IPQ_GCC_8074=y
  CONFIG_MSM_GCC_8916=y
  CONFIG_MSM_GCC_8994=y
  CONFIG_MSM_MMCC_8996=y
@@@ -1021,19 -1007,21 +1022,19 @@@ CONFIG_QCS_GCC_404=
  CONFIG_SC_GCC_7180=y
  CONFIG_SC_GCC_7280=y
  CONFIG_SDM_CAMCC_845=m
 -CONFIG_SDM_GCC_845=y
  CONFIG_SDM_GPUCC_845=y
  CONFIG_SDM_VIDEOCC_845=y
  CONFIG_SDM_DISPCC_845=y
 -CONFIG_SM_GCC_8150=y
 -CONFIG_SM_GCC_8250=y
  CONFIG_SM_GCC_8350=y
 +CONFIG_SM_GCC_8450=y
  CONFIG_SM_GPUCC_8150=y
  CONFIG_SM_GPUCC_8250=y
 -CONFIG_SM_DISPCC_8250=y
  CONFIG_QCOM_HFPLL=y
  CONFIG_CLK_GFM_LPASS_SM8250=m
  CONFIG_CLK_RCAR_USB2_CLOCK_SEL=y
  CONFIG_HWSPINLOCK=y
  CONFIG_HWSPINLOCK_QCOM=y
 +CONFIG_RENESAS_OSTM=y
  CONFIG_ARM_MHU=y
  CONFIG_IMX_MBOX=y
  CONFIG_PLATFORM_MHU=y
@@@ -1062,11 -1050,9 +1063,11 @@@ CONFIG_RASPBERRYPI_POWER=
  CONFIG_FSL_DPAA=y
  CONFIG_FSL_MC_DPIO=y
  CONFIG_FSL_RCPM=y
 +CONFIG_MTK_DEVAPC=m
  CONFIG_MTK_PMIC_WRAP=y
  CONFIG_QCOM_AOSS_QMP=y
  CONFIG_QCOM_COMMAND_DB=y
 +CONFIG_QCOM_CPR=y
  CONFIG_QCOM_GENI_SE=y
  CONFIG_QCOM_RMTFS_MEM=m
  CONFIG_QCOM_RPMH=y
@@@ -1077,26 -1063,25 +1078,26 @@@ CONFIG_QCOM_SMD_RPM=
  CONFIG_QCOM_SMP2P=y
  CONFIG_QCOM_SMSM=y
  CONFIG_QCOM_SOCINFO=m
 -CONFIG_QCOM_WCNSS_CTRL=m
  CONFIG_QCOM_STATS=m
 +CONFIG_QCOM_WCNSS_CTRL=m
  CONFIG_QCOM_APR=m
 -CONFIG_ARCH_R8A774A1=y
 -CONFIG_ARCH_R8A774B1=y
 -CONFIG_ARCH_R8A774C0=y
 -CONFIG_ARCH_R8A774E1=y
 +CONFIG_ARCH_R8A77995=y
 +CONFIG_ARCH_R8A77990=y
  CONFIG_ARCH_R8A77950=y
  CONFIG_ARCH_R8A77951=y
 +CONFIG_ARCH_R8A77965=y
  CONFIG_ARCH_R8A77960=y
  CONFIG_ARCH_R8A77961=y
 -CONFIG_ARCH_R8A77965=y
 -CONFIG_ARCH_R8A77970=y
 +CONFIG_ARCH_R8A779F0=y
  CONFIG_ARCH_R8A77980=y
 -CONFIG_ARCH_R8A77990=y
 -CONFIG_ARCH_R8A77995=y
 +CONFIG_ARCH_R8A77970=y
  CONFIG_ARCH_R8A779A0=y
 -CONFIG_ARCH_R8A779F0=y
 +CONFIG_ARCH_R8A774C0=y
 +CONFIG_ARCH_R8A774E1=y
 +CONFIG_ARCH_R8A774A1=y
 +CONFIG_ARCH_R8A774B1=y
  CONFIG_ARCH_R9A07G044=y
 +CONFIG_ROCKCHIP_IODOMAIN=y
  CONFIG_ROCKCHIP_PM_DOMAINS=y
  CONFIG_ARCH_TEGRA_132_SOC=y
  CONFIG_ARCH_TEGRA_210_SOC=y
@@@ -1117,7 -1102,6 +1118,7 @@@ CONFIG_QCOM_SPMI_VADC=
  CONFIG_QCOM_SPMI_ADC5=m
  CONFIG_ROCKCHIP_SARADC=m
  CONFIG_RZG2L_ADC=m
 +CONFIG_TI_ADS1015=m
  CONFIG_IIO_CROS_EC_SENSORS_CORE=m
  CONFIG_IIO_CROS_EC_SENSORS=m
  CONFIG_IIO_ST_LSM6DSX=m
@@@ -1129,7 -1113,6 +1130,7 @@@ CONFIG_IIO_CROS_EC_BARO=
  CONFIG_MPL3115=m
  CONFIG_PWM=y
  CONFIG_PWM_BCM2835=m
 +CONFIG_PWM_BRCMSTB=m
  CONFIG_PWM_CROS_EC=m
  CONFIG_PWM_IMX27=m
  CONFIG_PWM_MESON=m
@@@ -1152,9 -1135,7 +1153,9 @@@ CONFIG_RESET_RZG2L_USBPHY_CTRL=
  CONFIG_RESET_TI_SCI=y
  CONFIG_PHY_XGENE=y
  CONFIG_PHY_SUN4I_USB=y
 +CONFIG_PHY_CADENCE_SIERRA=m
  CONFIG_PHY_MIXEL_MIPI_DPHY=m
 +CONFIG_PHY_FSL_IMX8M_PCIE=y
  CONFIG_PHY_HI6220_USB=y
  CONFIG_PHY_HISTB_COMBPHY=y
  CONFIG_PHY_HISI_INNO_USB2=y
@@@ -1177,25 -1158,21 +1178,25 @@@ CONFIG_PHY_SAMSUNG_UFS=
  CONFIG_PHY_UNIPHIER_USB2=y
  CONFIG_PHY_UNIPHIER_USB3=y
  CONFIG_PHY_TEGRA_XUSB=y
 +CONFIG_PHY_AM654_SERDES=m
 +CONFIG_PHY_J721E_WIZ=m
  CONFIG_ARM_SMMU_V3_PMU=m
  CONFIG_FSL_IMX8_DDR_PMU=m
 -CONFIG_HISI_PMU=y
  CONFIG_QCOM_L2_PMU=y
  CONFIG_QCOM_L3_PMU=y
 +CONFIG_HISI_PMU=y
  CONFIG_NVMEM_IMX_OCOTP=y
  CONFIG_NVMEM_IMX_OCOTP_SCU=y
 -CONFIG_QCOM_QFPROM=y
  CONFIG_MTK_EFUSE=y
 +CONFIG_QCOM_QFPROM=y
  CONFIG_ROCKCHIP_EFUSE=y
  CONFIG_NVMEM_SUNXI_SID=y
  CONFIG_UNIPHIER_EFUSE=y
  CONFIG_MESON_EFUSE=m
  CONFIG_NVMEM_RMEM=m
 +CONFIG_NVMEM_LAYERSCAPE_SFP=m
  CONFIG_FPGA=y
 +CONFIG_FPGA_MGR_ALTERA_CVP=m
  CONFIG_FPGA_MGR_STRATIX10_SOC=m
  CONFIG_FPGA_BRIDGE=m
  CONFIG_ALTERA_FREEZE_BRIDGE=m
@@@ -1203,10 -1180,10 +1204,10 @@@ CONFIG_FPGA_REGION=
  CONFIG_OF_FPGA_REGION=m
  CONFIG_TEE=y
  CONFIG_OPTEE=y
 +CONFIG_MUX_MMIO=y
  CONFIG_SLIMBUS=m
  CONFIG_SLIM_QCOM_CTRL=m
  CONFIG_SLIM_QCOM_NGD_CTRL=m
 -CONFIG_MUX_MMIO=y
  CONFIG_INTERCONNECT=y
  CONFIG_INTERCONNECT_IMX=m
  CONFIG_INTERCONNECT_IMX8MM=m
@@@ -1220,7 -1197,6 +1221,7 @@@ CONFIG_INTERCONNECT_QCOM_SDM845=
  CONFIG_INTERCONNECT_QCOM_SM8150=m
  CONFIG_INTERCONNECT_QCOM_SM8250=m
  CONFIG_INTERCONNECT_QCOM_SM8350=m
 +CONFIG_INTERCONNECT_QCOM_SM8450=m
  CONFIG_EXT2_FS=y
  CONFIG_EXT3_FS=y
  CONFIG_EXT4_FS_POSIX_ACL=y
This page took 0.277558 seconds and 4 git commands to generate.