]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
ARM: at91/dt: sam9261: correctly define mainck
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>
Fri, 13 Jun 2014 12:02:29 +0000 (14:02 +0200)
committerNicolas Ferre <nicolas.ferre@atmel.com>
Wed, 25 Jun 2014 15:50:08 +0000 (17:50 +0200)
mainck (CKGR_MCFR register) is actually using main_osc (CKGR_MOR register).

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
arch/arm/boot/dts/at91sam9261.dtsi

index b309c1c6e848958d3af6c6679a1dc19402329402..9de312e9bb3e0d894ce82df742f11a302d638cea 100644 (file)
                                        clocks = <&slow_rc_osc &slow_xtal>;
                                };
 
-                               main: mainck {
-                                       compatible = "atmel,at91rm9200-clk-main";
+                               main_osc: main_osc {
+                                       compatible = "atmel,at91rm9200-clk-main-osc";
                                        #clock-cells = <0>;
                                        interrupts-extended = <&pmc AT91_PMC_MOSCS>;
                                        clocks = <&main_xtal>;
                                };
 
+                               main: mainck {
+                                       compatible = "atmel,at91rm9200-clk-main";
+                                       #clock-cells = <0>;
+                                       clocks = <&main_osc>;
+                               };
+
                                plla: pllack {
                                        compatible = "atmel,at91rm9200-clk-pll";
                                        #clock-cells = <0>;