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/0012-pinctrl-lantiq-fix-up-pinmux.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/0012-pinctrl-lantiq-fix-up-pinmux.patch')
| -rw-r--r-- | target/linux/lantiq/patches-4.1/0012-pinctrl-lantiq-fix-up-pinmux.patch | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/target/linux/lantiq/patches-4.1/0012-pinctrl-lantiq-fix-up-pinmux.patch b/target/linux/lantiq/patches-4.1/0012-pinctrl-lantiq-fix-up-pinmux.patch index ecd143f91f..8a5d270b09 100644 --- a/target/linux/lantiq/patches-4.1/0012-pinctrl-lantiq-fix-up-pinmux.patch +++ b/target/linux/lantiq/patches-4.1/0012-pinctrl-lantiq-fix-up-pinmux.patch @@ -39,18 +39,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> 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 - { - 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_c +@@ -696,6 +703,18 @@ static void xway_gpio_free(struct gpio_c pinctrl_free_gpio(gpio); } @@ -69,7 +58,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> 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 = { +@@ -704,6 +723,7 @@ static struct gpio_chip xway_chip = { .set = xway_gpio_set, .request = xway_gpio_req, .free = xway_gpio_free, |