3c1f6e358d
Patches are generated using the "format-patch" command from the following location: *https://www.codeaurora.org/cgit/quic/kernel/galak-msm/log/?h=apq_ipq_base *rev=0771849495b4128cac2faf7d49c85c729fc48b20 Patches numbered 76/77/102/103 have already been integrated in 3.14.12, so they're not in this list. All these patches are either integrated are pending integration into kernel.org, therefore these patches should go away once the kernel gets upgraded to 3.16. Support is currently limited to AP148 board but can be extended to other platforms in the future. These changes do not cover ethernet connectivity. Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org> SVN-Revision: 42334
67 lines
2.3 KiB
Diff
67 lines
2.3 KiB
Diff
From e34d9fdac8182f6ce8933501fea6e84664060bf0 Mon Sep 17 00:00:00 2001
|
|
From: Stephen Boyd <sboyd@codeaurora.org>
|
|
Date: Thu, 6 Mar 2014 22:44:44 -0800
|
|
Subject: [PATCH 030/182] pinctrl: msm: Replace lookup tables with math
|
|
|
|
We don't need to waste space with these lookup tables, just do
|
|
the math directly.
|
|
|
|
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
|
|
Acked-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
|
|
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
|
---
|
|
drivers/pinctrl/pinctrl-msm.c | 14 ++++++++------
|
|
1 file changed, 8 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/drivers/pinctrl/pinctrl-msm.c b/drivers/pinctrl/pinctrl-msm.c
|
|
index 4474e00..87f6c3c 100644
|
|
--- a/drivers/pinctrl/pinctrl-msm.c
|
|
+++ b/drivers/pinctrl/pinctrl-msm.c
|
|
@@ -258,8 +258,10 @@ static int msm_config_set(struct pinctrl_dev *pctldev, unsigned int pin,
|
|
#define MSM_PULL_DOWN 1
|
|
#define MSM_PULL_UP 3
|
|
|
|
-static const unsigned msm_regval_to_drive[] = { 2, 4, 6, 8, 10, 12, 14, 16 };
|
|
-static const unsigned msm_drive_to_regval[] = { -1, -1, 0, -1, 1, -1, 2, -1, 3, -1, 4, -1, 5, -1, 6, -1, 7 };
|
|
+static unsigned msm_regval_to_drive(u32 val)
|
|
+{
|
|
+ return (val + 1) * 2;
|
|
+}
|
|
|
|
static int msm_config_group_get(struct pinctrl_dev *pctldev,
|
|
unsigned int group,
|
|
@@ -296,7 +298,7 @@ static int msm_config_group_get(struct pinctrl_dev *pctldev,
|
|
arg = arg == MSM_PULL_UP;
|
|
break;
|
|
case PIN_CONFIG_DRIVE_STRENGTH:
|
|
- arg = msm_regval_to_drive[arg];
|
|
+ arg = msm_regval_to_drive(arg);
|
|
break;
|
|
default:
|
|
dev_err(pctrl->dev, "Unsupported config parameter: %x\n",
|
|
@@ -349,10 +351,10 @@ static int msm_config_group_set(struct pinctrl_dev *pctldev,
|
|
break;
|
|
case PIN_CONFIG_DRIVE_STRENGTH:
|
|
/* Check for invalid values */
|
|
- if (arg >= ARRAY_SIZE(msm_drive_to_regval))
|
|
+ if (arg > 16 || arg < 2 || (arg % 2) != 0)
|
|
arg = -1;
|
|
else
|
|
- arg = msm_drive_to_regval[arg];
|
|
+ arg = (arg / 2) - 1;
|
|
break;
|
|
default:
|
|
dev_err(pctrl->dev, "Unsupported config parameter: %x\n",
|
|
@@ -531,7 +533,7 @@ static void msm_gpio_dbg_show_one(struct seq_file *s,
|
|
pull = (ctl_reg >> g->pull_bit) & 3;
|
|
|
|
seq_printf(s, " %-8s: %-3s %d", g->name, is_out ? "out" : "in", func);
|
|
- seq_printf(s, " %dmA", msm_regval_to_drive[drive]);
|
|
+ seq_printf(s, " %dmA", msm_regval_to_drive(drive));
|
|
seq_printf(s, " %s", pulls[pull]);
|
|
}
|
|
|
|
--
|
|
1.7.10.4
|
|
|