diff options
| author |   kettenis <kettenis@openbsd.org> | 2016-08-22 19:38:42 +0000 |
|---|---|---|
| committer | kettenis <kettenis@openbsd.org> | 2016-08-22 19:38:42 +0000 |
| commit | db9e40834d09437f5bd09b7f60caa53dfaae5a5b (patch) | |
| tree | 6dbc0fde76bc47994abe0a3eddcf13dc2f49f288 | |
| parent | Use new clock API to manipulate clocks. (diff) | |
| download | wireguard-openbsd-db9e40834d09437f5bd09b7f60caa53dfaae5a5b.tar.xz wireguard-openbsd-db9e40834d09437f5bd09b7f60caa53dfaae5a5b.zip | |
Use new clock API.
| -rw-r--r-- | sys/arch/armv7/sunxi/sxie.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/arch/armv7/sunxi/sxie.c b/sys/arch/armv7/sunxi/sxie.c index 8e543038e04..0f40ab7fd68 100644 --- a/sys/arch/armv7/sunxi/sxie.c +++ b/sys/arch/armv7/sunxi/sxie.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sxie.c,v 1.20 2016/08/15 09:20:47 kettenis Exp $ */ +/* $OpenBSD: sxie.c,v 1.21 2016/08/22 19:38:42 kettenis Exp $ */ /* * Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se> * Copyright (c) 2013 Artturi Alm @@ -46,11 +46,10 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> -#include <armv7/armv7/armv7var.h> #include <armv7/sunxi/sunxireg.h> -#include <armv7/sunxi/sxiccmuvar.h> #include <dev/ofw/openfirm.h> +#include <dev/ofw/ofw_clock.h> #include <dev/ofw/ofw_pinctrl.h> #include <dev/ofw/fdt.h> @@ -226,6 +225,8 @@ sxie_attach(struct device *parent, struct device *self, void *aux) if (bus_space_map(sc->sc_iot, SID_ADDR, SID_SIZE, 0, &sc->sc_sid_ioh)) panic("sxie_attach: bus_space_map sid_ioh failed!"); + clock_enable_all(faa->fa_node); + sxie_socware_init(sc); sc->txf_inuse = 0; @@ -278,8 +279,6 @@ sxie_socware_init(struct sxie_softc *sc) int have_mac = 0; uint32_t reg; - sxiccmu_enablemodule(CCMU_EMAC); - /* MII clock cfg */ SXICMS4(sc, SXIE_MACMCFG, 15 << 2, 13 << 2); |