diff options
author | John Crispin <blogic@openwrt.org> | 2013-03-14 18:42:29 +0000 |
---|---|---|
committer | John Crispin <blogic@openwrt.org> | 2013-03-14 18:42:29 +0000 |
commit | d5d3a4d87b61b8dfbc59df0670bdb028e8e69dd5 (patch) | |
tree | 1305b5b94ec649d510dfbd63ccedc77446db1517 /target/linux/lantiq/patches-3.8/0009-PINCTRL-lantiq-the-pinconf-OD-parameter-argument-was.patch | |
parent | b9be683c5c324cf79f805f5218b90f4d31b90646 (diff) | |
download | master-187ad058-d5d3a4d87b61b8dfbc59df0670bdb028e8e69dd5.tar.gz master-187ad058-d5d3a4d87b61b8dfbc59df0670bdb028e8e69dd5.tar.bz2 master-187ad058-d5d3a4d87b61b8dfbc59df0670bdb028e8e69dd5.zip |
[lantiq] bump to v3.8
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36014 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq/patches-3.8/0009-PINCTRL-lantiq-the-pinconf-OD-parameter-argument-was.patch')
-rw-r--r-- | target/linux/lantiq/patches-3.8/0009-PINCTRL-lantiq-the-pinconf-OD-parameter-argument-was.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/target/linux/lantiq/patches-3.8/0009-PINCTRL-lantiq-the-pinconf-OD-parameter-argument-was.patch b/target/linux/lantiq/patches-3.8/0009-PINCTRL-lantiq-the-pinconf-OD-parameter-argument-was.patch new file mode 100644 index 0000000000..ca546e7b4f --- /dev/null +++ b/target/linux/lantiq/patches-3.8/0009-PINCTRL-lantiq-the-pinconf-OD-parameter-argument-was.patch @@ -0,0 +1,33 @@ +From 879fe8a24167983d2923f635cb37dc9e02f6cf57 Mon Sep 17 00:00:00 2001 +From: John Crispin <blogic@openwrt.org> +Date: Wed, 30 Jan 2013 18:39:34 +0100 +Subject: [PATCH 09/40] PINCTRL: lantiq: the pinconf OD parameter argument was + ignored + +When setting the OpenDrain bit we should really honour the argument passed +inside the devicetree. + +Signed-off-by: John Crispin <blogic@openwrt.org> +--- + drivers/pinctrl/pinctrl-xway.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/drivers/pinctrl/pinctrl-xway.c b/drivers/pinctrl/pinctrl-xway.c +index b23b895..53cb6a3 100644 +--- a/drivers/pinctrl/pinctrl-xway.c ++++ b/drivers/pinctrl/pinctrl-xway.c +@@ -494,7 +494,10 @@ static int xway_pinconf_set(struct pinctrl_dev *pctldev, + reg = GPIO3_OD; + else + reg = GPIO_OD(pin); +- gpio_setbit(info->membase[0], reg, PORT_PIN(pin)); ++ if (arg == 0) ++ gpio_setbit(info->membase[0], reg, PORT_PIN(pin)); ++ else ++ gpio_clearbit(info->membase[0], reg, PORT_PIN(pin)); + break; + + case LTQ_PINCONF_PARAM_PULL: +-- +1.7.10.4 + |