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

Pull ARM SoC DT updates from Olof Johansson:
 "Device tree and bindings updates for 3.12.

  General additions of various on-chip and on-board peripherals on
  various platforms as support gets added.  Some of the bigger changes
  are:

   - Addition of (new) PCI-e support on Tegra.
   - More Tegra4 support, including PMC configuration for Dalmore.
   - Addition of a new board for Exynos4 (trats2) and more bindings for
     4x12 IP.
   - Addition of Allwinner A20 and A31 SoC and board files.
   - Move of the ST Ericsson device tree files to now use ste-* prefix.
   - More move of hardware description of shmobile platforms to DT.
   - Two new board dts files for Freescale MXs"

* tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (177 commits)
  dts: Rename DW APB timer compatible strings
  dts: Deprecate ALTR as a vendor prefix
  of: add vendor prefix for Altera Corp.
  ARM: at91/dt: sam9x5ek: add sound configuration
  ARM: at91/dt: sam9x5ek: enable SSC
  ARM: at91/dt: sam9x5ek: add WM8731 codec
  ARM: at91/dt: sam9x5: add SSC DMA parameters
  ARM: at91/dt: add at91rm9200 PQFP package version
  ARM: at91: at91rm9200: set default mmc0 pinctrl-names
  ARM: at91: at91sam9n12: correct pin number of gpio-key
  ARM: at91: at91sam9n12: add qt1070 support
  ARM: at91: at91sam9n12: add pinctrl of TWI
  ARM: at91: Add PMU support for sama5d3
  ARM: at91: at91sam9260: add missing pinctrl-names on mmc
  ARM: tegra: configure power off for Dalmore
  ARM: DT: binding fixup to align with vendor-prefixes.txt (DT)
  ARM: dts: add sdio blocks to bcm28155-ap board
  ARM: dts: align sdio numbers to HW definition
  ARM: sun7i: Add Olimex A20-Olinuxino-Micro support
  ARM: sun7i: Add Allwinner A20 DTSI
  ...

1 files changed, 20 insertions, 18 deletions

diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index f2dfa6b1f1a1..f7e2d3493f82 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -163,11 +163,21 @@
                 clock-names = "watchdog";
         };
 
+        g2d@10850000 {
+                compatible = "samsung,exynos5250-g2d";
+                reg = <0x10850000 0x1000>;
+                interrupts = <0 91 0>;
+                clocks = <&clock 345>;
+                clock-names = "fimg2d";
+        };
+
         codec@11000000 {
                 compatible = "samsung,mfc-v6";
                 reg = <0x11000000 0x10000>;
                 interrupts = <0 96 0>;
                 samsung,power-domain = <&pd_mfc>;
+                clocks = <&clock 266>;
+                clock-names = "mfc";
         };
 
         rtc {
@@ -611,28 +621,20 @@
                 interrupts = <0 94 0>;
         };
 
-        dp-controller {
-                compatible = "samsung,exynos5-dp";
-                reg = <0x145b0000 0x1000>;
-                interrupts = <10 3>;
-                interrupt-parent = <&combiner>;
+        dp_phy: video-phy@10040720 {
+                compatible = "samsung,exynos5250-dp-video-phy";
+                reg = <0x10040720 4>;
+                #phy-cells = <0>;
+        };
+
+        dp-controller@145B0000 {
                 clocks = <&clock 342>;
                 clock-names = "dp";
-                #address-cells = <1>;
-                #size-cells = <0>;
-
-                dptx-phy {
-                        reg = <0x10040720>;
-                        samsung,enable-mask = <1>;
-                };
+                phys = <&dp_phy>;
+                phy-names = "dp";
         };
 
-        fimd {
-                compatible = "samsung,exynos5250-fimd";
-                interrupt-parent = <&combiner>;
-                reg = <0x14400000 0x40000>;
-                interrupt-names = "fifo", "vsync", "lcd_sys";
-                interrupts = <18 4>, <18 5>, <18 6>;
+        fimd@14400000 {
                 clocks = <&clock 133>, <&clock 339>;
                 clock-names = "sclk_fimd", "fimd";
         };