Merge tag 'for-master-20181206' of git://git.denx.de/u-boot-rockchip
authorTom Rini <trini@konsulko.com>
Thu, 6 Dec 2018 15:15:08 +0000 (10:15 -0500)
committerTom Rini <trini@konsulko.com>
Thu, 6 Dec 2018 15:15:08 +0000 (10:15 -0500)
commit26fe08dcd2a2492ccc10bd13a1fcb56566193907
tree102e0c57a4611bb1ed2dccab7c977aaf48f231b3
parent2a055ea53260ac8addeeb94eb671172844bc9106
parent467877341a4169f1a8c50b7ebe4c0e6fd28da727
Merge tag 'for-master-20181206' of git://git.denx.de/u-boot-rockchip

- Changes the declaration of regs_phy in dwc2-otg to uintptr_t
  to ensure it can be cast to void* for use with writel().
- Add the Rock960 and Ficus boards.