jacuzzi: remove ADC_BATT_ID

ADC_BATT_ID is reassigned to BATT_PRES in Jacuzzi families.
Remove it from source code to prevent people using it.

BRANCH=kukui
BUG=none
TEST=make buildall

Signed-off-by: Ting Shen <phoenixshen@google.com>
Change-Id: I213b502413642c9bfff99443180ddb43debb2463
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2380842
Tested-by: Ting Shen <phoenixshen@chromium.org>
Auto-Submit: Ting Shen <phoenixshen@chromium.org>
Reviewed-by: Nicolas Boichat <drinkcat@chromium.org>
Commit-Queue: Nicolas Boichat <drinkcat@chromium.org>

18 files changed, 0 insertions, 18 deletions

diff --git a/board/burnet/board.c b/board/burnet/board.c
index e2588c0cd4..c55e1d8132 100644
--- a/board/burnet/board.c
+++ b/board/burnet/board.c
@@ -61,7 +61,6 @@ static void tcpc_alert_event(enum gpio_signal signal)
 const struct adc_t adc_channels[] = {
 	[ADC_BOARD_ID] =  {"BOARD_ID",  3300, 4096, 0, STM32_AIN(10)},
 	[ADC_EC_SKU_ID] = {"EC_SKU_ID", 3300, 4096, 0, STM32_AIN(8)},
-	[ADC_BATT_ID] =   {"BATT_ID",   3300, 4096, 0, STM32_AIN(7)},
 };
 BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT);
 
diff --git a/board/burnet/board.h b/board/burnet/board.h
index 05f66e19fb..2564f78612 100644
--- a/board/burnet/board.h
+++ b/board/burnet/board.h
@@ -89,7 +89,6 @@ enum adc_channel {
 	/* Real ADC channels begin here */
 	ADC_BOARD_ID = 0,
 	ADC_EC_SKU_ID,
-	ADC_BATT_ID,
 	ADC_CH_COUNT
 };
 
diff --git a/board/cerise/board.c b/board/cerise/board.c
index b377820342..0a04842e35 100644
--- a/board/cerise/board.c
+++ b/board/cerise/board.c
@@ -62,7 +62,6 @@ static void tcpc_alert_event(enum gpio_signal signal)
 const struct adc_t adc_channels[] = {
 	[ADC_BOARD_ID] =  {"BOARD_ID",  3300, 4096, 0, STM32_AIN(10)},
 	[ADC_EC_SKU_ID] = {"EC_SKU_ID", 3300, 4096, 0, STM32_AIN(8)},
-	[ADC_BATT_ID] =   {"BATT_ID",   3300, 4096, 0, STM32_AIN(7)},
 };
 BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT);
 
diff --git a/board/cerise/board.h b/board/cerise/board.h
index 89276cac91..1ee3d931eb 100644
--- a/board/cerise/board.h
+++ b/board/cerise/board.h
@@ -98,7 +98,6 @@ enum adc_channel {
 	/* Real ADC channels begin here */
 	ADC_BOARD_ID = 0,
 	ADC_EC_SKU_ID,
-	ADC_BATT_ID,
 	ADC_CH_COUNT
 };
 
diff --git a/board/damu/board.c b/board/damu/board.c
index f2eb2a4739..280e834c85 100644
--- a/board/damu/board.c
+++ b/board/damu/board.c
@@ -62,7 +62,6 @@ static void tcpc_alert_event(enum gpio_signal signal)
 const struct adc_t adc_channels[] = {
 	[ADC_BOARD_ID] =  {"BOARD_ID",  3300, 4096, 0, STM32_AIN(10)},
 	[ADC_EC_SKU_ID] = {"EC_SKU_ID", 3300, 4096, 0, STM32_AIN(8)},
-	[ADC_BATT_ID] =   {"BATT_ID",   3300, 4096, 0, STM32_AIN(7)},
 };
 BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT);
 
diff --git a/board/damu/board.h b/board/damu/board.h
index dfad8cbfac..e5de9c205c 100644
--- a/board/damu/board.h
+++ b/board/damu/board.h
@@ -98,7 +98,6 @@ enum adc_channel {
 	/* Real ADC channels begin here */
 	ADC_BOARD_ID = 0,
 	ADC_EC_SKU_ID,
-	ADC_BATT_ID,
 	ADC_CH_COUNT
 };
 
diff --git a/board/esche/board.c b/board/esche/board.c
index 7a8b2989ae..655b58d845 100644
--- a/board/esche/board.c
+++ b/board/esche/board.c
@@ -60,7 +60,6 @@ static void tcpc_alert_event(enum gpio_signal signal)
 const struct adc_t adc_channels[] = {
 	[ADC_BOARD_ID] =  {"BOARD_ID",  3300, 4096, 0, STM32_AIN(10)},
 	[ADC_EC_SKU_ID] = {"EC_SKU_ID", 3300, 4096, 0, STM32_AIN(8)},
-	[ADC_BATT_ID] =   {"BATT_ID",   3300, 4096, 0, STM32_AIN(7)},
 };
 BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT);
 
diff --git a/board/esche/board.h b/board/esche/board.h
index 01eaf5d3b7..cd45bc5295 100644
--- a/board/esche/board.h
+++ b/board/esche/board.h
@@ -90,7 +90,6 @@ enum adc_channel {
 	/* Real ADC channels begin here */
 	ADC_BOARD_ID = 0,
 	ADC_EC_SKU_ID,
-	ADC_BATT_ID,
 	ADC_CH_COUNT
 };
 
diff --git a/board/fennel/board.c b/board/fennel/board.c
index 6ca7c05ce2..a36db6011a 100644
--- a/board/fennel/board.c
+++ b/board/fennel/board.c
@@ -60,7 +60,6 @@ static void tcpc_alert_event(enum gpio_signal signal)
 const struct adc_t adc_channels[] = {
 	[ADC_BOARD_ID] =  {"BOARD_ID",  3300, 4096, 0, STM32_AIN(10)},
 	[ADC_EC_SKU_ID] = {"EC_SKU_ID", 3300, 4096, 0, STM32_AIN(8)},
-	[ADC_BATT_ID] =   {"BATT_ID",   3300, 4096, 0, STM32_AIN(7)},
 };
 BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT);
 
diff --git a/board/fennel/board.h b/board/fennel/board.h
index 0c6f3d2aba..46fa7fc2af 100644
--- a/board/fennel/board.h
+++ b/board/fennel/board.h
@@ -94,7 +94,6 @@ enum adc_channel {
 	/* Real ADC channels begin here */
 	ADC_BOARD_ID = 0,
 	ADC_EC_SKU_ID,
-	ADC_BATT_ID,
 	ADC_CH_COUNT
 };
 
diff --git a/board/jacuzzi/board.c b/board/jacuzzi/board.c
index 637079d417..8b6478c26a 100644
--- a/board/jacuzzi/board.c
+++ b/board/jacuzzi/board.c
@@ -60,7 +60,6 @@ static void tcpc_alert_event(enum gpio_signal signal)
 const struct adc_t adc_channels[] = {
 	[ADC_BOARD_ID] =  {"BOARD_ID",  3300, 4096, 0, STM32_AIN(10)},
 	[ADC_EC_SKU_ID] = {"EC_SKU_ID", 3300, 4096, 0, STM32_AIN(8)},
-	[ADC_BATT_ID] =   {"BATT_ID",   3300, 4096, 0, STM32_AIN(7)},
 };
 BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT);
 
diff --git a/board/jacuzzi/board.h b/board/jacuzzi/board.h
index aaea35b54a..0303d87433 100644
--- a/board/jacuzzi/board.h
+++ b/board/jacuzzi/board.h
@@ -100,7 +100,6 @@ enum adc_channel {
 	/* Real ADC channels begin here */
 	ADC_BOARD_ID = 0,
 	ADC_EC_SKU_ID,
-	ADC_BATT_ID,
 	ADC_CH_COUNT
 };
 
diff --git a/board/kappa/board.c b/board/kappa/board.c
index dc759146c4..89dd4648c6 100644
--- a/board/kappa/board.c
+++ b/board/kappa/board.c
@@ -60,7 +60,6 @@ static void tcpc_alert_event(enum gpio_signal signal)
 const struct adc_t adc_channels[] = {
 	[ADC_BOARD_ID] =  {"BOARD_ID",  3300, 4096, 0, STM32_AIN(10)},
 	[ADC_EC_SKU_ID] = {"EC_SKU_ID", 3300, 4096, 0, STM32_AIN(8)},
-	[ADC_BATT_ID] =   {"BATT_ID",   3300, 4096, 0, STM32_AIN(7)},
 };
 BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT);
 
diff --git a/board/kappa/board.h b/board/kappa/board.h
index cdd3b30cdc..81ac819cf9 100644
--- a/board/kappa/board.h
+++ b/board/kappa/board.h
@@ -90,7 +90,6 @@ enum adc_channel {
 	/* Real ADC channels begin here */
 	ADC_BOARD_ID = 0,
 	ADC_EC_SKU_ID,
-	ADC_BATT_ID,
 	ADC_CH_COUNT
 };
 
diff --git a/board/stern/board.c b/board/stern/board.c
index b377820342..0a04842e35 100644
--- a/board/stern/board.c
+++ b/board/stern/board.c
@@ -62,7 +62,6 @@ static void tcpc_alert_event(enum gpio_signal signal)
 const struct adc_t adc_channels[] = {
 	[ADC_BOARD_ID] =  {"BOARD_ID",  3300, 4096, 0, STM32_AIN(10)},
 	[ADC_EC_SKU_ID] = {"EC_SKU_ID", 3300, 4096, 0, STM32_AIN(8)},
-	[ADC_BATT_ID] =   {"BATT_ID",   3300, 4096, 0, STM32_AIN(7)},
 };
 BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT);
 
diff --git a/board/stern/board.h b/board/stern/board.h
index 89276cac91..1ee3d931eb 100644
--- a/board/stern/board.h
+++ b/board/stern/board.h
@@ -98,7 +98,6 @@ enum adc_channel {
 	/* Real ADC channels begin here */
 	ADC_BOARD_ID = 0,
 	ADC_EC_SKU_ID,
-	ADC_BATT_ID,
 	ADC_CH_COUNT
 };
 
diff --git a/board/willow/board.c b/board/willow/board.c
index 1865691899..17ccb305e0 100644
--- a/board/willow/board.c
+++ b/board/willow/board.c
@@ -60,7 +60,6 @@ static void tcpc_alert_event(enum gpio_signal signal)
 const struct adc_t adc_channels[] = {
 	[ADC_BOARD_ID] =  {"BOARD_ID",  3300, 4096, 0, STM32_AIN(10)},
 	[ADC_EC_SKU_ID] = {"EC_SKU_ID", 3300, 4096, 0, STM32_AIN(8)},
-	[ADC_BATT_ID] =   {"BATT_ID",   3300, 4096, 0, STM32_AIN(7)},
 };
 BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT);
 
diff --git a/board/willow/board.h b/board/willow/board.h
index 732d62f3bf..74ea362211 100644
--- a/board/willow/board.h
+++ b/board/willow/board.h
@@ -101,7 +101,6 @@ enum adc_channel {
 	/* Real ADC channels begin here */
 	ADC_BOARD_ID = 0,
 	ADC_EC_SKU_ID,
-	ADC_BATT_ID,
 	ADC_CH_COUNT
 };