Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / arch / arm / boot / dts / at91-sama5d4_ma5d4.dtsi

diff --git a/arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi b/arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi
index e7b2109..a92c6e0 100644 (file)
--- a/arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi
+++ b/arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi
@@ -20,8 +20,11 @@
        };
 
        clocks {
-               main_clock: main_clock {
-                       compatible = "atmel,osc", "fixed-clock";
+               slow_xtal {
+                       clock-frequency = <32768>;
+               };
+
+               main_xtal {
                        clock-frequency = <12000000>;
                };
 
@@ -106,7 +109,7 @@
                };
        };
 
-       vcc_3v3_reg: fixedregulator@0 {
+       vcc_3v3_reg: fixedregulator_3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VCC 3V3";
                regulator-min-microvolt = <3300000>;
@@ -115,7 +118,7 @@
                regulator-always-on;
        };
 
-       vcc_mmc0_reg: fixedregulator@1 {
+       vcc_mmc0_reg: fixedregulator_mmc0 {
                compatible = "regulator-fixed";
                gpio = <&pioE 15 GPIO_ACTIVE_HIGH>;
                regulator-name = "RST_n MCI0";