summaryrefslogtreecommitdiff
path: root/sys/arch/zaurus/conf
diff options
context:
space:
mode:
authorUwe Stuehler <uwe@cvs.openbsd.org>2007-03-18 20:53:11 +0000
committerUwe Stuehler <uwe@cvs.openbsd.org>2007-03-18 20:53:11 +0000
commit9a1bf0c4b0a09c9e7a03e964c8ee6c3608fea836 (patch)
treec189c1e443ffac2fac8d4100f00bdac45d7dbd09 /sys/arch/zaurus/conf
parentdbae9d9f778079bf5b61ef91c0bb7361e2a5f1e4 (diff)
Support the PXA27x SD/SDIO/MMC controller on Zaurus
We use the suggested workaround for the problem E40 in the PXA27x errata sheet. Unfortunately this limits the bus speed to 9.75Mhz.
Diffstat (limited to 'sys/arch/zaurus/conf')
-rw-r--r--sys/arch/zaurus/conf/GENERIC6
-rw-r--r--sys/arch/zaurus/conf/files.zaurus11
2 files changed, 15 insertions, 2 deletions
diff --git a/sys/arch/zaurus/conf/GENERIC b/sys/arch/zaurus/conf/GENERIC
index 8d601f24f7b..835e7c120a9 100644
--- a/sys/arch/zaurus/conf/GENERIC
+++ b/sys/arch/zaurus/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.61 2007/02/28 21:54:43 grange Exp $
+# $OpenBSD: GENERIC,v 1.62 2007/03/18 20:53:10 uwe Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -202,6 +202,10 @@ zrc0 at pxaip? # Zaurus remote control
wskbd* at zrc? mux 1
flash0 at pxaip? # NAND flash memory
+pxammc0 at pxaip? # MMC/SD/SDIO controller
+sdmmc* at pxammc? # SD/MMC bus
+scsibus* at sdmmc? # SCSI emulation
+
# 1-Wire devices
option ONEWIREVERBOSE
owid* at onewire? # ID
diff --git a/sys/arch/zaurus/conf/files.zaurus b/sys/arch/zaurus/conf/files.zaurus
index 29feac6abe4..29facd476b6 100644
--- a/sys/arch/zaurus/conf/files.zaurus
+++ b/sys/arch/zaurus/conf/files.zaurus
@@ -1,4 +1,4 @@
-# $OpenBSD: files.zaurus,v 1.23 2006/11/25 14:31:59 uwe Exp $
+# $OpenBSD: files.zaurus,v 1.24 2007/03/18 20:53:10 uwe Exp $
#
# First try for arm-specific configuration info
#
@@ -42,6 +42,10 @@ file arch/zaurus/dev/zaurus_scoop.c scoop
attach pxapcic at pxaip with pxapcic_scoop
file arch/zaurus/dev/scoop_pcic.c pxapcic_scoop
+# SD/MMC socket controller
+attach pxammc at pxaip with pxammc_scoop
+file arch/zaurus/dev/scoop_mmc.c pxammc_scoop
+
# Dedicated SSP unit for ADC, touch screen, and backlight
device zssp
attach zssp at pxaip
@@ -102,6 +106,11 @@ include "dev/usb/files.usb"
include "dev/mii/files.mii"
#
+# Machine-independent SD/MMC drivers
+#
+include "dev/sdmmc/files.sdmmc"
+
+#
# Machine-independent 1-Wire drivers
#
include "dev/onewire/files.onewire"