3 files changed, 5 insertions, 4 deletions

diff --git a/drivers/i2c/busses/i2c-designware-core.c b/drivers/i2c/busses/i2c-designware-core.c
index 71055114bd80..6195df3c1c29 100644
--- a/drivers/i2c/busses/i2c-designware-core.c
+++ b/drivers/i2c/busses/i2c-designware-core.c
@@ -143,7 +143,7 @@ static u32 i2c_dw_scl_lcnt(u32 ic_clk, u32 tLOW, u32 tf, int offset)
 int i2c_dw_init(struct dw_i2c_dev *dev)
 {
         u32 input_clock_khz;
-        u32 ic_con, hcnt, lcnt;
+        u32 hcnt, lcnt;
         u32 reg;
 
         input_clock_khz = dev->get_clk_rate_khz(dev);
@@ -199,9 +199,7 @@ int i2c_dw_init(struct dw_i2c_dev *dev)
         dw_writel(dev, 0, DW_IC_RX_TL);
 
         /* configure the i2c master */
-        ic_con = DW_IC_CON_MASTER | DW_IC_CON_SLAVE_DISABLE |
-                DW_IC_CON_RESTART_EN | DW_IC_CON_SPEED_FAST;
-        dw_writel(dev, ic_con, DW_IC_CON);
+        dw_writel(dev, dev->master_cfg , DW_IC_CON);
         return 0;
 }
 
diff --git a/drivers/i2c/busses/i2c-designware-core.h b/drivers/i2c/busses/i2c-designware-core.h
index ab4e655a6c61..29386215fe3c 100644
--- a/drivers/i2c/busses/i2c-designware-core.h
+++ b/drivers/i2c/busses/i2c-designware-core.h
@@ -183,6 +183,7 @@ struct dw_i2c_dev {
         int                     swab;
         struct i2c_adapter      adapter;
         u32                     functionality;
+        u32                     master_cfg;
         unsigned int            tx_fifo_depth;
         unsigned int            rx_fifo_depth;
 };
diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c
index 36db7a80cbb2..1258cae3555d 100644
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@ -103,6 +103,8 @@ static int __devinit dw_i2c_probe(struct platform_device *pdev)
                 I2C_FUNC_SMBUS_BYTE_DATA |
                 I2C_FUNC_SMBUS_WORD_DATA |
                 I2C_FUNC_SMBUS_I2C_BLOCK;
+        dev->master_cfg =  DW_IC_CON_MASTER | DW_IC_CON_SLAVE_DISABLE |
+                DW_IC_CON_RESTART_EN | DW_IC_CON_SPEED_FAST;
 
         dev->base = ioremap(mem->start, resource_size(mem));
         if (dev->base == NULL) {