Merge tag 'hix5hd2-dt-for-3.18' of git://github.com/hisilicon/linux-hisi into next/dt
authorArnd Bergmann <arnd@arndb.de>
Thu, 25 Sep 2014 21:21:09 +0000 (23:21 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 25 Sep 2014 21:21:09 +0000 (23:21 +0200)
commit0bee2b6f441a6d3b335f9068cd4b350fe6971229
tree42813462c0afb703ffaa87e77e4256824858371a
parentcd7555aeae372c6faf09cbbc1dfbdd0c91fe76f7
parent610bd8722ef40b649b51f01045c5d1903f41b583
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