diff options
| author | Wai-Hong Tam <waihong@google.com> | 2021-03-18 09:44:55 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-03-18 19:56:57 +0000 |
| commit | d7fbb48e0334957aae229d826e9df832ef3b69f8 (patch) | |
| tree | bc983a70034a806df046cd7d42086a00f0adf2ff /zephyr | |
| parent | 29b492c095675a991147fdde0f586aa9efc94da9 (diff) | |
| download | chrome-ec-d7fbb48e0334957aae229d826e9df832ef3b69f8.tar.gz | |
zephyr: lazor: enable ADC
Enable ADC. Lazor uses ADC_0 channel 1, 2, and 3.
The channel 1 is scaled down VBUS through a 1/10 voltage
divider. The zephyr driver returns the exact voltage, which
is VBUS * 1/10.
The channel 2 is AMON_BMON voltage which is not enabled
until the charger task is setup.
The channel 3 is PSYS voltage which is zero. PSYS monitoring
is not enabled unless the process is in S0.
BUG=b:182398910
BRANCH=None
TEST=Tested on Lazor:
uart: ~$ adc
ADC_VBUS = 500 mV
ADC_AMON_BMON = 13 mV
ADC_PSYS = 0 mV
Change-Id: Ie45da85e24ee4a568da2542192a053d6abdd2cfc
Signed-off-by: Wai-Hong Tam <waihong@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2774078
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Keith Short <keithshort@chromium.org>
Diffstat (limited to 'zephyr')
| -rw-r--r-- | zephyr/projects/trogdor/boards/arm/trogdor/trogdor.dts | 21 | ||||
| -rw-r--r-- | zephyr/projects/trogdor/boards/arm/trogdor/trogdor_defconfig | 5 | ||||
| -rw-r--r-- | zephyr/projects/trogdor/lazor/prj.conf | 2 |
3 files changed, 28 insertions, 0 deletions
diff --git a/zephyr/projects/trogdor/boards/arm/trogdor/trogdor.dts b/zephyr/projects/trogdor/boards/arm/trogdor/trogdor.dts index 9ae4bea617..2d517762d0 100644 --- a/zephyr/projects/trogdor/boards/arm/trogdor/trogdor.dts +++ b/zephyr/projects/trogdor/boards/arm/trogdor/trogdor.dts @@ -57,6 +57,23 @@ }; }; + named-adc-channels { + compatible = "named-adc-channels"; + + vbus { + label = "ADC_VBUS"; + channel = <1>; + }; + amon_bmon { + label = "ADC_AMON_BMON"; + channel = <2>; + }; + psys { + label = "ADC_PSYS"; + channel = <3>; + }; + }; + def_lvol_io_list { compatible = "nuvoton,npcx-lvolctrl-def"; @@ -117,3 +134,7 @@ status = "okay"; clock-frequency = <I2C_BITRATE_FAST>; }; + +&adc0 { + status = "okay"; +}; diff --git a/zephyr/projects/trogdor/boards/arm/trogdor/trogdor_defconfig b/zephyr/projects/trogdor/boards/arm/trogdor/trogdor_defconfig index ec830d6fcb..4e275d3573 100644 --- a/zephyr/projects/trogdor/boards/arm/trogdor/trogdor_defconfig +++ b/zephyr/projects/trogdor/boards/arm/trogdor/trogdor_defconfig @@ -40,6 +40,11 @@ CONFIG_CROS_EC_RAM_BASE=0x200c0000 CONFIG_CROS_EC_DATA_RAM_SIZE=0x00010000 CONFIG_CROS_EC_RAM_SIZE=0x0000f800 +# ADC +# The resolution and oversamplig values are fixed by the NPCX ADC driver +CONFIG_PLATFORM_EC_ADC_RESOLUTION=10 +CONFIG_PLATFORM_EC_ADC_OVERSAMPLING=0 + CONFIG_FLASH_SIZE=512 CONFIG_CROS_EC_RO_MEM_OFF=0x0 CONFIG_CROS_EC_RO_SIZE=0x40000 diff --git a/zephyr/projects/trogdor/lazor/prj.conf b/zephyr/projects/trogdor/lazor/prj.conf index 1ae757870d..29105af85c 100644 --- a/zephyr/projects/trogdor/lazor/prj.conf +++ b/zephyr/projects/trogdor/lazor/prj.conf @@ -9,6 +9,8 @@ CONFIG_PLATFORM_EC_BRINGUP=y CONFIG_PLATFORM_EC_EXTPOWER_GPIO=y CONFIG_PLATFORM_EC_LID_SWITCH=y CONFIG_PLATFORM_EC_POWER_BUTTON=y +CONFIG_ADC=y +CONFIG_ADC_SHELL=n CONFIG_I2C=y # Application Processor is Qualcomm SC7180 |