From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 23 May 2014 20:59:20 +0000 (+0200)
Subject: Merge branch 'at91/cleanup' into next/dt
X-Git-Tag: v3.16-rc1~30^2~41^2~15
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=d5cd8605e2814d268cddee1ff1d95d9010b4e8eb;p=linux.git

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

d5cd8605e2814d268cddee1ff1d95d9010b4e8eb
diff --cc arch/arm/boot/dts/at91sam9rl.dtsi
index 981373c56bcc,a19a7c26a7fc..d309525ed398
--- a/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>;