[src/trunk]: src/sys/arch Add member sc_addr to struct pxa2x0_i2c_softc.

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

details:   https://anonhg.NetBSD.org/src/rev/a04c9ce6c988
branches:  trunk
changeset: 766436:a04c9ce6c988
user:      kiyohara <kiyohara%NetBSD.org@localhost>
date:      Wed Jun 22 16:18:54 2011 +0000

description:
Add member sc_addr to struct pxa2x0_i2c_softc.
And use sc_addr to bus_space_map() instead of macro-directly.

diffstat:

 sys/arch/arm/xscale/pxa2x0_i2c.c |  6 +++---
 sys/arch/arm/xscale/pxa2x0_i2c.h |  3 ++-
 sys/arch/zaurus/dev/zaudio.c     |  5 +++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diffs (70 lines):

diff -r cc4ff68cdc3f -r a04c9ce6c988 sys/arch/arm/xscale/pxa2x0_i2c.c
--- a/sys/arch/arm/xscale/pxa2x0_i2c.c  Wed Jun 22 14:05:38 2011 +0000
+++ b/sys/arch/arm/xscale/pxa2x0_i2c.c  Wed Jun 22 16:18:54 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pxa2x0_i2c.c,v 1.5 2011/06/19 16:16:42 nonaka Exp $    */
+/*     $NetBSD: pxa2x0_i2c.c,v 1.6 2011/06/22 16:18:55 kiyohara Exp $  */
 /*     $OpenBSD: pxa2x0_i2c.c,v 1.2 2005/05/26 03:52:07 pascoe Exp $   */
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_i2c.c,v 1.5 2011/06/19 16:16:42 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_i2c.c,v 1.6 2011/06/22 16:18:55 kiyohara Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -44,7 +44,7 @@
 {
        int error;
 
-       error = bus_space_map(sc->sc_iot, PXA2X0_I2C_BASE, sc->sc_size, 0,
+       error = bus_space_map(sc->sc_iot, sc->sc_addr, sc->sc_size, 0,
            &sc->sc_ioh);
        if (error) {
                aprint_error_dev(sc->sc_dev, "unable to map register\n");
diff -r cc4ff68cdc3f -r a04c9ce6c988 sys/arch/arm/xscale/pxa2x0_i2c.h
--- a/sys/arch/arm/xscale/pxa2x0_i2c.h  Wed Jun 22 14:05:38 2011 +0000
+++ b/sys/arch/arm/xscale/pxa2x0_i2c.h  Wed Jun 22 16:18:54 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pxa2x0_i2c.h,v 1.3 2011/06/19 16:16:42 nonaka Exp $    */
+/*     $NetBSD: pxa2x0_i2c.h,v 1.4 2011/06/22 16:18:55 kiyohara Exp $  */
 /*     $OpenBSD: pxa2x0_i2c.h,v 1.2 2005/05/26 03:52:07 pascoe Exp $   */
 
 /*
@@ -27,6 +27,7 @@
        bus_space_tag_t sc_iot;
        bus_space_handle_t sc_ioh;
 
+       bus_addr_t sc_addr;
        bus_size_t sc_size;
 
        uint32_t sc_icr;
diff -r cc4ff68cdc3f -r a04c9ce6c988 sys/arch/zaurus/dev/zaudio.c
--- a/sys/arch/zaurus/dev/zaudio.c      Wed Jun 22 14:05:38 2011 +0000
+++ b/sys/arch/zaurus/dev/zaudio.c      Wed Jun 22 16:18:54 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: zaudio.c,v 1.13 2011/06/19 16:20:09 nonaka Exp $       */
+/*     $NetBSD: zaudio.c,v 1.14 2011/06/22 16:18:54 kiyohara Exp $     */
 /*     $OpenBSD: zaurus_audio.c,v 1.8 2005/08/18 13:23:02 robert Exp $ */
 
 /*
@@ -51,7 +51,7 @@
 #include "opt_zaudio.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zaudio.c,v 1.13 2011/06/19 16:20:09 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zaudio.c,v 1.14 2011/06/22 16:18:54 kiyohara Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -344,6 +344,7 @@
 
        sc->sc_i2s.sc_iot = &pxa2x0_bs_tag;
        sc->sc_i2s.sc_dmat = &pxa2x0_bus_dma_tag;
+       sc->sc_i2c.sc_addr = PXA2X0_I2C_BASE;
        sc->sc_i2s.sc_size = PXA2X0_I2S_SIZE;
        if (pxa2x0_i2s_attach_sub(&sc->sc_i2s)) {
                aprint_error_dev(self, "unable to attach I2S\n");