aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>2014-06-13 08:02:29 -0400
committerNicolas Ferre <nicolas.ferre@atmel.com>2014-06-25 11:50:08 -0400
commit5de4728450417380d2d49fcf88905218f1787510 (patch)
tree972cb263e5263e204b7cdcc0d081ef1039ef5cb9 /arch
parent8cbff69ca9d57ee53656d187f77774501794bf27 (diff)
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/at91sam9261.dtsi10
1 files changed, 8 insertions, 2 deletions
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 @@
581 clocks = <&slow_rc_osc &slow_xtal>; 581 clocks = <&slow_rc_osc &slow_xtal>;
582 }; 582 };
583 583
584 main: mainck { 584 main_osc: main_osc {
585 compatible = "atmel,at91rm9200-clk-main"; 585 compatible = "atmel,at91rm9200-clk-main-osc";
586 #clock-cells = <0>; 586 #clock-cells = <0>;
587 interrupts-extended = <&pmc AT91_PMC_MOSCS>; 587 interrupts-extended = <&pmc AT91_PMC_MOSCS>;
588 clocks = <&main_xtal>; 588 clocks = <&main_xtal>;
589 }; 589 };
590 590
591 main: mainck {
592 compatible = "atmel,at91rm9200-clk-main";
593 #clock-cells = <0>;
594 clocks = <&main_osc>;
595 };
596
591 plla: pllack { 597 plla: pllack {
592 compatible = "atmel,at91rm9200-clk-pll"; 598 compatible = "atmel,at91rm9200-clk-pll";
593 #clock-cells = <0>; 599 #clock-cells = <0>;