[lantiq] bump to v3.8
[openwrt.git] / target / linux / lantiq / patches-3.8 / 0008-PINCTRL-lantiq-add-output-pinconf-parameter.patch
1 From f9441b4f98b5b28f3d2cbebd0a70b227c35451d9 Mon Sep 17 00:00:00 2001
2 From: John Crispin <blogic@openwrt.org>
3 Date: Wed, 30 Jan 2013 18:33:39 +0100
4 Subject: [PATCH 08/40] PINCTRL: lantiq: add output pinconf parameter
5
6 While converting the boards inside OpenWrt to OF I noticed that the we are
7 missing a pinconf parameter to set a pin to output.
8
9 Signed-off-by: John Crispin <blogic@openwrt.org>
10 ---
11  drivers/pinctrl/pinctrl-lantiq.h |    1 +
12  drivers/pinctrl/pinctrl-xway.c   |   14 ++++++++++++++
13  2 files changed, 15 insertions(+)
14
15 diff --git a/drivers/pinctrl/pinctrl-lantiq.h b/drivers/pinctrl/pinctrl-lantiq.h
16 index 4419d32..6d07f02 100644
17 --- a/drivers/pinctrl/pinctrl-lantiq.h
18 +++ b/drivers/pinctrl/pinctrl-lantiq.h
19 @@ -34,6 +34,7 @@ enum ltq_pinconf_param {
20         LTQ_PINCONF_PARAM_OPEN_DRAIN,
21         LTQ_PINCONF_PARAM_DRIVE_CURRENT,
22         LTQ_PINCONF_PARAM_SLEW_RATE,
23 +       LTQ_PINCONF_PARAM_OUTPUT,
24  };
25  
26  struct ltq_cfg_param {
27 diff --git a/drivers/pinctrl/pinctrl-xway.c b/drivers/pinctrl/pinctrl-xway.c
28 index aa4c8b8..b23b895 100644
29 --- a/drivers/pinctrl/pinctrl-xway.c
30 +++ b/drivers/pinctrl/pinctrl-xway.c
31 @@ -466,6 +466,11 @@ static int xway_pinconf_get(struct pinctrl_dev *pctldev,
32                         *config = LTQ_PINCONF_PACK(param, 1);
33                 break;
34  
35 +       case LTQ_PINCONF_PARAM_OUTPUT:
36 +               reg = GPIO_DIR(pin);
37 +               *config = LTQ_PINCONF_PACK(param,
38 +                       gpio_getbit(info->membase[0], reg, PORT_PIN(pin)));
39 +               break;
40         default:
41                 dev_err(pctldev->dev, "Invalid config param %04x\n", param);
42                 return -ENOTSUPP;
43 @@ -515,6 +520,14 @@ static int xway_pinconf_set(struct pinctrl_dev *pctldev,
44                         dev_err(pctldev->dev, "Invalid pull value %d\n", arg);
45                 break;
46  
47 +       case LTQ_PINCONF_PARAM_OUTPUT:
48 +               reg = GPIO_DIR(pin);
49 +               if (arg == 0)
50 +                       gpio_clearbit(info->membase[0], reg, PORT_PIN(pin));
51 +               else
52 +                       gpio_setbit(info->membase[0], reg, PORT_PIN(pin));
53 +               break;
54 +
55         default:
56                 dev_err(pctldev->dev, "Invalid config param %04x\n", param);
57                 return -ENOTSUPP;
58 @@ -573,6 +586,7 @@ static inline int xway_mux_apply(struct pinctrl_dev *pctrldev,
59  static const struct ltq_cfg_param xway_cfg_params[] = {
60         {"lantiq,pull",         LTQ_PINCONF_PARAM_PULL},
61         {"lantiq,open-drain",   LTQ_PINCONF_PARAM_OPEN_DRAIN},
62 +       {"lantiq,output",       LTQ_PINCONF_PARAM_OUTPUT},
63  };
64  
65  static struct ltq_pinmux_info xway_info = {
66 -- 
67 1.7.10.4
68