diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2016-01-17 19:54:59 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2016-01-17 19:54:59 +0000 |
| commit | 31145eff28cb929b3bc00781622dcc6596952f6c (patch) | |
| tree | 314f2f41bb990867d6ac548ff2a89147811e6d91 /target/linux/lantiq/patches-4.1/0045-pinctrl-lantiq-Fix-GPIO-Setup-of-GPIO-Port3.patch | |
| parent | 5d59da0548d89c2c4c32f0cc5cd5657072643f95 (diff) | |
| download | master-187ad058-31145eff28cb929b3bc00781622dcc6596952f6c.tar.gz master-187ad058-31145eff28cb929b3bc00781622dcc6596952f6c.tar.bz2 master-187ad058-31145eff28cb929b3bc00781622dcc6596952f6c.zip | |
lantiq: Backport upstream pinctrl-xway patches from 4.5
Upstream commit be14811c03cf2 "pinctrl/lantiq: introduce new dedicated
devicetree bindings" allows us to use each pin in the pinmux. This is
useful for example in the "spi" group which contains some pins which
are inputs, and some which are outputs.
These can only be used once the new compatible strings for the pinctrl
node are used.
Additionally 0150-lantiq-pinctrl-xway.patch and the "GPIO PORT3 fix"
(which was part of 0012-pinctrl-lantiq-fix-up-pinmux.patch) were
replaced with their upstream variants which are also in 4.5.
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48283 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq/patches-4.1/0045-pinctrl-lantiq-Fix-GPIO-Setup-of-GPIO-Port3.patch')
| -rw-r--r-- | target/linux/lantiq/patches-4.1/0045-pinctrl-lantiq-Fix-GPIO-Setup-of-GPIO-Port3.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/target/linux/lantiq/patches-4.1/0045-pinctrl-lantiq-Fix-GPIO-Setup-of-GPIO-Port3.patch b/target/linux/lantiq/patches-4.1/0045-pinctrl-lantiq-Fix-GPIO-Setup-of-GPIO-Port3.patch new file mode 100644 index 0000000000..a5f92ee58e --- /dev/null +++ b/target/linux/lantiq/patches-4.1/0045-pinctrl-lantiq-Fix-GPIO-Setup-of-GPIO-Port3.patch @@ -0,0 +1,28 @@ +From 57b588c950b7e04e0f22393ad439299ba4fda9c3 Mon Sep 17 00:00:00 2001 +From: John Crispin <blogic@openwrt.org> +Date: Thu, 26 Nov 2015 11:00:09 +0100 +Subject: [PATCH] pinctrl/lantiq: Fix GPIO Setup of GPIO Port3 + +Some special handling of GPIO Port 3 is needed because of +some hardware thingofabob. + +Signed-off-by: John Crispin <blogic@openwrt.org> +Signed-off-by: Martin Schiller <mschiller@tdt.de> +Signed-off-by: Linus Walleij <linus.walleij@linaro.org> +--- + drivers/pinctrl/pinctrl-xway.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/pinctrl/pinctrl-xway.c ++++ b/drivers/pinctrl/pinctrl-xway.c +@@ -1570,6 +1570,10 @@ static int xway_gpio_dir_out(struct gpio + { + 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); + |