[src/trunk]: src/sys/arch Petri Laakso <petri.laakso%asd.fi@localhost>

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/131da10d0365
branches:  trunk
changeset: 335499:131da10d0365
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Jan 10 12:18:09 2015 +0000

description:
Petri Laakso <petri.laakso%asd.fi@localhost>
-       New audio driver
-       Add new devices rtc and digfilt
-       Use BOOT_ARGS if defined in kernel configuration

diffstat:

 sys/arch/arm/imx/files.imx23                              |  14 +++++++++++++-
 sys/arch/evbarm/conf/IMX23_OLINUXINO                      |   9 ++++++++-
 sys/arch/evbarm/conf/files.imx23_olinuxino                |   5 ++++-
 sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c |   6 +++++-
 4 files changed, 30 insertions(+), 4 deletions(-)

diffs (100 lines):

diff -r 9eb16dba3487 -r 131da10d0365 sys/arch/arm/imx/files.imx23
--- a/sys/arch/arm/imx/files.imx23      Sat Jan 10 12:16:28 2015 +0000
+++ b/sys/arch/arm/imx/files.imx23      Sat Jan 10 12:18:09 2015 +0000
@@ -1,10 +1,12 @@
-# $Id: files.imx23,v 1.3 2015/01/10 12:11:39 jmcneill Exp $
+# $Id: files.imx23,v 1.4 2015/01/10 12:18:09 jmcneill Exp $
 #
 # Freescale i.MX23 applications processor configuration info.
 #
 
 defparam opt_imx.h                     MEMSIZE
 
+defflag opt_imx.h                               IMX23
+
 file   arch/arm/arm32/irq_dispatch.S   icoll
 file   arch/arm/imx/imx23_space.c      ahb|apbh|apbx
 file   arch/arm/imx/imx23_dma.c        ahb|apbh|apbx
@@ -82,3 +84,13 @@
 # EHCI
 attach ehci at imxusbc with imxehci
 file   arch/arm/imx/imxusb.c           imxehci
+
+# RTC 
+device rtc
+attach rtc at apbx
+file arch/arm/imx/imx23_rtc.c          rtc
+
+# Digital filter: Audio I/O
+device digfilt: audiobus
+attach digfilt at apbx with digfilt
+file arch/arm/imx/imx23_digfilt.c      digfilt
diff -r 9eb16dba3487 -r 131da10d0365 sys/arch/evbarm/conf/IMX23_OLINUXINO
--- a/sys/arch/evbarm/conf/IMX23_OLINUXINO      Sat Jan 10 12:16:28 2015 +0000
+++ b/sys/arch/evbarm/conf/IMX23_OLINUXINO      Sat Jan 10 12:18:09 2015 +0000
@@ -1,4 +1,4 @@
-# $Id: IMX23_OLINUXINO,v 1.10 2014/10/11 11:55:07 uebayasi Exp $
+# $Id: IMX23_OLINUXINO,v 1.11 2015/01/10 12:18:09 jmcneill Exp $
 #
 # IMX23_OLINUXINO -- Olimex i.MX23 OLinuXino kernel configuration file.
 #
@@ -66,6 +66,13 @@
 # Clock control
 clkctrl0       at apbx? addr 0x80040000 size 0x2000 irq -1
 
+# RTC
+rtc0           at apbx? addr 0x8005C000 size 0x2000 irq -1
+
+# Digital filter: Audio I/O
+digfilt0       at apbx? addr 0x80048000 size 0x8000 irq -1
+audio0         at digfilt0
+
 # USB host
 ehci0          at imxusbc0 unit 0 irq 11
 # USB OTG
diff -r 9eb16dba3487 -r 131da10d0365 sys/arch/evbarm/conf/files.imx23_olinuxino
--- a/sys/arch/evbarm/conf/files.imx23_olinuxino        Sat Jan 10 12:16:28 2015 +0000
+++ b/sys/arch/evbarm/conf/files.imx23_olinuxino        Sat Jan 10 12:18:09 2015 +0000
@@ -1,4 +1,4 @@
-# $Id: files.imx23_olinuxino,v 1.2 2013/10/07 17:36:40 matt Exp $
+# $Id: files.imx23_olinuxino,v 1.3 2015/01/10 12:18:09 jmcneill Exp $
 #
 # Olimex i.MX23 OLinuXino board configuration info.
 #
@@ -6,6 +6,9 @@
 # Pull in SoC support
 include "arch/arm/imx/files.imx23"
 
+# Kernel boot arguments
+defparam opt_machdep.h                         BOOT_ARGS
+
 file   arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c
 file   arch/arm/arm32/arm32_kvminit.c
 file   arch/arm/arm32/arm32_boot.c
diff -r 9eb16dba3487 -r 131da10d0365 sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c
--- a/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c Sat Jan 10 12:16:28 2015 +0000
+++ b/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c Sat Jan 10 12:18:09 2015 +0000
@@ -1,4 +1,4 @@
-/* $Id: imx23_olinuxino_machdep.c,v 1.5 2015/01/10 12:11:39 jmcneill Exp $ */
+/* $Id: imx23_olinuxino_machdep.c,v 1.6 2015/01/10 12:18:09 jmcneill Exp $ */
 
 /*
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -67,6 +67,7 @@
 #endif
 
 #include "opt_evbarm_boardtype.h"
+#include "opt_machdep.h"
 
 #define        KERNEL_VM_BASE  (KERNEL_BASE + 0x8000000)
 #define        KERNEL_VM_SIZE  0x20000000
@@ -163,6 +164,9 @@
        /* Copy boot arguments passed from bootimx23. */
        boot_args = (char *)KERN_PHYSTOV(BOOTIMX23_ARGS);
        memcpy(kernel_boot_args, boot_args, MAX_BOOT_STRING);
+#ifdef BOOT_ARGS
+       strcpy(kernel_boot_args, BOOT_ARGS);
+#endif
        boot_args = kernel_boot_args;
 #ifdef VERBOSE_INIT_ARM
        printf("boot_args @ %lx: '%s'\n", KERN_PHYSTOV(BOOTIMX23_ARGS),