diff options
Diffstat (limited to 'drivers/i2c/busses/i2c-pxa.c')
-rw-r--r-- | drivers/i2c/busses/i2c-pxa.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index 518b57c795c8..8b38ed0379d5 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c | |||
@@ -66,7 +66,8 @@ struct pxa_i2c { | |||
66 | unsigned long iosize; | 66 | unsigned long iosize; |
67 | 67 | ||
68 | int irq; | 68 | int irq; |
69 | int use_pio; | 69 | unsigned int use_pio :1; |
70 | unsigned int fast_mode :1; | ||
70 | }; | 71 | }; |
71 | 72 | ||
72 | #define _IBMR(i2c) ((i2c)->reg_base + (0x0 << (i2c)->reg_shift)) | 73 | #define _IBMR(i2c) ((i2c)->reg_base + (0x0 << (i2c)->reg_shift)) |
@@ -366,7 +367,7 @@ static void i2c_pxa_reset(struct pxa_i2c *i2c) | |||
366 | writel(i2c->slave_addr, _ISAR(i2c)); | 367 | writel(i2c->slave_addr, _ISAR(i2c)); |
367 | 368 | ||
368 | /* set control register values */ | 369 | /* set control register values */ |
369 | writel(I2C_ICR_INIT, _ICR(i2c)); | 370 | writel(I2C_ICR_INIT | (i2c->fast_mode ? ICR_FM : 0), _ICR(i2c)); |
370 | 371 | ||
371 | #ifdef CONFIG_I2C_PXA_SLAVE | 372 | #ifdef CONFIG_I2C_PXA_SLAVE |
372 | dev_info(&i2c->adap.dev, "Enabling slave mode\n"); | 373 | dev_info(&i2c->adap.dev, "Enabling slave mode\n"); |
@@ -1010,6 +1011,7 @@ static int i2c_pxa_probe(struct platform_device *dev) | |||
1010 | if (plat) { | 1011 | if (plat) { |
1011 | i2c->adap.class = plat->class; | 1012 | i2c->adap.class = plat->class; |
1012 | i2c->use_pio = plat->use_pio; | 1013 | i2c->use_pio = plat->use_pio; |
1014 | i2c->fast_mode = plat->fast_mode; | ||
1013 | } | 1015 | } |
1014 | 1016 | ||
1015 | if (i2c->use_pio) { | 1017 | if (i2c->use_pio) { |