diff options
| author | Varun Wadekar <vwadekar@nvidia.com> | 2010-12-24 12:17:53 +0530 |
|---|---|---|
| committer | Bharat Nihalani <bnihalani@nvidia.com> | 2010-12-24 06:05:54 -0800 |
| commit | de967036c414c3b9eddce48c092379cb30adb7bf (patch) | |
| tree | 7a62ffe6f73d47133ac76a7f1726496a25128677 | |
| parent | a3306d8b871c89475e6887806941a5b87990ca6c (diff) | |
[ARM] tegra: ventana: include board-ventana.h for external gpios
Change-Id: I9a9f2a42bb4b50624006160eeb75d9864351d208
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Reviewed-on: http://git-master/r/14219
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
| -rw-r--r-- | arch/arm/mach-tegra/board-ventana-sensors.c | 32 |
1 files changed, 8 insertions, 24 deletions
diff --git a/arch/arm/mach-tegra/board-ventana-sensors.c b/arch/arm/mach-tegra/board-ventana-sensors.c index 85e43fbfa687..cd37e72514f1 100644 --- a/arch/arm/mach-tegra/board-ventana-sensors.c +++ b/arch/arm/mach-tegra/board-ventana-sensors.c @@ -19,32 +19,24 @@ */ #include <linux/i2c.h> -#include <mach/gpio.h> #include <linux/i2c/nct1008.h> - -#ifdef CONFIG_SENSORS_AK8975 #include <linux/akm8975.h> -#endif -#ifdef CONFIG_SENSORS_MPU3050 #include <linux/mpu3050.h> -#endif +#include <linux/i2c/pca954x.h> +#include <linux/i2c/pca953x.h> +#include <mach/gpio.h> + +#include <media/ov5650.h> #include <generated/mach-types.h> #include "gpio-names.h" -#include <linux/i2c/pca954x.h> -#include <linux/i2c/pca953x.h> -#include <media/ov5650.h> +#include "board-ventana.h" #define ISL29018_IRQ_GPIO TEGRA_GPIO_PZ2 - -#ifdef CONFIG_SENSORS_AK8975 #define AKM8975_IRQ_GPIO TEGRA_GPIO_PN5 -#endif - #define CAMERA_POWER_GPIO TEGRA_GPIO_PV4 #define CAMERA_CSI_MUX_SEL_GPIO TEGRA_GPIO_PBB4 - #define AC_PRESENT_GPIO TEGRA_GPIO_PV3 static int ventana_camera_init(void) @@ -230,7 +222,8 @@ int __init ventana_sensors_init(void) ARRAY_SIZE(ventana_i2c7_board_info)); #ifdef CONFIG_SENSORS_MPU3050 - i2c_register_board_info(0, mpu3050_i2c0_boardinfo, ARRAY_SIZE(mpu3050_i2c0_boardinfo)); + i2c_register_board_info(0, mpu3050_i2c0_boardinfo, + ARRAY_SIZE(mpu3050_i2c0_boardinfo)); #endif return 0; @@ -238,15 +231,6 @@ int __init ventana_sensors_init(void) #ifdef CONFIG_VIDEO_OV5650 -#define AVDD_DSI_CSI_ENB_GPIO TEGRA_NR_GPIOS + 1 /* TPS6586X_GPIO2 */ - -#define TCA6416_GPIO_BASE TEGRA_NR_GPIOS + 4 -#define CAM2_PWR_DN_GPIO TCA6416_GPIO_BASE + 4 /* TCA6416_GPIO4 */ -#define CAM2_RST_L_GPIO TCA6416_GPIO_BASE + 5 /* TCA6416_GPIO5 */ -#define CAM2_AF_PWR_DN_L_GPIO TCA6416_GPIO_BASE + 6 /* TCA6416_GPIO6 */ -#define CAM2_LDO_SHUTDN_L_GPIO TCA6416_GPIO_BASE + 7 /* TCA6416_GPIO7 */ -#define CAM2_I2C_MUX_RST_GPIO TCA6416_GPIO_BASE + 15 /* TCA6416_GPIO15 */ - struct ov5650_gpios { const char *name; int gpio; |