18c72cc4befa4ee4f2b280880c38fa368f9b627d
[openwrt.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 diff --git a/drivers/pinctrl/pinctrl-msm.c b/drivers/pinctrl/pinctrl-msm.c
16 index 91de8bc..19d2feb 100644
17 --- a/drivers/pinctrl/pinctrl-msm.c
18 +++ b/drivers/pinctrl/pinctrl-msm.c
19 @@ -214,6 +214,11 @@ static int msm_config_reg(struct msm_pinctrl *pctrl,
20                 *bit = g->drv_bit;
21                 *mask = 7;
22                 break;
23 +       case PIN_CONFIG_OUTPUT:
24 +               *reg = g->ctl_reg;
25 +               *bit = g->oe_bit;
26 +               *mask = 1;
27 +               break;
28         default:
29                 dev_err(pctrl->dev, "Invalid config param %04x\n", param);
30                 return -ENOTSUPP;
31 @@ -282,6 +287,14 @@ static int msm_config_group_get(struct pinctrl_dev *pctldev,
32         case PIN_CONFIG_DRIVE_STRENGTH:
33                 arg = msm_regval_to_drive(arg);
34                 break;
35 +       case PIN_CONFIG_OUTPUT:
36 +               /* Pin is not output */
37 +               if (!arg)
38 +                       return -EINVAL;
39 +
40 +               val = readl(pctrl->regs + g->io_reg);
41 +               arg = !!(val & BIT(g->in_bit));
42 +               break;
43         default:
44                 dev_err(pctrl->dev, "Unsupported config parameter: %x\n",
45                         param);
46 @@ -337,6 +350,20 @@ static int msm_config_group_set(struct pinctrl_dev *pctldev,
47                         else
48                                 arg = (arg / 2) - 1;
49                         break;
50 +               case PIN_CONFIG_OUTPUT:
51 +                       /* set output value */
52 +                       spin_lock_irqsave(&pctrl->lock, flags);
53 +                       val = readl(pctrl->regs + g->io_reg);
54 +                       if (arg)
55 +                               val |= BIT(g->out_bit);
56 +                       else
57 +                               val &= ~BIT(g->out_bit);
58 +                       writel(val, pctrl->regs + g->io_reg);
59 +                       spin_unlock_irqrestore(&pctrl->lock, flags);
60 +
61 +                       /* enable output */
62 +                       arg = 1;
63 +                       break;
64                 default:
65                         dev_err(pctrl->dev, "Unsupported config parameter: %x\n",
66                                 param);
67 -- 
68 1.7.10.4
69