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

Pull ARM DT updates from Arnd Bergmann:
 "Lots of changes as usual, so I'm trying to be brief here. Most of the
  new hardware support has the respective driver changes merged through
  other trees or has had it available for a while, so this is where
  things come together.

  We get a DT descriptions for a couple of new SoCs, all of them
  variants of other chips we already support, and usually coming with a
  new evaluation board:

   - Oxford semiconductor (now Broadcom) OX820 SoC for NAS devices
   - Qualcomm MDM9615 LTE baseband
   - NXP imx6ull, the latest and smallest i.MX6 application processor variant
   - Renesas RZ/G (r8a7743 and r8a7745) application processors
   - Rockchip PX3, a variant of the rk3188 chip used in Android tablets
   - Rockchip rk1108 single-core application processor
   - ST stm32f746 Cortex-M7 based microcontroller
   - TI DRA71x automotive processors

  These are commercially available consumer platforms we now support:

   - Motorola Droid 4 (xt894) mobile phone
   - Rikomagic MK808 Android TV stick based on Rockchips rx3066
   - Cloud Engines PogoPlug v3 based on OX820
   - Various Broadcom based wireless devices:
      - Netgear R8500 router
      - Tenda AC9 router
      - TP-LINK Archer C9 V1
      - Luxul XAP-1510 Access point
   - Turris Omnia open hardware router based on Armada 385

  And a couple of new boards targeted at developers, makers or
  industrial integration:

   - Macnica Sodia development platform for Altera socfpga (Cyclone V)
   - MicroZed board based on Xilinx Zynq FPGA platforms
   - TOPEET itop/elite based on exynos4412
   - WP8548 MangOH Open Hardware platform for IOT, based on Qualcomm MDM9615
   - NextThing CHIP Pro gadget
   - NanoPi M1 development board
   - AM571x-IDK industrial board based on TI AM5718
   - i.MX6SX UDOO Neo
   - Boundary Devices Nitrogen6_SOM2 (i.MX6)
   - Engicam i.CoreM6
   - Grinn i.MX6UL liteSOM/liteBoard
   - Toradex Colibri iMX6 module

  Other changes:

   - added peripherals on renesas, davinci, stm32f429, uniphier, sti,
     mediatek, integrator, at91, imx, vybrid, ls1021a, omap, qualcomm,
     mvebu, allwinner, broadcom, exynos, zynq

   - Continued fixes for W=1 dtc warnings

   - The old STiH415/416 SoC support gets removed, these never made it
     into products and have served their purpose in the kernel as a
     template for teh newer chips from ST

   - The exynos4415 dtsi file is removed as nothing uses it.

   - Intel PXA25x can now be booted using devicetree"

* tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (422 commits)
  arm: dts: zynq: Add MicroZed board support
  ARM: dts: da850: enable high speed for mmc
  ARM: dts: da850: Add node for pullup/pulldown pinconf
  ARM: dts: da850: enable memctrl and mstpri nodes per board
  ARM: dts: da850-lcdk: Add ethernet0 alias to DT
  ARM: dts: artpec: add pcie support
  ARM: dts: add support for Turris Omnia
  devicetree: Add vendor prefix for CZ.NIC
  ARM: dts: berlin2q-marvell-dmp: fix typo in chosen node
  ARM: dts: berlin2q-marvell-dmp: fix regulators' name
  ARM: dts: Add xo to sdhc clock node on qcom platforms
  ARM: dts: r8a7794: Add device node for PRR
  ARM: dts: r8a7793: Add device node for PRR
  ARM: dts: r8a7792: Add device node for PRR
  ARM: dts: r8a7791: Add device node for PRR
  ARM: dts: r8a7790: Add device node for PRR
  ARM: dts: r8a7779: Add device node for PRR
  ARM: dts: r8a73a4: Add device node for PRR
  ARM: dts: sk-rzg1e: add Ether support
  ARM: dts: sk-rzg1e: initial device tree
  ...

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

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

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index 6e25c912a5c2611a377d6306e298ca3702aaf84e,b9ec0396775c2171ec065d578dc632aa138659a4..448c831753f85a3870b75539fc046b70c08aaf07
--- 1/Documentation/devicetree/bindings/vendor-prefixes.txt
--- 2/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -242,9 -230,9 +243,10 @@@ realtek Realtek Semiconductor Corp
  renesas       Renesas Electronics Corporation
  richtek       Richtek Technology Corporation
  ricoh Ricoh Co. Ltd.
+ rikomagic     Rikomagic Tech Corp. Ltd
  rockchip      Fuzhou Rockchip Electronics Co., Ltd
  samsung       Samsung Semiconductor
 +samtec        Samtec/Softing company
  sandisk       Sandisk Corporation
  sbs   Smart Battery System
  schindler     Schindler

diff --cc MAINTAINERS
index 0ed5010ce089b39bc33aeb856fea6e92a33d9bf3,b4e472a159eea263f3a6641889ff72a3f8b576c0..3d7cf9910775a5fbdee95fb173e7a0f18cf6be51
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1805,12 -1781,9 +1806,10 @@@ F:    drivers/media/rc/st_rc.
  F:    drivers/media/platform/sti/c8sectpfe/
  F:    drivers/mmc/host/sdhci-st.c
  F:    drivers/phy/phy-miphy28lp.c
- F:    drivers/phy/phy-miphy365x.c
  F:    drivers/phy/phy-stih407-usb.c
- F:    drivers/phy/phy-stih41x-usb.c
  F:    drivers/pinctrl/pinctrl-st.c
  F:    drivers/remoteproc/st_remoteproc.c
 +F:    drivers/remoteproc/st_slim_rproc.c
  F:    drivers/reset/sti/
  F:    drivers/rtc/rtc-st-lpc.c
  F:    drivers/tty/serial/st-asc.c

diff --cc arch/arm/boot/dts/dra72-evm-revc.dts
Simple merge

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

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

diff --cc arch/arm/boot/dts/imx6qp.dtsi
index caaa04036c8a1a26d511aef55f3b7a8d58b1bfe7,e0fdd0fda3614694bd2d3b4466638c3ccbd28ade..0d4977ab7d298ac7ca5ede7274c160c2f73a6ba9
--- 1/arch/arm/boot/dts/imx6qp.dtsi
--- 2/arch/arm/boot/dts/imx6qp.dtsi
+++ b/arch/arm/boot/dts/imx6qp.dtsi
@@@ -85,15 -85,12 +85,22 @@@
                pcie: pcie@0x01000000 {
                        compatible = "fsl,imx6qp-pcie", "snps,dw-pcie";
                };
+ 
+               aips-bus@02100000 {
+                       mmdc0: mmdc@021b0000 { /* MMDC0 */
+                               compatible = "fsl,imx6qp-mmdc", "fsl,imx6q-mmdc";
+                               reg = <0x021b0000 0x4000>;
+                       };
+               };
        };
  };
 +
 +&ldb {
 +      clocks = <&clks IMX6QDL_CLK_LDB_DI0_SEL>, <&clks IMX6QDL_CLK_LDB_DI1_SEL>,
 +               <&clks IMX6QDL_CLK_IPU1_DI0_SEL>, <&clks IMX6QDL_CLK_IPU1_DI1_SEL>,
 +               <&clks IMX6QDL_CLK_IPU2_DI0_SEL>, <&clks IMX6QDL_CLK_IPU2_DI1_SEL>,
 +               <&clks IMX6QDL_CLK_LDB_DI0_PODF>, <&clks IMX6QDL_CLK_LDB_DI1_PODF>;
 +      clock-names = "di0_pll", "di1_pll",
 +                    "di0_sel", "di1_sel", "di2_sel", "di3_sel",
 +                    "di0", "di1";
 +};

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

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

diff --cc arch/arm/boot/dts/r8a7779.dtsi
index 8cf16008a09b9a26be041b4e7dadf64eaf18635b,9d3bb74bd3f684d5e2b374a6505ede4369629cc4..55a7c1e37c57809528b29fb49a4e3f1f1a458152
--- 1/arch/arm/boot/dts/r8a7779.dtsi
--- 2/arch/arm/boot/dts/r8a7779.dtsi
+++ b/arch/arm/boot/dts/r8a7779.dtsi
@@@ -590,11 -590,11 +590,16 @@@
                };
        };
  
+       prr: chipid@ff000044 {
+               compatible = "renesas,prr";
+               reg = <0xff000044 4>;
+       };
+ 
 +      rst: reset-controller@ffcc0000 {
 +              compatible = "renesas,r8a7779-reset-wdt";
 +              reg = <0xffcc0000 0x48>;
 +      };
 +
        sysc: system-controller@ffd85000 {
                compatible = "renesas,r8a7779-sysc";
                reg = <0xffd85000 0x0200>;

diff --cc arch/arm/boot/dts/r8a7790.dtsi
index 3f10b0bf1b08fa89cf3744579366ec6a73c5f4d8,f554ef3c8096726ad90286fb48816a134a89a796..0c8900d4b8242ac93c24f120692ddbfd05aae20a
--- 1/arch/arm/boot/dts/r8a7790.dtsi
--- 2/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@@ -1471,11 -1471,11 +1471,16 @@@
                };
        };
  
+       prr: chipid@ff000044 {
+               compatible = "renesas,prr";
+               reg = <0 0xff000044 0 4>;
+       };
+ 
 +      rst: reset-controller@e6160000 {
 +              compatible = "renesas,r8a7790-rst";
 +              reg = <0 0xe6160000 0 0x0100>;
 +      };
 +
        sysc: system-controller@e6180000 {
                compatible = "renesas,r8a7790-sysc";
                reg = <0 0xe6180000 0 0x0200>;

diff --cc arch/arm/boot/dts/r8a7791.dtsi
index c465c79bcca6e8f31503fd1875bf6bc84e612d7d,4c50de2faef12301a44f7705b4dc00b955c8af0c..87214668d70f12ff9fff7ee7ba5c6861fbd4ad48
--- 1/arch/arm/boot/dts/r8a7791.dtsi
--- 2/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@@ -1482,11 -1485,11 +1485,16 @@@
                };
        };
  
 +      rst: reset-controller@e6160000 {
 +              compatible = "renesas,r8a7791-rst";
 +              reg = <0 0xe6160000 0 0x0100>;
 +      };
 +
+       prr: chipid@ff000044 {
+               compatible = "renesas,prr";
+               reg = <0 0xff000044 0 4>;
+       };
+ 
        sysc: system-controller@e6180000 {
                compatible = "renesas,r8a7791-sysc";
                reg = <0 0xe6180000 0 0x0200>;

diff --cc arch/arm/boot/dts/r8a7792.dtsi
index 6e1f61f65d292b0bea394ff3e36d4feaf8330839,69789020cf39e95fe14e75759921f7fab0c72ea3..6ced3c1ec3770c70c53d6d0e0cacf43788fb7e23
--- 1/arch/arm/boot/dts/r8a7792.dtsi
--- 2/arch/arm/boot/dts/r8a7792.dtsi
+++ b/arch/arm/boot/dts/r8a7792.dtsi
@@@ -118,11 -120,11 +120,16 @@@
                                      IRQ_TYPE_LEVEL_LOW)>;
                };
  
 +              rst: reset-controller@e6160000 {
 +                      compatible = "renesas,r8a7792-rst";
 +                      reg = <0 0xe6160000 0 0x0100>;
 +              };
 +
+               prr: chipid@ff000044 {
+                       compatible = "renesas,prr";
+                       reg = <0 0xff000044 0 4>;
+               };
+ 
                sysc: system-controller@e6180000 {
                        compatible = "renesas,r8a7792-sysc";
                        reg = <0 0xe6180000 0 0x0200>;

diff --cc arch/arm/boot/dts/r8a7793.dtsi
index e4b385eccf74e95e381dcf7fc4cf308b8c38c5b1,a377dda177241da0e603d9b972a768f5b96111e4..2fb527ca0b15edaa89782f636a9ed8155071bc50
--- 1/arch/arm/boot/dts/r8a7793.dtsi
--- 2/arch/arm/boot/dts/r8a7793.dtsi
+++ b/arch/arm/boot/dts/r8a7793.dtsi
@@@ -1279,11 -1306,11 +1306,16 @@@
                };
        };
  
 +      rst: reset-controller@e6160000 {
 +              compatible = "renesas,r8a7793-rst";
 +              reg = <0 0xe6160000 0 0x0100>;
 +      };
 +
+       prr: chipid@ff000044 {
+               compatible = "renesas,prr";
+               reg = <0 0xff000044 0 4>;
+       };
+ 
        sysc: system-controller@e6180000 {
                compatible = "renesas,r8a7793-sysc";
                reg = <0 0xe6180000 0 0x0200>;

diff --cc arch/arm/boot/dts/r8a7794.dtsi
index 69e4f4fad89b23230c2e29053f4f3333b3db124f,63dc7f29d216c32ed8cd5d069dcc7f583da234df..fb576dba748cd97c5e7c253386bd0675ed6852ad
--- 1/arch/arm/boot/dts/r8a7794.dtsi
--- 2/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@@ -1375,11 -1377,11 +1377,16 @@@
                };
        };
  
 +      rst: reset-controller@e6160000 {
 +              compatible = "renesas,r8a7794-rst";
 +              reg = <0 0xe6160000 0 0x0100>;
 +      };
 +
+       prr: chipid@ff000044 {
+               compatible = "renesas,prr";
+               reg = <0 0xff000044 0 4>;
+       };
+ 
        sysc: system-controller@e6180000 {
                compatible = "renesas,r8a7794-sysc";
                reg = <0 0xe6180000 0 0x0200>;

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

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

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

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

diff --cc arch/arm/boot/dts/stih410-b2260.dts
Simple merge

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

diff --cc arch/arm/boot/dts/vf610-zii-dev-rev-b.dts
Simple merge

diff --cc arch/arm64/boot/dts/hisilicon/hi6220.dtsi
Simple merge

diff --cc arch/arm64/boot/dts/mediatek/mt8173.dtsi
Simple merge

diff --cc drivers/pinctrl/bcm/pinctrl-bcm2835.c
Simple merge