aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq/patches-3.14/0009-pinctrl-lantiq-fix-up-pinmux.patch
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-09-11 17:49:57 +0000
committerJohn Crispin <john@openwrt.org>2014-09-11 17:49:57 +0000
commit18b5d72d834b1a4fb3c7daa2fab9f449ff55b1c1 (patch)
tree9055eb556a99fb07f30d3217fe2fdd60b51ca72c /target/linux/lantiq/patches-3.14/0009-pinctrl-lantiq-fix-up-pinmux.patch
parent5920eac8eeba0d689c7af9389aea2e2f46eec9ce (diff)
downloadupstream-18b5d72d834b1a4fb3c7daa2fab9f449ff55b1c1.tar.gz
upstream-18b5d72d834b1a4fb3c7daa2fab9f449ff55b1c1.tar.bz2
upstream-18b5d72d834b1a4fb3c7daa2fab9f449ff55b1c1.zip
lantiq: update 3.14 patches
Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 42476
Diffstat (limited to 'target/linux/lantiq/patches-3.14/0009-pinctrl-lantiq-fix-up-pinmux.patch')
-rw-r--r--target/linux/lantiq/patches-3.14/0009-pinctrl-lantiq-fix-up-pinmux.patch84
1 files changed, 0 insertions, 84 deletions
diff --git a/target/linux/lantiq/patches-3.14/0009-pinctrl-lantiq-fix-up-pinmux.patch b/target/linux/lantiq/patches-3.14/0009-pinctrl-lantiq-fix-up-pinmux.patch
deleted file mode 100644
index 267c89860c..0000000000
--- a/target/linux/lantiq/patches-3.14/0009-pinctrl-lantiq-fix-up-pinmux.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 29452de974f2cdc87876dbdc18a16405ef80c05f Mon Sep 17 00:00:00 2001
-From: John Crispin <blogic@openwrt.org>
-Date: Fri, 9 Aug 2013 20:38:15 +0200
-Subject: [PATCH 09/31] pinctrl/lantiq: fix up pinmux
-
-We found out how to set the gphy led pinmuxing.
-
-Signed-off-by: John Crispin <blogic@openwrt.org>
----
- 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 e66f4ca..b5f43c8 100644
---- a/drivers/pinctrl/pinctrl-xway.c
-+++ b/drivers/pinctrl/pinctrl-xway.c
-@@ -609,10 +609,9 @@ static struct pinctrl_desc xway_pctrl_desc = {
- .confops = &xway_pinconf_ops,
- };
-
--static inline int xway_mux_apply(struct pinctrl_dev *pctrldev,
-+static int mux_apply(struct ltq_pinmux_info *info,
- int pin, int mux)
- {
-- struct ltq_pinmux_info *info = pinctrl_dev_get_drvdata(pctrldev);
- int port = PORT(pin);
- u32 alt1_reg = GPIO_ALT1(pin);
-
-@@ -632,6 +631,14 @@ static inline int xway_mux_apply(struct pinctrl_dev *pctrldev,
- return 0;
- }
-
-+static inline int xway_mux_apply(struct pinctrl_dev *pctrldev,
-+ int pin, int mux)
-+{
-+ struct ltq_pinmux_info *info = pinctrl_dev_get_drvdata(pctrldev);
-+
-+ return mux_apply(info, pin, mux);
-+}
-+
- static const struct ltq_cfg_param xway_cfg_params[] = {
- {"lantiq,pull", LTQ_PINCONF_PARAM_PULL},
- {"lantiq,open-drain", LTQ_PINCONF_PARAM_OPEN_DRAIN},
-@@ -676,6 +683,10 @@ static int xway_gpio_dir_out(struct gpio_chip *chip, unsigned int pin, int val)
- {
- struct ltq_pinmux_info *info = dev_get_drvdata(chip->dev);
-
-+ if (PORT(pin) == PORT3)
-+ gpio_setbit(info->membase[0], GPIO3_OD, PORT_PIN(pin));
-+ else
-+ gpio_setbit(info->membase[0], GPIO_OD(pin), PORT_PIN(pin));
- gpio_setbit(info->membase[0], GPIO_DIR(pin), PORT_PIN(pin));
- xway_gpio_set(chip, pin, val);
-
-@@ -696,6 +707,18 @@ static void xway_gpio_free(struct gpio_chip *chip, unsigned offset)
- pinctrl_free_gpio(gpio);
- }
-
-+static int xway_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
-+{
-+ struct ltq_pinmux_info *info = dev_get_drvdata(chip->dev);
-+ int i;
-+
-+ for (i = 0; i < info->num_exin; i++)
-+ if (info->exin[i] == offset)
-+ return ltq_eiu_get_irq(i);
-+
-+ return -1;
-+}
-+
- static struct gpio_chip xway_chip = {
- .label = "gpio-xway",
- .direction_input = xway_gpio_dir_in,
-@@ -704,6 +727,7 @@ static struct gpio_chip xway_chip = {
- .set = xway_gpio_set,
- .request = xway_gpio_req,
- .free = xway_gpio_free,
-+ .to_irq = xway_gpio_to_irq,
- .base = -1,
- };
-
---
-1.7.10.4
-