Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use the "i2cbus" interface attribute rather than putting a string name 

into the i2cbus attach args
This commit is contained in:
drochner 2006-06-26 18:21:38 +00:00
parent 665742bb91
commit a3464e1d27
12 changed files with 30 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/arch/acorn26/ioc/iociic.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: iociic.c,v 1.3 2006/02/23 05:37:46 thorpej Exp $ */
/* $NetBSD: iociic.c,v 1.4 2006/06/26 18:21:38 drochner Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@ -139,9 +139,8 @@ iociic_attach(struct device *parent, struct device *self, void *aux)
sc->sc_i2c.ic_read_byte = iociic_read_byte;
sc->sc_i2c.ic_write_byte = iociic_write_byte;
iba.iba_name = "iic";
iba.iba_tag = &sc->sc_i2c;
(void) config_found(&sc->sc_dev, &iba, iicbus_print);
(void) config_found_ia(&sc->sc_dev, "i2cbus", &iba, iicbus_print);
}
CFATTACH_DECL(iociic, sizeof(struct iociic_softc),

5
sys/arch/arm/iomd/iomdiic.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: iomdiic.c,v 1.4 2005/12/24 20:06:52 perry Exp $ */
/* $NetBSD: iomdiic.c,v 1.5 2006/06/26 18:21:39 drochner Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@ -146,9 +146,8 @@ iomdiic_attach(struct device *parent, struct device *self, void *aux)
sc->sc_i2c.ic_read_byte = iomdiic_read_byte;
sc->sc_i2c.ic_write_byte = iomdiic_write_byte;
iba.iba_name = "iic";
iba.iba_tag = &sc->sc_i2c;
(void) config_found(&sc->sc_dev, &iba, iicbus_print);
(void) config_found_ia(&sc->sc_dev, "i2cbus", &iba, iicbus_print);
}
CFATTACH_DECL(iomdiic, sizeof(struct iomdiic_softc),

7
sys/arch/arm/xscale/iopi2c.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: iopi2c.c,v 1.3 2005/12/11 12:16:51 christos Exp $ */
/* $NetBSD: iopi2c.c,v 1.4 2006/06/26 18:21:39 drochner Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: iopi2c.c,v 1.3 2005/12/11 12:16:51 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: iopi2c.c,v 1.4 2006/06/26 18:21:39 drochner Exp $");
#include <sys/param.h>
#include <sys/lock.h>
@ -79,9 +79,8 @@ iopiic_attach(struct iopiic_softc *sc)
sc->sc_i2c.ic_read_byte = iopiic_read_byte;
sc->sc_i2c.ic_write_byte = iopiic_write_byte;
iba.iba_name = "iic";
iba.iba_tag = &sc->sc_i2c;
(void) config_found(&sc->sc_dev, &iba, iicbus_print);
(void) config_found_ia(&sc->sc_dev, "i2cbus", &iba, iicbus_print);
}
static int

7
sys/arch/evbarm/armadillo/armadillo9_iic.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: armadillo9_iic.c,v 1.2 2006/02/18 05:04:11 thorpej Exp $ */
/* $NetBSD: armadillo9_iic.c,v 1.3 2006/06/26 18:21:39 drochner Exp $ */
/*
* Copyright (c) 2005 HAMAJIMA Katsuomi. All rights reserved.
@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: armadillo9_iic.c,v 1.2 2006/02/18 05:04:11 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: armadillo9_iic.c,v 1.3 2006/06/26 18:21:39 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -116,7 +116,6 @@ armadillo9iic_attach(struct device *parent, struct device *self, void *aux)
sc->sc_i2c.ic_read_byte = armadillo9iic_read_byte;
sc->sc_i2c.ic_write_byte = armadillo9iic_write_byte;
iba.iba_name = "iic";
iba.iba_tag = &sc->sc_i2c;
epgpio_in(sc->sc_gpio, sc->sc_port, sc->sc_sda);
@ -125,7 +124,7 @@ armadillo9iic_attach(struct device *parent, struct device *self, void *aux)
printf("\n");
config_found(&sc->sc_dev, &iba, iicbus_print);
config_found_ia(&sc->sc_dev, "i2cbus", &iba, iicbus_print);
#if NSEEPROM > 0
/* read mac address */

5
sys/arch/evbarm/nslu2/nslu2_iic.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nslu2_iic.c,v 1.1 2006/02/28 20:40:33 scw Exp $ */
/* $NetBSD: nslu2_iic.c,v 1.2 2006/06/26 18:21:39 drochner Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@ -187,9 +187,8 @@ slugiic_deferred_attach(struct device *device)
reg |= GPIO_I2C_SDA_BIT;
GPIO_CONF_WRITE_4(ixp425_softc, IXP425_GPIO_GPOER, reg);
iba.iba_name = "iic";
iba.iba_tag = &sc->sc_ic;
(void) config_found(&sc->sc_dev, &iba, iicbus_print);
(void) config_found_ia(&sc->sc_dev, "i2cbus", &iba, iicbus_print);
}
static int

7
sys/arch/i386/pci/viapcib.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: viapcib.c,v 1.2 2006/03/17 19:52:35 xtraeme Exp $ */
/* $NetBSD: viapcib.c,v 1.3 2006/06/26 18:21:38 drochner Exp $ */
/* $FreeBSD: src/sys/pci/viapm.c,v 1.10 2005/05/29 04:42:29 nyan Exp $ */
/*-
@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: viapcib.c,v 1.2 2006/03/17 19:52:35 xtraeme Exp $");
__KERNEL_RCSID(0, "$NetBSD: viapcib.c,v 1.3 2006/06/26 18:21:38 drochner Exp $");
#include <sys/types.h>
#include <sys/param.h>
@ -220,7 +220,6 @@ core_pcib:
viapcib_smbus_write(sc, SMBSLVCNT, b & ~1);
memset(&sc->sc_i2c, 0, sizeof(sc->sc_i2c));
iba.iba_name = "iic";
#ifdef I2C_TYPE_SMBUS
iba.iba_type = I2C_TYPE_SMBUS;
#endif
@ -230,7 +229,7 @@ core_pcib:
iba.iba_tag->ic_release_bus = viapcib_release_bus;
iba.iba_tag->ic_exec = viapcib_exec;
config_found(&sc->sc_dev, &iba, iicbus_print);
config_found_ia(&sc->sc_dev, "i2cbus", &iba, iicbus_print);
}
return;

5
sys/arch/macppc/dev/ki2c.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ki2c.c,v 1.6 2005/12/24 22:45:35 perry Exp $ */
/* $NetBSD: ki2c.c,v 1.7 2006/06/26 18:21:38 drochner Exp $ */
/* Id: ki2c.c,v 1.7 2002/10/05 09:56:05 tsubai Exp */
/*-
@ -131,9 +131,8 @@ ki2c_attach(parent, self, aux)
sc->sc_i2c.ic_write_byte = NULL;
sc->sc_i2c.ic_exec = ki2c_i2c_exec;
iba.iba_name = "iic";
iba.iba_tag = &sc->sc_i2c;
(void) config_found(&sc->sc_dev, &iba, iicbus_print);
(void) config_found_ia(&sc->sc_dev, "i2cbus", &iba, iicbus_print);
/*
* newer OF puts I2C devices under 'i2c-bus' instead of attaching them

7
sys/arch/mips/alchemy/dev/ausmbus_psc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ausmbus_psc.c,v 1.5 2006/06/25 13:32:16 kiyohara Exp $ */
/* $NetBSD: ausmbus_psc.c,v 1.6 2006/06/26 18:21:38 drochner Exp $ */
/*-
* Copyright (c) 2006 Shigeyuki Fukushima.
@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ausmbus_psc.c,v 1.5 2006/06/25 13:32:16 kiyohara Exp $");
__KERNEL_RCSID(0, "$NetBSD: ausmbus_psc.c,v 1.6 2006/06/26 18:21:38 drochner Exp $");
#include "locators.h"
@ -133,9 +133,8 @@ ausmbus_attach(struct device *parent, struct device *self, void *aux)
sc->sc_i2c.ic_exec = ausmbus_exec;
sc->sc_smbus_timeout = 10;
iba.iba_name = "iic";
iba.iba_tag = &sc->sc_i2c;
(void) config_found(&sc->sc_dev, &iba, iicbus_print);
(void) config_found_ia(&sc->sc_dev, "i2cbus", &iba, iicbus_print);
}
static int

5
sys/arch/powerpc/ibm4xx/dev/gpiic_opb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: gpiic_opb.c,v 1.3 2005/12/11 12:18:42 christos Exp $ */
/* $NetBSD: gpiic_opb.c,v 1.4 2006/06/26 18:21:38 drochner Exp $ */
/*
* Copyright 2002, 2003 Wasabi Systems, Inc.
@ -134,9 +134,8 @@ gpiic_attach(struct device *parent, struct device *self, void *args)
bus_space_write_1(sc->sc_bust, sc->sc_bush, IIC_DIRECTCNTL,
IIC_DIRECTCNTL_SCC | IIC_DIRECTCNTL_SDAC);
iba.iba_name = "iic";
iba.iba_tag = &sc->sc_i2c;
(void) config_found(&sc->sc_dev, &iba, iicbus_print);
(void) config_found_ia(&sc->sc_dev, "i2cbus", &iba, iicbus_print);
}
static int

7
sys/dev/marvell/gti2c.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: gti2c.c,v 1.4 2006/03/29 06:55:32 thorpej Exp $ */
/* $NetBSD: gti2c.c,v 1.5 2006/06/26 18:21:39 drochner Exp $ */
/*
* Copyright (c) 2005 Brocade Communcations, inc.
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: gti2c.c,v 1.4 2006/03/29 06:55:32 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: gti2c.c,v 1.5 2006/06/26 18:21:39 drochner Exp $");
#include <sys/param.h>
#include <sys/device.h>
@ -272,7 +272,6 @@ gt_i2c_attach(struct device *parent, struct device *self, void *aux)
evcnt_attach_dynamic(&sc->sc_ev_intr, EVCNT_TYPE_INTR, NULL,
sc->sc_dev.dv_xname, "intr");
iba.iba_name = "iic";
iba.iba_tag = &sc->sc_i2c;
config_found(self, &iba, iicbus_print);
config_found_ia(self, "i2cbus", &iba, iicbus_print);
}

7
sys/dev/pci/amdpm_smbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: amdpm_smbus.c,v 1.3 2006/04/30 18:46:18 xtraeme Exp $ */
/* $NetBSD: amdpm_smbus.c,v 1.4 2006/06/26 18:21:39 drochner Exp $ */
/*
* Copyright (c) 2005 Anil Gopinath (anil_public@yahoo.com)
@ -32,7 +32,7 @@
* AMD-8111 HyperTransport I/O Hub
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: amdpm_smbus.c,v 1.3 2006/04/30 18:46:18 xtraeme Exp $");
__KERNEL_RCSID(0, "$NetBSD: amdpm_smbus.c,v 1.4 2006/06/26 18:21:39 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -83,9 +83,8 @@ amdpm_smbus_attach(struct amdpm_softc *sc)
lockinit(&sc->sc_lock, PZERO, "amdpm_smbus", 0, 0);
iba.iba_name = "iic";
iba.iba_tag = &sc->sc_i2c;
(void) config_found(&sc->sc_dev, &iba, iicbus_print);
(void) config_found_ia(&sc->sc_dev, "i2cbus", &iba, iicbus_print);
}
static int

5
sys/dev/pci/piixpm.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: piixpm.c,v 1.5 2006/06/26 17:17:20 drochner Exp $ */
/* $NetBSD: piixpm.c,v 1.6 2006/06/26 18:21:39 drochner Exp $ */
/* $OpenBSD: piixpm.c,v 1.20 2006/02/27 08:25:02 grange Exp $ */
/*
@ -225,9 +225,8 @@ nopowermanagement:
sc->sc_i2c_tag.ic_exec = piixpm_i2c_exec;
bzero(&iba, sizeof(iba));
iba.iba_name = "iic";
iba.iba_tag = &sc->sc_i2c_tag;
config_found(self, &iba, iicbus_print);
config_found_ia(self, "i2cbus", &iba, iicbus_print);
return;
}