diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-05-23 22:59:20 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-05-23 23:02:30 +0200 |
| commit | d5cd8605e2814d268cddee1ff1d95d9010b4e8eb (patch) | |
| tree | 87f67a177b10ec6c9e6c023cabb1c3607efe20b5 /arch/arm/boot/dts/at91sam9261.dtsi | |
| parent | 21c27cabe69bdce92130364efe5d945323b37986 (diff) | |
| parent | 138e8f1c4e99cd349e50fd8b18aebbd2716ceb87 (diff) | |
Merge branch 'at91/cleanup' into next/dt
Conflicts:
arch/arm/boot/dts/at91sam9rl.dtsi
Needed as a dependency for the at91/dt2 branch
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
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 10083c236cb..0d1d26f911b 100644 --- a/arch/arm/boot/dts/at91sam9261.dtsi +++ b/arch/arm/boot/dts/at91sam9261.dtsi @@ -46,6 +46,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>; @@ -556,17 +568,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 { |