From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Date: Fri, 13 Jun 2014 12:02:29 +0000 (+0200)
Subject: ARM: at91/dt: sam9261: correctly define mainck
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5de4728450417380d2d49fcf88905218f1787510;p=linux-beck.git

ARM: at91/dt: sam9261: correctly define mainck

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>
---

diff --git a/arch/arm/boot/dts/at91sam9261.dtsi b/arch/arm/boot/dts/at91sam9261.dtsi
index b309c1c6e848..9de312e9bb3e 100644
--- a/arch/arm/boot/dts/at91sam9261.dtsi
+++ b/arch/arm/boot/dts/at91sam9261.dtsi
@@ -581,13 +581,19 @@
 					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>;