Skip to content

L
linux
Commit 665b6e17 authored by Albert Cranford's avatar Albert Cranford Committed by Linus Torvalds
Browse files
Options

[PATCH] 2.5.23 i2c updates 3/4 

i2c-algo-bit.c: Leave kernel time_before/after_eq
  Remove #ifdef MODULE_LICENSE around MODULE_LICENSE.
  Remove #include <linux/sched.h> since i2c.h has it now.
i2c-algo-pcf.c: Remove #include <linux/sched.h> since i2c.h has it now.
  Remove #ifdef MODULE_LICENSE around MODULE_LICENSE.
  Remove #include <linux/sched.h> since i2c.h has it now.
i2c/i2c-elektor.c: Leave kernel __exit pcf_isa_exit(void)
  Remove #ifdef MODULE_LICENSE around MODULE_LICENSE.
i2c-elv.c: Leave kernel __exit bit_elv_exit(void)
  Remove #ifdef MODULE_LICENSE around MODULE_LICENSE.
i2c-philips-par.c: Remove #ifdef MODULE_LICENSE around MODULE_LICENSE.
i2c/i2c-velleman.c: Leave kernel __exit bit_velle_exit(void)
  Remove #ifdef MODULE_LICENSE around MODULE_LICENSE.
Drop i2c-algo-8xx.[ch] deltas
Drop i2c-algo-ppc405.[ch] deltas
Drop i2c-pcf-epp.c deltas
Drop i2c-ppc405.[ch] deltas
Drop i2c-ppc405adap.h deltas
Drop i2c-pport.c deltas
Drop i2c-rpx.c deltas
parent 555e8cee
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 105 additions and 106 deletions
drivers/i2c/i2c-algo-bit.c
View file @ 665b6e17
This diff is collapsed.
drivers/i2c/i2c-algo-pcf.c
View file @ 665b6e17
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/sched.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/i2c-algo-pcf.h> #include <linux/i2c-algo-pcf.h>
...@@ -99,7 +98,7 @@ static int wait_for_bb(struct i2c_algo_pcf_data *adap) { ...@@ -99,7 +98,7 @@ static int wait_for_bb(struct i2c_algo_pcf_data *adap) {
} }
#endif #endif
if (timeout <= 0) { if (timeout <= 0) {
printk("Timeout waiting for Bus Busy\n"); printk(KERN_ERR "Timeout waiting for Bus Busy\n");
} }
return (timeout<=0); return (timeout<=0);
...@@ -144,15 +143,14 @@ static int pcf_init_8584 (struct i2c_algo_pcf_data *adap) ...@@ -144,15 +143,14 @@ static int pcf_init_8584 (struct i2c_algo_pcf_data *adap)
{ {
unsigned char temp; unsigned char temp;
DEB3(printk("i2c-algo-pcf.o: PCF state 0x%02x\n", get_pcf(adap, 1))); DEB3(printk(KERN_DEBUG "i2c-algo-pcf.o: PCF state 0x%02x\n", get_pcf(adap, 1)));
/* S1=0x80: S0 selected, serial interface off */ /* S1=0x80: S0 selected, serial interface off */
set_pcf(adap, 1, I2C_PCF_PIN); set_pcf(adap, 1, I2C_PCF_PIN);
/* check to see S1 now used as R/W ctrl - /* check to see S1 now used as R/W ctrl -
PCF8584 does that when ESO is zero */ PCF8584 does that when ESO is zero */
/* PCF also resets PIN bit */ if (((temp = get_pcf(adap, 1)) & 0x7f) != (0)) {
if ((temp = get_pcf(adap, 1)) != (0)) { DEB2(printk(KERN_ERR "i2c-algo-pcf.o: PCF detection failed -- can't select S0 (0x%02x).\n", temp));
DEB2(printk("i2c-algo-pcf.o: PCF detection failed -- can't select S0 (0x%02x).\n", temp));
return -ENXIO; /* definetly not PCF8584 */ return -ENXIO; /* definetly not PCF8584 */
} }
...@@ -160,15 +158,15 @@ static int pcf_init_8584 (struct i2c_algo_pcf_data *adap) ...@@ -160,15 +158,15 @@ static int pcf_init_8584 (struct i2c_algo_pcf_data *adap)
i2c_outb(adap, get_own(adap)); i2c_outb(adap, get_own(adap));
/* check it's realy writen */ /* check it's realy writen */
if ((temp = i2c_inb(adap)) != get_own(adap)) { if ((temp = i2c_inb(adap)) != get_own(adap)) {
DEB2(printk("i2c-algo-pcf.o: PCF detection failed -- can't set S0 (0x%02x).\n", temp)); DEB2(printk(KERN_ERR "i2c-algo-pcf.o: PCF detection failed -- can't set S0 (0x%02x).\n", temp));
return -ENXIO; return -ENXIO;
} }
/* S1=0xA0, next byte in S2 */ /* S1=0xA0, next byte in S2 */
set_pcf(adap, 1, I2C_PCF_PIN | I2C_PCF_ES1); set_pcf(adap, 1, I2C_PCF_PIN | I2C_PCF_ES1);
/* check to see S2 now selected */ /* check to see S2 now selected */
if ((temp = get_pcf(adap, 1)) != I2C_PCF_ES1) { if (((temp = get_pcf(adap, 1)) & 0x7f) != I2C_PCF_ES1) {
DEB2(printk("i2c-algo-pcf.o: PCF detection failed -- can't select S2 (0x%02x).\n", temp)); DEB2(printk(KERN_ERR "i2c-algo-pcf.o: PCF detection failed -- can't select S2 (0x%02x).\n", temp));
return -ENXIO; return -ENXIO;
} }
...@@ -176,7 +174,7 @@ static int pcf_init_8584 (struct i2c_algo_pcf_data *adap) ...@@ -176,7 +174,7 @@ static int pcf_init_8584 (struct i2c_algo_pcf_data *adap)
i2c_outb(adap, get_clock(adap)); i2c_outb(adap, get_clock(adap));
/* check it's realy writen, the only 5 lowest bits does matter */ /* check it's realy writen, the only 5 lowest bits does matter */
if (((temp = i2c_inb(adap)) & 0x1f) != get_clock(adap)) { if (((temp = i2c_inb(adap)) & 0x1f) != get_clock(adap)) {
DEB2(printk("i2c-algo-pcf.o: PCF detection failed -- can't set S2 (0x%02x).\n", temp)); DEB2(printk(KERN_ERR "i2c-algo-pcf.o: PCF detection failed -- can't set S2 (0x%02x).\n", temp));
return -ENXIO; return -ENXIO;
} }
...@@ -185,11 +183,11 @@ static int pcf_init_8584 (struct i2c_algo_pcf_data *adap) ...@@ -185,11 +183,11 @@ static int pcf_init_8584 (struct i2c_algo_pcf_data *adap)
/* check to see PCF is realy idled and we can access status register */ /* check to see PCF is realy idled and we can access status register */
if ((temp = get_pcf(adap, 1)) != (I2C_PCF_PIN | I2C_PCF_BB)) { if ((temp = get_pcf(adap, 1)) != (I2C_PCF_PIN | I2C_PCF_BB)) {
DEB2(printk("i2c-algo-pcf.o: PCF detection failed -- can't select S1` (0x%02x).\n", temp)); DEB2(printk(KERN_ERR "i2c-algo-pcf.o: PCF detection failed -- can't select S1` (0x%02x).\n", temp));
return -ENXIO; return -ENXIO;
} }
printk("i2c-algo-pcf.o: deteted and initialized PCF8584.\n"); printk(KERN_DEBUG "i2c-algo-pcf.o: deteted and initialized PCF8584.\n");
return 0; return 0;
} }
...@@ -215,7 +213,7 @@ static inline int try_address(struct i2c_algo_pcf_data *adap, ...@@ -215,7 +213,7 @@ static inline int try_address(struct i2c_algo_pcf_data *adap,
i2c_stop(adap); i2c_stop(adap);
udelay(adap->udelay); udelay(adap->udelay);
} }
DEB2(if (i) printk("i2c-algo-pcf.o: needed %d retries for %d\n",i, DEB2(if (i) printk(KERN_DEBUG "i2c-algo-pcf.o: needed %d retries for %d\n",i,
addr)); addr));
return ret; return ret;
} }
...@@ -228,20 +226,20 @@ static int pcf_sendbytes(struct i2c_adapter *i2c_adap, const char *buf, ...@@ -228,20 +226,20 @@ static int pcf_sendbytes(struct i2c_adapter *i2c_adap, const char *buf,
int wrcount, status, timeout; int wrcount, status, timeout;
for (wrcount=0; wrcount<count; ++wrcount) { for (wrcount=0; wrcount<count; ++wrcount) {
DEB2(printk("i2c-algo-pcf.o: %s i2c_write: writing %2.2X\n", DEB2(printk(KERN_DEBUG "i2c-algo-pcf.o: %s i2c_write: writing %2.2X\n",
i2c_adap->name, buf[wrcount]&0xff)); i2c_adap->name, buf[wrcount]&0xff));
i2c_outb(adap, buf[wrcount]); i2c_outb(adap, buf[wrcount]);
timeout = wait_for_pin(adap, &status); timeout = wait_for_pin(adap, &status);
if (timeout) { if (timeout) {
i2c_stop(adap); i2c_stop(adap);
printk("i2c-algo-pcf.o: %s i2c_write: " printk(KERN_ERR "i2c-algo-pcf.o: %s i2c_write: "
"error - timeout.\n", i2c_adap->name); "error - timeout.\n", i2c_adap->name);
return -EREMOTEIO; /* got a better one ?? */ return -EREMOTEIO; /* got a better one ?? */
} }
#ifndef STUB_I2C #ifndef STUB_I2C
if (status & I2C_PCF_LRB) { if (status & I2C_PCF_LRB) {
i2c_stop(adap); i2c_stop(adap);
printk("i2c-algo-pcf.o: %s i2c_write: " printk(KERN_ERR "i2c-algo-pcf.o: %s i2c_write: "
"error - no ack.\n", i2c_adap->name); "error - no ack.\n", i2c_adap->name);
return -EREMOTEIO; /* got a better one ?? */ return -EREMOTEIO; /* got a better one ?? */
} }
...@@ -269,14 +267,14 @@ static int pcf_readbytes(struct i2c_adapter *i2c_adap, char *buf, ...@@ -269,14 +267,14 @@ static int pcf_readbytes(struct i2c_adapter *i2c_adap, char *buf,
if (wait_for_pin(adap, &status)) { if (wait_for_pin(adap, &status)) {
i2c_stop(adap); i2c_stop(adap);
printk("i2c-algo-pcf.o: pcf_readbytes timed out.\n"); printk(KERN_ERR "i2c-algo-pcf.o: pcf_readbytes timed out.\n");
return (-1); return (-1);
} }
#ifndef STUB_I2C #ifndef STUB_I2C
if ((status & I2C_PCF_LRB) && (i != count)) { if ((status & I2C_PCF_LRB) && (i != count)) {
i2c_stop(adap); i2c_stop(adap);
printk("i2c-algo-pcf.o: i2c_read: i2c_inb, No ack.\n"); printk(KERN_ERR "i2c-algo-pcf.o: i2c_read: i2c_inb, No ack.\n");
return (-1); return (-1);
} }
#endif #endif
...@@ -312,18 +310,18 @@ static inline int pcf_doAddress(struct i2c_algo_pcf_data *adap, ...@@ -312,18 +310,18 @@ static inline int pcf_doAddress(struct i2c_algo_pcf_data *adap,
if ( (flags & I2C_M_TEN) ) { if ( (flags & I2C_M_TEN) ) {
/* a ten bit address */ /* a ten bit address */
addr = 0xf0 | (( msg->addr >> 7) & 0x03); addr = 0xf0 | (( msg->addr >> 7) & 0x03);
DEB2(printk("addr0: %d\n",addr)); DEB2(printk(KERN_DEBUG "addr0: %d\n",addr));
/* try extended address code...*/ /* try extended address code...*/
ret = try_address(adap, addr, retries); ret = try_address(adap, addr, retries);
if (ret!=1) { if (ret!=1) {
printk("died at extended address code.\n"); printk(KERN_ERR "died at extended address code.\n");
return -EREMOTEIO; return -EREMOTEIO;
} }
/* the remaining 8 bit address */ /* the remaining 8 bit address */
i2c_outb(adap,msg->addr & 0x7f); i2c_outb(adap,msg->addr & 0x7f);
/* Status check comes here */ /* Status check comes here */
if (ret != 1) { if (ret != 1) {
printk("died at 2nd address code.\n"); printk(KERN_ERR "died at 2nd address code.\n");
return -EREMOTEIO; return -EREMOTEIO;
} }
if ( flags & I2C_M_RD ) { if ( flags & I2C_M_RD ) {
...@@ -332,7 +330,7 @@ static inline int pcf_doAddress(struct i2c_algo_pcf_data *adap, ...@@ -332,7 +330,7 @@ static inline int pcf_doAddress(struct i2c_algo_pcf_data *adap,
addr |= 0x01; addr |= 0x01;
ret = try_address(adap, addr, retries); ret = try_address(adap, addr, retries);
if (ret!=1) { if (ret!=1) {
printk("died at extended address code.\n"); printk(KERN_ERR "died at extended address code.\n");
return -EREMOTEIO; return -EREMOTEIO;
} }
} }
...@@ -360,7 +358,7 @@ static int pcf_xfer(struct i2c_adapter *i2c_adap, ...@@ -360,7 +358,7 @@ static int pcf_xfer(struct i2c_adapter *i2c_adap,
/* Check for bus busy */ /* Check for bus busy */
timeout = wait_for_bb(adap); timeout = wait_for_bb(adap);
if (timeout) { if (timeout) {
DEB2(printk("i2c-algo-pcf.o: " DEB2(printk(KERN_ERR "i2c-algo-pcf.o: "
"Timeout waiting for BB in pcf_xfer\n");) "Timeout waiting for BB in pcf_xfer\n");)
return -EIO; return -EIO;
} }
...@@ -368,7 +366,7 @@ static int pcf_xfer(struct i2c_adapter *i2c_adap, ...@@ -368,7 +366,7 @@ static int pcf_xfer(struct i2c_adapter *i2c_adap,
for (i = 0;ret >= 0 && i < num; i++) { for (i = 0;ret >= 0 && i < num; i++) {
pmsg = &msgs[i]; pmsg = &msgs[i];
DEB2(printk("i2c-algo-pcf.o: Doing %s %d bytes to 0x%02x - %d of %d messages\n", DEB2(printk(KERN_DEBUG "i2c-algo-pcf.o: Doing %s %d bytes to 0x%02x - %d of %d messages\n",
pmsg->flags & I2C_M_RD ? "read" : "write", pmsg->flags & I2C_M_RD ? "read" : "write",
pmsg->len, pmsg->addr, i + 1, num);) pmsg->len, pmsg->addr, i + 1, num);)
...@@ -383,7 +381,7 @@ static int pcf_xfer(struct i2c_adapter *i2c_adap, ...@@ -383,7 +381,7 @@ static int pcf_xfer(struct i2c_adapter *i2c_adap,
timeout = wait_for_pin(adap, &status); timeout = wait_for_pin(adap, &status);
if (timeout) { if (timeout) {
i2c_stop(adap); i2c_stop(adap);
DEB2(printk("i2c-algo-pcf.o: Timeout waiting " DEB2(printk(KERN_ERR "i2c-algo-pcf.o: Timeout waiting "
"for PIN(1) in pcf_xfer\n");) "for PIN(1) in pcf_xfer\n");)
return (-EREMOTEIO); return (-EREMOTEIO);
} }
...@@ -392,12 +390,12 @@ static int pcf_xfer(struct i2c_adapter *i2c_adap, ...@@ -392,12 +390,12 @@ static int pcf_xfer(struct i2c_adapter *i2c_adap,
/* Check LRB (last rcvd bit - slave ack) */ /* Check LRB (last rcvd bit - slave ack) */
if (status & I2C_PCF_LRB) { if (status & I2C_PCF_LRB) {
i2c_stop(adap); i2c_stop(adap);
DEB2(printk("i2c-algo-pcf.o: No LRB(1) in pcf_xfer\n");) DEB2(printk(KERN_ERR "i2c-algo-pcf.o: No LRB(1) in pcf_xfer\n");)
return (-EREMOTEIO); return (-EREMOTEIO);
} }
#endif #endif
DEB3(printk("i2c-algo-pcf.o: Msg %d, addr=0x%x, flags=0x%x, len=%d\n", DEB3(printk(KERN_DEBUG "i2c-algo-pcf.o: Msg %d, addr=0x%x, flags=0x%x, len=%d\n",
i, msgs[i].addr, msgs[i].flags, msgs[i].len);) i, msgs[i].addr, msgs[i].flags, msgs[i].len);)
/* Read */ /* Read */
...@@ -407,20 +405,20 @@ static int pcf_xfer(struct i2c_adapter *i2c_adap, ...@@ -407,20 +405,20 @@ static int pcf_xfer(struct i2c_adapter *i2c_adap,
(i + 1 == num)); (i + 1 == num));
if (ret != pmsg->len) { if (ret != pmsg->len) {
DEB2(printk("i2c-algo-pcf.o: fail: " DEB2(printk(KERN_DEBUG "i2c-algo-pcf.o: fail: "
"only read %d bytes.\n",ret)); "only read %d bytes.\n",ret));
} else { } else {
DEB2(printk("i2c-algo-pcf.o: read %d bytes.\n",ret)); DEB2(printk(KERN_DEBUG "i2c-algo-pcf.o: read %d bytes.\n",ret));
} }
} else { /* Write */ } else { /* Write */
ret = pcf_sendbytes(i2c_adap, pmsg->buf, pmsg->len, ret = pcf_sendbytes(i2c_adap, pmsg->buf, pmsg->len,
(i + 1 == num)); (i + 1 == num));
if (ret != pmsg->len) { if (ret != pmsg->len) {
DEB2(printk("i2c-algo-pcf.o: fail: " DEB2(printk(KERN_DEBUG "i2c-algo-pcf.o: fail: "
"only wrote %d bytes.\n",ret)); "only wrote %d bytes.\n",ret));
} else { } else {
DEB2(printk("i2c-algo-pcf.o: wrote %d bytes.\n",ret)); DEB2(printk(KERN_DEBUG "i2c-algo-pcf.o: wrote %d bytes.\n",ret));
} }
} }
} }
...@@ -461,7 +459,7 @@ int i2c_pcf_add_bus(struct i2c_adapter *adap) ...@@ -461,7 +459,7 @@ int i2c_pcf_add_bus(struct i2c_adapter *adap)
int i, status; int i, status;
struct i2c_algo_pcf_data *pcf_adap = adap->algo_data; struct i2c_algo_pcf_data *pcf_adap = adap->algo_data;
DEB2(printk("i2c-algo-pcf.o: hw routines for %s registered.\n", DEB2(printk(KERN_DEBUG "i2c-algo-pcf.o: hw routines for %s registered.\n",
adap->name)); adap->name));
/* register new adapter to i2c module... */ /* register new adapter to i2c module... */
...@@ -514,7 +512,7 @@ int i2c_pcf_del_bus(struct i2c_adapter *adap) ...@@ -514,7 +512,7 @@ int i2c_pcf_del_bus(struct i2c_adapter *adap)
int res; int res;
if ((res = i2c_del_adapter(adap)) < 0) if ((res = i2c_del_adapter(adap)) < 0)
return res; return res;
DEB2(printk("i2c-algo-pcf.o: adapter unregistered: %s\n",adap->name)); DEB2(printk(KERN_DEBUG "i2c-algo-pcf.o: adapter unregistered: %s\n",adap->name));
#ifdef MODULE #ifdef MODULE
MOD_DEC_USE_COUNT; MOD_DEC_USE_COUNT;
...@@ -524,7 +522,7 @@ int i2c_pcf_del_bus(struct i2c_adapter *adap) ...@@ -524,7 +522,7 @@ int i2c_pcf_del_bus(struct i2c_adapter *adap)
int __init i2c_algo_pcf_init (void) int __init i2c_algo_pcf_init (void)
{ {
printk("i2c-algo-pcf.o: i2c pcf8584 algorithm module\n"); printk(KERN_INFO "i2c-algo-pcf.o: i2c pcf8584 algorithm module version %s (%s)\n", I2C_VERSION, I2C_DATE);
return 0; return 0;
} }
......
drivers/i2c/i2c-elektor.c
View file @ 665b6e17
...@@ -74,11 +74,12 @@ static void pcf_isa_setbyte(void *data, int ctl, int val) ...@@ -74,11 +74,12 @@ static void pcf_isa_setbyte(void *data, int ctl, int val)
{ {
int address = ctl ? (base + 1) : base; int address = ctl ? (base + 1) : base;
if (ctl && irq) { /* enable irq if any specified for serial operation */
if (ctl && irq && (val & I2C_PCF_ESO)) {
val |= I2C_PCF_ENI; val |= I2C_PCF_ENI;
} }
DEB3(printk("i2c-elektor.o: Write 0x%X 0x%02X\n", address, val & 255)); DEB3(printk(KERN_DEBUG "i2c-elektor.o: Write 0x%X 0x%02X\n", address, val & 255));
switch (mmapped) { switch (mmapped) {
case 0: /* regular I/O */ case 0: /* regular I/O */
...@@ -99,7 +100,7 @@ static int pcf_isa_getbyte(void *data, int ctl) ...@@ -99,7 +100,7 @@ static int pcf_isa_getbyte(void *data, int ctl)
int address = ctl ? (base + 1) : base; int address = ctl ? (base + 1) : base;
int val = mmapped ? readb(address) : inb(address); int val = mmapped ? readb(address) : inb(address);
DEB3(printk("i2c-elektor.o: Read 0x%X 0x%02X\n", address, val)); DEB3(printk(KERN_DEBUG "i2c-elektor.o: Read 0x%X 0x%02X\n", address, val));
return (val); return (val);
} }
...@@ -142,7 +143,7 @@ static int pcf_isa_init(void) ...@@ -142,7 +143,7 @@ static int pcf_isa_init(void)
{ {
if (!mmapped) { if (!mmapped) {
if (check_region(base, 2) < 0 ) { if (check_region(base, 2) < 0 ) {
printk("i2c-elektor.o: requested I/O region (0x%X:2) is in use.\n", base); printk(KERN_ERR "i2c-elektor.o: requested I/O region (0x%X:2) is in use.\n", base);
return -ENODEV; return -ENODEV;
} else { } else {
request_region(base, 2, "i2c (isa bus adapter)"); request_region(base, 2, "i2c (isa bus adapter)");
...@@ -150,7 +151,7 @@ static int pcf_isa_init(void) ...@@ -150,7 +151,7 @@ static int pcf_isa_init(void)
} }
if (irq > 0) { if (irq > 0) {
if (request_irq(irq, pcf_isa_handler, 0, "PCF8584", 0) < 0) { if (request_irq(irq, pcf_isa_handler, 0, "PCF8584", 0) < 0) {
printk("i2c-elektor.o: Request irq%d failed\n", irq); printk(KERN_ERR "i2c-elektor.o: Request irq%d failed\n", irq);
irq = 0; irq = 0;
} else } else
enable_irq(irq); enable_irq(irq);
...@@ -238,7 +239,7 @@ int __init i2c_pcfisa_init(void) ...@@ -238,7 +239,7 @@ int __init i2c_pcfisa_init(void)
/* yeap, we've found cypress, let's check config */ /* yeap, we've found cypress, let's check config */
if (!pci_read_config_byte(cy693_dev, 0x47, &config)) { if (!pci_read_config_byte(cy693_dev, 0x47, &config)) {
DEB3(printk("i2c-elektor.o: found cy82c693, config register 0x47 = 0x%02x.\n", config)); DEB3(printk(KERN_DEBUG "i2c-elektor.o: found cy82c693, config register 0x47 = 0x%02x.\n", config));
/* UP2000 board has this register set to 0xe1, /* UP2000 board has this register set to 0xe1,
but the most significant bit as seems can be but the most significant bit as seems can be
...@@ -260,7 +261,7 @@ int __init i2c_pcfisa_init(void) ...@@ -260,7 +261,7 @@ int __init i2c_pcfisa_init(void)
8.25 MHz (PCI/4) clock 8.25 MHz (PCI/4) clock
(this can be read from cypress) */ (this can be read from cypress) */
clock = I2C_PCF_CLK | I2C_PCF_TRNS90; clock = I2C_PCF_CLK | I2C_PCF_TRNS90;
printk("i2c-elektor.o: found API UP2000 like board, will probe PCF8584 later.\n"); printk(KERN_INFO "i2c-elektor.o: found API UP2000 like board, will probe PCF8584 later.\n");
} }
} }
} }
...@@ -269,11 +270,11 @@ int __init i2c_pcfisa_init(void) ...@@ -269,11 +270,11 @@ int __init i2c_pcfisa_init(void)
/* sanity checks for mmapped I/O */ /* sanity checks for mmapped I/O */
if (mmapped && base < 0xc8000) { if (mmapped && base < 0xc8000) {
printk("i2c-elektor.o: incorrect base address (0x%0X) specified for mmapped I/O.\n", base); printk(KERN_ERR "i2c-elektor.o: incorrect base address (0x%0X) specified for mmapped I/O.\n", base);
return -ENODEV; return -ENODEV;
} }
printk("i2c-elektor.o: i2c pcf8584-isa adapter module\n"); printk(KERN_INFO "i2c-elektor.o: i2c pcf8584-isa adapter module version %s (%s)\n", I2C_VERSION, I2C_DATE);
if (base == 0) { if (base == 0) {
base = DEFAULT_BASE; base = DEFAULT_BASE;
...@@ -283,13 +284,15 @@ int __init i2c_pcfisa_init(void) ...@@ -283,13 +284,15 @@ int __init i2c_pcfisa_init(void)
init_waitqueue_head(&pcf_wait); init_waitqueue_head(&pcf_wait);
#endif #endif
if (pcf_isa_init() == 0) { if (pcf_isa_init() == 0) {
if (i2c_pcf_add_bus(&pcf_isa_ops) < 0) if (i2c_pcf_add_bus(&pcf_isa_ops) < 0) {
pcf_isa_exit();
return -ENODEV; return -ENODEV;
}
} else { } else {
return -ENODEV; return -ENODEV;
} }
printk("i2c-elektor.o: found device at %#x.\n", base); printk(KERN_ERR "i2c-elektor.o: found device at %#x.\n", base);
return 0; return 0;
} }
......
drivers/i2c/i2c-elv.c
View file @ 665b6e17
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
/* With some changes from Kysti Mlkki <kmalkki@cc.hut.fi> and even /* With some changes from Kysti Mlkki <kmalkki@cc.hut.fi> and even
Frodo Looijaard <frodol@dds.nl> */ Frodo Looijaard <frodol@dds.nl> */
/* $Id: i2c-elv.c,v 1.17 2001/07/29 02:44:25 mds Exp $ */ /* $Id: i2c-elv.c,v 1.21 2001/11/19 18:45:02 mds Exp $ */
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
...@@ -29,9 +29,7 @@ ...@@ -29,9 +29,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/version.h> #include <linux/version.h>
#include <linux/init.h> #include <linux/init.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <linux/ioport.h> #include <linux/ioport.h>
#include <asm/io.h> #include <asm/io.h>
#include <linux/errno.h> #include <linux/errno.h>
...@@ -95,14 +93,14 @@ static int bit_elv_init(void) ...@@ -95,14 +93,14 @@ static int bit_elv_init(void)
} else { } else {
/* test for ELV adap. */ /* test for ELV adap. */
if (inb(base+1) & 0x80) { /* BUSY should be high */ if (inb(base+1) & 0x80) { /* BUSY should be high */
DEBINIT(printk("i2c-elv.o: Busy was low.\n")); DEBINIT(printk(KERN_DEBUG "i2c-elv.o: Busy was low.\n"));
return -ENODEV; return -ENODEV;
} else { } else {
outb(0x0c,base+2); /* SLCT auf low */ outb(0x0c,base+2); /* SLCT auf low */
udelay(400); udelay(400);
if ( !(inb(base+1) && 0x10) ) { if ( !(inb(base+1) && 0x10) ) {
outb(0x04,base+2); outb(0x04,base+2);
DEBINIT(printk("i2c-elv.o: Select was high.\n")); DEBINIT(printk(KERN_DEBUG "i2c-elv.o: Select was high.\n"));
return -ENODEV; return -ENODEV;
} }
} }
...@@ -170,7 +168,7 @@ static struct i2c_adapter bit_elv_ops = { ...@@ -170,7 +168,7 @@ static struct i2c_adapter bit_elv_ops = {
int __init i2c_bitelv_init(void) int __init i2c_bitelv_init(void)
{ {
printk("i2c-elv.o: i2c ELV parallel port adapter module\n"); printk(KERN_INFO "i2c-elv.o: i2c ELV parallel port adapter module version %s (%s)\n", I2C_VERSION, I2C_DATE);
if (base==0) { if (base==0) {
/* probe some values */ /* probe some values */
base=DEFAULT_BASE; base=DEFAULT_BASE;
...@@ -190,7 +188,7 @@ int __init i2c_bitelv_init(void) ...@@ -190,7 +188,7 @@ int __init i2c_bitelv_init(void)
return -ENODEV; return -ENODEV;
} }
} }
printk("i2c-elv.o: found device at %#x.\n",base); printk(KERN_DEBUG "i2c-elv.o: found device at %#x.\n",base);
return 0; return 0;
} }
......
drivers/i2c/i2c-philips-par.c
View file @ 665b6e17
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
/* With some changes from Kysti Mlkki <kmalkki@cc.hut.fi> and even /* With some changes from Kysti Mlkki <kmalkki@cc.hut.fi> and even
Frodo Looijaard <frodol@dds.nl> */ Frodo Looijaard <frodol@dds.nl> */
/* $Id: i2c-philips-par.c,v 1.18 2000/07/06 19:21:49 frodo Exp $ */ /* $Id: i2c-philips-par.c,v 1.23 2002/02/06 08:50:58 simon Exp $ */
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/ioport.h> #include <linux/ioport.h>
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/stddef.h> #include <linux/stddef.h>
#include <linux/parport.h> #include <linux/parport.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/i2c-algo-bit.h> #include <linux/i2c-algo-bit.h>
...@@ -190,18 +189,18 @@ static void i2c_parport_attach (struct parport *port) ...@@ -190,18 +189,18 @@ static void i2c_parport_attach (struct parport *port)
struct i2c_par *adapter = kmalloc(sizeof(struct i2c_par), struct i2c_par *adapter = kmalloc(sizeof(struct i2c_par),
GFP_KERNEL); GFP_KERNEL);
if (!adapter) { if (!adapter) {
printk("i2c-philips-par: Unable to malloc.\n"); printk(KERN_ERR "i2c-philips-par: Unable to malloc.\n");
return; return;
} }
printk("i2c-philips-par.o: attaching to %s\n", port->name); printk(KERN_DEBUG "i2c-philips-par.o: attaching to %s\n", port->name);
adapter->pdev = parport_register_device(port, "i2c-philips-par", adapter->pdev = parport_register_device(port, "i2c-philips-par",
NULL, NULL, NULL, NULL, NULL, NULL,
PARPORT_FLAG_EXCL, PARPORT_FLAG_EXCL,
NULL); NULL);
if (!adapter->pdev) { if (!adapter->pdev) {
printk("i2c-philips-par: Unable to register with parport.\n"); printk(KERN_ERR "i2c-philips-par: Unable to register with parport.\n");
return; return;
} }
...@@ -210,15 +209,18 @@ static void i2c_parport_attach (struct parport *port) ...@@ -210,15 +209,18 @@ static void i2c_parport_attach (struct parport *port)
adapter->bit_lp_data = type ? bit_lp_data2 : bit_lp_data; adapter->bit_lp_data = type ? bit_lp_data2 : bit_lp_data;
adapter->bit_lp_data.data = port; adapter->bit_lp_data.data = port;
if (parport_claim_or_block(adapter->pdev) < 0 ) {
printk(KERN_ERR "i2c-philips-par: Could not claim parallel port.\n");
return;
}
/* reset hardware to sane state */ /* reset hardware to sane state */
parport_claim_or_block(adapter->pdev);
bit_lp_setsda(port, 1); bit_lp_setsda(port, 1);
bit_lp_setscl(port, 1); bit_lp_setscl(port, 1);
parport_release(adapter->pdev); parport_release(adapter->pdev);
if (i2c_bit_add_bus(&adapter->adapter) < 0) if (i2c_bit_add_bus(&adapter->adapter) < 0)
{ {
printk("i2c-philips-par: Unable to register with I2C.\n"); printk(KERN_ERR "i2c-philips-par: Unable to register with I2C.\n");
parport_unregister_device(adapter->pdev); parport_unregister_device(adapter->pdev);
kfree(adapter); kfree(adapter);
return; /* No good */ return; /* No good */
...@@ -264,7 +266,7 @@ int __init i2c_bitlp_init(void) ...@@ -264,7 +266,7 @@ int __init i2c_bitlp_init(void)
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,4) #if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,4)
struct parport *port; struct parport *port;
#endif #endif
printk("i2c-philips-par.o: i2c Philips parallel port adapter module\n"); printk(KERN_INFO "i2c-philips-par.o: i2c Philips parallel port adapter module version %s (%s)\n", I2C_VERSION, I2C_DATE);
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,4) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,4)
parport_register_driver(&i2c_driver); parport_register_driver(&i2c_driver);
......
drivers/i2c/i2c-velleman.c
View file @ 665b6e17
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
/* $Id: i2c-velleman.c,v 1.19 2000/01/24 02:06:33 mds Exp $ */ /* $Id: i2c-velleman.c,v 1.23 2001/11/19 18:45:02 mds Exp $ */
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/ioport.h> #include <linux/ioport.h>
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
#include <linux/string.h> /* for 2.0 kernels to get NULL */ #include <linux/string.h> /* for 2.0 kernels to get NULL */
#include <asm/errno.h> /* for 2.0 kernels to get ENODEV */ #include <asm/errno.h> /* for 2.0 kernels to get ENODEV */
#include <asm/io.h> #include <asm/io.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/i2c-algo-bit.h> #include <linux/i2c-algo-bit.h>
...@@ -91,7 +90,7 @@ static int bit_velle_getsda(void *data) ...@@ -91,7 +90,7 @@ static int bit_velle_getsda(void *data)
static int bit_velle_init(void) static int bit_velle_init(void)
{ {
if (check_region(base,(base == 0x3bc)? 3 : 8) < 0 ) { if (check_region(base,(base == 0x3bc)? 3 : 8) < 0 ) {
DEBE(printk("i2c-velleman.o: Port %#x already in use.\n", DEBE(printk(KERN_DEBUG "i2c-velleman.o: Port %#x already in use.\n",
base)); base));
return -ENODEV; return -ENODEV;
} else { } else {
...@@ -160,7 +159,7 @@ static struct i2c_adapter bit_velle_ops = { ...@@ -160,7 +159,7 @@ static struct i2c_adapter bit_velle_ops = {
int __init i2c_bitvelle_init(void) int __init i2c_bitvelle_init(void)
{ {
printk("i2c-velleman.o: i2c Velleman K8000 adapter module\n"); printk(KERN_INFO "i2c-velleman.o: i2c Velleman K8000 adapter module version %s (%s)\n", I2C_VERSION, I2C_DATE);
if (base==0) { if (base==0) {
/* probe some values */ /* probe some values */
base=DEFAULT_BASE; base=DEFAULT_BASE;
...@@ -180,7 +179,7 @@ int __init i2c_bitvelle_init(void) ...@@ -180,7 +179,7 @@ int __init i2c_bitvelle_init(void)
return -ENODEV; return -ENODEV;
} }
} }
printk("i2c-velleman.o: found device at %#x.\n",base); printk(KERN_DEBUG "i2c-velleman.o: found device at %#x.\n",base);
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7