[src/trunk]: src/sys/arch/arm/rockchip Set RGMII delay for MAC side correctly...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3740309ca682
branches:  trunk
changeset: 449240:3740309ca682
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Thu Feb 28 03:05:46 2019 +0000

description:
Set RGMII delay for MAC side correctly on RK3399.

diffstat:

 sys/arch/arm/rockchip/rk_gmac.c |  11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diffs (33 lines):

diff -r 88e5df664241 -r 3740309ca682 sys/arch/arm/rockchip/rk_gmac.c
--- a/sys/arch/arm/rockchip/rk_gmac.c   Thu Feb 28 02:35:37 2019 +0000
+++ b/sys/arch/arm/rockchip/rk_gmac.c   Thu Feb 28 03:05:46 2019 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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 @@
        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);