X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fi2c%2Fbusses%2Fi2c-mpc.c;h=ee65aa1be13a95ac364567af0f7c0542af99af68;hb=97bf2856c6014879bd04983a3e9dfcdac1e7fe85;hp=f77245e569098d9236b51e90c7509574c0b3f5fe;hpb=a2c21200f1c81b08cb55e417b68150bba439b646;p=linux-2.6.git diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c index f77245e56..ee65aa1be 100644 --- a/drivers/i2c/busses/i2c-mpc.c +++ b/drivers/i2c/busses/i2c-mpc.c @@ -1,28 +1,30 @@ /* * (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 * warranty of any kind, whether express or implied. */ -#include #include #include #include #include #include +#include + #include -#include +#include #include #include +#include #define MPC_I2C_ADDR 0x00 #define MPC_I2C_FDR 0x04 @@ -48,11 +50,12 @@ #define CSR_RXAK 0x01 struct mpc_i2c { - char *base; - struct ocp_def *ocpdef; + void __iomem *base; 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) @@ -60,7 +63,7 @@ static __inline__ void writeccr(struct mpc_i2c *i2c, u32 x) writeb(x, i2c->base + MPC_I2C_CR); } -static irqreturn_t mpc_i2c_isr(int irq, void *dev_id, struct pt_regs *regs) +static irqreturn_t mpc_i2c_isr(int irq, void *dev_id) { struct mpc_i2c *i2c = dev_id; if (readb(i2c->base + MPC_I2C_SR) & CSR_MIF) { @@ -74,12 +77,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 +94,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 +133,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 +160,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 +188,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; @@ -232,7 +228,7 @@ static int mpc_read(struct mpc_i2c *i2c, int target, return length; } -static int mpc_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num) +static int mpc_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) { struct i2c_msg *pmsg; int i; @@ -276,9 +272,7 @@ static u32 mpc_functionality(struct i2c_adapter *adap) return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL; } -static struct i2c_algorithm mpc_algo = { - .name = "MPC algorithm", - .id = I2C_ALGO_MPC107, +static const struct i2c_algorithm mpc_algo = { .master_xfer = mpc_xfer, .functionality = mpc_functionality, }; @@ -286,30 +280,35 @@ static struct i2c_algorithm mpc_algo = { static struct i2c_adapter mpc_ops = { .owner = THIS_MODULE, .name = "MPC adapter", - .id = I2C_ALGO_MPC107 | I2C_HW_MPC107, + .id = I2C_HW_MPC107, .algo = &mpc_algo, .class = I2C_CLASS_HWMON, .timeout = 1, .retries = 1 }; -static int __devinit mpc_i2c_probe(struct ocp_device *ocp) +static int fsl_i2c_probe(struct platform_device *pdev) { int result = 0; struct mpc_i2c *i2c; + struct fsl_i2c_platform_data *pdata; + struct resource *r = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!(i2c = kmalloc(sizeof(*i2c), GFP_KERNEL))) { + pdata = (struct fsl_i2c_platform_data *) pdev->dev.platform_data; + + if (!(i2c = kzalloc(sizeof(*i2c), GFP_KERNEL))) { return -ENOMEM; } - i2c->ocpdef = ocp->def; - init_waitqueue_head(&i2c->queue); - if (!request_mem_region(ocp->def->paddr, MPC_I2C_REGION, "i2c-mpc")) { - printk(KERN_ERR "i2c-mpc - resource unavailable\n"); - return -ENODEV; + i2c->irq = platform_get_irq(pdev, 0); + if (i2c->irq < 0) { + result = -ENXIO; + goto fail_get_irq; } + i2c->flags = pdata->device_flags; + init_waitqueue_head(&i2c->queue); - i2c->base = ioremap(ocp->def->paddr, MPC_I2C_REGION); + i2c->base = ioremap((phys_addr_t)r->start, MPC_I2C_REGION); if (!i2c->base) { printk(KERN_ERR "i2c-mpc - failed to map controller\n"); @@ -317,74 +316,75 @@ static int __devinit mpc_i2c_probe(struct ocp_device *ocp) goto fail_map; } - if (ocp->def->irq != OCP_IRQ_NA) - if ((result = request_irq(ocp->def->irq, mpc_i2c_isr, - 0, "i2c-mpc", i2c)) < 0) { + if (i2c->irq != 0) + if ((result = request_irq(i2c->irq, mpc_i2c_isr, + IRQF_SHARED, "i2c-mpc", i2c)) < 0) { printk(KERN_ERR "i2c-mpc - failed to attach interrupt\n"); goto fail_irq; } + mpc_i2c_setclock(i2c); + platform_set_drvdata(pdev, i2c); + 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); - ocp_set_drvdata(ocp, i2c); return result; fail_add: - if (ocp->def->irq != OCP_IRQ_NA) - free_irq(ocp->def->irq, 0); + if (i2c->irq != 0) + free_irq(i2c->irq, NULL); fail_irq: iounmap(i2c->base); fail_map: - release_mem_region(ocp->def->paddr, MPC_I2C_REGION); + fail_get_irq: kfree(i2c); return result; -} -static void __devexit mpc_i2c_remove(struct ocp_device *ocp) +}; + +static int fsl_i2c_remove(struct platform_device *pdev) { - struct mpc_i2c *i2c = ocp_get_drvdata(ocp); - ocp_set_drvdata(ocp, NULL); + struct mpc_i2c *i2c = platform_get_drvdata(pdev); + i2c_del_adapter(&i2c->adap); + platform_set_drvdata(pdev, NULL); + + if (i2c->irq != 0) + free_irq(i2c->irq, i2c); - if (ocp->def->irq != OCP_IRQ_NA) - free_irq(i2c->ocpdef->irq, i2c); iounmap(i2c->base); - release_mem_region(i2c->ocpdef->paddr, MPC_I2C_REGION); kfree(i2c); -} - -static struct ocp_device_id mpc_iic_ids[] __devinitdata = { - {.vendor = OCP_VENDOR_FREESCALE,.function = OCP_FUNC_IIC}, - {.vendor = OCP_VENDOR_INVALID} + return 0; }; -MODULE_DEVICE_TABLE(ocp, mpc_iic_ids); - -static struct ocp_driver mpc_iic_driver = { - .name = "iic", - .id_table = mpc_iic_ids, - .probe = mpc_i2c_probe, - .remove = __devexit_p(mpc_i2c_remove) +/* Structure for a device driver */ +static struct platform_driver fsl_i2c_driver = { + .probe = fsl_i2c_probe, + .remove = fsl_i2c_remove, + .driver = { + .owner = THIS_MODULE, + .name = "fsl-i2c", + }, }; -static int __init iic_init(void) +static int __init fsl_i2c_init(void) { - return ocp_register_driver(&mpc_iic_driver); + return platform_driver_register(&fsl_i2c_driver); } -static void __exit iic_exit(void) +static void __exit fsl_i2c_exit(void) { - ocp_unregister_driver(&mpc_iic_driver); + platform_driver_unregister(&fsl_i2c_driver); } -module_init(iic_init); -module_exit(iic_exit); +module_init(fsl_i2c_init); +module_exit(fsl_i2c_exit); MODULE_AUTHOR("Adrian Cox "); MODULE_DESCRIPTION