diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-09-25 23:21:09 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-09-25 23:21:09 +0200 |
| commit | 0bee2b6f441a6d3b335f9068cd4b350fe6971229 (patch) | |
| tree | 42813462c0afb703ffaa87e77e4256824858371a /arch/arm/boot/dts/kirkwood-dockstar.dts | |
| parent | Merge tag 'sunxi-dt-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | ARM: dts: hix5hd2: add wdg node (diff) | |
| download | linux-0bee2b6f441a6d3b335f9068cd4b350fe6971229.tar.xz linux-0bee2b6f441a6d3b335f9068cd4b350fe6971229.zip | |
Merge tag 'hix5hd2-dt-for-3.18' of git://github.com/hisilicon/linux-hisi into next/dt
Pull "ARM: DT: Hisilicon terminal SoC HiX5HD2 DT updates for 3.18" from Wei Xu:
- Add watchdog, gpio, sata, usb, mmc and gmac nodes in HiX5HD2 SoC DT
- Enable sata and gmac in HiX5HD2 dkb board DT
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'hix5hd2-dt-for-3.18' of git://github.com/hisilicon/linux-hisi:
ARM: dts: hix5hd2: add wdg node
ARM: dts: hix5hd2: add gpio node
ARM: dts: hix5hd2: add sata node
ARM: dts: hix5hd2: add usb node
ARM: dts: hix5hd2: add mmc node
ARM: dts: hix5hd2: add gmac node
Diffstat (limited to 'arch/arm/boot/dts/kirkwood-dockstar.dts')
0 files changed, 0 insertions, 0 deletions