summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRajesh Kumar <rajesh3.kumar@intel.com>2021-12-30 12:42:23 -0800
committerCommit Bot <commit-bot@chromium.org>2022-01-04 19:13:18 +0000
commite7387610873d2ebdcc42b81fd85498b0c556b7aa (patch)
tree06f77384a8f3a003062fe968a4759de1bc41a5ba
parent895d718383049164b586dda2af8b984d636bcc51 (diff)
downloadchrome-ec-e7387610873d2ebdcc42b81fd85498b0c556b7aa.tar.gz
zephyr: brya: Enable CBI configuration
Enable CBI configuration on brya. BUG=b:212660485 BRANCH=none TEST=zmake testall and ec console command "cbi" Signed-off-by: Rajesh Kumar <rajesh3.kumar@intel.com> Change-Id: I17d00546d2d7b950aae055d0c5d7ef0fa1ffd7b7 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3362496 Reviewed-by: Vijay P Hiremath <vijay.p.hiremath@intel.com> Reviewed-by: Keith Short <keithshort@chromium.org>
-rw-r--r--zephyr/projects/brya/brya/BUILD.py5
-rw-r--r--zephyr/projects/brya/brya/CMakeLists.txt9
-rw-r--r--zephyr/projects/brya/brya/cbi_eeprom.dts17
-rw-r--r--zephyr/projects/brya/brya/gpio.dts3
-rw-r--r--zephyr/projects/brya/brya/prj.conf2
5 files changed, 32 insertions, 4 deletions
diff --git a/zephyr/projects/brya/brya/BUILD.py b/zephyr/projects/brya/brya/BUILD.py
index 70696c1f3f..1091a2840a 100644
--- a/zephyr/projects/brya/brya/BUILD.py
+++ b/zephyr/projects/brya/brya/BUILD.py
@@ -5,5 +5,8 @@
register_npcx_project(
project_name="brya",
zephyr_board="brya",
- dts_overlays=["gpio.dts"],
+ dts_overlays=[
+ "cbi_eeprom.dts",
+ "gpio.dts",
+ ],
)
diff --git a/zephyr/projects/brya/brya/CMakeLists.txt b/zephyr/projects/brya/brya/CMakeLists.txt
index 59af20ebfe..c5f11ebf5f 100644
--- a/zephyr/projects/brya/brya/CMakeLists.txt
+++ b/zephyr/projects/brya/brya/CMakeLists.txt
@@ -7,4 +7,11 @@ cmake_minimum_required(VERSION 3.13.1)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(brya)
-zephyr_include_directories(include)
+set(PLATFORM_EC_BASEBOARD "${PLATFORM_EC}/baseboard/brya" CACHE PATH
+ "Path to the platform/ec baseboard directory")
+
+zephyr_include_directories(include
+ "${PLATFORM_EC_BASEBOARD}")
+
+zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CBI_EEPROM
+ "${PLATFORM_EC_BASEBOARD}/cbi.c")
diff --git a/zephyr/projects/brya/brya/cbi_eeprom.dts b/zephyr/projects/brya/brya/cbi_eeprom.dts
new file mode 100644
index 0000000000..f584c56afd
--- /dev/null
+++ b/zephyr/projects/brya/brya/cbi_eeprom.dts
@@ -0,0 +1,17 @@
+/* Copyright 2021 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.
+ */
+
+&i2c7_0 {
+ cbi_eeprom: eeprom@50 {
+ compatible = "atmel,at24";
+ reg = <0x50>;
+ label = "EEPROM_CBI";
+ size = <2048>;
+ pagesize = <16>;
+ address-width = <8>;
+ timeout = <5>;
+ wp-gpios = <&gpio_ec_wp_l>;
+ };
+};
diff --git a/zephyr/projects/brya/brya/gpio.dts b/zephyr/projects/brya/brya/gpio.dts
index daaa2db547..7476afcd84 100644
--- a/zephyr/projects/brya/brya/gpio.dts
+++ b/zephyr/projects/brya/brya/gpio.dts
@@ -19,7 +19,8 @@
label = "GSC_EC_PWR_BTN_ODL";
};
- wp_l {
+ gpio_ec_wp_l: wp_l {
+ #gpio-cells = <0>;
gpios = <&gpioa 1 GPIO_INPUT>;
enum-name = "GPIO_WP_L";
label = "EC_WP_ODL";
diff --git a/zephyr/projects/brya/brya/prj.conf b/zephyr/projects/brya/brya/prj.conf
index 49604ecef5..1126e110ee 100644
--- a/zephyr/projects/brya/brya/prj.conf
+++ b/zephyr/projects/brya/brya/prj.conf
@@ -7,6 +7,7 @@ CONFIG_PLATFORM_EC=y
CONFIG_PLATFORM_EC_BRINGUP=y
CONFIG_SHIMMED_TASKS=y
CONFIG_PLATFORM_EC_POWER_BUTTON=y
+CONFIG_PLATFORM_EC_CBI_EEPROM=y
CONFIG_PLATFORM_EC_LID_SWITCH=y
CONFIG_PLATFORM_EC_SWITCH=y
CONFIG_LTO=y
@@ -66,7 +67,6 @@ CONFIG_PLATFORM_EC_WORKAROUND_FLASH_DOWNLOAD_API=y
CONFIG_SYSCON=y
# TODO(b/188605676): bring these features up
-CONFIG_PLATFORM_EC_BOARD_VERSION_CBI=n
CONFIG_PLATFORM_EC_BOARD_VERSION_GPIO=n
# Power Sequencing