diff options
author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-05-22 18:01:22 +0200 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-05-22 18:01:22 +0200 |
commit | 6a84872a3c3090993be108f02f91b4de062a7d32 (patch) | |
tree | eb9029dda4b56efdc1488a8683c00c711075ca18 /arch/arm/boot/dts/at91sam9261.dtsi | |
parent | d82b40133f2a7d50e491cecb64e4ea01dabd8672 (diff) | |
parent | 138e8f1c4e99cd349e50fd8b18aebbd2716ceb87 (diff) |
Merge branch 'at91-3.16-cleanup' into at91-3.16-dt3
Diffstat (limited to 'arch/arm/boot/dts/at91sam9261.dtsi')
-rw-r--r-- | arch/arm/boot/dts/at91sam9261.dtsi | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/at91sam9261.dtsi b/arch/arm/boot/dts/at91sam9261.dtsi index 3be973e9889..80cdcecf033 100644 --- a/arch/arm/boot/dts/at91sam9261.dtsi +++ b/arch/arm/boot/dts/at91sam9261.dtsi @@ -45,6 +45,18 @@ reg = <0x20000000 0x08000000>; }; + main_xtal: main_xtal { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <0>; + }; + + slow_xtal: slow_xtal { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <0>; + }; + ahb { compatible = "simple-bus"; #address-cells = <1>; @@ -524,17 +536,24 @@ #size-cells = <0>; #interrupt-cells = <1>; - clk32k: slck { + slow_rc_osc: slow_rc_osc { compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <32768>; + clock-accuracy = <50000000>; + }; + + clk32k: slck { + compatible = "atmel,at91sam9260-clk-slow"; + #clock-cells = <0>; + clocks = <&slow_rc_osc &slow_xtal>; }; main: mainck { compatible = "atmel,at91rm9200-clk-main"; #clock-cells = <0>; interrupts-extended = <&pmc AT91_PMC_MOSCS>; - clocks = <&clk32k>; + clocks = <&main_xtal>; }; plla: pllack { |