]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'next/dt' into for-next
authorOlof Johansson <olof@lixom.net>
Mon, 5 May 2014 21:21:26 +0000 (14:21 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 5 May 2014 21:21:26 +0000 (14:21 -0700)
* next/dt:
  ARM: at91: sama5d3: clock for ssc from rk pin
  ARM: at91: sama5d3: add the missing property
  ARM: at91: sama5d3: correct the sound compatible string
  ARM: at91: sama5d3: disable sound by default
  ARM: at91: sama5d3: add DMA property for SSC devices
  ARM: at91/dt: at91sam9m10g45ek PWM leds polarity is inversed
  ARM: at91/dt: at91sam9m10g45ek: add ADC and touchscreen support
  ARM: at91/dt: sam9g45: improve ADC/touchscreen support
  ARM: at91/dt: add peripherals to the at91sam9rlek board
  ARM: at91/dt: sam9rl: add lcd, adc, usb gadget and pwm support

1  2 
arch/arm/boot/dts/at91sam9rl.dtsi
arch/arm/boot/dts/sama5d3.dtsi

index 92a52faebef77cd8eda572d11504c0f83362a428,6202e161314a8cc530900e798cc8f7d515d1c675..b9714f5c61dcd5b27693c5c675a50c4c9dae99bf
@@@ -8,9 -8,10 +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";
Simple merge