diff options
| author | Tom Rini <trini@konsulko.com> | 2018-05-14 18:13:59 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-05-14 18:13:59 -0400 |
| commit | db6b0281eca0dc4a1a40d9ef52d543b09979a1bf (patch) | |
| tree | c204a2ad8663e93e88084cdc907b6cba86bd6ef4 | |
| parent | ca70cbabdcd19bf157ae4fa984559b126071ccff (diff) | |
| parent | ed1030e1523541801ae1e36bc34ee6872d474184 (diff) | |
| download | u-boot-db6b0281eca0dc4a1a40d9ef52d543b09979a1bf.zip u-boot-db6b0281eca0dc4a1a40d9ef52d543b09979a1bf.tar.gz u-boot-db6b0281eca0dc4a1a40d9ef52d543b09979a1bf.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-rockchip
| -rw-r--r-- | drivers/clk/rockchip/clk_rk3288.c | 10 | ||||
| -rw-r--r-- | include/configs/rockchip-common.h | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/drivers/clk/rockchip/clk_rk3288.c b/drivers/clk/rockchip/clk_rk3288.c index 9375681..4a6e5c7 100644 --- a/drivers/clk/rockchip/clk_rk3288.c +++ b/drivers/clk/rockchip/clk_rk3288.c @@ -898,6 +898,16 @@ static int rk3288_clk_enable(struct clk *clk) case HCLK_USBHOST0: case HCLK_HSIC: return 0; + + case SCLK_MAC: + case SCLK_MAC_RX: + case SCLK_MAC_TX: + case SCLK_MACREF: + case SCLK_MACREF_OUT: + case ACLK_GMAC: + case PCLK_GMAC: + /* Required to successfully probe the Designware GMAC driver */ + return 0; } debug("%s: unsupported clk %ld\n", __func__, clk->id); diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index dee82ca..68e1105 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -7,6 +7,8 @@ #define _ROCKCHIP_COMMON_H_ #include <linux/sizes.h> +#define CONFIG_SYS_NS16550_MEM32 + #ifndef CONFIG_SPL_BUILD /* First try to boot from SD (index 0), then eMMC (index 1) */ |