From b804d54998a128e5dd4e4e78493d3d137428b166 Mon Sep 17 00:00:00 2001 From: Ting Shen Date: Tue, 2 Nov 2021 15:45:20 +0800 Subject: zephyr:it8xxx2: move i2c/adc to projects folder These items should be configured per-project BUG=b:202808130 TEST=1) zmake testall 2) zmake -D -l DEBUG configure -b zephyr/projects/corsola/krabby/ BRANCH=main Signed-off-by: Ting Shen Change-Id: Ie64273768686421245438df1e0776ff14d63aad6 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3256040 Reviewed-by: Rong Chang Commit-Queue: Ting Shen Tested-by: Ting Shen --- zephyr/boards/riscv/it8xxx2/it8xxx2.dts | 144 -------------------------------- zephyr/projects/corsola/krabby/BUILD.py | 8 +- zephyr/projects/corsola/krabby/adc.dts | 54 ++++++++++++ zephyr/projects/corsola/krabby/i2c.dts | 102 ++++++++++++++++++++++ 4 files changed, 163 insertions(+), 145 deletions(-) create mode 100644 zephyr/projects/corsola/krabby/adc.dts create mode 100644 zephyr/projects/corsola/krabby/i2c.dts diff --git a/zephyr/boards/riscv/it8xxx2/it8xxx2.dts b/zephyr/boards/riscv/it8xxx2/it8xxx2.dts index bf6f7a52d3..2a2cd2539d 100644 --- a/zephyr/boards/riscv/it8xxx2/it8xxx2.dts +++ b/zephyr/boards/riscv/it8xxx2/it8xxx2.dts @@ -6,7 +6,6 @@ /dts-v1/; #include -#include #include #include #include @@ -39,121 +38,6 @@ MKBP_EVENT_HOST_EVENT)>; }; - named-adc-channels { - compatible = "named-adc-channels"; - - adc_vbus_c0 { - label = "ADC_VBUS_C0"; - enum-name = "ADC_VBUS_C0"; - channel = <0>; - mul = <10>; - }; - adc_board_id0 { - label = "ADC_BOARD_ID_0"; - enum-name = "ADC_BOARD_ID_0"; - channel = <1>; - }; - adc_board_id1 { - label = "ADC_BOARD_ID_1"; - enum-name = "ADC_BOARD_ID_1"; - channel = <2>; - }; - adc_charger_amon_r { - label = "ADC_AMON_BMON"; - enum-name = "ADC_AMON_BMON"; - channel = <3>; - mul = <1000>; - div = <18>; - }; - adc_vbus_c1 { - label = "ADC_VBUS_C1"; - enum-name = "ADC_VBUS_C1"; - channel = <5>; - mul = <10>; - }; - adc_charger_pmon { - label = "ADC_PMON"; - enum-name = "ADC_PMON"; - channel = <6>; - }; - adc-psys { - label = "ADC_PSYS"; - enum-name = "ADC_PSYS"; - channel = <6>; - }; - }; - - named-i2c-ports { - compatible = "named-i2c-ports"; - - power { - i2c-port = <&i2c0>; - enum-name = "I2C_PORT_POWER"; - label = "POWER"; - }; - battery { - i2c-port = <&i2c0>; - remote-port = <0>; - enum-name = "I2C_PORT_BATTERY"; - label = "BATTERY"; - }; - virtual-battery { - i2c-port = <&i2c0>; - enum-name = "I2C_PORT_VIRTUAL_BATTERY"; - label = "VIRTUAL_BATTERY"; - }; - eeprom { - i2c-port = <&i2c0>; - enum-name = "I2C_PORT_EEPROM"; - label = "EEPROM"; - }; - charger { - i2c-port = <&i2c0>; - enum-name = "I2C_PORT_CHARGER"; - label = "CHARGER"; - }; - i2c_sensor: sensor { - i2c-port = <&i2c1>; - enum-name = "I2C_PORT_SENSOR"; - label = "SENSOR"; - }; - i2c-accel { - i2c-port = <&i2c1>; - enum-name = "I2C_PORT_ACCEL"; - label = "ACCEL"; - }; - ppc0 { - i2c-port = <&i2c2>; - enum-name = "I2C_PORT_PPC0"; - label = "PPC0"; - }; - ppc1 { - i2c-port = <&i2c4>; - enum-name = "I2C_PORT_PPC1"; - label = "PPC1"; - }; - usb-c0 { - i2c-port = <&i2c2>; - enum-name = "I2C_PORT_USB_C0"; - label = "USB_C0"; - }; - usb-c1 { - i2c-port = <&i2c4>; - enum-name = "I2C_PORT_USB_C1"; - label = "USB_C1"; - }; - usb-mux0 { - i2c-port = <&i2c2>; - enum-name = "I2C_PORT_USB_MUX0"; - label = "USB_MUX0"; - }; - usb-mux1 { - i2c-port = <&i2c4>; - enum-name = "I2C_PORT_USB_MUX1"; - label = "USB_MUX1"; - }; - }; - soc { /delete-node/ kscan@f01d00; @@ -174,34 +58,6 @@ clock-frequency = <1804800>; }; -&adc0 { - status = "okay"; -}; - -&i2c0 { - /* EC_I2C_PWR_CBI */ - status = "okay"; - clock-frequency = ; -}; - -&i2c1 { - /* EC_I2C_SENSOR */ - status = "okay"; - clock-frequency = ; -}; - -&i2c2 { - /* EC_I2C_USB_C0 */ - status = "okay"; - clock-frequency = ; -}; - -&i2c4{ - /* EC_I2C_USB_C1 */ - status = "okay"; - clock-frequency = ; -}; - &cros_kb_raw { status = "okay"; }; diff --git a/zephyr/projects/corsola/krabby/BUILD.py b/zephyr/projects/corsola/krabby/BUILD.py index 03c86a5013..87a1142dfa 100644 --- a/zephyr/projects/corsola/krabby/BUILD.py +++ b/zephyr/projects/corsola/krabby/BUILD.py @@ -5,5 +5,11 @@ register_binman_project( "krabby", zephyr_board="it8xxx2", - dts_overlays=["battery.dts", "gpio.dts", "motionsense.dts", "pwm.dts"], + dts_overlays=[ + "adc.dts", + "battery.dts", + "gpio.dts", + "i2c.dts", + "motionsense.dts", + "pwm.dts"], ) diff --git a/zephyr/projects/corsola/krabby/adc.dts b/zephyr/projects/corsola/krabby/adc.dts new file mode 100644 index 0000000000..7f308c04f9 --- /dev/null +++ b/zephyr/projects/corsola/krabby/adc.dts @@ -0,0 +1,54 @@ +/* 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. + */ + +/ { + named-adc-channels { + compatible = "named-adc-channels"; + + adc_vbus_c0 { + label = "ADC_VBUS_C0"; + enum-name = "ADC_VBUS_C0"; + channel = <0>; + mul = <10>; + }; + adc_board_id0 { + label = "ADC_BOARD_ID_0"; + enum-name = "ADC_BOARD_ID_0"; + channel = <1>; + }; + adc_board_id1 { + label = "ADC_BOARD_ID_1"; + enum-name = "ADC_BOARD_ID_1"; + channel = <2>; + }; + adc_charger_amon_r { + label = "ADC_AMON_BMON"; + enum-name = "ADC_AMON_BMON"; + channel = <3>; + mul = <1000>; + div = <18>; + }; + adc_vbus_c1 { + label = "ADC_VBUS_C1"; + enum-name = "ADC_VBUS_C1"; + channel = <5>; + mul = <10>; + }; + adc_charger_pmon { + label = "ADC_PMON"; + enum-name = "ADC_PMON"; + channel = <6>; + }; + adc-psys { + label = "ADC_PSYS"; + enum-name = "ADC_PSYS"; + channel = <6>; + }; + }; +}; + +&adc0 { + status = "okay"; +}; diff --git a/zephyr/projects/corsola/krabby/i2c.dts b/zephyr/projects/corsola/krabby/i2c.dts new file mode 100644 index 0000000000..7205bf19bc --- /dev/null +++ b/zephyr/projects/corsola/krabby/i2c.dts @@ -0,0 +1,102 @@ +/* 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. + */ + +/ { + named-i2c-ports { + compatible = "named-i2c-ports"; + + power { + i2c-port = <&i2c0>; + enum-name = "I2C_PORT_POWER"; + label = "POWER"; + }; + battery { + i2c-port = <&i2c0>; + remote-port = <0>; + enum-name = "I2C_PORT_BATTERY"; + label = "BATTERY"; + }; + virtual-battery { + i2c-port = <&i2c0>; + enum-name = "I2C_PORT_VIRTUAL_BATTERY"; + label = "VIRTUAL_BATTERY"; + }; + eeprom { + i2c-port = <&i2c0>; + enum-name = "I2C_PORT_EEPROM"; + label = "EEPROM"; + }; + charger { + i2c-port = <&i2c0>; + enum-name = "I2C_PORT_CHARGER"; + label = "CHARGER"; + }; + i2c_sensor: sensor { + i2c-port = <&i2c1>; + enum-name = "I2C_PORT_SENSOR"; + label = "SENSOR"; + }; + i2c-accel { + i2c-port = <&i2c1>; + enum-name = "I2C_PORT_ACCEL"; + label = "ACCEL"; + }; + ppc0 { + i2c-port = <&i2c2>; + enum-name = "I2C_PORT_PPC0"; + label = "PPC0"; + }; + ppc1 { + i2c-port = <&i2c4>; + enum-name = "I2C_PORT_PPC1"; + label = "PPC1"; + }; + usb-c0 { + i2c-port = <&i2c2>; + enum-name = "I2C_PORT_USB_C0"; + label = "USB_C0"; + }; + usb-c1 { + i2c-port = <&i2c4>; + enum-name = "I2C_PORT_USB_C1"; + label = "USB_C1"; + }; + usb-mux0 { + i2c-port = <&i2c2>; + enum-name = "I2C_PORT_USB_MUX0"; + label = "USB_MUX0"; + }; + usb-mux1 { + i2c-port = <&i2c4>; + enum-name = "I2C_PORT_USB_MUX1"; + label = "USB_MUX1"; + }; + }; + +}; + +&i2c0 { + /* EC_I2C_PWR_CBI */ + status = "okay"; + clock-frequency = ; +}; + +&i2c1 { + /* EC_I2C_SENSOR */ + status = "okay"; + clock-frequency = ; +}; + +&i2c2 { + /* EC_I2C_USB_C0 */ + status = "okay"; + clock-frequency = ; +}; + +&i2c4 { + /* EC_I2C_USB_C1 */ + status = "okay"; + clock-frequency = ; +}; -- cgit v1.2.1