Merge branch 'next/soc' into for-next

* next/soc: (28 commits)
  ARM: at91/dt: at91-cosino_mega2560 remove useless tsadcc node
  ARM: at91: remove atmel_tsadcc platform_data
  Input: atmel_tsadcc: remove driver
  ARM: at91: remove atmel_tsadcc from sama5_defconfig
  ARM: at91: sam9rl: switch from atmel_tsadcc to at91_adc
  ARM: at91: sam9g45: switch from atmel_tsadcc to at91_adc
  ARM: at91: sam9rlek add touchscreen support through at91_adc
  ARM: at91: sam9rl: add at91_adc to support adc and touchscreen
  iio: adc: at91: add sam9rl support
  iio: adc: at91: remove unused include from include/mach
  ARM: at91: sam9m10g45ek: Add touchscreen support through at91_adc
  iio: adc: at91_adc: Add support for touchscreens without TSMR
  iio: adc: at91: cleanup platform_data
  ARM: at91: sam9260: remove unused platform_data
  ARM: at91: sam9g45: remove unused platform_data
  ARM: at91/dt: define sam9rlek crystal frequencies
  ARM: at91/dt: move at91sam9rl SoC to the new slow/main clock models
  ARM: at91/dt: define main xtal frequency of the at91sam9261ek board
  ARM: at91/dt: move at91sam9261 SoC to the new main clock model
  ARM: at91/dt: add xtal frequencies to sama5d3 xplained board
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
Conflicts:
	arch/arm/boot/dts/at91sam9rl.dtsi

diff --cc Documentation/devicetree/bindings/clock/at91-clock.txt
Simple merge

diff --cc MAINTAINERS
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 b9714f5c61dcd5b27693c5c675a50c4c9dae99bf,a19a7c26a7fc4d8f23c7970386962b233ba27054..dbb8d77ccf825c0297633982468879db7ad9f275
--- 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