diff options
| author | Diana Z <dzigterman@chromium.org> | 2021-12-13 17:01:11 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-12-16 17:56:12 +0000 |
| commit | ae9ed126ac94477b25fc096d8b90777277e3c82a (patch) | |
| tree | a137727ffd339d95b7f62a62f35d0411223d1449 /driver | |
| parent | 95e6e6d046a1d085715f5547f2e0df428b90fa29 (diff) | |
| download | chrome-ec-ae9ed126ac94477b25fc096d8b90777277e3c82a.tar.gz | |
TMP112: Prepare for zephyr use
Move the header for the TMP112 sensor to the include directory so it's
available for zephyr consumption. Include the shim's temp_sensor.h file
which will now create our sensor enum.
BRANCH=None
BUG=b:195137794
TEST=zmake testall
Signed-off-by: Diana Z <dzigterman@chromium.org>
Change-Id: Id665168ca84fed12020b475649574ff1acd0a1b3
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3340219
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/temp_sensor/tmp112.c | 6 | ||||
| -rw-r--r-- | driver/temp_sensor/tmp112.h | 66 |
2 files changed, 5 insertions, 67 deletions
diff --git a/driver/temp_sensor/tmp112.c b/driver/temp_sensor/tmp112.c index 4da5c4e0e8..6e726a27b9 100644 --- a/driver/temp_sensor/tmp112.c +++ b/driver/temp_sensor/tmp112.c @@ -7,12 +7,16 @@ #include "common.h" #include "console.h" -#include "tmp112.h" #include "i2c.h" #include "hooks.h" #include "math_util.h" +#include "temp_sensor/tmp112.h" #include "util.h" +#ifdef CONFIG_ZEPHYR +#include "temp_sensor/temp_sensor.h" +#endif + #define TMP112_RESOLUTION 12 #define TMP112_SHIFT1 (16 - TMP112_RESOLUTION) #define TMP112_SHIFT2 (TMP112_RESOLUTION - 8) diff --git a/driver/temp_sensor/tmp112.h b/driver/temp_sensor/tmp112.h deleted file mode 100644 index d1b97b138c..0000000000 --- a/driver/temp_sensor/tmp112.h +++ /dev/null @@ -1,66 +0,0 @@ -/* Copyright 2016 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. - */ - -#ifndef __CROS_EC_TMP112_H -#define __CROS_EC_TMP112_H - -#include "i2c.h" - -#define TMP112_I2C_ADDR_FLAGS0 (0x48 | I2C_FLAG_BIG_ENDIAN) -#define TMP112_I2C_ADDR_FLAGS1 (0x49 | I2C_FLAG_BIG_ENDIAN) -#define TMP112_I2C_ADDR_FLAGS2 (0x4A | I2C_FLAG_BIG_ENDIAN) -#define TMP112_I2C_ADDR_FLAGS3 (0x4B | I2C_FLAG_BIG_ENDIAN) - -#define TMP112_REG_TEMP 0x00 -#define TMP112_REG_CONF 0x01 -#define TMP112_REG_HYST 0x02 -#define TMP112_REG_MAX 0x03 - -/* - * I2C port and address information for all the board TMP112 sensors should be - * defined in an array of the following structures, with an enum tmp112_sensor - * indexing the array. The enum tmp112_sensor shall end with a TMP112_COUNT - * defining the maximum number of sensors for the board. - */ - -struct tmp112_sensor_t { - int i2c_port; - int i2c_addr_flags; -}; - -extern const struct tmp112_sensor_t tmp112_sensors[]; - -/** - * Get the last polled value of a sensor. - * - * @param idx Index to read, from board's enum tmp112_sensor - * definition - * - * @param temp_k_ptr Destination for temperature in K. - * - * @return EC_SUCCESS if successful, non-zero if error. - */ -int tmp112_get_val_k(int idx, int *temp_k_ptr); - -/** - * Get the last polled value of a sensor. - * - * @param idx Index to read, from board's enum tmp112_sensor - * definition - * - * @param temp_mk_ptr Destination for temperature in mK. - * - * @return EC_SUCCESS if successful, non-zero if error. - */ -int tmp112_get_val_mk(int idx, int *temp_mk_ptr); - -/** - * Init the sensors. Note, this will run automatically on HOOK_INIT, but is - * made available for boards which may not always power the sensor in all - * states. - */ -void tmp112_init(void); - -#endif /* __CROS_EC_TMP112_H */ |