diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2009-04-15 13:56:08 +0200 |
|---|---|---|
| committer | Eric Miao <eric.miao@marvell.com> | 2009-04-19 21:57:10 +0800 |
| commit | a48dc30da44769ea3f3562c18f54878a9a3e78a1 (patch) | |
| tree | 7d7d36b473b0c2eb1a5918f26009b69647f334eb /arch | |
| parent | e91fb9137dd235ab959d7675d0e4104974dad5eb (diff) | |
| download | kernel_samsung_aries-a48dc30da44769ea3f3562c18f54878a9a3e78a1.zip kernel_samsung_aries-a48dc30da44769ea3f3562c18f54878a9a3e78a1.tar.gz kernel_samsung_aries-a48dc30da44769ea3f3562c18f54878a9a3e78a1.tar.bz2 | |
[ARM] pxa/pcm990: start external GPIOs immediately after built-in ones
As a result of an off-by-1 error pcm990 leaves one unused GPIO number between
built-in GPIOs and the pca9536 extender. Fix it.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-pxa/pcm990-baseboard.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/pcm990-baseboard.c b/arch/arm/mach-pxa/pcm990-baseboard.c index 6112740..6c12b5a 100644 --- a/arch/arm/mach-pxa/pcm990-baseboard.c +++ b/arch/arm/mach-pxa/pcm990-baseboard.c @@ -377,7 +377,7 @@ struct pxacamera_platform_data pcm990_pxacamera_platform_data = { #include <linux/i2c/pca953x.h> static struct pca953x_platform_data pca9536_data = { - .gpio_base = NR_BUILTIN_GPIO + 1, + .gpio_base = NR_BUILTIN_GPIO, }; static int gpio_bus_switch; @@ -405,9 +405,9 @@ static unsigned long pcm990_camera_query_bus_param(struct soc_camera_link *link) int ret; if (!gpio_bus_switch) { - ret = gpio_request(NR_BUILTIN_GPIO + 1, "camera"); + ret = gpio_request(NR_BUILTIN_GPIO, "camera"); if (!ret) { - gpio_bus_switch = NR_BUILTIN_GPIO + 1; + gpio_bus_switch = NR_BUILTIN_GPIO; gpio_direction_output(gpio_bus_switch, 0); } else gpio_bus_switch = -EINVAL; |