Merge branch 'at91-3.16-cleanup' into at91-3.16-dt3

This commit is contained in:
Nicolas Ferre
2014-05-22 18:01:22 +02:00
74 changed files with 1803 additions and 804 deletions

View File

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