diff options
| author | Olof Johansson <olof@lixom.net> | 2015-07-21 14:06:46 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-07-21 14:06:46 -0700 |
| commit | 7d132de8b0caece3b23098aee97df07e82e27fc0 (patch) | |
| tree | 69a25a59da45e1b7cb6d7df02bff538993e54403 /arch/arm/boot/dts/Makefile | |
| parent | af3761246c18f8d4b2c5b6b7acb2cfce911b8530 (diff) | |
| parent | fb18539b3c8f03e550b8afb21cf53db2a2235dbe (diff) | |
Merge tag 'tags/pxa-dt-4.3' of https://github.com/rjarzmik/linux into next/dt
Merge "pxa-dt for v4.3" from Robert Jarzmik:
This device-tree pxa update brings :
- dma nodes after dmaengine pxa_dma driver merge
- camera driver
- usb host controller
* tag 'tags/pxa-dt-4.3' of https://github.com/rjarzmik/linux:
ARM: dts: pxa: fix power i2c definition
ARM: dts: pxa: add the usb host controller
ARM: dts: pxa: add embedded pxa camera capture interface
ARM: dts: pxa: add dma pxamci nodes to pxa3xx
ARM: dts: pxa: add dma engine node to pxa3xx-nand
ARM: dts: pxa: add dma controller
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
0 files changed, 0 insertions, 0 deletions