diff options
| author | Tom Rini <trini@konsulko.com> | 2017-06-08 12:14:11 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-06-08 12:14:11 -0400 |
| commit | 156d64fa55e9914b144c5e83f2a9e13d1223a4d3 (patch) | |
| tree | 3501aaea3a400a6b92e6f98447f3205502d86887 /arch/arm/include/asm/arch-rockchip/grf_rk3288.h | |
| parent | 24796d27be0d0f403ed6ad7e3022b33e36ac08b5 (diff) | |
| parent | 6c53d680c6b57bb9617a93cd1e92c242ae0aab21 (diff) | |
Merge git://git.denx.de/u-boot-rockchip
Here is additional rk3368 and rk3399 support, rv1108 support,
refactoring HDMI video (brought in from Anatolij's tree to resolve
conflicts), some mkimage fixes and a few other things.
Diffstat (limited to 'arch/arm/include/asm/arch-rockchip/grf_rk3288.h')
| -rw-r--r-- | arch/arm/include/asm/arch-rockchip/grf_rk3288.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk3288.h b/arch/arm/include/asm/arch-rockchip/grf_rk3288.h index 7d56b8ced0..fbc4a0d80f 100644 --- a/arch/arm/include/asm/arch-rockchip/grf_rk3288.h +++ b/arch/arm/include/asm/arch-rockchip/grf_rk3288.h @@ -813,7 +813,7 @@ enum { (1 << RK3288_TXCLK_DLY_ENA_GMAC_SHIFT), RK3288_TXCLK_DLY_ENA_GMAC_DISABLE = 0, RK3288_TXCLK_DLY_ENA_GMAC_ENABLE = - (1 << RK3288_RXCLK_DLY_ENA_GMAC_SHIFT), + (1 << RK3288_TXCLK_DLY_ENA_GMAC_SHIFT), RK3288_CLK_RX_DL_CFG_GMAC_SHIFT = 0x7, RK3288_CLK_RX_DL_CFG_GMAC_MASK = |