]> Git Repo - linux.git/commitdiff
Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
authorLinus Torvalds <[email protected]>
Sat, 8 Oct 2016 04:29:04 +0000 (21:29 -0700)
committerLinus Torvalds <[email protected]>
Sat, 8 Oct 2016 04:29:04 +0000 (21:29 -0700)
Pull ARM DT updates from Arnd Bergmann:
 "These are as usual a very large number of mostly boring updates to
  enable devices in existing machines, or to fix minor bugs. Notably, an
  ongoing treewide effort to fix warnings caused by an update to the
  device tree compiler. These are enabled with "make W=1" at the moment
  but can hopefully become the default once all issues have been
  addressed.

  No new SoC platform is added this time around (Armada 395 and Orion
  mv88f5181 are slight variations of existing ones), but a significant
  number of new dts files are added, which I list by platform:

   - Allwinner: Empire Electronix M712 and iNet d978 Rev2 tablets,
     Orange Pi PC Plus, Orange Pi 2, Orange Pi Plus 2E, Orange Pi Lite,
     Olimex A33-Olinuxino, and Nano Pi Neo single-board computers

   - ARM Realview: all supported machines (ported from board files)

   - Broadcom: BCM958525er, BCM958522er, BCM988312hr, BCM958623hr and
     BCM958622hr reference boards for Northstar platform, Raspberry Pi
     Zero single-board computer

   - Marvell EBU: Netgear WNR854T router (ported from board file),
     Armada 395 SoC platform and GP board Armada 390 DB development
     board

   - NXP i.MX: imx7s Warp7 reference board, Gateworks Ventana GW553x
     single-board computer, Technologic Systems TS-4900 and Engicam
     IMX6UL GEA M6UL computer-on-module, Inverse Path USB armory board

   - Qualcomm: LG Nexus 5 Phone

   - Renesas: r8a7792/wheat and r7s72100/rskrza1 development boards

   - Rockchip: Rockchip RK3288 Fennec reference board, Firefly RK3288
     Reload platform

   - ST Microelectronics STi: B2260 (96boards) single-board computer

   - TI Davinci: OMAP-L138 LCDK Development kit

   - TI OMAP: beagleboard-x15 rev B1 single-board computer"

* tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (390 commits)
  ARM: dts: sony-nsz-gs7: add missing unit name to /memory node
  ARM: dts: chromecast: add missing unit name to /memory node
  ARM: dts: berlin2q-marvell-dmp: add missing unit name to /memory node
  ARM: dts: berlin2: Add missing unit name to /soc node
  ARM: dts: berlin2cd: Add missing unit name to /soc node
  ARM: dts: berlin2q: Add missing unit name to /soc node
  ARM: dts: berlin2: Remove skeleton.dtsi inclusion
  ARM: dts: berlin2cd: Remove skeleton.dtsi inclusion
  ARM: dts: berlin2q: Remove skeleton.dtsi inclusion
  arm: dts: berlin2q: enable all wdt nodes unconditionally
  arm: dts: berlin2: enable all wdt nodes unconditionally
  ARM: dts: omap5-igep0050.dts: Use tabs for indentation
  ARM: dts: Fix igepv5 power button GPIO direction
  ARM: dts: am335x-evmsk: Add blue-and-red-wiring -property to lcdc node
  ARM: dts: am335x-evmsk: Whitespace cleanup of lcdc related nodes
  ARM: dts: am335x-evm: Add blue-and-red-wiring -property to lcdc node
  ARM: dts: s3c64xx: Use macros for pinctrl configuration
  ARM: dts: s3c2416: Use macros for pinctrl configuration
  ARM: dts: s5pv210: Use macros for pinctrl configuration
  ARM: dts: s3c64xx: Use common macros for pinctrl configuration
  ...

14 files changed:
1  2 
Documentation/devicetree/bindings/clock/qcom,gcc.txt
Documentation/devicetree/bindings/vendor-prefixes.txt
MAINTAINERS
arch/arm/boot/dts/armada-388-clearfog.dts
arch/arm/boot/dts/bcm283x.dtsi
arch/arm/boot/dts/exynos5410-odroidxu.dts
arch/arm/boot/dts/rk3288.dtsi
arch/arm/boot/dts/rk3xxx.dtsi
arch/arm/boot/dts/stih407-family.dtsi
arch/arm/boot/dts/stih410.dtsi
arch/arm/boot/dts/stm32f429.dtsi
arch/arm/boot/dts/sun8i-a23-a33.dtsi
arch/arm/boot/dts/sun8i-h3.dtsi
arch/arm/mach-davinci/da8xx-dt.c

index 869a2f0e2ff6a943b64a9d2e4caa845981542b2e,ea893cbef73de71d1172eedb80fc3ff734a07e54..3cf44217068e4d7097203e09177b125fdaa96cf5
@@@ -15,7 -15,6 +15,7 @@@ Required properties 
                        "qcom,gcc-msm8974pro"
                        "qcom,gcc-msm8974pro-ac"
                        "qcom,gcc-msm8996"
 +                      "qcom,gcc-mdm9615"
  
  - reg : shall contain base register location and length
  - #clock-cells : shall contain 1
  
  Optional properties :
  - #power-domain-cells : shall contain 1
+ - Qualcomm TSENS (thermal sensor device) on some devices can
+ be part of GCC and hence the TSENS properties can also be
+ part of the GCC/clock-controller node.
+ For more details on the TSENS properties please refer
+ Documentation/devicetree/bindings/thermal/qcom-tsens.txt
  
  Example:
        clock-controller@900000 {
                #reset-cells = <1>;
                #power-domain-cells = <1>;
        };
+ Example of GCC with TSENS properties:
+       clock-controller@900000 {
+               compatible = "qcom,gcc-apq8064";
+               reg = <0x00900000 0x4000>;
+               nvmem-cells = <&tsens_calib>, <&tsens_backup>;
+               nvmem-cell-names = "calib", "calib_backup";
+               #clock-cells = <1>;
+               #reset-cells = <1>;
+               #thermal-sensor-cells = <1>;
+       };
index 77e985f21707ad76eed791f46be4a0da55769c3c,97730d3fef6c1de241d8d7a214af007fe2662918..24c6f658bce147162d92f2009c1a4d319c490be3
@@@ -3,8 -3,8 +3,8 @@@ Device tree binding vendor prefix regis
  This isn't an exhaustive list, but you should add new prefixes to it before
  using them to avoid name-space collisions.
  
 -abilis        Abilis Systems
  abcn  Abracon Corporation
 +abilis        Abilis Systems
  active-semi   Active-Semi International Inc
  ad    Avionic Design GmbH
  adapteva      Adapteva, Inc.
@@@ -36,7 -36,6 +36,7 @@@ aspeed        ASPEED Technology Inc
  atlas Atlas Scientific LLC
  atmel Atmel Corporation
  auo   AU Optronics Corporation
 +auvidea Auvidea GmbH
  avago Avago Technologies
  avic  Shanghai AVIC Optoelectronics Co., Ltd.
  axis  Axis Communications AB
@@@ -76,7 -75,6 +76,7 @@@ digilent      Diglent, Inc
  dlg   Dialog Semiconductor
  dlink D-Link Corporation
  dmo   Data Modul AG
 +domintech     Domintech Co., Ltd.
  dptechnics    DPTechnics
  dragino       Dragino Technology Co., Limited
  ea    Embedded Artists AB
@@@ -87,7 -85,6 +87,7 @@@ elan  Elan Microelectronic Corp
  embest        Shenzhen Embest Technology Co., Ltd.
  emmicro       EM Microelectronic
  energymicro   Silicon Laboratories (formerly Energy Micro AS)
 +engicam       Engicam S.r.l.
  epcos EPCOS AG
  epfl  Ecole Polytechnique Fédérale de Lausanne
  epson Seiko Epson Corp.
@@@ -101,11 -98,12 +101,12 @@@ ezchip   EZchip Semiconducto
  fcs   Fairchild Semiconductor
  firefly       Firefly
  focaltech     FocalTech Systems Co.,Ltd
+ friendlyarm   Guangzhou FriendlyARM Computer Tech Co., Ltd
  fsl   Freescale Semiconductor
  ge    General Electric Company
  geekbuying    GeekBuying
 -GEFanuc       GE Fanuc Intelligent Platforms Embedded Systems, Inc.
  gef   GE Fanuc Intelligent Platforms Embedded Systems, Inc.
 +GEFanuc       GE Fanuc Intelligent Platforms Embedded Systems, Inc.
  geniatech     Geniatech, Inc.
  giantplus     Giantplus Technology Co., Ltd.
  globalscale   Globalscale Technologies, Inc.
@@@ -129,6 -127,7 +130,6 @@@ i2se       I2SE Gmb
  ibm   International Business Machines (IBM)
  idt   Integrated Device Technologies, Inc.
  ifi   Ingenieurburo Fur Ic-Technologie (I/F/I)
 -iom   Iomega Corporation
  img   Imagination Technologies Ltd.
  infineon Infineon Technologies
  inforce       Inforce Computing
@@@ -137,14 -136,12 +138,15 @@@ innolux Innolux Corporatio
  intel Intel Corporation
  intercontrol  Inter Control Group
  invensense    InvenSense Inc.
+ inversepath   Inverse Path
 +iom   Iomega Corporation
  isee  ISEE 2007 S.L.
  isil  Intersil
  issi  Integrated Silicon Solutions Inc.
 +jdi   Japan Display Inc.
  jedec JEDEC Solid State Technology Association
  karo  Ka-Ro electronics GmbH
 +keithkoep     Keith & Koep GmbH
  keymile       Keymile GmbH
  kinetic Kinetic Technologies
  kosagi        Sutajio Ko-Usagi PTE Ltd.
@@@ -154,8 -151,8 +156,8 @@@ lantiq     Lantiq Semiconducto
  lenovo        Lenovo Group Ltd.
  lg    LG Corporation
  linux Linux-specific binding
 -lsi   LSI Corp. (LSI Logic)
  lltc  Linear Technology Corporation
 +lsi   LSI Corp. (LSI Logic)
  marvell       Marvell Technology Group Ltd.
  maxim Maxim Integrated Products
  meas  Measurement Specialties
@@@ -195,20 -192,20 +197,20 @@@ onnn    ON Semiconductor Corp
  ontat On Tat Industrial Company
  opencores     OpenCores.org
  option        Option NV
 +ORCL  Oracle Corporation
  ortustech     Ortus Technology Co., Ltd.
  ovti  OmniVision Technologies
 -ORCL  Oracle Corporation
  oxsemi        Oxford Semiconductor, Ltd.
  panasonic     Panasonic Corporation
  parade        Parade Technologies Inc.
  pericom       Pericom Technology Inc.
  phytec        PHYTEC Messtechnik GmbH
  picochip      Picochip Ltd
 +pixcir  PIXCIR MICROELECTRONICS Co., Ltd
  plathome      Plat'Home Co., Ltd.
  plda  PLDA
 -pixcir  PIXCIR MICROELECTRONICS Co., Ltd
 -pulsedlight   PulsedLight, Inc
  powervr       PowerVR (deprecated, use img)
 +pulsedlight   PulsedLight, Inc
  qca   Qualcomm Atheros, Inc.
  qcom  Qualcomm Technologies, Inc
  qemu  QEMU, a generic and open source machine emulator and virtualizer
@@@ -236,13 -233,12 +238,13 @@@ sgx     SGX Sensortec
  sharp Sharp Corporation
  si-en Si-En Technology Ltd.
  sigma Sigma Designs, Inc.
 +sii   Seiko Instruments, Inc.
  sil   Silicon Image
  silabs        Silicon Laboratories
 +silead        Silead Inc.
 +silergy       Silergy Corp.
  siliconmitus  Silicon Mitus, Inc.
  simtek
 -sii   Seiko Instruments, Inc.
 -silergy       Silergy Corp.
  sirf  SiRF Technology, Inc.
  sis   Silicon Integrated Systems Corp.
  sitronix      Sitronix Technology Corporation
@@@ -260,12 -256,9 +262,12 @@@ starry   Starry Electronic Technology (Sh
  startek       Startek
  ste   ST-Ericsson
  stericsson    ST-Ericsson
 +summit        Summit microelectronics
 +sunchip       Shenzhen Sunchip Technology Co., Ltd
 +SUNW  Sun Microsystems, Inc
 +swir  Sierra Wireless
  syna  Synaptics Inc.
  synology      Synology, Inc.
 -SUNW  Sun Microsystems, Inc
  tbs   TBS Technologies
  tcg   Trusted Computing Group
  tcl   Toby Churchill Ltd.
@@@ -274,18 -267,18 +276,19 @@@ technologic     Technologic System
  thine THine Electronics, Inc.
  ti    Texas Instruments
  tlm   Trusted Logic Mobility
 +topeet  Topeet
  toradex       Toradex AG
  toshiba       Toshiba Corporation
  toumaz        Toumaz
 -tplink        TP-LINK Technologies Co., Ltd.
  tpk   TPK U.S.A. LLC
 +tplink        TP-LINK Technologies Co., Ltd.
+ tpo   TPO
  tronfy        Tronfy
  tronsmart     Tronsmart
  truly Truly Semiconductors Limited
  tyan  Tyan Computer Corporation
 -upisemi       uPI Semiconductor Corp.
  uniwest       United Western Technologies Corp (UniWest)
 +upisemi       uPI Semiconductor Corp.
  urt   United Radiant Technology Corporation
  usi   Universal Scientific Industrial Co., Ltd.
  v3    V3 Semiconductor
@@@ -303,7 -296,7 +306,7 @@@ x-powers   X-Power
  xes   Extreme Engineering Solutions (X-ES)
  xillybus      Xillybus Ltd.
  xlnx  Xilinx
 -zyxel ZyXEL Communications Corp.
  zarlink       Zarlink Semiconductor
  zii   Zodiac Inflight Innovations
  zte   ZTE Corp.
 +zyxel ZyXEL Communications Corp.
diff --combined MAINTAINERS
index 8a5ce7d0b320fecafc62f997988418eb2ca23392,55077a5b30095e9cfd02a15d79ee0509f6f19b52..5327bbe00d13b4ab961710308f3a75d940878066
@@@ -636,15 -636,6 +636,15 @@@ F:       drivers/tty/serial/altera_jtaguart.
  F:    include/linux/altera_uart.h
  F:    include/linux/altera_jtaguart.h
  
 +AMAZON ETHERNET DRIVERS
 +M:    Netanel Belgazal <[email protected]>
 +R:    Saeed Bishara <[email protected]>
 +R:    Zorik Machulsky <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/networking/ena.txt
 +F:    drivers/net/ethernet/amazon/
 +
  AMD CRYPTOGRAPHIC COPROCESSOR (CCP) DRIVER
  M:    Tom Lendacky <[email protected]>
  M:    Gary Hook <[email protected]>
@@@ -807,7 -798,6 +807,7 @@@ M: Laura Abbott <[email protected]
  M:    Sumit Semwal <[email protected]>
  L:    [email protected]
  S:    Supported
 +F:    Documentation/devicetree/bindings/staging/ion/
  F:    drivers/staging/android/ion
  F:    drivers/staging/android/uapi/ion.h
  F:    drivers/staging/android/uapi/ion_test.h
@@@ -819,11 -809,11 +819,11 @@@ L:      [email protected] (moderat
  S:    Maintained
  F:    sound/aoa/
  
 -APEX EMBEDDED SYSTEMS STX104 DAC DRIVER
 +APEX EMBEDDED SYSTEMS STX104 IIO DRIVER
  M:    William Breathitt Gray <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/iio/dac/stx104.c
 +F:    drivers/iio/adc/stx104.c
  
  APM DRIVER
  M:    Jiri Kosina <[email protected]>
@@@ -866,13 -856,6 +866,13 @@@ F:       drivers/net/phy/mdio-xgene.
  F:    Documentation/devicetree/bindings/net/apm-xgene-enet.txt
  F:    Documentation/devicetree/bindings/net/apm-xgene-mdio.txt
  
 +APPLIED MICRO (APM) X-GENE SOC PMU
 +M:    Tai Nguyen <[email protected]>
 +S:    Supported
 +F:    drivers/perf/xgene_pmu.c
 +F:    Documentation/perf/xgene-pmu.txt
 +F:    Documentation/devicetree/bindings/perf/apm-xgene-pmu.txt
 +
  APTINA CAMERA SENSOR PLL
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
@@@ -929,17 -912,15 +929,17 @@@ F:      arch/arm/include/asm/floppy.
  
  ARM PMU PROFILING AND DEBUGGING
  M:    Will Deacon <[email protected]>
 -R:    Mark Rutland <[email protected]>
 +M:    Mark Rutland <[email protected]>
  S:    Maintained
 +L:    [email protected] (moderated for non-subscribers)
  F:    arch/arm*/kernel/perf_*
  F:    arch/arm/oprofile/common.c
  F:    arch/arm*/kernel/hw_breakpoint.c
  F:    arch/arm*/include/asm/hw_breakpoint.h
  F:    arch/arm*/include/asm/perf_event.h
 -F:    drivers/perf/arm_pmu.c
 +F:    drivers/perf/*
  F:    include/linux/perf/arm_pmu.h
 +F:    Documentation/devicetree/bindings/arm/pmu.txt
  
  ARM PORT
  M:    Russell King <[email protected]>
@@@ -1010,7 -991,6 +1010,7 @@@ M:       Chen-Yu Tsai <[email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  N:    sun[x456789]i
 +F:    arch/arm/boot/dts/ntc-gr8*
  
  ARM/Allwinner SoC Clock Support
  M:    Emilio López <[email protected]>
@@@ -1142,11 -1122,6 +1142,11 @@@ F:    drivers/hwtracing/coresight/
  F:    Documentation/trace/coresight.txt
  F:    Documentation/devicetree/bindings/arm/coresight.txt
  F:    Documentation/ABI/testing/sysfs-bus-coresight-devices-*
 +F:    tools/perf/arch/arm/util/pmu.c
 +F:    tools/perf/arch/arm/util/auxtrace.c
 +F:    tools/perf/arch/arm/util/cs-etm.c
 +F:    tools/perf/arch/arm/util/cs-etm.h
 +F:    tools/perf/util/cs-etm.h
  
  ARM/CORGI MACHINE SUPPORT
  M:    Richard Purdie <[email protected]>
@@@ -1467,7 -1442,6 +1467,7 @@@ F:      arch/arm/mach-orion5x/ts78xx-
  ARM/OXNAS platform support
  M:    Neil Armstrong <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-oxnas/
  F:    arch/arm/boot/dts/oxnas*
@@@ -1649,8 -1623,7 +1649,8 @@@ N:      rockchi
  
  ARM/SAMSUNG EXYNOS ARM ARCHITECTURES
  M:    Kukjin Kim <[email protected]>
 -M:    Krzysztof Kozlowski <[email protected]>
 +M:    Krzysztof Kozlowski <[email protected]>
 +R:    Javier Martinez Canillas <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -1670,6 -1643,7 +1670,6 @@@ F:      drivers/*/*s3c64xx
  F:    drivers/*/*s5pv210*
  F:    drivers/memory/samsung/*
  F:    drivers/soc/samsung/*
 -F:    drivers/spi/spi-s3c*
  F:    Documentation/arm/Samsung/
  F:    Documentation/devicetree/bindings/arm/samsung/
  F:    Documentation/devicetree/bindings/sram/samsung-sram.txt
@@@ -1857,7 -1831,6 +1857,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  ARM/UNIPHIER ARCHITECTURE
  M:    Masahiro Yamada <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier.git
  S:    Maintained
  F:    arch/arm/boot/dts/uniphier*
  F:    arch/arm/include/asm/hardware/cache-uniphier.h
@@@ -1865,10 -1838,8 +1865,10 @@@ F:    arch/arm/mach-uniphier
  F:    arch/arm/mm/cache-uniphier.c
  F:    arch/arm64/boot/dts/socionext/
  F:    drivers/bus/uniphier-system-bus.c
 +F:    drivers/clk/uniphier/
  F:    drivers/i2c/busses/i2c-uniphier*
  F:    drivers/pinctrl/uniphier/
 +F:    drivers/reset/reset-uniphier.c
  F:    drivers/tty/serial/8250/8250_uniphier.c
  N:    uniphier
  
@@@ -2003,13 -1974,6 +2003,13 @@@ S:    Maintaine
  F:    drivers/media/i2c/as3645a.c
  F:    include/media/i2c/as3645a.h
  
 +ASAHI KASEI AK8974 DRIVER
 +M:    Linus Walleij <[email protected]>
 +L:    [email protected]
 +W:    http://www.akm.com/
 +S:    Supported
 +F:    drivers/iio/magnetometer/ak8974.c
 +
  ASC7621 HARDWARE MONITOR DRIVER
  M:    George Joseph <[email protected]>
  L:    [email protected]
@@@ -2148,6 -2112,11 +2148,6 @@@ M:     Ludovic Desroches <ludovic.desroches
  S:    Maintained
  F:    drivers/mmc/host/atmel-mci.c
  
 -ATMEL AT91 / AT32 SERIAL DRIVER
 -M:    Nicolas Ferre <[email protected]>
 -S:    Supported
 -F:    drivers/tty/serial/atmel_serial.c
 -
  ATMEL AT91 SAMA5D2-Compatible Shutdown Controller
  M:    Nicolas Ferre <[email protected]>
  S:    Supported
@@@ -2482,7 -2451,6 +2482,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    block/
  F:    kernel/trace/blktrace.c
 +F:    lib/sbitmap.c
  
  BLOCK2MTD DRIVER
  M:    Joern Engel <[email protected]>
@@@ -2516,7 -2484,7 +2516,7 @@@ F:      include/net/bluetooth
  BONDING DRIVER
  M:    Jay Vosburgh <[email protected]>
  M:    Veaceslav Falico <[email protected]>
 -M:    Andy Gospodarek <[email protected]>
 +M:    Andy Gospodarek <[email protected]>
  L:    [email protected]
  W:    http://sourceforge.net/projects/bonding/
  S:    Supported
@@@ -2531,7 -2499,7 +2531,7 @@@ S:      Supporte
  F:    kernel/bpf/
  
  BROADCOM B44 10/100 ETHERNET DRIVER
 -M:    Gary Zambrano <zambrano@broadcom.com>
 +M:    Michael Chan <michael.chan@broadcom.com>
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/broadcom/b44.*
@@@ -2606,13 -2574,6 +2606,13 @@@ F:    arch/arm/mach-bcm/bcm_5301x.
  F:    arch/arm/boot/dts/bcm5301x*.dtsi
  F:    arch/arm/boot/dts/bcm470*
  
 +BROADCOM BCM53573 ARM ARCHITECTURE
 +M:    Rafał Miłecki <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/arm/boot/dts/bcm53573*
 +F:    arch/arm/boot/dts/bcm47189*
 +
  BROADCOM BCM63XX ARM ARCHITECTURE
  M:    Florian Fainelli <[email protected]>
  M:    [email protected]
@@@ -2926,14 -2887,6 +2926,14 @@@ S:    Maintaine
  F:    drivers/iio/light/cm*
  F:    Documentation/devicetree/bindings/i2c/trivial-devices.txt
  
 +CAVIUM I2C DRIVER
 +M:    Jan Glauber <[email protected]>
 +M:    David Daney <[email protected]>
 +W:    http://www.cavium.com
 +S:    Supported
 +F:    drivers/i2c/busses/i2c-octeon*
 +F:    drivers/i2c/busses/i2c-thunderx*
 +
  CAVIUM LIQUIDIO NETWORK DRIVER
  M:     Derek Chickles <[email protected]>
  M:     Satanand Burla <[email protected]>
@@@ -3181,7 -3134,7 +3181,7 @@@ L:      [email protected] (moderated fo
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git misc
  W:    http://coccinelle.lip6.fr/
  S:    Supported
 -F:    Documentation/coccinelle.txt
 +F:    Documentation/dev-tools/coccinelle.rst
  F:    scripts/coccinelle/
  F:    scripts/coccicheck
  
@@@ -3207,7 -3160,6 +3207,7 @@@ COMMON CLK FRAMEWOR
  M:    Michael Turquette <[email protected]>
  M:    Stephen Boyd <[email protected]>
  L:    [email protected]
 +Q:    http://patchwork.kernel.org/project/linux-clk/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git
  S:    Maintained
  F:    Documentation/devicetree/bindings/clock/
@@@ -3295,7 -3247,7 +3295,7 @@@ F:      kernel/cpuset.
  CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)
  M:    Johannes Weiner <[email protected]>
  M:    Michal Hocko <[email protected]>
 -M:    Vladimir Davydov <vdavydov@virtuozzo.com>
 +M:    Vladimir Davydov <vdavydov.dev@gmail.com>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -3316,7 -3268,7 +3316,7 @@@ S:      Maintaine
  F:    drivers/net/wan/cosa*
  
  CPMAC ETHERNET DRIVER
 -M:    Florian Fainelli <f[email protected]>
 +M:    Florian Fainelli <f[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/ti/cpmac.c
@@@ -3328,7 -3280,6 +3328,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)
 +F:    Documentation/cpu-freq/
  F:    drivers/cpufreq/
  F:    include/linux/cpufreq.h
  
@@@ -3540,14 -3491,14 +3540,14 @@@ F:   drivers/net/ethernet/chelsio/cxgb4vf
  
  CXL (IBM Coherent Accelerator Processor Interface CAPI) DRIVER
  M:    Ian Munsie <[email protected]>
 -M:    Michael Neuling <[email protected]>
 +M:    Frederic Barrat <[email protected]>
  L:    [email protected]
  S:    Supported
 +F:    arch/powerpc/platforms/powernv/pci-cxl.c
  F:    drivers/misc/cxl/
  F:    include/misc/cxl*
  F:    include/uapi/misc/cxl.h
  F:    Documentation/powerpc/cxl.txt
 -F:    Documentation/powerpc/cxl.txt
  F:    Documentation/ABI/testing/sysfs-class-cxl
  
  CXLFLASH (IBM Coherent Accelerator Processor Interface CAPI Flash) SCSI DRIVER
@@@ -3810,8 -3761,8 +3810,8 @@@ F:      drivers/leds/leds-da90??.
  F:    drivers/mfd/da903x.c
  F:    drivers/mfd/da90??-*.c
  F:    drivers/mfd/da91??-*.c
 -F:    drivers/power/da9052-battery.c
 -F:    drivers/power/da91??-*.c
 +F:    drivers/power/supply/da9052-battery.c
 +F:    drivers/power/supply/da91??-*.c
  F:    drivers/regulator/da903x.c
  F:    drivers/regulator/da9???-regulator.[ch]
  F:    drivers/rtc/rtc-da90??.c
@@@ -3827,12 -3778,6 +3827,12 @@@ F:    include/linux/regulator/da9211.
  F:    include/sound/da[79]*.h
  F:    sound/soc/codecs/da[79]*.[ch]
  
 +DIAMOND SYSTEMS GPIO-MM GPIO DRIVER
 +M:    William Breathitt Gray <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/gpio/gpio-gpio-mm.c
 +
  DIGI NEO AND CLASSIC PCI PRODUCTS
  M:    Lidza Louina <[email protected]>
  M:    Mark Hounschell <[email protected]>
@@@ -4458,6 -4403,7 +4458,6 @@@ F:      Documentation/filesystems/ecryptfs.t
  F:    fs/ecryptfs/
  
  EDAC-CORE
 -M:    Doug Thompson <[email protected]>
  M:    Borislav Petkov <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
@@@ -4470,12 -4416,14 +4470,12 @@@ F:   drivers/edac
  F:    include/linux/edac.h
  
  EDAC-AMD64
 -M:    Doug Thompson <[email protected]>
  M:    Borislav Petkov <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/edac/amd64_edac*
  
  EDAC-CALXEDA
 -M:    Doug Thompson <[email protected]>
  M:    Robert Richter <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -4491,21 -4439,17 +4491,21 @@@ F:   drivers/edac/octeon_edac
  
  EDAC-E752X
  M:    Mark Gross <[email protected]>
 -M:    Doug Thompson <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/edac/e752x_edac.c
  
  EDAC-E7XXX
 -M:    Doug Thompson <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/edac/e7xxx_edac.c
  
 +EDAC-FSL_DDR
 +M:    York Sun <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/edac/fsl_ddr_edac.*
 +
  EDAC-GHES
  M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
@@@ -4520,11 -4464,13 +4520,11 @@@ S:   Maintaine
  F:    drivers/edac/i82443bxgx_edac.c
  
  EDAC-I3000
 -M:    Jason Uhlenkott <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  F:    drivers/edac/i3000_edac.c
  
  EDAC-I5000
 -M:    Doug Thompson <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/edac/i5000_edac.c
@@@ -4636,13 -4582,6 +4636,13 @@@ M:    Peter Jones <[email protected]
  S:    Maintained
  F:    drivers/video/fbdev/efifb.c
  
 +EFI TEST DRIVER
 +L:    [email protected]
 +M:    Ivan Hu <[email protected]>
 +M:    Matt Fleming <[email protected]>
 +S:    Maintained
 +F:    drivers/firmware/efi/test/
 +
  EFS FILESYSTEM
  W:    http://aeschi.ch.eu.org/efs/
  S:    Orphan
@@@ -4910,7 -4849,6 +4910,7 @@@ F:      tools/firewire
  
  FIRMWARE LOADER (request_firmware)
  M:    Ming Lei <[email protected]>
 +M:    Luis R. Rodriguez <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/firmware_class/
@@@ -5131,9 -5069,10 +5131,9 @@@ F:     include/linux/fscrypto.
  
  F2FS FILE SYSTEM
  M:    Jaegeuk Kim <[email protected]>
 -M:    Changman Lee <[email protected]>
 -R:    Chao Yu <[email protected]>
 +M:    Chao Yu <[email protected]>
  L:    [email protected]
 -W:    http://en.wikipedia.org/wiki/F2FS
 +W:    https://f2fs.wiki.kernel.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git
  S:    Maintained
  F:    Documentation/filesystems/f2fs.txt
@@@ -5195,7 -5134,7 +5195,7 @@@ GCOV BASED KERNEL PROFILIN
  M:    Peter Oberparleiter <[email protected]>
  S:    Maintained
  F:    kernel/gcov/
 -F:    Documentation/gcov.txt
 +F:    Documentation/dev-tools/gcov.rst
  
  GDT SCSI DISK ARRAY CONTROLLER DRIVER
  M:    Achim Leubner <[email protected]>
  S:    Maintained
  F:    drivers/input/touchscreen/goodix.c
  
 +GPIO MOCKUP DRIVER
 +M:    Bamvor Jian Zhang <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/gpio/gpio-mockup.c
 +F:    tools/testing/selftests/gpio/
 +
  GPIO SUBSYSTEM
  M:    Linus Walleij <[email protected]>
  M:    Alexandre Courbot <[email protected]>
  S:    Maintained
  F:    drivers/net/ethernet/aeroflex/
  
 +GREYBUS SUBSYSTEM
 +M:    Johan Hovold <[email protected]>
 +M:    Alex Elder <[email protected]>
 +M:    Greg Kroah-Hartman <[email protected]>
 +S:    Maintained
 +F:    drivers/staging/greybus/
 +
 +GREYBUS AUDIO PROTOCOLS DRIVERS
 +M:    Vaibhav Agarwal <[email protected]>
 +M:    Mark Greer <[email protected]>
 +S:    Maintained
 +F:    drivers/staging/greybus/audio_apbridgea.c
 +F:    drivers/staging/greybus/audio_apbridgea.h
 +F:    drivers/staging/greybus/audio_codec.c
 +F:    drivers/staging/greybus/audio_codec.h
 +F:    drivers/staging/greybus/audio_gb.c
 +F:    drivers/staging/greybus/audio_manager.c
 +F:    drivers/staging/greybus/audio_manager.h
 +F:    drivers/staging/greybus/audio_manager_module.c
 +F:    drivers/staging/greybus/audio_manager_private.h
 +F:    drivers/staging/greybus/audio_manager_sysfs.c
 +F:    drivers/staging/greybus/audio_module.c
 +F:    drivers/staging/greybus/audio_topology.c
 +
 +GREYBUS PROTOCOLS DRIVERS
 +M:    Rui Miguel Silva <[email protected]>
 +S:    Maintained
 +F:    drivers/staging/greybus/sdio.c
 +F:    drivers/staging/greybus/light.c
 +F:    drivers/staging/greybus/gpio.c
 +F:    drivers/staging/greybus/power_supply.c
 +F:    drivers/staging/greybus/spi.c
 +F:    drivers/staging/greybus/spilib.c
 +
 +GREYBUS PROTOCOLS DRIVERS
 +M:    Bryan O'Donoghue <[email protected]>
 +S:    Maintained
 +F:    drivers/staging/greybus/loopback.c
 +F:    drivers/staging/greybus/timesync.c
 +F:    drivers/staging/greybus/timesync_platform.c
 +
 +GREYBUS PROTOCOLS DRIVERS
 +M:    Viresh Kumar <[email protected]>
 +S:    Maintained
 +F:    drivers/staging/greybus/authentication.c
 +F:    drivers/staging/greybus/bootrom.c
 +F:    drivers/staging/greybus/firmware.h
 +F:    drivers/staging/greybus/fw-core.c
 +F:    drivers/staging/greybus/fw-download.c
 +F:    drivers/staging/greybus/fw-managament.c
 +F:    drivers/staging/greybus/greybus_authentication.h
 +F:    drivers/staging/greybus/greybus_firmware.h
 +F:    drivers/staging/greybus/hid.c
 +F:    drivers/staging/greybus/i2c.c
 +F:    drivers/staging/greybus/spi.c
 +F:    drivers/staging/greybus/spilib.c
 +F:    drivers/staging/greybus/spilib.h
 +
 +GREYBUS PROTOCOLS DRIVERS
 +M:    David Lin <[email protected]>
 +S:    Maintained
 +F:    drivers/staging/greybus/uart.c
 +F:    drivers/staging/greybus/log.c
 +
 +GREYBUS PLATFORM DRIVERS
 +M:    Vaibhav Hiremath <[email protected]>
 +S:    Maintained
 +F:    drivers/staging/greybus/arche-platform.c
 +F:    drivers/staging/greybus/arche-apb-ctrl.c
 +F:    drivers/staging/greybus/arche_platform.h
 +
  GSPCA FINEPIX SUBDRIVER
  M:    Frank Zago <[email protected]>
  L:    [email protected]
@@@ -5721,9 -5582,10 +5721,9 @@@ F:     Documentation/devicetree/bindings/sc
  
  HOST AP DRIVER
  M:    Jouni Malinen <[email protected]>
 -L:    [email protected] (subscribers-only)
  L:    [email protected]
 -W:    http://hostap.epitest.fi/
 -S:    Maintained
 +W:    http://w1.fi/hostap-driver.html
 +S:    Obsolete
  F:    drivers/net/wireless/intersil/hostap/
  
  HP COMPAQ TC1100 TABLET WMI EXTRAS DRIVER
@@@ -5760,7 -5622,7 +5760,7 @@@ M:      Sebastian Reichel <[email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-bus-hsi
 -F:    Documentation/hsi.txt
 +F:    Documentation/device-drivers/serial-interfaces.rst
  F:    drivers/hsi/
  F:    include/linux/hsi/
  F:    include/uapi/linux/hsi/
@@@ -5814,8 -5676,6 +5814,8 @@@ S:      Maintaine
  F:    Documentation/i2c/i2c-topology
  F:    Documentation/i2c/muxes/
  F:    Documentation/devicetree/bindings/i2c/i2c-mux*
 +F:    Documentation/devicetree/bindings/i2c/i2c-arb*
 +F:    Documentation/devicetree/bindings/i2c/i2c-gate*
  F:    drivers/i2c/i2c-mux.c
  F:    drivers/i2c/muxes/
  F:    include/linux/i2c-mux.h
@@@ -6233,13 -6093,6 +6233,13 @@@ T:    git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    drivers/idle/intel_idle.c
  
 +INTEL INTEGRATED SENSOR HUB DRIVER
 +M:    Srinivas Pandruvada <[email protected]>
 +M:    Jiri Kosina <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/hid/intel-ish-hid/
 +
  INTEL PSTATE DRIVER
  M:    Srinivas Pandruvada <[email protected]>
  M:    Len Brown <[email protected]>
@@@ -6248,7 -6101,7 +6248,7 @@@ S:      Supporte
  F:    drivers/cpufreq/intel_pstate.c
  
  INTEL FRAMEBUFFER DRIVER (excluding 810 and 815)
 -M:    Maik Broemme <mbroemme@plusserver.de>
 +M:    Maik Broemme <mbroemme@libmpq.org>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/fb/intelfb.txt
@@@ -6750,7 -6603,7 +6750,7 @@@ L:      [email protected]
  S:    Maintained
  F:    arch/*/include/asm/kasan.h
  F:    arch/*/mm/kasan_init*
 -F:    Documentation/kasan.txt
 +F:    Documentation/dev-tools/kasan.rst
  F:    include/linux/kasan*.h
  F:    lib/test_kasan.c
  F:    mm/kasan/
@@@ -6966,7 -6819,7 +6966,7 @@@ KMEMCHEC
  M:    Vegard Nossum <[email protected]>
  M:    Pekka Enberg <[email protected]>
  S:    Maintained
 -F:    Documentation/kmemcheck.txt
 +F:    Documentation/dev-tools/kmemcheck.rst
  F:    arch/x86/include/asm/kmemcheck.h
  F:    arch/x86/mm/kmemcheck/
  F:    include/linux/kmemcheck.h
@@@ -6975,7 -6828,7 +6975,7 @@@ F:      mm/kmemcheck.
  KMEMLEAK
  M:    Catalin Marinas <[email protected]>
  S:    Maintained
 -F:    Documentation/kmemleak.txt
 +F:    Documentation/dev-tools/kmemleak.rst
  F:    include/linux/kmemleak.h
  F:    mm/kmemleak.c
  F:    mm/kmemleak-test.c
@@@ -7588,8 -7441,9 +7588,8 @@@ F:      Documentation/hwmon/max2075
  F:    drivers/hwmon/max20751.c
  
  MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER
 -M:    "Hans J. Koch" <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  F:    Documentation/hwmon/max6650
  F:    drivers/hwmon/max6650.c
  
@@@ -7610,12 -7464,11 +7610,12 @@@ F:   Documentation/devicetree/bindings/so
  F:    sound/soc/codecs/max9860.*
  
  MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS
 -M:    Krzysztof Kozlowski <[email protected]>
 +M:    Krzysztof Kozlowski <[email protected]>
 +M:    Bartlomiej Zolnierkiewicz <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    drivers/power/max14577_charger.c
 -F:    drivers/power/max77693_charger.c
 +F:    drivers/power/supply/max14577_charger.c
 +F:    drivers/power/supply/max77693_charger.c
  
  MAXIM MAX77802 MULTIFUNCTION PMIC DEVICE DRIVERS
  M:    Javier Martinez Canillas <[email protected]>
@@@ -7627,8 -7480,7 +7627,8 @@@ F:      include/dt-bindings/*/*max77802.
  
  MAXIM PMIC AND MUIC DRIVERS FOR EXYNOS BASED BOARDS
  M:    Chanwoo Choi <[email protected]>
 -M:    Krzysztof Kozlowski <[email protected]>
 +M:    Krzysztof Kozlowski <[email protected]>
 +M:    Bartlomiej Zolnierkiewicz <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/*/max14577*.c
  S:    Maintained
  F:    drivers/iio/potentiometer/mcp4531.c
  
 +MEASUREMENT COMPUTING CIO-DAC IIO DRIVER
 +M:    William Breathitt Gray <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/iio/dac/cio-dac.c
 +
  MEDIA DRIVERS FOR RENESAS - FCP
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
@@@ -7818,19 -7664,6 +7818,19 @@@ W:    http://www.mellanox.co
  Q:    http://patchwork.ozlabs.org/project/netdev/list/
  F:    drivers/net/ethernet/mellanox/mlxsw/
  
 +MELLANOX MLXCPLD LED DRIVER
 +M:    Vadim Pasternak <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/leds/leds-mlxcpld.c
 +F:    Documentation/leds/leds-mlxcpld.txt
 +
 +MELLANOX PLATFORM DRIVER
 +M:      Vadim Pasternak <[email protected]>
 +L:      [email protected]
 +S:      Supported
 +F:      arch/x86/platform/mellanox/mlx-platform.c
 +
  SOFT-ROCE DRIVER (rxe)
  M:    Moni Shoua <[email protected]>
  L:    [email protected]
@@@ -7916,12 -7749,6 +7916,12 @@@ T:    git git://git.monstr.eu/linux-2.6-mi
  S:    Supported
  F:    arch/microblaze/
  
 +MICROCHIP / ATMEL AT91 / AT32 SERIAL DRIVER
 +M:    Richard Genoud <[email protected]>
 +S:    Maintained
 +F:    drivers/tty/serial/atmel_serial.c
 +F:    include/linux/atmel_serial.h
 +
  MICROSOFT SURFACE PRO 3 BUTTON DRIVER
  M:    Chen Yu <[email protected]>
  L:    [email protected]
@@@ -8008,18 -7835,6 +8008,18 @@@ W:    http://www.melexis.co
  S:    Supported
  F:    drivers/iio/temperature/mlx90614.c
  
 +MICROSEMI SMART ARRAY SMARTPQI DRIVER (smartpqi)
 +M:    Don Brace <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/scsi/smartpqi/smartpqi*.[ch]
 +F:    drivers/scsi/smartpqi/Kconfig
 +F:    drivers/scsi/smartpqi/Makefile
 +F:    include/linux/cciss*.h
 +F:    include/uapi/linux/cciss*.h
 +F:    Documentation/scsi/smartpqi.txt
 +
  MN88472 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
@@@ -8145,7 -7960,6 +8145,7 @@@ MULTIFUNCTION DEVICES (MFD
  M:    Lee Jones <[email protected]>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git
  S:    Supported
 +F:    Documentation/devicetree/bindings/mfd/
  F:    drivers/mfd/
  F:    include/linux/mfd/
  
@@@ -8232,16 -8046,20 +8232,16 @@@ M:   Michael Schmitz <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/scsi/g_NCR5380.txt
 -F:    Documentation/scsi/dtc3x80.txt
  F:    drivers/scsi/NCR5380.*
  F:    drivers/scsi/arm/cumana_1.c
  F:    drivers/scsi/arm/oak.c
  F:    drivers/scsi/atari_scsi.*
  F:    drivers/scsi/dmx3191d.c
 -F:    drivers/scsi/dtc.*
  F:    drivers/scsi/g_NCR5380.*
  F:    drivers/scsi/g_NCR5380_mmio.c
  F:    drivers/scsi/mac_scsi.*
 -F:    drivers/scsi/pas16.*
  F:    drivers/scsi/sun3_scsi.*
  F:    drivers/scsi/sun3_scsi_vme.c
 -F:    drivers/scsi/t128.*
  
  NCR DUAL 700 SCSI DRIVER (MICROCHANNEL)
  M:    "James E.J. Bottomley" <[email protected]>
@@@ -8339,15 -8157,6 +8339,15 @@@ S:    Maintaine
  W:    https://fedorahosted.org/dropwatch/
  F:    net/core/drop_monitor.c
  
 +NETWORKING [DSA]
 +M:    Andrew Lunn <[email protected]>
 +M:    Vivien Didelot <[email protected]>
 +M:    Florian Fainelli <[email protected]>
 +S:    Maintained
 +F:    net/dsa/
 +F:    include/net/dsa.h
 +F:    drivers/net/dsa/
 +
  NETWORKING [GENERAL]
  M:    "David S. Miller" <[email protected]>
  L:    [email protected]
@@@ -8530,11 -8339,11 +8530,11 @@@ R:   Pali Rohár <[email protected]
  F:    include/linux/power/bq2415x_charger.h
  F:    include/linux/power/bq27xxx_battery.h
  F:    include/linux/power/isp1704_charger.h
 -F:    drivers/power/bq2415x_charger.c
 -F:    drivers/power/bq27xxx_battery.c
 -F:    drivers/power/bq27xxx_battery_i2c.c
 -F:    drivers/power/isp1704_charger.c
 -F:    drivers/power/rx51_battery.c
 +F:    drivers/power/supply/bq2415x_charger.c
 +F:    drivers/power/supply/bq27xxx_battery.c
 +F:    drivers/power/supply/bq27xxx_battery_i2c.c
 +F:    drivers/power/supply/isp1704_charger.c
 +F:    drivers/power/supply/rx51_battery.c
  
  NTB DRIVER CORE
  M:    Jon Mason <[email protected]>
@@@ -8923,7 -8732,7 +8923,7 @@@ F:      drivers/oprofile
  F:    include/linux/oprofile.h
  
  ORACLE CLUSTER FILESYSTEM 2 (OCFS2)
 -M:    Mark Fasheh <mfasheh@suse.com>
 +M:    Mark Fasheh <mfasheh@versity.com>
  M:    Joel Becker <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  W:    http://ocfs2.wiki.kernel.org
@@@ -9035,7 -8844,6 +9035,7 @@@ S:      Supporte
  F:    Documentation/virtual/paravirt_ops.txt
  F:    arch/*/kernel/paravirt*
  F:    arch/*/include/asm/paravirt.h
 +F:    include/linux/hypervisor.h
  
  PARIDE DRIVERS FOR PARALLEL PORT IDE DEVICES
  M:    Tim Waugh <[email protected]>
@@@ -9291,15 -9099,6 +9291,15 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/pci/hisilicon-pcie.txt
  F:    drivers/pci/host/pcie-hisi.c
  
 +PCIE DRIVER FOR ROCKCHIP
 +M:    Shawn Lin <[email protected]>
 +M:    Wenrui Li <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/pci/rockchip-pcie.txt
 +F:    drivers/pci/host/pcie-rockchip.c
 +
  PCIE DRIVER FOR QUALCOMM MSM
  M:     Stanimir Varbanov <[email protected]>
  L:     [email protected]
@@@ -9447,12 -9246,14 +9447,14 @@@ F:   drivers/pinctrl/sh-pfc
  
  PIN CONTROLLER - SAMSUNG
  M:    Tomasz Figa <[email protected]>
 -M:    Krzysztof Kozlowski <k[email protected]>
 +M:    Krzysztof Kozlowski <k[email protected]>
  M:    Sylwester Nawrocki <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/pinctrl/samsung/
+ F:    include/dt-bindings/pinctrl/samsung.h
+ F:    Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt
  
  PIN CONTROLLER - SINGLE
  M:    Tony Lindgren <[email protected]>
@@@ -9543,12 -9344,16 +9545,12 @@@ F:   drivers/powercap
  
  POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS
  M:    Sebastian Reichel <[email protected]>
 -M:    Dmitry Eremin-Solenikov <[email protected]>
 -M:    David Woodhouse <[email protected]>
  L:    [email protected]
 -T:    git git://git.infradead.org/battery-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git
  S:    Maintained
 -F:    Documentation/devicetree/bindings/power/
 -F:    Documentation/devicetree/bindings/power_supply/
 +F:    Documentation/devicetree/bindings/power/supply/
  F:    include/linux/power_supply.h
 -F:    drivers/power/
 -X:    drivers/power/avs/
 +F:    drivers/power/supply/
  
  POWER STATE COORDINATION INTERFACE (PSCI)
  M:    Mark Rutland <[email protected]>
@@@ -9884,12 -9689,6 +9886,12 @@@ T:    git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    drivers/net/wireless/ath/ath10k/
  
 +QUALCOMM EMAC GIGABIT ETHERNET DRIVER
 +M:    Timur Tabi <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/net/ethernet/qualcomm/emac/
 +
  QUALCOMM HEXAGON ARCHITECTURE
  M:    Richard Kuo <[email protected]>
  L:    [email protected]
@@@ -10110,12 -9909,6 +10112,12 @@@ F:  drivers/rpmsg
  F:    Documentation/rpmsg.txt
  F:    include/linux/rpmsg.h
  
 +RENESAS CLOCK DRIVERS
 +M:    Geert Uytterhoeven <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/clk/renesas/
 +
  RENESAS ETHERNET DRIVERS
  R:    Sergei Shtylyov <[email protected]>
  L:    [email protected]
@@@ -10151,7 -9944,6 +10153,7 @@@ F:    net/rfkill
  
  RHASHTABLE
  M:    Thomas Graf <[email protected]>
 +M:    Herbert Xu <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    lib/rhashtable.c
@@@ -10295,8 -10087,8 +10297,8 @@@ S:   Supporte
  F:    drivers/s390/cio/
  
  S390 DASD DRIVER
 -M:    Stefan Weinhuber <wein@de.ibm.com>
 -M:    Stefan Haberland <stefan.haberland@de.ibm.com>
 +M:    Stefan Haberland <[email protected].ibm.com>
 +M:    Jan Hoeppner <[email protected].ibm.com>
  L:    [email protected]
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
@@@ -10389,7 -10181,7 +10391,7 @@@ S:   Maintaine
  F:    drivers/platform/x86/samsung-laptop.c
  
  SAMSUNG AUDIO (ASoC) DRIVERS
 -M:    Krzysztof Kozlowski <k[email protected]>
 +M:    Krzysztof Kozlowski <k[email protected]>
  M:    Sangbeom Kim <[email protected]>
  M:    Sylwester Nawrocki <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -10404,8 -10196,7 +10406,8 @@@ F:   drivers/video/fbdev/s3c-fb.
  
  SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS
  M:    Sangbeom Kim <[email protected]>
 -M:    Krzysztof Kozlowski <[email protected]>
 +M:    Krzysztof Kozlowski <[email protected]>
 +M:    Bartlomiej Zolnierkiewicz <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -10460,23 -10251,9 +10462,23 @@@ F: drivers/nfc/s3fwrn
  SAMSUNG SOC CLOCK DRIVERS
  M:    Sylwester Nawrocki <[email protected]>
  M:    Tomasz Figa <[email protected]>
 +M:    Chanwoo Choi <[email protected]>
  S:    Supported
  L:    [email protected] (moderated for non-subscribers)
  F:    drivers/clk/samsung/
 +F:    include/dt-bindings/clock/exynos*.h
 +F:    Documentation/devicetree/bindings/clock/exynos*.txt
 +
 +SAMSUNG SPI DRIVERS
 +M:    Kukjin Kim <[email protected]>
 +M:    Krzysztof Kozlowski <[email protected]>
 +M:    Andi Shyti <[email protected]>
 +L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/spi/spi-samsung.txt
 +F:    drivers/spi/spi-s3c*
 +F:    include/linux/platform_data/spi-s3c64xx.h
  
  SAMSUNG SXGBE DRIVERS
  M:    Byungho An <[email protected]>
@@@ -10563,8 -10340,8 +10565,8 @@@ F:   drivers/thunderbolt
  TI BQ27XXX POWER SUPPLY DRIVER
  R:    Andrew F. Davis <[email protected]>
  F:    include/linux/power/bq27xxx_battery.h
 -F:    drivers/power/bq27xxx_battery.c
 -F:    drivers/power/bq27xxx_battery_i2c.c
 +F:    drivers/power/supply/bq27xxx_battery.c
 +F:    drivers/power/supply/bq27xxx_battery_i2c.c
  
  TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER
  M:    John Stultz <[email protected]>
@@@ -10792,12 -10569,12 +10794,12 @@@ S:        Maintaine
  F:    drivers/misc/phantom.c
  F:    include/uapi/linux/phantom.h
  
 -SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER
 -M:    Jayamohan Kallickal <jayamohan.kallickal@avagotech.com>
 -M:    Ketan Mukadam <ketan.mukadam@avagotech.com>
 -M:    John Soni Jose <sony.john@avagotech.com>
 +Emulex 10Gbps iSCSI - OneConnect DRIVER
 +M:    Subbu Seetharaman <subbu.seetharaman@broadcom.com>
 +M:    Ketan Mukadam <ketan.mukadam@broadcom.com>
 +M:    Jitendra Bhivare <jitendra.bhivare@broadcom.com>
  L:    [email protected]
 -W:    http://www.avagotech.com
 +W:    http://www.broadcom.com
  S:    Supported
  F:    drivers/scsi/be2iscsi/
  
@@@ -11324,7 -11101,6 +11326,7 @@@ F:   Documentation/spi
  F:    drivers/spi/
  F:    include/linux/spi/
  F:    include/uapi/linux/spi/
 +F:    tools/spi/
  
  SPIDERNET NETWORK DRIVER for CELL
  M:    Ishizaki Kou <[email protected]>
@@@ -11395,7 -11171,6 +11397,7 @@@ F:   drivers/staging/media/lirc
  STAGING - LUSTRE PARALLEL FILESYSTEM
  M:    Oleg Drokin <[email protected]>
  M:    Andreas Dilger <[email protected]>
 +M:    James Simmons <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  W:    http://wiki.lustre.org/
  S:    Maintained
@@@ -11422,6 -11197,13 +11424,6 @@@ M:  Florian Schilhabel <florian.c.schilh
  S:    Odd Fixes
  F:    drivers/staging/rtl8712/
  
 -STAGING - REALTEK RTL8723U WIRELESS DRIVER
 -M:    Larry Finger <[email protected]>
 -M:    Jes Sorensen <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/staging/rtl8723au/
 -
  STAGING - SILICON MOTION SM750 FRAME BUFFER DRIVER
  M:    Sudip Mukherjee <[email protected]>
  M:    Teddy Wang <[email protected]>
@@@ -11452,8 -11234,12 +11454,8 @@@ S:  Odd Fixe
  F:    drivers/staging/vt665?/
  
  STAGING - WILC1000 WIFI DRIVER
 -M:    Johnny Kim <[email protected]>
 -M:    Austin Shin <[email protected]>
 -M:    Chris Park <[email protected]>
 -M:    Tony Cho <[email protected]>
 -M:    Glen Lee <[email protected]>
 -M:    Leo Kim <[email protected]>
 +M:    Aditya Shankar <[email protected]>
 +M:    Ganesh Krishna <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/staging/wilc1000/
@@@ -11561,14 -11347,6 +11563,14 @@@ T: git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    drivers/mfd/syscon.c
  
 +SYSTEM RESET/SHUTDOWN DRIVERS
 +M:    Sebastian Reichel <[email protected]>
 +L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/power/reset/
 +F:    drivers/power/reset/
 +
  SYSV FILESYSTEM
  M:    Christoph Hellwig <[email protected]>
  S:    Maintained
@@@ -11829,7 -11607,7 +11831,7 @@@ F:   Documentation/devicetree/bindings/th
  THERMAL/CPU_COOLING
  M:    Amit Daniel Kachhap <[email protected]>
  M:    Viresh Kumar <[email protected]>
 -M:    Javi Merino <javi.merino@arm.com>
 +M:    Javi Merino <javi.merino@kernel.org>
  L:    [email protected]
  S:    Supported
  F:    Documentation/thermal/cpu-cooling-api.txt
@@@ -11917,7 -11695,7 +11919,7 @@@ F:   include/linux/platform_data/lp855x.
  TI LP8727 CHARGER DRIVER
  M:    Milo Kim <[email protected]>
  S:    Maintained
 -F:    drivers/power/lp8727_charger.c
 +F:    drivers/power/supply/lp8727_charger.c
  F:    include/linux/platform_data/lp8727.h
  
  TI LP8788 MFD DRIVER
@@@ -11926,7 -11704,7 +11928,7 @@@ S:   Maintaine
  F:    drivers/iio/adc/lp8788_adc.c
  F:    drivers/leds/leds-lp8788.c
  F:    drivers/mfd/lp8788*.c
 -F:    drivers/power/lp8788-charger.c
 +F:    drivers/power/supply/lp8788-charger.c
  F:    drivers/regulator/lp8788-*.c
  F:    include/linux/mfd/lp8788*.h
  
@@@ -12195,6 -11973,12 +12197,6 @@@ S:  Maintaine
  F:    drivers/tc/
  F:    include/linux/tc.h
  
 -U14-34F SCSI DRIVER
 -M:    Dario Ballabio <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/scsi/u14-34f.c
 -
  UBI FILE SYSTEM (UBIFS)
  M:    Richard Weinberger <[email protected]>
  M:    Artem Bityutskiy <[email protected]>
@@@ -12390,7 -12174,7 +12392,7 @@@ S:   Maintaine
  F:    drivers/net/usb/lan78xx.*
  
  USB MASS STORAGE DRIVER
 -M:    Matthew Dharm <[email protected]>
 +M:    Alan Stern <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -12474,7 -12258,6 +12476,7 @@@ F:   drivers/net/usb/rtl8150.
  USB SERIAL SUBSYSTEM
  M:    Johan Hovold <[email protected]>
  L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git
  S:    Maintained
  F:    Documentation/usb/usb-serial.txt
  F:    drivers/usb/serial/
@@@ -12488,7 -12271,6 +12490,7 @@@ F:   drivers/net/usb/smsc75xx.
  
  USB SMSC95XX ETHERNET DRIVER
  M:    Steve Glendinning <[email protected]>
 +M:    Microchip Linux Driver Support <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/usb/smsc95xx.*
@@@ -12595,6 -12377,7 +12597,6 @@@ F:   fs/hostfs
  F:    fs/hppfs/
  
  USERSPACE I/O (UIO)
 -M:    "Hans J. Koch" <[email protected]>
  M:    Greg Kroah-Hartman <[email protected]>
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
@@@ -12776,7 -12559,7 +12778,7 @@@ F:   include/linux/if_*vlan.
  F:    net/8021q/
  
  VLYNQ BUS
 -M:    Florian Fainelli <f[email protected]>
 +M:    Florian Fainelli <f[email protected]>
  L:    [email protected] (subscribers-only)
  S:    Maintained
  F:    drivers/vlynq/vlynq.c
@@@ -12922,6 -12705,12 +12924,6 @@@ F:  drivers/watchdog
  F:    include/linux/watchdog.h
  F:    include/uapi/linux/watchdog.h
  
 -WD7000 SCSI DRIVER
 -M:    Miroslav Zagorac <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/scsi/wd7000.c
 -
  WIIMOTE HID DRIVER
  M:    David Herrmann <[email protected]>
  L:    [email protected]
@@@ -12991,7 -12780,7 +12993,7 @@@ F:   drivers/input/touchscreen/wm97*.
  F:    drivers/mfd/arizona*
  F:    drivers/mfd/wm*.c
  F:    drivers/mfd/cs47l24*
 -F:    drivers/power/wm83*.c
 +F:    drivers/power/supply/wm83*.c
  F:    drivers/rtc/rtc-wm83*.c
  F:    drivers/regulator/wm8*.c
  F:    drivers/video/backlight/wm83*_bl.c
@@@ -13143,10 -12932,11 +13145,10 @@@ F:        arch/x86/xen/*swiotlb
  F:    drivers/xen/*swiotlb*
  
  XFS FILESYSTEM
 -P:    Silicon Graphics Inc
  M:    Dave Chinner <[email protected]>
 -M:    [email protected]
 -L:    [email protected]
 -W:    http://oss.sgi.com/projects/xfs
 +M:    [email protected]
 +L:    [email protected]
 +W:    http://xfs.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.git
  S:    Supported
  F:    Documentation/filesystems/xfs.txt
index d3e6bd80500619ab87267ae334a084c8778554ad,2d2593023fd0c7c592f9e7fe5dedfd911747a2b8..71ce201c903e378406c9acfc901042a8c2f1d170
                                status = "okay";
                        };
  
-                       spi@10680 {
-                               /*
-                                * We don't seem to have the W25Q32 on the
-                                * A1 Rev 2.0 boards, so disable SPI.
-                                * CS0: W25Q32 (doesn't appear to be present)
-                                * CS1:
-                                * CS2: mikrobus
-                                */
-                               pinctrl-0 = <&spi1_pins
-                                            &clearfog_spi1_cs_pins
-                                            &mikro_spi_pins>;
-                               pinctrl-names = "default";
-                               status = "okay";
-                               spi-flash@0 {
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
-                                       compatible = "w25q32", "jedec,spi-nor";
-                                       reg = <0>; /* Chip select 0 */
-                                       spi-max-frequency = <3000000>;
-                                       status = "disabled";
-                               };
-                       };
                        usb@58000 {
                                /* CON3, nearest  power. */
                                status = "okay";
  
                        port@0 {
                                reg = <0>;
 -                              label = "lan1";
 +                              label = "lan5";
                        };
  
                        port@1 {
                                reg = <1>;
 -                              label = "lan2";
 +                              label = "lan4";
                        };
  
                        port@2 {
  
                        port@3 {
                                reg = <3>;
 -                              label = "lan4";
 +                              label = "lan2";
                        };
  
                        port@4 {
                                reg = <4>;
 -                              label = "lan5";
 +                              label = "lan1";
                        };
  
                        port@5 {
                };
        };
  };
+ &spi1 {
+       /*
+        * We don't seem to have the W25Q32 on the
+        * A1 Rev 2.0 boards, so disable SPI.
+        * CS0: W25Q32 (doesn't appear to be present)
+        * CS1:
+        * CS2: mikrobus
+        */
+       pinctrl-0 = <&spi1_pins
+                    &clearfog_spi1_cs_pins
+                    &mikro_spi_pins>;
+       pinctrl-names = "default";
+       status = "okay";
+       spi-flash@0 {
+               #address-cells = <1>;
+               #size-cells = <0>;
+               compatible = "w25q32", "jedec,spi-nor";
+               reg = <0>; /* Chip select 0 */
+               spi-max-frequency = <3000000>;
+               status = "disabled";
+       };
+ };
index 445624a1a1de2fd3d1fda6fd9811a015e26d3dd3,5472800882997716bad62d065c5af662e3f1c44c..46d46d894a441d69dcf784fb2cf54d4d72038aa0
@@@ -2,6 -2,7 +2,6 @@@
  #include <dt-bindings/clock/bcm2835.h>
  #include <dt-bindings/clock/bcm2835-aux.h>
  #include <dt-bindings/gpio/gpio.h>
 -#include "skeleton.dtsi"
  
  /* This include file covers the common peripherals and configuration between
   * bcm2835 and bcm2836 implementations, leaving the CPU configuration to
@@@ -12,8 -13,6 +12,8 @@@
        compatible = "brcm,bcm2835";
        model = "BCM2835";
        interrupt-parent = <&intc>;
 +      #address-cells = <1>;
 +      #size-cells = <1>;
  
        chosen {
                bootargs = "earlyprintk console=ttyAMA0";
                        interrupts = <1 9>;
                        #address-cells = <1>;
                        #size-cells = <0>;
+                       clocks = <&clk_usb>;
+                       clock-names = "otg";
                };
  
                v3d: v3d@7ec00000 {
                        clock-frequency = <19200000>;
                };
  
+               clk_usb: clock@4 {
+                       compatible = "fixed-clock";
+                       reg = <4>;
+                       #clock-cells = <0>;
+                       clock-output-names = "otg";
+                       clock-frequency = <480000000>;
+               };
        };
  };
index f6d135245a4b9b3785fec6beda2e83564a7fa7a0,67e6452e2faee80c942ff4b84017a6399ddfc388..3c271cb4b2be323733de846ba9875f0a0a0069fc
        model = "Hardkernel Odroid XU";
        compatible = "hardkernel,odroid-xu", "samsung,exynos5410", "samsung,exynos5";
  
-       memory {
+       memory@40000000 {
+               device_type = "memory";
                reg = <0x40000000 0x7ea00000>;
        };
  
        chosen {
-               linux,stdout-path = &serial_2;
+               stdout-path = "serial2:115200n8";
        };
  
        emmc_pwrseq: pwrseq {
        samsung,dw-mshc-ciu-div = <3>;
        samsung,dw-mshc-sdr-timing = <0 4>;
        samsung,dw-mshc-ddr-timing = <0 2>;
 -      samsung,dw-mshc-hs400-timing = <0 2>;
 -      samsung,read-strobe-delay = <90>;
        pinctrl-names = "default";
        pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus1 &sd0_bus4 &sd0_bus8 &sd0_cd>;
        bus-width = <8>;
        cap-mmc-highspeed;
        mmc-hs200-1_8v;
 -      mmc-hs400-1_8v;
        vmmc-supply = <&ldo20_reg>;
        vqmmc-supply = <&ldo11_reg>;
  };
  &pinctrl_0 {
        emmc_nrst_pin: emmc-nrst {
                samsung,pins = "gpd1-0";
-               samsung,pin-function = <2>;
-               samsung,pin-pud = <0>;
-               samsung,pin-drv = <0>;
+               samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+               samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+               samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV1>;
        };
  
        pmic_dvs_3: pmic-dvs-3 {
                samsung,pins = "gpx0-0";
-               samsung,pin-function = <1>;
-               samsung,pin-pud = <0>;
-               samsung,pin-drv = <0>;
+               samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;
+               samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+               samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV1>;
        };
  
        pmic_dvs_2: pmic-dvs-2 {
                samsung,pins = "gpx0-1";
-               samsung,pin-function = <1>;
-               samsung,pin-pud = <0>;
-               samsung,pin-drv = <0>;
+               samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;
+               samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+               samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV1>;
        };
  
        pmic_dvs_1: pmic-dvs-1 {
                samsung,pins = "gpx0-2";
-               samsung,pin-function = <1>;
-               samsung,pin-pud = <0>;
-               samsung,pin-drv = <0>;
+               samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;
+               samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+               samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV1>;
                samsung,pin-val = <1>;
        };
  
        max77802_irq: max77802-irq {
                samsung,pins = "gpx0-4";
-               samsung,pin-function = <0xf>;
-               samsung,pin-pud = <0>;
-               samsung,pin-drv = <0>;
+               samsung,pin-function = <EXYNOS_PIN_FUNC_F>;
+               samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+               samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV1>;
        };
  };
  
index 91c4b3c7a8d51def2cd4ef18b3e1a5ec7628fb9f,48ca4e45256413cff6cdba981d951f5c55a65108..17ec2e2d7a60bda135d089cfdc404446c1f05039
@@@ -45,6 -45,7 +45,7 @@@
  #include <dt-bindings/clock/rk3288-cru.h>
  #include <dt-bindings/thermal/thermal.h>
  #include <dt-bindings/power/rk3288-power.h>
+ #include <dt-bindings/soc/rockchip,boot-mode.h>
  #include "skeleton.dtsi"
  
  / {
                #io-channel-cells = <1>;
                clocks = <&cru SCLK_SARADC>, <&cru PCLK_SARADC>;
                clock-names = "saradc", "apb_pclk";
 +              resets = <&cru SRST_SARADC>;
 +              reset-names = "saradc-apb";
                status = "disabled";
        };
  
                                clocks = <&cru ACLK_GPU>;
                        };
                };
+               reboot-mode {
+                       compatible = "syscon-reboot-mode";
+                       offset = <0x94>;
+                       mode-normal = <BOOT_NORMAL>;
+                       mode-recovery = <BOOT_RECOVERY>;
+                       mode-bootloader = <BOOT_FASTBOOT>;
+                       mode-loader = <BOOT_BL_DOWNLOAD>;
+               };
        };
  
        sgrf: syscon@ff740000 {
                        compatible = "rockchip,rk3288-io-voltage-domain";
                        status = "disabled";
                };
+               usbphy: usbphy {
+                       compatible = "rockchip,rk3288-usb-phy";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+                       usbphy0: usb-phy@320 {
+                               #phy-cells = <0>;
+                               reg = <0x320>;
+                               clocks = <&cru SCLK_OTGPHY0>;
+                               clock-names = "phyclk";
+                               #clock-cells = <0>;
+                       };
+                       usbphy1: usb-phy@334 {
+                               #phy-cells = <0>;
+                               reg = <0x334>;
+                               clocks = <&cru SCLK_OTGPHY1>;
+                               clock-names = "phyclk";
+                               #clock-cells = <0>;
+                       };
+                       usbphy2: usb-phy@348 {
+                               #phy-cells = <0>;
+                               reg = <0x348>;
+                               clocks = <&cru SCLK_OTGPHY2>;
+                               clock-names = "phyclk";
+                               #clock-cells = <0>;
+                       };
+               };
        };
  
        wdt: watchdog@ff800000 {
                };
        };
  
-       usbphy: phy {
-               compatible = "rockchip,rk3288-usb-phy";
-               rockchip,grf = <&grf>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-               status = "disabled";
-               usbphy0: usb-phy@320 {
-                       #phy-cells = <0>;
-                       reg = <0x320>;
-                       clocks = <&cru SCLK_OTGPHY0>;
-                       clock-names = "phyclk";
-                       #clock-cells = <0>;
-               };
-               usbphy1: usb-phy@334 {
-                       #phy-cells = <0>;
-                       reg = <0x334>;
-                       clocks = <&cru SCLK_OTGPHY1>;
-                       clock-names = "phyclk";
-                       #clock-cells = <0>;
-               };
-               usbphy2: usb-phy@348 {
-                       #phy-cells = <0>;
-                       reg = <0x348>;
-                       clocks = <&cru SCLK_OTGPHY2>;
-                       clock-names = "phyclk";
-                       #clock-cells = <0>;
-               };
-       };
        pinctrl: pinctrl {
                compatible = "rockchip,rk3288-pinctrl";
                rockchip,grf = <&grf>;
index e2cd683b4e4b3d19825adf4f28da4b356179e43d,405d61258f107516a561f8c48c8b18e22ba785bc..e15beb3c671ed58dcbc20b8a2e6df66851643179
@@@ -43,6 -43,7 +43,7 @@@
  
  #include <dt-bindings/interrupt-controller/irq.h>
  #include <dt-bindings/interrupt-controller/arm-gic.h>
+ #include <dt-bindings/soc/rockchip,boot-mode.h>
  #include "skeleton.dtsi"
  
  / {
        };
  
        pmu: pmu@20004000 {
-               compatible = "rockchip,rk3066-pmu", "syscon";
+               compatible = "rockchip,rk3066-pmu", "syscon", "simple-mfd";
                reg = <0x20004000 0x100>;
+               reboot-mode {
+                       compatible = "syscon-reboot-mode";
+                       offset = <0x40>;
+                       mode-normal = <BOOT_NORMAL>;
+                       mode-recovery = <BOOT_RECOVERY>;
+                       mode-bootloader = <BOOT_FASTBOOT>;
+                       mode-loader = <BOOT_BL_DOWNLOAD>;
+               };
        };
  
        grf: grf@20008000 {
                #io-channel-cells = <1>;
                clocks = <&cru SCLK_SARADC>, <&cru PCLK_SARADC>;
                clock-names = "saradc", "apb_pclk";
 +              resets = <&cru SRST_SARADC>;
 +              reset-names = "saradc-apb";
                status = "disabled";
        };
  
index 8b063ab10c19e9d2faff0f4e9b9a62421e091f45,55cb99f3f95440d59c92183d2e3b151e20532344..5430747c6b734afd2bf7b3971155ab2199ff4496
                        interrupt-names = "mmcirq";
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_mmc0>;
 -                      clock-names = "mmc";
 -                      clocks = <&clk_s_c0_flexgen CLK_MMC_0>;
 +                      clock-names = "mmc", "icn";
 +                      clocks = <&clk_s_c0_flexgen CLK_MMC_0>,
 +                               <&clk_s_c0_flexgen CLK_RX_ICN_HVA>;
                        bus-width = <8>;
-                       non-removable;
                };
  
                mmc1: sdhci@09080000 {
                        interrupt-names = "mmcirq";
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_sd1>;
 -                      clock-names = "mmc";
 -                      clocks = <&clk_s_c0_flexgen CLK_MMC_1>;
 +                      clock-names = "mmc", "icn";
 +                      clocks = <&clk_s_c0_flexgen CLK_MMC_1>,
 +                               <&clk_s_c0_flexgen CLK_RX_ICN_HVA>;
                        resets = <&softreset STIH407_MMC1_SOFTRESET>;
                        bus-width = <4>;
                };
                        clock-names = "ahci_clk";
                        clocks = <&clk_s_c0_flexgen CLK_ICN_REG>;
  
+                       ports-implemented = <0x1>;
                        status = "disabled";
                };
  
                        clock-names = "ahci_clk";
                        clocks = <&clk_s_c0_flexgen CLK_ICN_REG>;
  
+                       ports-implemented = <0x1>;
                        status = "disabled";
                };
  
                        compatible      = "st,sti-pwm";
                        #pwm-cells      = <2>;
                        reg             = <0x9810000 0x68>;
+                       interrupts      = <GIC_SPI 128 IRQ_TYPE_NONE>;
                        pinctrl-names   = "default";
                        pinctrl-0       = <&pinctrl_pwm0_chan0_default>;
                        clock-names     = "pwm";
                        clock-frequency = <600000000>;
                        st,syscfg       = <&syscfg_core 0x224>;
                };
+               /* fdma audio */
+               fdma0: dma-controller@8e20000 {
+                       compatible = "st,stih407-fdma-mpe31-11", "st,slim-rproc";
+                       reg = <0x8e20000 0x8000>,
+                             <0x8e30000 0x3000>,
+                             <0x8e37000 0x1000>,
+                             <0x8e38000 0x8000>;
+                       reg-names = "slimcore", "dmem", "peripherals", "imem";
+                       clocks = <&clk_s_c0_flexgen CLK_FDMA>,
+                                <&clk_s_c0_flexgen CLK_EXT2F_A9>,
+                                <&clk_s_c0_flexgen CLK_EXT2F_A9>,
+                                <&clk_s_c0_flexgen CLK_EXT2F_A9>;
+                       interrupts = <GIC_SPI 5 IRQ_TYPE_NONE>;
+                       dma-channels = <16>;
+                       #dma-cells = <3>;
+               };
+               /* fdma app */
+               fdma1: dma-controller@8e40000 {
+                       compatible = "st,stih407-fdma-mpe31-12", "st,slim-rproc";
+                       reg = <0x8e40000 0x8000>,
+                             <0x8e50000 0x3000>,
+                             <0x8e57000 0x1000>,
+                             <0x8e58000 0x8000>;
+                       reg-names = "slimcore", "dmem", "peripherals", "imem";
+                       clocks = <&clk_s_c0_flexgen CLK_FDMA>,
+                               <&clk_s_c0_flexgen CLK_TX_ICN_DMU>,
+                               <&clk_s_c0_flexgen CLK_TX_ICN_DMU>,
+                               <&clk_s_c0_flexgen CLK_EXT2F_A9>;
+                       interrupts = <GIC_SPI 7 IRQ_TYPE_NONE>;
+                       dma-channels = <16>;
+                       #dma-cells = <3>;
+               };
+               /* fdma free running */
+               fdma2: dma-controller@8e60000 {
+                       compatible = "st,stih407-fdma-mpe31-13", "st,slim-rproc";
+                       reg = <0x8e60000 0x8000>,
+                             <0x8e70000 0x3000>,
+                             <0x8e77000 0x1000>,
+                             <0x8e78000 0x8000>;
+                       reg-names = "slimcore", "dmem", "peripherals", "imem";
+                       interrupts = <GIC_SPI 9 IRQ_TYPE_NONE>;
+                       dma-channels = <16>;
+                       #dma-cells = <3>;
+                       clocks = <&clk_s_c0_flexgen CLK_FDMA>,
+                               <&clk_s_c0_flexgen CLK_EXT2F_A9>,
+                               <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>,
+                               <&clk_s_c0_flexgen CLK_EXT2F_A9>;
+               };
+               sti_sasg_codec: sti-sasg-codec {
+                       compatible = "st,stih407-sas-codec";
+                       #sound-dai-cells = <1>;
+                       status = "disabled";
+                       st,syscfg = <&syscfg_core>;
+               };
+               sti_uni_player0: sti-uni-player@8d80000 {
+                       compatible = "st,sti-uni-player";
+                       #sound-dai-cells = <0>;
+                       st,syscfg = <&syscfg_core>;
+                       clocks = <&clk_s_d0_flexgen CLK_PCM_0>;
+                       assigned-clocks = <&clk_s_d0_quadfs 0>, <&clk_s_d0_flexgen CLK_PCM_0>;
+                       assigned-clock-parents = <0>, <&clk_s_d0_quadfs 0>;
+                       assigned-clock-rates = <50000000>;
+                       reg = <0x8d80000 0x158>;
+                       interrupts = <GIC_SPI 84 IRQ_TYPE_NONE>;
+                       dmas = <&fdma0 2 0 1>;
+                       dai-name = "Uni Player #0 (HDMI)";
+                       dma-names = "tx";
+                       st,uniperiph-id = <0>;
+                       st,version = <5>;
+                       st,mode = "HDMI";
+                       status          = "disabled";
+               };
+               sti_uni_player1: sti-uni-player@8d81000 {
+                       compatible = "st,sti-uni-player";
+                       #sound-dai-cells = <0>;
+                       st,syscfg = <&syscfg_core>;
+                       clocks = <&clk_s_d0_flexgen CLK_PCM_1>;
+                       assigned-clocks = <&clk_s_d0_quadfs 1>, <&clk_s_d0_flexgen CLK_PCM_1>;
+                       assigned-clock-parents = <0>, <&clk_s_d0_quadfs 1>;
+                       assigned-clock-rates = <50000000>;
+                       reg = <0x8d81000 0x158>;
+                       interrupts = <GIC_SPI 85 IRQ_TYPE_NONE>;
+                       dmas = <&fdma0 3 0 1>;
+                       dai-name = "Uni Player #1 (PIO)";
+                       dma-names = "tx";
+                       st,uniperiph-id = <1>;
+                       st,version = <5>;
+                       st,mode = "PCM";
+                       status = "disabled";
+               };
+               sti_uni_player2: sti-uni-player@8d82000 {
+                       compatible = "st,sti-uni-player";
+                       #sound-dai-cells = <0>;
+                       st,syscfg = <&syscfg_core>;
+                       clocks = <&clk_s_d0_flexgen CLK_PCM_2>;
+                       assigned-clocks = <&clk_s_d0_quadfs 2>, <&clk_s_d0_flexgen CLK_PCM_2>;
+                       assigned-clock-parents = <0>, <&clk_s_d0_quadfs 2>;
+                       assigned-clock-rates = <50000000>;
+                       reg = <0x8d82000 0x158>;
+                       interrupts = <GIC_SPI 86 IRQ_TYPE_NONE>;
+                       dmas = <&fdma0 4 0 1>;
+                       dai-name = "Uni Player #1 (DAC)";
+                       dma-names = "tx";
+                       st,uniperiph-id = <2>;
+                       st,version = <5>;
+                       st,mode = "PCM";
+                       status = "disabled";
+               };
+               sti_uni_player3: sti-uni-player@8d85000 {
+                       compatible = "st,sti-uni-player";
+                       #sound-dai-cells = <0>;
+                       st,syscfg = <&syscfg_core>;
+                       clocks = <&clk_s_d0_flexgen CLK_SPDIFF>;
+                       assigned-clocks = <&clk_s_d0_quadfs 3>, <&clk_s_d0_flexgen CLK_SPDIFF>;
+                       assigned-clock-parents = <0>, <&clk_s_d0_quadfs 3>;
+                       assigned-clock-rates = <50000000>;
+                       reg = <0x8d85000 0x158>;
+                       interrupts = <GIC_SPI 89 IRQ_TYPE_NONE>;
+                       dmas = <&fdma0 7 0 1>;
+                       dma-names = "tx";
+                       dai-name = "Uni Player #1 (PIO)";
+                       st,uniperiph-id = <3>;
+                       st,version = <5>;
+                       st,mode = "SPDIF";
+                       status = "disabled";
+               };
+               sti_uni_reader0: sti-uni-reader@8d83000 {
+                       compatible = "st,sti-uni-reader";
+                       #sound-dai-cells = <0>;
+                       st,syscfg = <&syscfg_core>;
+                       reg = <0x8d83000 0x158>;
+                       interrupts = <GIC_SPI 87 IRQ_TYPE_NONE>;
+                       dmas = <&fdma0 5 0 1>;
+                       dma-names = "rx";
+                       dai-name = "Uni Reader #0 (PCM IN)";
+                       st,version = <3>;
+                       status = "disabled";
+               };
+               sti_uni_reader1: sti-uni-reader@8d84000 {
+                       compatible = "st,sti-uni-reader";
+                       #sound-dai-cells = <0>;
+                       st,syscfg = <&syscfg_core>;
+                       reg = <0x8d84000 0x158>;
+                       interrupts = <GIC_SPI 88 IRQ_TYPE_NONE>;
+                       dmas = <&fdma0 6 0 1>;
+                       dma-names = "rx";
+                       dai-name = "Uni Reader #1 (HDMI RX)";
+                       st,version = <3>;
+                       status = "disabled";
+               };
        };
  };
index 40318869c733668a15e3d318ff291c3221336125,2d231300bf27efd23d27c2a5b011eeb8add16ce4..a3ef7341c051c267d15b31cdae104ba43e6bd1de
@@@ -41,8 -41,7 +41,8 @@@
                        compatible = "st,st-ohci-300x";
                        reg = <0x9a03c00 0x100>;
                        interrupts = <GIC_SPI 180 IRQ_TYPE_NONE>;
 -                      clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>;
 +                      clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>,
 +                               <&clk_s_c0_flexgen CLK_RX_ICN_DISP_0>;
                        resets = <&powerdown STIH407_USB2_PORT0_POWERDOWN>,
                                 <&softreset STIH407_USB2_PORT0_SOFTRESET>;
                        reset-names = "power", "softreset";
@@@ -58,8 -57,7 +58,8 @@@
                        interrupts = <GIC_SPI 151 IRQ_TYPE_NONE>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_usb0>;
 -                      clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>;
 +                      clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>,
 +                               <&clk_s_c0_flexgen CLK_RX_ICN_DISP_0>;
                        resets = <&powerdown STIH407_USB2_PORT0_POWERDOWN>,
                                 <&softreset STIH407_USB2_PORT0_SOFTRESET>;
                        reset-names = "power", "softreset";
@@@ -73,8 -71,7 +73,8 @@@
                        compatible = "st,st-ohci-300x";
                        reg = <0x9a83c00 0x100>;
                        interrupts = <GIC_SPI 181 IRQ_TYPE_NONE>;
 -                      clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>;
 +                      clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>,
 +                               <&clk_s_c0_flexgen CLK_RX_ICN_DISP_0>;
                        resets = <&powerdown STIH407_USB2_PORT1_POWERDOWN>,
                                 <&softreset STIH407_USB2_PORT1_SOFTRESET>;
                        reset-names = "power", "softreset";
@@@ -90,8 -87,7 +90,8 @@@
                        interrupts = <GIC_SPI 153 IRQ_TYPE_NONE>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_usb1>;
 -                      clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>;
 +                      clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>,
 +                               <&clk_s_c0_flexgen CLK_RX_ICN_DISP_0>;
                        resets = <&powerdown STIH407_USB2_PORT1_POWERDOWN>,
                                 <&softreset STIH407_USB2_PORT1_SOFTRESET>;
                        reset-names = "power", "softreset";
                        #size-cells = <1>;
  
                        assigned-clocks = <&clk_s_d2_quadfs 0>,
-                                         <&clk_s_d2_quadfs 0>,
+                                         <&clk_s_d2_quadfs 1>,
+                                         <&clk_s_c0_pll1 0>,
+                                         <&clk_s_c0_flexgen CLK_COMPO_DVP>,
+                                         <&clk_s_c0_flexgen CLK_MAIN_DISP>,
                                          <&clk_s_d2_flexgen CLK_PIX_MAIN_DISP>,
                                          <&clk_s_d2_flexgen CLK_PIX_AUX_DISP>,
                                          <&clk_s_d2_flexgen CLK_PIX_GDP1>,
  
                        assigned-clock-parents = <0>,
                                                 <0>,
+                                                <0>,
+                                                <&clk_s_c0_pll1 0>,
+                                                <&clk_s_c0_pll1 0>,
                                                 <&clk_s_d2_quadfs 0>,
-                                                <&clk_s_d2_quadfs 0>,
+                                                <&clk_s_d2_quadfs 1>,
                                                 <&clk_s_d2_quadfs 0>,
                                                 <&clk_s_d2_quadfs 0>,
                                                 <&clk_s_d2_quadfs 0>,
                                                 <&clk_s_d2_quadfs 0>;
  
-                       assigned-clock-rates = <297000000>, <297000000>;
+                       assigned-clock-rates = <297000000>,
+                                              <108000000>,
+                                              <0>,
+                                              <400000000>,
+                                              <400000000>;
  
                        ranges;
  
                        clock-names = "bdisp";
                        clocks = <&clk_s_c0_flexgen CLK_IC_BDISP_0>;
                };
+               hva@8c85000 {
+                       compatible = "st,st-hva";
+                       reg = <0x8c85000 0x400>, <0x6000000 0x40000>;
+                       reg-names = "hva_registers", "hva_esram";
+                       interrupts = <GIC_SPI 58 IRQ_TYPE_NONE>,
+                                    <GIC_SPI 59 IRQ_TYPE_NONE>;
+                       clock-names = "clk_hva";
+                       clocks = <&clk_s_c0_flexgen CLK_HVA>;
+               };
+               thermal@91a0000 {
+                       compatible = "st,stih407-thermal";
+                       reg = <0x91a0000 0x28>;
+                       clock-names = "thermal";
+                       clocks = <&clk_sysin>;
+                       interrupts = <GIC_SPI 205 IRQ_TYPE_EDGE_RISING>;
+               };
        };
  };
index 2e0741b3de606187cb07e8467f0e0d683b0324f3,8e69328c00e4db63db81ba9848c2479d7a07b56f..336ee4fb587dd873ffb5cb8fc72523879fca6181
@@@ -45,6 -45,7 +45,7 @@@
   *     OTHER DEALINGS IN THE SOFTWARE.
   */
  
+ #include "skeleton.dtsi"
  #include "armv7-m.dtsi"
  #include <dt-bindings/pinctrl/stm32f429-pinfunc.h>
  
                        reg = <0x40013800 0x400>;
                };
  
 +              exti: interrupt-controller@40013c00 {
 +                      compatible = "st,stm32-exti";
 +                      interrupt-controller;
 +                      #interrupt-cells = <2>;
 +                      reg = <0x40013C00 0x400>;
 +                      interrupts = <1>, <2>, <3>, <6>, <7>, <8>, <9>, <10>, <23>, <40>, <41>, <42>, <62>, <76>;
 +              };
 +
                pin-controller {
                        #address-cells = <1>;
                        #size-cells = <1>;
                };
  
                rcc: rcc@40023810 {
 +                      #reset-cells = <1>;
                        #clock-cells = <2>;
                        compatible = "st,stm32f42xx-rcc", "st,stm32-rcc";
                        reg = <0x40023800 0x400>;
index e3b196e08ccf575d4c4c1bbd858874b3d6c0a225,6d6509c71009ea3a41a90c4e57af257bfca51f33..826877b14bfff5c0d5ca55f024de82384d4f8fcf
                                             "mmc2_sample";
                };
  
+               nand_clk: clk@01c20080 {
+                       #clock-cells = <0>;
+                       compatible = "allwinner,sun4i-a10-mod0-clk";
+                       reg = <0x01c20080 0x4>;
+                       clocks = <&osc24M>, <&pll6 1>;
+                       clock-output-names = "nand";
+               };
                usb_clk: clk@01c200cc {
                        #clock-cells = <1>;
                        #reset-cells = <1>;
                };
  
                mmc0: mmc@01c0f000 {
 -                      compatible = "allwinner,sun5i-a13-mmc";
 +                      compatible = "allwinner,sun7i-a20-mmc";
                        reg = <0x01c0f000 0x1000>;
                        clocks = <&ahb1_gates 8>,
                                 <&mmc0_clk 0>,
                };
  
                mmc1: mmc@01c10000 {
 -                      compatible = "allwinner,sun5i-a13-mmc";
 +                      compatible = "allwinner,sun7i-a20-mmc";
                        reg = <0x01c10000 0x1000>;
                        clocks = <&ahb1_gates 9>,
                                 <&mmc1_clk 0>,
                };
  
                mmc2: mmc@01c11000 {
 -                      compatible = "allwinner,sun5i-a13-mmc";
 +                      compatible = "allwinner,sun7i-a20-mmc";
                        reg = <0x01c11000 0x1000>;
                        clocks = <&ahb1_gates 10>,
                                 <&mmc2_clk 0>,
                        #size-cells = <0>;
                };
  
+               nfc: nand@01c03000 {
+                       compatible = "allwinner,sun4i-a10-nand";
+                       reg = <0x01c03000 0x1000>;
+                       interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&ahb1_gates 13>, <&nand_clk>;
+                       clock-names = "ahb", "mod";
+                       resets = <&ahb1_rst 13>;
+                       reset-names = "ahb";
+                       status = "disabled";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+               };
                ehci0: usb@01c1a000 {
                        compatible = "allwinner,sun8i-a23-ehci", "generic-ehci";
                        reg = <0x01c1a000 0x100>;
index 8a95e3613488d7834b2eb4b923308b45c6b607b2,6d83b8674201d9a977b22b8858d177b966407956..9ea313d9fa3a0e2f7ef433898b26d28d09da8eeb
                };
  
                mmc0: mmc@01c0f000 {
 -                      compatible = "allwinner,sun5i-a13-mmc";
 +                      compatible = "allwinner,sun7i-a20-mmc";
                        reg = <0x01c0f000 0x1000>;
                        clocks = <&ccu CLK_BUS_MMC0>,
                                 <&ccu CLK_MMC0>,
                };
  
                mmc1: mmc@01c10000 {
 -                      compatible = "allwinner,sun5i-a13-mmc";
 +                      compatible = "allwinner,sun7i-a20-mmc";
                        reg = <0x01c10000 0x1000>;
                        clocks = <&ccu CLK_BUS_MMC1>,
                                 <&ccu CLK_MMC1>,
                };
  
                mmc2: mmc@01c11000 {
 -                      compatible = "allwinner,sun5i-a13-mmc";
 +                      compatible = "allwinner,sun7i-a20-mmc";
                        reg = <0x01c11000 0x1000>;
                        clocks = <&ccu CLK_BUS_MMC2>,
                                 <&ccu CLK_MMC2>,
                        interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
                };
  
+               pwm: pwm@01c21400 {
+                       compatible = "allwinner,sun8i-h3-pwm";
+                       reg = <0x01c21400 0x8>;
+                       clocks = <&osc24M>;
+                       #pwm-cells = <3>;
+                       status = "disabled";
+               };
                uart0: serial@01c28000 {
                        compatible = "snps,dw-apb-uart";
                        reg = <0x01c28000 0x400>;
index 35c0d65fe7f1891d7782c54fd74d879e5a99dfaf,ca997114b1f46a3e1eda3f552114ef4b458e4c1c..c9f7e9274aa8ace16cbd84d02c86b7efd9cccd20
@@@ -37,7 -37,6 +37,7 @@@ static struct of_dev_auxdata da850_auxd
        OF_DEV_AUXDATA("ti,davinci-dm6467-emac", 0x01e20000, "davinci_emac.1",
                       NULL),
        OF_DEV_AUXDATA("ti,da830-mcasp-audio", 0x01d00000, "davinci-mcasp.0", NULL),
 +      OF_DEV_AUXDATA("ti,da850-aemif", 0x68000000, "ti-aemif", NULL),
        {}
  };
  
@@@ -50,6 -49,7 +50,7 @@@ static void __init da850_init_machine(v
  
  static const char *const da850_boards_compat[] __initconst = {
        "enbw,cmc",
+       "ti,da850-lcdk",
        "ti,da850-evm",
        "ti,da850",
        NULL,
This page took 0.24099 seconds and 4 git commands to generate.