Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM DT updates from Arnd Bergmann:
 "These are all the updates to device tree files for 32-bit platforms,
  which as usual makes up the bulk of the ARM SoC changes: 462 non-merge
  changesets, 450 files changed, 23340 insertions, 5216 deletions.

  The three platforms that are added with the "soc" branch are here as
  well, and we add some related machine files:

   - For Aspeed AST2400/AST2500, we get the evaluation platform and the
     Tyan Palmetto POWER8 mainboard that uses the AST2400 BMC
   - For Oxnas 810SE, the Western Digital "My Book World Edition" is
     added as the only platform at the moment.
   - For ARM MPS2, the AN385 (Cortex-M3) and AN399 (Cortex-M7) are
     supported

  On the ARM Realview development platform, we now support all machines
  with device tree, previously only the board files were supported,
  which in turn will likely be removed soon.

  Qualcomm IPQ4019 is the second generation ARM based "Internet
  Processor", following the IPQ806x that is used in many high-end WiFi
  routers.  This one integrates two ath10k wifi radios that were
  previously on separate chips.

  Other boards that got added for existing chips are:

  Ti OMAP family:
     - Amazon Kindle Fire, first generation, tablet and ebook reader
     - OnRISC Baltos iR 2110 and 3220 embedded industrial PCs
     - TI AM5728 IDK, TI AM3359 ICE-V2, and TI DRA722 Rev C EVM
       development systems

  Samsung EXYNOS platform:
     - Samsung ARTIK5 evaluation board, see

        https://www.artik.io/modules/overview/artik-5/

  NXP i.MX platforms:
     - Ka-Ro electronics TX6S-8034, TX6S-8035, TX6U-8033, TX6U-81xx,
       TX6Q-1036, TX6Q-1110/-1130, TXUL-0010 and TXUL-0011 industrial
       SoM modules
     - Embest MarS Board i.MX6Dual DIY platform
     - Boundary Devices i.MX6 Quad Plus Nitrogen6_MAX and SoloX
       Nitrogen6sx embedded boards
     - Technexion Pico i.MX6UL compute module
     - ZII VF610 Development Board

  Marvell embedded (mvebu, orion, kirkwood) platforms:
     - Linksys Viper (E4200v2 / EA4500) WiFi router
     - Buffalo Kurobox Pro NAS

  Qualcomm Snapdragon:
     - Arrow DragonBoard 600c (96boards) with APQ8064 Snapdragon 600

  Rockchips platform:
     - mqmaker MiQi single-board computer

  Altera SoCFPGA:
     - samtec VIN|ING 1000 vehicle communication interface

  Allwinner Sunxi platforms:
     - Dserve DSRV9703C tablet
     - Difrnce DIT4350 tablet
     - Colorfly E708 Q1 tablet
     - Polaroid MID2809PXE04 tablet
     - Olimex A20 OLinuXino LIME2 single board computer
     - Xunlong Orange Pi 2, Orange Pi One, and Orange Pi PC single board
       computers

  Across many platforms, bug fixes went in to address warnings that dtc
  now emits with 'make dtbs W=1'.  Further changes for device enablement
  went into Ti OMAP, bcm283x (Raspberry Pi), bcm47xx (wifi router), Ti
  Davinci, Samsung EXYNOS, Marvell mvebu/kirkwood/orion, NXP i.MX/Vybrid
  NXP LPC18xx, NXP LPC32xx, Renesas shmobile/r-mobile/r-car, Rockchips
  rk3xxx, ST Ux500, ST STi, Atmel AT91/SAMA5, Altera SoCFPGA, Allwinner
  Sunxi, Sigma Designs Tango, NVIDIA Tegra, Socionext Uniphier and ARM
  Versatile Express"

* tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (458 commits)
  ARM: dts: tango4: Import watchdog node
  ARM: dts: tango4: Update cpus node for cpufreq
  ARM: dts: tango4: Update DT to match clk driver
  ARM: dts: tango4: Initial thermal support
  arm/dst: Add Aspeed ast2500 device tree
  arm/dts: Add Aspeed ast2400 device tree
  ARM: sun7i: dt: Add pll3 and pll7 clocks
  ARM: dts: sunxi: Add a olinuxino-lime2-emmc
  ARM: dts: at91: sama5d4: add trng node
  ARM: dts: at91: sama5d3: add trng node
  ARM: dts: at91: sama5d2: add trng node
  ARM: dts: at91: at91sam9g45 family: reduce the trng register map size
  ARM: sun4i: dt: Add pll3 and pll7 clocks
  ARM: sun5i: chip: Enable the TV Encoder
  ARM: sun5i: r8: Add display blocks to the DTSI
  ARM: sun5i: a13: Add display and TCON clocks
  ARM: dts: ux500: configure the accelerometers open drain
  ARM: mx5: dts: Enable USB OTG on M53EVK
  ARM: dts: imx6ul-14x14-evk: Add audio support
  ARM: dts: imx6qdl: Remove unneeded unit-addresses
  ...

diff --cc Documentation/devicetree/bindings/arm/atmel-at91.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/boot/dts/am335x-baltos-ir5221.dts
index 4e28d87e935637140af712abf5a661f338437db9,227cdfb4df086b013ab99b06123f9000aee292bb..d0faa7b8c5da91f318c2de4c5be19af910f17386
--- 1/arch/arm/boot/dts/am335x-baltos-ir5221.dts
--- 2/arch/arm/boot/dts/am335x-baltos-ir5221.dts
+++ b/arch/arm/boot/dts/am335x-baltos-ir5221.dts
@@@ -367,115 -117,10 +117,13 @@@
        dr_mode = "otg";
  };
  
- &cppi41dma  {
-       status = "okay";
- };
- 
- #include "tps65910.dtsi"
- 
- &tps {
-       vcc1-supply = <&vbat>;
-       vcc2-supply = <&vbat>;
-       vcc3-supply = <&vbat>;
-       vcc4-supply = <&vbat>;
-       vcc5-supply = <&vbat>;
-       vcc6-supply = <&vbat>;
-       vcc7-supply = <&vbat>;
-       vccio-supply = <&vbat>;
- 
-       ti,en-ck32k-xtal = <1>;
- 
-       regulators {
-               vrtc_reg: regulator@0 {
-                       regulator-always-on;
-               };
- 
-               vio_reg: regulator@1 {
-                       regulator-always-on;
-               };
- 
-               vdd1_reg: regulator@2 {
-                       /* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */
-                       regulator-name = "vdd_mpu";
-                       regulator-min-microvolt = <912500>;
-                       regulator-max-microvolt = <1312500>;
-                       regulator-boot-on;
-                       regulator-always-on;
-               };
- 
-               vdd2_reg: regulator@3 {
-                       /* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */
-                       regulator-name = "vdd_core";
-                       regulator-min-microvolt = <912500>;
-                       regulator-max-microvolt = <1150000>;
-                       regulator-boot-on;
-                       regulator-always-on;
-               };
- 
-               vdd3_reg: regulator@4 {
-                       regulator-always-on;
-               };
- 
-               vdig1_reg: regulator@5 {
-                       regulator-always-on;
-               };
- 
-               vdig2_reg: regulator@6 {
-                       regulator-always-on;
-               };
- 
-               vpll_reg: regulator@7 {
-                       regulator-always-on;
-               };
- 
-               vdac_reg: regulator@8 {
-                       regulator-always-on;
-               };
- 
-               vaux1_reg: regulator@9 {
-                       regulator-always-on;
-               };
- 
-               vaux2_reg: regulator@10 {
-                       regulator-always-on;
-               };
- 
-               vaux33_reg: regulator@11 {
-                       regulator-always-on;
-               };
- 
-               vmmc_reg: regulator@12 {
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <3300000>;
-                       regulator-always-on;
-               };
-       };
- };
- 
- &mac {
-       pinctrl-names = "default", "sleep";
-       pinctrl-0 = <&cpsw_default>;
-       pinctrl-1 = <&cpsw_sleep>;
-       dual_emac = <1>;
- 
-       status = "okay";
- };
- 
- &davinci_mdio {
-       pinctrl-names = "default", "sleep";
-       pinctrl-0 = <&davinci_mdio_default>;
-       pinctrl-1 = <&davinci_mdio_sleep>;
- 
-       status = "okay";
- };
- 
  &cpsw_emac0 {
 -      phy_id = <&davinci_mdio>, <0>;
        phy-mode = "rmii";
        dual_emac_res_vlan = <1>;
 +      fixed-link {
 +              speed = <100>;
 +              full-duplex;
 +      };
  };
  
  &cpsw_emac1 {

diff --cc arch/arm/boot/dts/am33xx.dtsi
Simple merge

diff --cc arch/arm/boot/dts/am4372.dtsi
Simple merge

diff --cc arch/arm/boot/dts/am43x-epos-evm.dts
Simple merge

diff --cc arch/arm/boot/dts/am57xx-beagle-x15.dts
Simple merge

diff --cc arch/arm/boot/dts/armada-385-linksys.dtsi
Simple merge

diff --cc arch/arm/boot/dts/dra7xx-clocks.dtsi
Simple merge

diff --cc arch/arm/boot/dts/exynos5420-peach-pit.dts
Simple merge

diff --cc arch/arm/boot/dts/omap34xx.dtsi
Simple merge

diff --cc arch/arm/boot/dts/omap4.dtsi
Simple merge

diff --cc arch/arm/boot/dts/omap5-board-common.dtsi
Simple merge

diff --cc arch/arm/boot/dts/omap5-cm-t54.dts
Simple merge

diff --cc arch/arm/boot/dts/omap5.dtsi
Simple merge

diff --cc arch/arm/boot/dts/qcom-apq8064.dtsi
Simple merge

diff --cc arch/arm/boot/dts/qcom-msm8974.dtsi
Simple merge

diff --cc arch/arm/boot/dts/sama5d2.dtsi
Simple merge

diff --cc arch/arm/mach-davinci/da8xx-dt.c
index fac6d43e7fdb89ca556fd21b7d089f58bc5be844,0ba3dc9963d48937fa8b9af2eaf9d6e70294c9e7..754f478110b490bc07857fe27e1c1dc1fc6f66c9
--- 1/arch/arm/mach-davinci/da8xx-dt.c
--- 2/arch/arm/mach-davinci/da8xx-dt.c
+++ b/arch/arm/mach-davinci/da8xx-dt.c
@@@ -18,8 -18,21 +18,9 @@@
  #include "cp_intc.h"
  #include <mach/da8xx.h>
  
 -#define DA8XX_NUM_UARTS       3
 -
 -static const struct of_device_id const da8xx_irq_match[] __initconst = {
 -      { .compatible = "ti,cp-intc", .data = cp_intc_of_init, },
 -      { }
 -};
 -
 -static void __init da8xx_init_irq(void)
 -{
 -      of_irq_init(da8xx_irq_match);
 -}
 -
  static struct of_dev_auxdata da850_auxdata_lookup[] __initdata = {
        OF_DEV_AUXDATA("ti,davinci-i2c", 0x01c22000, "i2c_davinci.1", NULL),
+       OF_DEV_AUXDATA("ti,davinci-i2c", 0x01e28000, "i2c_davinci.2", NULL),
        OF_DEV_AUXDATA("ti,davinci-wdt", 0x01c21000, "davinci-wdt", NULL),
        OF_DEV_AUXDATA("ti,da830-mmc", 0x01c40000, "da830-mmc.0", NULL),
        OF_DEV_AUXDATA("ti,da850-ehrpwm", 0x01f00000, "ehrpwm", NULL),

diff --cc arch/arm64/boot/dts/renesas/r8a7795.dtsi
Simple merge