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

Pull ARM SoC device tree changes from Arnd Bergmann:
 "A large part of the arm-soc patches are nowadays DT changes, adding
  support for new SoCs, boards and devices without changing kernel
  source.  The plan is still to move the devicetree files out of the
  kernel tree and reduce the amount of churn going on here, but we keep
  finding reasons to delay doing that.

  Changes are really all over the place, with little sticking out
  particularly.  We have contributions from a total of 116 people in
  this branch.

  Unfortunately, the size of this branch also causes a significant
  number of conflicts at the moment, typically when subsystem
  maintainers merge patches that change the driver at the same time as
  the dts files.  In most cases this could be avoided because the dts
  changes are supposed to be compatible in both ways, and we are asking
  everyone to send ARM dts changes through our tree only"

* tag 'dt-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (541 commits)
  dts: stmmac: Document the clocks property in the stmmac base document
  dts: socfpga: Add DTS entry for adding the stmmac glue layer for stmmac.
  ARM: STi: stih41x: Add support for the FSM Serial Flash Controller
  ARM: STi: stih416: Add support for the FSM Serial Flash Controller
  ARM: tegra: fix Dalmore pinctrl configuration
  ARM: dts: keystone: use common "ti,keystone" compatible instead of -evm
  ARM: dts: k2hk-evm: set ubifs partition size for 512M NAND
  ARM: dts: Build all keystone dt blobs
  ARM: dts: keystone: Fix control register range for clktsip
  ARM: dts: keystone: Fix domain register range for clkfftc1
  ARM: dts: bcm28155-ap: leave camldo1 on to fix reboot
  ARM: dts: add bcm590xx pmu support and enable for bcm28155-ap
  ARM: dts: bcm21664: Add device tree files.
  ARM: DT: bcm21664: Device tree bindings
  ARM: efm32: properly namespace i2c location property
  ARM: efm32: fix unit address part in USART2 device nodes' names
  ARM: mvebu: Enable NAND controller in Armada 385-DB
  ARM: mvebu: Add support for NAND controller in Armada 38x SoC
  ARM: mvebu: Add the Core Divider clock to Armada 38x SoCs
  ARM: mvebu: Add a 2 GHz fixed-clock on Armada 38x SoCs
  ...

1 files changed, 40 insertions, 3 deletions

diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index 7a16647c76f4..8292ad0fe69f 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -49,6 +49,12 @@
                                 1000000 1060000
                                 1500000 1250000
                         >;
+
+                        clocks = <&dpll_mpu_ck>;
+                        clock-names = "cpu";
+
+                        clock-latency = <300000>; /* From omap-cpufreq driver */
+
                         /* cooling options */
                         cooling-min-level = <0>;
                         cooling-max-level = <2>;
@@ -355,6 +361,7 @@
                         compatible = "ti,omap4-hwspinlock";
                         reg = <0x4a0f6000 0x1000>;
                         ti,hwmods = "spinlock";
+                        #hwlock-cells = <1>;
                 };
 
                 mcspi1: spi@48098000 {
@@ -515,6 +522,21 @@
                         dma-names = "tx", "rx";
                 };
 
+                mmu_dsp: mmu@4a066000 {
+                        compatible = "ti,omap4-iommu";
+                        reg = <0x4a066000 0x100>;
+                        interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
+                        ti,hwmods = "mmu_dsp";
+                };
+
+                mmu_ipu: mmu@55082000 {
+                        compatible = "ti,omap4-iommu";
+                        reg = <0x55082000 0x100>;
+                        interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
+                        ti,hwmods = "mmu_ipu";
+                        ti,iommu-bus-err-back;
+                };
+
                 keypad: keypad@4ae1c000 {
                         compatible = "ti,omap4-keypad";
                         reg = <0x4ae1c000 0x400>;
@@ -531,6 +553,7 @@
                         dmas = <&sdma 65>,
                                <&sdma 66>;
                         dma-names = "up_link", "dn_link";
+                        status = "disabled";
                 };
 
                 dmic: dmic@4012e000 {
@@ -542,6 +565,7 @@
                         ti,hwmods = "dmic";
                         dmas = <&sdma 67>;
                         dma-names = "up_link";
+                        status = "disabled";
                 };
 
                 mcbsp1: mcbsp@40122000 {
@@ -556,6 +580,7 @@
                         dmas = <&sdma 33>,
                                <&sdma 34>;
                         dma-names = "tx", "rx";
+                        status = "disabled";
                 };
 
                 mcbsp2: mcbsp@40124000 {
@@ -570,6 +595,7 @@
                         dmas = <&sdma 17>,
                                <&sdma 18>;
                         dma-names = "tx", "rx";
+                        status = "disabled";
                 };
 
                 mcbsp3: mcbsp@40126000 {
@@ -584,6 +610,7 @@
                         dmas = <&sdma 19>,
                                <&sdma 20>;
                         dma-names = "tx", "rx";
+                        status = "disabled";
                 };
 
                 timer1: timer@4ae18000 {
@@ -685,6 +712,13 @@
                         ti,hwmods = "wd_timer2";
                 };
 
+                dmm@4e000000 {
+                        compatible = "ti,omap5-dmm";
+                        reg = <0x4e000000 0x800>;
+                        interrupts = <0 113 0x4>;
+                        ti,hwmods = "dmm";
+                };
+
                 emif1: emif@4c000000 {
                         compatible      = "ti,emif-4d5";
                         ti,hwmods       = "emif1";
@@ -734,7 +768,8 @@
                                 compatible = "snps,dwc3";
                                 reg = <0x4a030000 0x10000>;
                                 interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>;
-                                usb-phy = <&usb2_phy>, <&usb3_phy>;
+                                phys = <&usb2_phy>, <&usb3_phy>;
+                                phy-names = "usb2-phy", "usb3-phy";
                                 dr_mode = "peripheral";
                                 tx-fifo-resize;
                         };
@@ -751,6 +786,7 @@
                                 compatible = "ti,omap-usb2";
                                 reg = <0x4a084000 0x7c>;
                                 ctrl-module = <&omap_control_usb2phy>;
+                                #phy-cells = <0>;
                         };
 
                         usb3_phy: usb3phy@4a084400 {
@@ -760,6 +796,7 @@
                                       <0x4a084c00 0x40>;
                                 reg-names = "phy_rx", "phy_tx", "pll_ctrl";
                                 ctrl-module = <&omap_control_usb3phy>;
+                                #phy-cells = <0>;
                         };
                 };
 
@@ -779,14 +816,14 @@
                         ranges;
 
                         usbhsohci: ohci@4a064800 {
-                                compatible = "ti,ohci-omap3", "usb-ohci";
+                                compatible = "ti,ohci-omap3";
                                 reg = <0x4a064800 0x400>;
                                 interrupt-parent = <&gic>;
                                 interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
                         };
 
                         usbhsehci: ehci@4a064c00 {
-                                compatible = "ti,ehci-omap", "usb-ehci";
+                                compatible = "ti,ehci-omap";
                                 reg = <0x4a064c00 0x400>;
                                 interrupt-parent = <&gic>;
                                 interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;