summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Pascoe <pascoe@cvs.openbsd.org>2006-04-04 09:16:16 +0000
committerChristopher Pascoe <pascoe@cvs.openbsd.org>2006-04-04 09:16:16 +0000
commit718e4a5849a7ee6b1663586e05b37f894336b8a6 (patch)
tree0b0badfcd755c60f86c5d4ea4046fe7fa6c3ae1e
parent079216a2691b0b6b08674638416a03c6fa904e39 (diff)
Configure the I2S controller's GPIOs, not than the USB's.
tested robert@
-rw-r--r--sys/arch/arm/xscale/pxa2x0_i2s.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/arm/xscale/pxa2x0_i2s.c b/sys/arch/arm/xscale/pxa2x0_i2s.c
index b4896eadfcc..e00d58deae7 100644
--- a/sys/arch/arm/xscale/pxa2x0_i2s.c
+++ b/sys/arch/arm/xscale/pxa2x0_i2s.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pxa2x0_i2s.c,v 1.5 2005/05/26 03:52:07 pascoe Exp $ */
+/* $OpenBSD: pxa2x0_i2s.c,v 1.6 2006/04/04 09:16:15 pascoe Exp $ */
/*
* Copyright (c) 2005 Christopher Pascoe <pascoe@openbsd.org>
@@ -62,11 +62,11 @@ pxa2x0_i2s_attach_sub(struct pxa2x0_i2s_softc *sc)
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); /* I2S_SYSCLK */
- pxa2x0_gpio_set_function(37, GPIO_ALT_FN_1_OUT); /* I2S_BITCLK */
- pxa2x0_gpio_set_function(41, GPIO_ALT_FN_2_IN); /* I2S_SYNC */
- pxa2x0_gpio_set_function(89, GPIO_ALT_FN_2_OUT); /* I2S_SDATAOUT */
- pxa2x0_gpio_set_function(120, GPIO_ALT_FN_2_OUT); /* I2S_SDATAIN */
+ pxa2x0_gpio_set_function(28, GPIO_ALT_FN_1_OUT); /* I2S_BITCLK */
+ pxa2x0_gpio_set_function(113, GPIO_ALT_FN_1_OUT); /* I2S_SYSCLK */
+ pxa2x0_gpio_set_function(31, GPIO_ALT_FN_1_OUT); /* I2S_SYNC */
+ pxa2x0_gpio_set_function(30, GPIO_ALT_FN_1_OUT); /* I2S_SDATA_OUT */
+ pxa2x0_gpio_set_function(29, GPIO_ALT_FN_2_IN); /* I2S_SDATA_IN */
pxa2x0_i2s_init(sc);