From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 23 May 2014 21:02:49 +0000 (+0200)
Subject: Merge tag 'at91-dt3' of git://github.com/at91linux/linux-at91 into next/dt
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=77579afc35eeea20d3b34aad66dcbb6fdaf502da;p=deliverable%2Flinux.git

Merge tag 'at91-dt3' of git://github.com/at91linux/linux-at91 into next/dt

3.16 third DT series:
- move of both at91sam9n12 and at91sam9x5 to CCF

* tag 'at91-dt3' of git://github.com/at91linux/linux-at91:
  ARM: at91: move sam9n12 SoC to the CCF
  ARM: at91/dt: define sam9n12ek crystal frequencies
  ARM: at91/dt: define sam9n12 clocks
  ARM: at91: prepare common clk transition for sam9n12 SoC
  ARM: at91: move sam9x5 SoCs to the CCF
  ARM: at91/dt: define sam9x5ek's crystal frequencies
  ARM: at91/dt: define sam9x5 clocks
  ARM: at91: prepare common clk transition for sam9x5 SoCs
  dt-bindings: clock: Move at91.h to dt-bindigs/clock
  ARM: at91: fix spi cs on sama5d3 Xplained board

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

77579afc35eeea20d3b34aad66dcbb6fdaf502da
diff --cc arch/arm/boot/dts/at91sam9rl.dtsi
index d309525ed398,ae9c39a28c63..1da183155eee
--- a/arch/arm/boot/dts/at91sam9rl.dtsi
+++ b/arch/arm/boot/dts/at91sam9rl.dtsi
@@@ -8,10 -8,9 +8,10 @@@
  
  #include "skeleton.dtsi"
  #include <dt-bindings/pinctrl/at91.h>
- #include <dt-bindings/clk/at91.h>
+ #include <dt-bindings/clock/at91.h>
  #include <dt-bindings/interrupt-controller/irq.h>
  #include <dt-bindings/gpio/gpio.h>
 +#include <dt-bindings/pwm/pwm.h>
  
  / {
  	model = "Atmel AT91SAM9RL family SoC";