diff options
| author | Pritesh Raithatha <praithatha@nvidia.com> | 2012-01-17 15:35:40 +0530 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2012-03-23 21:13:57 -0700 |
| commit | 9a8d89b086c104d2d3c0c3a1d5b595423a802a13 (patch) | |
| tree | a43f1c17fda012ac3d31c1c9834fe72e29ac8ca1 /arch/arm/mach-tegra/board-ventana-sensors.c | |
| parent | 8ad7ea41cb02a42ae263439181136a69b706b62a (diff) | |
arm: tegra: ventana: add defines and cleanup header file
-move sensors defines to board header file.
-add defines for pca954x i2c mux instead of using direct i2c
bus number.
-cleanup board-ventana.h.
Bug 925547
Change-Id: I76a42b66f3a3fa0adbc8c06b2edb9fd006c7ae44
Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com>
Reviewed-on: http://git-master/r/75689
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Varun Wadekar <vwadekar@nvidia.com>
Reviewed-by: Mayuresh Kulkarni <mkulkarni@nvidia.com>
Rebase-Id: R7a392ce7569fee639e7f14a7c9451a1dc98bf46c
Diffstat (limited to 'arch/arm/mach-tegra/board-ventana-sensors.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-ventana-sensors.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/arch/arm/mach-tegra/board-ventana-sensors.c b/arch/arm/mach-tegra/board-ventana-sensors.c index e6cc41bd927f..16dfa5822912 100644 --- a/arch/arm/mach-tegra/board-ventana-sensors.c +++ b/arch/arm/mach-tegra/board-ventana-sensors.c @@ -1,7 +1,7 @@ /* * arch/arm/mach-tegra/board-ventana-sensors.c * - * Copyright (c) 2011, NVIDIA CORPORATION, All rights reserved. + * Copyright (c) 2011-2012, NVIDIA CORPORATION, All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -52,13 +52,6 @@ #include "board-ventana.h" #include "cpu-tegra.h" -#define ISL29018_IRQ_GPIO TEGRA_GPIO_PZ2 -#define AKM8975_IRQ_GPIO TEGRA_GPIO_PN5 -#define CAMERA_POWER_GPIO TEGRA_GPIO_PV4 -#define CAMERA_CSI_MUX_SEL_GPIO TEGRA_GPIO_PBB4 -#define CAMERA_FLASH_ACT_GPIO TEGRA_GPIO_PD2 -#define NCT1008_THERM2_GPIO TEGRA_GPIO_PN6 - static int ventana_camera_init(void) { int err; @@ -251,18 +244,18 @@ static const struct i2c_board_info ventana_i2c2_board_info[] = { }; static struct pca953x_platform_data ventana_tca6416_data = { - .gpio_base = TEGRA_NR_GPIOS + 4, /* 4 gpios are already requested by tps6586x */ + .gpio_base = TCA6416_GPIO_BASE, }; static struct pca954x_platform_mode ventana_pca9546_modes[] = { - { .adap_id = 6, .deselect_on_exit = 1 }, /* REAR CAM1 */ - { .adap_id = 7, .deselect_on_exit = 1 }, /* REAR CAM2 */ - { .adap_id = 8, .deselect_on_exit = 1 }, /* FRONT CAM3 */ + { .adap_id = PCA954x_I2C_BUS0, .deselect_on_exit = 1 }, /* REAR CAM1 */ + { .adap_id = PCA954x_I2C_BUS1, .deselect_on_exit = 1 }, /* REAR CAM2 */ + { .adap_id = PCA954x_I2C_BUS2, .deselect_on_exit = 1 }, /* FRONT CAM3 */ }; static struct pca954x_platform_data ventana_pca9546_data = { - .modes = ventana_pca9546_modes, - .num_modes = ARRAY_SIZE(ventana_pca9546_modes), + .modes = ventana_pca9546_modes, + .num_modes = ARRAY_SIZE(ventana_pca9546_modes), }; static const struct i2c_board_info ventana_i2c3_board_info_tca6416[] = { |