From a2a85365d600b93ecd10d44d1a5a2115ce0252f1 Mon Sep 17 00:00:00 2001 From: Randall Spangler Date: Mon, 23 Jan 2012 16:37:45 -0800 Subject: [PATCH] Use correct ADC channel for charger current on link Signed-off-by: Randall Spangler BUG=chrome-os-partner:7697 TEST=if it runs, it works Change-Id: I36ab37a8cf1c3e4bf41bfb38e622e766cee8a4c4 --- board/bds/board.h | 2 +- board/link/board.h | 2 +- chip/lm4/adc.c | 11 ++++++----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/board/bds/board.h b/board/bds/board.h index 83e40804c1..e92c5fef5b 100644 --- a/board/bds/board.h +++ b/board/bds/board.h @@ -42,7 +42,7 @@ /* ADC inputs */ /* TODO: really just need a lookup table for channels to inputs */ -#define ADC_IN_POT 0 /* Turn POT on badger board */ +#define ADC_IN0 0 /* Turn POT on badger board */ /* I2C ports */ #define I2C_PORT_BATTERY 5 // port 0 / PB2:3 on Link, open on badger diff --git a/board/link/board.h b/board/link/board.h index c2f388661d..22acb41dd7 100644 --- a/board/link/board.h +++ b/board/link/board.h @@ -42,7 +42,7 @@ /* ADC inputs */ /* TODO: assign real ADC inputs */ -#define ADC_IN_POT 0 /* Turn POT on badger board */ +#define ADC_IN0 11 /* Charger current */ /* I2C ports */ #define I2C_PORT_BATTERY 0 diff --git a/chip/lm4/adc.c b/chip/lm4/adc.c index 97b20ed175..f4524c3adb 100644 --- a/chip/lm4/adc.c +++ b/chip/lm4/adc.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved. * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -97,7 +97,8 @@ int adc_read_ec_temperature(void) static int command_adc(int argc, char **argv) { - uart_printf("ADC POT channel = 0x%03x\n",adc_read(ADC_CH_POT)); + uart_printf("ADC channel %d = 0x%03x\n", ADC_IN0, + adc_read(ADC_CH_POT)); return EC_SUCCESS; } @@ -143,9 +144,9 @@ int adc_init(void) LM4_ADC_ADCACTSS &= ~0x01; /* Trigger SS0 by processor request */ LM4_ADC_ADCEMUX = (LM4_ADC_ADCEMUX & 0xfffffff0) | 0x00; - /* Sample AIN0 only */ - LM4_ADC_SSMUX(0) = ADC_IN_POT & 0x0f; - LM4_ADC_SSEMUX(0) = (ADC_IN_POT >> 4) & 0x0f; + /* Sample only our one channel */ + LM4_ADC_SSMUX(0) = ADC_IN0 & 0x0f; + LM4_ADC_SSEMUX(0) = (ADC_IN0 >> 4) & 0x0f; LM4_ADC_SSCTL(0) = 0x06; /* IE0 | END0 */ /* Enable sample sequencer 0 */ LM4_ADC_ADCACTSS |= 0x01;