summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorGwendal Grignou <gwendal@chromium.org>2018-11-30 16:23:40 -0800
committerCommit Bot <commit-bot@chromium.org>2019-08-02 17:47:21 +0000
commite58e2fc0a457b3929b04a94e52783453953978c8 (patch)
tree507d0eb3a4a975ac58a286d60d65c6a30db8209f /board
parent8d8e007be362217b113c6bd63b6fa5f61ec04687 (diff)
downloadchrome-ec-e58e2fc0a457b3929b04a94e52783453953978c8.tar.gz
config: Add magnetometer definitions
Add all possible supported or soon-to-be supported configuration of magnetometer behind accelerometers. Use a more generic variable to indicate the i2c address of the secondary device. BUG=b:110143516,b:115587004 BRANCH=none TEST=compile Change-Id: Ic00c413f2ec5fa0e6bf1c98861daa02f00769a65 Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/1361989 Commit-Ready: Karthikeyan Ramasubramanian <kramasub@chromium.org> Tested-by: Justin TerAvest <teravest@chromium.org> Reviewed-by: Karthikeyan Ramasubramanian <kramasub@chromium.org> Reviewed-by: Diana Z <dzigterman@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1719524 Reviewed-by: Edward Hill <ecgh@chromium.org> Tested-by: Edward Hill <ecgh@chromium.org> Commit-Queue: Edward Hill <ecgh@chromium.org>
Diffstat (limited to 'board')
-rw-r--r--board/eve/board.h2
-rw-r--r--board/kukui/board.h3
-rw-r--r--board/poppy/board.h2
-rw-r--r--board/reef/board.h2
-rw-r--r--board/reef_mchp/board.h2
5 files changed, 7 insertions, 4 deletions
diff --git a/board/eve/board.h b/board/eve/board.h
index 0f521bdccb..64578c9528 100644
--- a/board/eve/board.h
+++ b/board/eve/board.h
@@ -125,7 +125,7 @@
#define CONFIG_MAG_BMI160_BMM150
#define CONFIG_ACCEL_INTERRUPTS
#define CONFIG_ACCELGYRO_BMI160_INT_EVENT TASK_EVENT_CUSTOM(4)
-#define BMI160_SEC_ADDR BMM150_ADDR0 /* 8-bit address */
+#define CONFIG_ACCELGYRO_SEC_ADDR BMM150_ADDR0 /* 8-bit address */
#define CONFIG_MAG_CALIBRATE
#define CONFIG_LID_ANGLE
#define CONFIG_LID_ANGLE_UPDATE
diff --git a/board/kukui/board.h b/board/kukui/board.h
index 925f9ba917..27b1324dda 100644
--- a/board/kukui/board.h
+++ b/board/kukui/board.h
@@ -90,6 +90,9 @@
/* Motion Sensors */
#ifdef SECTION_IS_RW
+#define CONFIG_MAG_BMI160_BMM150
+#define CONFIG_ACCELGYRO_SEC_ADDR BMM150_ADDR0 /* 8-bit address */
+#define CONFIG_MAG_CALIBRATE
#define CONFIG_ACCELGYRO_BMI160
#define CONFIG_ACCEL_INTERRUPTS
#define CONFIG_ACCELGYRO_BMI160_INT_EVENT TASK_EVENT_CUSTOM(4)
diff --git a/board/poppy/board.h b/board/poppy/board.h
index 431d3634db..50d48cdbbb 100644
--- a/board/poppy/board.h
+++ b/board/poppy/board.h
@@ -123,7 +123,7 @@
#define CONFIG_MAG_BMI160_BMM150
#define CONFIG_ACCEL_INTERRUPTS
#define CONFIG_ACCELGYRO_BMI160_INT_EVENT TASK_EVENT_CUSTOM(4)
-#define BMI160_SEC_ADDR BMM150_ADDR0 /* 8-bit address */
+#define CONFIG_ACCELGYRO_SEC_ADDR BMM150_ADDR0 /* 8-bit address */
#define CONFIG_MAG_CALIBRATE
/* Lower maximal ODR to 100Hz */
#define CONFIG_EC_MAX_SENSOR_FREQ_MILLIHZ 100000
diff --git a/board/reef/board.h b/board/reef/board.h
index 3c4577ef2b..83facd8c04 100644
--- a/board/reef/board.h
+++ b/board/reef/board.h
@@ -195,7 +195,7 @@
#define CONFIG_ACCEL_INTERRUPTS
#define CONFIG_ACCELGYRO_BMI160_INT_EVENT TASK_EVENT_CUSTOM(4)
#define CONFIG_MAG_BMI160_BMM150
-#define BMI160_SEC_ADDR BMM150_ADDR0 /* 8-bit address */
+#define CONFIG_ACCELGYRO_SEC_ADDR BMM150_ADDR0 /* 8-bit address */
#define CONFIG_MAG_CALIBRATE
#define CONFIG_ACCEL_KX022
#define CONFIG_ALS_OPT3001
diff --git a/board/reef_mchp/board.h b/board/reef_mchp/board.h
index 1177268f20..7b6cdfbbe8 100644
--- a/board/reef_mchp/board.h
+++ b/board/reef_mchp/board.h
@@ -202,7 +202,7 @@
#define CONFIG_ACCEL_INTERRUPTS
#define CONFIG_ACCELGYRO_BMI160_INT_EVENT TASK_EVENT_CUSTOM(4)
#define CONFIG_MAG_BMI160_BMM150
-#define BMI160_SEC_ADDR BMM150_ADDR0 /* 8-bit address */
+#define CONFIG_ACCELGYRO_SEC_ADDR BMM150_ADDR0 /* 8-bit address */
#define CONFIG_MAG_CALIBRATE
#define CONFIG_ACCEL_KX022
#define CONFIG_ALS_OPT3001