summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJinyoung Park <jinyoungp@nvidia.com>2013-12-05 09:57:30 +0900
committerHarry Hong <hhong@nvidia.com>2013-12-04 18:10:19 -0800
commit79e17d8b720780b3b95aeeba786217fa1b9c5ab6 (patch)
tree73f8a15affc30d1ba7cc5642483bf2182139d1f1
parent812acea1fac956257dc9fceab0e51e73299df5ee (diff)
ARM: tegra: tegratab: Disable GPADC auto shutdown
Disable GPADC auto shutdown due to GPADC lock issue in auto mode. Bug 1366274 Bug 1417932 Change-Id: I83282148050eb32835957da8b32fdbd2f2909b94 Signed-off-by: Jinyoung Park <jinyoungp@nvidia.com> Reviewed-on: http://git-master/r/338483 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Harry Hong <hhong@nvidia.com> Tested-by: Harry Hong <hhong@nvidia.com>
-rw-r--r--arch/arm/mach-tegra/board-tegratab-power.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/arm/mach-tegra/board-tegratab-power.c b/arch/arm/mach-tegra/board-tegratab-power.c
index 575c38ede345..7196c1f578fa 100644
--- a/arch/arm/mach-tegra/board-tegratab-power.c
+++ b/arch/arm/mach-tegra/board-tegratab-power.c
@@ -419,13 +419,6 @@ static struct iio_map palmas_adc_iio_maps[] = {
PALMAS_GPADC_IIO_MAP(NULL, NULL, NULL),
};
-struct palmas_adc_auto_conv_property palmas_adc_auto_conv1_data = {
- .adc_channel_number = PALMAS_ADC_CH_IN1, /* NTC thermistor(Tboard) */
- /* Shutdown if ADC auto conversion is below 168(>95C). */
- .adc_low_threshold = 168, /* 95C */
- .adc_shutdown = true,
-};
-
static struct palmas_gpadc_platform_data palmas_adc_pdata = {
.ch0_current_uA = 5,
/* If ch3_dual_current is true, it will measure ch3 input signal with
@@ -667,15 +660,6 @@ int __init tegratab_palmas_regulator_init(void)
ARRAY_SIZE(tegratab_palmas_clk32k_idata);
}
- if (board_info.board_id != BOARD_E1569 &&
- (board_info.board_id == BOARD_P1640 &&
- (board_info.fab != BOARD_FAB_A00 &&
- board_info.fab != BOARD_FAB_A01))) {
- palmas_adc_pdata.auto_conversion_period_ms = 1000;
- palmas_adc_pdata.adc_auto_conv1_data =
- &palmas_adc_auto_conv1_data;
- }
-
if (get_androidboot_mode_charger())
palmas_pdata.long_press_delay =
PALMAS_LONG_PRESS_KEY_TIME_12SECONDS;