-/* $OpenBSD: exehci.c,v 1.7 2017/03/10 21:26:19 kettenis Exp $ */
+/* $OpenBSD: exehci.c,v 1.8 2017/12/23 10:23:34 kettenis Exp $ */
/*
* Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se>
*
#include <dev/usb/usbdivar.h>
#include <dev/usb/usb_mem.h>
-#include <armv7/exynos/exsysregvar.h>
-
#include <dev/ofw/openfirm.h>
#include <dev/ofw/ofw_clock.h>
#include <dev/ofw/ofw_gpio.h>
#define EHCI_CTRL_ENAINCR8 (1 << 27)
#define EHCI_CTRL_ENAINCR16 (1 << 26)
+/* SYSREG registers */
+#define USB20PHY_CFG 0x230
+#define USB20PHY_CFG_HOST_LINK_EN (1 << 0)
+
/* PMU registers */
#define USB_HOST_POWER_5250 0x708
#define USB_HOST_POWER_54XX 0x70c
void
exehci_setup(struct exehci_softc *sc)
{
- struct regmap *pmurm;
- uint32_t pmureg;
+ struct regmap *pmurm, *sysrm;
+ uint32_t pmureg, sysreg;
bus_size_t offset;
uint32_t val;
int node;
delay(3000);
#endif
- exsysreg_usbhost_mode(1);
+ /* Enable host mode. */
+ sysreg = OF_getpropint(sc->sc_phy, "samsung,sysreg-phandle", 0);
+ sysrm = regmap_byphandle(sysreg);
+ if (sysrm) {
+ val = regmap_read_4(sysrm, USB20PHY_CFG);
+ val |= USB20PHY_CFG_HOST_LINK_EN;
+ regmap_write_4(sysrm, USB20PHY_CFG, val);
+ }
/* Power up the PHY block. */
pmureg = OF_getpropint(sc->sc_phy, "samsung,pmureg-phandle", 0);
+++ /dev/null
-/* $OpenBSD: exsysreg.c,v 1.5 2017/03/04 18:17:24 kettenis Exp $ */
-/*
- * Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/device.h>
-
-#include <machine/intr.h>
-#include <machine/bus.h>
-#include <machine/fdt.h>
-
-#include <dev/ofw/openfirm.h>
-#include <dev/ofw/fdt.h>
-
-#include <armv7/exynos/exsysregvar.h>
-
-/* registers */
-#define SYSREG_USB20PHY_CFG 0x230
-
-/* bits and bytes */
-#define SYSREG_USB20PHY_CFG_HOST_LINK_EN (1 << 0)
-
-#define HREAD4(sc, reg) \
- (bus_space_read_4((sc)->sc_iot, (sc)->sc_ioh, (reg)))
-#define HWRITE4(sc, reg, val) \
- bus_space_write_4((sc)->sc_iot, (sc)->sc_ioh, (reg), (val))
-#define HSET4(sc, reg, bits) \
- HWRITE4((sc), (reg), HREAD4((sc), (reg)) | (bits))
-#define HCLR4(sc, reg, bits) \
- HWRITE4((sc), (reg), HREAD4((sc), (reg)) & ~(bits))
-
-struct exsysreg_softc {
- struct device sc_dev;
- bus_space_tag_t sc_iot;
- bus_space_handle_t sc_ioh;
-};
-
-struct exsysreg_softc *exsysreg_sc;
-
-int exsysreg_match(struct device *, void *, void *);
-void exsysreg_attach(struct device *, struct device *, void *);
-
-struct cfattach exsysreg_ca = {
- sizeof (struct exsysreg_softc), exsysreg_match, exsysreg_attach
-};
-
-struct cfdriver exsysreg_cd = {
- NULL, "exsysreg", DV_DULL
-};
-
-int
-exsysreg_match(struct device *parent, void *match, void *aux)
-{
- struct fdt_attach_args *faa = aux;
-
- return OF_is_compatible(faa->fa_node, "samsung,exynos5-sysreg");
-}
-
-void
-exsysreg_attach(struct device *parent, struct device *self, void *aux)
-{
- struct exsysreg_softc *sc = (struct exsysreg_softc *)self;
- struct fdt_attach_args *faa = aux;
-
- sc->sc_iot = faa->fa_iot;
-
- if (bus_space_map(sc->sc_iot, faa->fa_reg[0].addr,
- faa->fa_reg[0].size, 0, &sc->sc_ioh))
- panic("%s: bus_space_map failed!", __func__);
-
- printf("\n");
-
- exsysreg_sc = sc;
-}
-
-void
-exsysreg_usbhost_mode(int on)
-{
- struct exsysreg_softc *sc = exsysreg_sc;
- KASSERT(sc);
-
- if (on)
- HSET4(sc, SYSREG_USB20PHY_CFG, SYSREG_USB20PHY_CFG_HOST_LINK_EN);
- else
- HCLR4(sc, SYSREG_USB20PHY_CFG, SYSREG_USB20PHY_CFG_HOST_LINK_EN);
-}
+++ /dev/null
-/* $OpenBSD: exsysregvar.h,v 1.1 2015/01/26 02:48:24 bmercer Exp $ */
-/*
- * Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef EXSYSREGVAR_H
-#define EXSYSREGVAR_H
-
-void exsysreg_usbhost_mode(int);
-
-#endif /* EXSYSREGVAR_H */
projects / openbsd / commitdiff