Module Name: src
Committed By: ahoka
Date: Sat Sep 4 16:23:48 UTC 2010
Modified Files:
src/sys/arch/arm/omap: omap2_gpmc.c omap2_gpmcvar.h
Log Message:
Add gpmc_register_read and gpmc_register_write to access registers
mapped by the gpmc driver (eg.: GPMC_CONFIG, GPMC_STATUS).
The driver should save the parent (gpmc) device's sc pointer
to be able to use these functions.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/omap/omap2_gpmc.c
cvs rdiff -u -r1.2 -r1.3 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.7 src/sys/arch/arm/omap/omap2_gpmc.c:1.8
--- src/sys/arch/arm/omap/omap2_gpmc.c:1.7 Sat Aug 28 04:00:35 2010
+++ src/sys/arch/arm/omap/omap2_gpmc.c Sat Sep 4 16:23:47 2010
@@ -1,7 +1,7 @@
-/* $Id: omap2_gpmc.c,v 1.7 2010/08/28 04:00:35 kiyohara Exp $ */
+/* $Id: omap2_gpmc.c,v 1.8 2010/09/04 16:23:47 ahoka Exp $ */
/* adapted from: */
-/* $NetBSD: omap2_gpmc.c,v 1.7 2010/08/28 04:00:35 kiyohara Exp $ */
+/* $NetBSD: omap2_gpmc.c,v 1.8 2010/09/04 16:23:47 ahoka Exp $ */
/*
@@ -102,7 +102,7 @@
#include "opt_omap.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap2_gpmc.c,v 1.7 2010/08/28 04:00:35 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap2_gpmc.c,v 1.8 2010/09/04 16:23:47 ahoka Exp $");
#include "locators.h"
@@ -316,3 +316,15 @@
return UNCONF;
}
+
+uint32_t
+gpmc_register_read(struct gpmc_softc *sc, bus_size_t reg)
+{
+ return bus_space_read_4(sc->sc_iot, sc->sc_ioh, reg);
+}
+
+void
+gpmc_register_write(struct gpmc_softc *sc, bus_size_t reg, const uint32_t data)
+{
+ bus_space_write_4(sc->sc_iot, sc->sc_ioh, reg, data);
+}
Index: src/sys/arch/arm/omap/omap2_gpmcvar.h
diff -u src/sys/arch/arm/omap/omap2_gpmcvar.h:1.2 src/sys/arch/arm/omap/omap2_gpmcvar.h:1.3
--- src/sys/arch/arm/omap/omap2_gpmcvar.h:1.2 Wed Jul 7 21:10:39 2010
+++ src/sys/arch/arm/omap/omap2_gpmcvar.h Sat Sep 4 16:23:47 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: omap2_gpmcvar.h,v 1.2 2010/07/07 21:10:39 ahoka Exp $ */
+/* $NetBSD: omap2_gpmcvar.h,v 1.3 2010/09/04 16:23:47 ahoka Exp $ */
/*
* Copyright (c) 2007 Microsoft
* All rights reserved.
@@ -41,4 +41,10 @@
int gpmc_cs;
};
+struct gpmc_softc;
+
+uint32_t gpmc_register_read(struct gpmc_softc *sc, bus_size_t reg);
+void gpmc_register_write(struct gpmc_softc *sc, bus_size_t reg,
+ const uint32_t data);
+
#endif /* _OMAP2430GPMCVAR_H */
