diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index c466c6c..e9e1493 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -241,7 +241,6 @@ config I2C_PIIX4 config I2C_IBM_IIC tristate "IBM PPC 4xx on-chip I2C interface" - depends on IBM_OCP help Say Y here if you want to use IIC peripheral found on embedded IBM PPC 4xx based systems. diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c index 9b43ff7..0b10bb1 100644 --- a/drivers/i2c/busses/i2c-ibm_iic.c +++ b/drivers/i2c/busses/i2c-ibm_iic.c @@ -6,7 +6,10 @@ * Copyright (c) 2003, 2004 Zultys Technologies. * Eugene Surovegin or * - * Based on original work by + * Copyright (c) 2008 PIKA Technologies + * Sean MacLennan + * + * Based on original work by * Ian DaSilva * Armin Kuster * Matt Porter @@ -39,12 +42,17 @@ #include #include #include + +#ifdef CONFIG_IBM_OCP #include #include +#else +#include +#endif #include "i2c-ibm_iic.h" -#define DRIVER_VERSION "2.1" +#define DRIVER_VERSION "2.2" MODULE_DESCRIPTION("IBM IIC driver v" DRIVER_VERSION); MODULE_LICENSE("GPL"); @@ -657,6 +665,7 @@ static inline u8 iic_clckdiv(unsigned int opb) return (u8)((opb + 9) / 10 - 1); } +#ifdef CONFIG_IBM_OCP /* * Register single IIC interface */ @@ -831,3 +840,192 @@ static void __exit iic_exit(void) module_init(iic_init); module_exit(iic_exit); +#else +/* + * Register single IIC interface + */ +static int __devinit iic_probe(struct of_device *ofdev, + const struct of_device_id *match) +{ + static int index = 0; + struct device_node *np = ofdev->node; + struct ibm_iic_private* dev; + struct i2c_adapter* adap; + const u32 *addrp, *freq; + u64 addr; + int ret; + + if (!(dev = kzalloc(sizeof(*dev), GFP_KERNEL))) { + printk(KERN_CRIT "ibm-iic: failed to allocate device data\n"); + return -ENOMEM; + } + + /* This assumes we don't mix index and non-index entries. */ + if((addrp = of_get_property(np, "index", NULL))) + dev->idx = *addrp; + else + dev->idx = index++; + + dev_set_drvdata(&ofdev->dev, dev); + + if((addrp = of_get_address(np, 0, NULL, NULL)) == NULL || + (addr = of_translate_address(np, addrp)) == OF_BAD_ADDR) { + printk(KERN_CRIT "ibm-iic%d: Unable to get iic address\n", + dev->idx); + ret = -EBUSY; + goto fail1; + } + + if (!(dev->vaddr = ioremap(addr, sizeof(struct iic_regs)))){ + printk(KERN_CRIT "ibm-iic%d: failed to ioremap device registers\n", + dev->idx); + ret = -ENXIO; + goto fail1; + } + + init_waitqueue_head(&dev->wq); + + if(iic_force_poll) + dev->irq = NO_IRQ; + else if((dev->irq = irq_of_parse_and_map(np, 0)) == NO_IRQ) + printk(KERN_ERR __FILE__ ": irq_of_parse_and_map failed\n"); + + if (dev->irq != NO_IRQ) { + /* Disable interrupts until we finish initialization, + assumes level-sensitive IRQ setup... + */ + iic_interrupt_mode(dev, 0); + if(request_irq(dev->irq, iic_handler, 0, "IBM IIC", dev)){ + printk(KERN_ERR "ibm-iic%d: request_irq %d failed\n", + dev->idx, dev->irq); + /* Fallback to the polling mode */ + dev->irq = NO_IRQ; + } + } + + if (dev->irq == NO_IRQ) + printk(KERN_WARNING "ibm-iic%d: using polling mode\n", + dev->idx); + + /* Board specific settings */ + if(iic_force_fast || of_get_property(np, "fast-mode", NULL)) + dev->fast_mode = 1; + else + dev->fast_mode = 0; + + /* clckdiv is the same for *all* IIC interfaces, but I'd rather + * make a copy than introduce another global. --ebs + */ + if((freq = of_get_property(np, "clock-frequency", NULL)) == NULL && + (freq = of_get_property(np->parent, "clock-frequency", NULL)) == NULL) { + printk(KERN_CRIT "ibm-iic%d: Unable to get bus frequency\n", dev->idx); + ret = -EBUSY; + goto fail; + } + + dev->clckdiv = iic_clckdiv(*freq); + DBG("%d: clckdiv = %d\n", dev->idx, dev->clckdiv); + + /* Initialize IIC interface */ + iic_dev_init(dev); + + /* Register it with i2c layer */ + adap = &dev->adap; + adap->dev.parent = &ofdev->dev; + strcpy(adap->name, "IBM IIC"); + i2c_set_adapdata(adap, dev); + adap->id = I2C_HW_OCP; + adap->class = I2C_CLASS_HWMON; + adap->algo = &iic_algo; + adap->client_register = NULL; + adap->client_unregister = NULL; + adap->timeout = 1; + adap->retries = 1; + adap->nr = dev->idx; + + if ((ret = i2c_add_numbered_adapter(adap)) < 0) { + printk(KERN_CRIT "ibm-iic%d: failed to register i2c adapter\n", + dev->idx); + goto fail; + } + + printk(KERN_INFO "ibm-iic%d: using %s mode\n", dev->idx, + dev->fast_mode ? "fast (400 kHz)" : "standard (100 kHz)"); + + return 0; + +fail: + if (dev->irq != NO_IRQ){ + iic_interrupt_mode(dev, 0); + free_irq(dev->irq, dev); + } + + iounmap(dev->vaddr); +fail1: + dev_set_drvdata(&ofdev->dev, NULL); + kfree(dev); + return ret; +} + +/* + * Cleanup initialized IIC interface + */ +static int __devexit iic_remove(struct of_device *ofdev) +{ + struct ibm_iic_private* dev = (struct ibm_iic_private*)dev_get_drvdata(&ofdev->dev); + + BUG_ON(dev == NULL); + if (i2c_del_adapter(&dev->adap)){ + printk(KERN_CRIT "ibm-iic%d: failed to delete i2c adapter :(\n", + dev->idx); + /* That's *very* bad, just shutdown IRQ ... */ + if (dev->irq >= 0){ + iic_interrupt_mode(dev, 0); + free_irq(dev->irq, dev); + dev->irq = -1; + } + } else { + if (dev->irq != NO_IRQ){ + iic_interrupt_mode(dev, 0); + free_irq(dev->irq, dev); + } + iounmap(dev->vaddr); + kfree(dev); + } + + return 0; +} + + +static struct of_device_id ibm_iic_match[] = +{ + { .type = "i2c", .compatible = "ibm,iic-405ex", }, + { .type = "i2c", .compatible = "ibm,iic-405gp", }, + { .type = "i2c", .compatible = "ibm,iic-440gp", }, + { .type = "i2c", .compatible = "ibm,iic-440gpx", }, + { .type = "i2c", .compatible = "ibm,iic-440grx", }, + {} +}; + +static struct of_platform_driver ibm_iic_driver = +{ + .name = "ibm-iic", + .match_table = ibm_iic_match, + .probe = iic_probe, + .remove = iic_remove, +}; + +static int __init ibm_iic_init(void) +{ + printk(KERN_INFO "IBM IIC driver v" DRIVER_VERSION "\n"); + return of_register_platform_driver(&ibm_iic_driver); +} +module_init(ibm_iic_init); + +static void __exit ibm_iic_exit(void) +{ + of_unregister_platform_driver(&ibm_iic_driver); +} +module_exit(ibm_iic_exit); +#endif +