X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fi2c%2Fbusses%2Fi2c-mpc.c;h=67d6e7d299a2d0ef2fdcd7277d8a5dd20d13c923;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=f77245e569098d9236b51e90c7509574c0b3f5fe;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c index f77245e56..67d6e7d29 100644 --- a/drivers/i2c/busses/i2c-mpc.c +++ b/drivers/i2c/busses/i2c-mpc.c @@ -1,12 +1,12 @@ /* * (C) Copyright 2003-2004 * Humboldt Solutions Ltd, adrian@humboldt.co.uk. - + * This is a combined i2c adapter and algorithm driver for the * MPC107/Tsi107 PowerPC northbridge and processors that include - * the same I2C unit (8240, 8245, 85xx). + * the same I2C unit (8240, 8245, 85xx). * - * Release 0.6 + * Release 0.8 * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any @@ -20,9 +20,16 @@ #include #include #include +#ifdef CONFIG_FSL_OCP #include +#define FSL_I2C_DEV_SEPARATE_DFSRR FS_I2C_SEPARATE_DFSRR +#define FSL_I2C_DEV_CLOCK_5200 FS_I2C_CLOCK_5200 +#else +#include +#endif #include #include +#include #define MPC_I2C_ADDR 0x00 #define MPC_I2C_FDR 0x04 @@ -49,10 +56,11 @@ struct mpc_i2c { char *base; - struct ocp_def *ocpdef; u32 interrupt; wait_queue_head_t queue; struct i2c_adapter adap; + int irq; + u32 flags; }; static __inline__ void writeccr(struct mpc_i2c *i2c, u32 x) @@ -74,12 +82,12 @@ static irqreturn_t mpc_i2c_isr(int irq, void *dev_id, struct pt_regs *regs) static int i2c_wait(struct mpc_i2c *i2c, unsigned timeout, int writing) { - DECLARE_WAITQUEUE(wait, current); unsigned long orig_jiffies = jiffies; u32 x; int result = 0; - if (i2c->ocpdef->irq == OCP_IRQ_NA) { + if (i2c->irq == 0) + { while (!(readb(i2c->base + MPC_I2C_SR) & CSR_MIF)) { schedule(); if (time_after(jiffies, orig_jiffies + timeout)) { @@ -91,28 +99,22 @@ static int i2c_wait(struct mpc_i2c *i2c, unsigned timeout, int writing) x = readb(i2c->base + MPC_I2C_SR); writeb(0, i2c->base + MPC_I2C_SR); } else { - add_wait_queue(&i2c->queue, &wait); - while (!(i2c->interrupt & CSR_MIF)) { - set_current_state(TASK_INTERRUPTIBLE); - if (signal_pending(current)) { - pr_debug("I2C: Interrupted\n"); - result = -EINTR; - break; - } - if (time_after(jiffies, orig_jiffies + timeout)) { - pr_debug("I2C: timeout\n"); - result = -EIO; - break; - } - schedule_timeout(timeout); + /* Interrupt mode */ + result = wait_event_interruptible_timeout(i2c->queue, + (i2c->interrupt & CSR_MIF), timeout * HZ); + + if (unlikely(result < 0)) + pr_debug("I2C: wait interrupted\n"); + else if (unlikely(!(i2c->interrupt & CSR_MIF))) { + pr_debug("I2C: wait timeout\n"); + result = -ETIMEDOUT; } - current->state = TASK_RUNNING; - remove_wait_queue(&i2c->queue, &wait); + x = i2c->interrupt; i2c->interrupt = 0; } - if (result < -0) + if (result < 0) return result; if (!(x & CSR_MCF)) { @@ -136,12 +138,11 @@ static int i2c_wait(struct mpc_i2c *i2c, unsigned timeout, int writing) static void mpc_i2c_setclock(struct mpc_i2c *i2c) { - struct ocp_fs_i2c_data *i2c_data = i2c->ocpdef->additions; /* Set clock and filters */ - if (i2c_data && (i2c_data->flags & FS_I2C_SEPARATE_DFSRR)) { + if (i2c->flags & FSL_I2C_DEV_SEPARATE_DFSRR) { writeb(0x31, i2c->base + MPC_I2C_FDR); writeb(0x10, i2c->base + MPC_I2C_DFSRR); - } else if (i2c_data && (i2c_data->flags & FS_I2C_CLOCK_5200)) + } else if (i2c->flags & FSL_I2C_DEV_CLOCK_5200) writeb(0x3f, i2c->base + MPC_I2C_FDR); else writel(0x1031, i2c->base + MPC_I2C_FDR); @@ -164,7 +165,7 @@ static int mpc_write(struct mpc_i2c *i2c, int target, const u8 * data, int length, int restart) { int i; - unsigned timeout = HZ; + unsigned timeout = i2c->adap.timeout; u32 flags = restart ? CCR_RSTA : 0; /* Start with MEN */ @@ -192,7 +193,7 @@ static int mpc_write(struct mpc_i2c *i2c, int target, static int mpc_read(struct mpc_i2c *i2c, int target, u8 * data, int length, int restart) { - unsigned timeout = HZ; + unsigned timeout = i2c->adap.timeout; int i; u32 flags = restart ? CCR_RSTA : 0; @@ -293,6 +294,7 @@ static struct i2c_adapter mpc_ops = { .retries = 1 }; +#ifdef CONFIG_FSL_OCP static int __devinit mpc_i2c_probe(struct ocp_device *ocp) { int result = 0; @@ -301,7 +303,10 @@ static int __devinit mpc_i2c_probe(struct ocp_device *ocp) if (!(i2c = kmalloc(sizeof(*i2c), GFP_KERNEL))) { return -ENOMEM; } - i2c->ocpdef = ocp->def; + memset(i2c, 0, sizeof(*i2c)); + + i2c->irq = ocp->def->irq; + i2c->flags = ((struct ocp_fs_i2c_data *)ocp->def->additions)->flags; init_waitqueue_head(&i2c->queue); if (!request_mem_region(ocp->def->paddr, MPC_I2C_REGION, "i2c-mpc")) { @@ -317,16 +322,20 @@ static int __devinit mpc_i2c_probe(struct ocp_device *ocp) goto fail_map; } - if (ocp->def->irq != OCP_IRQ_NA) + if (i2c->irq != OCP_IRQ_NA) + { if ((result = request_irq(ocp->def->irq, mpc_i2c_isr, 0, "i2c-mpc", i2c)) < 0) { printk(KERN_ERR "i2c-mpc - failed to attach interrupt\n"); goto fail_irq; } + } else + i2c->irq = 0; i2c->adap = mpc_ops; i2c_set_adapdata(&i2c->adap, i2c); + if ((result = i2c_add_adapter(&i2c->adap)) < 0) { printk(KERN_ERR "i2c-mpc - failed to add adapter\n"); goto fail_add; @@ -353,9 +362,9 @@ static void __devexit mpc_i2c_remove(struct ocp_device *ocp) i2c_del_adapter(&i2c->adap); if (ocp->def->irq != OCP_IRQ_NA) - free_irq(i2c->ocpdef->irq, i2c); + free_irq(i2c->irq, i2c); iounmap(i2c->base); - release_mem_region(i2c->ocpdef->paddr, MPC_I2C_REGION); + release_mem_region(ocp->def->paddr, MPC_I2C_REGION); kfree(i2c); } @@ -385,6 +394,101 @@ static void __exit iic_exit(void) module_init(iic_init); module_exit(iic_exit); +#else +static int fsl_i2c_probe(struct device *device) +{ + int result = 0; + struct mpc_i2c *i2c; + struct platform_device *pdev = to_platform_device(device); + struct fsl_i2c_platform_data *pdata; + struct resource *r = platform_get_resource(pdev, IORESOURCE_MEM, 0); + + pdata = (struct fsl_i2c_platform_data *) pdev->dev.platform_data; + + if (!(i2c = kmalloc(sizeof(*i2c), GFP_KERNEL))) { + return -ENOMEM; + } + memset(i2c, 0, sizeof(*i2c)); + + i2c->irq = platform_get_irq(pdev, 0); + i2c->flags = pdata->device_flags; + init_waitqueue_head(&i2c->queue); + + i2c->base = ioremap((phys_addr_t)r->start, MPC_I2C_REGION); + + if (!i2c->base) { + printk(KERN_ERR "i2c-mpc - failed to map controller\n"); + result = -ENOMEM; + goto fail_map; + } + + if (i2c->irq != 0) + if ((result = request_irq(i2c->irq, mpc_i2c_isr, + 0, "fsl-i2c", i2c)) < 0) { + printk(KERN_ERR + "i2c-mpc - failed to attach interrupt\n"); + goto fail_irq; + } + + i2c->adap = mpc_ops; + i2c_set_adapdata(&i2c->adap, i2c); + i2c->adap.dev.parent = &pdev->dev; + if ((result = i2c_add_adapter(&i2c->adap)) < 0) { + printk(KERN_ERR "i2c-mpc - failed to add adapter\n"); + goto fail_add; + } + + mpc_i2c_setclock(i2c); + dev_set_drvdata(device, i2c); + return result; + + fail_add: + if (i2c->irq != 0) + free_irq(i2c->irq, 0); + fail_irq: + iounmap(i2c->base); + fail_map: + kfree(i2c); + return result; +}; + +static int fsl_i2c_remove(struct device *device) +{ + struct mpc_i2c *i2c = dev_get_drvdata(device); + + dev_set_drvdata(device, NULL); + i2c_del_adapter(&i2c->adap); + + if (i2c->irq != 0) + free_irq(i2c->irq, i2c); + + iounmap(i2c->base); + kfree(i2c); + return 0; +}; + +/* Structure for a device driver */ +static struct device_driver fsl_i2c_driver = { + .name = "fsl-i2c", + .bus = &platform_bus_type, + .probe = fsl_i2c_probe, + .remove = fsl_i2c_remove, +}; + +static int __init fsl_i2c_init(void) +{ + return driver_register(&fsl_i2c_driver); +} + +static void __exit fsl_i2c_exit(void) +{ + driver_unregister(&fsl_i2c_driver); +} + +module_init(fsl_i2c_init); +module_exit(fsl_i2c_exit); + +#endif /* CONFIG_FSL_OCP */ MODULE_AUTHOR("Adrian Cox "); MODULE_DESCRIPTION