diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2005-02-19 00:45:15 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2005-02-19 00:45:15 +0000 |
| commit | f00824869a995af521da77771da4f74ea9d5ecb2 (patch) | |
| tree | 41bb5aa88e8c82977f908cf818031753e6d39e1e /sys/arch/arm/xscale | |
| parent | f0e556959094c589e3325aee699ca1e9bed8c189 (diff) | |
set the gpios in the right place
ok drahn@
Diffstat (limited to 'sys/arch/arm/xscale')
| -rw-r--r-- | sys/arch/arm/xscale/pxa27x_udc.c | 8 | ||||
| -rw-r--r-- | sys/arch/arm/xscale/pxa2x0_ohci.c | 9 |
2 files changed, 7 insertions, 10 deletions
diff --git a/sys/arch/arm/xscale/pxa27x_udc.c b/sys/arch/arm/xscale/pxa27x_udc.c index 6e0bb3dc31e..378dc57fd7d 100644 --- a/sys/arch/arm/xscale/pxa27x_udc.c +++ b/sys/arch/arm/xscale/pxa27x_udc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pxa27x_udc.c,v 1.2 2005/02/18 16:42:09 dlg Exp $ */ +/* $OpenBSD: pxa27x_udc.c,v 1.3 2005/02/19 00:45:14 dlg Exp $ */ /* * Copyright (c) 2005 David Gwynne <dlg@openbsd.org> @@ -82,6 +82,10 @@ pxaudc_attach(struct device *parent, struct device *self, void *aux) bus_space_barrier(sc->sc_iot, sc->sc_ioh, 0, sc->sc_size, BUS_SPACE_BARRIER_READ|BUS_SPACE_BARRIER_WRITE); + pxa2x0_gpio_set_function(35, GPIO_ALT_FN_2_IN); /* USB_P2_1 */ + pxa2x0_gpio_set_function(37, GPIO_ALT_FN_1_OUT); /* USB_P2_8 */ + pxa2x0_gpio_set_function(41, GPIO_ALT_FN_2_IN); /* USB_P2_7 */ + pxa2x0_clkman_config(CKEN_USBDC, 0); /* disable the controller */ @@ -104,7 +108,7 @@ pxaudc_attach(struct device *parent, struct device *self, void *aux) bus_space_write_4(sc->sc_iot, sc->sc_ioh, USBDC_UP2OCR, hr | USBDC_UP2OCR_DPPDE|USBDC_UP2OCR_DMPDE); - pxa2x0_gpio_set_bit(37); + pxa2x0_gpio_set_bit(37); /* USB_P2_8 */ } int diff --git a/sys/arch/arm/xscale/pxa2x0_ohci.c b/sys/arch/arm/xscale/pxa2x0_ohci.c index 1632f57bed0..019cac40ce4 100644 --- a/sys/arch/arm/xscale/pxa2x0_ohci.c +++ b/sys/arch/arm/xscale/pxa2x0_ohci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pxa2x0_ohci.c,v 1.11 2005/02/18 16:42:09 dlg Exp $ */ +/* $OpenBSD: pxa2x0_ohci.c,v 1.12 2005/02/19 00:45:14 dlg Exp $ */ /* * Copyright (c) 2005 David Gwynne <dlg@openbsd.org> @@ -121,8 +121,6 @@ pxaohci_attach(struct device *parent, struct device *self, void *aux) bus_space_write_4(sc->sc.iot, sc->sc.ioh, OHCI_INTERRUPT_DISABLE, OHCI_MIE); - /* XXX splusb? */ - strlcpy(sc->sc.sc_vendor, "PXA27x", sizeof(sc->sc.sc_vendor)); r = ohci_init(&sc->sc); @@ -136,15 +134,10 @@ pxaohci_attach(struct device *parent, struct device *self, void *aux) pxa2x0_clkman_config(CKEN_USBHC, 0); return; } - /* XXX splx(s) usb? */ sc->sc_ih = pxa2x0_intr_establish(sc->sc_intr, IPL_USB, ohci_intr, sc, sc->sc.sc_bus.bdev.dv_xname); - pxa2x0_gpio_set_function(35, GPIO_ALT_FN_2_IN); - pxa2x0_gpio_set_function(37, GPIO_ALT_FN_1_OUT); - pxa2x0_gpio_set_function(41, GPIO_ALT_FN_2_IN); - sc->sc.sc_child = config_found((void *) sc, &sc->sc.sc_bus, usbctlprint); } |