Tue Jun 18 15:40:26 2013 UTC ()
Fix gpio addresses
Add sdhc


(matt)
diff -r1.9 -r1.10 src/sys/arch/evbarm/conf/PANDABOARD
cvs diff -r1.9 -r1.10 src/sys/arch/evbarm/conf/Attic/PANDABOARD (expand / switch to unified diff)

--- src/sys/arch/evbarm/conf/Attic/PANDABOARD 2013/06/16 16:49:09 1.9
+++ src/sys/arch/evbarm/conf/Attic/PANDABOARD 2013/06/18 15:40:26 1.10
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# 1#
2# $NetBSD: PANDABOARD,v 1.9 2013/06/16 16:49:09 matt Exp $ 2# $NetBSD: PANDABOARD,v 1.10 2013/06/18 15:40:26 matt Exp $
3# 3#
4# PANDABOARD -- TI OMAP 4430 Eval Board Kernel 4# PANDABOARD -- TI OMAP 4430 Eval Board Kernel
5# 5#
6 6
7include "arch/evbarm/conf/std.beagle" 7include "arch/evbarm/conf/std.beagle"
8 8
9# estimated number of users 9# estimated number of users
10 10
11maxusers 32 11maxusers 32
12 12
13# Standard system options 13# Standard system options
14 14
15options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT 15options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT
@@ -176,32 +176,32 @@ a9wdt0 at armperiph? # Watchdog @@ -176,32 +176,32 @@ a9wdt0 at armperiph? # Watchdog
176 176
177# L3 Interconnect 177# L3 Interconnect
178L3i0 at mainbus? 178L3i0 at mainbus?
179 179
180# OBIO 180# OBIO
181obio0 at mainbus? base 0x4a000000 size 0x1000000 # L4 CORE (CFG) 181obio0 at mainbus? base 0x4a000000 size 0x1000000 # L4 CORE (CFG)
182obio1 at mainbus? base 0x4a300000 size 0x0040000 # L4 WAKEUP 182obio1 at mainbus? base 0x4a300000 size 0x0040000 # L4 WAKEUP
183obio2 at mainbus? base 0x48000000 size 0x1000000 # L4 PERIPHERAL 183obio2 at mainbus? base 0x48000000 size 0x1000000 # L4 PERIPHERAL
184obio3 at mainbus? base 0x49000000 size 0x1000000 # L4 ABE 184obio3 at mainbus? base 0x49000000 size 0x1000000 # L4 ABE
185 185
186# General Purpose Memory Controller 186# General Purpose Memory Controller
187gpmc0 at mainbus? base 0x50000000 187gpmc0 at mainbus? base 0x50000000
188 188
189omapgpio0 at obio1 addr 0x48310000 size 0x0400 intrbase 160 intr 61 189omapgpio0 at obio1 addr 0x4a310000 size 0x0400 intrbase 160 intr 61
190#omapgpio1 at obio2 addr 0x49055000 size 0x0400 intrbase 192 intr 62 190omapgpio1 at obio2 addr 0x48055000 size 0x0400 intrbase 192 intr 62
191#omapgpio2 at obio2 addr 0x49057000 size 0x0400 intrbase 224 intr 63 191omapgpio2 at obio2 addr 0x48057000 size 0x0400 intrbase 224 intr 63
192#omapgpio3 at obio2 addr 0x49059000 size 0x0400 intrbase 256 intr 64 192omapgpio3 at obio2 addr 0x48059000 size 0x0400 intrbase 256 intr 64
193omapgpio4 at obio2 addr 0x4905a000 size 0x0400 intrbase 288 intr 65 193omapgpio4 at obio2 addr 0x4805a000 size 0x0400 intrbase 288 intr 65
194#omapgpio5 at obio2 addr 0x4905d000 size 0x0400 intrbase 320 intr 66 194omapgpio5 at obio2 addr 0x4805d000 size 0x0400 intrbase 320 intr 66
195 195
196gpio* at omapgpio? 196gpio* at omapgpio?
197 197
198# # I2C Controller 198# # I2C Controller
199# omapi2c0 at tipb? addr 0xfffb3800 intr 68 mult 4 199# omapi2c0 at tipb? addr 0xfffb3800 intr 68 mult 4
200# iic* at omapi2c? 200# iic* at omapi2c?
201# # omap's own i2c address 201# # omap's own i2c address
202# options OMAP_I2C_ADDRESS=0xe 202# options OMAP_I2C_ADDRESS=0xe
203# # i2c bus clock low and high times in ns 203# # i2c bus clock low and high times in ns
204# options I2C_LOW_TIME_nSEC=1500 204# options I2C_LOW_TIME_nSEC=1500
205# options I2C_HIGH_TIME_nSEC=1000 205# options I2C_HIGH_TIME_nSEC=1000
206 206
207# On-board 16550 UARTs 207# On-board 16550 UARTs
@@ -237,26 +237,35 @@ options CONSADDR=0x48020000, CONSPEED=1 @@ -237,26 +237,35 @@ options CONSADDR=0x48020000, CONSPEED=1
237#options WS_KERNEL_BG=WSCOL_LIGHT_WHITE 237#options WS_KERNEL_BG=WSCOL_LIGHT_WHITE
238#options WSDISPLAY_COMPAT_USL # VT handling 238#options WSDISPLAY_COMPAT_USL # VT handling
239#options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes 239#options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
240#options WSDISPLAY_DEFAULTSCREENS=4 240#options WSDISPLAY_DEFAULTSCREENS=4
241#options FONT_QVSS8x15 241#options FONT_QVSS8x15
242#options FONT_GALLANT12x22 # the console font 242#options FONT_GALLANT12x22 # the console font
243 243
244#pseudo-device wsmux # mouse & keyboard multiplexor 244#pseudo-device wsmux # mouse & keyboard multiplexor
245#pseudo-device wsfont 245#pseudo-device wsfont
246 246
247# Power, Reset and Clock Management 247# Power, Reset and Clock Management
248prcm* at obio1 addr 0x4A306000 size 0x2000 # PRM Module 248prcm* at obio1 addr 0x4A306000 size 0x2000 # PRM Module
249 249
 250# MMC/SDIO
 251sdhc0 at obio2 addr 0x4809c000 size 0x0f00 intr 115 # 83 + 32
 252#sdhc1 at obio2 addr 0x480b4000 size 0x0f00 intr 118 # 85 + 32
 253#sdhc2 at obio2 addr 0x480ad000 size 0x0f00 intr 126 # 94 + 32
 254sdmmc* at sdhc? # SD/MMC bus
 255ld* at sdmmc?
 256#options SDMMC_DEBUG
 257#options SDHC_DEBUG
 258
250# On-board USB 259# On-board USB
251ohci* at obio0 addr 0x4A064800 size 0x0400 intr 108 # 76 + 32 260ohci* at obio0 addr 0x4A064800 size 0x0400 intr 108 # 76 + 32
252ehci* at obio0 addr 0x4A064c00 size 0x0400 intr 109 # 77 + 32 261ehci* at obio0 addr 0x4A064c00 size 0x0400 intr 109 # 77 + 32
253usb* at ohci? 262usb* at ohci?
254usb* at ehci? 263usb* at ehci?
255uhub* at usb? 264uhub* at usb?
256uhub* at uhub? port ? 265uhub* at uhub? port ?
257umass* at uhub? port ? configuration ? interface ? 266umass* at uhub? port ? configuration ? interface ?
258scsibus* at scsi? 267scsibus* at scsi?
259sd* at scsibus? target ? lun ? 268sd* at scsibus? target ? lun ?
260wd* at umass? 269wd* at umass?
261#uhidev* at uhub? 270#uhidev* at uhub?
262#ukbd* at uhidev? 271#ukbd* at uhidev?