kernel: update linux 3.2 to 3.2.15
[openwrt/svn-archive/archive.git] / target / linux / lantiq / patches-3.2 / 0014-MIPS-lantiq-fix-pull-gpio-up-resistors-usage.patch
1 From cf06a3358f752a7d1247498f1e9409b66b23a603 Mon Sep 17 00:00:00 2001
2 From: John Crispin <blogic@openwrt.org>
3 Date: Thu, 27 Oct 2011 20:06:30 +0200
4 Subject: [PATCH 14/73] MIPS: lantiq: fix pull gpio up resistors usage
5
6 The register that enables a gpios internal pullups was not used. This patch
7 makes sure the pullups are activated correctly.
8
9 Signed-off-by: Matti Laakso <malaakso@elisanet.fi>
10 Signed-off-by: John Crispin <blogic@openwrt.org>
11 ---
12 arch/mips/lantiq/xway/gpio.c | 6 ++++++
13 1 files changed, 6 insertions(+), 0 deletions(-)
14
15 --- a/arch/mips/lantiq/xway/gpio.c
16 +++ b/arch/mips/lantiq/xway/gpio.c
17 @@ -21,6 +21,8 @@
18 #define LTQ_GPIO_ALTSEL0 0x0C
19 #define LTQ_GPIO_ALTSEL1 0x10
20 #define LTQ_GPIO_OD 0x14
21 +#define LTQ_GPIO_PUDSEL 0x1C
22 +#define LTQ_GPIO_PUDEN 0x20
23
24 #define PINS_PER_PORT 16
25 #define MAX_PORTS 3
26 @@ -106,6 +108,8 @@ static int ltq_gpio_direction_input(stru
27
28 ltq_gpio_clearbit(ltq_gpio->membase, LTQ_GPIO_OD, offset);
29 ltq_gpio_clearbit(ltq_gpio->membase, LTQ_GPIO_DIR, offset);
30 + ltq_gpio_setbit(ltq_gpio->membase, LTQ_GPIO_PUDSEL, offset);
31 + ltq_gpio_setbit(ltq_gpio->membase, LTQ_GPIO_PUDEN, offset);
32
33 return 0;
34 }
35 @@ -117,6 +121,8 @@ static int ltq_gpio_direction_output(str
36
37 ltq_gpio_setbit(ltq_gpio->membase, LTQ_GPIO_OD, offset);
38 ltq_gpio_setbit(ltq_gpio->membase, LTQ_GPIO_DIR, offset);
39 + ltq_gpio_clearbit(ltq_gpio->membase, LTQ_GPIO_PUDSEL, offset);
40 + ltq_gpio_clearbit(ltq_gpio->membase, LTQ_GPIO_PUDEN, offset);
41 ltq_gpio_set(chip, offset, value);
42
43 return 0;