summaryrefslogtreecommitdiff
path: root/chip/npcx
diff options
context:
space:
mode:
authorCaveh Jalali <caveh@chromium.org>2021-08-25 16:20:28 -0700
committerCommit Bot <commit-bot@chromium.org>2021-08-27 01:27:33 +0000
commit199a41cadb9e748d65d946b5c9eaf17d5b168260 (patch)
tree900652fa4ca12fb9edd30164d25fefabfc35857b /chip/npcx
parent4f9ecfc0861ec20e315934bce6e390b9ea4b3a3e (diff)
downloadchrome-ec-199a41cadb9e748d65d946b5c9eaf17d5b168260.tar.gz
adc: Include adc_chip.h from adc.h
This reorganizes adc.h and adc_chip.h so that general code only needs to know about adc.h. adc_chip.h is now included by adc.h directly and does not need to be included in general code. BRANCH=none BUG=b:181271666 TEST=buildall passes (with next patch in series) Cq-Depend: chromium:3120316 Change-Id: I8bc107c6900e831a57f7a7fb8668eb08bb179d6c Signed-off-by: Caveh Jalali <caveh@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3120315 Reviewed-by: Keith Short <keithshort@chromium.org>
Diffstat (limited to 'chip/npcx')
-rw-r--r--chip/npcx/adc.c1
-rw-r--r--chip/npcx/adc_chip.h8
2 files changed, 1 insertions, 8 deletions
diff --git a/chip/npcx/adc.c b/chip/npcx/adc.c
index 768e7dff27..ea16589d9b 100644
--- a/chip/npcx/adc.c
+++ b/chip/npcx/adc.c
@@ -6,7 +6,6 @@
/* NPCX-specific ADC module for Chrome EC */
#include "adc.h"
-#include "adc_chip.h"
#include "atomic.h"
#include "clock.h"
#include "clock_chip.h"
diff --git a/chip/npcx/adc_chip.h b/chip/npcx/adc_chip.h
index 9c2de3000d..300447df16 100644
--- a/chip/npcx/adc_chip.h
+++ b/chip/npcx/adc_chip.h
@@ -8,7 +8,7 @@
#ifndef __CROS_EC_ADC_CHIP_H
#define __CROS_EC_ADC_CHIP_H
-#include "adc.h"
+#include "common.h"
/* Minimum and maximum values returned by raw ADC read. */
#define ADC_READ_MIN 0
@@ -46,12 +46,6 @@ struct adc_t {
};
/*
- * Boards must provide this list of ADC channel definitions. This must match
- * the enum adc_channel list provided by the board.
- */
-extern const struct adc_t adc_channels[];
-
-/*
* Boards may configure a ADC channel for use with thershold interrupts.
* The threshold levels may be set from 0 to ADC_MAX_VOLT inclusive.
*/