diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-05-15 15:18:57 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-15 15:18:57 (GMT) |
| commit | 144ed9708e67d28b116f4cd9e3106c08341a8959 (patch) | |
| tree | c1a7831c370d3066dcde79ca520de2d8b92c6ca9 /arch/mn10300 | |
| parent | 830f5a5a1e2f37881e2f7d61ffca43f9c8225a11 (diff) | |
| parent | 8dd3075c489ba19a8f2795199352334e52f34bed (diff) | |
| download | linux-144ed9708e67d28b116f4cd9e3106c08341a8959.tar.xz | |
Merge tag 'pxa-dt-4.2' of https://github.com/rjarzmik/linux into next/dt
Merge "device-tree pxa update" from Robert Jarzmik:
- clocks descriptions (pxa27x, pxa3xx)
- timer descriptions (pxa27x, pxa3xx)
- IPs which are embedded on the SoC
- keypad
- udc (USB client)
- power I2C
These are amongst the building blocks for future pxa device-tree board
description.
* tag 'pxa-dt-4.2' of https://github.com/rjarzmik/linux:
ARM: dts: pxa: add pxa-timer to pxa27x and pxa3xx
ARM: dts: pxa: add pxa27x-keypad to pxa27x
ARM: dts: pxa: add pxa27x-udc to pxa27x
ARM: dts: pxa: add clocks
ARM: dts: pxa: add pwri2c to pxa device-tree
Diffstat (limited to 'arch/mn10300')
0 files changed, 0 insertions, 0 deletions