]> Git Repo - linux.git/commitdiff
Merge tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
authorLinus Torvalds <[email protected]>
Thu, 15 Dec 2016 23:58:28 +0000 (15:58 -0800)
committerLinus Torvalds <[email protected]>
Thu, 15 Dec 2016 23:58:28 +0000 (15:58 -0800)
Pull ARM 64-bit DT updates from Arnd Bergmann:
 "A couple of interesting new SoC platforms are now supported, these are
  the respective DTS sources:

   - Samsung Exynos5433 mobile phone platform, including an (almost)
     fully supported phone reference board.
   - Hisilicon Hip07 server platform and D05 board, the latest iteration
     of their product line, now with 64 Cortex-A72 cores across two
     sockets.
   - Allwinner A64 SoC, the first 64-bit chip from their "sunxi" product
     line, used in Android tablets and ultra-cheap development boards
   - NXP LS1046A Communication processor, improving on the earlier
     LS1043A with faster CPU cores
   - Qualcomm MSM8992 (Snapdragon 808) and MSM8994 (Snapdragon 810)
     mobile phone SoCs
   - Early support for the Nvidia Tegra Tegra186 SoC
   - Amlogic S905D is a minor variant of their existing Android consumer
     product line
   - Rockchip PX5 automotive platform, a close relative of their popular
     rk3368 Android tablet chips

  Aside from the respective evaluation platforms for the above chips,
  there are only a few consumer devices and boards added this time:

   - Huawei Nexus 6P (Angler) mobile phone
   - LG Nexus 5x (Bullhead) mobile phone
   - Nexbox A1 and A95X Android TV boxes
   - Pine64 development board based on Allwinner A64
   - Globalscale Marvell ESPRESSOBin community board based on Armada 3700
   - Renesas "R-Car Starter Kit Pro" (M3ULCB) low-cost automotive board

  For the existing platforms, we get bug fixes and new peripheral
  support for Juno, Renesas, Uniphier, Amlogic, Samsung, Broadcom,
  Rockchip, Berlin, and ZTE"

* tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (168 commits)
  arm64: dts: fix build errors from missing dependencies
  ARM64: dts: meson-gxbb: add SCPI pre-1.0 compatible
  ARM64: dts: meson-gxl: Add support for Nexbox A95X
  ARM64: dts: meson-gxm: Add support for the Nexbox A1
  ARM: dts: artpec: add pcie support
  arm64: dts: berlin4ct-dmp: add missing unit name to /memory node
  arm64: dts: berlin4ct-stb: add missing unit name to /memory node
  arm64: dts: berlin4ct: add missing unit name to /soc node
  arm64: dts: qcom: msm8916: Add ddr support to sdhc1
  arm64: dts: exynos: Enable HS400 mode for eMMC for TM2
  ARM: dts: Add xo to sdhc clock node on qcom platforms
  ARM64: dts: Add support for Meson GXM
  dt-bindings: add rockchip RK1108 Evaluation board
  arm64: dts: NS2: Add PCI PHYs
  arm64: dts: NS2: enable sdio1
  arm64: dts: exynos: Add the mshc_2 node for supporting T-Flash
  arm64: tegra: Add NVIDIA P2771 board support
  arm64: tegra: Enable PSCI on P3310
  arm64: tegra: Add NVIDIA P3310 processor module support
  arm64: tegra: Add GPIO controllers on Tegra186
  ...

23 files changed:
1  2 
Documentation/devicetree/bindings/arm/qcom.txt
Documentation/devicetree/bindings/arm/rockchip.txt
Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt
Documentation/devicetree/bindings/arm/shmobile.txt
Documentation/devicetree/bindings/i2c/trivial-devices.txt
Documentation/devicetree/bindings/vendor-prefixes.txt
MAINTAINERS
arch/arm64/boot/dts/arm/juno-base.dtsi
arch/arm64/boot/dts/arm/juno-r1.dts
arch/arm64/boot/dts/arm/juno-r2.dts
arch/arm64/boot/dts/arm/juno.dts
arch/arm64/boot/dts/broadcom/ns2-svk.dts
arch/arm64/boot/dts/broadcom/ns2.dtsi
arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi
arch/arm64/boot/dts/marvell/armada-3720-db.dts
arch/arm64/boot/dts/marvell/armada-37xx.dtsi
arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
arch/arm64/boot/dts/renesas/r8a7795.dtsi
arch/arm64/boot/dts/renesas/r8a7796.dtsi
arch/arm64/boot/dts/rockchip/rk3368.dtsi
arch/arm64/boot/dts/rockchip/rk3399.dtsi
arch/arm64/boot/dts/zte/zx296718.dtsi

index 43abf4e0a0a5474932e0aed5dd0b224ebefb2def,eb4057e77c23a85844f4aab29d5d17d72349eb47..028d16e721862effcf95ee4e9055856255e99879
@@@ -21,8 -21,9 +21,10 @@@ The 'SoC' element must be one of the fo
        apq8096
        msm8916
        msm8974
+       msm8992
+       msm8994
        msm8996
 +      mdm9615
  
  The 'board' element must be one of the following strings:
  
index e921f3efac6476ec814a6733ea1adabb4ec36b33,5b960d7392620d1021c32ccd541be2bb75b902eb..cc4ace6397abda9ffa0a7aa02a0fce76eff5c6e0
@@@ -25,10 -25,6 +25,10 @@@ Rockchip platforms device tree binding
      Required root node properties:
        - compatible = "radxa,rock2-square", "rockchip,rk3288";
  
 +- Rikomagic MK808 v1 board:
 +    Required root node properties:
 +      - compatible = "rikomagic,mk808", "rockchip,rk3066a";
 +
  - Firefly Firefly-RK3288 board:
      Required root node properties:
        - compatible = "firefly,firefly-rk3288", "rockchip,rk3288";
      Required root node properties:
        - compatible = "mqmaker,miqi", "rockchip,rk3288";
  
+ - Rockchip PX3 Evaluation board:
+     Required root node properties:
+       - compatible = "rockchip,px3-evb", "rockchip,px3", "rockchip,rk3188";
+ - Rockchip PX5 Evaluation board:
+     Required root node properties:
+       - compatible = "rockchip,px5-evb", "rockchip,px5", "rockchip,rk3368";
+ - Rockchip RK1108 Evaluation board
+     Required root node properties:
+       - compatible = "rockchip,rk1108-evb", "rockchip,rk1108";
  - Rockchip RK3368 evb:
      Required root node properties:
        - compatible = "rockchip,rk3368-evb-act8846", "rockchip,rk3368";
index 5160fa5f7b5cef902c8e7c92d46afb8e964fea84,c64c7b5157772ccb3d6f9de307309cbdeb8f4e7c..3c551894f621ff67d1b441eb8292f49f787bb264
@@@ -15,6 -15,8 +15,8 @@@ Required root node properties
        - "samsung,xyref5260"   - for Exynos5260-based Samsung board.
        - "samsung,smdk5410"    - for Exynos5410-based Samsung SMDK5410 eval board.
        - "samsung,smdk5420"    - for Exynos5420-based Samsung SMDK5420 eval board.
+       - "samsung,tm2"         - for Exynos5433-based Samsung TM2 board.
+       - "samsung,tm2e"        - for Exynos5433-based Samsung TM2E board.
        - "samsung,sd5v1"       - for Exynos5440-based Samsung board.
        - "samsung,ssdk5440"    - for Exynos5440-based Samsung board.
  
@@@ -22,9 -24,6 +24,9 @@@
    * FriendlyARM
        - "friendlyarm,tiny4412"  - for Exynos4412-based FriendlyARM
                                    TINY4412 board.
 +  * TOPEET
 +      - "topeet,itop4412-elite" - for Exynos4412-based TOPEET
 +                                    Elite base board.
  
    * Google
        - "google,pi"           - for Exynos5800-based Google Peach Pi
index 3c7acf22957a365afebe45eb0b8ac12ae2c0b43b,29bf24ca0b7b53503e3d9c618b5db54e55d8feca..5d8229d74a5fe526c6911d398894a321478be559
@@@ -13,10 -13,6 +13,10 @@@ SoCs
      compatible = "renesas,r8a73a4"
    - R-Mobile A1 (R8A77400)
      compatible = "renesas,r8a7740"
 +  - RZ/G1M (R8A77430)
 +    compatible = "renesas,r8a7743"
 +  - RZ/G1E (R8A77450)
 +    compatible = "renesas,r8a7745"
    - R-Car M1A (R8A77781)
      compatible = "renesas,r8a7778"
    - R-Car H1 (R8A77790)
@@@ -39,7 -35,7 +39,7 @@@
  
  Boards:
  
 -  - Alt
 +  - Alt (RTP0RC7794SEB00010S)
      compatible = "renesas,alt", "renesas,r8a7794"
    - APE6-EVM
      compatible = "renesas,ape6evm", "renesas,r8a73a4"
@@@ -51,9 -47,9 +51,9 @@@
      compatible = "renesas,bockw", "renesas,r8a7778"
    - Genmai (RTK772100BC00000BR)
      compatible = "renesas,genmai", "renesas,r7s72100"
 -  - Gose
 +  - Gose (RTP0RC7793SEB00010S)
      compatible = "renesas,gose", "renesas,r8a7793"
-   - H3ULCB (RTP0RC7795SKB00010S)
+   - H3ULCB (R-Car Starter Kit Premier, RTP0RC7795SKB00010S)
      compatible = "renesas,h3ulcb", "renesas,r8a7795";
    - Henninger
      compatible = "renesas,henninger", "renesas,r8a7791"
@@@ -65,7 -61,9 +65,9 @@@
      compatible = "renesas,kzm9g", "renesas,sh73a0"
    - Lager (RTP0RC7790SEB00010S)
      compatible = "renesas,lager", "renesas,r8a7790"
 -  - Marzen
+   - M3ULCB (R-Car Starter Kit Pro, RTP0RC7796SKB00010S)
+     compatible = "renesas,m3ulcb", "renesas,r8a7796";
 +  - Marzen (R0P7779A00010S)
      compatible = "renesas,marzen", "renesas,r8a7779"
    - Porter (M2-LCDP)
      compatible = "renesas,porter", "renesas,r8a7791"
@@@ -77,9 -75,5 +79,9 @@@
      compatible = "renesas,salvator-x", "renesas,r8a7796";
    - SILK (RTP0RC7794LCB00011S)
      compatible = "renesas,silk", "renesas,r8a7794"
 +  - SK-RZG1E (YR8A77450S000BE)
 +    compatible = "renesas,sk-rzg1e", "renesas,r8a7745"
 +  - SK-RZG1M (YR8A77430S000BE)
 +    compatible = "renesas,sk-rzg1m", "renesas,r8a7743"
    - Wheat
      compatible = "renesas,wheat", "renesas,r8a7792"
index df720ca00fcfe22294079717206caf070925527a,8a43a5ebc07c674d495ff52844505269c177eeeb..ff86fdcbd3537b3bffe91091b0e55993bd1b76de
@@@ -39,13 -39,11 +39,13 @@@ dallas,ds75                Digital Thermometer and Th
  dlg,da9053            DA9053: flexible system level PMIC with multicore support
  dlg,da9063            DA9063: system PMIC for quad-core application processors
  domintech,dmard09     DMARD09: 3-axis Accelerometer
 +domintech,dmard10     DMARD10: 3-axis Accelerometer
  epson,rx8010          I2C-BUS INTERFACE REAL TIME CLOCK MODULE
  epson,rx8025          High-Stability. I2C-Bus INTERFACE REAL TIME CLOCK MODULE
  epson,rx8581          I2C-BUS INTERFACE REAL TIME CLOCK MODULE
  fsl,mag3110           MAG3110: Xtrinsic High Accuracy, 3D Magnetometer
  fsl,mc13892           MC13892: Power Management Integrated Circuit (PMIC) for i.MX35/51
 +fsl,mma7660           MMA7660FC: 3-Axis Orientation/Motion Detection Sensor
  fsl,mma8450           MMA8450Q: Xtrinsic Low-power, 3-axis Xtrinsic Accelerometer
  fsl,mpl3115           MPL3115: Absolute Digital Pressure Sensor
  fsl,mpr121            MPR121: Proximity Capacitive Touch Sensor Controller
@@@ -59,7 -57,6 +59,7 @@@ maxim,max1237         Low-Power, 4-/12-Channel
  maxim,max6625         9-Bit/12-Bit Temperature Sensors with I²C-Compatible Serial Interface
  mc,rv3029c2           Real Time Clock Module with I2C-Bus
  mcube,mc3230          mCube 3-axis 8-bit digital accelerometer
 +memsic,mxc6225                MEMSIC 2-axis 8-bit digital accelerometer
  microchip,mcp4531-502 Microchip 7-bit Single I2C Digital Potentiometer (5k)
  microchip,mcp4531-103 Microchip 7-bit Single I2C Digital Potentiometer (10k)
  microchip,mcp4531-503 Microchip 7-bit Single I2C Digital Potentiometer (50k)
@@@ -124,11 -121,6 +124,11 @@@ microchip,mcp4662-502    Microchip 8-bit D
  microchip,mcp4662-103 Microchip 8-bit Dual I2C Digital Potentiometer with NV Memory (10k)
  microchip,mcp4662-503 Microchip 8-bit Dual I2C Digital Potentiometer with NV Memory (50k)
  microchip,mcp4662-104 Microchip 8-bit Dual I2C Digital Potentiometer with NV Memory (100k)
 +microchip,tc654               PWM Fan Speed Controller With Fan Fault Detection
 +microchip,tc655               PWM Fan Speed Controller With Fan Fault Detection
 +miramems,da226                MiraMEMS DA226 2-axis 14-bit digital accelerometer
 +miramems,da280                MiraMEMS DA280 3-axis 14-bit digital accelerometer
 +miramems,da311                MiraMEMS DA311 3-axis 12-bit digital accelerometer
  national,lm63         Temperature sensor with integrated fan control
  national,lm75         I2C TEMP SENSOR
  national,lm80         Serial Interface ACPI-Compatible Microprocessor System Hardware Monitor
@@@ -138,6 -130,8 +138,8 @@@ nuvoton,npct501            i2c trusted platform m
  nuvoton,npct601               i2c trusted platform module (TPM2)
  nxp,pca9556           Octal SMBus and I2C registered interface
  nxp,pca9557           8-bit I2C-bus and SMBus I/O port with reset
+ nxp,pcf2127           Real-time clock
+ nxp,pcf2129           Real-time clock
  nxp,pcf8563           Real-time clock/calendar
  nxp,pcf85063          Tiny Real-Time Clock
  oki,ml86v7667         OKI ML86V7667 video decoder
@@@ -154,7 -148,6 +156,7 @@@ ricoh,rv5c387a             I2C bus SERIAL INTERFAC
  samsung,24ad0xd1      S524AD0XF1 (128K/256K-bit Serial EEPROM for Low Power)
  sgx,vz89x             SGX Sensortech VZ89X Sensors
  sii,s35390a           2-wire CMOS real-time clock
 +silabs,si7020         Relative Humidity and Temperature Sensors
  skyworks,sky81452     Skyworks SKY81452: Six-Channel White LED Driver with Touch Panel Bias Supply
  st,24c256             i2c serial eeprom  (24cxx)
  st,m41t00             Serial real-time clock (RTC)
index 448c831753f85a3870b75539fc046b70c08aaf07,7de215da9f5585033f37f2d95bb654d5716a4397..16d3b5e7f5d1f52d1bf3c5f98220ba4f09b99b8f
@@@ -24,11 -24,9 +24,11 @@@ ampire      Ampire Co., Ltd
  ams   AMS AG
  amstaos       AMS-Taos Inc.
  analogix      Analogix Semiconductor, Inc.
 +andestech     Andes Technology Corporation
  apm   Applied Micro Circuits Corporation (APM)
  aptina        Aptina Imaging
  arasan        Arasan Chip Systems
 +aries Aries Embedded GmbH
  arm   ARM Ltd.
  armadeus      ARMadeus Systems SARL
  arrow Arrow Electronics
@@@ -41,7 -39,6 +41,7 @@@ auo   AU Optronics Corporatio
  auvidea Auvidea GmbH
  avago Avago Technologies
  avic  Shanghai AVIC Optoelectronics Co., Ltd.
 +axentia       Axentia Technologies AB
  axis  Axis Communications AB
  boe   BOE Technology Group Co., Ltd.
  bosch Bosch Sensortec GmbH
@@@ -70,7 -67,6 +70,7 @@@ creative      Creative Technology Lt
  crystalfontz  Crystalfontz America, Inc.
  cubietech     Cubietech, Ltd.
  cypress       Cypress Semiconductor Corporation
 +cznic CZ.NIC, z.s.p.o.
  dallas        Maxim Integrated Products (formerly Dallas Semiconductor)
  davicom       DAVICOM Semiconductor, Inc.
  delta Delta Electronics, Inc.
@@@ -130,7 -126,6 +130,7 @@@ hitex      Hitex Development Tool
  holt  Holt Integrated Circuits, Inc.
  honeywell     Honeywell
  hp    Hewlett Packard
 +holtek        Holtek Semiconductor, Inc.
  i2se  I2SE GmbH
  ibm   International Business Machines (IBM)
  idt   Integrated Device Technologies, Inc.
@@@ -140,7 -135,6 +140,7 @@@ infineon Infineon Technologie
  inforce       Inforce Computing
  ingenic       Ingenic Semiconductor
  innolux       Innolux Corporation
 +inside-secure INSIDE Secure
  intel Intel Corporation
  intercontrol  Inter Control Group
  invensense    InvenSense Inc.
@@@ -164,22 -158,18 +164,22 @@@ lg      LG Corporatio
  linux Linux-specific binding
  lltc  Linear Technology Corporation
  lsi   LSI Corp. (LSI Logic)
 +macnica       Macnica Americas
  marvell       Marvell Technology Group Ltd.
  maxim Maxim Integrated Products
 +mcube mCube
  meas  Measurement Specialties
  mediatek      MediaTek Inc.
  melexis       Melexis N.V.
  melfas        MELFAS Inc.
 +memsic        MEMSIC Inc.
  merrii        Merrii Technology Co., Ltd.
  micrel        Micrel Inc.
  microchip     Microchip Technology Inc.
  microcrystal  Micro Crystal AG
  micron        Micron Technology Inc.
  minix MINIX Technology Ltd.
 +miramems      MiraMEMS Sensing Technology Co., Ltd.
  mitsubishi    Mitsubishi Electric Corporation
  mosaixtech    Mosaix Technologies, Inc.
  moxa  Moxa
@@@ -190,23 -180,20 +190,24 @@@ mti     Imagination Technologies Ltd. (form
  mundoreader   Mundo Reader S.L.
  murata        Murata Manufacturing Co., Ltd.
  mxicy Macronix International Co., Ltd.
 +myir  MYIR Tech Limited
  national      National Semiconductor
  nec   NEC LCD Technologies, Ltd.
  neonode               Neonode Inc.
  netgear       NETGEAR
  netlogic      Broadcom Corporation (formerly NetLogic Microsystems)
  netxeon               Shenzhen Netxeon Technology CO., LTD
+ nexbox        Nexbox
  newhaven      Newhaven Display International
 +ni    National Instruments
  nintendo      Nintendo
  nokia Nokia
  nuvoton       Nuvoton Technology Corporation
 +nvd   New Vision Display
  nvidia        NVIDIA
  nxp   NXP Semiconductors
  okaya Okaya Electric America, Inc.
 +oki   Oki Electric Industry Co., Ltd.
  olimex        OLIMEX Ltd.
  onion Onion Corporation
  onnn  ON Semiconductor Corp.
@@@ -222,6 -209,7 +223,7 @@@ parade     Parade Technologies Inc
  pericom       Pericom Technology Inc.
  phytec        PHYTEC Messtechnik GmbH
  picochip      Picochip Ltd
+ pine64        Pine64
  pixcir  PIXCIR MICROELECTRONICS Co., Ltd
  plathome      Plat'Home Co., Ltd.
  plda  PLDA
@@@ -243,10 -231,8 +245,10 @@@ realtek Realtek Semiconductor Corp
  renesas       Renesas Electronics Corporation
  richtek       Richtek Technology Corporation
  ricoh Ricoh Co. Ltd.
 +rikomagic     Rikomagic Tech Corp. Ltd
  rockchip      Fuzhou Rockchip Electronics Co., Ltd
  samsung       Samsung Semiconductor
 +samtec        Samtec/Softing company
  sandisk       Sandisk Corporation
  sbs   Smart Battery System
  schindler     Schindler
@@@ -291,7 -277,6 +293,7 @@@ tcg        Trusted Computing Grou
  tcl   Toby Churchill Ltd.
  technexion    TechNexion
  technologic   Technologic Systems
 +terasic       Terasic Inc.
  thine THine Electronics, Inc.
  ti    Texas Instruments
  tlm   Trusted Logic Mobility
@@@ -306,7 -291,6 +308,7 @@@ tronfy     Tronf
  tronsmart     Tronsmart
  truly Truly Semiconductors Limited
  tyan  Tyan Computer Corporation
 +udoo  Udoo
  uniwest       United Western Technologies Corp (UniWest)
  upisemi       uPI Semiconductor Corp.
  urt   United Radiant Technology Corporation
diff --combined MAINTAINERS
index 3d7cf9910775a5fbdee95fb173e7a0f18cf6be51,61e164cc9fb6f6161401ab717ac9a017eb632f8a..b5f5d5b47774da8f917bf9fb4dba4319518ee2c6
@@@ -35,13 -35,13 +35,13 @@@ trivial patch so apply some common sens
  
        PLEASE check your patch with the automated style checker
        (scripts/checkpatch.pl) to catch trivial style violations.
 -      See Documentation/CodingStyle for guidance here.
 +      See Documentation/process/coding-style.rst for guidance here.
  
        PLEASE CC: the maintainers and mailing lists that are generated
        by scripts/get_maintainer.pl.  The results returned by the
        script will be best if you have git installed and are making
        your changes in a branch derived from Linus' latest git tree.
 -      See Documentation/SubmittingPatches for details.
 +      See Documentation/process/submitting-patches.rst for details.
  
        PLEASE try to include any credit lines you want added with the
        patch. It avoids people being missed off by mistake and makes
@@@ -54,7 -54,7 +54,7 @@@
        of the Linux Foundation certificate of contribution and should
        include a Signed-off-by: line.  The current version of this
        "Developer's Certificate of Origin" (DCO) is listed in the file
 -      Documentation/SubmittingPatches.
 +      Documentation/process/submitting-patches.rst.
  
  6.    Make sure you have the right to send any changes you make. If you
        do changes at work you may find your employer owns the patch
@@@ -74,14 -74,9 +74,14 @@@ Descriptions of section entries
           These reviewers should be CCed on patches.
        L: Mailing list that is relevant to this area
        W: Web-page with status/info
 +      B: URI for where to file bugs. A web-page with detailed bug
 +         filing info, a direct bug tracker link, or a mailto: URI.
 +      C: URI for chat protocol, server and channel where developers
 +         usually hang out, for example irc://server/channel.
        Q: Patchwork web based patch tracking system site
        T: SCM tree type and location.
           Type is one of: git, hg, quilt, stgit, topgit
 +      B: Bug tracking system location.
        S: Status, one of the following:
           Supported:   Someone is actually paid to look after this.
           Maintained:  Someone actually looks after it.
@@@ -260,12 -255,6 +260,12 @@@ L:       [email protected]
  S:    Maintained
  F:    drivers/gpio/gpio-104-idio-16.c
  
 +ACCES 104-QUAD-8 IIO DRIVER
 +M:    William Breathitt Gray <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/iio/counter/104-quad-8.c
 +
  ACENIC DRIVER
  M:    Jes Sorensen <[email protected]>
  L:    [email protected]
  W:    https://01.org/linux-acpi
  Q:    https://patchwork.kernel.org/project/linux-acpi/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
 +B:    https://bugzilla.kernel.org
  S:    Supported
  F:    drivers/acpi/
  F:    drivers/pnp/pnpacpi/
@@@ -316,8 -304,6 +316,8 @@@ W: https://acpica.org
  W:    https://github.com/acpica/acpica/
  Q:    https://patchwork.kernel.org/project/linux-acpi/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
 +B:    https://bugzilla.kernel.org
 +B:    https://bugs.acpica.org
  S:    Supported
  F:    drivers/acpi/acpica/
  F:    include/acpi/
@@@ -327,7 -313,6 +327,7 @@@ ACPI FAN DRIVE
  M:    Zhang Rui <[email protected]>
  L:    [email protected]
  W:    https://01.org/linux-acpi
 +B:    https://bugzilla.kernel.org
  S:    Supported
  F:    drivers/acpi/fan.c
  
@@@ -343,7 -328,6 +343,7 @@@ ACPI THERMAL DRIVE
  M:    Zhang Rui <[email protected]>
  L:    [email protected]
  W:    https://01.org/linux-acpi
 +B:    https://bugzilla.kernel.org
  S:    Supported
  F:    drivers/acpi/*thermal*
  
@@@ -351,7 -335,6 +351,7 @@@ ACPI VIDEO DRIVE
  M:    Zhang Rui <[email protected]>
  L:    [email protected]
  W:    https://01.org/linux-acpi
 +B:    https://bugzilla.kernel.org
  S:    Supported
  F:    drivers/acpi/acpi_video.c
  
@@@ -540,7 -523,6 +540,7 @@@ S: Supporte
  F:    fs/afs/
  F:    include/net/af_rxrpc.h
  F:    net/rxrpc/af_rxrpc.c
 +W:    https://www.infradead.org/~dhowells/kafs/
  
  AGPGART DRIVER
  M:    David Airlie <[email protected]>
@@@ -588,11 -570,6 +588,11 @@@ T:       git git://linuxtv.org/anttip/media_t
  S:    Maintained
  F:    drivers/media/usb/airspy/
  
 +ALACRITECH GIGABIT ETHERNET DRIVER
 +M:    Lino Sanfilippo <[email protected]>
 +S:    Maintained
 +F:    drivers/net/ethernet/alacritech/*
 +
  ALCATEL SPEEDTOUCH USB DRIVER
  M:    Duncan Sands <[email protected]>
  L:    [email protected]
@@@ -810,7 -787,7 +810,7 @@@ S: Supporte
  F:    drivers/iio/*/ad*
  X:    drivers/iio/*/adjd*
  F:    drivers/staging/iio/*/ad*
 -F:    staging/iio/trigger/iio-trig-bfin-timer.c
 +F:    drivers/staging/iio/trigger/iio-trig-bfin-timer.c
  
  ANALOG DEVICES INC DMA DRIVERS
  M:    Lars-Peter Clausen <[email protected]>
@@@ -1042,6 -1019,7 +1042,7 @@@ L:      [email protected]
  S:    Maintained
  N:    sun[x456789]i
  F:    arch/arm/boot/dts/ntc-gr8*
+ F:    arch/arm64/boot/dts/allwinner/
  
  ARM/Allwinner SoC Clock Support
  M:    Emilio López <[email protected]>
@@@ -1059,7 -1037,6 +1060,7 @@@ F:      arch/arm/mach-meson
  F:    arch/arm/boot/dts/meson*
  F:    arch/arm64/boot/dts/amlogic/
  F:    drivers/pinctrl/meson/
 +F:    drivers/mmc/host/meson*
  N:    meson
  
  ARM/Annapurna Labs ALPINE ARCHITECTURE
@@@ -1503,9 -1480,8 +1504,9 @@@ L:      [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-oxnas/
 -F:    arch/arm/boot/dts/oxnas*
 +F:    arch/arm/boot/dts/ox8*.dtsi
  F:    arch/arm/boot/dts/wd-mbwe.dts
 +F:    arch/arm/boot/dts/cloudengines-pogoplug-series-3.dts
  N:    oxnas
  
  ARM/Mediatek RTC DRIVER
@@@ -1800,16 -1776,16 +1801,16 @@@ F:   drivers/char/hw_random/st-rng.
  F:    drivers/clocksource/arm_global_timer.c
  F:    drivers/clocksource/clksrc_st_lpc.c
  F:    drivers/cpufreq/sti-cpufreq.c
 +F:    drivers/dma/st_fdma*
  F:    drivers/i2c/busses/i2c-st.c
  F:    drivers/media/rc/st_rc.c
  F:    drivers/media/platform/sti/c8sectpfe/
  F:    drivers/mmc/host/sdhci-st.c
  F:    drivers/phy/phy-miphy28lp.c
 -F:    drivers/phy/phy-miphy365x.c
  F:    drivers/phy/phy-stih407-usb.c
 -F:    drivers/phy/phy-stih41x-usb.c
  F:    drivers/pinctrl/pinctrl-st.c
  F:    drivers/remoteproc/st_remoteproc.c
 +F:    drivers/remoteproc/st_slim_rproc.c
  F:    drivers/reset/sti/
  F:    drivers/rtc/rtc-st-lpc.c
  F:    drivers/tty/serial/st-asc.c
@@@ -1818,7 -1794,6 +1819,7 @@@ F:      drivers/usb/host/ehci-st.
  F:    drivers/usb/host/ohci-st.c
  F:    drivers/watchdog/st_lpc_wdt.c
  F:    drivers/ata/ahci_st.c
 +F:    include/linux/remoteproc/st_slim_rproc.h
  
  ARM/STM32 ARCHITECTURE
  M:    Maxime Coquelin <[email protected]>
@@@ -2344,13 -2319,6 +2345,13 @@@ F:    include/uapi/linux/ax25.
  F:    include/net/ax25.h
  F:    net/ax25/
  
 +AXENTIA ASOC DRIVERS
 +M:    Peter Rosin <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/sound/axentia,*
 +F:    sound/soc/atmel/tse850-pcm5142.c
 +
  AZ6007 DVB DRIVER
  M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
@@@ -2563,8 -2531,6 +2564,8 @@@ L:      [email protected]
  L:    [email protected]
  S:    Supported
  F:    kernel/bpf/
 +F:    tools/testing/selftests/bpf/
 +F:    lib/test_bpf.c
  
  BROADCOM B44 10/100 ETHERNET DRIVER
  M:    Michael Chan <[email protected]>
@@@ -2587,18 -2553,15 +2588,18 @@@ S:   Supporte
  F:    drivers/net/ethernet/broadcom/genet/
  
  BROADCOM BNX2 GIGABIT ETHERNET DRIVER
 -M:    Sony Chacko <[email protected]>
 -M:    [email protected]
 +M:    Rasesh Mody <[email protected]>
 +M:    Harish Patil <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/broadcom/bnx2.*
  F:    drivers/net/ethernet/broadcom/bnx2_*
  
  BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER
 -M:    Ariel Elior <[email protected]>
 +M:    Yuval Mintz <[email protected]>
 +M:    Ariel Elior <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/broadcom/bnx2x/
@@@ -2625,7 -2588,6 +2626,7 @@@ L:      [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git
  S:    Maintained
  N:    bcm2835
 +F:    drivers/staging/vc04_services
  
  BROADCOM BCM47XX MIPS ARCHITECTURE
  M:    Hauke Mehrtens <[email protected]>
  S:    Maintained
  F:    drivers/mtd/nand/brcmnand/
  
 +BROADCOM STB AVS CPUFREQ DRIVER
 +M:    Markus Mayer <[email protected]>
 +M:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/cpufreq/brcm,stb-avs-cpu-freq.txt
 +F:    drivers/cpufreq/brcmstb*
 +
  BROADCOM SPECIFIC AMBA DRIVER (BCMA)
  M:    Rafał Miłecki <[email protected]>
  L:    [email protected]
@@@ -2800,7 -2754,7 +2801,7 @@@ S:      Supporte
  F:    drivers/net/ethernet/broadcom/bcmsysport.*
  
  BROADCOM VULCAN ARM64 SOC
 -M:    Jayachandran C. <jchandra@broadcom.com>
 +M:    Jayachandran C. <c.jayachandran@gmail.com>
  M:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -2814,9 -2768,7 +2815,9 @@@ S:      Supporte
  F:    drivers/scsi/bfa/
  
  BROCADE BNA 10 GIGABIT ETHERNET DRIVER
 -M:    Rasesh Mody <[email protected]>
 +M:    Rasesh Mody <[email protected]>
 +M:    Sudarsana Kalluru <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/brocade/bna/
@@@ -2974,7 -2926,7 +2975,7 @@@ CAPELLA MICROSYSTEMS LIGHT SENSOR DRIVE
  M:    Kevin Tsai <[email protected]>
  S:    Maintained
  F:    drivers/iio/light/cm*
 -F:    Documentation/devicetree/bindings/i2c/trivial-devices.txt
 +F:    Documentation/devicetree/bindings/i2c/trivial-admin-guide/devices.rst
  
  CAVIUM I2C DRIVER
  M:    Jan Glauber <[email protected]>
@@@ -3074,12 -3026,6 +3075,12 @@@ F:    drivers/usb/host/whci
  F:    drivers/usb/wusbcore/
  F:    include/linux/usb/wusb*
  
 +HT16K33 LED CONTROLLER DRIVER
 +M:    Robin van der Gracht <[email protected]>
 +S:    Maintained
 +F:    drivers/auxdisplay/ht16k33.c
 +F:    Documentation/devicetree/bindings/display/ht16k33.txt
 +
  CFAG12864B LCD DRIVER
  M:    Miguel Ojeda Sandonis <[email protected]>
  W:    http://miguelojeda.es/auxdisplay.htm
@@@ -3128,7 -3074,7 +3129,7 @@@ M:      Harry Wei <[email protected]
  L:    [email protected] (subscribers-only)
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 -F:    Documentation/zh_CN/
 +F:    Documentation/translations/zh_CN/
  
  CHIPIDEA USB HIGH SPEED DUAL ROLE CONTROLLER
  M:    Peter Chen <[email protected]>
@@@ -3199,15 -3145,15 +3200,15 @@@ S:   Supporte
  F:    drivers/clocksource
  
  CISCO FCOE HBA DRIVER
 -M:    Hiral Patel <hiralpat@cisco.com>
 -M:    Suma Ramars <sramars@cisco.com>
 -M:    Brian Uchino <buchino@cisco.com>
 +M:    Satish Kharat <satishkh@cisco.com>
 +M:    Sesidhar Baddela <sebaddel@cisco.com>
 +M:    Karan Tilak Kumar <kartilak@cisco.com>
  L:    [email protected]
  S:    Supported
  F:    drivers/scsi/fnic/
  
  CISCO SCSI HBA DRIVER
 -M:    Narsimhulu Musini <nmusini@cisco.com>
 +M:    Karan Tilak Kumar <kartilak@cisco.com>
  M:    Sesidhar Baddela <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -3384,7 -3330,6 +3385,7 @@@ L:      [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
  T:    git git://git.linaro.org/people/vireshk/linux.git (For ARM Updates)
 +B:    https://bugzilla.kernel.org
  F:    Documentation/cpu-freq/
  F:    drivers/cpufreq/
  F:    include/linux/cpufreq.h
@@@ -3424,7 -3369,6 +3425,7 @@@ M:      Daniel Lezcano <daniel.lezcano@linar
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
 +B:    https://bugzilla.kernel.org
  F:    drivers/cpuidle/*
  F:    include/linux/cpuidle.h
  
@@@ -3470,7 -3414,6 +3471,7 @@@ F:      arch/*/crypto
  F:    crypto/
  F:    drivers/crypto/
  F:    include/crypto/
 +F:    include/linux/crypto*
  
  CRYPTOGRAPHIC RANDOM NUMBER GENERATOR
  M:    Neil Horman <[email protected]>
@@@ -3964,7 -3907,7 +3965,7 @@@ F:      include/linux/dma-buf
  F:    include/linux/reservation.h
  F:    include/linux/*fence.h
  F:    Documentation/dma-buf-sharing.txt
 -T:    git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
  
  SYNC FILE FRAMEWORK
  M:    Sumit Semwal <[email protected]>
@@@ -3972,12 -3915,10 +3973,12 @@@ R:   Gustavo Padovan <[email protected]
  S:    Maintained
  L:    [email protected]
  L:    [email protected]
 -F:    drivers/dma-buf/sync_file.c
 +F:    drivers/dma-buf/sync_*
 +F:    drivers/dma-buf/sw_sync.c
  F:    include/linux/sync_file.h
 +F:    include/uapi/linux/sync_file.h
  F:    Documentation/sync_file.txt
 -T:    git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
  
  DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
  M:    Vinod Koul <[email protected]>
@@@ -4065,8 -4006,6 +4066,8 @@@ DRM DRIVER
  M:    David Airlie <[email protected]>
  L:    [email protected]
  T:    git git://people.freedesktop.org/~airlied/linux
 +B:    https://bugs.freedesktop.org/
 +C:    irc://chat.freenode.net/dri-devel
  S:    Maintained
  F:    drivers/gpu/drm/
  F:    drivers/gpu/vga/
@@@ -4077,30 -4016,11 +4078,30 @@@ F:   Documentation/gpu
  F:    include/drm/
  F:    include/uapi/drm/
  
 +DRM DRIVERS AND MISC GPU PATCHES
 +M:    Daniel Vetter <[email protected]>
 +M:    Jani Nikula <[email protected]>
 +M:    Sean Paul <[email protected]>
 +W:    https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html
 +S:    Maintained
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    Documentation/gpu/
 +F:    drivers/gpu/vga/
 +F:    drivers/gpu/drm/*
 +F:    include/drm/drm*
 +F:    include/uapi/drm/drm*
 +
  DRM DRIVER FOR AST SERVER GRAPHICS CHIPS
  M:    Dave Airlie <[email protected]>
  S:    Odd Fixes
  F:    drivers/gpu/drm/ast/
  
 +DRM DRIVERS FOR BRIDGE CHIPS
 +M:    Archit Taneja <[email protected]>
 +S:    Maintained
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    drivers/gpu/drm/bridge/
 +
  DRM DRIVER FOR BOCHS VIRTUAL GPU
  M:    Gerd Hoffmann <[email protected]>
  S:    Odd Fixes
@@@ -4136,9 -4056,8 +4137,9 @@@ INTEL DRM DRIVERS (excluding Poulsbo, M
  M:    Daniel Vetter <[email protected]>
  M:    Jani Nikula <[email protected]>
  L:    [email protected]
 -L:    [email protected]
  W:    https://01.org/linuxgraphics/
 +B:    https://01.org/linuxgraphics/documentation/how-report-bugs
 +C:    irc://chat.freenode.net/intel-gfx
  Q:    http://patchwork.freedesktop.org/project/intel-gfx/
  T:    git git://anongit.freedesktop.org/drm-intel
  S:    Supported
@@@ -4147,16 -4066,6 +4148,16 @@@ F:    include/drm/i915
  F:    include/uapi/drm/i915_drm.h
  F:    Documentation/gpu/i915.rst
  
 +INTEL GVT-g DRIVERS (Intel GPU Virtualization)
 +M:      Zhenyu Wang <[email protected]>
 +M:      Zhi Wang <[email protected]>
 +L:      [email protected]
 +L:      [email protected]
 +W:      https://01.org/igvt-g
 +T:      git https://github.com/01org/gvt-linux.git
 +S:      Supported
 +F:      drivers/gpu/drm/i915/gvt/
 +
  DRM DRIVERS FOR ATMEL HLCDC
  M:    Boris Brezillon <[email protected]>
  L:    [email protected]
@@@ -4171,15 -4080,6 +4172,15 @@@ S:    Supporte
  F:    drivers/gpu/drm/sun4i/
  F:    Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt
  
 +DRM DRIVERS FOR AMLOGIC SOCS
 +M:    Neil Armstrong <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +W:    http://linux-meson.com/
 +S:    Supported
 +F:    drivers/gpu/drm/meson/
 +F:    Documentation/devicetree/bindings/display/amlogic,meson-vpu.txt
 +
  DRM DRIVERS FOR EXYNOS
  M:    Inki Dae <[email protected]>
  M:    Joonyoung Shim <[email protected]>
@@@ -4219,7 -4119,6 +4220,7 @@@ F:      drivers/gpu/drm/gma500
  
  DRM DRIVERS FOR HISILICON
  M:    Xinliang Liu <[email protected]>
 +M:    Rongrong Zou <[email protected]>
  R:    Xinwei Kong <[email protected]>
  R:    Chen Feng <[email protected]>
  L:    [email protected]
@@@ -4344,7 -4243,6 +4345,7 @@@ DRM DRIVERS FOR VIVANTE GPU I
  M:    Lucas Stach <[email protected]>
  R:    Russell King <[email protected]>
  R:    Christian Gmeiner <[email protected]>
 +L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/gpu/drm/etnaviv/
@@@ -4385,13 -4283,6 +4386,13 @@@ S:    Maintaine
  F:    drivers/gpu/drm/tilcdc/
  F:    Documentation/devicetree/bindings/display/tilcdc/
  
 +DRM DRIVERS FOR ZTE ZX
 +M:    Shawn Guo <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/gpu/drm/zte/
 +F:    Documentation/devicetree/bindings/display/zte,vou.txt
 +
  DSBR100 USB FM RADIO DRIVER
  M:    Alexey Klimov <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git
  S:    Maintained
  F:    Documentation/efi-stub.txt
 -F:    arch/ia64/kernel/efi.c
 +F:    arch/*/kernel/efi.c
  F:    arch/x86/boot/compressed/eboot.[ch]
 -F:    arch/x86/include/asm/efi.h
 +F:    arch/*/include/asm/efi.h
  F:    arch/x86/platform/efi/
  F:    drivers/firmware/efi/
  F:    include/linux/efi*.h
 +F:    arch/arm/boot/compressed/efi-header.S
 +F:    arch/arm64/kernel/efi-entry.S
  
  EFI VARIABLE FILESYSTEM
  M:    Matthew Garrett <[email protected]>
@@@ -4795,11 -4684,11 +4796,11 @@@ M:   David Woodhouse <[email protected]
  L:    [email protected]
  S:    Maintained
  
 -EMULEX/AVAGO LPFC FC/FCOE SCSI DRIVER
 -M:    James Smart <james.smart@avagotech.com>
 -M:    Dick Kennedy <dick.kennedy@avagotech.com>
 +EMULEX/BROADCOM LPFC FC/FCOE SCSI DRIVER
 +M:    James Smart <james.smart@broadcom.com>
 +M:    Dick Kennedy <dick.kennedy@broadcom.com>
  L:    [email protected]
 -W:    http://www.avagotech.com
 +W:    http://www.broadcom.com
  S:    Supported
  F:    drivers/scsi/lpfc/
  
@@@ -5057,9 -4946,7 +5058,9 @@@ K:      fmc_d.*registe
  FPGA MANAGER FRAMEWORK
  M:    Alan Tull <[email protected]>
  R:    Moritz Fischer <[email protected]>
 +L:    [email protected]
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/atull/linux-fpga.git
  F:    drivers/fpga/
  F:    include/linux/fpga/fpga-mgr.h
  W:    http://www.rocketboards.org
@@@ -5077,9 -4964,10 +5078,9 @@@ F:     drivers/net/wan/dlci.
  F:    drivers/net/wan/sdla.c
  
  FRAMEBUFFER LAYER
 -M:    Tomi Valkeinen <[email protected]>
  L:    [email protected]
  Q:    http://patchwork.kernel.org/project/linux-fbdev/list/
 -S:    Maintained
 +S:    Orphan
  F:    Documentation/fb/
  F:    drivers/video/
  F:    include/video/
@@@ -5087,14 -4975,6 +5088,14 @@@ F:    include/linux/fb.
  F:    include/uapi/video/
  F:    include/uapi/linux/fb.h
  
 +FREESCALE CAAM (Cryptographic Acceleration and Assurance Module) DRIVER
 +M:    Horia Geantă <[email protected]>
 +M:    Dan Douglass <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/crypto/caam/
 +F:    Documentation/devicetree/bindings/crypto/fsl-sec4.txt
 +
  FREESCALE DIU FRAMEBUFFER DRIVER
  M:    Timur Tabi <[email protected]>
  L:    [email protected]
@@@ -5160,18 -5040,9 +5161,18 @@@ S:    Maintaine
  F:    drivers/net/ethernet/freescale/fman
  F:    Documentation/devicetree/bindings/powerpc/fsl/fman.txt
  
 +FREESCALE SOC DRIVERS
 +M:    Scott Wood <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/soc/fsl/
 +F:    include/linux/fsl/
 +
  FREESCALE QUICC ENGINE LIBRARY
 +M:    Qiang Zhao <[email protected]>
  L:    [email protected]
 -S:    Orphan
 +S:    Maintained
  F:    drivers/soc/fsl/qe/
  F:    include/soc/fsl/*qe*.h
  F:    include/soc/fsl/*ucc*.h
@@@ -5223,6 -5094,13 +5224,6 @@@ F:     sound/soc/fsl/fsl
  F:    sound/soc/fsl/imx*
  F:    sound/soc/fsl/mpc8610_hpcd.c
  
 -FREESCALE QORIQ MANAGEMENT COMPLEX DRIVER
 -M:    "J. German Rivera" <[email protected]>
 -M:    Stuart Yoder <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/staging/fsl-mc/
 -
  FREEVXFS FILESYSTEM
  M:    Christoph Hellwig <[email protected]>
  W:    ftp://ftp.openlinux.org/pub/people/hch/vxfs
@@@ -5256,7 -5134,6 +5257,7 @@@ F:      include/linux/fscache*.
  FS-CRYPTO: FILE SYSTEM LEVEL ENCRYPTION SUPPORT
  M:    Theodore Y. Ts'o <[email protected]>
  M:    Jaegeuk Kim <[email protected]>
 +L:    [email protected]
  S:    Supported
  F:    fs/crypto/
  F:    include/linux/fscrypto.h
@@@ -5321,7 -5198,6 +5322,7 @@@ L:      [email protected]
  S:    Maintained
  F:    scripts/gcc-plugins/
  F:    scripts/gcc-plugin.sh
 +F:    scripts/Makefile.gcc-plugins
  F:    Documentation/gcc-plugins.txt
  
  GCOV BASED KERNEL PROFILING
@@@ -5733,6 -5609,7 +5734,6 @@@ F:      drivers/watchdog/hpwdt.
  
  HEWLETT-PACKARD SMART ARRAY RAID DRIVER (hpsa)
  M:    Don Brace <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -5743,6 -5620,7 +5744,6 @@@ F:      include/uapi/linux/cciss*.
  
  HEWLETT-PACKARD SMART CISS RAID DRIVER (cciss)
  M:    Don Brace <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -5781,7 -5659,6 +5782,7 @@@ HIBERNATION (aka Software Suspend, aka 
  M:    "Rafael J. Wysocki" <[email protected]>
  M:    Pavel Machek <[email protected]>
  L:    [email protected]
 +B:    https://bugzilla.kernel.org
  S:    Supported
  F:    arch/x86/power/
  F:    drivers/base/power/
@@@ -5963,7 -5840,6 +5964,7 @@@ F:      drivers/input/serio/hyperv-keyboard.
  F:    drivers/pci/host/pci-hyperv.c
  F:    drivers/net/hyperv/
  F:    drivers/scsi/storvsc_drv.c
 +F:    drivers/uio/uio_hv_generic.c
  F:    drivers/video/fbdev/hyperv_fb.c
  F:    include/linux/hyperv.h
  F:    tools/hv/
@@@ -6207,9 -6083,14 +6208,9 @@@ S:     Maintaine
  F:    Documentation/cdrom/ide-cd
  F:    drivers/ide/ide-cd*
  
 -IDLE-I7300
 -M:    Andy Henroid <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    drivers/idle/i7300_idle.c
 -
  IEEE 802.15.4 SUBSYSTEM
  M:    Alexander Aring <[email protected]>
 +M:    Stefan Schmidt <[email protected]>
  L:    [email protected]
  W:    http://wpan.cakelab.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git
  S:    Maintained
  F:    drivers/media/rc/iguanair.c
  
 +IIO DIGITAL POTENTIOMETER DAC
 +M:    Peter Rosin <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-bus-iio-dac-dpot-dac
 +F:    Documentation/devicetree/bindings/iio/dac/dpot-dac.txt
 +F:    drivers/iio/dac/dpot-dac.c
 +
 +IIO ENVELOPE DETECTOR
 +M:    Peter Rosin <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-bus-iio-adc-envelope-detector
 +F:    Documentation/devicetree/bindings/iio/adc/envelope-detector.txt
 +F:    drivers/iio/adc/envelope-detector.c
 +
  IIO SUBSYSTEM AND DRIVERS
  M:    Jonathan Cameron <[email protected]>
  R:    Hartmut Knaack <[email protected]>
@@@ -6412,11 -6277,9 +6413,11 @@@ S:    Maintaine
  F:    drivers/platform/x86/intel-vbtn.c
  
  INTEL IDLE DRIVER
 +M:    Jacob Pan <[email protected]>
  M:    Len Brown <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git
 +B:    https://bugzilla.kernel.org
  S:    Supported
  F:    drivers/idle/intel_idle.c
  
@@@ -6514,7 -6377,10 +6515,7 @@@ F:     drivers/net/ethernet/intel/*
  
  INTEL RDMA RNIC DRIVER
  M:     Faisal Latif <[email protected]>
 -R:     Chien Tin Tung <[email protected]>
 -R:     Mustafa Ismail <[email protected]>
 -R:     Shiraz Saleem <[email protected]>
 -R:     Tatyana Nikolova <[email protected]>
 +M:     Shiraz Saleem <[email protected]>
  L:     [email protected]
  S:     Supported
  F:     drivers/infiniband/hw/i40iw/
@@@ -6633,13 -6499,6 +6634,13 @@@ S:    Maintaine
  F:    arch/x86/include/asm/pmc_core.h
  F:    drivers/platform/x86/intel_pmc_core*
  
 +INVENSENSE MPU-3050 GYROSCOPE DRIVER
 +M:    Linus Walleij <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/iio/gyro/mpu3050*
 +F:    Documentation/devicetree/bindings/iio/gyroscope/inv,mpu3050.txt
 +
  IOC3 ETHERNET DRIVER
  M:    Ralf Baechle <[email protected]>
  L:    [email protected]
@@@ -7221,7 -7080,6 +7222,7 @@@ F:      drivers/scsi/53c700
  LED SUBSYSTEM
  M:    Richard Purdie <[email protected]>
  M:    Jacek Anaszewski <[email protected]>
 +M:    Pavel Machek <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git
  S:    Maintained
@@@ -7694,10 -7552,8 +7695,10 @@@ S:    Maintaine
  MARVELL 88E6XXX ETHERNET SWITCH FABRIC DRIVER
  M:    Andrew Lunn <[email protected]>
  M:    Vivien Didelot <[email protected]>
 +L:    [email protected]
  S:    Maintained
  F:    drivers/net/dsa/mv88e6xxx/
 +F:    Documentation/devicetree/bindings/net/dsa/marvell.txt
  
  MARVELL ARMADA DRM SUPPORT
  M:    Russell King <[email protected]>
@@@ -7847,7 -7703,6 +7848,7 @@@ MCP4531 MICROCHIP DIGITAL POTENTIOMETE
  M:    Peter Rosin <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-bus-iio-potentiometer-mcp4531
  F:    drivers/iio/potentiometer/mcp4531.c
  
  MEASUREMENT COMPUTING CIO-DAC IIO DRIVER
@@@ -7979,12 -7834,12 +7980,12 @@@ S:   Maintaine
  F:    drivers/net/wireless/mediatek/mt7601u/
  
  MEGARAID SCSI/SAS DRIVERS
 -M:    Kashyap Desai <kashyap.desai@avagotech.com>
 -M:    Sumit Saxena <sumit.saxena@avagotech.com>
 -M:    Uday Lingala <uday.lingala@avagotech.com>
 -L:    megaraidlinux.pdl@avagotech.com
 +M:    Kashyap Desai <kashyap.desai@broadcom.com>
 +M:    Sumit Saxena <sumit.saxena@broadcom.com>
 +M:    Shivasharan S <shivasharan.srikanteshwara@broadcom.com>
 +L:    megaraidlinux.pdl@broadcom.com
  L:    [email protected]
 -W:    http://www.lsi.com
 +W:    http://www.avagotech.com/support/
  S:    Maintained
  F:    Documentation/scsi/megaraid.txt
  F:    drivers/scsi/megaraid.*
@@@ -8022,15 -7877,6 +8023,15 @@@ W:    http://www.mellanox.co
  Q:    http://patchwork.ozlabs.org/project/netdev/list/
  F:    drivers/net/ethernet/mellanox/mlxsw/
  
 +MELLANOX MLXCPLD I2C AND MUX DRIVER
 +M:    Vadim Pasternak <[email protected]>
 +M:    Michael Shych <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/i2c/busses/i2c-mlxcpld.c
 +F:    drivers/i2c/muxes/i2c-mux-mlxcpld.c
 +F:    Documentation/i2c/busses/i2c-mlxcpld
 +
  MELLANOX MLXCPLD LED DRIVER
  M:    Vadim Pasternak <[email protected]>
  L:    [email protected]
  S:      Supported
  F:      arch/x86/platform/mellanox/mlx-platform.c
  
 +MELLANOX MLX CPLD HOTPLUG DRIVER
 +M:    Vadim Pasternak <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/platform/x86/mlxcpld-hotplug.c
 +F:    include/linux/platform_data/mlxcpld-hotplug.h
 +
  SOFT-ROCE DRIVER (rxe)
  M:    Moni Shoua <[email protected]>
  L:    [email protected]
@@@ -8082,10 -7921,6 +8083,10 @@@ F:    mm
  MEMORY TECHNOLOGY DEVICES (MTD)
  M:    David Woodhouse <[email protected]>
  M:    Brian Norris <[email protected]>
 +M:    Boris Brezillon <[email protected]>
 +M:    Marek Vasut <[email protected]>
 +M:    Richard Weinberger <[email protected]>
 +M:    Cyrille Pitchen <[email protected]>
  L:    [email protected]
  W:    http://www.linux-mtd.infradead.org/
  Q:    http://patchwork.ozlabs.org/project/linux-mtd/list/
@@@ -8214,7 -8049,6 +8215,7 @@@ F:      drivers/infiniband/hw/mlx4
  F:    include/linux/mlx4/
  
  MELLANOX MLX5 core VPI driver
 +M:    Saeed Mahameed <[email protected]>
  M:    Matan Barak <[email protected]>
  M:    Leon Romanovsky <[email protected]>
  L:    [email protected]
@@@ -8428,12 -8262,6 +8429,12 @@@ T:    git git://linuxtv.org/mkrufky/tuners
  S:    Maintained
  F:    drivers/media/tuners/mxl5007t.*
  
 +MXSFB DRM DRIVER
 +M:    Marek Vasut <[email protected]>
 +S:    Supported
 +F:    drivers/gpu/drm/mxsfb/
 +F:    Documentation/devicetree/bindings/display/mxsfb-drm.txt
 +
  MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)
  M:    Hyong-Youb Kim <[email protected]>
  L:    [email protected]
@@@ -8480,6 -8308,7 +8481,6 @@@ F:      drivers/scsi/arm/oak.
  F:    drivers/scsi/atari_scsi.*
  F:    drivers/scsi/dmx3191d.c
  F:    drivers/scsi/g_NCR5380.*
 -F:    drivers/scsi/g_NCR5380_mmio.c
  F:    drivers/scsi/mac_scsi.*
  F:    drivers/scsi/sun3_scsi.*
  F:    drivers/scsi/sun3_scsi_vme.c
@@@ -8610,6 -8439,7 +8611,6 @@@ F:      include/uapi/linux/net_namespace.
  F:    tools/net/
  F:    tools/testing/selftests/net/
  F:    lib/random32.c
 -F:    lib/test_bpf.c
  
  NETWORKING [IPv4/IPv6]
  M:    "David S. Miller" <[email protected]>
@@@ -8688,10 -8518,11 +8689,10 @@@ F:   Documentation/devicetree/bindings/ne
  F:    drivers/net/wireless/
  
  NETXEN (1/10) GbE SUPPORT
 -M:    Manish Chopra <manish.chopra@qlogic.com>
 -M:    Sony Chacko <sony.chacko@qlogic.com>
 -M:    Rajesh Borundia <[email protected]>
 +M:    Manish Chopra <manish.chopra@cavium.com>
 +M:    Rahul Verma <rahul.verma@cavium.com>
 +M:    [email protected]
  L:    [email protected]
 -W:    http://www.qlogic.com
  S:    Supported
  F:    drivers/net/ethernet/qlogic/netxen/
  
  S:    Supported
  F:    drivers/nvme/target/
  
 +NVM EXPRESS FC TRANSPORT DRIVERS
 +M:    James Smart <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    include/linux/nvme-fc.h
 +F:    include/linux/nvme-fc-driver.h
 +F:    drivers/nvme/host/fc.c
 +F:    drivers/nvme/target/fc.c
 +F:    drivers/nvme/target/fcloop.c
 +
  NVMEM FRAMEWORK
  M:    Srinivas Kandagatla <[email protected]>
  M:    Maxime Ripard <[email protected]>
@@@ -8910,7 -8731,6 +8911,7 @@@ F:      drivers/regulator/tps65217-regulator
  F:    drivers/regulator/tps65218-regulator.c
  F:    drivers/regulator/tps65910-regulator.c
  F:    drivers/regulator/twl-regulator.c
 +F:    drivers/regulator/twl6030-regulator.c
  F:    include/linux/i2c-omap.h
  
  OMAP DEVICE TREE SUPPORT
@@@ -9131,11 -8951,9 +9132,11 @@@ F:    drivers/of/resolver.
  
  OPENRISC ARCHITECTURE
  M:    Jonas Bonn <[email protected]>
 -W:    http://openrisc.net
 +M:    Stefan Kristiansson <[email protected]>
 +M:    Stafford Horne <[email protected]>
 +L:    [email protected]
 +W:    http://openrisc.io
  S:    Maintained
 -T:    git git://openrisc.net/~jonas/linux
  F:    arch/openrisc/
  
  OPENVSWITCH
@@@ -9267,7 -9085,7 +9268,7 @@@ F:      drivers/misc/panel.
  
  PARALLEL PORT SUBSYSTEM
  M:    Sudip Mukherjee <[email protected]>
 -M:    Sudip Mukherjee <sudip@vectorindia.org>
 +M:    Sudip Mukherjee <sudip[email protected]>
  L:    [email protected] (subscribers-only)
  S:    Maintained
  F:    drivers/parport/
@@@ -9422,12 -9240,11 +9423,12 @@@ S:   Maintaine
  F:    drivers/pci/host/*layerscape*
  
  PCI DRIVER FOR IMX6
 -M:    Richard Zhu <Richard.Zhu@freescale.com>
 +M:    Richard Zhu <hongxing.zhu@nxp.com>
  M:    Lucas Stach <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 +F:    Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt
  F:    drivers/pci/host/*imx6*
  
  PCI DRIVER FOR TI KEYSTONE
@@@ -9486,11 -9303,17 +9487,11 @@@ F:   drivers/pci/host/pci-exynos.
  
  PCI DRIVER FOR SYNOPSIS DESIGNWARE
  M:    Jingoo Han <[email protected]>
 -M:    Pratyush Anand <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/pci/host/*designware*
 -
 -PCI DRIVER FOR SYNOPSYS PROTOTYPING DEVICE
 -M:    Jose Abreu <[email protected]>
 +M:    Joao Pinto <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/designware-pcie.txt
 -F:    drivers/pci/host/pcie-designware-plat.c
 +F:    drivers/pci/host/*designware*
  
  PCI DRIVER FOR GENERIC OF HOSTS
  M:    Will Deacon <[email protected]>
@@@ -9505,7 -9328,7 +9506,7 @@@ PCI DRIVER FOR INTEL VOLUME MANAGEMENT 
  M:    Keith Busch <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    arch/x86/pci/vmd.c
 +F:    drivers/pci/host/vmd.c
  
  PCIE DRIVER FOR ST SPEAR13XX
  M:    Pratyush Anand <[email protected]>
@@@ -9738,8 -9561,8 +9739,8 @@@ F:      arch/mips/boot/dts/pistachio
  F:      arch/mips/configs/pistachio*_defconfig
  
  PKTCDVD DRIVER
 -M:    Jiri Kosina <[email protected]>
 -S:    Maintained
 +S:    Orphan
 +M:    [email protected]
  F:    drivers/block/pktcdvd.c
  F:    include/linux/pktcdvd.h
  F:    include/uapi/linux/pktcdvd.h
@@@ -9792,7 -9615,6 +9793,7 @@@ POWER MANAGEMENT COR
  M:    "Rafael J. Wysocki" <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
 +B:    https://bugzilla.kernel.org
  S:    Supported
  F:    drivers/base/power/
  F:    include/linux/pm.h
@@@ -9974,7 -9796,7 +9975,7 @@@ F:      drivers/media/usb/pwc/
  
  PWM FAN DRIVER
  M:    Kamil Debski <[email protected]>
 -M:    Lukasz Majewski <l.majewski@samsung.com>
 +M:    Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
  L:    [email protected]
  S:    Supported
  F:    Documentation/devicetree/bindings/hwmon/pwm-fan.txt
@@@ -10076,32 -9898,33 +10077,32 @@@ F: Documentation/scsi/LICENSE.qla4xx
  F:    drivers/scsi/qla4xxx/
  
  QLOGIC QLA3XXX NETWORK DRIVER
 -M:    Jitendra Kalsaria <[email protected]>
 -M:    Ron Mercer <[email protected]>
 -M:    [email protected]
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    Documentation/networking/LICENSE.qla3xxx
  F:    drivers/net/ethernet/qlogic/qla3xxx.*
  
  QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
 -M:    [email protected]
 +M:    Harish Patil <[email protected]>
 +M:    Manish Chopra <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/qlogic/qlcnic/
  
  QLOGIC QLGE 10Gb ETHERNET DRIVER
 -M:    Harish Patil <[email protected]>
 -M:    Sudarsana Kalluru <[email protected]>
 -M:    [email protected]
 -M:    [email protected]
 +M:    Harish Patil <[email protected]>
 +M:    Manish Chopra <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/qlogic/qlge/
  
  QLOGIC QL4xxx ETHERNET DRIVER
 -M:    Yuval Mintz <Yuval.Mintz@qlogic.com>
 -M:    Ariel Elior <Ariel.Elior@qlogic.com>
 -M:    everest-linux-l2@qlogic.com
 +M:    Yuval Mintz <Yuval.Mintz@cavium.com>
 +M:    Ariel Elior <Ariel.Elior@cavium.com>
 +M:    everest-linux-l2@cavium.com
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/qlogic/qed/
@@@ -10116,12 -9939,6 +10117,12 @@@ F:  fs/qnx4
  F:    include/uapi/linux/qnx4_fs.h
  F:    include/uapi/linux/qnxtypes.h
  
 +QORIQ DPAA2 FSL-MC BUS DRIVER
 +M:    Stuart Yoder <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/staging/fsl-mc/
 +
  QT1010 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
@@@ -10584,7 -10401,7 +10585,7 @@@ F:   arch/s390/pci
  F:    drivers/pci/hotplug/s390_pci_hpc.c
  
  S390 ZCRYPT DRIVER
 -M:    Ingo Tuchscherer <ingo.tuchscherer@de.ibm.com>
 +M:    Harald Freudenberger <freude@de.ibm.com>
  L:    [email protected]
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
  F:    drivers/net/ethernet/samsung/sxgbe/
  
  SAMSUNG THERMAL DRIVER
 -M:    Lukasz Majewski <l.majewski@samsung.com>
 +M:    Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -10877,11 -10694,6 +10878,11 @@@ W: http://www.sunplus.co
  S:    Supported
  F:    arch/score/
  
 +SCR24X CHIP CARD INTERFACE DRIVER
 +M:    Lubomir Rintel <[email protected]>
 +S:    Supported
 +F:    drivers/char/pcmcia/scr24x_cs.c
 +
  SYSTEM CONTROL & POWER INTERFACE (SCPI) Message Protocol drivers
  M:    Sudeep Holla <[email protected]>
  L:    [email protected]
@@@ -11090,6 -10902,7 +11091,6 @@@ F:   drivers/net/ethernet/emulex/benet
  EMULEX ONECONNECT ROCE DRIVER
  M:    Selvin Xavier <[email protected]>
  M:    Devesh Sharma <[email protected]>
 -M:    Mitesh Ahuja <[email protected]>
  L:    [email protected]
  W:    http://www.emulex.com
  S:    Supported
@@@ -11284,7 -11097,7 +11285,7 @@@ F:   include/media/i2c/ov2659.
  SILICON MOTION SM712 FRAME BUFFER DRIVER
  M:    Sudip Mukherjee <[email protected]>
  M:    Teddy Wang <[email protected]>
 -M:    Sudip Mukherjee <sudip@vectorindia.org>
 +M:    Sudip Mukherjee <sudip[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/video/fbdev/sm712*
@@@ -11589,17 -11402,6 +11590,17 @@@ W: http://www.st.com/spea
  S:    Maintained
  F:    drivers/clk/spear/
  
 +SPI NOR SUBSYSTEM
 +M:    Cyrille Pitchen <[email protected]>
 +M:    Marek Vasut <[email protected]>
 +L:    [email protected]
 +W:    http://www.linux-mtd.infradead.org/
 +Q:    http://patchwork.ozlabs.org/project/linux-mtd/list/
 +T:    git git://github.com/spi-nor/linux.git
 +S:    Maintained
 +F:    drivers/mtd/spi-nor/
 +F:    include/linux/mtd/spi-nor.h
 +
  SPI SUBSYSTEM
  M:    Mark Brown <[email protected]>
  L:    [email protected]
@@@ -11646,7 -11448,7 +11647,7 @@@ STABLE BRANC
  M:    Greg Kroah-Hartman <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    Documentation/stable_kernel_rules.txt
 +F:    Documentation/process/stable-kernel-rules.rst
  
  STAGING SUBSYSTEM
  M:    Greg Kroah-Hartman <[email protected]>
@@@ -11712,11 -11514,17 +11713,11 @@@ F:        drivers/staging/rtl8712
  STAGING - SILICON MOTION SM750 FRAME BUFFER DRIVER
  M:    Sudip Mukherjee <[email protected]>
  M:    Teddy Wang <[email protected]>
 -M:    Sudip Mukherjee <sudip@vectorindia.org>
 +M:    Sudip Mukherjee <sudip[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/staging/sm750fb/
  
 -STAGING - SLICOSS
 -M:    Lior Dotan <[email protected]>
 -M:    Christopher Harrer <[email protected]>
 -S:    Odd Fixes
 -F:    drivers/staging/slicoss/
 -
  STAGING - SPEAKUP CONSOLE SPEECH DRIVER
  M:    William Hubbs <[email protected]>
  M:    Chris Brannon <[email protected]>
@@@ -11786,7 -11594,6 +11787,7 @@@ M:   "Rafael J. Wysocki" <[email protected]
  M:    Len Brown <[email protected]>
  M:    Pavel Machek <[email protected]>
  L:    [email protected]
 +B:    https://bugzilla.kernel.org
  S:    Supported
  F:    Documentation/power/
  F:    arch/x86/kernel/acpi/
@@@ -11826,7 -11633,6 +11827,7 @@@ S:   Supporte
  F:    arch/arc/
  F:    Documentation/devicetree/bindings/arc/*
  F:    Documentation/devicetree/bindings/interrupt-controller/snps,arc*
 +F:    drivers/clocksource/arc_timer.c
  F:    drivers/tty/serial/arc_uart.c
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git
  
@@@ -12517,12 -12323,6 +12518,12 @@@ S: Maintaine
  F:    Documentation/filesystems/udf.txt
  F:    fs/udf/
  
 +UDRAW TABLET
 +M:    Bastien Nocera <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/hid/hid-udraw.c
 +
  UFS FILESYSTEM
  M:    Evgeniy Dushistov <[email protected]>
  S:    Maintained
@@@ -12579,8 -12379,7 +12580,8 @@@ F:   Documentation/scsi/ufs.tx
  F:    drivers/scsi/ufs/
  
  UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER DWC HOOKS
 -M:    Joao Pinto <[email protected]>
 +M:    Manjunath M Bettegowda <[email protected]>
 +M:    Prabu Thangamuthu <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/scsi/ufs/*dwc*
@@@ -12938,15 -12737,6 +12939,15 @@@ F: drivers/vfio
  F:    include/linux/vfio.h
  F:    include/uapi/linux/vfio.h
  
 +VFIO MEDIATED DEVICE DRIVERS
 +M:    Kirti Wankhede <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/vfio-mediated-device.txt
 +F:    drivers/vfio/mdev/
 +F:    include/linux/mdev.h
 +F:    samples/vfio-mdev/
 +
  VFIO PLATFORM DRIVER
  M:    Baptiste Reynal <[email protected]>
  L:    [email protected]
@@@ -12991,7 -12781,6 +12992,7 @@@ F:   include/uapi/linux/virtio_console.
  
  VIRTIO CORE, NET AND BLOCK DRIVERS
  M:    "Michael S. Tsirkin" <[email protected]>
 +M:    Jason Wang <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/virtio/
@@@ -13022,7 -12811,6 +13023,7 @@@ F:   include/uapi/linux/virtio_gpu.
  
  VIRTIO HOST (VHOST)
  M:    "Michael S. Tsirkin" <[email protected]>
 +M:    Jason Wang <[email protected]>
  L:    [email protected]
  L:    [email protected]
  L:    [email protected]
@@@ -13099,7 -12887,7 +13100,7 @@@ M:   Greg Kroah-Hartman <gregkh@linuxfoun
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git
 -F:    Documentation/vme_api.txt
 +F:    Documentation/driver-api/vme.rst
  F:    drivers/staging/vme/
  F:    drivers/vme/
  F:    include/linux/vme*
@@@ -13141,13 -12929,6 +13142,13 @@@ S: Maintaine
  F:    drivers/scsi/vmw_pvscsi.c
  F:    drivers/scsi/vmw_pvscsi.h
  
 +VMWARE PVRDMA DRIVER
 +M:    Adit Ranadive <[email protected]>
 +M:    VMware PV-Drivers <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/infiniband/hw/vmw_pvrdma/
 +
  VOLTAGE AND CURRENT REGULATOR FRAMEWORK
  M:    Liam Girdwood <[email protected]>
  M:    Mark Brown <[email protected]>
@@@ -13330,7 -13111,7 +13331,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    include/linux/workqueue.h
  F:    kernel/workqueue.c
 -F:    Documentation/workqueue.txt
 +F:    Documentation/core-api/workqueue.rst
  
  X-POWERS MULTIFUNCTION PMIC DEVICE DRIVERS
  M:    Chen-Yu Tsai <[email protected]>
@@@ -13395,6 -13176,7 +13396,6 @@@ F:   drivers/media/tuners/tuner-xc2028.
  
  XEN HYPERVISOR INTERFACE
  M:    Boris Ostrovsky <[email protected]>
 -M:    David Vrabel <[email protected]>
  M:    Juergen Gross <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git
index 7d3a2acc6a553471d66a2bd71ce53e8c36e10aeb,100810a8b9298072d4ef18b92d23a59187c6c9af..7d832247d0dbca1418d07a11ab34ffe2c8f0734d
                clock-names = "apb_pclk";
        };
  
+       smmu_pcie: iommu@2b500000 {
+               compatible = "arm,mmu-401", "arm,smmu-v1";
+               reg = <0x0 0x2b500000 0x0 0x10000>;
+               interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
+               #iommu-cells = <1>;
+               #global-interrupts = <1>;
+               dma-coherent;
+               status = "disabled";
+       };
+       smmu_etr: iommu@2b600000 {
+               compatible = "arm,mmu-401", "arm,smmu-v1";
+               reg = <0x0 0x2b600000 0x0 0x10000>;
+               interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;
+               #iommu-cells = <1>;
+               #global-interrupts = <1>;
+               dma-coherent;
+               status = "disabled";
+       };
        gic: interrupt-controller@2c010000 {
                compatible = "arm,gic-400", "arm,cortex-a15-gic";
                reg = <0x0 0x2c010000 0 0x1000>,
        etr@20070000 {
                compatible = "arm,coresight-tmc", "arm,primecell";
                reg = <0 0x20070000 0 0x1000>;
+               iommus = <&smmu_etr 0>;
  
                clocks = <&soc_smc50mhz>;
                clock-names = "apb_pclk";
                #address-cells = <3>;
                #size-cells = <2>;
                dma-coherent;
 -              ranges = <0x01000000 0x00 0x5f800000 0x00 0x5f800000 0x0 0x00800000>,
 +              ranges = <0x01000000 0x00 0x00000000 0x00 0x5f800000 0x0 0x00800000>,
                         <0x02000000 0x00 0x50000000 0x00 0x50000000 0x0 0x08000000>,
                         <0x42000000 0x40 0x00000000 0x40 0x00000000 0x1 0x00000000>;
                #interrupt-cells = <1>;
                                <0 0 0 4 &gic 0 0 0 139 4>;
                msi-parent = <&v2m_0>;
                status = "disabled";
+               iommu-map-mask = <0x0>; /* RC has no means to output PCI RID */
+               iommu-map = <0x0 &smmu_pcie 0x0 0x1>;
        };
  
        scpi {
  
        /include/ "juno-clocks.dtsi"
  
+       smmu_dma: iommu@7fb00000 {
+               compatible = "arm,mmu-401", "arm,smmu-v1";
+               reg = <0x0 0x7fb00000 0x0 0x10000>;
+               interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;
+               #iommu-cells = <1>;
+               #global-interrupts = <1>;
+               dma-coherent;
+               status = "disabled";
+       };
+       smmu_hdlcd1: iommu@7fb10000 {
+               compatible = "arm,mmu-401", "arm,smmu-v1";
+               reg = <0x0 0x7fb10000 0x0 0x10000>;
+               interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;
+               #iommu-cells = <1>;
+               #global-interrupts = <1>;
+               status = "disabled";
+       };
+       smmu_hdlcd0: iommu@7fb20000 {
+               compatible = "arm,mmu-401", "arm,smmu-v1";
+               reg = <0x0 0x7fb20000 0x0 0x10000>;
+               interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
+               #iommu-cells = <1>;
+               #global-interrupts = <1>;
+               status = "disabled";
+       };
+       smmu_usb: iommu@7fb30000 {
+               compatible = "arm,mmu-401", "arm,smmu-v1";
+               reg = <0x0 0x7fb30000 0x0 0x10000>;
+               interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
+               #iommu-cells = <1>;
+               #global-interrupts = <1>;
+               dma-coherent;
+               status = "disabled";
+       };
        dma@7ff00000 {
                compatible = "arm,pl330", "arm,primecell";
                reg = <0x0 0x7ff00000 0 0x1000>;
                             <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;
+               iommus = <&smmu_dma 0>,
+                        <&smmu_dma 1>,
+                        <&smmu_dma 2>,
+                        <&smmu_dma 3>,
+                        <&smmu_dma 4>,
+                        <&smmu_dma 5>,
+                        <&smmu_dma 6>,
+                        <&smmu_dma 7>,
+                        <&smmu_dma 8>;
                clocks = <&soc_faxiclk>;
                clock-names = "apb_pclk";
        };
                compatible = "arm,hdlcd";
                reg = <0 0x7ff50000 0 0x1000>;
                interrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>;
+               iommus = <&smmu_hdlcd1 0>;
                clocks = <&scpi_clk 3>;
                clock-names = "pxlclk";
  
                compatible = "arm,hdlcd";
                reg = <0 0x7ff60000 0 0x1000>;
                interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
+               iommus = <&smmu_hdlcd0 0>;
                clocks = <&scpi_clk 3>;
                clock-names = "pxlclk";
  
                compatible = "generic-ohci";
                reg = <0x0 0x7ffb0000 0x0 0x10000>;
                interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>;
+               iommus = <&smmu_usb 0>;
                clocks = <&soc_usb48mhz>;
        };
  
                compatible = "generic-ehci";
                reg = <0x0 0x7ffc0000 0x0 0x10000>;
                interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;
+               iommus = <&smmu_usb 0>;
                clocks = <&soc_usb48mhz>;
        };
  
index f0b857d6d73cc9595504b266f9cf197d9b1be5be,3be8a3ef671c02019d50a62fad6585166f0281d5..eec37feee8fcbd65f72775cc791ded7be84fce32
@@@ -76,7 -76,7 +76,7 @@@
                                compatible = "arm,idle-state";
                                arm,psci-suspend-param = <0x1010000>;
                                local-timer-stop;
 -                              entry-latency-us = <300>;
 +                              entry-latency-us = <400>;
                                exit-latency-us = <1200>;
                                min-residency-us = <2500>;
                        };
@@@ -90,6 -90,7 +90,7 @@@
                        next-level-cache = <&A57_L2>;
                        clocks = <&scpi_dvfs 0>;
                        cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
+                       capacity-dmips-mhz = <1024>;
                };
  
                A57_1: cpu@1 {
                        next-level-cache = <&A57_L2>;
                        clocks = <&scpi_dvfs 0>;
                        cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
+                       capacity-dmips-mhz = <1024>;
                };
  
                A53_0: cpu@100 {
                        next-level-cache = <&A53_L2>;
                        clocks = <&scpi_dvfs 1>;
                        cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
+                       capacity-dmips-mhz = <578>;
                };
  
                A53_1: cpu@101 {
                        next-level-cache = <&A53_L2>;
                        clocks = <&scpi_dvfs 1>;
                        cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
+                       capacity-dmips-mhz = <578>;
                };
  
                A53_2: cpu@102 {
                        next-level-cache = <&A53_L2>;
                        clocks = <&scpi_dvfs 1>;
                        cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
+                       capacity-dmips-mhz = <578>;
                };
  
                A53_3: cpu@103 {
                        next-level-cache = <&A53_L2>;
                        clocks = <&scpi_dvfs 1>;
                        cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
+                       capacity-dmips-mhz = <578>;
                };
  
                A57_L2: l2-cache0 {
index 26aaa6a7670f10b3f8cba5ea91bc214c4ba7241b,614fc92279435c79c7af457fc2039177e2a15033..28f40ec44090ecda65d0c3ad65525c93166dc828
@@@ -76,7 -76,7 +76,7 @@@
                                compatible = "arm,idle-state";
                                arm,psci-suspend-param = <0x1010000>;
                                local-timer-stop;
 -                              entry-latency-us = <300>;
 +                              entry-latency-us = <400>;
                                exit-latency-us = <1200>;
                                min-residency-us = <2500>;
                        };
@@@ -90,6 -90,7 +90,7 @@@
                        next-level-cache = <&A72_L2>;
                        clocks = <&scpi_dvfs 0>;
                        cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
+                       capacity-dmips-mhz = <1024>;
                };
  
                A72_1: cpu@1 {
                        next-level-cache = <&A72_L2>;
                        clocks = <&scpi_dvfs 0>;
                        cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
+                       capacity-dmips-mhz = <1024>;
                };
  
                A53_0: cpu@100 {
                        next-level-cache = <&A53_L2>;
                        clocks = <&scpi_dvfs 1>;
                        cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
+                       capacity-dmips-mhz = <485>;
                };
  
                A53_1: cpu@101 {
                        next-level-cache = <&A53_L2>;
                        clocks = <&scpi_dvfs 1>;
                        cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
+                       capacity-dmips-mhz = <485>;
                };
  
                A53_2: cpu@102 {
                        next-level-cache = <&A53_L2>;
                        clocks = <&scpi_dvfs 1>;
                        cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
+                       capacity-dmips-mhz = <485>;
                };
  
                A53_3: cpu@103 {
                        next-level-cache = <&A53_L2>;
                        clocks = <&scpi_dvfs 1>;
                        cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
+                       capacity-dmips-mhz = <485>;
                };
  
                A72_L2: l2-cache0 {
index 6e154d948a80b9fa4e79739fff85ed6fb65dc092,6b4135e9cfe5a8534144125c76a5efbea2fce56d..ac5ceb73f45fb9d2b9be24e81b6afbfdf8a09a82
@@@ -76,7 -76,7 +76,7 @@@
                                compatible = "arm,idle-state";
                                arm,psci-suspend-param = <0x1010000>;
                                local-timer-stop;
 -                              entry-latency-us = <300>;
 +                              entry-latency-us = <400>;
                                exit-latency-us = <1200>;
                                min-residency-us = <2500>;
                        };
@@@ -90,6 -90,7 +90,7 @@@
                        next-level-cache = <&A57_L2>;
                        clocks = <&scpi_dvfs 0>;
                        cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
+                       capacity-dmips-mhz = <1024>;
                };
  
                A57_1: cpu@1 {
                        next-level-cache = <&A57_L2>;
                        clocks = <&scpi_dvfs 0>;
                        cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
+                       capacity-dmips-mhz = <1024>;
                };
  
                A53_0: cpu@100 {
                        next-level-cache = <&A53_L2>;
                        clocks = <&scpi_dvfs 1>;
                        cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
+                       capacity-dmips-mhz = <578>;
                };
  
                A53_1: cpu@101 {
                        next-level-cache = <&A53_L2>;
                        clocks = <&scpi_dvfs 1>;
                        cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
+                       capacity-dmips-mhz = <578>;
                };
  
                A53_2: cpu@102 {
                        next-level-cache = <&A53_L2>;
                        clocks = <&scpi_dvfs 1>;
                        cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
+                       capacity-dmips-mhz = <578>;
                };
  
                A53_3: cpu@103 {
                        next-level-cache = <&A53_L2>;
                        clocks = <&scpi_dvfs 1>;
                        cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
+                       capacity-dmips-mhz = <578>;
                };
  
                A57_L2: l2-cache0 {
index c4d544244b19734d9341e0555c0607234c9b81f8,34619079a6c6c2f14f077cf75e2fe6a0704d8124..de8d379f44e2e490383d0f6059306b648320a149
        };
  };
  
 +&enet {
 +      status = "ok";
 +};
 +
  &pci_phy0 {
        status = "ok";
  };
        status = "ok";
  };
  
+ &sdio1 {
+       status = "ok";
+ };
  &nand {
        nandcs@0 {
                compatible = "brcm,nandcs";
  &mdio_mux_iproc {
        mdio@10 {
                gphy0: eth-phy@10 {
 +                      enet-phy-lane-swap;
                        reg = <0x10>;
                };
        };
                groups = "nand_grp";
        };
  };
+ &qspi {
+       bspi-sel = <0>;
+       flash: m25p80@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "m25p80";
+               reg = <0x0>;
+               spi-max-frequency = <12500000>;
+               m25p,fast-read;
+               spi-cpol;
+               spi-cpha;
+               partition@0 {
+                       label = "boot";
+                       reg = <0x00000000 0x000a0000>;
+               };
+               partition@a0000 {
+                       label = "env";
+                       reg = <0x000a0000 0x00060000>;
+               };
+               partition@100000 {
+                       label = "system";
+                       reg = <0x00100000 0x00600000>;
+               };
+               partition@700000 {
+                       label = "rootfs";
+                       reg = <0x00700000 0x01900000>;
+               };
+       };
+ };
index 773ed593da4d976b7d65374e71a0eab1f823a025,863503d78f57e0830d591b6c66f2670840de70a1..4fcdeca3a983e2d4489cb3347f6973a4b1c22952
  
                status = "disabled";
  
+               phys = <&pci_phy0>;
+               phy-names = "pcie-phy";
                msi-parent = <&msi0>;
                msi0: msi@20020000 {
                        compatible = "brcm,iproc-msi";
  
                status = "disabled";
  
+               phys = <&pci_phy1>;
+               phy-names = "pcie-phy";
                msi-parent = <&msi4>;
                msi4: msi@50020000 {
                        compatible = "brcm,iproc-msi";
  
                #include "ns2-clock.dtsi"
  
 +              enet: ethernet@61000000 {
 +                      compatible = "brcm,ns2-amac";
 +                      reg = <0x61000000 0x1000>,
 +                            <0x61090000 0x1000>,
 +                            <0x61030000 0x100>;
 +                      reg-names = "amac_base", "idm_base", "nicpm_base";
 +                      interrupts = <GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH>;
 +                      phy-handle = <&gphy0>;
 +                      phy-mode = "rgmii";
 +                      status = "disabled";
 +              };
 +
+               pdc0: iproc-pdc0@612c0000 {
+                       compatible = "brcm,iproc-pdc-mbox";
+                       reg = <0x612c0000 0x445>;  /* PDC FS0 regs */
+                       interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
+                       #mbox-cells = <1>;
+                       brcm,rx-status-len = <32>;
+                       brcm,use-bcm-hdr;
+               };
+               pdc1: iproc-pdc1@612e0000 {
+                       compatible = "brcm,iproc-pdc-mbox";
+                       reg = <0x612e0000 0x445>;  /* PDC FS1 regs */
+                       interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>;
+                       #mbox-cells = <1>;
+                       brcm,rx-status-len = <32>;
+                       brcm,use-bcm-hdr;
+               };
+               pdc2: iproc-pdc2@61300000 {
+                       compatible = "brcm,iproc-pdc-mbox";
+                       reg = <0x61300000 0x445>;  /* PDC FS2 regs */
+                       interrupts = <GIC_SPI 191 IRQ_TYPE_LEVEL_HIGH>;
+                       #mbox-cells = <1>;
+                       brcm,rx-status-len = <32>;
+                       brcm,use-bcm-hdr;
+               };
+               pdc3: iproc-pdc3@61320000 {
+                       compatible = "brcm,iproc-pdc-mbox";
+                       reg = <0x61320000 0x445>;  /* PDC FS3 regs */
+                       interrupts = <GIC_SPI 193 IRQ_TYPE_LEVEL_HIGH>;
+                       #mbox-cells = <1>;
+                       brcm,rx-status-len = <32>;
+                       brcm,use-bcm-hdr;
+               };
                dma0: dma@61360000 {
                        compatible = "arm,pl330", "arm,primecell";
                        reg = <0x61360000 0x1000>;
                                     <GIC_SPI 260 IRQ_TYPE_LEVEL_HIGH>,
                                     <GIC_SPI 261 IRQ_TYPE_LEVEL_HIGH>,
                                     <GIC_SPI 262 IRQ_TYPE_LEVEL_HIGH>;
-                       mmu-masters;
+                       #iommu-cells = <1>;
                };
  
                pinctrl: pinctrl@6501d130 {
  
                        brcm,nand-has-wp;
                };
+               qspi: spi@66470200 {
+                       compatible = "brcm,spi-bcm-qspi", "brcm,spi-ns2-qspi";
+                       reg = <0x66470200 0x184>,
+                               <0x66470000 0x124>,
+                               <0x67017408 0x004>,
+                               <0x664703a0 0x01c>;
+                       reg-names = "mspi", "bspi", "intr_regs",
+                               "intr_status_reg";
+                       interrupts = <GIC_SPI 419 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "spi_l1_intr";
+                       clocks = <&iprocmed>;
+                       clock-names = "iprocmed";
+                       num-cs = <2>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+               };
        };
  };
index d058e56db72d46f8d6b9cd4444c76219ffd0e9ef,aa5a0fbf2cdff765340098868ae249bb4966cee2..e5935f28848c564ae3627c6314248dc82070bcbc
@@@ -44,6 -44,8 +44,8 @@@
   *     OTHER DEALINGS IN THE SOFTWARE.
   */
  
+ #include <dt-bindings/thermal/thermal.h>
  / {
        compatible = "fsl,ls2080a";
        interrupt-parent = <&gic>;
                 */
  
                /* We have 4 clusters having 2 Cortex-A57 cores each */
-               cpu@0 {
+               cpu0: cpu@0 {
                        device_type = "cpu";
                        compatible = "arm,cortex-a57";
                        reg = <0x0>;
                        clocks = <&clockgen 1 0>;
                        next-level-cache = <&cluster0_l2>;
+                       #cooling-cells = <2>;
                };
  
-               cpu@1 {
+               cpu1: cpu@1 {
                        device_type = "cpu";
                        compatible = "arm,cortex-a57";
                        reg = <0x1>;
                        next-level-cache = <&cluster0_l2>;
                };
  
-               cpu@100 {
+               cpu2: cpu@100 {
                        device_type = "cpu";
                        compatible = "arm,cortex-a57";
                        reg = <0x100>;
                        clocks = <&clockgen 1 1>;
                        next-level-cache = <&cluster1_l2>;
+                       #cooling-cells = <2>;
                };
  
-               cpu@101 {
+               cpu3: cpu@101 {
                        device_type = "cpu";
                        compatible = "arm,cortex-a57";
                        reg = <0x101>;
                        next-level-cache = <&cluster1_l2>;
                };
  
-               cpu@200 {
+               cpu4: cpu@200 {
                        device_type = "cpu";
                        compatible = "arm,cortex-a57";
                        reg = <0x200>;
                        clocks = <&clockgen 1 2>;
                        next-level-cache = <&cluster2_l2>;
+                       #cooling-cells = <2>;
                };
  
-               cpu@201 {
+               cpu5: cpu@201 {
                        device_type = "cpu";
                        compatible = "arm,cortex-a57";
                        reg = <0x201>;
                        next-level-cache = <&cluster2_l2>;
                };
  
-               cpu@300 {
+               cpu6: cpu@300 {
                        device_type = "cpu";
                        compatible = "arm,cortex-a57";
                        reg = <0x300>;
                        clocks = <&clockgen 1 3>;
                        next-level-cache = <&cluster3_l2>;
+                       #cooling-cells = <2>;
                };
  
-               cpu@301 {
+               cpu7: cpu@301 {
                        device_type = "cpu";
                        compatible = "arm,cortex-a57";
                        reg = <0x301>;
                        clocks = <&sysclk>;
                };
  
 +              dcfg: dcfg@1e00000 {
 +                      compatible = "fsl,ls2080a-dcfg", "syscon";
 +                      reg = <0x0 0x1e00000 0x0 0x10000>;
 +                      little-endian;
 +              };
 +
+               tmu: tmu@1f80000 {
+                       compatible = "fsl,qoriq-tmu";
+                       reg = <0x0 0x1f80000 0x0 0x10000>;
+                       interrupts = <0 23 0x4>;
+                       fsl,tmu-range = <0xb0000 0x9002a 0x6004c 0x30062>;
+                       fsl,tmu-calibration = <0x00000000 0x00000026
+                                              0x00000001 0x0000002d
+                                              0x00000002 0x00000032
+                                              0x00000003 0x00000039
+                                              0x00000004 0x0000003f
+                                              0x00000005 0x00000046
+                                              0x00000006 0x0000004d
+                                              0x00000007 0x00000054
+                                              0x00000008 0x0000005a
+                                              0x00000009 0x00000061
+                                              0x0000000a 0x0000006a
+                                              0x0000000b 0x00000071
+                                              0x00010000 0x00000025
+                                              0x00010001 0x0000002c
+                                              0x00010002 0x00000035
+                                              0x00010003 0x0000003d
+                                              0x00010004 0x00000045
+                                              0x00010005 0x0000004e
+                                              0x00010006 0x00000057
+                                              0x00010007 0x00000061
+                                              0x00010008 0x0000006b
+                                              0x00010009 0x00000076
+                                              0x00020000 0x00000029
+                                              0x00020001 0x00000033
+                                              0x00020002 0x0000003d
+                                              0x00020003 0x00000049
+                                              0x00020004 0x00000056
+                                              0x00020005 0x00000061
+                                              0x00020006 0x0000006d
+                                              0x00030000 0x00000021
+                                              0x00030001 0x0000002a
+                                              0x00030002 0x0000003c
+                                              0x00030003 0x0000004e>;
+                       little-endian;
+                       #thermal-sensor-cells = <1>;
+               };
+               thermal-zones {
+                       cpu_thermal: cpu-thermal {
+                               polling-delay-passive = <1000>;
+                               polling-delay = <5000>;
+                               thermal-sensors = <&tmu 4>;
+                               trips {
+                                       cpu_alert: cpu-alert {
+                                               temperature = <75000>;
+                                               hysteresis = <2000>;
+                                               type = "passive";
+                                       };
+                                       cpu_crit: cpu-crit {
+                                               temperature = <85000>;
+                                               hysteresis = <2000>;
+                                               type = "critical";
+                                       };
+                               };
+                               cooling-maps {
+                                       map0 {
+                                               trip = <&cpu_alert>;
+                                               cooling-device =
+                                                       <&cpu0 THERMAL_NO_LIMIT
+                                                       THERMAL_NO_LIMIT>;
+                                       };
+                                       map1 {
+                                               trip = <&cpu_alert>;
+                                               cooling-device =
+                                                       <&cpu2 THERMAL_NO_LIMIT
+                                                       THERMAL_NO_LIMIT>;
+                                       };
+                                       map2 {
+                                               trip = <&cpu_alert>;
+                                               cooling-device =
+                                                       <&cpu4 THERMAL_NO_LIMIT
+                                                       THERMAL_NO_LIMIT>;
+                                       };
+                                       map3 {
+                                               trip = <&cpu_alert>;
+                                               cooling-device =
+                                                       <&cpu6 THERMAL_NO_LIMIT
+                                                       THERMAL_NO_LIMIT>;
+                                       };
+                               };
+                       };
+               };
                serial0: serial@21c0500 {
                        compatible = "fsl,ns16550", "ns16550a";
                        reg = <0x0 0x21c0500 0x0 0x100>;
index a59d36cd6caf05f95ce90cbc539aa7e455bc6372,a260ae25b6585a31d340b5df647cf017f6338428..89de0a751093575b376ea381c8ba6e1ddc078aa3
@@@ -56,7 -56,7 +56,7 @@@
                stdout-path = "serial0:115200n8";
        };
  
-       memory {
+       memory@0 {
                device_type = "memory";
                reg = <0x00000000 0x00000000 0x00000000 0x20000000>;
        };
  &pcie0 {
        status = "okay";
  };
 +
 +&mdio {
 +      status = "okay";
 +      phy0: ethernet-phy@0 {
 +              reg = <0>;
 +      };
 +
 +      phy1: ethernet-phy@1 {
 +              reg = <1>;
 +      };
 +};
 +
 +&eth0 {
 +      phy-mode = "rgmii-id";
 +      phy = <&phy0>;
 +      status = "okay";
 +};
 +
 +&eth1 {
 +      phy-mode = "sgmii";
 +      phy = <&phy1>;
 +      status = "okay";
 +};
index 3b8eb45bdc7667b71fa8405397f977ea0f4a9b67,f1596daa2bc7b9e282b93fcfce7f052045200b13..bab5c6ff5745fdca0d392da9c7f5fe4963e8f79f
@@@ -91,7 -91,7 +91,7 @@@
                #size-cells = <2>;
                ranges;
  
-               internal-regs {
+               internal-regs@d0000000 {
                        #address-cells = <1>;
                        #size-cells = <1>;
                        compatible = "simple-bus";
                                status = "disabled";
                        };
  
 -                      nb_perih_clk: nb-periph-clk@13000{
 +                      nb_periph_clk: nb-periph-clk@13000 {
                                compatible = "marvell,armada-3700-periph-clock-nb";
                                reg = <0x13000 0x100>;
                                clocks = <&tbg 0>, <&tbg 1>, <&tbg 2>,
                                #clock-cells = <1>;
                        };
  
 -                      sb_perih_clk: sb-periph-clk@18000{
 +                      sb_periph_clk: sb-periph-clk@18000 {
                                compatible = "marvell,armada-3700-periph-clock-sb";
                                reg = <0x18000 0x100>;
                                clocks = <&tbg 0>, <&tbg 1>, <&tbg 2>,
                                };
                        };
  
 +                      eth0: ethernet@30000 {
 +                                 compatible = "marvell,armada-3700-neta";
 +                                 reg = <0x30000 0x4000>;
 +                                 interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;
 +                                 clocks = <&sb_periph_clk 8>;
 +                                 status = "disabled";
 +                      };
 +
 +                      mdio: mdio@32004 {
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +                              compatible = "marvell,orion-mdio";
 +                              reg = <0x32004 0x4>;
 +                      };
 +
 +                      eth1: ethernet@40000 {
 +                              compatible = "marvell,armada-3700-neta";
 +                              reg = <0x40000 0x4000>;
 +                              interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
 +                              clocks = <&sb_periph_clk 7>;
 +                              status = "disabled";
 +                      };
 +
                        usb3: usb@58000 {
                                compatible = "marvell,armada3700-xhci",
                                "generic-xhci";
index 93ec8fef82a1e6bb170a493c1a4ca6a216d6f652,9d7f0cd94f9d41742bde71354ce68998ef1cf6e0..05222f749a45e8a75c34d3da1941aed96d438c00
@@@ -52,7 -52,7 +52,7 @@@
                interrupt-parent = <&gic>;
                ranges;
  
-               config-space {
+               config-space@f2000000 {
                        #address-cells = <1>;
                        #size-cells = <1>;
                        compatible = "simple-bus";
                                clocks = <&cpm_syscon0 1 21>;
                                status = "disabled";
                        };
 +
 +                      cpm_trng: trng@760000 {
 +                              compatible = "marvell,armada-8k-rng", "inside-secure,safexcel-eip76";
 +                              reg = <0x760000 0x7d>;
 +                              interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>;
 +                              clocks = <&cpm_syscon0 1 25>;
 +                              status = "okay";
 +                      };
                };
  
                cpm_pcie0: pcie@f2600000 {
index ee8db055679193e3c836c40e224c428151ebb842,88e74069c666163b7df84257bcec7061b0bc264b..638820ce977dae005474cdfe77f018d226432521
@@@ -52,7 -52,7 +52,7 @@@
                interrupt-parent = <&gic>;
                ranges;
  
-               config-space {
+               config-space@f4000000 {
                        #address-cells = <1>;
                        #size-cells = <1>;
                        compatible = "simple-bus";
                                reg = <0x700600 0x50>;
                                #address-cells = <0x1>;
                                #size-cells = <0x0>;
 -                              cell-index = <1>;
 -                              clocks = <&cps_syscon0 0 3>;
 +                              cell-index = <3>;
 +                              clocks = <&cps_syscon0 1 21>;
                                status = "disabled";
                        };
  
                                reg = <0x700680 0x50>;
                                #address-cells = <1>;
                                #size-cells = <0>;
 -                              cell-index = <2>;
 +                              cell-index = <4>;
                                clocks = <&cps_syscon0 1 21>;
                                status = "disabled";
                        };
                                clocks = <&cps_syscon0 1 21>;
                                status = "disabled";
                        };
 +
 +                      cps_trng: trng@760000 {
 +                              compatible = "marvell,armada-8k-rng", "inside-secure,safexcel-eip76";
 +                              reg = <0x760000 0x7d>;
 +                              interrupts = <GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH>;
 +                              clocks = <&cps_syscon0 1 25>;
 +                              status = "okay";
 +                      };
                };
  
                cps_pcie0: pcie@f4600000 {
index 625dda713548da785d1fe3ced864d469dd4b4276,a39a702b904da73c831afbdec969b76847e59f6d..bbf594bce930ed8bd7bce231790b4535b252a943
                        #power-domain-cells = <0>;
                };
  
 +              rst: reset-controller@e6160000 {
 +                      compatible = "renesas,r8a7795-rst";
 +                      reg = <0 0xe6160000 0 0x0200>;
 +              };
 +
+               prr: chipid@fff00044 {
+                       compatible = "renesas,prr";
+                       reg = <0 0xfff00044 0 4>;
+               };
                sysc: system-controller@e6180000 {
                        compatible = "renesas,r8a7795-sysc";
                        reg = <0 0xe6180000 0 0x0400>;
                };
  
                fcpvb1: fcp@fe92f000 {
-                       compatible = "renesas,r8a7795-fcpv", "renesas,fcpv";
+                       compatible = "renesas,fcpv";
                        reg = <0 0xfe92f000 0 0x200>;
                        clocks = <&cpg CPG_MOD 606>;
                        power-domains = <&sysc R8A7795_PD_A3VP>;
                };
  
                fcpf0: fcp@fe950000 {
-                       compatible = "renesas,r8a7795-fcpf", "renesas,fcpf";
+                       compatible = "renesas,fcpf";
                        reg = <0 0xfe950000 0 0x200>;
                        clocks = <&cpg CPG_MOD 615>;
                        power-domains = <&sysc R8A7795_PD_A3VP>;
                };
  
                fcpf1: fcp@fe951000 {
-                       compatible = "renesas,r8a7795-fcpf", "renesas,fcpf";
+                       compatible = "renesas,fcpf";
                        reg = <0 0xfe951000 0 0x200>;
                        clocks = <&cpg CPG_MOD 614>;
                        power-domains = <&sysc R8A7795_PD_A3VP>;
                };
  
                fcpf2: fcp@fe952000 {
-                       compatible = "renesas,r8a7795-fcpf", "renesas,fcpf";
+                       compatible = "renesas,fcpf";
                        reg = <0 0xfe952000 0 0x200>;
                        clocks = <&cpg CPG_MOD 613>;
                        power-domains = <&sysc R8A7795_PD_A3VP>;
                };
  
                fcpvb0: fcp@fe96f000 {
-                       compatible = "renesas,r8a7795-fcpv", "renesas,fcpv";
+                       compatible = "renesas,fcpv";
                        reg = <0 0xfe96f000 0 0x200>;
                        clocks = <&cpg CPG_MOD 607>;
                        power-domains = <&sysc R8A7795_PD_A3VP>;
                };
  
                fcpvi0: fcp@fe9af000 {
-                       compatible = "renesas,r8a7795-fcpv", "renesas,fcpv";
+                       compatible = "renesas,fcpv";
                        reg = <0 0xfe9af000 0 0x200>;
                        clocks = <&cpg CPG_MOD 611>;
                        power-domains = <&sysc R8A7795_PD_A3VP>;
                };
  
                fcpvi1: fcp@fe9bf000 {
-                       compatible = "renesas,r8a7795-fcpv", "renesas,fcpv";
+                       compatible = "renesas,fcpv";
                        reg = <0 0xfe9bf000 0 0x200>;
                        clocks = <&cpg CPG_MOD 610>;
                        power-domains = <&sysc R8A7795_PD_A3VP>;
                };
  
                fcpvi2: fcp@fe9cf000 {
-                       compatible = "renesas,r8a7795-fcpv", "renesas,fcpv";
+                       compatible = "renesas,fcpv";
                        reg = <0 0xfe9cf000 0 0x200>;
                        clocks = <&cpg CPG_MOD 609>;
                        power-domains = <&sysc R8A7795_PD_A3VP>;
                };
  
                fcpvd0: fcp@fea27000 {
-                       compatible = "renesas,r8a7795-fcpv", "renesas,fcpv";
+                       compatible = "renesas,fcpv";
                        reg = <0 0xfea27000 0 0x200>;
                        clocks = <&cpg CPG_MOD 603>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
                };
  
                fcpvd1: fcp@fea2f000 {
-                       compatible = "renesas,r8a7795-fcpv", "renesas,fcpv";
+                       compatible = "renesas,fcpv";
                        reg = <0 0xfea2f000 0 0x200>;
                        clocks = <&cpg CPG_MOD 602>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
                };
  
                fcpvd2: fcp@fea37000 {
-                       compatible = "renesas,r8a7795-fcpv", "renesas,fcpv";
+                       compatible = "renesas,fcpv";
                        reg = <0 0xfea37000 0 0x200>;
                        clocks = <&cpg CPG_MOD 601>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
                };
  
                fcpvd3: fcp@fea3f000 {
-                       compatible = "renesas,r8a7795-fcpv", "renesas,fcpv";
+                       compatible = "renesas,fcpv";
                        reg = <0 0xfea3f000 0 0x200>;
                        clocks = <&cpg CPG_MOD 600>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
index 75c8c55a824835bf29e61f162aef99c76ffc65d0,41a050d2f1925552d41e8bf6a6701cd04b7d6dfa..28ba59a00cd86934ad335c2f261b3a0176175f7f
        #address-cells = <2>;
        #size-cells = <2>;
  
+       aliases {
+               i2c0 = &i2c0;
+               i2c1 = &i2c1;
+               i2c2 = &i2c2;
+               i2c3 = &i2c3;
+               i2c4 = &i2c4;
+               i2c5 = &i2c5;
+               i2c6 = &i2c6;
+       };
        psci {
                compatible = "arm,psci-0.2";
                method = "smc";
                        #power-domain-cells = <0>;
                };
  
 +              rst: reset-controller@e6160000 {
 +                      compatible = "renesas,r8a7796-rst";
 +                      reg = <0 0xe6160000 0 0x0200>;
 +              };
 +
+               prr: chipid@fff00044 {
+                       compatible = "renesas,prr";
+                       reg = <0 0xfff00044 0 4>;
+               };
                sysc: system-controller@e6180000 {
                        compatible = "renesas,r8a7796-sysc";
                        reg = <0 0xe6180000 0 0x0400>;
                        #power-domain-cells = <1>;
                };
  
+               i2c0: i2c@e6500000 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "renesas,i2c-r8a7796";
+                       reg = <0 0xe6500000 0 0x40>;
+                       interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 931>;
+                       power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       dmas = <&dmac1 0x91>, <&dmac1 0x90>,
+                              <&dmac2 0x91>, <&dmac2 0x90>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       i2c-scl-internal-delay-ns = <110>;
+                       status = "disabled";
+               };
+               i2c1: i2c@e6508000 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "renesas,i2c-r8a7796";
+                       reg = <0 0xe6508000 0 0x40>;
+                       interrupts = <GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 930>;
+                       power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       dmas = <&dmac1 0x93>, <&dmac1 0x92>,
+                              <&dmac2 0x93>, <&dmac2 0x92>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       i2c-scl-internal-delay-ns = <6>;
+                       status = "disabled";
+               };
+               i2c2: i2c@e6510000 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "renesas,i2c-r8a7796";
+                       reg = <0 0xe6510000 0 0x40>;
+                       interrupts = <GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 929>;
+                       power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       dmas = <&dmac1 0x95>, <&dmac1 0x94>,
+                              <&dmac2 0x95>, <&dmac2 0x94>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       i2c-scl-internal-delay-ns = <6>;
+                       status = "disabled";
+               };
+               i2c3: i2c@e66d0000 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "renesas,i2c-r8a7796";
+                       reg = <0 0xe66d0000 0 0x40>;
+                       interrupts = <GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 928>;
+                       power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       dmas = <&dmac0 0x97>, <&dmac0 0x96>;
+                       dma-names = "tx", "rx";
+                       i2c-scl-internal-delay-ns = <110>;
+                       status = "disabled";
+               };
+               i2c4: i2c@e66d8000 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "renesas,i2c-r8a7796";
+                       reg = <0 0xe66d8000 0 0x40>;
+                       interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 927>;
+                       power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       dmas = <&dmac0 0x99>, <&dmac0 0x98>;
+                       dma-names = "tx", "rx";
+                       i2c-scl-internal-delay-ns = <110>;
+                       status = "disabled";
+               };
+               i2c5: i2c@e66e0000 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "renesas,i2c-r8a7796";
+                       reg = <0 0xe66e0000 0 0x40>;
+                       interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 919>;
+                       power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       dmas = <&dmac0 0x9b>, <&dmac0 0x9a>;
+                       dma-names = "tx", "rx";
+                       i2c-scl-internal-delay-ns = <110>;
+                       status = "disabled";
+               };
+               i2c6: i2c@e66e8000 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "renesas,i2c-r8a7796";
+                       reg = <0 0xe66e8000 0 0x40>;
+                       interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 918>;
+                       power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       dmas = <&dmac0 0x9d>, <&dmac0 0x9c>;
+                       dma-names = "tx", "rx";
+                       i2c-scl-internal-delay-ns = <6>;
+                       status = "disabled";
+               };
                scif2: serial@e6e88000 {
                        compatible = "renesas,scif-r8a7796",
                                     "renesas,rcar-gen3-scif", "renesas,scif";
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
                        status = "disabled";
                };
+               dmac0: dma-controller@e6700000 {
+                       compatible = "renesas,dmac-r8a7796",
+                                    "renesas,rcar-dmac";
+                       reg = <0 0xe6700000 0 0x10000>;
+                       interrupts = <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 215 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "error",
+                                       "ch0", "ch1", "ch2", "ch3",
+                                       "ch4", "ch5", "ch6", "ch7",
+                                       "ch8", "ch9", "ch10", "ch11",
+                                       "ch12", "ch13", "ch14", "ch15";
+                       clocks = <&cpg CPG_MOD 219>;
+                       clock-names = "fck";
+                       power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       #dma-cells = <1>;
+                       dma-channels = <16>;
+               };
+               dmac1: dma-controller@e7300000 {
+                       compatible = "renesas,dmac-r8a7796",
+                                    "renesas,rcar-dmac";
+                       reg = <0 0xe7300000 0 0x10000>;
+                       interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 319 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "error",
+                                       "ch0", "ch1", "ch2", "ch3",
+                                       "ch4", "ch5", "ch6", "ch7",
+                                       "ch8", "ch9", "ch10", "ch11",
+                                       "ch12", "ch13", "ch14", "ch15";
+                       clocks = <&cpg CPG_MOD 218>;
+                       clock-names = "fck";
+                       power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       #dma-cells = <1>;
+                       dma-channels = <16>;
+               };
+               dmac2: dma-controller@e7310000 {
+                       compatible = "renesas,dmac-r8a7796",
+                                    "renesas,rcar-dmac";
+                       reg = <0 0xe7310000 0 0x10000>;
+                       interrupts = <GIC_SPI 416 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 417 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 418 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 419 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 420 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 422 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 426 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 427 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 428 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 429 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 430 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 431 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 397 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "error",
+                                       "ch0", "ch1", "ch2", "ch3",
+                                       "ch4", "ch5", "ch6", "ch7",
+                                       "ch8", "ch9", "ch10", "ch11",
+                                       "ch12", "ch13", "ch14", "ch15";
+                       clocks = <&cpg CPG_MOD 217>;
+                       clock-names = "fck";
+                       power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       #dma-cells = <1>;
+                       dma-channels = <16>;
+               };
+               sdhi0: sd@ee100000 {
+                       compatible = "renesas,sdhi-r8a7796";
+                       reg = <0 0xee100000 0 0x2000>;
+                       interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 314>;
+                       max-frequency = <200000000>;
+                       power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       status = "disabled";
+               };
+               sdhi1: sd@ee120000 {
+                       compatible = "renesas,sdhi-r8a7796";
+                       reg = <0 0xee120000 0 0x2000>;
+                       interrupts = <GIC_SPI 166 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 313>;
+                       max-frequency = <200000000>;
+                       power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       status = "disabled";
+               };
+               sdhi2: sd@ee140000 {
+                       compatible = "renesas,sdhi-r8a7796";
+                       reg = <0 0xee140000 0 0x2000>;
+                       interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 312>;
+                       max-frequency = <200000000>;
+                       power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       status = "disabled";
+               };
+               sdhi3: sd@ee160000 {
+                       compatible = "renesas,sdhi-r8a7796";
+                       reg = <0 0xee160000 0 0x2000>;
+                       interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 311>;
+                       max-frequency = <200000000>;
+                       power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       status = "disabled";
+               };
        };
  };
index df231c4df5a5ac362d20baad1b08dda9604fb8d9,4f2b6bdf87f22b7fef27e0679de8cad7030548af..a635adc47e742c1bdf3a3cd5be613532fe807a8f
        sdmmc: dwmmc@ff0c0000 {
                compatible = "rockchip,rk3368-dw-mshc", "rockchip,rk3288-dw-mshc";
                reg = <0x0 0xff0c0000 0x0 0x4000>;
-               clock-freq-min-max = <400000 150000000>;
+               max-frequency = <150000000>;
                clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>,
                         <&cru SCLK_SDMMC_DRV>, <&cru SCLK_SDMMC_SAMPLE>;
                clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
        sdio0: dwmmc@ff0d0000 {
                compatible = "rockchip,rk3368-dw-mshc", "rockchip,rk3288-dw-mshc";
                reg = <0x0 0xff0d0000 0x0 0x4000>;
-               clock-freq-min-max = <400000 150000000>;
+               max-frequency = <150000000>;
                clocks = <&cru HCLK_SDIO0>, <&cru SCLK_SDIO0>,
                         <&cru SCLK_SDIO0_DRV>, <&cru SCLK_SDIO0_SAMPLE>;
                clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
        emmc: dwmmc@ff0f0000 {
                compatible = "rockchip,rk3368-dw-mshc", "rockchip,rk3288-dw-mshc";
                reg = <0x0 0xff0f0000 0x0 0x4000>;
-               clock-freq-min-max = <400000 150000000>;
+               max-frequency = <150000000>;
                clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>,
                         <&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>;
                clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
                status = "disabled";
        };
  
-       i2c1: i2c@ff140000 {
+       i2c2: i2c@ff140000 {
                compatible = "rockchip,rk3368-i2c", "rockchip,rk3288-i2c";
                reg = <0x0 0xff140000 0x0 0x1000>;
                interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
                #address-cells = <1>;
                #size-cells = <0>;
                clock-names = "i2c";
-               clocks = <&cru PCLK_I2C1>;
+               clocks = <&cru PCLK_I2C2>;
                pinctrl-names = "default";
-               pinctrl-0 = <&i2c1_xfer>;
+               pinctrl-0 = <&i2c2_xfer>;
                status = "disabled";
        };
  
                g-np-tx-fifo-size = <16>;
                g-rx-fifo-size = <275>;
                g-tx-fifo-size = <256 128 128 64 64 32>;
 -              g-use-dma;
                status = "disabled";
        };
  
                status = "disabled";
        };
  
-       i2c2: i2c@ff660000 {
+       i2c1: i2c@ff660000 {
                compatible = "rockchip,rk3368-i2c", "rockchip,rk3288-i2c";
                reg = <0x0 0xff660000 0x0 0x1000>;
                interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
                #address-cells = <1>;
                #size-cells = <0>;
                clock-names = "i2c";
-               clocks = <&cru PCLK_I2C2>;
+               clocks = <&cru PCLK_I2C1>;
                pinctrl-names = "default";
-               pinctrl-0 = <&i2c2_xfer>;
+               pinctrl-0 = <&i2c1_xfer>;
                status = "disabled";
        };
  
index 1e24e455700b116c0e74186a6872e445ed2f50a1,0ee4220ddf0818a75557b1bf13a7364d56b8165f..c928015d39a213f9911c48a2a6312774a397d725
                             <GIC_PPI 14 IRQ_TYPE_LEVEL_LOW 0>,
                             <GIC_PPI 11 IRQ_TYPE_LEVEL_LOW 0>,
                             <GIC_PPI 10 IRQ_TYPE_LEVEL_LOW 0>;
 +              arm,no-tick-in-suspend;
        };
  
        xin24m: xin24m {
                             "rockchip,rk3288-dw-mshc";
                reg = <0x0 0xfe310000 0x0 0x4000>;
                interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH 0>;
-               clock-freq-min-max = <400000 150000000>;
+               max-frequency = <150000000>;
                clocks = <&cru HCLK_SDIO>, <&cru SCLK_SDIO>,
                         <&cru SCLK_SDIO_DRV>, <&cru SCLK_SDIO_SAMPLE>;
                clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
                             "rockchip,rk3288-dw-mshc";
                reg = <0x0 0xfe320000 0x0 0x4000>;
                interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH 0>;
-               clock-freq-min-max = <400000 150000000>;
+               max-frequency = <150000000>;
                clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>,
                         <&cru SCLK_SDMMC_DRV>, <&cru SCLK_SDMMC_SAMPLE>;
                clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
                fifo-depth = <0x100>;
+               power-domains = <&power RK3399_PD_SD>;
                status = "disabled";
        };
  
                #clock-cells = <0>;
                phys = <&emmc_phy>;
                phy-names = "phy_arasan";
+               power-domains = <&power RK3399_PD_EMMC>;
                status = "disabled";
        };
  
                ranges = <0x83000000 0x0 0xfa000000 0x0 0xfa000000 0x0 0x600000
                          0x81000000 0x0 0xfa600000 0x0 0xfa600000 0x0 0x100000>;
                resets = <&cru SRST_PCIE_CORE>, <&cru SRST_PCIE_MGMT>,
 -                       <&cru SRST_PCIE_MGMT_STICKY>, <&cru SRST_PCIE_PIPE>;
 -              reset-names = "core", "mgmt", "mgmt-sticky", "pipe";
 +                       <&cru SRST_PCIE_MGMT_STICKY>, <&cru SRST_PCIE_PIPE>,
 +                       <&cru SRST_PCIE_PM>, <&cru SRST_P_PCIE>,
 +                       <&cru SRST_A_PCIE>;
 +              reset-names = "core", "mgmt", "mgmt-sticky", "pipe",
 +                            "pm", "pclk", "aclk";
                status = "disabled";
  
                pcie0_intc: interrupt-controller {
                status = "disabled";
        };
  
+       qos_sd: qos@ffa74000 {
+               compatible = "syscon";
+               reg = <0x0 0xffa74000 0x0 0x20>;
+       };
+       qos_emmc: qos@ffa58000 {
+               compatible = "syscon";
+               reg = <0x0 0xffa58000 0x0 0x20>;
+       };
        qos_gmac: qos@ffa5c000 {
                compatible = "syscon";
                reg = <0x0 0xffa5c000 0x0 0x20>;
                        };
  
                        /* These power domains are grouped by VD_LOGIC */
+                       pd_emmc@RK3399_PD_EMMC {
+                               reg = <RK3399_PD_EMMC>;
+                               clocks = <&cru ACLK_EMMC>;
+                               pm_qos = <&qos_emmc>;
+                       };
                        pd_gmac@RK3399_PD_GMAC {
                                reg = <RK3399_PD_GMAC>;
-                               clocks = <&cru ACLK_GMAC>;
+                               clocks = <&cru ACLK_GMAC>,
+                                        <&cru PCLK_GMAC>;
                                pm_qos = <&qos_gmac>;
                        };
+                       pd_sd@RK3399_PD_SD {
+                               reg = <RK3399_PD_SD>;
+                               clocks = <&cru HCLK_SDMMC>,
+                                        <&cru SCLK_SDMMC>;
+                               pm_qos = <&qos_sd>;
+                       };
                        pd_vio@RK3399_PD_VIO {
                                reg = <RK3399_PD_VIO>;
                                #address-cells = <1>;
                clock-names = "pclk_efuse";
  
                /* Data cells */
+               cpu_id: cpu-id@7 {
+                       reg = <0x07 0x10>;
+               };
                cpub_leakage: cpu-leakage@17 {
                        reg = <0x17 0x1>;
                };
                                interrupt-names = "linestate";
                                status = "disabled";
                        };
+                       u2phy0_otg: otg-port {
+                               #phy-cells = <0>;
+                               interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH 0>,
+                                            <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH 0>,
+                                            <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH 0>;
+                               interrupt-names = "otg-bvalid", "otg-id",
+                                                 "linestate";
+                               status = "disabled";
+                       };
                };
  
                u2phy1: usb2-phy@e460 {
                                interrupt-names = "linestate";
                                status = "disabled";
                        };
+                       u2phy1_otg: otg-port {
+                               #phy-cells = <0>;
+                               interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH 0>,
+                                            <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH 0>,
+                                            <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH 0>;
+                               interrupt-names = "otg-bvalid", "otg-id",
+                                                 "linestate";
+                               status = "disabled";
+                       };
                };
  
                emmc_phy: phy@f780 {
                clock-names = "tcpdcore", "tcpdphy-ref";
                assigned-clocks = <&cru SCLK_UPHY0_TCPDCORE>;
                assigned-clock-rates = <50000000>;
+               power-domains = <&power RK3399_PD_TCPD0>;
                resets = <&cru SRST_UPHY0>,
                         <&cru SRST_UPHY0_PIPE_L00>,
                         <&cru SRST_P_UPHY0_TCPHY>;
                clock-names = "tcpdcore", "tcpdphy-ref";
                assigned-clocks = <&cru SCLK_UPHY1_TCPDCORE>;
                assigned-clock-rates = <50000000>;
+               power-domains = <&power RK3399_PD_TCPD1>;
                resets = <&cru SRST_UPHY1>,
                         <&cru SRST_UPHY1_PIPE_L00>,
                         <&cru SRST_P_UPHY1_TCPHY>;
index dd2cd73c774cb417eda139eecbe455f864e88c91,7a1aed70dbc070e76b8f4a6b1655ff57bc9ce49d..88ff70a0608685bcc7a36893a30f3d89c44ab77c
                compatible = "arm,gic-v3";
                #interrupt-cells = <3>;
                #address-cells = <0>;
 -              #redistributor-regions = <6>;
 -              redistributor-stride = <0x0 0x40000>;
                interrupt-controller;
                reg = <0x02a00000 0x10000>,
 -                    <0x02b00000 0x20000>,
 -                    <0x02b20000 0x20000>,
 -                    <0x02b40000 0x20000>,
 -                    <0x02b60000 0x20000>,
 -                    <0x02b80000 0x20000>,
 -                    <0x02ba0000 0x20000>;
 +                    <0x02b00000 0xc0000>;
                interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;
        };
  
                        dma-requests = <32>;
                };
  
+               lsp0crm: clock-controller@1420000 {
+                       compatible = "zte,zx296718-lsp0crm";
+                       reg = <0x01420000 0x1000>;
+                       #clock-cells = <1>;
+               };
+               lsp1crm: clock-controller@1430000 {
+                       compatible = "zte,zx296718-lsp1crm";
+                       reg = <0x01430000 0x1000>;
+                       #clock-cells = <1>;
+               };
+               topcrm: clock-controller@1461000 {
+                       compatible = "zte,zx296718-topcrm";
+                       reg = <0x01461000 0x1000>;
+                       #clock-cells = <1>;
+               };
                sysctrl: sysctrl@1463000 {
                        compatible = "zte,zx296718-sysctrl", "syscon";
                        reg = <0x1463000 0x1000>;
                };
+               audiocrm: clock-controller@1480000 {
+                       compatible = "zte,zx296718-audiocrm";
+                       reg = <0x01480000 0x1000>;
+                       #clock-cells = <1>;
+               };
        };
  };
This page took 0.210109 seconds and 4 git commands to generate.