Module Name: src
Committed By: khorben
Date: Wed Mar 13 03:08:18 UTC 2013
Modified Files:
src/sys/arch/arm/omap: omap3_i2c.c omap3_scm.c
src/sys/arch/evbarm/conf: N900
Log Message:
Set the N900 kernel on par with the latest improvements related to the
BEAGLEBOARD. Tested on a Nokia N900; BEAGLEBOARD still builds.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/omap/omap3_i2c.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/omap/omap3_scm.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/conf/N900
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/omap/omap3_i2c.c
diff -u src/sys/arch/arm/omap/omap3_i2c.c:1.2 src/sys/arch/arm/omap/omap3_i2c.c:1.3
--- src/sys/arch/arm/omap/omap3_i2c.c:1.2 Tue Jan 1 23:20:24 2013
+++ src/sys/arch/arm/omap/omap3_i2c.c Wed Mar 13 03:08:17 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: omap3_i2c.c,v 1.2 2013/01/01 23:20:24 jmcneill Exp $ */
+/* $NetBSD: omap3_i2c.c,v 1.3 2013/03/13 03:08:17 khorben Exp $ */
/*-
* Copyright (c) 2012 Jared D. McNeill <jmcne...@invisible.ca>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap3_i2c.c,v 1.2 2013/01/01 23:20:24 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap3_i2c.c,v 1.3 2013/03/13 03:08:17 khorben Exp $");
#include "opt_omap.h"
@@ -99,7 +99,7 @@ omap3_i2c_match(device_t parent, cfdata_
{
struct obio_attach_args *obio = opaque;
-#if defined(OMAP_3530)
+#if defined(OMAP_3430) || defined(OMAP_3530)
if (obio->obio_addr == I2C1_BASE_3530 ||
obio->obio_addr == I2C2_BASE_3530 ||
obio->obio_addr == I2C3_BASE_3530)
Index: src/sys/arch/arm/omap/omap3_scm.c
diff -u src/sys/arch/arm/omap/omap3_scm.c:1.1 src/sys/arch/arm/omap/omap3_scm.c:1.2
--- src/sys/arch/arm/omap/omap3_scm.c:1.1 Tue Jan 1 13:05:21 2013
+++ src/sys/arch/arm/omap/omap3_scm.c Wed Mar 13 03:08:17 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: omap3_scm.c,v 1.1 2013/01/01 13:05:21 jmcneill Exp $ */
+/* $NetBSD: omap3_scm.c,v 1.2 2013/03/13 03:08:17 khorben Exp $ */
/*-
* Copyright (c) 2013 Jared D. McNeill <jmcne...@invisible.ca>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap3_scm.c,v 1.1 2013/01/01 13:05:21 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap3_scm.c,v 1.2 2013/03/13 03:08:17 khorben Exp $");
#include "opt_omap.h"
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap3_scm.c,
#define SCM_OFFSET_INTERFACE_3530 0
#define SCM_OFFSET_GENERAL_3530 0x270
-#if defined(OMAP_3530)
+#if defined(OMAP_3430) || defined(OMAP_3530)
#define SCM_BASE SCM_BASE_3530
#define SCM_SIZE SCM_SIZE_3530
#define SCM_OFFSET_INTERFACE SCM_OFFSET_INTERFACE_3530
Index: src/sys/arch/evbarm/conf/N900
diff -u src/sys/arch/evbarm/conf/N900:1.6 src/sys/arch/evbarm/conf/N900:1.7
--- src/sys/arch/evbarm/conf/N900:1.6 Sat Mar 2 02:42:13 2013
+++ src/sys/arch/evbarm/conf/N900 Wed Mar 13 03:08:18 2013
@@ -1,5 +1,5 @@
#
-# $NetBSD: N900,v 1.6 2013/03/02 02:42:13 christos Exp $
+# $NetBSD: N900,v 1.7 2013/03/13 03:08:18 khorben Exp $
#
# N900 -- Nokia N900 Kernel
#
@@ -17,6 +17,7 @@ options RTC_OFFSET=0 # hardware clock i
# CPU options
+#options UVMHIST,UVMHIST_PRINT
options CPU_CORTEXA8
options OMAP_3430
options PMAPCOUNTERS
@@ -34,9 +35,9 @@ file-system NFS # Network file system
#file-system CD9660 # ISO 9660 + Rock Ridge file system
file-system MSDOSFS # MS-DOS file system
#file-system FDESC # /dev/fd
-#file-system KERNFS # /kern
+file-system KERNFS # /kern
#file-system NULLFS # loopback file system
-#file-system PROCFS # /proc
+file-system PROCFS # /proc
#file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
#file-system UMAPFS # NULLFS + uid and gid remapping
#file-system UNION # union file system
@@ -137,7 +138,7 @@ options DDB_ONPANIC=1
options DDB_HISTORY_SIZE=100 # Enable history editing in DDB
#options KGDB
makeoptions DEBUG="-g" # compile full symbol table
-options SYMTAB_SPACE=530000
+options SYMTAB_SPACE=800000
## USB Debugging options
options USB_DEBUG
@@ -212,14 +213,20 @@ omapgpio4 at obio2 addr 0x49056000 size
gpio* at omapgpio?
-# # I2C Controller
-# omapi2c0 at tipb? addr 0xfffb3800 intr 36 mult 4
-# iic* at omapi2c?
-# # omap's own i2c address
-# options OMAP_I2C_ADDRESS=0xe
-# # i2c bus clock low and high times in ns
-# options I2C_LOW_TIME_nSEC=1500
-# options I2C_HIGH_TIME_nSEC=1000
+# System Control Module
+omapscm0 at obio0 addr 0x48002000 size 0x1000
+
+# I2C Controller
+omapiic0 at obio0 addr 0x48070000 size 0x80
+omapiic1 at obio0 addr 0x48072000 size 0x80
+omapiic2 at obio0 addr 0x48060000 size 0x80
+iic* at omapiic?
+
+# Power Managent and System Companion Device
+tps65950pm0 at iic0 addr 0x48
+tps65950pm1 at iic0 addr 0x49
+tps65950pm2 at iic0 addr 0x4a
+tps65950pm3 at iic0 addr 0x4b
# On-board 16550 UARTs
com0 at obio2 addr 0x49020000 intr 74 mult 4 # UART3 (console)
@@ -236,8 +243,10 @@ options OMAP_MPU_TIMER_CLOCK_FREQ=120000
# Watchdog timers
#omapwdt32k* at obio2 addr 0x49030000 size 2048 # WDT3
-#omapwdt32k* at obio1 addr 0x4830c000 size 2048 # WDT1
-#omapwdt32k* at obio1 addr 0x48314000 size 2048 # WDT2
+omapwdt32k* at obio1 addr 0x48314000 size 2048 # WDT2
+
+# onboard DMA
+omapdma0 at obio0 addr 0x48056000 size 0x1000
# onboard video
omapfb* at obio0 addr 0x48050000 size 0x10000
@@ -253,6 +262,8 @@ options WS_DEFAULT_FG=WSCOL_BLACK
options WS_DEFAULT_BG=WSCOL_LIGHT_WHITE
options WS_KERNEL_FG=WSCOL_GREEN
options WS_KERNEL_BG=WSCOL_LIGHT_WHITE
+options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
+options WSDISPLAY_COMPAT_SYSCONS # emulate some more ioctls
options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
options WSDISPLAY_DEFAULTSCREENS=4
@@ -307,3 +318,5 @@ pseudo-device pty # pseudo-terminals
#pseudo-device clockctl # user control of clock subsystem
pseudo-device ksyms # /dev/ksyms
pseudo-device lockstat # lock profiling
+
+cinclude "arch/evbarm/conf/N900.local"
