i2c: imx: use struct representing i2c clk{div, val} pair

using struct representing the i2c clk{div, val} pair would
make the i2c_clk_div array more clear.

Signed-off-by: Jingchang Lu <b35083@freescale.com>
Reviewed-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
index e24279725d363acb594e452b53b788a10058026d..9167d4332d7773a83d742cfd0f29ab0044ba74d8 100644 (file)
--- a/drivers/i2c/busses/i2c-imx.c
+++ b/drivers/i2c/busses/i2c-imx.c
@@ -30,6 +30,8 @@
  *     Copyright (C) 2007 RightHand Technologies, Inc.
  *     Copyright (C) 2008 Darius Augulis <darius.augulis at teltonika.lt>
  *
+ *     Copyright 2013 Freescale Semiconductor, Inc.
+ *
  */
 
 /** Includes *******************************************************************
@@ -95,8 +97,12 @@
  *
  * Duplicated divider values removed from list
  */
+struct imx_i2c_clk_pair {
+       u16     div;
+       u16     val;
+};
 
-static u16 __initdata i2c_clk_div[50][2] = {
+static struct imx_i2c_clk_pair __initdata i2c_clk_div[] = {
        { 22,   0x20 }, { 24,   0x21 }, { 26,   0x22 }, { 28,   0x23 },
        { 30,   0x00 }, { 32,   0x24 }, { 36,   0x25 }, { 40,   0x26 },
        { 42,   0x03 }, { 44,   0x27 }, { 48,   0x28 }, { 52,   0x05 },
@@ -274,15 +280,15 @@ static void __init i2c_imx_set_clk(struct imx_i2c_struct *i2c_imx,
        /* Divider value calculation */
        i2c_clk_rate = clk_get_rate(i2c_imx->clk);
        div = (i2c_clk_rate + rate - 1) / rate;
-       if (div < i2c_clk_div[0][0])
+       if (div < i2c_clk_div[0].div)
                i = 0;
-       else if (div > i2c_clk_div[ARRAY_SIZE(i2c_clk_div) - 1][0])
+       else if (div > i2c_clk_div[ARRAY_SIZE(i2c_clk_div) - 1].div)
                i = ARRAY_SIZE(i2c_clk_div) - 1;
        else
-               for (i = 0; i2c_clk_div[i][0] < div; i++);
+               for (i = 0; i2c_clk_div[i].div < div; i++);
 
        /* Store divider value */
-       i2c_imx->ifdr = i2c_clk_div[i][1];
+       i2c_imx->ifdr = i2c_clk_div[i].val;
 
        /*
         * There dummy delay is calculated.
@@ -290,7 +296,7 @@ static void __init i2c_imx_set_clk(struct imx_i2c_struct *i2c_imx,
         * This delay is used in I2C bus disable function
         * to fix chip hardware bug.
         */
-       i2c_imx->disable_delay = (500000U * i2c_clk_div[i][0]
+       i2c_imx->disable_delay = (500000U * i2c_clk_div[i].div
                + (i2c_clk_rate / 2) - 1) / (i2c_clk_rate / 2);
 
        /* dev_dbg() can't be used, because adapter is not yet registered */
@@ -298,7 +304,7 @@ static void __init i2c_imx_set_clk(struct imx_i2c_struct *i2c_imx,
        dev_dbg(&i2c_imx->adapter.dev, "<%s> I2C_CLK=%d, REQ DIV=%d\n",
                __func__, i2c_clk_rate, div);
        dev_dbg(&i2c_imx->adapter.dev, "<%s> IFDR[IC]=0x%x, REAL DIV=%d\n",
-               __func__, i2c_clk_div[i][1], i2c_clk_div[i][0]);
+               __func__, i2c_clk_div[i].val, i2c_clk_div[i].div);
 #endif
 }