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>

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/boot/dts/at91-sama5d3_xplained.dts
Simple merge

diff --cc arch/arm/boot/dts/at91sam9261.dtsi
Simple merge

diff --cc arch/arm/boot/dts/at91sam9rl.dtsi
index 981373c56bcc0cca558788fc6102aecc8f9ee2d6,a19a7c26a7fc4d8f23c7970386962b233ba27054..d309525ed398477064e7912818ebb1de184d99c7
--- 1/arch/arm/boot/dts/at91sam9rl.dtsi
--- 2/arch/arm/boot/dts/at91sam9rl.dtsi
+++ b/arch/arm/boot/dts/at91sam9rl.dtsi
@@@ -50,14 -48,18 +50,26 @@@
                reg = <0x20000000 0x04000000>;
        };
  
+       slow_xtal: slow_xtal {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <0>;
+       };
+ 
+       main_xtal: main_xtal {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <0>;
+       };
+ 
 +      clocks {
 +              adc_op_clk: adc_op_clk{
 +                      compatible = "fixed-clock";
 +                      #clock-cells = <0>;
 +                      clock-frequency = <1000000>;
 +              };
 +      };
 +
        ahb {
                compatible = "simple-bus";
                #address-cells = <1>;

diff --cc arch/arm/boot/dts/at91sam9rlek.dts
Simple merge

diff --cc arch/arm/boot/dts/sama5d3.dtsi
Simple merge