diff options
Diffstat (limited to 'drivers/i2c')
-rw-r--r-- | drivers/i2c/busses/i2c-s3c2410.c | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index 5b7f95641ba4..9d797561de5f 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c | |||
@@ -663,6 +663,23 @@ static int s3c24xx_i2c_clockrate(struct s3c24xx_i2c *i2c, unsigned int *got) | |||
663 | 663 | ||
664 | writel(iiccon, i2c->regs + S3C2410_IICCON); | 664 | writel(iiccon, i2c->regs + S3C2410_IICCON); |
665 | 665 | ||
666 | if (s3c24xx_i2c_is2440(i2c)) { | ||
667 | unsigned long sda_delay; | ||
668 | |||
669 | if (pdata->sda_delay) { | ||
670 | sda_delay = (freq / 1000) * pdata->sda_delay; | ||
671 | sda_delay /= 1000000; | ||
672 | sda_delay = DIV_ROUND_UP(sda_delay, 5); | ||
673 | if (sda_delay > 3) | ||
674 | sda_delay = 3; | ||
675 | sda_delay |= S3C2410_IICLC_FILTER_ON; | ||
676 | } else | ||
677 | sda_delay = 0; | ||
678 | |||
679 | dev_dbg(i2c->dev, "IICLC=%08lx\n", sda_delay); | ||
680 | writel(sda_delay, i2c->regs + S3C2440_IICLC); | ||
681 | } | ||
682 | |||
666 | return 0; | 683 | return 0; |
667 | } | 684 | } |
668 | 685 | ||
@@ -769,11 +786,8 @@ static int s3c24xx_i2c_init(struct s3c24xx_i2c *i2c) | |||
769 | 786 | ||
770 | /* check for s3c2440 i2c controller */ | 787 | /* check for s3c2440 i2c controller */ |
771 | 788 | ||
772 | if (s3c24xx_i2c_is2440(i2c)) { | 789 | if (s3c24xx_i2c_is2440(i2c)) |
773 | dev_dbg(i2c->dev, "S3C2440_IICLC=%08x\n", pdata->sda_delay); | 790 | writel(0x0, i2c->regs + S3C2440_IICLC); |
774 | |||
775 | writel(pdata->sda_delay, i2c->regs + S3C2440_IICLC); | ||
776 | } | ||
777 | 791 | ||
778 | return 0; | 792 | return 0; |
779 | } | 793 | } |