Apply k4412 kernel from HardKernel for ODROID-X.

1 files changed, 90 insertions, 13 deletions

diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index f84a63c6dd9..d7ae653cec0 100644
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -54,6 +54,7 @@ enum s3c24xx_i2c_state {
 enum s3c24xx_i2c_type {
         TYPE_S3C2410,
         TYPE_S3C2440,
+        TYPE_S3C2440_HDMIPHY,
 };
 
 struct s3c24xx_i2c {
@@ -85,6 +86,17 @@ struct s3c24xx_i2c {
 
 /* default platform data removed, dev should always carry data. */
 
+static inline void dump_i2c_register(struct s3c24xx_i2c *i2c)
+{
+        dev_dbg(i2c->dev, "Register dump(%d) : %x %x %x %x %x\n"
+                , i2c->suspended
+                , readl(i2c->regs + S3C2410_IICCON)
+                , readl(i2c->regs + S3C2410_IICSTAT)
+                , readl(i2c->regs + S3C2410_IICADD)
+                , readl(i2c->regs + S3C2410_IICDS)
+                , readl(i2c->regs + S3C2440_IICLC));
+}
+
 /* s3c24xx_i2c_is2440()
  *
  * return true is this is an s3c2440
@@ -96,7 +108,20 @@ static inline int s3c24xx_i2c_is2440(struct s3c24xx_i2c *i2c)
         enum s3c24xx_i2c_type type;
 
         type = platform_get_device_id(pdev)->driver_data;
-        return type == TYPE_S3C2440;
+        return type == TYPE_S3C2440 || type == TYPE_S3C2440_HDMIPHY;
+}
+
+/* s3c24xx_i2c_is2440_hdmiphy()
+ *
+ * return true is this is an s3c2440 dedicated for HDMIPHY interface
+*/
+static inline int s3c24xx_i2c_is2440_hdmiphy(struct s3c24xx_i2c *i2c)
+{
+        struct platform_device *pdev = to_platform_device(i2c->dev);
+        enum s3c24xx_i2c_type type;
+
+        type = platform_get_device_id(pdev)->driver_data;
+        return type == TYPE_S3C2440_HDMIPHY;
 }
 
 /* s3c24xx_i2c_master_complete
@@ -201,18 +226,29 @@ static void s3c24xx_i2c_message_start(struct s3c24xx_i2c *i2c,
 
 static inline void s3c24xx_i2c_stop(struct s3c24xx_i2c *i2c, int ret)
 {
-        unsigned long iicstat = readl(i2c->regs + S3C2410_IICSTAT);
+        unsigned long iicstat;
+        unsigned long iiccon;
 
         dev_dbg(i2c->dev, "STOP\n");
 
         /* stop the transfer */
+
+        /* Disable irq */
+        s3c24xx_i2c_disable_irq(i2c);
+
+        /* STOP signal generation : MTx(0xD0) */
+        iicstat = readl(i2c->regs + S3C2410_IICSTAT);
         iicstat &= ~S3C2410_IICSTAT_START;
         writel(iicstat, i2c->regs + S3C2410_IICSTAT);
 
-        i2c->state = STATE_STOP;
+        /* Clear pending bit */
+        iiccon = readl(i2c->regs + S3C2410_IICCON);
+        iiccon &= ~S3C2410_IICCON_IRQPEND;
+        writel(iiccon, i2c->regs + S3C2410_IICCON);
 
         s3c24xx_i2c_master_complete(i2c, ret);
-        s3c24xx_i2c_disable_irq(i2c);
+
+        i2c->state = STATE_STOP;
 }
 
 /* helper functions to determine the current state in the set of
@@ -348,12 +384,21 @@ static int i2c_s3c_irq_nextbyte(struct s3c24xx_i2c *i2c, unsigned long iicstat)
                                          * forces us to send a new START
                                          * when we change direction */
 
+                                        dev_dbg(i2c->dev, "Cannot do this\n");
                                         s3c24xx_i2c_stop(i2c, -EINVAL);
                                 }
 
+                                /* For multiple messages,
+                                 * ex)
+                                 * Msg[0]: Slave Addr + Write(Addr)
+                                 * Msg[1]: Write(Data) */
                                 goto retry_write;
                         } else {
                                 /* send the new start */
+                                /* For multiple messages,
+                                 * ex)
+                                 * Msg[0]: Slave Addr + Write(Addr)
+                                 * Msg[1]: Slave Addr + Read/Write(Data) */
                                 s3c24xx_i2c_message_start(i2c, i2c->msg);
                                 i2c->state = STATE_START;
                         }
@@ -424,6 +469,8 @@ static irqreturn_t s3c24xx_i2c_irq(int irqno, void *dev_id)
         unsigned long status;
         unsigned long tmp;
 
+        spin_lock(&i2c->lock);
+
         status = readl(i2c->regs + S3C2410_IICSTAT);
 
         if (status & S3C2410_IICSTAT_ARBITR) {
@@ -446,6 +493,8 @@ static irqreturn_t s3c24xx_i2c_irq(int irqno, void *dev_id)
         i2c_s3c_irq_nextbyte(i2c, status);
 
  out:
+        spin_unlock(&i2c->lock);
+
         return IRQ_HANDLED;
 }
 
@@ -490,6 +539,7 @@ static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c,
         ret = s3c24xx_i2c_set_master(i2c);
         if (ret != 0) {
                 dev_err(i2c->dev, "cannot get bus (error %d)\n", ret);
+                dump_i2c_register(i2c);
                 ret = -EAGAIN;
                 goto out;
         }
@@ -513,10 +563,13 @@ static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c,
         /* having these next two as dev_err() makes life very
          * noisy when doing an i2cdetect */
 
-        if (timeout == 0)
+        if (timeout == 0) {
                 dev_dbg(i2c->dev, "timeout\n");
-        else if (ret != num)
+                dump_i2c_register(i2c);
+        } else if (ret != num) {
                 dev_dbg(i2c->dev, "incomplete xfer (%d)\n", ret);
+                dump_i2c_register(i2c);
+        }
 
         /* ensure the stop has been through the bus */
 
@@ -525,7 +578,7 @@ static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c,
         /* first, try busy waiting briefly */
         do {
                 iicstat = readl(i2c->regs + S3C2410_IICSTAT);
-        } while ((iicstat & S3C2410_IICSTAT_START) && --spins);
+        } while ((iicstat & S3C2410_IICSTAT_BUSBUSY) && --spins);
 
         /* if that timed out sleep */
         if (!spins) {
@@ -533,8 +586,23 @@ static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c,
                 iicstat = readl(i2c->regs + S3C2410_IICSTAT);
         }
 
-        if (iicstat & S3C2410_IICSTAT_START)
-                dev_warn(i2c->dev, "timeout waiting for bus idle\n");
+        /* if still not finished, clean it up */
+        spin_lock_irq(&i2c->lock);
+        if (iicstat & S3C2410_IICSTAT_BUSBUSY) {
+                dev_dbg(i2c->dev, "timeout waiting for bus idle\n");
+                dump_i2c_register(i2c);
+
+                if (i2c->state != STATE_STOP) {
+                        dev_dbg(i2c->dev, "timeout : i2c interrupt hasn't occurred\n");
+                        s3c24xx_i2c_stop(i2c, 0);
+                }
+
+                /* Disable Serial Out : To forcely terminate the connection */
+                iicstat = readl(i2c->regs + S3C2410_IICSTAT);
+                iicstat &= ~S3C2410_IICSTAT_TXRXEN;
+                writel(iicstat, i2c->regs + S3C2410_IICSTAT);
+        }
+        spin_unlock_irq(&i2c->lock);
 
  out:
         return ret;
@@ -553,6 +621,12 @@ static int s3c24xx_i2c_xfer(struct i2c_adapter *adap,
         int retry;
         int ret;
 
+        if (i2c->suspended) {
+                dev_err(i2c->dev, "I2C is not initialzed.\n");
+                dump_i2c_register(i2c);
+                return -EIO;
+        }
+
         clk_enable(i2c->clk);
 
         for (retry = 0; retry < adap->retries; retry++) {
@@ -710,7 +784,7 @@ static int s3c24xx_i2c_cpufreq_transition(struct notifier_block *nb,
                 if (ret < 0)
                         dev_err(i2c->dev, "cannot find frequency\n");
                 else
-                        dev_info(i2c->dev, "setting freq %d\n", got);
+                        dev_dbg(i2c->dev, "setting freq %d\n", got);
         }
 
         return 0;
@@ -765,7 +839,7 @@ static int s3c24xx_i2c_init(struct s3c24xx_i2c *i2c)
 
         writeb(pdata->slave_addr, i2c->regs + S3C2410_IICADD);
 
-        dev_info(i2c->dev, "slave address 0x%02x\n", pdata->slave_addr);
+        dev_dbg(i2c->dev, "slave address 0x%02x\n", pdata->slave_addr);
 
         writel(iicon, i2c->regs + S3C2410_IICCON);
 
@@ -779,7 +853,7 @@ static int s3c24xx_i2c_init(struct s3c24xx_i2c *i2c)
 
         /* todo - check that the i2c lines aren't being dragged anywhere */
 
-        dev_info(i2c->dev, "bus frequency set to %d KHz\n", freq);
+        dev_dbg(i2c->dev, "bus frequency set to %d KHz\n", freq);
         dev_dbg(i2c->dev, "S3C2410_IICCON=0x%02lx\n", iicon);
 
         return 0;
@@ -981,10 +1055,10 @@ static int s3c24xx_i2c_resume(struct device *dev)
         struct platform_device *pdev = to_platform_device(dev);
         struct s3c24xx_i2c *i2c = platform_get_drvdata(pdev);
 
-        i2c->suspended = 0;
         clk_enable(i2c->clk);
         s3c24xx_i2c_init(i2c);
         clk_disable(i2c->clk);
+        i2c->suspended = 0;
 
         return 0;
 }
@@ -1008,6 +1082,9 @@ static struct platform_device_id s3c24xx_driver_ids[] = {
         }, {
                 .name           = "s3c2440-i2c",
                 .driver_data    = TYPE_S3C2440,
+        }, {
+                .name           = "s3c2440-hdmiphy-i2c",
+                .driver_data    = TYPE_S3C2440_HDMIPHY,
         }, { },
 };
 MODULE_DEVICE_TABLE(platform, s3c24xx_driver_ids);