Merge branch 'i2c-next' of git://aeryn.fluff.org.uk/bjdooks/linux
Linus Torvalds [Tue, 6 Jan 2009 02:58:06 +0000 (18:58 -0800)]
* 'i2c-next' of git://aeryn.fluff.org.uk/bjdooks/linux:
  i2c-omap: fix type of irq handler function
  i2c-s3c2410: Change IRQ to be plain integer.
  i2c-s3c2410: Allow more than one i2c-s3c2410 adapter
  i2c-s3c2410: Remove default platform data.
  i2c-s3c2410: Use platform data for gpio configuration
  i2c-s3c2410: Fixup style problems from checkpatch.pl
  i2c-omap: Enable I2C wakeups for 34xx
  i2c-omap: reprogram OCP_SYSCONFIG register after reset
  i2c-omap: convert 'rev1' flag to generic 'rev' u8
  i2c-omap: fix I2C timeouts due to recursive omap_i2c_{un,}idle()
  i2c-omap: Clean-up i2c-omap
  i2c-omap: Don't compile in OMAP15xx I2C ISR for non-OMAP15xx builds
  i2c-omap: Mark init-only functions as __init
  i2c-omap: Add support for omap34xx
  i2c-omap: FIFO handling support and broken hw workaround for i2c-omap
  i2c-omap: Add high-speed support to omap-i2c
  i2c-omap: Close suspected race between omap_i2c_idle() and omap_i2c_isr()
  i2c-omap: Do not use interruptible wait call in omap_i2c_xfer_msg

Fix up apparently-trivial conflict in drivers/i2c/busses/i2c-s3c2410.c

1  2 
arch/arm/mach-omap2/clock24xx.h
drivers/i2c/busses/i2c-s3c2410.c

@@@ -2321,7 -2321,7 +2321,7 @@@ static struct clk i2c2_fck = 
  };
  
  static struct clk i2chs2_fck = {
-       .name           = "i2chs_fck",
+       .name           = "i2c_fck",
        .id             = 2,
        .parent         = &func_96m_ck,
        .flags          = CLOCK_IN_OMAP243X,
@@@ -2354,7 -2354,7 +2354,7 @@@ static struct clk i2c1_fck = 
  };
  
  static struct clk i2chs1_fck = {
-       .name           = "i2chs_fck",
+       .name           = "i2c_fck",
        .id             = 1,
        .parent         = &func_96m_ck,
        .flags          = CLOCK_IN_OMAP243X,
@@@ -2522,6 -2522,7 +2522,6 @@@ static struct clk usbhs_ick = 
  
  static struct clk mmchs1_ick = {
        .name           = "mmchs_ick",
 -      .id             = 1,
        .parent         = &l4_ck,
        .flags          = CLOCK_IN_OMAP243X,
        .clkdm_name     = "core_l4_clkdm",
  
  static struct clk mmchs1_fck = {
        .name           = "mmchs_fck",
 -      .id             = 1,
        .parent         = &func_96m_ck,
        .flags          = CLOCK_IN_OMAP243X,
        .clkdm_name     = "core_l3_clkdm",
  
  static struct clk mmchs2_ick = {
        .name           = "mmchs_ick",
 -      .id             = 2,
 +      .id             = 1,
        .parent         = &l4_ck,
        .flags          = CLOCK_IN_OMAP243X,
        .clkdm_name     = "core_l4_clkdm",
  
  static struct clk mmchs2_fck = {
        .name           = "mmchs_fck",
 -      .id             = 2,
 +      .id             = 1,
        .parent         = &func_96m_ck,
        .flags          = CLOCK_IN_OMAP243X,
        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2),
@@@ -2593,6 -2595,7 +2593,6 @@@ static struct clk mdm_intc_ick = 
  
  static struct clk mmchsdb1_fck = {
        .name           = "mmchsdb_fck",
 -      .id             = 1,
        .parent         = &func_32k_ck,
        .flags          = CLOCK_IN_OMAP243X,
        .clkdm_name     = "core_l4_clkdm",
  
  static struct clk mmchsdb2_fck = {
        .name           = "mmchsdb_fck",
 -      .id             = 2,
 +      .id             = 1,
        .parent         = &func_32k_ck,
        .flags          = CLOCK_IN_OMAP243X,
        .clkdm_name     = "core_l4_clkdm",
  #include <linux/clk.h>
  #include <linux/cpufreq.h>
  
  #include <asm/irq.h>
  #include <asm/io.h>
  
- #include <mach/regs-gpio.h>
 -#include <asm/plat-s3c/regs-iic.h>
 -#include <asm/plat-s3c/iic.h>
 +#include <plat/regs-iic.h>
 +#include <plat/iic.h>
  
  /* i2c controller state */
  
@@@ -56,7 -54,6 +54,7 @@@ enum s3c24xx_i2c_state 
  struct s3c24xx_i2c {
        spinlock_t              lock;
        wait_queue_head_t       wait;
 +      unsigned int            suspended:1;
  
        struct i2c_msg          *msg;
        unsigned int            msg_num;
@@@ -64,6 -61,7 +62,7 @@@
        unsigned int            msg_ptr;
  
        unsigned int            tx_setup;
+       unsigned int            irq;
  
        enum s3c24xx_i2c_state  state;
        unsigned long           clkrate;
@@@ -71,7 -69,6 +70,6 @@@
        void __iomem            *regs;
        struct clk              *clk;
        struct device           *dev;
-       struct resource         *irq;
        struct resource         *ioarea;
        struct i2c_adapter      adap;
  
  #endif
  };
  
- /* default platform data to use if not supplied in the platform_device
- */
- static struct s3c2410_platform_i2c s3c24xx_i2c_default_platform = {
-       .flags          = 0,
-       .slave_addr     = 0x10,
-       .bus_freq       = 100*1000,
-       .max_freq       = 400*1000,
-       .sda_delay      = S3C2410_IICLC_SDA_DELAY5 | S3C2410_IICLC_FILTER_ON,
- };
+ /* default platform data removed, dev should always carry data. */
  
  /* s3c24xx_i2c_is2440()
   *
@@@ -103,21 -91,6 +92,6 @@@ static inline int s3c24xx_i2c_is2440(st
        return !strcmp(pdev->name, "s3c2440-i2c");
  }
  
- /* s3c24xx_i2c_get_platformdata
-  *
-  * get the platform data associated with the given device, or return
-  * the default if there is none
- */
- static inline struct s3c2410_platform_i2c *s3c24xx_i2c_get_platformdata(struct device *dev)
- {
-       if (dev->platform_data != NULL)
-               return (struct s3c2410_platform_i2c *)dev->platform_data;
-       return &s3c24xx_i2c_default_platform;
- }
  /* s3c24xx_i2c_master_complete
   *
   * complete the message and wake up the caller, using the given return code,
@@@ -130,7 -103,7 +104,7 @@@ static inline void s3c24xx_i2c_master_c
  
        i2c->msg_ptr = 0;
        i2c->msg = NULL;
-       i2c->msg_idx ++;
+       i2c->msg_idx++;
        i2c->msg_num = 0;
        if (ret)
                i2c->msg_idx = ret;
  static inline void s3c24xx_i2c_disable_ack(struct s3c24xx_i2c *i2c)
  {
        unsigned long tmp;
-       
        tmp = readl(i2c->regs + S3C2410_IICCON);
        writel(tmp & ~S3C2410_IICCON_ACKEN, i2c->regs + S3C2410_IICCON);
  }
  
  static inline void s3c24xx_i2c_enable_ack(struct s3c24xx_i2c *i2c)
  {
        unsigned long tmp;
-       
        tmp = readl(i2c->regs + S3C2410_IICCON);
        writel(tmp | S3C2410_IICCON_ACKEN, i2c->regs + S3C2410_IICCON);
  }
  
  /* irq enable/disable functions */
  static inline void s3c24xx_i2c_disable_irq(struct s3c24xx_i2c *i2c)
  {
        unsigned long tmp;
-       
        tmp = readl(i2c->regs + S3C2410_IICCON);
        writel(tmp & ~S3C2410_IICCON_IRQEN, i2c->regs + S3C2410_IICCON);
  }
  static inline void s3c24xx_i2c_enable_irq(struct s3c24xx_i2c *i2c)
  {
        unsigned long tmp;
-       
        tmp = readl(i2c->regs + S3C2410_IICCON);
        writel(tmp | S3C2410_IICCON_IRQEN, i2c->regs + S3C2410_IICCON);
  }
  
  /* s3c24xx_i2c_message_start
   *
-  * put the start of a message onto the bus 
+  * put the start of a message onto the bus
  */
  
- static void s3c24xx_i2c_message_start(struct s3c24xx_i2c *i2c, 
+ static void s3c24xx_i2c_message_start(struct s3c24xx_i2c *i2c,
                                      struct i2c_msg *msg)
  {
        unsigned int addr = (msg->addr & 0x7f) << 1;
        if (msg->flags & I2C_M_REV_DIR_ADDR)
                addr ^= 1;
  
-       // todo - check for wether ack wanted or not
+       /* todo - check for wether ack wanted or not */
        s3c24xx_i2c_enable_ack(i2c);
  
        iiccon = readl(i2c->regs + S3C2410_IICCON);
        writel(stat, i2c->regs + S3C2410_IICSTAT);
-       
        dev_dbg(i2c->dev, "START: %08lx to IICSTAT, %02x to DS\n", stat, addr);
        writeb(addr, i2c->regs + S3C2410_IICDS);
-       
        /* delay here to ensure the data byte has gotten onto the bus
         * before the transaction is started */
  
  
        dev_dbg(i2c->dev, "iiccon, %08lx\n", iiccon);
        writel(iiccon, i2c->regs + S3C2410_IICCON);
-       
-       stat |=  S3C2410_IICSTAT_START;
+       stat |= S3C2410_IICSTAT_START;
        writel(stat, i2c->regs + S3C2410_IICSTAT);
  }
  
@@@ -227,11 -198,11 +199,11 @@@ static inline void s3c24xx_i2c_stop(str
        dev_dbg(i2c->dev, "STOP\n");
  
        /* stop the transfer */
-       iicstat &= ~ S3C2410_IICSTAT_START;
+       iicstat &= ~S3C2410_IICSTAT_START;
        writel(iicstat, i2c->regs + S3C2410_IICSTAT);
-       
        i2c->state = STATE_STOP;
-       
        s3c24xx_i2c_master_complete(i2c, ret);
        s3c24xx_i2c_disable_irq(i2c);
  }
  
  /* is_lastmsg()
   *
-  * returns TRUE if the current message is the last in the set 
+  * returns TRUE if the current message is the last in the set
  */
  
  static inline int is_lastmsg(struct s3c24xx_i2c *i2c)
@@@ -289,14 -260,14 +261,14 @@@ static int i2s_s3c_irq_nextbyte(struct 
  
        case STATE_STOP:
                dev_err(i2c->dev, "%s: called in STATE_STOP\n", __func__);
-               s3c24xx_i2c_disable_irq(i2c);           
+               s3c24xx_i2c_disable_irq(i2c);
                goto out_ack;
  
        case STATE_START:
                /* last thing we did was send a start condition on the
                 * bus, or started a new i2c message
                 */
-               
                if (iicstat & S3C2410_IICSTAT_LASTBIT &&
                    !(i2c->msg->flags & I2C_M_IGNORE_NAK)) {
                        /* ack was not received... */
                if (i2c->state == STATE_READ)
                        goto prepare_read;
  
-               /* fall through to the write state, as we will need to 
+               /* fall through to the write state, as we will need to
                 * send a byte as well */
  
        case STATE_WRITE:
                        }
                }
  
-       retry_write:
+  retry_write:
  
                if (!is_msgend(i2c)) {
                        byte = i2c->msg->buf[i2c->msg_ptr++];
                        dev_dbg(i2c->dev, "WRITE: Next Message\n");
  
                        i2c->msg_ptr = 0;
-                       i2c->msg_idx ++;
+                       i2c->msg_idx++;
                        i2c->msg++;
-                       
                        /* check to see if we need to do another message */
                        if (i2c->msg->flags & I2C_M_NOSTART) {
  
  
                                goto retry_write;
                        } else {
-                       
                                /* send the new start */
                                s3c24xx_i2c_message_start(i2c, i2c->msg);
                                i2c->state = STATE_START;
                break;
  
        case STATE_READ:
-               /* we have a byte of data in the data register, do 
+               /* we have a byte of data in the data register, do
                 * something with it, and then work out wether we are
                 * going to do any more read/write
                 */
                byte = readb(i2c->regs + S3C2410_IICDS);
                i2c->msg->buf[i2c->msg_ptr++] = byte;
  
-       prepare_read:
+  prepare_read:
                if (is_msglast(i2c)) {
                        /* last byte of buffer */
  
                        if (is_lastmsg(i2c))
                                s3c24xx_i2c_disable_ack(i2c);
-                       
                } else if (is_msgend(i2c)) {
                        /* ok, we've read the entire buffer, see if there
                         * is anything else we need to do */
        /* acknowlegde the IRQ and get back on with the work */
  
   out_ack:
-       tmp = readl(i2c->regs + S3C2410_IICCON);        
+       tmp = readl(i2c->regs + S3C2410_IICCON);
        tmp &= ~S3C2410_IICCON_IRQPEND;
        writel(tmp, i2c->regs + S3C2410_IICCON);
   out:
@@@ -450,19 -420,19 +421,19 @@@ static irqreturn_t s3c24xx_i2c_irq(int 
        status = readl(i2c->regs + S3C2410_IICSTAT);
  
        if (status & S3C2410_IICSTAT_ARBITR) {
-               // deal with arbitration loss
+               /* deal with arbitration loss */
                dev_err(i2c->dev, "deal with arbitration loss\n");
        }
  
        if (i2c->state == STATE_IDLE) {
                dev_dbg(i2c->dev, "IRQ: error i2c->state == IDLE\n");
  
-               tmp = readl(i2c->regs + S3C2410_IICCON);        
+               tmp = readl(i2c->regs + S3C2410_IICCON);
                tmp &= ~S3C2410_IICCON_IRQPEND;
                writel(tmp, i2c->regs +  S3C2410_IICCON);
                goto out;
        }
-       
        /* pretty much this leaves us with the fact that we've
         * transmitted or received whatever byte we last sent */
  
@@@ -485,16 -455,13 +456,13 @@@ static int s3c24xx_i2c_set_master(struc
  
        while (timeout-- > 0) {
                iicstat = readl(i2c->regs + S3C2410_IICSTAT);
-               
                if (!(iicstat & S3C2410_IICSTAT_BUSBUSY))
                        return 0;
  
                msleep(1);
        }
  
-       dev_dbg(i2c->dev, "timeout: GPEDAT is %08x\n",
-               __raw_readl(S3C2410_GPEDAT));
        return -ETIMEDOUT;
  }
  
   * this starts an i2c transfer
  */
  
- static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c, struct i2c_msg *msgs, int num)
+ static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c,
+                             struct i2c_msg *msgs, int num)
  {
        unsigned long timeout;
        int ret;
  
 -      if (!(readl(i2c->regs + S3C2410_IICCON) & S3C2410_IICCON_IRQEN))
 +      if (i2c->suspended)
                return -EIO;
  
        ret = s3c24xx_i2c_set_master(i2c);
        s3c24xx_i2c_enable_irq(i2c);
        s3c24xx_i2c_message_start(i2c, msgs);
        spin_unlock_irq(&i2c->lock);
-       
        timeout = wait_event_timeout(i2c->wait, i2c->msg_num == 0, HZ * 5);
  
        ret = i2c->msg_idx;
  
-       /* having these next two as dev_err() makes life very 
+       /* having these next two as dev_err() makes life very
         * noisy when doing an i2cdetect */
  
        if (timeout == 0)
@@@ -591,19 -559,6 +560,6 @@@ static const struct i2c_algorithm s3c24
        .functionality          = s3c24xx_i2c_func,
  };
  
- static struct s3c24xx_i2c s3c24xx_i2c = {
-       .lock           = __SPIN_LOCK_UNLOCKED(s3c24xx_i2c.lock),
-       .wait           = __WAIT_QUEUE_HEAD_INITIALIZER(s3c24xx_i2c.wait),
-       .tx_setup       = 50,
-       .adap           = {
-               .name                   = "s3c2410-i2c",
-               .owner                  = THIS_MODULE,
-               .algo                   = &s3c24xx_i2c_algorithm,
-               .retries                = 2,
-               .class                  = I2C_CLASS_HWMON | I2C_CLASS_SPD,
-       },
- };
  /* s3c24xx_i2c_calcdivisor
   *
   * return the divisor settings for a given frequency
@@@ -643,7 -598,7 +599,7 @@@ static inline int freq_acceptable(unsig
  {
        int diff = freq - wanted;
  
-       return (diff >= -2 && diff <= 2);
+       return diff >= -2 && diff <= 2;
  }
  
  /* s3c24xx_i2c_clockrate
  
  static int s3c24xx_i2c_clockrate(struct s3c24xx_i2c *i2c, unsigned int *got)
  {
-       struct s3c2410_platform_i2c *pdata;
+       struct s3c2410_platform_i2c *pdata = i2c->dev->platform_data;
        unsigned long clkin = clk_get_rate(i2c->clk);
        unsigned int divs, div1;
        u32 iiccon;
        int start, end;
  
        i2c->clkrate = clkin;
-       pdata = s3c24xx_i2c_get_platformdata(i2c->adap.dev.parent);
        clkin /= 1000;          /* clkin now in KHz */
-      
        dev_dbg(i2c->dev, "pdata %p, freq %lu %lu..%lu\n",
                 pdata, pdata->bus_freq, pdata->min_freq, pdata->max_freq);
  
@@@ -774,7 -727,7 +728,7 @@@ static inline void s3c24xx_i2c_deregist
  
  /* s3c24xx_i2c_init
   *
-  * initialise the controller, set the IO lines and frequency 
+  * initialise the controller, set the IO lines and frequency
  */
  
  static int s3c24xx_i2c_init(struct s3c24xx_i2c *i2c)
  
        /* get the plafrom data */
  
-       pdata = s3c24xx_i2c_get_platformdata(i2c->adap.dev.parent);
+       pdata = i2c->dev->platform_data;
  
        /* inititalise the gpio */
  
-       s3c2410_gpio_cfgpin(S3C2410_GPE15, S3C2410_GPE15_IICSDA);
-       s3c2410_gpio_cfgpin(S3C2410_GPE14, S3C2410_GPE14_IICSCL);
+       if (pdata->cfg_gpio)
+               pdata->cfg_gpio(to_platform_device(i2c->dev));
  
        /* write slave address */
-       
        writeb(pdata->slave_addr, i2c->regs + S3C2410_IICADD);
  
        dev_info(i2c->dev, "slave address 0x%02x\n", pdata->slave_addr);
  
  static int s3c24xx_i2c_probe(struct platform_device *pdev)
  {
-       struct s3c24xx_i2c *i2c = &s3c24xx_i2c;
+       struct s3c24xx_i2c *i2c;
        struct s3c2410_platform_i2c *pdata;
        struct resource *res;
        int ret;
  
-       pdata = s3c24xx_i2c_get_platformdata(&pdev->dev);
+       pdata = pdev->dev.platform_data;
+       if (!pdata) {
+               dev_err(&pdev->dev, "no platform data\n");
+               return -EINVAL;
+       }
+       i2c = kzalloc(sizeof(struct s3c24xx_i2c), GFP_KERNEL);
+       if (!i2c) {
+               dev_err(&pdev->dev, "no memory for state\n");
+               return -ENOMEM;
+       }
+       strlcpy(i2c->adap.name, "s3c2410-i2c", sizeof(i2c->adap.name));
+       i2c->adap.owner   = THIS_MODULE;
+       i2c->adap.algo    = &s3c24xx_i2c_algorithm;
+       i2c->adap.retries = 2;
+       i2c->adap.class   = I2C_CLASS_HWMON | I2C_CLASS_SPD;
+       i2c->tx_setup     = 50;
+       spin_lock_init(&i2c->lock);
+       init_waitqueue_head(&i2c->wait);
  
        /* find the clock and enable it */
  
                goto err_ioarea;
        }
  
-       dev_dbg(&pdev->dev, "registers %p (%p, %p)\n", i2c->regs, i2c->ioarea, res);
+       dev_dbg(&pdev->dev, "registers %p (%p, %p)\n",
+               i2c->regs, i2c->ioarea, res);
  
        /* setup info block for the i2c core */
  
                goto err_iomap;
  
        /* find the IRQ for this unit (note, this relies on the init call to
-        * ensure no current IRQs pending 
+        * ensure no current IRQs pending
         */
  
-       res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-       if (res == NULL) {
+       i2c->irq = ret = platform_get_irq(pdev, 0);
+       if (ret <= 0) {
                dev_err(&pdev->dev, "cannot find IRQ\n");
                goto err_iomap;
        }
  
-       ret = request_irq(res->start, s3c24xx_i2c_irq, IRQF_DISABLED,
-                         pdev->name, i2c);
+       ret = request_irq(i2c->irq, s3c24xx_i2c_irq, IRQF_DISABLED,
+                         dev_name(&pdev->dev), i2c);
  
        if (ret != 0) {
-               dev_err(&pdev->dev, "cannot claim IRQ\n");
+               dev_err(&pdev->dev, "cannot claim IRQ %d\n", i2c->irq);
                goto err_iomap;
        }
  
-       i2c->irq = res;
-               
-       dev_dbg(&pdev->dev, "irq resource %p (%lu)\n", res,
-               (unsigned long)res->start);
        ret = s3c24xx_i2c_register_cpufreq(i2c);
        if (ret < 0) {
                dev_err(&pdev->dev, "failed to register cpufreq notifier\n");
        s3c24xx_i2c_deregister_cpufreq(i2c);
  
   err_irq:
-       free_irq(i2c->irq->start, i2c);
+       free_irq(i2c->irq, i2c);
  
   err_iomap:
        iounmap(i2c->regs);
        clk_put(i2c->clk);
  
   err_noclk:
+       kfree(i2c);
        return ret;
  }
  
@@@ -973,7 -942,7 +943,7 @@@ static int s3c24xx_i2c_remove(struct pl
        s3c24xx_i2c_deregister_cpufreq(i2c);
  
        i2c_del_adapter(&i2c->adap);
-       free_irq(i2c->irq->start, i2c);
+       free_irq(i2c->irq, i2c);
  
        clk_disable(i2c->clk);
        clk_put(i2c->clk);
  
        release_resource(i2c->ioarea);
        kfree(i2c->ioarea);
+       kfree(i2c);
  
        return 0;
  }
  
  #ifdef CONFIG_PM
 +static int s3c24xx_i2c_suspend_late(struct platform_device *dev,
 +                                  pm_message_t msg)
 +{
 +      struct s3c24xx_i2c *i2c = platform_get_drvdata(dev);
 +      i2c->suspended = 1;
 +      return 0;
 +}
 +
  static int s3c24xx_i2c_resume(struct platform_device *dev)
  {
        struct s3c24xx_i2c *i2c = platform_get_drvdata(dev);
  
 -      if (i2c != NULL)
 -              s3c24xx_i2c_init(i2c);
 +      i2c->suspended = 0;
 +      s3c24xx_i2c_init(i2c);
  
        return 0;
  }
  
  #else
 +#define s3c24xx_i2c_suspend_late NULL
  #define s3c24xx_i2c_resume NULL
  #endif
  
  static struct platform_driver s3c2410_i2c_driver = {
        .probe          = s3c24xx_i2c_probe,
        .remove         = s3c24xx_i2c_remove,
 +      .suspend_late   = s3c24xx_i2c_suspend_late,
        .resume         = s3c24xx_i2c_resume,
        .driver         = {
                .owner  = THIS_MODULE,
  static struct platform_driver s3c2440_i2c_driver = {
        .probe          = s3c24xx_i2c_probe,
        .remove         = s3c24xx_i2c_remove,
 +      .suspend_late   = s3c24xx_i2c_suspend_late,
        .resume         = s3c24xx_i2c_resume,
        .driver         = {
                .owner  = THIS_MODULE,