From: Tom Rini 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-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=26fe08dcd2a2492ccc10bd13a1fcb56566193907;p=u-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