kernel: update 3.14 to 3.14.18
[openwrt/staging/jow.git] / target / linux / ipq806x / patches / 0033-pinctrl-msm-Support-output-high-low-configuration.patch
1 From 469f83e0ed374250be5fd6202ac535276a752fa8 Mon Sep 17 00:00:00 2001
2 From: Bjorn Andersson <bjorn@kryo.se>
3 Date: Tue, 4 Feb 2014 19:55:31 -0800
4 Subject: [PATCH 033/182] pinctrl-msm: Support output-{high,low} configuration
5
6 Add support for configuring pins as output with value as from the
7 pinconf-generic interface.
8
9 Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
10 Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 ---
12 drivers/pinctrl/pinctrl-msm.c | 27 +++++++++++++++++++++++++++
13 1 file changed, 27 insertions(+)
14
15 --- a/drivers/pinctrl/pinctrl-msm.c
16 +++ b/drivers/pinctrl/pinctrl-msm.c
17 @@ -214,6 +214,11 @@ static int msm_config_reg(struct msm_pin
18 *bit = g->drv_bit;
19 *mask = 7;
20 break;
21 + case PIN_CONFIG_OUTPUT:
22 + *reg = g->ctl_reg;
23 + *bit = g->oe_bit;
24 + *mask = 1;
25 + break;
26 default:
27 dev_err(pctrl->dev, "Invalid config param %04x\n", param);
28 return -ENOTSUPP;
29 @@ -282,6 +287,14 @@ static int msm_config_group_get(struct p
30 case PIN_CONFIG_DRIVE_STRENGTH:
31 arg = msm_regval_to_drive(arg);
32 break;
33 + case PIN_CONFIG_OUTPUT:
34 + /* Pin is not output */
35 + if (!arg)
36 + return -EINVAL;
37 +
38 + val = readl(pctrl->regs + g->io_reg);
39 + arg = !!(val & BIT(g->in_bit));
40 + break;
41 default:
42 dev_err(pctrl->dev, "Unsupported config parameter: %x\n",
43 param);
44 @@ -337,6 +350,20 @@ static int msm_config_group_set(struct p
45 else
46 arg = (arg / 2) - 1;
47 break;
48 + case PIN_CONFIG_OUTPUT:
49 + /* set output value */
50 + spin_lock_irqsave(&pctrl->lock, flags);
51 + val = readl(pctrl->regs + g->io_reg);
52 + if (arg)
53 + val |= BIT(g->out_bit);
54 + else
55 + val &= ~BIT(g->out_bit);
56 + writel(val, pctrl->regs + g->io_reg);
57 + spin_unlock_irqrestore(&pctrl->lock, flags);
58 +
59 + /* enable output */
60 + arg = 1;
61 + break;
62 default:
63 dev_err(pctrl->dev, "Unsupported config parameter: %x\n",
64 param);