colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-rockchip

Browse Source
This commit is contained in:
Tom Rini
2018-05-14 18:13:59 -04:00
parent ca70cbabdc ed1030e152
commit db6b0281ec
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/clk/rockchip/clk_rk3288.c
View File

@@ -898,6 +898,16 @@ static int rk3288_clk_enable(struct clk *clk)
case HCLK_USBHOST0: case HCLK_USBHOST0:
case HCLK_HSIC: case HCLK_HSIC:
return 0; 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); debug("%s: unsupported clk %ld\n", __func__, clk->id);

2
include/configs/rockchip-common.h
View File

@@ -7,6 +7,8 @@
#define _ROCKCHIP_COMMON_H_ #define _ROCKCHIP_COMMON_H_
#include <linux/sizes.h> #include <linux/sizes.h>
#define CONFIG_SYS_NS16550_MEM32
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD
/* First try to boot from SD (index 0), then eMMC (index 1) */ /* First try to boot from SD (index 0), then eMMC (index 1) */