Module Name: src
Committed By: ahoka
Date: Wed Jul 7 21:10:39 UTC 2010
Modified Files:
src/sys/arch/arm/omap: omap2_gpmc.c omap2_gpmcvar.h
Log Message:
Pass CS# in gpmc attach arg.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/omap/omap2_gpmc.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/omap/omap2_gpmcvar.h
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/omap2_gpmc.c
diff -u src/sys/arch/arm/omap/omap2_gpmc.c:1.5 src/sys/arch/arm/omap/omap2_gpmc.c:1.6
--- src/sys/arch/arm/omap/omap2_gpmc.c:1.5 Fri Nov 21 17:13:07 2008
+++ src/sys/arch/arm/omap/omap2_gpmc.c Wed Jul 7 21:10:39 2010
@@ -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 */
Index: src/sys/arch/arm/omap/omap2_gpmcvar.h
diff -u src/sys/arch/arm/omap/omap2_gpmcvar.h:1.1 src/sys/arch/arm/omap/omap2_gpmcvar.h:1.2
--- src/sys/arch/arm/omap/omap2_gpmcvar.h:1.1 Wed Aug 27 11:03:10 2008
+++ src/sys/arch/arm/omap/omap2_gpmcvar.h Wed Jul 7 21:10:39 2010
@@ -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 */
