diff options
| author | Tom Rini <trini@konsulko.com> | 2018-12-06 10:15:08 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-12-06 10:15:08 -0500 |
| commit | 26fe08dcd2a2492ccc10bd13a1fcb56566193907 (patch) | |
| tree | 102e0c57a4611bb1ed2dccab7c977aaf48f231b3 /include | |
| parent | 2a055ea53260ac8addeeb94eb671172844bc9106 (diff) | |
| parent | 467877341a4169f1a8c50b7ebe4c0e6fd28da727 (diff) | |
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.
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/rock960_rk3399.h | 15 | ||||
| -rw-r--r-- | include/usb/dwc2_udc.h | 2 |
2 files changed, 16 insertions, 1 deletions
diff --git a/include/configs/rock960_rk3399.h b/include/configs/rock960_rk3399.h new file mode 100644 index 0000000000..746d24cbff --- /dev/null +++ b/include/configs/rock960_rk3399.h @@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2018 Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> + */ + +#ifndef __ROCK960_RK3399_H +#define __ROCK960_RK3399_H + +#include <configs/rk3399_common.h> + +#define CONFIG_SYS_MMC_ENV_DEV 1 + +#define SDRAM_BANK_SIZE (2UL << 30) + +#endif diff --git a/include/usb/dwc2_udc.h b/include/usb/dwc2_udc.h index 62e32365e2..4068de045d 100644 --- a/include/usb/dwc2_udc.h +++ b/include/usb/dwc2_udc.h @@ -14,7 +14,7 @@ struct dwc2_plat_otg_data { void *priv; int phy_of_node; int (*phy_control)(int on); - unsigned int regs_phy; + uintptr_t regs_phy; uintptr_t regs_otg; unsigned int usb_phy_ctrl; unsigned int usb_flags; |