diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-03-02 23:45:58 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-03-02 23:45:58 +0300 |
| commit | 9c8add4c4a491ec236e6e4eb9a22e37370145063 (patch) | |
| tree | ae87efe7fa2550d0ba3f2b12f960735ade2b1179 /include/linux/scif.h | |
| parent | e3c739e1299a40811bdaff68dd005be76d4b0c6a (diff) | |
| parent | ed0f4b3ffcdbd2b47a0b24035bb6f22464c9fef1 (diff) | |
| download | linux-9c8add4c4a491ec236e6e4eb9a22e37370145063.tar.xz | |
Merge tag 'at91-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/dt
Merge "at91: dt for 4.6 #2" from Nicolas Ferre:
Second 4.6 DT series, all patches for sama5d2 and its Xplained board:
- addition of the NAND flash node
- addition of the dma properties for UART/USART nodes
- one update of the sama5d2 Xplained phy node
- addition of USB pinmux, button and leds
* tag 'at91-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
ARM: dts: at91: sama5d2 Xplained: add leds node
ARM: dts: at91: sama5d2 Xplained: add user push button
ARM: dts: at91: sama5d2 Xplained: set pin muxing for usb gadget and usb host
ARM: dts: at91: sama5d2: add nand0 and nfc0 nodes
ARM: dts: at91: sama5d2: add dma properties to UART nodes
ARM: dts: at91: sama5d2 Xplained: Correct the macb irq pinctrl node
Diffstat (limited to 'include/linux/scif.h')
0 files changed, 0 insertions, 0 deletions