[src/trunk]: src/sys/arch/arm/rockchip RK3399: Skip setting RGMII TX/RX clock...

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

details:   https://anonhg.NetBSD.org/src/rev/5198012f85c2
branches:  trunk
changeset: 451085:5198012f85c2
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun May 05 19:10:05 2019 +0000

description:
RK3399: Skip setting RGMII TX/RX clock delayline parameters for now and
rely on the settings configured by firmware.

diffstat:

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

diffs (40 lines):

diff -r b55b20e44573 -r 5198012f85c2 sys/arch/arm/rockchip/rk_gmac.c
--- a/sys/arch/arm/rockchip/rk_gmac.c   Sun May 05 18:16:39 2019 +0000
+++ b/sys/arch/arm/rockchip/rk_gmac.c   Sun May 05 19:10:05 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_gmac.c,v 1.11 2019/02/28 03:05:46 msaitoh Exp $ */
+/* $NetBSD: rk_gmac.c,v 1.12 2019/05/05 19:10:05 jmcneill 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.11 2019/02/28 03:05:46 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_gmac.c,v 1.12 2019/05/05 19:10:05 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -170,6 +170,7 @@
            (RK3399_GRF_SOC_CON5_RMII_MODE | RK3399_GRF_SOC_CON5_GMAC_PHY_INTF_SEL) << 16;
        const uint32_t con5 = __SHIFTIN(1, RK3399_GRF_SOC_CON5_GMAC_PHY_INTF_SEL);
 
+#if notyet
        const uint32_t con6_mask =
            (RK3399_GRF_SOC_CON6_GMAC_RXCLK_DLY_ENA |
                RK3399_GRF_SOC_CON6_GMAC_TXCLK_DLY_ENA |
@@ -180,10 +181,13 @@
            (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);
+#endif
 
        syscon_lock(rk_sc->sc_syscon);
        syscon_write_4(rk_sc->sc_syscon, RK3399_GRF_SOC_CON5, con5 | con5_mask);
+#if notyet
        syscon_write_4(rk_sc->sc_syscon, RK3399_GRF_SOC_CON6, con6 | con6_mask);
+#endif
        syscon_unlock(rk_sc->sc_syscon);
 }