From: Tom Rini <trini@konsulko.com>
Date: Thu, 6 Dec 2018 15:15:08 +0000 (-0500)
Subject: Merge tag 'for-master-20181206' of git://git.denx.de/u-boot-rockchip
X-Git-Tag: v2019.01-rc2~27
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=26fe08dcd2a2492ccc10bd13a1fcb56566193907;p=oweals%2Fu-boot.git

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.
---

26fe08dcd2a2492ccc10bd13a1fcb56566193907