Module Name: src
Committed By: msaitoh
Date: Thu Feb 28 03:05:46 UTC 2019
Modified Files:
src/sys/arch/arm/rockchip: rk_gmac.c
Log Message:
Set RGMII delay for MAC side correctly on RK3399.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/rockchip/rk_gmac.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/rockchip/rk_gmac.c
diff -u src/sys/arch/arm/rockchip/rk_gmac.c:1.10 src/sys/arch/arm/rockchip/rk_gmac.c:1.11
--- src/sys/arch/arm/rockchip/rk_gmac.c:1.10 Wed Feb 27 07:16:00 2019
+++ src/sys/arch/arm/rockchip/rk_gmac.c Thu Feb 28 03:05:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_gmac.c,v 1.10 2019/02/27 07:16:00 msaitoh Exp $ */
+/* $NetBSD: rk_gmac.c,v 1.11 2019/02/28 03:05:46 msaitoh Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <jmcne...@invisible.ca>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rk_gmac.c,v 1.10 2019/02/27 07:16:00 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_gmac.c,v 1.11 2019/02/28 03:05:46 msaitoh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -171,8 +171,13 @@ rk3399_gmac_set_mode_rgmii(struct dwc_gm
const uint32_t con5 = __SHIFTIN(1, RK3399_GRF_SOC_CON5_GMAC_PHY_INTF_SEL);
const uint32_t con6_mask =
- (RK3399_GRF_SOC_CON6_GMAC_CLK_RX_DL_CFG | RK3399_GRF_SOC_CON6_GMAC_CLK_TX_DL_CFG) << 16;
+ (RK3399_GRF_SOC_CON6_GMAC_RXCLK_DLY_ENA |
+ RK3399_GRF_SOC_CON6_GMAC_TXCLK_DLY_ENA |
+ RK3399_GRF_SOC_CON6_GMAC_CLK_RX_DL_CFG |
+ RK3399_GRF_SOC_CON6_GMAC_CLK_TX_DL_CFG) << 16;
const uint32_t con6 =
+ (tx_delay ? RK3399_GRF_SOC_CON6_GMAC_TXCLK_DLY_ENA : 0) |
+ (rx_delay ? RK3399_GRF_SOC_CON6_GMAC_RXCLK_DLY_ENA : 0) |
__SHIFTIN(rx_delay, RK3399_GRF_SOC_CON6_GMAC_CLK_RX_DL_CFG) |
__SHIFTIN(tx_delay, RK3399_GRF_SOC_CON6_GMAC_CLK_TX_DL_CFG);
