aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-pxa/pcm990-baseboard.c')
-rw-r--r--arch/arm/mach-pxa/pcm990-baseboard.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/arch/arm/mach-pxa/pcm990-baseboard.c b/arch/arm/mach-pxa/pcm990-baseboard.c
index 6d5b7e062124..abab4e2b122c 100644
--- a/arch/arm/mach-pxa/pcm990-baseboard.c
+++ b/arch/arm/mach-pxa/pcm990-baseboard.c
@@ -19,7 +19,7 @@
19 * it under the terms of the GNU General Public License version 2 as 19 * it under the terms of the GNU General Public License version 2 as
20 * published by the Free Software Foundation. 20 * published by the Free Software Foundation.
21 */ 21 */
22 22#include <linux/gpio.h>
23#include <linux/irq.h> 23#include <linux/irq.h>
24#include <linux/platform_device.h> 24#include <linux/platform_device.h>
25#include <linux/i2c.h> 25#include <linux/i2c.h>
@@ -28,7 +28,6 @@
28 28
29#include <media/soc_camera.h> 29#include <media/soc_camera.h>
30 30
31#include <asm/gpio.h>
32#include <mach/camera.h> 31#include <mach/camera.h>
33#include <asm/mach/map.h> 32#include <asm/mach/map.h>
34#include <mach/pxa27x.h> 33#include <mach/pxa27x.h>
@@ -379,7 +378,7 @@ struct pxacamera_platform_data pcm990_pxacamera_platform_data = {
379#include <linux/i2c/pca953x.h> 378#include <linux/i2c/pca953x.h>
380 379
381static struct pca953x_platform_data pca9536_data = { 380static struct pca953x_platform_data pca9536_data = {
382 .gpio_base = NR_BUILTIN_GPIO, 381 .gpio_base = PXA_NR_BUILTIN_GPIO,
383}; 382};
384 383
385static int gpio_bus_switch = -EINVAL; 384static int gpio_bus_switch = -EINVAL;
@@ -395,9 +394,9 @@ static int pcm990_camera_set_bus_param(struct soc_camera_link *link,
395 } 394 }
396 395
397 if (flags & SOCAM_DATAWIDTH_8) 396 if (flags & SOCAM_DATAWIDTH_8)
398 gpio_set_value(gpio_bus_switch, 1); 397 gpio_set_value_cansleep(gpio_bus_switch, 1);
399 else 398 else
400 gpio_set_value(gpio_bus_switch, 0); 399 gpio_set_value_cansleep(gpio_bus_switch, 0);
401 400
402 return 0; 401 return 0;
403} 402}
@@ -407,9 +406,9 @@ static unsigned long pcm990_camera_query_bus_param(struct soc_camera_link *link)
407 int ret; 406 int ret;
408 407
409 if (gpio_bus_switch < 0) { 408 if (gpio_bus_switch < 0) {
410 ret = gpio_request(NR_BUILTIN_GPIO, "camera"); 409 ret = gpio_request(PXA_NR_BUILTIN_GPIO, "camera");
411 if (!ret) { 410 if (!ret) {
412 gpio_bus_switch = NR_BUILTIN_GPIO; 411 gpio_bus_switch = PXA_NR_BUILTIN_GPIO;
413 gpio_direction_output(gpio_bus_switch, 0); 412 gpio_direction_output(gpio_bus_switch, 0);
414 } 413 }
415 } 414 }