target/linux/ipq806x/patches/0030-pinctrl-msm-Replace-lookup-tables-with-math.patch

   1 From e34d9fdac8182f6ce8933501fea6e84664060bf0 Mon Sep 17 00:00:00 2001
   2 From: Stephen Boyd <sboyd@codeaurora.org>
   3 Date: Thu, 6 Mar 2014 22:44:44 -0800
   4 Subject: [PATCH 030/182] pinctrl: msm: Replace lookup tables with math
   5
   6 We don't need to waste space with these lookup tables, just do
   7 the math directly.
   8
   9 Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
  10 Acked-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
  11 Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  12 ---
  13  drivers/pinctrl/pinctrl-msm.c |   14 ++++++++------
  14  1 file changed, 8 insertions(+), 6 deletions(-)
  15
  16 diff --git a/drivers/pinctrl/pinctrl-msm.c b/drivers/pinctrl/pinctrl-msm.c
  17 index 4474e00..87f6c3c 100644
  18 --- a/drivers/pinctrl/pinctrl-msm.c
  19 +++ b/drivers/pinctrl/pinctrl-msm.c
  20 @@ -258,8 +258,10 @@ static int msm_config_set(struct pinctrl_dev *pctldev, unsigned int pin,
  21  #define MSM_PULL_DOWN  1
  22  #define MSM_PULL_UP    3
  23
  24 -static const unsigned msm_regval_to_drive[] = { 2, 4, 6, 8, 10, 12, 14, 16 };
  25 -static const unsigned msm_drive_to_regval[] = { -1, -1, 0, -1, 1, -1, 2, -1, 3, -1, 4, -1, 5, -1, 6, -1, 7 };
  26 +static unsigned msm_regval_to_drive(u32 val)
  27 +{
  28 +       return (val + 1) * 2;
  29 +}
  30
  31  static int msm_config_group_get(struct pinctrl_dev *pctldev,
  32                                 unsigned int group,
  33 @@ -296,7 +298,7 @@ static int msm_config_group_get(struct pinctrl_dev *pctldev,
  34                 arg = arg == MSM_PULL_UP;
  35                 break;
  36         case PIN_CONFIG_DRIVE_STRENGTH:
  37 -               arg = msm_regval_to_drive[arg];
  38 +               arg = msm_regval_to_drive(arg);
  39                 break;
  40         default:
  41                 dev_err(pctrl->dev, "Unsupported config parameter: %x\n",
  42 @@ -349,10 +351,10 @@ static int msm_config_group_set(struct pinctrl_dev *pctldev,
  43                         break;
  44                 case PIN_CONFIG_DRIVE_STRENGTH:
  45                         /* Check for invalid values */
  46 -                       if (arg >= ARRAY_SIZE(msm_drive_to_regval))
  47 +                       if (arg > 16 || arg < 2 || (arg % 2) != 0)
  48                                 arg = -1;
  49                         else
  50 -                               arg = msm_drive_to_regval[arg];
  51 +                               arg = (arg / 2) - 1;
  52                         break;
  53                 default:
  54                         dev_err(pctrl->dev, "Unsupported config parameter: %x\n",
  55 @@ -531,7 +533,7 @@ static void msm_gpio_dbg_show_one(struct seq_file *s,
  56         pull = (ctl_reg >> g->pull_bit) & 3;
  57
  58         seq_printf(s, " %-8s: %-3s %d", g->name, is_out ? "out" : "in", func);
  59 -       seq_printf(s, " %dmA", msm_regval_to_drive[drive]);
  60 +       seq_printf(s, " %dmA", msm_regval_to_drive(drive));
  61         seq_printf(s, " %s", pulls[pull]);
  62  }
  63
  64 --
  65 1.7.10.4
  66