Merge tag 'blackfin-for-linus' of http://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / arch / arm / boot / dts / exynos4x12.dtsi

diff --git a/arch/arm/boot/dts/exynos4x12.dtsi b/arch/arm/boot/dts/exynos4x12.dtsi
index 70e3765..c5a943d 100644 (file)
--- a/arch/arm/boot/dts/exynos4x12.dtsi
+++ b/arch/arm/boot/dts/exynos4x12.dtsi
@@ -137,6 +137,10 @@
                interrupts = <0 72 0>;
        };
 
+       pmu_system_controller: system-controller@10020000 {
+               compatible = "samsung,exynos4212-pmu", "syscon";
+       };
+
        g2d@10800000 {
                compatible = "samsung,exynos4212-g2d";
                reg = <0x10800000 0x1000>;
@@ -261,4 +265,9 @@
                clock-names = "biu", "ciu";
                status = "disabled";
        };
+
+       exynos-usbphy@125B0000 {
+               compatible = "samsung,exynos4x12-usb2-phy";
+               samsung,sysreg-phandle = <&sys_reg>;
+       };
 };