[src/trunk]: src/sys/arch/arm/omap Pass CS# in gpmc attach arg.

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

details:   https://anonhg.NetBSD.org/src/rev/6b97aefdea9e
branches:  trunk
changeset: 756164:6b97aefdea9e
user:      ahoka <ahoka%NetBSD.org@localhost>
date:      Wed Jul 07 21:10:39 2010 +0000

description:
Pass CS# in gpmc attach arg.

diffstat:

 sys/arch/arm/omap/omap2_gpmc.c    |  7 ++++---
 sys/arch/arm/omap/omap2_gpmcvar.h |  3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diffs (47 lines):

diff -r 020fa5f2381e -r 6b97aefdea9e sys/arch/arm/omap/omap2_gpmc.c
--- a/sys/arch/arm/omap/omap2_gpmc.c    Wed Jul 07 20:58:56 2010 +0000
+++ b/sys/arch/arm/omap/omap2_gpmc.c    Wed Jul 07 21:10:39 2010 +0000
@@ -1,7 +1,7 @@
-/*     $Id: omap2_gpmc.c,v 1.5 2008/11/21 17:13:07 matt Exp $  */
+/*     $Id: omap2_gpmc.c,v 1.6 2010/07/07 21:10:39 ahoka Exp $ */
 
 /* adapted from: */
-/*     $NetBSD: omap2_gpmc.c,v 1.5 2008/11/21 17:13:07 matt Exp $ */
+/*     $NetBSD: omap2_gpmc.c,v 1.6 2010/07/07 21:10:39 ahoka Exp $ */
 
 
 /*
@@ -102,7 +102,7 @@
 
 #include "opt_omap.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap2_gpmc.c,v 1.5 2008/11/21 17:13:07 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap2_gpmc.c,v 1.6 2010/07/07 21:10:39 ahoka Exp $");
 
 #include "locators.h"
 
@@ -290,6 +290,7 @@
                        &&  ((aa.gpmc_addr + aa.gpmc_size)
                                >= (cs->cs_addr + cs->cs_size)))
                                        continue;       /* NG */
+                       aa.gpmc_cs = i;
                        if (config_match(parent, cf, &aa)) {
                                config_attach(parent, cf, &aa, gpmc_print);
                                return 0;               /* love it */
diff -r 020fa5f2381e -r 6b97aefdea9e sys/arch/arm/omap/omap2_gpmcvar.h
--- a/sys/arch/arm/omap/omap2_gpmcvar.h Wed Jul 07 20:58:56 2010 +0000
+++ b/sys/arch/arm/omap/omap2_gpmcvar.h Wed Jul 07 21:10:39 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: omap2_gpmcvar.h,v 1.1 2008/08/27 11:03:10 matt Exp $   */
+/*     $NetBSD: omap2_gpmcvar.h,v 1.2 2010/07/07 21:10:39 ahoka Exp $  */
 /*
  * Copyright (c) 2007 Microsoft
  * All rights reserved.
@@ -38,6 +38,7 @@
        int             gpmc_intr;
        bus_dma_tag_t   gpmc_dmac;
        unsigned int    gpmc_mult;
+       int             gpmc_cs;
 };
 
 #endif /* _OMAP2430GPMCVAR_H */