summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
Diffstat (limited to 'board')
-rw-r--r--board/amenia/board.c7
-rw-r--r--board/amenia/board.h13
-rw-r--r--board/chell/board.h2
-rw-r--r--board/elm/board.h2
-rw-r--r--board/glados/board.h2
-rw-r--r--board/oak/board.h3
-rw-r--r--board/reef/board.h10
-rw-r--r--board/wheatley/board.h2
8 files changed, 31 insertions, 10 deletions
diff --git a/board/amenia/board.c b/board/amenia/board.c
index 9b98a0a9f9..56d02895b5 100644
--- a/board/amenia/board.c
+++ b/board/amenia/board.c
@@ -116,9 +116,12 @@ const struct adc_t adc_channels[] = {
/* Vbus sensing. Converted to mV, full ADC is equivalent to 28.16V. */
[ADC_VBUS] = {"VBUS", NPCX_ADC_CH1, 28160, ADC_READ_MAX+1, 0},
/* Adapter current output or battery discharging current */
- [ADC_AMON_BMON] = {"AMON_BMON", NPCX_ADC_CH4, 55000, 6144, 0},
+ [ADC_AMON_BMON] = {"AMON_BMON", NPCX_ADC_CH4,
+ (5 << BD99955_IOUT_GAIN_SELECT) * 10000,
+ ADC_READ_MAX+1, 0},
/* System current consumption */
- [ADC_PSYS] = {"PSYS", NPCX_ADC_CH3, 1, 1, 0},
+ [ADC_PSYS] = {"PSYS", NPCX_ADC_CH3, ADC_MAX_VOLT * 10,
+ ADC_READ_MAX+1, 3},
/* Thermistor 0 */
[ADC_THERM_SYS0] = {"THERM_SYS0", NPCX_ADC_CH0, 1, 1, 0},
/* Thermistor 1 */
diff --git a/board/amenia/board.h b/board/amenia/board.h
index b716519269..e111a83f4d 100644
--- a/board/amenia/board.h
+++ b/board/amenia/board.h
@@ -31,7 +31,6 @@
#define CONFIG_CHARGER
#define CONFIG_CHARGER_V2
-#define CONFIG_CHARGER_ADC_AMON_BMON
#define CONFIG_CHARGER_DISCHARGE_ON_AC
#define CONFIG_CHARGER_BD99955
#define CONFIG_CHARGER_ILIM_PIN_DISABLED
@@ -40,10 +39,18 @@
#define CONFIG_CHARGER_LIMIT_POWER_THRESH_CHG_MW 15000
#define CONFIG_CHARGER_MIN_BAT_PCT_FOR_POWER_ON 1
#define CONFIG_CHARGER_NARROW_VDC
-#define CONFIG_CHARGER_SENSE_RESISTOR 10
-#define CONFIG_CHARGER_SENSE_RESISTOR_AC 20
#define CONFIG_USB_CHARGER
+#define CONFIG_CMD_CHARGER_ADC_AMON_BMON
+#define CONFIG_CHARGER_SENSE_RESISTOR 10
+#define CONFIG_CHARGER_SENSE_RESISTOR_AC 10
+#define BD99955_IOUT_GAIN_SELECT \
+ BD99955_CMD_PMON_IOUT_CTRL_SET_IOUT_GAIN_SET_20V
+
+#define CONFIG_CMD_CHARGER_PSYS
+#define BD99955_PSYS_GAIN_SELECT \
+ BD99955_CMD_PMON_IOUT_CTRL_SET_PMON_GAIN_SET_02UAW
+
#define CONFIG_CHIPSET_APOLLOLAKE
#define CONFIG_CMD_ACCELS
#define CONFIG_CMD_ACCEL_INFO
diff --git a/board/chell/board.h b/board/chell/board.h
index d4c51058a3..bfcd96abe2 100644
--- a/board/chell/board.h
+++ b/board/chell/board.h
@@ -27,7 +27,6 @@
#define CONFIG_CHARGER
#define CONFIG_CHARGER_V2
-#define CONFIG_CHARGER_ADC_AMON_BMON
#define CONFIG_CHARGER_DISCHARGE_ON_AC
#define CONFIG_CHARGER_ISL9237
#define CONFIG_CHARGER_ILIM_PIN_DISABLED
@@ -37,6 +36,7 @@
#define CONFIG_CHARGER_PROFILE_OVERRIDE
#define CONFIG_CHARGER_SENSE_RESISTOR 10
#define CONFIG_CHARGER_SENSE_RESISTOR_AC 20
+#define CONFIG_CMD_CHARGER_ADC_AMON_BMON
#define CONFIG_CHIPSET_SKYLAKE
#define CONFIG_CHIPSET_RESET_HOOK
diff --git a/board/elm/board.h b/board/elm/board.h
index b30c05b04a..7ba5a5c443 100644
--- a/board/elm/board.h
+++ b/board/elm/board.h
@@ -41,7 +41,6 @@
#define CONFIG_CHARGER_NARROW_VDC
#define CONFIG_CHARGER_SENSE_RESISTOR 10
#define CONFIG_CHARGER_SENSE_RESISTOR_AC 20
-#define CONFIG_CHARGER_ADC_AMON_BMON
#define CONFIG_CHARGER_DISCHARGE_ON_AC
#define CONFIG_CHARGER_V2
#define CONFIG_CHIPSET_MEDIATEK
@@ -110,6 +109,7 @@
#define CONFIG_USB_SWITCH_PI3USB9281_CHIP_COUNT 1
/* Optional features */
+#define CONFIG_CMD_CHARGER_ADC_AMON_BMON
#define CONFIG_CMD_HOSTCMD
#define CONFIG_CMD_I2C_PROTECT
#define CONFIG_CMD_PD_CONTROL
diff --git a/board/glados/board.h b/board/glados/board.h
index dbe1fd614c..498fd45a04 100644
--- a/board/glados/board.h
+++ b/board/glados/board.h
@@ -31,7 +31,6 @@
#define CONFIG_CHARGER
#define CONFIG_CHARGER_V2
-#define CONFIG_CHARGER_ADC_AMON_BMON
#define CONFIG_CHARGER_DISCHARGE_ON_AC
#define CONFIG_CHARGER_ISL9237
#define CONFIG_CHARGER_ILIM_PIN_DISABLED
@@ -41,6 +40,7 @@
#define CONFIG_CHARGER_PROFILE_OVERRIDE
#define CONFIG_CHARGER_SENSE_RESISTOR 10
#define CONFIG_CHARGER_SENSE_RESISTOR_AC 20
+#define CONFIG_CMD_CHARGER_ADC_AMON_BMON
#define CONFIG_CHIPSET_SKYLAKE
#define CONFIG_CHIPSET_RESET_HOOK
diff --git a/board/oak/board.h b/board/oak/board.h
index da022f48f0..dfc154f3cb 100644
--- a/board/oak/board.h
+++ b/board/oak/board.h
@@ -52,13 +52,14 @@
#define CONFIG_CHARGER_SENSE_RESISTOR_AC 20
#endif /* BOARD_REV */
-#define CONFIG_CHARGER_ADC_AMON_BMON
#define CONFIG_CHARGER_DISCHARGE_ON_AC
#define CONFIG_CHARGER_V2
#define CONFIG_CHIPSET_MEDIATEK
#define CONFIG_CMD_TYPEC
#define CONFIG_EXTPOWER_GPIO
#define CONFIG_FORCE_CONSOLE_RESUME
+#define CONFIG_CMD_CHARGER_ADC_AMON_BMON
+
/*
* EC_WAKE: PA0 - WKUP1
* POWER_BUTTON_L: PB5 - WKUP6
diff --git a/board/reef/board.h b/board/reef/board.h
index 73bb77c8b9..9d6d99a0b4 100644
--- a/board/reef/board.h
+++ b/board/reef/board.h
@@ -61,6 +61,16 @@
#define CONFIG_POWER_BUTTON_X86
#define CONFIG_POWER_COMMON
+#define CONFIG_CMD_CHARGER_ADC_AMON_BMON
+#define CONFIG_CHARGER_SENSE_RESISTOR 10
+#define CONFIG_CHARGER_SENSE_RESISTOR_AC 10
+#define BD99955_IOUT_GAIN_SELECT \
+ BD99955_CMD_PMON_IOUT_CTRL_SET_IOUT_GAIN_SET_20V
+
+#define CONFIG_CMD_CHARGER_PSYS
+#define BD99955_PSYS_GAIN_SELECT \
+ BD99955_CMD_PMON_IOUT_CTRL_SET_PMON_GAIN_SET_02UAW
+
/* EC */
#define CONFIG_ADC
#define CONFIG_BOARD_VERSION
diff --git a/board/wheatley/board.h b/board/wheatley/board.h
index 70e627347d..7ef5f22fcd 100644
--- a/board/wheatley/board.h
+++ b/board/wheatley/board.h
@@ -24,7 +24,6 @@
#define CONFIG_CHARGER
#define CONFIG_CHARGER_V2
-#define CONFIG_CHARGER_ADC_AMON_BMON
#define CONFIG_CHARGER_DISCHARGE_ON_AC
#define CONFIG_CHARGER_ISL9237
#define CONFIG_CHARGER_ILIM_PIN_DISABLED
@@ -34,6 +33,7 @@
#define CONFIG_CHARGER_PROFILE_OVERRIDE
#define CONFIG_CHARGER_SENSE_RESISTOR 10
#define CONFIG_CHARGER_SENSE_RESISTOR_AC 20
+#define CONFIG_CMD_CHARGER_ADC_AMON_BMON
#define CONFIG_CHIPSET_SKYLAKE
#define CONFIG_CLOCK_CRYSTAL
View Lorry Controller Status