Module Name: src
Committed By: martin
Date: Tue Sep 9 10:03:43 UTC 2014
Modified Files:
src/sys/arch/arm/allwinner: awin_gige.c
Log Message:
Better safe than sorry: do the full clock setup, and pass the MII clock
used (depending on board configuration, we use RGMII mode) to the
core attach function.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/allwinner/awin_gige.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/allwinner/awin_gige.c
diff -u src/sys/arch/arm/allwinner/awin_gige.c:1.5 src/sys/arch/arm/allwinner/awin_gige.c:1.6
--- src/sys/arch/arm/allwinner/awin_gige.c:1.5 Mon Sep 8 14:26:16 2014
+++ src/sys/arch/arm/allwinner/awin_gige.c Tue Sep 9 10:03:43 2014
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: awin_gige.c,v 1.5 2014/09/08 14:26:16 martin Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_gige.c,v 1.6 2014/09/09 10:03:43 martin Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -129,7 +129,20 @@ awin_gige_attach(device_t parent, device
aprint_normal_dev(self, "interrupting on irq %d\n",
loc->loc_intr);
- dwc_gmac_attach(&sc->sc_core, ep);
+ /*
+ * Enable GMAC clock
+ */
+ awin_reg_set_clear(aio->aio_core_bst, aio->aio_ccm_bsh,
+ AWIN_AHB_GATING1_REG, AWIN_AHB_GATING1_GMAC, 0);
+ /*
+ * We use RGMII phy mode, set up clock accordingly
+ */
+ awin_reg_set_clear(aio->aio_core_bst, aio->aio_ccm_bsh,
+ AWIN_GMAC_CLK_REG, 4, 3);
+ awin_reg_set_clear(aio->aio_core_bst, aio->aio_ccm_bsh,
+ AWIN_GMAC_CLK_REG, 2, 0);
+
+ dwc_gmac_attach(&sc->sc_core, ep, 2);
}
