]> Git Repo - linux.git/commitdiff
Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
authorLinus Torvalds <[email protected]>
Fri, 6 Apr 2018 04:18:09 +0000 (21:18 -0700)
committerLinus Torvalds <[email protected]>
Fri, 6 Apr 2018 04:18:09 +0000 (21:18 -0700)
Pull ARM SoC device tree updates from Arnd Bergmann:
 "This is the usual set of changes for device trees, with over 700
  non-merged changesets. There is an ongoing set of dtc warning fixes
  and the usual bugfixes, cleanups and added device support.

  The most interesting bit as usual is support for new machines listed
  below:

   - The Allwinner H6 makes its debut with the Pine-H64 board, and we
     get two new machines based on its older siblings: the H5 based
     OrangePi Zero+ and the A64 based Teres-I Laptop from Olimex. On the
     32-bit side, we add The Olimex som204 based on Allwinner A20, and
     the Banana Pi M2 Zero development board (based on H2).

   - NVIDIA adds support for Tegra194 aka "Xavier", plus their p2972
     development board and p2888 CPU module.

   - The Nuvoton npcm750 is a BMC that was newly added, for now we only
     support running on the evaluation board.

   - STmicroelectronics stm32 gains support for the stm32mp157c and two
     evaluation boards.

   - The Toradex Colibri board family grows a few members based on the
     i.MX6ULL variant.

   - The Advantec DMS-BA16 is a Qseven module using the NXP i.MX6 family
     of chips.

   - The Phytec phyBOARD Mira is a family of industrial boards based on
     i.MX6. For now, four models get added.

   - TI am335x based PDU-001 is an industrial embedded machine used for
     traffic monitoring

   - The Aspeed platform now supports running on the BMC on the Qualcomm
     Centriq 2400 server

   - Samsung Exynos4 based Galaxy S3 is a family of mobile phones
     Qualcomm msm8974 based Galaxy S5 is a rather different phone made
     by the same company.

   - The Xilinx Zynq and ZynqMP platforms now gained a lot of dts file
     for the various boards made by Xilinx themselves, as well as the
     Digilent Zybo Z7.

   - The ARM Versatile family now supports the "IB2" interface board.

   - The Renesas H2 based "Stout" and the H3 based Salvator-X are more
     evaluation boards named after a kind of beer, as most of them are.
     The r8a77980 (V3H) based "Condor" apparently doesn't follow that
     tradition. ;-)

   - ROC-RK3328-CC is a simple developement board from the Libre
     Computer Project, based on the Rockchips RK3328 SoC

   - Haiku is another development board plus Qseven module based on
     Rockchips RK3368 and made by Theobroma Systems"

* tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (701 commits)
  arm: dts: modify Nuvoton NPCM7xx device tree structure
  arm: dts: modify Makefile NPCM750 configuration name
  arm: dts: modify clock binding in NPCM750 device tree
  arm: dts: modify timer register size in NPCM750 device tree
  arm: dts: modify UART compatible name in NPCM750 device tree
  arm: dts: add watchdog device to NPCM750 device tree
  arm64: dts: uniphier: add ethernet node for PXs3
  ARM: dts: uniphier: add pinctrl groups of ethernet for second instance
  arm: dts: kirkwood*.dts: use SPDX-License-Identifier for board using GPL-2.0+
  arm: dts: kirkwood*.dts: use SPDX-License-Identifier for boards using GPL-2.0+/MIT
  arm: dts: kirkwood*.dts: use SPDX-License-Identifier for boards using GPL-2.0
  arm: dts: armada-385-turris-omnia: use SPDX-License-Identifier
  arm: dts: armada-385-db-ap: use SPDX-License-Identifier
  arm: dts: armada-388-rd: use SPDX-License-Identifier
  arm: dts: armada-xp-db-xc3-24g4xg: use SPDX-License-Identifier
  arm: dts: armada-xp-db-dxbc2: use SPDX-License-Identifier
  arm: dts: armada-370-db: use SPDX-License-Identifier
  arm: dts: armada-*.dts: use SPDX-License-Identifier for most of the Armada based board
  arm: dts: armada-xp-98dx: use SPDX-License-Identifier for prestara 98d SoCs
  arm: dts: armada-*.dtsi: use SPDX-License-Identifier for most of the Armada SoCs
  ...

16 files changed:
1  2 
MAINTAINERS
arch/arm/boot/dts/armada-370-rd.dts
arch/arm/boot/dts/aspeed-g4.dtsi
arch/arm/boot/dts/aspeed-g5.dtsi
arch/arm/boot/dts/bcm2835-rpi.dtsi
arch/arm/boot/dts/imx7d-sdb.dts
arch/arm/boot/dts/mt7623.dtsi
arch/arm/boot/dts/stih407-b2120.dts
arch/arm/boot/dts/stih410-b2120.dts
arch/arm/boot/dts/stih410-b2260.dts
arch/arm/boot/dts/stih418-b2199.dts
arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts
arch/arm64/boot/dts/hisilicon/hi3660.dtsi
arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
arch/arm64/boot/dts/rockchip/rk3399.dtsi

diff --combined MAINTAINERS
index d8aec0877e3356beccdb3ad1196d3ac7136d8def,94e6a62ca60b41a97c0aa988f11a6d48525097c9..8fa200fddd16d04f8dcf23ca052921eaf26dae67
@@@ -766,8 -766,6 +766,8 @@@ F: drivers/gpu/drm/amd/amdgpu/amdgpu_am
  F:    drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
  F:    drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
  F:    drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
 +F:    drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c
 +F:    drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
  F:    drivers/gpu/drm/amd/amdkfd/
  F:    drivers/gpu/drm/amd/include/cik_structs.h
  F:    drivers/gpu/drm/amd/include/kgd_kfd_interface.h
@@@ -843,6 -841,13 +843,6 @@@ F:        sound/soc/codecs/ad7
  F:    sound/soc/codecs/ssm*
  F:    sound/soc/codecs/sigmadsp.*
  
 -ANALOG DEVICES INC ASOC DRIVERS
 -L:    [email protected] (moderated for non-subscribers)
 -L:    [email protected] (moderated for non-subscribers)
 -W:    http://blackfin.uclinux.org/
 -S:    Supported
 -F:    sound/soc/blackfin/*
 -
  ANALOG DEVICES INC DMA DRIVERS
  M:    Lars-Peter Clausen <[email protected]>
  W:    http://ez.analog.com/community/linux-device-drivers
@@@ -861,17 -866,7 +861,17 @@@ F:       drivers/iio/*/ad
  F:    drivers/iio/adc/ltc2497*
  X:    drivers/iio/*/adjd*
  F:    drivers/staging/iio/*/ad*
 -F:    drivers/staging/iio/trigger/iio-trig-bfin-timer.c
 +
 +ANDES ARCHITECTURE
 +M:    Greentime Hu <[email protected]>
 +M:    Vincent Chen <[email protected]>
 +T:    git https://github.com/andestech/linux.git
 +S:    Supported
 +F:    arch/nds32/
 +F:    Documentation/devicetree/bindings/interrupt-controller/andestech,ativic32.txt
 +F:    Documentation/devicetree/bindings/nds32/
 +K:    nds32
 +N:    nds32
  
  ANDROID CONFIG FRAGMENTS
  M:    Rob Herring <[email protected]>
@@@ -1065,42 -1060,41 +1065,42 @@@ ARM POR
  M:    Russell King <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  W:    http://www.armlinux.org.uk/
 -S:    Maintained
 +S:    Odd Fixes
  T:    git git://git.armlinux.org.uk/~rmk/linux-arm.git
  F:    arch/arm/
 +X:    arch/arm/boot/dts/
  
  ARM PRIMECELL AACI PL041 DRIVER
  M:    Russell King <[email protected]>
 -S:    Maintained
 +S:    Odd Fixes
  F:    sound/arm/aaci.*
  
  ARM PRIMECELL BUS SUPPORT
  M:    Russell King <[email protected]>
 -S:    Maintained
 +S:    Odd Fixes
  F:    drivers/amba/
  F:    include/linux/amba/bus.h
  
  ARM PRIMECELL CLCD PL110 DRIVER
  M:    Russell King <[email protected]>
 -S:    Maintained
 +S:    Odd Fixes
  F:    drivers/video/fbdev/amba-clcd.*
  
  ARM PRIMECELL KMI PL050 DRIVER
  M:    Russell King <[email protected]>
 -S:    Maintained
 +S:    Odd Fixes
  F:    drivers/input/serio/ambakmi.*
  F:    include/linux/amba/kmi.h
  
  ARM PRIMECELL MMCI PL180/1 DRIVER
  M:    Russell King <[email protected]>
 -S:    Maintained
 +S:    Odd Fixes
  F:    drivers/mmc/host/mmci.*
  F:    include/linux/amba/mmci.h
  
  ARM PRIMECELL UART PL010 AND PL011 DRIVERS
  M:    Russell King <[email protected]>
 -S:    Maintained
 +S:    Odd Fixes
  F:    drivers/tty/serial/amba-pl01*.c
  F:    include/linux/amba/serial.h
  
@@@ -1158,7 -1152,7 +1158,7 @@@ S:      Maintaine
  F:    drivers/clk/sunxi/
  
  ARM/Allwinner sunXi SoC support
 -M:    Maxime Ripard <maxime.ripard@free-electrons.com>
 +M:    Maxime Ripard <maxime.ripard@bootlin.com>
  M:    Chen-Yu Tsai <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -1869,7 -1863,6 +1869,6 @@@ Q:      https://patchwork.kernel.org/project
  S:    Maintained
  F:    arch/arm/boot/dts/s3c*
  F:    arch/arm/boot/dts/s5p*
- F:    arch/arm/boot/dts/samsung*
  F:    arch/arm/boot/dts/exynos*
  F:    arch/arm64/boot/dts/exynos/
  F:    arch/arm/plat-samsung/
@@@ -2635,6 -2628,51 +2634,6 @@@ F:     Documentation/filesystems/bfs.tx
  F:    fs/bfs/
  F:    include/uapi/linux/bfs_fs.h
  
 -BLACKFIN ARCHITECTURE
 -L:    [email protected] (moderated for non-subscribers)
 -T:    git git://git.code.sf.net/p/adi-linux/code
 -W:    http://blackfin.uclinux.org
 -S:    Orphan
 -F:    arch/blackfin/
 -
 -BLACKFIN EMAC DRIVER
 -L:    [email protected] (moderated for non-subscribers)
 -W:    http://blackfin.uclinux.org
 -S:    Orphan
 -F:    drivers/net/ethernet/adi/
 -
 -BLACKFIN MEDIA DRIVER
 -L:    [email protected] (moderated for non-subscribers)
 -W:    http://blackfin.uclinux.org/
 -S:    Orphan
 -F:    drivers/media/platform/blackfin/
 -F:    drivers/media/i2c/adv7183*
 -F:    drivers/media/i2c/vs6624*
 -
 -BLACKFIN RTC DRIVER
 -L:    [email protected] (moderated for non-subscribers)
 -W:    http://blackfin.uclinux.org
 -S:    Orphan
 -F:    drivers/rtc/rtc-bfin.c
 -
 -BLACKFIN SDH DRIVER
 -L:    [email protected] (moderated for non-subscribers)
 -W:    http://blackfin.uclinux.org
 -S:    Orphan
 -F:    drivers/mmc/host/bfin_sdh.c
 -
 -BLACKFIN SERIAL DRIVER
 -L:    [email protected] (moderated for non-subscribers)
 -W:    http://blackfin.uclinux.org
 -S:    Orphan
 -F:    drivers/tty/serial/bfin_uart.c
 -
 -BLACKFIN WATCHDOG DRIVER
 -L:    [email protected] (moderated for non-subscribers)
 -W:    http://blackfin.uclinux.org
 -S:    Orphan
 -F:    drivers/watchdog/bfin_wdt.c
 -
  BLINKM RGB LED DRIVER
  M:    Jan-Simon Moeller <[email protected]>
  S:    Maintained
@@@ -2646,7 -2684,6 +2645,7 @@@ L:      [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
  S:    Maintained
  F:    block/
 +F:    drivers/block/
  F:    kernel/trace/blktrace.c
  F:    lib/sbitmap.c
  
@@@ -3246,11 -3283,12 +3245,11 @@@ F:   drivers/net/ieee802154/cc2520.
  F:    include/linux/spi/cc2520.h
  F:    Documentation/devicetree/bindings/net/ieee802154/cc2520.txt
  
 -CCREE ARM TRUSTZONE CRYPTOCELL 700 REE DRIVER
 +CCREE ARM TRUSTZONE CRYPTOCELL REE DRIVER
  M:    Gilad Ben-Yossef <[email protected]>
  L:    [email protected]
 -L:    [email protected]
  S:    Supported
 -F:    drivers/staging/ccree/
 +F:    drivers/crypto/ccree/
  W:    https://developer.arm.com/products/system-ip/trustzone-cryptocell/cryptocell-700-family
  
  CEC FRAMEWORK
@@@ -3268,7 -3306,6 +3267,7 @@@ F:      include/media/cec-notifier.
  F:    include/uapi/linux/cec.h
  F:    include/uapi/linux/cec-funcs.h
  F:    Documentation/devicetree/bindings/media/cec.txt
 +F:    Documentation/ABI/testing/debugfs-cec-error-inj
  
  CEC GPIO DRIVER
  M:    Hans Verkuil <[email protected]>
@@@ -3711,6 -3748,16 +3710,6 @@@ S:     Maintaine
  F:    Documentation/filesystems/cramfs.txt
  F:    fs/cramfs/
  
 -CRIS PORT
 -M:    Mikael Starvik <[email protected]>
 -M:    Jesper Nilsson <[email protected]>
 -L:    [email protected]
 -W:    http://developer.axis.com
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris.git
 -S:    Maintained
 -F:    arch/cris/
 -F:    drivers/tty/serial/crisv10.*
 -
  CRYPTO API
  M:    Herbert Xu <[email protected]>
  M:    "David S. Miller" <[email protected]>
@@@ -4073,7 -4120,7 +4072,7 @@@ S:      Supporte
  F:    drivers/mtd/nand/denali*
  
  DESIGNWARE USB2 DRD IP DRIVER
 -M:    John Youn <johnyoun@synopsys.com>
 +M:    Minas Harutyunyan <hminas@synopsys.com>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
  S:    Maintained
@@@ -4287,7 -4334,6 +4286,7 @@@ Q:      https://patchwork.kernel.org/project
  S:    Maintained
  F:    drivers/dma/
  F:    include/linux/dmaengine.h
 +F:    include/linux/of_dma.h
  F:    Documentation/devicetree/bindings/dma/
  F:    Documentation/driver-api/dmaengine/
  T:    git git://git.infradead.org/users/vkoul/slave-dma.git
  S:    Maintained
  F:    drivers/staging/fsl-dpaa2/ethernet
  
 +DPAA2 ETHERNET SWITCH DRIVER
 +M:    Razvan Stefanescu <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/staging/fsl-dpaa2/ethsw
 +
  DPT_I2O SCSI RAID DRIVER
  M:    Adaptec OEM Raid Solutions <[email protected]>
  L:    [email protected]
@@@ -4417,13 -4457,6 +4416,13 @@@ T:    git git://anongit.freedesktop.org/dr
  S:    Supported
  F:    drivers/gpu/drm/pl111/
  
 +DRM DRIVER FOR ARM VERSATILE TFT PANELS
 +M:    Linus Walleij <[email protected]>
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +S:    Maintained
 +F:    drivers/gpu/drm/panel/panel-arm-versatile.c
 +F:    Documentation/devicetree/bindings/display/panel/arm,versatile-tft-panel.txt
 +
  DRM DRIVER FOR AST SERVER GRAPHICS CHIPS
  M:    Dave Airlie <[email protected]>
  S:    Odd Fixes
@@@ -4578,8 -4611,8 +4577,8 @@@ F:      include/uapi/drm
  F:    include/linux/vga*
  
  DRM DRIVERS AND MISC GPU PATCHES
 -M:    Daniel Vetter <[email protected]>
  M:    Gustavo Padovan <[email protected]>
 +M:    Maarten Lankhorst <[email protected]>
  M:    Sean Paul <[email protected]>
  W:    https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html
  S:    Maintained
@@@ -4592,7 -4625,7 +4591,7 @@@ F:      include/uapi/drm/drm
  F:    include/linux/vga*
  
  DRM DRIVERS FOR ALLWINNER A10
 -M:    Maxime Ripard  <maxime.ripard@free-electrons.com>
 +M:    Maxime Ripard  <maxime.ripard@bootlin.com>
  L:    [email protected]
  S:    Supported
  F:    drivers/gpu/drm/sun4i/
@@@ -4705,7 -4738,6 +4704,7 @@@ F:      drivers/gpu/drm/rcar-du
  F:    drivers/gpu/drm/shmobile/
  F:    include/linux/platform_data/shmob_drm.h
  F:    Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.txt
 +F:    Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
  F:    Documentation/devicetree/bindings/display/renesas,du.txt
  
  DRM DRIVERS FOR ROCKCHIP
@@@ -4972,6 -5004,12 +4971,6 @@@ T:     git git://linuxtv.org/anttip/media_t
  S:    Maintained
  F:    drivers/media/tuners/e4000*
  
 -EATA ISA/EISA/PCI SCSI DRIVER
 -M:    Dario Ballabio <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/scsi/eata.c
 -
  EC100 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
@@@ -5513,7 -5551,7 +5512,7 @@@ M:      Luis R. Rodriguez <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/firmware_class/
 -F:    drivers/base/firmware*.c
 +F:    drivers/base/firmware_loader/
  F:    include/linux/firmware.h
  
  FLASH ADAPTER DRIVER (IBM Flash Adapter 900GB Full Height PCI Flash Card)
@@@ -5598,7 -5636,7 +5597,7 @@@ S:      Maintaine
  F:    drivers/dma/fsldma.*
  
  FREESCALE eTSEC ETHERNET DRIVER (GIANFAR)
 -M:    Claudiu Manoil <claudiu.manoil@freescale.com>
 +M:    Claudiu Manoil <claudiu.manoil@nxp.com>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/freescale/gianfar*
@@@ -5760,6 -5798,10 +5759,6 @@@ F:     fs/crypto
  F:    include/linux/fscrypt*.h
  F:    Documentation/filesystems/fscrypt.rst
  
 -FUJITSU FR-V (FRV) PORT
 -S:    Orphan
 -F:    arch/frv/
 -
  FUJITSU LAPTOP EXTRAS
  M:    Jonathan Woithe <[email protected]>
  L:    [email protected]
@@@ -5807,6 -5849,12 +5806,6 @@@ F:     tools/testing/selftests/futex
  F:    tools/perf/bench/futex*
  F:    Documentation/*futex*
  
 -FUTURE DOMAIN TMC-16x0 SCSI DRIVER (16-bit)
 -M:    Rik Faith <[email protected]>
 -L:    [email protected]
 -S:    Odd Fixes (e.g., new signatures)
 -F:    drivers/scsi/fdomain.*
 -
  GCC PLUGINS
  M:    Kees Cook <[email protected]>
  R:    Emese Revfy <[email protected]>
@@@ -5967,7 -6015,7 +5966,7 @@@ S:      Maintaine
  F:    drivers/media/rc/gpio-ir-tx.c
  
  GPIO MOCKUP DRIVER
 -M:    Bamvor Jian Zhang <bamv[email protected]>
 +M:    Bamvor Jian Zhang <bamv[email protected]>
  R:    Bartosz Golaszewski <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
  S:    Maintained
  F:    Documentation/devicetree/bindings/gpio/
 +F:    Documentation/driver-api/gpio/
  F:    Documentation/gpio/
  F:    Documentation/ABI/testing/gpio-cdev
  F:    Documentation/ABI/obsolete/sysfs-gpio
  F:    drivers/gpio/
  F:    include/linux/gpio/
  F:    include/linux/gpio.h
 +F:    include/linux/of_gpio.h
  F:    include/asm-generic/gpio.h
  F:    include/uapi/linux/gpio.h
  F:    tools/gpio/
@@@ -6197,11 -6243,6 +6196,11 @@@ F:    Documentation/hw_random.tx
  F:    drivers/char/hw_random/
  F:    include/linux/hw_random.h
  
 +HARDWARE TRACING FACILITIES
 +M:    Alexander Shishkin <[email protected]>
 +S:    Maintained
 +F:    drivers/hwtracing/
 +
  HARDWARE SPINLOCK CORE
  M:    Ohad Ben-Cohen <[email protected]>
  M:    Bjorn Andersson <[email protected]>
@@@ -6861,13 -6902,6 +6860,13 @@@ M:    James Hogan <[email protected]
  S:    Maintained
  F:    drivers/media/rc/img-ir/
  
 +IMON SOUNDGRAPH USB IR RECEIVER
 +M:    Sean Young <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/rc/imon_raw.c
 +F:    drivers/media/rc/imon.c
 +
  IMS TWINTURBO FRAMEBUFFER DRIVER
  L:    [email protected]
  S:    Orphan
@@@ -6957,7 -6991,7 +6956,7 @@@ F:      drivers/input/input-mt.
  K:    \b(ABS|SYN)_MT_
  
  INSIDE SECURE CRYPTO DRIVER
 -M:    Antoine Tenart <antoine.tenart@free-electrons.com>
 +M:    Antoine Tenart <antoine.tenart@bootlin.com>
  F:    drivers/crypto/inside-secure/
  S:    Maintained
  L:    [email protected]
@@@ -7028,7 -7062,6 +7027,7 @@@ F:      Documentation/networking/ixgbe.tx
  F:    Documentation/networking/ixgbevf.txt
  F:    Documentation/networking/i40e.txt
  F:    Documentation/networking/i40evf.txt
 +F:    Documentation/networking/ice.txt
  F:    drivers/net/ethernet/intel/
  F:    drivers/net/ethernet/intel/*/
  F:    include/linux/avf/virtchnl.h
  S:    Supported
  F:    drivers/infiniband/hw/i40iw/
  
 +INTEL SHA MULTIBUFFER DRIVER
 +M:    Megha Dey <[email protected]>
 +R:    Tim Chen <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    arch/x86/crypto/sha*-mb
 +F:    crypto/mcryptd.c
 +
  INTEL TELEMETRY DRIVER
  M:    Souvik Kumar Chakravarty <[email protected]>
  L:    [email protected]
@@@ -7297,7 -7322,6 +7296,7 @@@ S:      Maintaine
  F:    Documentation/devicetree/bindings/iommu/
  F:    drivers/iommu/
  F:    include/linux/iommu.h
 +F:    include/linux/of_iommu.h
  F:    include/linux/iova.h
  
  IP MASQUERADING
@@@ -7498,13 -7522,6 +7497,13 @@@ Q:    http://patchwork.linuxtv.org/project
  S:    Maintained
  F:    drivers/media/dvb-frontends/ix2505v*
  
 +JAILHOUSE HYPERVISOR INTERFACE
 +M:    Jan Kiszka <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/x86/kernel/jailhouse.c
 +F:    arch/x86/include/asm/jailhouse_para.h
 +
  JC42.4 TEMPERATURE SENSOR DRIVER
  M:    Guenter Roeck <[email protected]>
  L:    [email protected]
@@@ -8131,25 -8148,7 +8130,25 @@@ F:    drivers/*/*/*pasemi
  LINUX KERNEL DUMP TEST MODULE (LKDTM)
  M:    Kees Cook <[email protected]>
  S:    Maintained
 -F:    drivers/misc/lkdtm*
 +F:    drivers/misc/lkdtm/*
 +
 +LINUX KERNEL MEMORY CONSISTENCY MODEL (LKMM)
 +M:    Alan Stern <[email protected]>
 +M:    Andrea Parri <[email protected]>
 +M:    Will Deacon <[email protected]>
 +M:    Peter Zijlstra <[email protected]>
 +M:    Boqun Feng <[email protected]>
 +M:    Nicholas Piggin <[email protected]>
 +M:    David Howells <[email protected]>
 +M:    Jade Alglave <[email protected]>
 +M:    Luc Maranget <[email protected]>
 +M:    "Paul E. McKenney" <[email protected]>
 +R:    Akira Yokosawa <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
 +F:    tools/memory-model/
 +F:    Documentation/memory-barriers.txt
  
  LINUX SECURITY MODULE (LSM) FRAMEWORK
  M:    Chris Wright <[email protected]>
@@@ -8312,6 -8311,11 +8311,6 @@@ W:     http://linux-test-project.github.io
  T:    git git://github.com/linux-test-project/ltp.git
  S:    Maintained
  
 -M32R ARCHITECTURE
 -W:    http://www.linux-m32r.org/
 -S:    Orphan
 -F:    arch/m32r/
 -
  M68K ARCHITECTURE
  M:    Geert Uytterhoeven <[email protected]>
  L:    [email protected]
@@@ -8429,7 -8433,7 +8428,7 @@@ S:      Orpha
  F:    drivers/net/wireless/marvell/libertas/
  
  MARVELL MACCHIATOBIN SUPPORT
 -M:    Russell King <rmk@armlinux.org.uk>
 +M:    Russell King <linux@armlinux.org.uk>
  L:    [email protected]
  S:    Maintained
  F:    arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
@@@ -8442,7 -8446,7 +8441,7 @@@ F:      drivers/net/ethernet/marvell/mv643xx
  F:    include/linux/mv643xx.h
  
  MARVELL MV88X3310 PHY DRIVER
 -M:    Russell King <rmk@armlinux.org.uk>
 +M:    Russell King <linux@armlinux.org.uk>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/phy/marvell10g.c
@@@ -8584,23 -8588,13 +8583,23 @@@ W:   https://linuxtv.or
  S:    Maintained
  F:    drivers/media/radio/radio-maxiradio*
  
 -MCP4531 MICROCHIP DIGITAL POTENTIOMETER DRIVER
 +MCP4018 AND MCP4531 MICROCHIP DIGITAL POTENTIOMETER DRIVERS
  M:    Peter Rosin <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-bus-iio-potentiometer-mcp4531
 +F:    drivers/iio/potentiometer/mcp4018.c
  F:    drivers/iio/potentiometer/mcp4531.c
  
 +MCR20A IEEE-802.15.4 RADIO DRIVER
 +M:    Xue Liu <[email protected]>
 +L:    [email protected]
 +W:    https://github.com/xueliu/mcr20a-linux
 +S:    Maintained
 +F:    drivers/net/ieee802154/mcr20a.c
 +F:    drivers/net/ieee802154/mcr20a.h
 +F:    Documentation/devicetree/bindings/net/ieee802154/mcr20a.txt
 +
  MEASUREMENT COMPUTING CIO-DAC IIO DRIVER
  M:    William Breathitt Gray <[email protected]>
  L:    [email protected]
@@@ -8617,14 -8611,6 +8616,14 @@@ T:    git git://linuxtv.org/media_tree.gi
  S:    Supported
  F:    drivers/media/dvb-frontends/ascot2e*
  
 +MEDIA DRIVERS FOR CXD2099AR CI CONTROLLERS
 +M:    Jasmin Jessich <[email protected]>
 +L:    [email protected]
 +W:    https://linuxtv.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/dvb-frontends/cxd2099*
 +
  MEDIA DRIVERS FOR CXD2841ER
  M:    Sergey Kozlov <[email protected]>
  M:    Abylay Ospan <[email protected]>
@@@ -8635,15 -8621,6 +8634,15 @@@ T:    git git://linuxtv.org/media_tree.gi
  S:    Supported
  F:    drivers/media/dvb-frontends/cxd2841er*
  
 +MEDIA DRIVERS FOR CXD2880
 +M:    Yasunari Takiguchi <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org/
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Supported
 +F:    drivers/media/dvb-frontends/cxd2880/*
 +F:    drivers/media/spi/cxd2880*
 +
  MEDIA DRIVERS FOR DIGITAL DEVICES PCIE DEVICES
  M:    Daniel Scheller <[email protected]>
  L:    [email protected]
@@@ -8711,16 -8688,6 +8710,16 @@@ T:    git git://linuxtv.org/media_tree.gi
  S:    Supported
  F:    drivers/media/pci/netup_unidvb/*
  
 +MEDIA DRIVERS FOR RENESAS - CEU
 +M:    Jacopo Mondi <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Supported
 +F:    Documentation/devicetree/bindings/media/renesas,ceu.txt
 +F:    drivers/media/platform/renesas-ceu.c
 +F:    include/media/drv-intf/renesas-ceu.h
 +
  MEDIA DRIVERS FOR RENESAS - DRIF
  M:    Ramesh Shanmugasundaram <[email protected]>
  L:    [email protected]
@@@ -8913,13 -8880,6 +8912,13 @@@ W:    http://www.melexis.co
  S:    Supported
  F:    drivers/iio/temperature/mlx90614.c
  
 +MELEXIS MLX90632 DRIVER
 +M:    Crt Mori <[email protected]>
 +L:    [email protected]
 +W:    http://www.melexis.com
 +S:    Supported
 +F:    drivers/iio/temperature/mlx90632.c
 +
  MELFAS MIP4 TOUCHSCREEN DRIVER
  M:    Sangwon Jee <[email protected]>
  W:    http://www.melfas.com
@@@ -9045,7 -9005,6 +9044,7 @@@ M:      Vadim Pasternak <[email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/leds/leds-mlxcpld.c
 +F:    drivers/leds/leds-mlxreg.c
  F:    Documentation/leds/leds-mlxcpld.txt
  
  MELLANOX PLATFORM DRIVER
@@@ -9124,6 -9083,20 +9123,6 @@@ F:     drivers/media/platform/meson/ao-cec.
  F:    Documentation/devicetree/bindings/media/meson-ao-cec.txt
  T:    git git://linuxtv.org/media_tree.git
  
 -METAG ARCHITECTURE
 -M:    James Hogan <[email protected]>
 -L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git
 -S:    Odd Fixes
 -F:    arch/metag/
 -F:    Documentation/metag/
 -F:    Documentation/devicetree/bindings/metag/
 -F:    Documentation/devicetree/bindings/interrupt-controller/img,*
 -F:    drivers/clocksource/metag_generic.c
 -F:    drivers/irqchip/irq-metag.c
 -F:    drivers/irqchip/irq-metag-ext.c
 -F:    drivers/tty/metag_da.c
 -
  MICROBLAZE ARCHITECTURE
  M:    Michal Simek <[email protected]>
  W:    http://www.monstr.eu/fdt/
@@@ -9178,13 -9151,6 +9177,13 @@@ F:    drivers/net/dsa/microchip/
  F:    include/linux/platform_data/microchip-ksz.h
  F:    Documentation/devicetree/bindings/net/dsa/ksz.txt
  
 +MICROCHIP LAN743X ETHERNET DRIVER
 +M:    Bryan Whitehead <[email protected]>
 +M:    Microchip Linux Driver Support <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/ethernet/microchip/lan743x_*
 +
  MICROCHIP USB251XB DRIVER
  M:    Richard Leitner <[email protected]>
  L:    [email protected]
@@@ -9412,14 -9378,6 +9411,14 @@@ S:    Maintaine
  F:    drivers/media/i2c/mt9t001.c
  F:    include/media/i2c/mt9t001.h
  
 +MT9T112 APTINA CAMERA SENSOR
 +M:    Jacopo Mondi <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Odd Fixes
 +F:    drivers/media/i2c/mt9t112.c
 +F:    include/media/i2c/mt9t112.h
 +
  MT9V032 APTINA CAMERA SENSOR
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
@@@ -9966,13 -9924,6 +9965,13 @@@ F:    Documentation/ABI/stable/sysfs-bus-n
  F:    include/linux/nvmem-consumer.h
  F:    include/linux/nvmem-provider.h
  
 +NXP SGTL5000 DRIVER
 +M:    Fabio Estevam <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/sound/sgtl5000.txt
 +F:    sound/soc/codecs/sgtl5000*
 +
  NXP TDA998X DRM DRIVER
  M:    Russell King <[email protected]>
  S:    Supported
@@@ -10225,13 -10176,6 +10224,13 @@@ T: git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    drivers/media/i2c/ov13858.c
  
 +OMNIVISION OV2685 SENSOR DRIVER
 +M:    Shunqian Zheng <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/ov2685.c
 +
  OMNIVISION OV5640 SENSOR DRIVER
  M:    Steve Longerbeam <[email protected]>
  L:    [email protected]
@@@ -10246,13 -10190,6 +10245,13 @@@ T: git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    drivers/media/i2c/ov5647.c
  
 +OMNIVISION OV5695 SENSOR DRIVER
 +M:    Shunqian Zheng <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/ov5695.c
 +
  OMNIVISION OV7670 SENSOR DRIVER
  M:    Jonathan Corbet <[email protected]>
  L:    [email protected]
@@@ -10261,14 -10198,6 +10260,14 @@@ S: Maintaine
  F:    drivers/media/i2c/ov7670.c
  F:    Documentation/devicetree/bindings/media/i2c/ov7670.txt
  
 +OMNIVISION OV772x SENSOR DRIVER
 +M:    Jacopo Mondi <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Odd fixes
 +F:    drivers/media/i2c/ov772x.c
 +F:    include/media/i2c/ov772x.h
 +
  OMNIVISION OV7740 SENSOR DRIVER
  M:    Wenyou Yang <[email protected]>
  L:    [email protected]
@@@ -10277,16 -10206,6 +10276,16 @@@ S: Maintaine
  F:    drivers/media/i2c/ov7740.c
  F:    Documentation/devicetree/bindings/media/i2c/ov7740.txt
  
 +OMNIVISION OV9650 SENSOR DRIVER
 +M:    Sakari Ailus <[email protected]>
 +R:    Akinobu Mita <[email protected]>
 +R:    Sylwester Nawrocki <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/ov9650.c
 +F:    Documentation/devicetree/bindings/media/i2c/ov9650.txt
 +
  ONENAND FLASH DRIVER
  M:    Kyungmin Park <[email protected]>
  L:    [email protected]
@@@ -10407,7 -10326,7 +10406,7 @@@ F:   drivers/oprofile
  F:    include/linux/oprofile.h
  
  ORACLE CLUSTER FILESYSTEM 2 (OCFS2)
 -M:    Mark Fasheh <mfasheh@versity.com>
 +M:    Mark Fasheh <mark@fasheh.com>
  M:    Joel Becker <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  W:    http://ocfs2.wiki.kernel.org
  S:    Maintained
  F:    drivers/platform/x86/panasonic-laptop.c
  
 -PANASONIC MN10300/AM33/AM34 PORT
 -M:    David Howells <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -W:    ftp://ftp.redhat.com/pub/redhat/gnupro/AM33/
 -S:    Maintained
 -F:    Documentation/mn10300/
 -F:    arch/mn10300/
 -
  PARALLEL LCD/KEYPAD PANEL DRIVER
  M:    Willy Tarreau <[email protected]>
  M:    Ksenija Stanojevic <[email protected]>
@@@ -10788,7 -10715,6 +10787,7 @@@ F:   drivers/acpi/pci
  F:    drivers/pci/
  F:    include/asm-generic/pci*
  F:    include/linux/pci*
 +F:    include/linux/of_pci.h
  F:    include/uapi/linux/pci*
  F:    lib/pci*
  F:    arch/x86/pci/
@@@ -10910,7 -10836,6 +10909,7 @@@ F:   drivers/platform/x86/peaq-wmi.
  PER-CPU MEMORY ALLOCATOR
  M:    Tejun Heo <[email protected]>
  M:    Christoph Lameter <[email protected]>
 +M:    Dennis Zhou <[email protected]>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git
  S:    Maintained
  F:    include/linux/percpu*.h
@@@ -11091,7 -11016,7 +11090,7 @@@ F:   include/linux/pktcdvd.
  F:    include/uapi/linux/pktcdvd.h
  
  PKUNITY SOC DRIVERS
 -M:    Guan Xuetao <gxt@mprc.pku.edu.cn>
 +M:    Guan Xuetao <[email protected]>
  W:    http://mprc.pku.edu.cn/~guanxuetao/linux
  S:    Maintained
  T:    git git://github.com/gxt/linux.git
@@@ -11535,9 -11460,8 +11534,9 @@@ M:   Stuart Yoder <[email protected]
  M:    Laurentiu Tudor <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/staging/fsl-mc/
 +F:    drivers/bus/fsl-mc/
  F:    Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt
 +F:    Documentation/networking/dpaa2/overview.rst
  
  QT1010 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
@@@ -12182,7 -12106,6 +12181,7 @@@ M:   Sylwester Nawrocki <s.nawrocki@samsu
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    sound/soc/samsung/
 +F:    Documentation/devicetree/bindings/sound/samsung*
  
  SAMSUNG EXYNOS PSEUDO RANDOM NUMBER GENERATOR (RNG) DRIVER
  M:    Krzysztof Kozlowski <[email protected]>
@@@ -12288,7 -12211,7 +12287,7 @@@ F:   Documentation/devicetree/bindings/cl
  SAMSUNG SPI DRIVERS
  M:    Kukjin Kim <[email protected]>
  M:    Krzysztof Kozlowski <[email protected]>
 -M:    Andi Shyti <andi[email protected]>
 +M:    Andi Shyti <andi@etezian.org>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -12342,6 -12265,13 +12341,6 @@@ F:  include/linux/sched.
  F:    include/uapi/linux/sched.h
  F:    include/linux/wait.h
  
 -SCORE ARCHITECTURE
 -M:    Chen Liqin <[email protected]>
 -M:    Lennox Wu <[email protected]>
 -W:    http://www.sunplus.com
 -S:    Supported
 -F:    arch/score/
 -
  SCR24X CHIP CARD INTERFACE DRIVER
  M:    Lubomir Rintel <[email protected]>
  S:    Supported
@@@ -12869,9 -12799,10 +12868,9 @@@ S:  Maintaine
  F:    drivers/net/ethernet/smsc/smsc9420.*
  
  SOC-CAMERA V4L2 SUBSYSTEM
 -M:    Guennadi Liakhovetski <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
 -S:    Maintained
 +S:    Orphan
  F:    include/media/soc*
  F:    drivers/media/i2c/soc_camera/
  F:    drivers/media/platform/soc_camera/
@@@ -12934,19 -12865,6 +12933,19 @@@ S: Maintaine
  F:    drivers/net/ethernet/socionext/netsec.c
  F:    Documentation/devicetree/bindings/net/socionext-netsec.txt
  
 +SOLIDRUN CLEARFOG SUPPORT
 +M:    Russell King <[email protected]>
 +S:    Maintained
 +F:    arch/arm/boot/dts/armada-388-clearfog*
 +F:    arch/arm/boot/dts/armada-38x-solidrun-*
 +
 +SOLIDRUN CUBOX-I/HUMMINGBOARD SUPPORT
 +M:    Russell King <[email protected]>
 +S:    Maintained
 +F:    arch/arm/boot/dts/imx6*-cubox-i*
 +F:    arch/arm/boot/dts/imx6*-hummingboard*
 +F:    arch/arm/boot/dts/imx6*-sr-*
 +
  SONIC NETWORK DRIVER
  M:    Thomas Bogendoerfer <[email protected]>
  L:    [email protected]
@@@ -13600,14 -13518,6 +13599,14 @@@ T: git git://linuxtv.org/mkrufky/tuners
  S:    Maintained
  F:    drivers/media/tuners/tda18271*
  
 +TDA1997x MEDIA DRIVER
 +M:    Tim Harvey <[email protected]>
 +L:    [email protected]
 +W:    https://linuxtv.org
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +S:    Maintained
 +F:    drivers/media/i2c/tda1997x.*
 +
  TDA827x MEDIA DRIVER
  M:    Michael Krufky <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/media/rc/ttusbir.c
  
 +TECHWELL TW9910 VIDEO DECODER
 +L:    [email protected]
 +S:    Orphan
 +F:    drivers/media/i2c/tw9910.c
 +F:    include/media/i2c/tw9910.h
 +
  TEE SUBSYSTEM
  M:    Jens Wiklander <[email protected]>
  S:    Maintained
@@@ -13730,8 -13634,7 +13729,8 @@@ S:   Supporte
  F:    drivers/i2c/busses/i2c-tegra.c
  
  TEGRA IOMMU DRIVERS
 -M:    Hiroshi Doyu <[email protected]>
 +M:    Thierry Reding <[email protected]>
 +L:    [email protected]
  S:    Supported
  F:    drivers/iommu/tegra*
  
@@@ -14019,6 -13922,19 +14018,6 @@@ S:  Orpha
  F:    drivers/net/wireless/ti/
  F:    include/linux/wl12xx.h
  
 -TILE ARCHITECTURE
 -W:    http://www.mellanox.com/repository/solutions/tile-scm/
 -S:    Orphan
 -F:    arch/tile/
 -F:    drivers/char/tile-srom.c
 -F:    drivers/edac/tile_edac.c
 -F:    drivers/net/ethernet/tile/
 -F:    drivers/rtc/rtc-tile.c
 -F:    drivers/tty/hvc/hvc_tile.c
 -F:    drivers/tty/serial/tilegx.c
 -F:    drivers/usb/host/*-tilegx.c
 -F:    include/linux/usb/tilegx.h
 -
  TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER
  M:    John Stultz <[email protected]>
  M:    Thomas Gleixner <[email protected]>
@@@ -14344,7 -14260,7 +14343,7 @@@ F:   include/linux/uwb.
  F:    include/linux/uwb/
  
  UNICORE32 ARCHITECTURE:
 -M:    Guan Xuetao <gxt@mprc.pku.edu.cn>
 +M:    Guan Xuetao <[email protected]>
  W:    http://mprc.pku.edu.cn/~guanxuetao/linux
  S:    Maintained
  T:    git git://github.com/gxt/linux.git
@@@ -14483,12 -14399,6 +14482,12 @@@ S: Maintaine
  F:    Documentation/hid/hiddev.txt
  F:    drivers/hid/usbhid/
  
 +USB INTEL XHCI ROLE MUX DRIVER
 +M:    Hans de Goede <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/usb/roles/intel-xhci-usb-role-switch.c
 +
  USB ISP116X DRIVER
  M:    Olav Kongas <[email protected]>
  L:    [email protected]
@@@ -14619,12 -14529,6 +14618,12 @@@ F: drivers/usb
  F:    include/linux/usb.h
  F:    include/linux/usb/
  
 +USB TYPEC PI3USB30532 MUX DRIVER
 +M:    Hans de Goede <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/usb/typec/mux/pi3usb30532.c
 +
  USB TYPEC SUBSYSTEM
  M:    Heikki Krogerus <[email protected]>
  L:    [email protected]
@@@ -15009,7 -14913,7 +15008,7 @@@ F:   drivers/input/mouse/vmmouse.
  F:    drivers/input/mouse/vmmouse.h
  
  VMWARE VMXNET3 ETHERNET DRIVER
 -M:    Shrikrishna Khare <skhare@vmware.com>
 +M:    Ronak Doshi <doshir@vmware.com>
  M:    "VMware, Inc." <[email protected]>
  L:    [email protected]
  S:    Maintained
index c28afb24239384d0c2395888bab51abdbc4bd3aa,54ee9fa6b58e1942e8c245e68a54fe2c163e9248..cc2f774eb2671ed08747f68c15c41c0c0145d8f9
@@@ -1,3 -1,4 +1,4 @@@
+ // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
  /*
   * Device Tree file for Marvell Armada 370 Reference Design board
   * (RD-88F6710-A1)
@@@ -6,44 -7,6 +7,6 @@@
   *
   *  Copyright (C) 2013 Florian Fainelli <[email protected]>
   *
-  * This file is dual-licensed: you can use it either under the terms
-  * of the GPL or the X11 license, at your option. Note that this dual
-  * licensing only applies to this file, and not this project as a
-  * whole.
-  *
-  *  a) This file is free software; you can redistribute it and/or
-  *     modify it under the terms of the GNU General Public License as
-  *     published by the Free Software Foundation; either version 2 of the
-  *     License, or (at your option) any later version.
-  *
-  *     This file is distributed in the hope that it will be useful,
-  *     but WITHOUT ANY WARRANTY; without even the implied warranty of
-  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  *     GNU General Public License for more details.
-  *
-  * Or, alternatively,
-  *
-  *  b) Permission is hereby granted, free of charge, to any person
-  *     obtaining a copy of this software and associated documentation
-  *     files (the "Software"), to deal in the Software without
-  *     restriction, including without limitation the rights to use,
-  *     copy, modify, merge, publish, distribute, sublicense, and/or
-  *     sell copies of the Software, and to permit persons to whom the
-  *     Software is furnished to do so, subject to the following
-  *     conditions:
-  *
-  *     The above copyright notice and this permission notice shall be
-  *     included in all copies or substantial portions of the Software.
-  *
-  *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-  *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-  *     OTHER DEALINGS IN THE SOFTWARE.
-  *
   * Note: this Device Tree assumes that the bootloader has remapped the
   * internal registers to 0xf1000000 (instead of the default
   * 0xd0000000). The 0xf1000000 is the default used by the recent,
@@@ -56,7 -19,6 +19,7 @@@
  
  /dts-v1/;
  #include <dt-bindings/input/input.h>
 +#include <dt-bindings/interrupt-controller/irq.h>
  #include <dt-bindings/gpio/gpio.h>
  #include "armada-370.dtsi"
  
                #address-cells = <1>;
                #size-cells = <0>;
                reg = <0x10>;
 +              interrupt-controller;
 +              #interrupt-cells = <2>;
  
                ports {
                        #address-cells = <1>;
                                };
                        };
                };
 +
 +              mdio {
 +                      #address-cells = <1>;
 +                      #size-cells = <0>;
 +
 +                      switchphy0: switchphy@0 {
 +                              reg = <0>;
 +                              interrupt-parent = <&switch>;
 +                              interrupts = <0 IRQ_TYPE_LEVEL_HIGH>;
 +                      };
 +
 +                      switchphy1: switchphy@1 {
 +                              reg = <1>;
 +                              interrupt-parent = <&switch>;
 +                              interrupts = <1 IRQ_TYPE_LEVEL_HIGH>;
 +                      };
 +
 +                      switchphy2: switchphy@2 {
 +                              reg = <2>;
 +                              interrupt-parent = <&switch>;
 +                              interrupts = <2 IRQ_TYPE_LEVEL_HIGH>;
 +                      };
 +
 +                      switchphy3: switchphy@3 {
 +                              reg = <3>;
 +                              interrupt-parent = <&switch>;
 +                              interrupts = <3 IRQ_TYPE_LEVEL_HIGH>;
 +                      };
 +              };
        };
  };
  
index ae2b8c952e80d7102f9aa262c7422d676c390adf,36ae23aa3b48f5ed172ff45d45695ecd3d9cbcfd..518d2bc7c7fca3e2ba1363c835c561c8e81c6cb4
                };
        };
  
 +      memory@40000000 {
 +              device_type = "memory";
 +              reg = <0x40000000 0>;
 +      };
 +
        ahb {
                compatible = "simple-bus";
                #address-cells = <1>;
                                reg-shift = <2>;
                                interrupts = <9>;
                                clocks = <&syscon ASPEED_CLK_GATE_UART1CLK>;
+                               resets = <&lpc_reset 4>;
                                no-loopback-test;
                                status = "disabled";
                        };
                                        lpc_ctrl: lpc-ctrl@0 {
                                                compatible = "aspeed,ast2400-lpc-ctrl";
                                                reg = <0x0 0x80>;
+                                               clocks = <&syscon ASPEED_CLK_GATE_LCLK>;
                                                status = "disabled";
                                        };
  
                                                compatible = "aspeed,ast2400-lhc";
                                                reg = <0x20 0x24 0x48 0x8>;
                                        };
+                                       lpc_reset: reset-controller@18 {
+                                               compatible = "aspeed,ast2400-lpc-reset";
+                                               reg = <0x18 0x4>;
+                                               #reset-cells = <1>;
+                                       };
+                                       ibt: ibt@c0  {
+                                               compatible = "aspeed,ast2400-ibt-bmc";
+                                               reg = <0xc0 0x18>;
+                                               interrupts = <8>;
+                                               status = "disabled";
+                                       };
                                };
                        };
  
                                reg-shift = <2>;
                                interrupts = <32>;
                                clocks = <&syscon ASPEED_CLK_GATE_UART2CLK>;
+                               resets = <&lpc_reset 5>;
                                no-loopback-test;
                                status = "disabled";
                        };
                                reg-shift = <2>;
                                interrupts = <33>;
                                clocks = <&syscon ASPEED_CLK_GATE_UART3CLK>;
+                               resets = <&lpc_reset 6>;
                                no-loopback-test;
                                status = "disabled";
                        };
                                reg-shift = <2>;
                                interrupts = <34>;
                                clocks = <&syscon ASPEED_CLK_GATE_UART4CLK>;
+                               resets = <&lpc_reset 7>;
                                no-loopback-test;
                                status = "disabled";
                        };
index 2477ebc11d9db4dfdd62fe09fcdf6a00c9f80161,17ee0fa33a143a42b5cc2734d0809b48bf0e8926..f9917717dd088faa33227177ceca19d822ae632f
                };
        };
  
 +      memory@80000000 {
 +              device_type = "memory";
 +              reg = <0x80000000 0>;
 +      };
 +
        ahb {
                compatible = "simple-bus";
                #address-cells = <1>;
                                reg-shift = <2>;
                                interrupts = <9>;
                                clocks = <&syscon ASPEED_CLK_GATE_UART1CLK>;
+                               resets = <&lpc_reset 4>;
                                no-loopback-test;
                                status = "disabled";
                        };
  
                                #address-cells = <1>;
                                #size-cells = <1>;
-                               ranges = <0 0x1e789000 0x1000>;
+                               ranges = <0x0 0x1e789000 0x1000>;
  
                                lpc_bmc: lpc-bmc@0 {
                                        compatible = "aspeed,ast2500-lpc-bmc";
                                lpc_host: lpc-host@80 {
                                        compatible = "aspeed,ast2500-lpc-host", "simple-mfd", "syscon";
                                        reg = <0x80 0x1e0>;
+                                       reg-io-width = <4>;
  
                                        #address-cells = <1>;
                                        #size-cells = <1>;
-                                       ranges = <0 0x80 0x1e0>;
-                                       reg-io-width = <4>;
+                                       ranges = <0x0 0x80 0x1e0>;
  
                                        lpc_ctrl: lpc-ctrl@0 {
                                                compatible = "aspeed,ast2500-lpc-ctrl";
                                                reg = <0x0 0x80>;
+                                               clocks = <&syscon ASPEED_CLK_GATE_LCLK>;
                                                status = "disabled";
                                        };
  
                                                compatible = "aspeed,ast2500-lhc";
                                                reg = <0x20 0x24 0x48 0x8>;
                                        };
+                                       lpc_reset: reset-controller@18 {
+                                               compatible = "aspeed,ast2500-lpc-reset";
+                                               reg = <0x18 0x4>;
+                                               #reset-cells = <1>;
+                                       };
+                                       ibt: ibt@c0 {
+                                               compatible = "aspeed,ast2500-ibt-bmc";
+                                               reg = <0xc0 0x18>;
+                                               interrupts = <8>;
+                                               status = "disabled";
+                                       };
                                };
                        };
  
                                reg-shift = <2>;
                                interrupts = <32>;
                                clocks = <&syscon ASPEED_CLK_GATE_UART2CLK>;
+                               resets = <&lpc_reset 5>;
                                no-loopback-test;
                                status = "disabled";
                        };
                                reg-shift = <2>;
                                interrupts = <33>;
                                clocks = <&syscon ASPEED_CLK_GATE_UART3CLK>;
+                               resets = <&lpc_reset 6>;
                                no-loopback-test;
                                status = "disabled";
                        };
                                reg-shift = <2>;
                                interrupts = <34>;
                                clocks = <&syscon ASPEED_CLK_GATE_UART4CLK>;
+                               resets = <&lpc_reset 7>;
                                no-loopback-test;
                                status = "disabled";
                        };
index 593f58d4ac0f3eafd6d845cc0175f22e4a5be83f,0198bd46ef7cd228d99f83e7b80c2f455b0f5f33..6c3cfaa77f3ddcefa435127aa328b637cb5ec837
@@@ -18,7 -18,9 +18,9 @@@
  
        soc {
                firmware: firmware {
-                       compatible = "raspberrypi,bcm2835-firmware";
+                       compatible = "raspberrypi,bcm2835-firmware", "simple-bus";
+                       #address-cells = <0>;
+                       #size-cells = <0>;
                        mboxes = <&mailbox>;
                };
  
                        firmware = <&firmware>;
                        #power-domain-cells = <1>;
                };
 +
 +              mailbox@7e00b840 {
 +                      compatible = "brcm,bcm2835-vchiq";
 +                      reg = <0x7e00b840 0xf>;
 +                      interrupts = <0 2>;
 +              };
        };
  };
  
index e7d2db839d70790fe0ace3e62c6fcd3e9def6e59,7f241afc15ea4083f46194778b9c99f886392468..5d6a08be397f211c82eddbb9cef1bf0da1b462a8
@@@ -48,7 -48,7 +48,7 @@@
        model = "Freescale i.MX7 SabreSD Board";
        compatible = "fsl,imx7d-sdb", "fsl,imx7d";
  
-       memory {
+       memory@80000000 {
                reg = <0x80000000 0x80000000>;
        };
  
@@@ -82,7 -82,7 +82,7 @@@
                enable-active-high;
        };
  
 -      reg_usb_otg2_vbus: regulator-usb-otg1-vbus {
 +      reg_usb_otg2_vbus: regulator-usb-otg2-vbus {
                compatible = "regulator-fixed";
                regulator-name = "usb_otg2_vbus";
                regulator-min-microvolt = <5000000>;
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_i2c2>;
        status = "okay";
+       mpl3115@60 {
+               compatible = "fsl,mpl3115";
+               reg = <0x60>;
+       };
  };
  
  &i2c3 {
index 8e7c65464c9d0ab8da13b88ff37d54bb0cb37e4d,ead9e1c1184a4b0e1a903640eddec581251d8f62..e10c034965246fb591f9e4383737b3edf891fe3d
@@@ -28,7 -28,7 +28,7 @@@
        compatible = "mediatek,mt7623";
        interrupt-parent = <&sysirq>;
  
-       cpu_opp_table: opp_table {
+       cpu_opp_table: opp-table {
                compatible = "operating-points-v2";
                opp-shared;
  
@@@ -87,6 -87,8 +87,6 @@@
                        clock-names = "cpu", "intermediate";
                        operating-points-v2 = <&cpu_opp_table>;
                        #cooling-cells = <2>;
 -                      cooling-min-level = <0>;
 -                      cooling-max-level = <7>;
                        clock-frequency = <1300000000>;
                };
  
@@@ -94,6 -96,9 +94,9 @@@
                        device_type = "cpu";
                        compatible = "arm,cortex-a7";
                        reg = <0x1>;
+                       clocks = <&infracfg CLK_INFRA_CPUSEL>,
+                                <&apmixedsys CLK_APMIXED_MAINPLL>;
+                       clock-names = "cpu", "intermediate";
                        operating-points-v2 = <&cpu_opp_table>;
                        clock-frequency = <1300000000>;
                };
                        device_type = "cpu";
                        compatible = "arm,cortex-a7";
                        reg = <0x2>;
+                       clocks = <&infracfg CLK_INFRA_CPUSEL>,
+                                <&apmixedsys CLK_APMIXED_MAINPLL>;
+                       clock-names = "cpu", "intermediate";
                        operating-points-v2 = <&cpu_opp_table>;
                        clock-frequency = <1300000000>;
                };
                        device_type = "cpu";
                        compatible = "arm,cortex-a7";
                        reg = <0x3>;
+                       clocks = <&infracfg CLK_INFRA_CPUSEL>,
+                                <&apmixedsys CLK_APMIXED_MAINPLL>;
+                       clock-names = "cpu", "intermediate";
                        operating-points-v2 = <&cpu_opp_table>;
                        clock-frequency = <1300000000>;
                };
        };
  
        thermal-zones {
-                       cpu_thermal: cpu_thermal {
+                       cpu_thermal: cpu-thermal {
                                polling-delay-passive = <1000>;
                                polling-delay = <1000>;
  
                                thermal-sensors = <&thermal 0>;
  
                                trips {
-                                       cpu_passive: cpu_passive {
+                                       cpu_passive: cpu-passive {
                                                temperature = <47000>;
                                                hysteresis = <2000>;
                                                type = "passive";
                                        };
  
-                                       cpu_active: cpu_active {
+                                       cpu_active: cpu-active {
                                                temperature = <67000>;
                                                hysteresis = <2000>;
                                                type = "active";
                                        };
  
-                                       cpu_hot: cpu_hot {
+                                       cpu_hot: cpu-hot {
                                                temperature = <87000>;
                                                hysteresis = <2000>;
                                                type = "hot";
                                        };
  
-                                       cpu_crit {
+                                       cpu-crit {
                                                temperature = <107000>;
                                                hysteresis = <2000>;
                                                type = "critical";
                #reset-cells = <1>;
        };
  
+       pcie: pcie@1a140000 {
+               compatible = "mediatek,mt7623-pcie";
+               device_type = "pci";
+               reg = <0 0x1a140000 0 0x1000>, /* PCIe shared registers */
+                     <0 0x1a142000 0 0x1000>, /* Port0 registers */
+                     <0 0x1a143000 0 0x1000>, /* Port1 registers */
+                     <0 0x1a144000 0 0x1000>; /* Port2 registers */
+               reg-names = "subsys", "port0", "port1", "port2";
+               #address-cells = <3>;
+               #size-cells = <2>;
+               #interrupt-cells = <1>;
+               interrupt-map-mask = <0xf800 0 0 0>;
+               interrupt-map = <0x0000 0 0 0 &sysirq GIC_SPI 193 IRQ_TYPE_LEVEL_LOW>,
+                               <0x0800 0 0 0 &sysirq GIC_SPI 194 IRQ_TYPE_LEVEL_LOW>,
+                               <0x1000 0 0 0 &sysirq GIC_SPI 195 IRQ_TYPE_LEVEL_LOW>;
+               clocks = <&topckgen CLK_TOP_ETHIF_SEL>,
+                        <&hifsys CLK_HIFSYS_PCIE0>,
+                        <&hifsys CLK_HIFSYS_PCIE1>,
+                        <&hifsys CLK_HIFSYS_PCIE2>;
+               clock-names = "free_ck", "sys_ck0", "sys_ck1", "sys_ck2";
+               resets = <&hifsys MT2701_HIFSYS_PCIE0_RST>,
+                        <&hifsys MT2701_HIFSYS_PCIE1_RST>,
+                        <&hifsys MT2701_HIFSYS_PCIE2_RST>;
+               reset-names = "pcie-rst0", "pcie-rst1", "pcie-rst2";
+               phys = <&pcie0_port PHY_TYPE_PCIE>,
+                      <&pcie1_port PHY_TYPE_PCIE>,
+                      <&u3port1 PHY_TYPE_PCIE>;
+               phy-names = "pcie-phy0", "pcie-phy1", "pcie-phy2";
+               power-domains = <&scpsys MT2701_POWER_DOMAIN_HIF>;
+               bus-range = <0x00 0xff>;
+               status = "disabled";
+               ranges = <0x81000000 0 0x1a160000 0 0x1a160000 0 0x00010000
+                         0x83000000 0 0x60000000 0 0x60000000 0 0x10000000>;
+               pcie@0,0 {
+                       reg = <0x0000 0 0 0 0>;
+                       #address-cells = <3>;
+                       #size-cells = <2>;
+                       #interrupt-cells = <1>;
+                       interrupt-map-mask = <0 0 0 0>;
+                       interrupt-map = <0 0 0 0 &sysirq GIC_SPI 193 IRQ_TYPE_LEVEL_LOW>;
+                       ranges;
+                       num-lanes = <1>;
+                       status = "disabled";
+               };
+               pcie@1,0 {
+                       reg = <0x0800 0 0 0 0>;
+                       #address-cells = <3>;
+                       #size-cells = <2>;
+                       #interrupt-cells = <1>;
+                       interrupt-map-mask = <0 0 0 0>;
+                       interrupt-map = <0 0 0 0 &sysirq GIC_SPI 194 IRQ_TYPE_LEVEL_LOW>;
+                       ranges;
+                       num-lanes = <1>;
+                       status = "disabled";
+               };
+               pcie@2,0 {
+                       reg = <0x1000 0 0 0 0>;
+                       #address-cells = <3>;
+                       #size-cells = <2>;
+                       #interrupt-cells = <1>;
+                       interrupt-map-mask = <0 0 0 0>;
+                       interrupt-map = <0 0 0 0 &sysirq GIC_SPI 195 IRQ_TYPE_LEVEL_LOW>;
+                       ranges;
+                       num-lanes = <1>;
+                       status = "disabled";
+               };
+       };
+       pcie0_phy: pcie-phy@1a149000 {
+               compatible = "mediatek,generic-tphy-v1";
+               reg = <0 0x1a149000 0 0x0700>;
+               #address-cells = <2>;
+               #size-cells = <2>;
+               ranges;
+               status = "disabled";
+               pcie0_port: pcie-phy@1a149900 {
+                       reg = <0 0x1a149900 0 0x0700>;
+                       clocks = <&clk26m>;
+                       clock-names = "ref";
+                       #phy-cells = <1>;
+                       status = "okay";
+               };
+       };
+       pcie1_phy: pcie-phy@1a14a000 {
+               compatible = "mediatek,generic-tphy-v1";
+               reg = <0 0x1a14a000 0 0x0700>;
+               #address-cells = <2>;
+               #size-cells = <2>;
+               ranges;
+               status = "disabled";
+               pcie1_port: pcie-phy@1a14a900 {
+                       reg = <0 0x1a14a900 0 0x0700>;
+                       clocks = <&clk26m>;
+                       clock-names = "ref";
+                       #phy-cells = <1>;
+                       status = "okay";
+               };
+       };
        usb1: usb@1a1c0000 {
                compatible = "mediatek,mt7623-xhci",
                             "mediatek,mt8173-xhci";
index a7a0f76e9cbc7e64cf8dcc356da6625e9ea08472,de3c8bf129b58ce1218f92a9fb62da646cecd46b..62ce1cecbb1f66138e193efbed2478cbb915a79c
        compatible = "st,stih407-b2120", "st,stih407";
  
        chosen {
 -              bootargs = "console=ttyAS0,115200 clk_ignore_unused";
 +              bootargs = "clk_ignore_unused";
-               linux,stdout-path = &sbc_serial0;
+               stdout-path = &sbc_serial0;
        };
  
-       memory {
+       memory@40000000 {
                device_type = "memory";
                reg = <0x40000000 0x80000000>;
        };
  
        aliases {
 -              ttyAS0 = &sbc_serial0;
 +              serial0 = &sbc_serial0;
                ethernet0 = &ethernet0;
        };
  
index 6c6b4cc37e97983582fae97a85911060f4972cf8,0a59b7b0f4b2c4f8715f53ceadca7ef07b655dd1..2a5a9802a5ec7d17ef28f48ff1703895c80edae8
        compatible = "st,stih410-b2120", "st,stih410";
  
        chosen {
 -              bootargs = "console=ttyAS0,115200 clk_ignore_unused";
 +              bootargs = "clk_ignore_unused";
-               linux,stdout-path = &sbc_serial0;
+               stdout-path = &sbc_serial0;
        };
  
-       memory {
+       memory@40000000 {
                device_type = "memory";
                reg = <0x40000000 0x80000000>;
        };
  
        aliases {
 -              ttyAS0 = &sbc_serial0;
 +              serial0 = &sbc_serial0;
                ethernet0 = &ethernet0;
        };
  
                        sd-uhs-ddr50;
                };
  
-               usb2_picophy1: phy2 {
+               usb2_picophy1: phy2@0 {
                        status = "okay";
                };
  
-               usb2_picophy2: phy3 {
+               usb2_picophy2: phy3@0 {
                        status = "okay";
                };
  
@@@ -61,7 -61,7 +61,7 @@@
                        status = "okay";
                };
  
-               sti-display-subsystem {
+               sti-display-subsystem@0 {
                        sti-hda@8d02000 {
                                status = "okay";
                        };
index 50d36758391c1e482c2c8ade68b5f91ce1322601,feb8834478fad456caac3f8eca85a30998a9e2f8..155caa8c002ad95702494ecd686bf9b0be36079f
        compatible = "st,stih410-b2260", "st,stih410";
  
        chosen {
 -              bootargs = "console=ttyAS1,115200 clk_ignore_unused";
 +              bootargs = "clk_ignore_unused";
-               linux,stdout-path = &uart1;
+               stdout-path = &uart1;
        };
  
-       memory {
+       memory@40000000 {
                device_type = "memory";
                reg = <0x40000000 0x40000000>;
        };
  
        aliases {
 -              ttyAS1 = &uart1;
 +              serial1 = &uart1;
                ethernet0 = &ethernet0;
        };
  
-       soc {
+       leds {
+               compatible = "gpio-leds";
+               user_green_1 {
+                       label = "User_green_1";
+                       gpios = <&pio1 3 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "heartbeat";
+                       default-state = "off";
+               };
  
-               leds {
-                       compatible = "gpio-leds";
-                       user_green_1 {
-                               label = "User_green_1";
-                               gpios = <&pio1 3 GPIO_ACTIVE_LOW>;
-                               linux,default-trigger = "heartbeat";
-                               default-state = "off";
-                       };
+               user_green_2 {
+                       label = "User_green_2";
+                       gpios = <&pio4 1 GPIO_ACTIVE_LOW>;
+                       default-state = "off";
+               };
  
-                       user_green_2 {
-                               label = "User_green_2";
-                               gpios = <&pio4 1 GPIO_ACTIVE_LOW>;
-                               default-state = "off";
-                       };
+               user_green_3 {
+                       label = "User_green_3";
+                       gpios = <&pio2 1 GPIO_ACTIVE_LOW>;
+                       default-state = "off";
+               };
+               user_green_4 {
+                       label = "User_green_4";
+                       gpios = <&pio2 5 GPIO_ACTIVE_LOW>;
+                       default-state = "off";
+               };
+       };
  
-                       user_green_3 {
-                               label = "User_green_3";
-                               gpios = <&pio2 1 GPIO_ACTIVE_LOW>;
-                               default-state = "off";
+       sound: sound {
+               compatible = "simple-audio-card";
+               simple-audio-card,name = "STI-B2260";
+               status = "okay";
+               simple-audio-card,dai-link0 {
+                       /* DAC */
+                       format = "i2s";
+                       mclk-fs = <128>;
+                       cpu {
+                               sound-dai = <&sti_uni_player0>;
                        };
  
-                       user_green_4 {
-                               label = "User_green_4";
-                               gpios = <&pio2 5 GPIO_ACTIVE_LOW>;
-                               default-state = "off";
+                       codec {
+                               sound-dai = <&sti_hdmi>;
                        };
                };
+       };
  
+       soc {
                /* Low speed expansion connector */
                uart0: serial@9830000 {
                        label = "LS-UART0";
                        status = "okay";
                };
  
-               usb2_picophy1: phy2 {
+               usb2_picophy1: phy2@0 {
                        status = "okay";
                };
  
-               usb2_picophy2: phy3 {
+               usb2_picophy2: phy3@0 {
                        status = "okay";
                };
  
                        status = "okay";
                };
  
-               sound {
-                       compatible = "simple-audio-card";
-                       simple-audio-card,name = "STI-B2260";
-                       status = "okay";
-                       simple-audio-card,dai-link@0 {
-                               /* DAC */
-                               format = "i2s";
-                               mclk-fs = <128>;
-                               cpu {
-                                       sound-dai = <&sti_uni_player0>;
-                               };
-                               codec {
-                                       sound-dai = <&sti_hdmi>;
-                               };
-                       };
-               };
-               miphy28lp_phy: miphy28lp@9b22000 {
+               miphy28lp_phy: miphy28lp@0 {
  
                        phy_port1: port@9b2a000 {
                                st,osc-force-ext;
index 7f5f3252bfc7ebc9ab3d363a51fe1bac1f85ad18,39b4db2e3507da91929ed7cebfb7b90cae938328..cd0d719e31b799c9e235f2ae5053c04a949d80cf
        compatible = "st,stih418-b2199", "st,stih418";
  
        chosen {
 -              bootargs = "console=ttyAS0,115200 clk_ignore_unused";
 +              bootargs = "clk_ignore_unused";
-               linux,stdout-path = &sbc_serial0;
+               stdout-path = &sbc_serial0;
        };
  
-       memory {
+       memory@40000000 {
                device_type = "memory";
                reg = <0x40000000 0xc0000000>;
        };
  
        aliases {
 -              ttyAS0 = &sbc_serial0;
 +              serial0 = &sbc_serial0;
                ethernet0 = &ethernet0;
        };
  
+       leds {
+               compatible = "gpio-leds";
+               red {
+                       label = "Front Panel LED";
+                       gpios = <&pio4 1 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "heartbeat";
+               };
+               green {
+                       gpios = <&pio1 3 GPIO_ACTIVE_HIGH>;
+                       default-state = "off";
+               };
+       };
        soc {
                sbc_serial0: serial@9530000 {
                        status = "okay";
                };
  
-               leds {
-                       compatible = "gpio-leds";
-                       red {
-                               label = "Front Panel LED";
-                               gpios = <&pio4 1 GPIO_ACTIVE_HIGH>;
-                               linux,default-trigger = "heartbeat";
-                       };
-                       green {
-                               gpios = <&pio1 3 GPIO_ACTIVE_HIGH>;
-                               default-state = "off";
-                       };
-               };
                i2c@9842000 {
                        status = "okay";
                };
@@@ -88,7 -88,7 +88,7 @@@
                        non-removable;
                };
  
-               miphy28lp_phy: miphy28lp@9b22000 {
+               miphy28lp_phy: miphy28lp@0 {
  
                        phy_port0: port@9b22000 {
                                st,osc-rdy;
index b2758dd8ce438abdfd53a0a347f496b6d8ddbe7d,3077e8ec9cd9da3f3f0cb988cf812aa81baac8eb..b8b79c0e9ee051255762e7d7d10e76422130fabd
@@@ -42,6 -42,7 +42,6 @@@
  
  /dts-v1/;
  #include "sun6i-a31s.dtsi"
 -#include "sunxi-common-regulators.dtsi"
  #include <dt-bindings/gpio/gpio.h>
  
  / {
@@@ -98,7 -99,6 +98,7 @@@
        pinctrl-0 = <&gmac_pins_rgmii_a>, <&gmac_phy_reset_pin_bpi_m2>;
        phy = <&phy1>;
        phy-mode = "rgmii";
 +      phy-supply = <&reg_dldo1>;
        snps,reset-gpio = <&pio 0 21 GPIO_ACTIVE_HIGH>; /* PA21 */
        snps,reset-active-low;
        snps,reset-delays-us = <0 10000 30000>;
  &mmc0 {
        pinctrl-names = "default";
        pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bpi_m2>;
 -      vmmc-supply = <&reg_vcc3v0>;
 +      vmmc-supply = <&reg_dcdc1>;
        bus-width = <4>;
-       cd-gpios = <&pio 0 4 GPIO_ACTIVE_HIGH>; /* PA4 */
-       cd-inverted;
+       cd-gpios = <&pio 0 4 GPIO_ACTIVE_LOW>; /* PA4 */
        status = "okay";
  };
  
  &mmc2 {
        pinctrl-names = "default";
        pinctrl-0 = <&mmc2_pins_a>;
 -      vmmc-supply = <&reg_vcc3v0>;
 +      vmmc-supply = <&reg_aldo1>;
        mmc-pwrseq = <&mmc2_pwrseq>;
        bus-width = <4>;
        non-removable;
                reg = <0x68>;
                interrupt-parent = <&nmi_intc>;
                interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
 +              eldoin-supply = <&reg_dcdc1>;
 +              x-powers,drive-vbus-en;
        };
  };
  
  
  #include "axp22x.dtsi"
  
 +&reg_aldo1 {
 +      regulator-min-microvolt = <3300000>;
 +      regulator-max-microvolt = <3300000>;
 +      regulator-name = "vcc-wifi";
 +};
 +
 +&reg_aldo2 {
 +      regulator-always-on;
 +      regulator-min-microvolt = <2500000>;
 +      regulator-max-microvolt = <2500000>;
 +      regulator-name = "vcc-gmac";
 +};
 +
 +&reg_aldo3 {
 +      regulator-always-on;
 +      regulator-min-microvolt = <3000000>;
 +      regulator-max-microvolt = <3000000>;
 +      regulator-name = "avcc";
 +};
 +
  &reg_dc5ldo {
 +      regulator-always-on;
        regulator-min-microvolt = <700000>;
        regulator-max-microvolt = <1320000>;
        regulator-name = "vdd-cpus";
        regulator-name = "vcc-dram";
  };
  
 +&reg_dldo1 {
 +      regulator-min-microvolt = <3000000>;
 +      regulator-max-microvolt = <3000000>;
 +      regulator-name = "vcc-mac";
 +};
 +
 +&reg_dldo2 {
 +      regulator-min-microvolt = <2800000>;
 +      regulator-max-microvolt = <2800000>;
 +      regulator-name = "avdd-csi";
 +};
 +
 +&reg_dldo3 {
 +      regulator-always-on;
 +      regulator-min-microvolt = <3300000>;
 +      regulator-max-microvolt = <3300000>;
 +      regulator-name = "vcc-pb";
 +};
 +
 +&reg_eldo1 {
 +      regulator-min-microvolt = <1800000>;
 +      regulator-max-microvolt = <1800000>;
 +      regulator-name = "vdd-csi";
 +      status = "okay";
 +};
 +
 +&reg_ldo_io1 {
 +      regulator-always-on;
 +      regulator-min-microvolt = <1800000>;
 +      regulator-max-microvolt = <1800000>;
 +      regulator-name = "vcc-pm-cpus";
 +      status = "okay";
 +};
 +
  &uart0 {
        pinctrl-names = "default";
        pinctrl-0 = <&uart0_pins_a>;
index 51ce5832ee1dfc0f7e260d92648312788f3b3177,54bf6a6c6f7b72f8593fdb491a1fb85b60ea1194..eaf13fe292877cfb703a6781e75b70ef05b47817
@@@ -88,6 -88,7 +88,6 @@@
  
  &mmc {
        status = "okay";
 -      num-slots = <1>;
        cap-sd-highspeed;
        broken-cd;
        bus-width = <4>;
  
  &usb0 {
        status = "okay";
+       disable-over-current;
+ };
+ &watchdog0 {
+       status = "okay";
  };
index a7ecd9074ea24378544ba0105d33a1abad3108c3,4ce4c282e19e1a3fcff933a1ead35113e93a308d..ec3eb8e33a3a528e1a78d2138762acf4aaec3cd2
                        reg = <0x0 0x100>;
                        enable-method = "psci";
                        next-level-cache = <&A73_L2>;
-                       cpu-idle-states = <
-                                       &CPU_NAP
-                                       &CPU_SLEEP
-                                       &CLUSTER_SLEEP_1
-                       >;
+                       cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP_1>;
                        capacity-dmips-mhz = <1024>;
                };
  
                        reg = <0x0 0x101>;
                        enable-method = "psci";
                        next-level-cache = <&A73_L2>;
-                       cpu-idle-states = <
-                                       &CPU_NAP
-                                       &CPU_SLEEP
-                                       &CLUSTER_SLEEP_1
-                       >;
+                       cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP_1>;
                        capacity-dmips-mhz = <1024>;
                };
  
                        reg = <0x0 0x102>;
                        enable-method = "psci";
                        next-level-cache = <&A73_L2>;
-                       cpu-idle-states = <
-                                       &CPU_NAP
-                                       &CPU_SLEEP
-                                       &CLUSTER_SLEEP_1
-                       >;
+                       cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP_1>;
                        capacity-dmips-mhz = <1024>;
                };
  
                        reg = <0x0 0x103>;
                        enable-method = "psci";
                        next-level-cache = <&A73_L2>;
-                       cpu-idle-states = <
-                                       &CPU_NAP
-                                       &CPU_SLEEP
-                                       &CLUSTER_SLEEP_1
-                       >;
+                       cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP_1>;
                        capacity-dmips-mhz = <1024>;
                };
  
                idle-states {
                        entry-method = "psci";
  
-                       CPU_NAP: cpu-nap {
-                               compatible = "arm,idle-state";
-                               arm,psci-suspend-param = <0x0000001>;
-                               entry-latency-us = <7>;
-                               exit-latency-us = <2>;
-                               min-residency-us = <15>;
-                       };
                        CPU_SLEEP: cpu-sleep {
                                compatible = "arm,idle-state";
                                local-timer-stop;
                        #size-cells = <0>;
                        cd-inverted;
                        compatible = "hisilicon,hi3660-dw-mshc";
 -                      num-slots = <1>;
                        bus-width = <0x4>;
                        disable-wp;
                        cap-sd-highspeed;
                        compatible = "hisilicon,hi3660-dw-mshc";
                        reg = <0x0 0xff3ff000 0x0 0x1000>;
                        interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
 -                      num-slots = <1>;
                        clocks = <&crg_ctrl HI3660_CLK_GATE_SDIO0>,
                                 <&crg_ctrl HI3660_HCLK_GATE_SDIO0>;
                        clock-names = "ciu", "biu";
index 204bdb9857b9cbd3517c0ff2307aa9af30ae2f8c,300f11daf1aed62fcd0985891fcfc1bce69e3098..18f546f2dfd113d018e9935f2a03b18315c46efa
        wlan_pd_n: wlan-pd-n {
                compatible = "regulator-fixed";
                regulator-name = "wlan_pd_n";
 +              pinctrl-names = "default";
 +              pinctrl-0 = <&wlan_module_reset_l>;
  
 -              /* Note the wlan_module_reset_l pinctrl */
                enable-active-high;
                gpio = <&gpio1 11 GPIO_ACTIVE_HIGH>;
  
                compatible = "rockchip,rk3399-gru-sound";
                rockchip,cpu = <&i2s0 &i2s2>;
                rockchip,codec = <&max98357a &headsetcodec
-                                 &codec &wacky_spi_audio>;
+                                 &codec &wacky_spi_audio &cdn_dp>;
        };
  };
  
+ &cdn_dp {
+       status = "okay";
+       extcon = <&usbc_extcon0>, <&usbc_extcon1>;
+ };
  /*
   * Set some suspend operating points to avoid OVP in suspend
   *
                <&cru PCLK_PERIHP>,
                <&cru ACLK_PERILP0>, <&cru HCLK_PERILP0>,
                <&cru PCLK_PERILP0>, <&cru ACLK_CCI>,
-               <&cru HCLK_PERILP1>, <&cru PCLK_PERILP1>;
+               <&cru HCLK_PERILP1>, <&cru PCLK_PERILP1>,
+               <&cru ACLK_VIO>;
        assigned-clock-rates =
                <600000000>, <800000000>,
                <1000000000>,
                <37500000>,
                <100000000>, <100000000>,
                <50000000>, <800000000>,
-               <100000000>, <50000000>;
+               <100000000>, <50000000>,
+               <400000000>;
  };
  
  &emmc_phy {
@@@ -984,6 -990,12 +991,6 @@@ ap_i2c_audio: &i2c8 
        pinctrl-0 = <
                &ap_pwroff      /* AP will auto-assert this when in S3 */
                &clk_32k        /* This pin is always 32k on gru boards */
 -
 -              /*
 -               * We want this driven low ASAP; firmware should help us, but
 -               * we can help ourselves too.
 -               */
 -              &wlan_module_reset_l
        >;
  
        pcfg_output_low: pcfg-output-low {
                };
  
                wlan_module_reset_l: wlan-module-reset-l {
 -                      /*
 -                       * We want this driven low ASAP (As {Soon,Strongly} As
 -                       * Possible), to avoid leakage through the powered-down
 -                       * WiFi.
 -                       */
 -                      rockchip,pins = <1 11 RK_FUNC_GPIO &pcfg_output_low>;
 +                      rockchip,pins = <1 11 RK_FUNC_GPIO &pcfg_pull_none>;
                };
  
                bt_host_wake_l: bt-host-wake-l {
index 0b81ca1d07e7e900705d71f8e9cdacd5ce9b1217,e5491d6f66e8165216d3c3e40e225327363d9f48..4550c0f82be9021c3258ef18da864570800f1cda
                        reg = <0x0 0xfe800000 0x0 0x100000>;
                        interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH 0>;
                        dr_mode = "otg";
 -                      phys = <&u2phy0_otg>, <&tcphy0_usb3>;
 -                      phy-names = "usb2-phy", "usb3-phy";
 +                      phys = <&u2phy0_otg>;
 +                      phy-names = "usb2-phy";
                        phy_type = "utmi_wide";
                        snps,dis_enblslpm_quirk;
                        snps,dis-u2-freeclk-exists-quirk;
                        reg = <0x0 0xfe900000 0x0 0x100000>;
                        interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH 0>;
                        dr_mode = "otg";
 -                      phys = <&u2phy1_otg>, <&tcphy1_usb3>;
 -                      phy-names = "usb2-phy", "usb3-phy";
 +                      phys = <&u2phy1_otg>;
 +                      phy-names = "usb2-phy";
                        phy_type = "utmi_wide";
                        snps,dis_enblslpm_quirk;
                        snps,dis-u2-freeclk-exists-quirk;
                };
        };
  
+       cdn_dp: dp@fec00000 {
+               compatible = "rockchip,rk3399-cdn-dp";
+               reg = <0x0 0xfec00000 0x0 0x100000>;
+               interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH 0>;
+               assigned-clocks = <&cru SCLK_DP_CORE>;
+               assigned-clock-rates = <100000000>;
+               clocks = <&cru SCLK_DP_CORE>, <&cru PCLK_DP_CTRL>,
+                        <&cru SCLK_SPDIF_REC_DPTX>, <&cru PCLK_VIO_GRF>;
+               clock-names = "core-clk", "pclk", "spdif", "grf";
+               phys = <&tcphy0_dp>, <&tcphy1_dp>;
+               power-domains = <&power RK3399_PD_HDCP>;
+               resets = <&cru SRST_DPTX_SPDIF_REC>, <&cru SRST_P_UPHY0_DPTX>,
+                        <&cru SRST_P_UPHY0_APB>, <&cru SRST_DP_CORE>;
+               reset-names = "spdif", "dptx", "apb", "core";
+               rockchip,grf = <&grf>;
+               #sound-dai-cells = <1>;
+               status = "disabled";
+               ports {
+                       dp_in: port {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               dp_in_vopb: endpoint@0 {
+                                       reg = <0>;
+                                       remote-endpoint = <&vopb_out_dp>;
+                               };
+                               dp_in_vopl: endpoint@1 {
+                                       reg = <1>;
+                                       remote-endpoint = <&vopl_out_dp>;
+                               };
+                       };
+               };
+       };
        gic: interrupt-controller@fee00000 {
                compatible = "arm,gic-v3";
                #interrupt-cells = <4>;
                        <&cru PCLK_PERIHP>,
                        <&cru ACLK_PERILP0>, <&cru HCLK_PERILP0>,
                        <&cru PCLK_PERILP0>, <&cru ACLK_CCI>,
-                       <&cru HCLK_PERILP1>, <&cru PCLK_PERILP1>;
+                       <&cru HCLK_PERILP1>, <&cru PCLK_PERILP1>,
+                       <&cru ACLK_VIO>;
                assigned-clock-rates =
                         <594000000>,  <800000000>,
                        <1000000000>,
                          <37500000>,
                         <100000000>,  <100000000>,
                          <50000000>, <600000000>,
-                        <100000000>,   <50000000>;
+                        <100000000>,   <50000000>,
+                        <400000000>;
        };
  
        grf: syscon@ff770000 {
                                reg = <3>;
                                remote-endpoint = <&mipi1_in_vopl>;
                        };
+                       vopl_out_dp: endpoint@4 {
+                               reg = <4>;
+                               remote-endpoint = <&dp_in_vopl>;
+                       };
                };
        };
  
                                reg = <3>;
                                remote-endpoint = <&mipi1_in_vopb>;
                        };
+                       vopb_out_dp: endpoint@4 {
+                               reg = <4>;
+                               remote-endpoint = <&dp_in_vopb>;
+                       };
                };
        };
  
                };
  
                i2s0 {
+                       i2s0_2ch_bus: i2s0-2ch-bus {
+                               rockchip,pins =
+                                       <3 24 RK_FUNC_1 &pcfg_pull_none>,
+                                       <3 25 RK_FUNC_1 &pcfg_pull_none>,
+                                       <3 26 RK_FUNC_1 &pcfg_pull_none>,
+                                       <3 27 RK_FUNC_1 &pcfg_pull_none>,
+                                       <3 31 RK_FUNC_1 &pcfg_pull_none>,
+                                       <4 0 RK_FUNC_1 &pcfg_pull_none>;
+                       };
                        i2s0_8ch_bus: i2s0-8ch-bus {
                                rockchip,pins =
                                        <3 24 RK_FUNC_1 &pcfg_pull_none>,
                        };
                };
  
+               testclk {
+                       test_clkout0: test-clkout0 {
+                               rockchip,pins =
+                                       <0 0 RK_FUNC_1 &pcfg_pull_none>;
+                       };
+                       test_clkout1: test-clkout1 {
+                               rockchip,pins =
+                                       <2 25 RK_FUNC_2 &pcfg_pull_none>;
+                       };
+                       test_clkout2: test-clkout2 {
+                               rockchip,pins =
+                                       <0 8 RK_FUNC_3 &pcfg_pull_none>;
+                       };
+               };
                tsadc {
                        otp_gpio: otp-gpio {
                                rockchip,pins = <1 6 RK_FUNC_GPIO &pcfg_pull_none>;
This page took 0.239937 seconds and 4 git commands to generate.