Merge tag 'omap-for-v4.6/dt-ti81xx-signed' of git://git.kernel.org/pub/scm/linux...

[deliverable/linux.git] / arch / arm / boot / dts / dm814x-clocks.dtsi

diff --git a/arch/arm/boot/dts/dm814x-clocks.dtsi b/arch/arm/boot/dts/dm814x-clocks.dtsi
index 60e9b332fabb638b746563fd20fa7626945dab05..c4671af0a28d612bccacc560809633b597861f62 100644 (file)
--- a/arch/arm/boot/dts/dm814x-clocks.dtsi
+++ b/arch/arm/boot/dts/dm814x-clocks.dtsi
@@ -156,7 +156,7 @@
 };
 
 &pllss_clocks {
-       timer1_fck: timer1_fck {
+       timer1_fck: timer1_fck@2e0 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&sysclk18_ck &aud_clkin0_ck &aud_clkin1_ck
@@ -165,7 +165,7 @@
                reg = <0x2e0>;
        };
 
-       timer2_fck: timer2_fck {
+       timer2_fck: timer2_fck@2e0 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&sysclk18_ck &aud_clkin0_ck &aud_clkin1_ck
@@ -192,7 +192,7 @@
                clock-frequency = <125000000>;
        };
 
-       sysclk18_ck: sysclk18_ck {
+       sysclk18_ck: sysclk18_ck@2f0 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&rtcosc_ck>, <&rtcdivider_ck>;
@@ -202,7 +202,7 @@
 };
 
 &scm_clocks {
-       devosc_ck: devosc_ck {
+       devosc_ck: devosc_ck@40 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&virt_20000000_ck>, <&virt_19200000_ck>;
@@ -210,11 +210,11 @@
                reg = <0x0040>;
        };
 
-       /* Optional auxosc, 20 - 30 MHz range, assume 27 MHz by default */
+       /* Optional auxosc, 20 - 30 MHz range, assume 22.5729 MHz by default */
        auxosc_ck: auxosc_ck {
                #clock-cells = <0>;
                compatible = "fixed-clock";
-               clock-frequency = <27000000>;
+               clock-frequency = <22572900>;
        };
 
        /* Optional 32768Hz crystal or clock on RTCOSC pins */
@@ -259,7 +259,7 @@
                clock-div = <1>;
        };
 
-       mpu_clksrc_ck: mpu_clksrc_ck {
+       mpu_clksrc_ck: mpu_clksrc_ck@40 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&devosc_ck>, <&rtcdivider_ck>;