Module Name: src
Committed By: nonaka
Date: Thu Jun 23 10:56:03 UTC 2011
Modified Files:
src/sys/arch/zaurus/dev: zaudio.c ziic.c
Log Message:
set PXA2X0_I2C_BASE to sc->sc_addr in the correct position.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/zaurus/dev/zaudio.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/zaurus/dev/ziic.c
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/zaurus/dev/zaudio.c
diff -u src/sys/arch/zaurus/dev/zaudio.c:1.14 src/sys/arch/zaurus/dev/zaudio.c:1.15
--- src/sys/arch/zaurus/dev/zaudio.c:1.14 Wed Jun 22 16:18:54 2011
+++ src/sys/arch/zaurus/dev/zaudio.c Thu Jun 23 10:56:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: zaudio.c,v 1.14 2011/06/22 16:18:54 kiyohara Exp $ */
+/* $NetBSD: zaudio.c,v 1.15 2011/06/23 10:56:03 nonaka 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.14 2011/06/22 16:18:54 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zaudio.c,v 1.15 2011/06/23 10:56:03 nonaka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -344,7 +344,6 @@
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");
Index: src/sys/arch/zaurus/dev/ziic.c
diff -u src/sys/arch/zaurus/dev/ziic.c:1.1 src/sys/arch/zaurus/dev/ziic.c:1.2
--- src/sys/arch/zaurus/dev/ziic.c:1.1 Sun Jun 19 16:20:09 2011
+++ src/sys/arch/zaurus/dev/ziic.c Thu Jun 23 10:56:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ziic.c,v 1.1 2011/06/19 16:20:09 nonaka Exp $ */
+/* $NetBSD: ziic.c,v 1.2 2011/06/23 10:56:03 nonaka Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ziic.c,v 1.1 2011/06/19 16:20:09 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ziic.c,v 1.2 2011/06/23 10:56:03 nonaka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -80,6 +80,7 @@
if (strcmp(cf->cf_name, pxa->pxa_name))
return 0;
+ pxa->pxa_addr = PXA2X0_I2C_BASE;
pxa->pxa_size = PXA2X0_I2C_SIZE;
return 1;
}
@@ -97,6 +98,7 @@
psc->sc_dev = self;
psc->sc_iot = pxa->pxa_iot;
+ psc->sc_addr = pxa->pxa_addr;
psc->sc_size = pxa->pxa_size;
psc->sc_flags = 0;
if (pxa2x0_i2c_attach_sub(psc)) {
