Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / arch / arm / boot / dts / exynos3250-artik5.dtsi

diff --git a/arch/arm/boot/dts/exynos3250-artik5.dtsi b/arch/arm/boot/dts/exynos3250-artik5.dtsi
index 6c2f320..04290ec 100644 (file)
--- a/arch/arm/boot/dts/exynos3250-artik5.dtsi
+++ b/arch/arm/boot/dts/exynos3250-artik5.dtsi
@@ -55,6 +55,10 @@
        assigned-clock-rates = <6000000>;
 };
 
+&cmu {
+       clocks = <&xusbxti>;
+};
+
 &cpu0 {
        cpu0-supply = <&buck2_reg>;
 };
@@ -72,7 +76,7 @@
        samsung,i2c-max-bus-freq = <100000>;
        status = "okay";
 
-       s2mps14_pmic@66 {
+       pmic@66 {
                compatible = "samsung,s2mps14-pmic";
                interrupt-parent = <&gpx3>;
                interrupts = <5 IRQ_TYPE_NONE>;