kernel: update linux 3.9 to 3.9.8

[openwrt/svn-archive/archive.git] / target / linux / lantiq / patches-3.9 / 0022-PINCTRL-add-gpio_irq-support.patch

diff --git a/target/linux/lantiq/patches-3.9/0022-PINCTRL-add-gpio_irq-support.patch b/target/linux/lantiq/patches-3.9/0022-PINCTRL-add-gpio_irq-support.patch
index 223f78c3a37b95213d34c03981e7792a586c79c4..fd18e62c7386ae227e84959d453cbe3b2f1cd1a3 100644 (file)
--- a/target/linux/lantiq/patches-3.9/0022-PINCTRL-add-gpio_irq-support.patch
+++ b/target/linux/lantiq/patches-3.9/0022-PINCTRL-add-gpio_irq-support.patch
@@ -7,11 +7,9 @@ Subject: [PATCH 22/22] PINCTRL: add gpio_irq support
  drivers/pinctrl/pinctrl-xway.c |   28 ++++++++++++++++++++++++++--
  1 file changed, 26 insertions(+), 2 deletions(-)
 
  drivers/pinctrl/pinctrl-xway.c |   28 ++++++++++++++++++++++++++--
  1 file changed, 26 insertions(+), 2 deletions(-)
 

-diff --git a/drivers/pinctrl/pinctrl-xway.c b/drivers/pinctrl/pinctrl-xway.c
-index 068224e..8719d35 100644

 --- a/drivers/pinctrl/pinctrl-xway.c
 +++ b/drivers/pinctrl/pinctrl-xway.c
 --- a/drivers/pinctrl/pinctrl-xway.c
 +++ b/drivers/pinctrl/pinctrl-xway.c

-@@ -564,10 +564,9 @@ static struct pinctrl_desc xway_pctrl_desc = {
+@@ -564,10 +564,9 @@ static struct pinctrl_desc xway_pctrl_de

        .confops        = &xway_pinconf_ops,
  };
  
        .confops        = &xway_pinconf_ops,
  };
  


@@ -23,7 +21,7 @@ index 068224e..8719d35 100644
        int port = PORT(pin);
        u32 alt1_reg = GPIO_ALT1(pin);
  
        int port = PORT(pin);
        u32 alt1_reg = GPIO_ALT1(pin);
  

-@@ -587,6 +586,14 @@ static inline int xway_mux_apply(struct pinctrl_dev *pctrldev,
+@@ -587,6 +586,14 @@ static inline int xway_mux_apply(struct

        return 0;
  }
  
        return 0;
  }
  


@@ -38,7 +36,7 @@ index 068224e..8719d35 100644
  static const struct ltq_cfg_param xway_cfg_params[] = {
        {"lantiq,pull",         LTQ_PINCONF_PARAM_PULL},
        {"lantiq,open-drain",   LTQ_PINCONF_PARAM_OPEN_DRAIN},
  static const struct ltq_cfg_param xway_cfg_params[] = {
        {"lantiq,pull",         LTQ_PINCONF_PARAM_PULL},
        {"lantiq,open-drain",   LTQ_PINCONF_PARAM_OPEN_DRAIN},

-@@ -631,6 +638,10 @@ static int xway_gpio_dir_out(struct gpio_chip *chip, unsigned int pin, int val)
+@@ -631,6 +638,10 @@ static int xway_gpio_dir_out(struct gpio

  {
        struct ltq_pinmux_info *info = dev_get_drvdata(chip->dev);
  
  {
        struct ltq_pinmux_info *info = dev_get_drvdata(chip->dev);
  


@@ -49,7 +47,7 @@ index 068224e..8719d35 100644
        gpio_setbit(info->membase[0], GPIO_DIR(pin), PORT_PIN(pin));
        xway_gpio_set(chip, pin, val);
  
        gpio_setbit(info->membase[0], GPIO_DIR(pin), PORT_PIN(pin));
        xway_gpio_set(chip, pin, val);
  

-@@ -651,6 +662,18 @@ static void xway_gpio_free(struct gpio_chip *chip, unsigned offset)
+@@ -651,6 +662,18 @@ static void xway_gpio_free(struct gpio_c

        pinctrl_free_gpio(gpio);
  }
  
        pinctrl_free_gpio(gpio);
  }
  


@@ -76,6 +74,3 @@ index 068224e..8719d35 100644
        .base = -1,
  };
  
        .base = -1,
  };
  

--- 
-1.7.10.4
-