From c8af732351cc5c7167f27e8390e26f0556f53a5a Mon Sep 17 00:00:00 2001 From: YH Lin Date: Sat, 3 Dec 2022 00:19:30 +0000 Subject: Revert "Merge remote-tracking branch cros/main into factory-brya-14517.B-main" This reverts commit af25602b15b22b9ef5821dcba9934311f2157c48. Reason for revert: broken build due to ec-utils. Original change's description: > Merge remote-tracking branch cros/main into factory-brya-14517.B-main > > Generated by: util/update_release_branch.py --baseboard brya --relevant_paths_file > baseboard/brya/relevant-paths.txt factory-brya-14517.B-main > > Relevant changes: > > git log --oneline 54462f034b..aa40b859b3 -- baseboard/brya board/agah > board/anahera board/banshee board/brya board/crota board/felwinter > board/gimble board/kano board/mithrax board/osiris board/primus > board/redrix board/taeko board/taniks board/vell board/volmar > driver/bc12/pi3usb9201_public.* driver/charger/bq25710.* > driver/ppc/nx20p348x.* driver/ppc/syv682x_public.* > driver/retimer/bb_retimer_public.* driver/tcpm/nct38xx.* > driver/tcpm/ps8xxx_public.* driver/tcpm/tcpci.* include/power/alderlake* > include/intel_x86.h power/alderlake* power/intel_x86.c > util/getversion.sh > > e6da633c38 driver: Sort header files > 234a87ae2d tcpci: Add FRS enable to driver structure > a56be59ccd tcpm_header: add test for tcpm_dump_registers > 57b3256963 Rename CONFIG_CHARGER_INPUT_CURRENT to _CHARGER_DEFAULT_CURRENT_LIMIT > e420c8ff9a marasov: Modify TypeC and TypeA configuration. > 43b53e0045 Add default implementation of board_set_charge_limit > b75dc90677 Add CONFIG_CHARGER_MIN_INPUT_CURRENT_LIMIT > f1b563c350 baseboard: Sort header files > 7d01b1e58d driver/retimer/ps8818.h: Add I2C ADDR FLAGS 0x30, 0x58, 0x70 > ec31407993 Add CONFIG_CHARGER_INPUT_CURRENT_DERATE_PCT > 8f89f69a5b crota: disable lid angle sensor for clamshell > > BRANCH=None > BUG=b:259002141 b:255184961 b:247100970 b:259354679 b:260630630 > BUG=b:163093572 b:254328661 > TEST=`emerge-brya chromeos-ec` > > Force-Relevant-Builds: all > Change-Id: Ia85a701fbf6b8e67ec214b9e25e0e55e980a6f47 > Signed-off-by: YH Lin Bug: b:259002141 b:255184961 b:247100970 b:259354679 b:260630630 Bug: b:163093572 b:254328661 Change-Id: I48d5aa4cc67a69ee1f6ac9255ac3087d34da4c72 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4077248 Tested-by: YH Lin Commit-Queue: YH Lin Reviewed-by: Boris Mittelberg Auto-Submit: YH Lin --- .../dts/bindings/battery/battery-fuel-gauge.yaml | 2 + zephyr/dts/bindings/battery/battery-info.yaml | 2 + zephyr/dts/bindings/battery/battery-smart.yaml | 1 - zephyr/dts/bindings/battery/cosmx,ap20cbl-2.yaml | 12 +- zephyr/dts/bindings/battery/ganfeng,sg20.yaml | 53 ------- .../dts/bindings/cbi/cros-ec,cbi-ssfc-value.yaml | 22 --- zephyr/dts/bindings/cbi/cros-ec,cbi-ssfc.yaml | 56 ------- zephyr/dts/bindings/cbi/named-cbi-ssfc-value.yaml | 22 +++ zephyr/dts/bindings/cbi/named-cbi-ssfc.yaml | 56 +++++++ zephyr/dts/bindings/charger/richtek,rt9490.yaml | 11 +- .../mediatek,mt8186-power-signal-list.yaml | 20 --- .../mediatek,mt8192-power-signal-list.yaml | 19 --- .../cros_pwr_signal/mt8186,power-signal-list.yaml | 20 +++ .../cros_pwr_signal/mt8192,power-signal-list.yaml | 19 +++ .../dts/bindings/emul/cros,anx7447-tcpc-emul.yaml | 16 -- zephyr/dts/bindings/emul/cros,anx7447-tcpc.yaml | 16 ++ zephyr/dts/bindings/emul/cros,bb-retimer-emul.yaml | 30 ++++ zephyr/dts/bindings/emul/zephyr,bma255-emul.yaml | 83 ----------- zephyr/dts/bindings/emul/zephyr,bma255.yaml | 83 +++++++++++ zephyr/dts/bindings/emul/zephyr,bmi-emul.yaml | 42 ------ zephyr/dts/bindings/emul/zephyr,bmi.yaml | 42 ++++++ .../dts/bindings/emul/zephyr,pi3usb9201-emul.yaml | 9 ++ .../bindings/emul/zephyr,smart-battery-emul.yaml | 161 --------------------- zephyr/dts/bindings/emul/zephyr,smart-battery.yaml | 161 +++++++++++++++++++++ zephyr/dts/bindings/emul/zephyr,tcs3400-emul.yaml | 44 ------ zephyr/dts/bindings/emul/zephyr,tcs3400.yaml | 44 ++++++ zephyr/dts/bindings/emul/zephyr,tusb1064-emul.yaml | 9 -- zephyr/dts/bindings/emul/zephyr,tusb1064.yaml | 9 ++ zephyr/dts/bindings/fan/cros-ec,fan-steps.yaml | 27 ---- zephyr/dts/bindings/fan/cros-ec,fans.yaml | 6 - zephyr/dts/bindings/gpio/gpio-enum-name.yaml | 1 - zephyr/dts/bindings/gpio/named-gpios.yaml | 5 + zephyr/dts/bindings/keyboard/cros-ec,keyscan.yaml | 82 ----------- zephyr/dts/bindings/keyboard/cros-keyscan.yaml | 82 +++++++++++ zephyr/dts/bindings/led/maxim,max695x.yaml | 18 --- .../dts/bindings/led/maxim,seven-seg-display.yaml | 19 +++ .../dts/bindings/leds/cros-ec,gpio-led-pins.yaml | 19 +-- zephyr/dts/bindings/leds/cros-ec,pwm-led-pins.yaml | 21 +-- .../dts/bindings/leds/cros-ec,pwm-pin-config.yaml | 19 +++ .../bindings/power/intel,ap-pwr-signal-emul.yaml | 124 ---------------- .../bindings/power/intel,ap-pwr-test-platform.yaml | 18 --- .../bindings/switchcap/cros-ec,switchcap-gpio.yaml | 22 --- zephyr/dts/bindings/switchcap/lion,ln9310.yaml | 28 ---- zephyr/dts/bindings/switchcap/switchcap-gpio.yaml | 22 +++ .../dts/bindings/switchcap/switchcap-ln9310.yaml | 28 ++++ .../bindings/usbc/bc12/richtek,rt9490-bc12.yaml | 15 ++ .../dts/bindings/usbc/tcpc/renesas,raa489000.yaml | 16 -- zephyr/dts/board-overlays/native_posix.dts | 3 - zephyr/dts/it8xxx2_emul.dts | 10 -- 49 files changed, 729 insertions(+), 920 deletions(-) delete mode 100644 zephyr/dts/bindings/battery/ganfeng,sg20.yaml delete mode 100644 zephyr/dts/bindings/cbi/cros-ec,cbi-ssfc-value.yaml delete mode 100644 zephyr/dts/bindings/cbi/cros-ec,cbi-ssfc.yaml create mode 100644 zephyr/dts/bindings/cbi/named-cbi-ssfc-value.yaml create mode 100644 zephyr/dts/bindings/cbi/named-cbi-ssfc.yaml delete mode 100644 zephyr/dts/bindings/cros_pwr_signal/mediatek,mt8186-power-signal-list.yaml delete mode 100644 zephyr/dts/bindings/cros_pwr_signal/mediatek,mt8192-power-signal-list.yaml create mode 100644 zephyr/dts/bindings/cros_pwr_signal/mt8186,power-signal-list.yaml create mode 100644 zephyr/dts/bindings/cros_pwr_signal/mt8192,power-signal-list.yaml delete mode 100644 zephyr/dts/bindings/emul/cros,anx7447-tcpc-emul.yaml create mode 100644 zephyr/dts/bindings/emul/cros,anx7447-tcpc.yaml create mode 100644 zephyr/dts/bindings/emul/cros,bb-retimer-emul.yaml delete mode 100644 zephyr/dts/bindings/emul/zephyr,bma255-emul.yaml create mode 100644 zephyr/dts/bindings/emul/zephyr,bma255.yaml delete mode 100644 zephyr/dts/bindings/emul/zephyr,bmi-emul.yaml create mode 100644 zephyr/dts/bindings/emul/zephyr,bmi.yaml create mode 100644 zephyr/dts/bindings/emul/zephyr,pi3usb9201-emul.yaml delete mode 100644 zephyr/dts/bindings/emul/zephyr,smart-battery-emul.yaml create mode 100644 zephyr/dts/bindings/emul/zephyr,smart-battery.yaml delete mode 100644 zephyr/dts/bindings/emul/zephyr,tcs3400-emul.yaml create mode 100644 zephyr/dts/bindings/emul/zephyr,tcs3400.yaml delete mode 100644 zephyr/dts/bindings/emul/zephyr,tusb1064-emul.yaml create mode 100644 zephyr/dts/bindings/emul/zephyr,tusb1064.yaml delete mode 100644 zephyr/dts/bindings/fan/cros-ec,fan-steps.yaml delete mode 100644 zephyr/dts/bindings/keyboard/cros-ec,keyscan.yaml create mode 100644 zephyr/dts/bindings/keyboard/cros-keyscan.yaml delete mode 100644 zephyr/dts/bindings/led/maxim,max695x.yaml create mode 100644 zephyr/dts/bindings/led/maxim,seven-seg-display.yaml create mode 100644 zephyr/dts/bindings/leds/cros-ec,pwm-pin-config.yaml delete mode 100644 zephyr/dts/bindings/power/intel,ap-pwr-signal-emul.yaml delete mode 100644 zephyr/dts/bindings/power/intel,ap-pwr-test-platform.yaml delete mode 100644 zephyr/dts/bindings/switchcap/cros-ec,switchcap-gpio.yaml delete mode 100644 zephyr/dts/bindings/switchcap/lion,ln9310.yaml create mode 100644 zephyr/dts/bindings/switchcap/switchcap-gpio.yaml create mode 100644 zephyr/dts/bindings/switchcap/switchcap-ln9310.yaml create mode 100644 zephyr/dts/bindings/usbc/bc12/richtek,rt9490-bc12.yaml delete mode 100644 zephyr/dts/bindings/usbc/tcpc/renesas,raa489000.yaml (limited to 'zephyr/dts') diff --git a/zephyr/dts/bindings/battery/battery-fuel-gauge.yaml b/zephyr/dts/bindings/battery/battery-fuel-gauge.yaml index 83bd825236..d2fed4bfa6 100644 --- a/zephyr/dts/bindings/battery/battery-fuel-gauge.yaml +++ b/zephyr/dts/bindings/battery/battery-fuel-gauge.yaml @@ -5,6 +5,8 @@ description: | Battery fuel gauge parameters +compatible: "battery-fuel-gauge" + properties: manuf_name: description: | diff --git a/zephyr/dts/bindings/battery/battery-info.yaml b/zephyr/dts/bindings/battery/battery-info.yaml index c188616260..54e81cedeb 100644 --- a/zephyr/dts/bindings/battery/battery-info.yaml +++ b/zephyr/dts/bindings/battery/battery-info.yaml @@ -8,6 +8,8 @@ description: Current is in milliamperes Temperature is in Celsius degrees +compatible: "battery-info" + properties: voltage_max: description: | diff --git a/zephyr/dts/bindings/battery/battery-smart.yaml b/zephyr/dts/bindings/battery/battery-smart.yaml index 5992226291..1d0c9786eb 100644 --- a/zephyr/dts/bindings/battery/battery-smart.yaml +++ b/zephyr/dts/bindings/battery/battery-smart.yaml @@ -28,7 +28,6 @@ properties: - "dynapack,cosmx_gh02047xl" - "dynapack,c140254" - "ganfeng,7c01" - - "ganfeng,sg20" - "getac,bq40z50-R3-S3" - "getac,bq40z50-R3-S2" - "lgc,ac17a8m" diff --git a/zephyr/dts/bindings/battery/cosmx,ap20cbl-2.yaml b/zephyr/dts/bindings/battery/cosmx,ap20cbl-2.yaml index 7faceedb11..5e64834f15 100644 --- a/zephyr/dts/bindings/battery/cosmx,ap20cbl-2.yaml +++ b/zephyr/dts/bindings/battery/cosmx,ap20cbl-2.yaml @@ -17,22 +17,22 @@ properties: default: 0x3A ship_mode_reg_data: default: [ 0xC574, 0xC574 ] - # Documentation: b/257860663#comment7 + # Documentation: b/243772306 # Manufacturer Access 0x00 - # b14: Charging Disabled (0: Off, 1: On) - # b13: Discharging Disabled (0: Off, 1: On) + # b14: C-FET Status (0: Off, 1: On) + # b15: D-FET Status (0: Off, 1: On) fet_mfgacc_support: default: 1 fet_reg_addr: default: 0x0 fet_reg_mask: - default: 0x2000 + default: 0x8000 fet_disconnect_val: - default: 0x2000 + default: 0x0000 fet_cfet_mask: default: 0x4000 fet_cfet_off_val: - default: 0x4000 + default: 0x0000 # Battery info voltage_max: diff --git a/zephyr/dts/bindings/battery/ganfeng,sg20.yaml b/zephyr/dts/bindings/battery/ganfeng,sg20.yaml deleted file mode 100644 index 6e8f558b00..0000000000 --- a/zephyr/dts/bindings/battery/ganfeng,sg20.yaml +++ /dev/null @@ -1,53 +0,0 @@ -description: "Ganfeng SG20" -compatible: "ganfeng,sg20" - -include: battery-smart.yaml - -properties: - enum-name: - type: string - default: "ganfeng,sg20" - - # Fuel gauge - manuf_name: - default: "Ganfeng" - device_name: - default: "SG20" - ship_mode_reg_addr: - default: 0x00 - ship_mode_reg_data: - default: [ 0x0010, 0x0010 ] - fet_mfgacc_support: - default: 0 - fet_reg_addr: - default: 0x43 - fet_reg_mask: - default: 0x0001 - fet_disconnect_val: - default: 0x0000 - fet_cfet_mask: - default: 0x0002 - fet_cfet_off_val: - default: 0x0000 - - # Battery info - voltage_max: - default: 8700 - voltage_normal: - default: 7600 - voltage_min: - default: 6000 - precharge_current: - default: 256 - start_charging_min_c: - default: 0 - start_charging_max_c: - default: 50 - charging_min_c: - default: 0 - charging_max_c: - default: 60 - discharging_min_c: - default: -20 - discharging_max_c: - default: 60 diff --git a/zephyr/dts/bindings/cbi/cros-ec,cbi-ssfc-value.yaml b/zephyr/dts/bindings/cbi/cros-ec,cbi-ssfc-value.yaml deleted file mode 100644 index 6bbba1bdd7..0000000000 --- a/zephyr/dts/bindings/cbi/cros-ec,cbi-ssfc-value.yaml +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 2021 The ChromiumOS Authors -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -description: - Possible CBI SSFC field values. - It has to be defined as grandchild on the "cros-ec,cbi-ssfc" - -compatible: "cros-ec,cbi-ssfc-value" - -properties: - value: - type: int - required: true - description: - Unique value of CBI SSFC field - default: - type: boolean - description: - Indicates that the specified value is default for the parent - CBI SSFC field node. It should appear only once for the CBI SSFC - definition. diff --git a/zephyr/dts/bindings/cbi/cros-ec,cbi-ssfc.yaml b/zephyr/dts/bindings/cbi/cros-ec,cbi-ssfc.yaml deleted file mode 100644 index d1cc4c26e5..0000000000 --- a/zephyr/dts/bindings/cbi/cros-ec,cbi-ssfc.yaml +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 2021 The ChromiumOS Authors -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -description: CBI Second Source Factory Cache (SSFC) - -compatible: "cros-ec,cbi-ssfc" - -child-binding: - description: - CBI SSFC fields definition. - The order of the children in this node define the order - of the SSFC bit fields from least significant bit to most - significant bit. The total size of all SSFC bit fields - must not exceed 32 bits. - properties: - enum-name: - type: string - required: true - description: - Enum values used only for description purposes - enum: - - AUDIO_CODEC - - BASE_SENSOR - - LID_SENSOR - - LIGHTBAR - - USB_SS_MUX - size: - type: int - required: true - description: The size of the field in bits. - -# Example: -# -# cbi-ssfc { -# compatible = "cros-ec,cbi-ssfc"; -# -# base_sensor { -# enum-name = "BASE_SENSOR"; -# size = <3>; -# bmi160 { -# compatible = "cros-ec,cbi-ssfc-value"; -# status = "okay"; -# -# value = <1>; -# devices = <&alt_base_accel &alt_base_gyro>; -# }; -# kx022 { -# compatible = "cros-ec,cbi-ssfc-value"; -# status = "okay"; -# -# value = <3>; -# devices = <&base_accel_kx022>; -# }; -# }; -# }; diff --git a/zephyr/dts/bindings/cbi/named-cbi-ssfc-value.yaml b/zephyr/dts/bindings/cbi/named-cbi-ssfc-value.yaml new file mode 100644 index 0000000000..7e04afed87 --- /dev/null +++ b/zephyr/dts/bindings/cbi/named-cbi-ssfc-value.yaml @@ -0,0 +1,22 @@ +# Copyright 2021 The ChromiumOS Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +description: + Possible CBI SSFC field values. + It has to be defied as grandchild on the "named-cbi-ssfc" + +compatible: "named-cbi-ssfc-value" + +properties: + value: + type: int + required: true + description: + Unique value of CBI SSFC field + default: + type: boolean + description: + Indicates that the specified value is default for the parent + CBI SSFC field node. It should appear only once for the CBI SSFC + definition. diff --git a/zephyr/dts/bindings/cbi/named-cbi-ssfc.yaml b/zephyr/dts/bindings/cbi/named-cbi-ssfc.yaml new file mode 100644 index 0000000000..2db330079d --- /dev/null +++ b/zephyr/dts/bindings/cbi/named-cbi-ssfc.yaml @@ -0,0 +1,56 @@ +# Copyright 2021 The ChromiumOS Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +description: CBI Second Source Factory Cache (SSFC) + +compatible: "named-cbi-ssfc" + +child-binding: + description: + CBI SSFC fields definition. + The order of the children in this node define the order + of the SSFC bit fields from least significant bit to most + significant bit. The total size of all SSFC bit fields + must not exceed 32 bits. + properties: + enum-name: + type: string + required: true + description: + Enum values used only for description purposes + enum: + - AUDIO_CODEC + - BASE_SENSOR + - LID_SENSOR + - LIGHTBAR + - USB_SS_MUX + size: + type: int + required: true + description: The size of the field in bits. + +# Example: +# +# cbi-ssfc { +# compatible = "named-cbi-ssfc"; +# +# base_sensor { +# enum-name = "BASE_SENSOR"; +# size = <3>; +# bmi160 { +# compatible = "named-cbi-ssfc-value"; +# status = "okay"; +# +# value = <1>; +# devices = <&alt_base_accel &alt_base_gyro>; +# }; +# kx022 { +# compatible = "named-cbi-ssfc-value"; +# status = "okay"; +# +# value = <3>; +# devices = <&base_accel_kx022>; +# }; +# }; +# }; \ No newline at end of file diff --git a/zephyr/dts/bindings/charger/richtek,rt9490.yaml b/zephyr/dts/bindings/charger/richtek,rt9490.yaml index 0f9acf999a..ecd25696f3 100644 --- a/zephyr/dts/bindings/charger/richtek,rt9490.yaml +++ b/zephyr/dts/bindings/charger/richtek,rt9490.yaml @@ -9,11 +9,6 @@ compatible: "richtek,rt9490" include: chg-chip.yaml properties: - irq: - type: phandles - description: | - GPIO interrupt from BC1.2 - - thermistor: - type: phandle - description: Underlying thermistor device to measure temperature + thermistor: + type: phandle + description: Underlying thermistor device to measure temperature diff --git a/zephyr/dts/bindings/cros_pwr_signal/mediatek,mt8186-power-signal-list.yaml b/zephyr/dts/bindings/cros_pwr_signal/mediatek,mt8186-power-signal-list.yaml deleted file mode 100644 index 5f0e75f717..0000000000 --- a/zephyr/dts/bindings/cros_pwr_signal/mediatek,mt8186-power-signal-list.yaml +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 2021 Google LLC -# SPDX-License-Identifier: Apache-2.0 - -description: MediaTek MT8186, Power Signal List -compatible: "mediatek,mt8186-power-signal-list" - -include: power-signal-list.yaml - -properties: - power-signals-required: - default: 4 - -child-binding: - properties: - power-enum-name: - enum: - - AP_IN_RST - - AP_IN_S3 - - AP_WDT_ASSERTED - - AP_WARM_RST_REQ diff --git a/zephyr/dts/bindings/cros_pwr_signal/mediatek,mt8192-power-signal-list.yaml b/zephyr/dts/bindings/cros_pwr_signal/mediatek,mt8192-power-signal-list.yaml deleted file mode 100644 index 8bbd1207eb..0000000000 --- a/zephyr/dts/bindings/cros_pwr_signal/mediatek,mt8192-power-signal-list.yaml +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2021 Google LLC -# SPDX-License-Identifier: Apache-2.0 - -description: MediaTek, Power Signal List -compatible: "mediatek,mt8192-power-signal-list" - -include: power-signal-list.yaml - -properties: - power-signals-required: - default: 3 - -child-binding: - properties: - power-enum-name: - enum: - - AP_IN_S3_L - - AP_WDT_ASSERTED - - PMIC_PWR_GOOD diff --git a/zephyr/dts/bindings/cros_pwr_signal/mt8186,power-signal-list.yaml b/zephyr/dts/bindings/cros_pwr_signal/mt8186,power-signal-list.yaml new file mode 100644 index 0000000000..6e9af9ccef --- /dev/null +++ b/zephyr/dts/bindings/cros_pwr_signal/mt8186,power-signal-list.yaml @@ -0,0 +1,20 @@ +# Copyright 2021 Google LLC +# SPDX-License-Identifier: Apache-2.0 + +description: MediaTek MT8186, Power Signal List +compatible: "mt8186,power-signal-list" + +include: power-signal-list.yaml + +properties: + power-signals-required: + default: 4 + +child-binding: + properties: + power-enum-name: + enum: + - AP_IN_RST + - AP_IN_S3 + - AP_WDT_ASSERTED + - AP_WARM_RST_REQ diff --git a/zephyr/dts/bindings/cros_pwr_signal/mt8192,power-signal-list.yaml b/zephyr/dts/bindings/cros_pwr_signal/mt8192,power-signal-list.yaml new file mode 100644 index 0000000000..b1dedb76c8 --- /dev/null +++ b/zephyr/dts/bindings/cros_pwr_signal/mt8192,power-signal-list.yaml @@ -0,0 +1,19 @@ +# Copyright 2021 Google LLC +# SPDX-License-Identifier: Apache-2.0 + +description: MediaTek, Power Signal List +compatible: "mt8192,power-signal-list" + +include: power-signal-list.yaml + +properties: + power-signals-required: + default: 3 + +child-binding: + properties: + power-enum-name: + enum: + - AP_IN_S3_L + - AP_WDT_ASSERTED + - PMIC_PWR_GOOD diff --git a/zephyr/dts/bindings/emul/cros,anx7447-tcpc-emul.yaml b/zephyr/dts/bindings/emul/cros,anx7447-tcpc-emul.yaml deleted file mode 100644 index a4b41a0cec..0000000000 --- a/zephyr/dts/bindings/emul/cros,anx7447-tcpc-emul.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 2022 The ChromiumOS Authors -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. -# -description: Zephyr ANX7447 emulator - -compatible: "cros,anx7447-tcpc-emul" - -include: i2c-device.yaml - -properties: - tcpc-flags: - type: int - default: 0 - description: | - TCPC configuration flags diff --git a/zephyr/dts/bindings/emul/cros,anx7447-tcpc.yaml b/zephyr/dts/bindings/emul/cros,anx7447-tcpc.yaml new file mode 100644 index 0000000000..562485d03d --- /dev/null +++ b/zephyr/dts/bindings/emul/cros,anx7447-tcpc.yaml @@ -0,0 +1,16 @@ +# Copyright 2022 The ChromiumOS Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +# +description: Zephyr ANX7447 emulator + +compatible: "cros,anx7447-emul" + +include: i2c-device.yaml + +properties: + tcpc-flags: + type: int + default: 0 + description: | + TCPC configuration flags diff --git a/zephyr/dts/bindings/emul/cros,bb-retimer-emul.yaml b/zephyr/dts/bindings/emul/cros,bb-retimer-emul.yaml new file mode 100644 index 0000000000..11dd5f5218 --- /dev/null +++ b/zephyr/dts/bindings/emul/cros,bb-retimer-emul.yaml @@ -0,0 +1,30 @@ +# Copyright 2021 The ChromiumOS Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +description: Zephyr BB retimer Emulator + +compatible: "cros,bb-retimer-emul" + +include: base.yaml + +properties: + vendor: + type: string + required: true + enum: + - BB_RETIMER_VENDOR_ID_1 + - BB_RETIMER_VENDOR_ID_2 + description: Vendor ID used by device that is emulated. + + error-on-ro-write: + type: boolean + description: + Flag indicating if error should be generated when read only register + is being written. + + error-on-reserved-bit-write: + type: boolean + description: + Flag indicating if error should be generated when reserved bit + is being written. diff --git a/zephyr/dts/bindings/emul/zephyr,bma255-emul.yaml b/zephyr/dts/bindings/emul/zephyr,bma255-emul.yaml deleted file mode 100644 index 7017d62667..0000000000 --- a/zephyr/dts/bindings/emul/zephyr,bma255-emul.yaml +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 2021 The ChromiumOS Authors -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -description: Zephyr BMA255 Emulator - -compatible: "zephyr,bma255-emul" - -include: base.yaml - -properties: - nvm-off-x: - type: int - required: false - default: 0 - description: Accelerometer offset of x axis stored in NVM. - - nvm-off-y: - type: int - required: false - default: 0 - description: Accelerometer offset of y axis stored in NVM. - - nvm-off-z: - type: int - required: false - default: 0 - description: Accelerometer offset of z axis stored in NVM. - - nvm-gp0: - type: int - required: false - default: 0 - description: GP0 value stored in NVM. - - nvm-gp1: - type: int - required: false - default: 0 - description: GP1 value stored in NVM. - - nvm-acc-x: - type: int - required: false - default: 0 - description: Accelerometer value of x axis used until new value is set. - - nvm-acc-y: - type: int - required: false - default: 0 - description: Accelerometer value of y axis used until new value is set. - - nvm-acc-z: - type: int - required: false - default: 0 - description: Accelerometer value of z axis used until new value is set. - - error-on-compensation-not-ready: - type: boolean - description: - Flag indicating if error should be generated when fast compensation - is started when not ready bit is set. - - error-on-ro-write: - type: boolean - description: - Flag indicating if error should be generated when read only register - is being written. - - error-on-reserved-bit-write: - type: boolean - description: - Flag indicating if error should be generated when reserved bit - is being written. - - error-on-msb-first-access: - type: boolean - description: - Flag indicating if error should be generated when MSB register of - accelerometer value is accessed before LSB and shadowing is enabled - at the same time. diff --git a/zephyr/dts/bindings/emul/zephyr,bma255.yaml b/zephyr/dts/bindings/emul/zephyr,bma255.yaml new file mode 100644 index 0000000000..3f504e05a5 --- /dev/null +++ b/zephyr/dts/bindings/emul/zephyr,bma255.yaml @@ -0,0 +1,83 @@ +# Copyright 2021 The ChromiumOS Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +description: Zephyr BMA255 Emulator + +compatible: "zephyr,bma255" + +include: base.yaml + +properties: + nvm-off-x: + type: int + required: false + default: 0 + description: Accelerometer offset of x axis stored in NVM. + + nvm-off-y: + type: int + required: false + default: 0 + description: Accelerometer offset of y axis stored in NVM. + + nvm-off-z: + type: int + required: false + default: 0 + description: Accelerometer offset of z axis stored in NVM. + + nvm-gp0: + type: int + required: false + default: 0 + description: GP0 value stored in NVM. + + nvm-gp1: + type: int + required: false + default: 0 + description: GP1 value stored in NVM. + + nvm-acc-x: + type: int + required: false + default: 0 + description: Accelerometer value of x axis used until new value is set. + + nvm-acc-y: + type: int + required: false + default: 0 + description: Accelerometer value of y axis used until new value is set. + + nvm-acc-z: + type: int + required: false + default: 0 + description: Accelerometer value of z axis used until new value is set. + + error-on-compensation-not-ready: + type: boolean + description: + Flag indicating if error should be generated when fast compensation + is started when not ready bit is set. + + error-on-ro-write: + type: boolean + description: + Flag indicating if error should be generated when read only register + is being written. + + error-on-reserved-bit-write: + type: boolean + description: + Flag indicating if error should be generated when reserved bit + is being written. + + error-on-msb-first-access: + type: boolean + description: + Flag indicating if error should be generated when MSB register of + accelerometer value is accessed before LSB and shadowing is enabled + at the same time. diff --git a/zephyr/dts/bindings/emul/zephyr,bmi-emul.yaml b/zephyr/dts/bindings/emul/zephyr,bmi-emul.yaml deleted file mode 100644 index b8b1d2551d..0000000000 --- a/zephyr/dts/bindings/emul/zephyr,bmi-emul.yaml +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 2021 The ChromiumOS Authors -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -description: Zephyr BMI Emulator - -compatible: "zephyr,bmi-emul" - -include: base.yaml - -properties: - device-model: - type: string - required: true - enum: - - BMI_EMUL_160 - - BMI_EMUL_260 - description: Model of device that is emulated. - - error-on-ro-write: - type: boolean - description: - Flag indicating if error should be generated when read only register - is being written. - - error-on-wo-read: - type: boolean - description: - Flag indicating if error should be generated when write only register - is being read. - - error-on-reserved-bit-write: - type: boolean - description: - Flag indicating if error should be generated when reserved bit - is being written. - - simulate-command-exec-time: - type: boolean - description: - Flag indicating if emulator should wait the same amount of time before - finishing command as real device would. diff --git a/zephyr/dts/bindings/emul/zephyr,bmi.yaml b/zephyr/dts/bindings/emul/zephyr,bmi.yaml new file mode 100644 index 0000000000..6280d5cc39 --- /dev/null +++ b/zephyr/dts/bindings/emul/zephyr,bmi.yaml @@ -0,0 +1,42 @@ +# Copyright 2021 The ChromiumOS Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +description: Zephyr BMI Emulator + +compatible: "zephyr,bmi" + +include: base.yaml + +properties: + device-model: + type: string + required: true + enum: + - BMI_EMUL_160 + - BMI_EMUL_260 + description: Model of device that is emulated. + + error-on-ro-write: + type: boolean + description: + Flag indicating if error should be generated when read only register + is being written. + + error-on-wo-read: + type: boolean + description: + Flag indicating if error should be generated when write only register + is being read. + + error-on-reserved-bit-write: + type: boolean + description: + Flag indicating if error should be generated when reserved bit + is being written. + + simulate-command-exec-time: + type: boolean + description: + Flag indicating if emulator should wait the same amount of time before + finishing command as real device would. diff --git a/zephyr/dts/bindings/emul/zephyr,pi3usb9201-emul.yaml b/zephyr/dts/bindings/emul/zephyr,pi3usb9201-emul.yaml new file mode 100644 index 0000000000..1f26a62f73 --- /dev/null +++ b/zephyr/dts/bindings/emul/zephyr,pi3usb9201-emul.yaml @@ -0,0 +1,9 @@ +# Copyright 2021 The ChromiumOS Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +description: Zephyr pi3usb9201 Emulator + +compatible: "zephyr,pi3usb9201-emul" + +include: base.yaml diff --git a/zephyr/dts/bindings/emul/zephyr,smart-battery-emul.yaml b/zephyr/dts/bindings/emul/zephyr,smart-battery-emul.yaml deleted file mode 100644 index 88060b01d7..0000000000 --- a/zephyr/dts/bindings/emul/zephyr,smart-battery-emul.yaml +++ /dev/null @@ -1,161 +0,0 @@ -# Copyright 2021 The ChromiumOS Authors -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -description: Zephyr Smart Battery Emulator - -compatible: "zephyr,smart-battery-emul" - -include: base.yaml - -properties: - mf-access: - type: int - required: false - default: 0 - description: Word returned on manufacturer access command. - - at-rate-full-mw-support: - type: boolean - description: - Flag indicating if AT_RATE_TIME_TO_FULL command supports mW capacity - mode. - - version: - type: string - required: false - enum: - - BATTERY_SPEC_VER_1_0 - - BATTERY_SPEC_VER_1_1 - - BATTERY_SPEC_VER_1_1_WITH_PEC - default: BATTERY_SPEC_VER_1_1_WITH_PEC - description: Version of Smart Battery. - - vscale: - type: int - required: false - default: 0 - description: Scaling of voltage. - - ipscale: - type: int - required: false - default: 0 - description: Scaling of current. - - int-charge-controller: - type: boolean - description: Flag indicating if internal charge controller is supported. - - primary-battery: - type: boolean - description: - Flag indicating if primary battery role selection is supported. - - design-mv: - type: int - required: false - default: 5000 - description: Design battery voltage in mV. - - design-cap: - type: int - required: false - default: 5000 - description: Design battery capacity in mAh. - - temperature: - type: int - required: false - default: 2930 - description: Battery temperature in 0.1 Kelvins. - - volt: - type: int - required: false - default: 5000 - description: Battery voltage in mV. - - cur: - type: int - required: false - default: 1000 - description: Current charging (> 0) or discharging (< 0) battery in mA. - - avg-cur: - type: int - required: false - default: 1000 - description: Average current from 1 minute. - - max-error: - type: int - required: false - default: 0 - description: Maximum error of commands return value in percent. - - cap: - type: int - required: false - default: 2000 - description: Capacity of the battery in mAh. - - full-cap: - type: int - required: false - default: 4000 - description: Full capacity of the battery in mAh. - - desired-charg-cur: - type: int - required: false - default: 2000 - description: Charging current requested by battery. - - desired-charg-volt: - type: int - required: false - default: 7000 - description: Charging voltage requested by battery. - - cycle-count: - type: int - required: false - default: 125 - description: Number of cycles. - - serial-number: - type: int - required: false - default: 7 - description: Serial number of battery. - - mf-name: - type: string - required: false - default: "zephyr" - description: Manufacturer name. Length has to be smaller than 32 bytes. - - dev-name: - type: string - required: false - default: "smartbat" - description: Device name. Length has to be smaller than 32 bytes. - - dev-chem: - type: string - required: false - default: "LION" - description: Device chemistry. Length has to be smaller than 32 bytes. - - mf-data: - type: string - required: false - default: "LION" - description: Manufacturer data. Length has to be smaller than 32 bytes. - - mf-info: - type: string - required: false - default: "LION" - description: Manufacturer info. Length has to be smaller than 32 bytes. diff --git a/zephyr/dts/bindings/emul/zephyr,smart-battery.yaml b/zephyr/dts/bindings/emul/zephyr,smart-battery.yaml new file mode 100644 index 0000000000..4c46fd4f64 --- /dev/null +++ b/zephyr/dts/bindings/emul/zephyr,smart-battery.yaml @@ -0,0 +1,161 @@ +# Copyright 2021 The ChromiumOS Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +description: Zephyr Smart Battery Emulator + +compatible: "zephyr,smart-battery" + +include: base.yaml + +properties: + mf-access: + type: int + required: false + default: 0 + description: Word returned on manufacturer access command. + + at-rate-full-mw-support: + type: boolean + description: + Flag indicating if AT_RATE_TIME_TO_FULL command supports mW capacity + mode. + + version: + type: string + required: false + enum: + - BATTERY_SPEC_VER_1_0 + - BATTERY_SPEC_VER_1_1 + - BATTERY_SPEC_VER_1_1_WITH_PEC + default: BATTERY_SPEC_VER_1_1_WITH_PEC + description: Version of Smart Battery. + + vscale: + type: int + required: false + default: 0 + description: Scaling of voltage. + + ipscale: + type: int + required: false + default: 0 + description: Scaling of current. + + int-charge-controller: + type: boolean + description: Flag indicating if internal charge controller is supported. + + primary-battery: + type: boolean + description: + Flag indicating if primary battery role selection is supported. + + design-mv: + type: int + required: false + default: 5000 + description: Design battery voltage in mV. + + design-cap: + type: int + required: false + default: 5000 + description: Design battery capacity in mAh. + + temperature: + type: int + required: false + default: 2930 + description: Battery temperature in 0.1 Kelvins. + + volt: + type: int + required: false + default: 5000 + description: Battery voltage in mV. + + cur: + type: int + required: false + default: 1000 + description: Current charging (> 0) or discharging (< 0) battery in mA. + + avg-cur: + type: int + required: false + default: 1000 + description: Average current from 1 minute. + + max-error: + type: int + required: false + default: 0 + description: Maximum error of commands return value in percent. + + cap: + type: int + required: false + default: 2000 + description: Capacity of the battery in mAh. + + full-cap: + type: int + required: false + default: 4000 + description: Full capacity of the battery in mAh. + + desired-charg-cur: + type: int + required: false + default: 2000 + description: Charging current requested by battery. + + desired-charg-volt: + type: int + required: false + default: 7000 + description: Charging voltage requested by battery. + + cycle-count: + type: int + required: false + default: 125 + description: Number of cycles. + + serial-number: + type: int + required: false + default: 7 + description: Serial number of battery. + + mf-name: + type: string + required: false + default: "zephyr" + description: Manufacturer name. Length has to be smaller than 32 bytes. + + dev-name: + type: string + required: false + default: "smartbat" + description: Device name. Length has to be smaller than 32 bytes. + + dev-chem: + type: string + required: false + default: "LION" + description: Device chemistry. Length has to be smaller than 32 bytes. + + mf-data: + type: string + required: false + default: "LION" + description: Manufacturer data. Length has to be smaller than 32 bytes. + + mf-info: + type: string + required: false + default: "LION" + description: Manufacturer info. Length has to be smaller than 32 bytes. diff --git a/zephyr/dts/bindings/emul/zephyr,tcs3400-emul.yaml b/zephyr/dts/bindings/emul/zephyr,tcs3400-emul.yaml deleted file mode 100644 index 8c33331b7a..0000000000 --- a/zephyr/dts/bindings/emul/zephyr,tcs3400-emul.yaml +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 2021 The ChromiumOS Authors -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -description: Zephyr ALS TCS3400 light sensor i2c emulator - -compatible: "zephyr,tcs3400-emul" - -include: base.yaml - -properties: - device-id: - type: string - required: false - enum: - - TCS340015_DEVICE_ID - - TCS340037_DEVICE_ID - default: TCS340015_DEVICE_ID - description: Device ID that is set in the register. - - revision: - type: int - required: false - default: 0 - description: Wafer die revision level that is set in the register. - - error-on-ro-write: - type: boolean - description: - Flag indicating if error should be generated when read only register - is being written. - - error-on-reserved-bit-write: - type: boolean - description: - Flag indicating if error should be generated when reserved bit - is being written. - - error-on-msb-first-access: - type: boolean - description: - Flag indicating if error should be generated when MSB register of - accelerometer value is accessed before LSB and shadowing is enabled - at the same time. diff --git a/zephyr/dts/bindings/emul/zephyr,tcs3400.yaml b/zephyr/dts/bindings/emul/zephyr,tcs3400.yaml new file mode 100644 index 0000000000..f214a21064 --- /dev/null +++ b/zephyr/dts/bindings/emul/zephyr,tcs3400.yaml @@ -0,0 +1,44 @@ +# Copyright 2021 The ChromiumOS Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +description: Zephyr ALS TCS3400 light sensor i2c emulator + +compatible: "zephyr,tcs3400" + +include: base.yaml + +properties: + device-id: + type: string + required: false + enum: + - TCS340015_DEVICE_ID + - TCS340037_DEVICE_ID + default: TCS340015_DEVICE_ID + description: Device ID that is set in the register. + + revision: + type: int + required: false + default: 0 + description: Wafer die revision level that is set in the register. + + error-on-ro-write: + type: boolean + description: + Flag indicating if error should be generated when read only register + is being written. + + error-on-reserved-bit-write: + type: boolean + description: + Flag indicating if error should be generated when reserved bit + is being written. + + error-on-msb-first-access: + type: boolean + description: + Flag indicating if error should be generated when MSB register of + accelerometer value is accessed before LSB and shadowing is enabled + at the same time. diff --git a/zephyr/dts/bindings/emul/zephyr,tusb1064-emul.yaml b/zephyr/dts/bindings/emul/zephyr,tusb1064-emul.yaml deleted file mode 100644 index 3cab1dd5a6..0000000000 --- a/zephyr/dts/bindings/emul/zephyr,tusb1064-emul.yaml +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 2022 The ChromiumOS Authors -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. -# -description: Zephyr TUSB1064 Emulator - -compatible: "zephyr,tusb1064-emul" - -include: "ti,tusb1064.yaml" diff --git a/zephyr/dts/bindings/emul/zephyr,tusb1064.yaml b/zephyr/dts/bindings/emul/zephyr,tusb1064.yaml new file mode 100644 index 0000000000..3cab1dd5a6 --- /dev/null +++ b/zephyr/dts/bindings/emul/zephyr,tusb1064.yaml @@ -0,0 +1,9 @@ +# Copyright 2022 The ChromiumOS Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +# +description: Zephyr TUSB1064 Emulator + +compatible: "zephyr,tusb1064-emul" + +include: "ti,tusb1064.yaml" diff --git a/zephyr/dts/bindings/fan/cros-ec,fan-steps.yaml b/zephyr/dts/bindings/fan/cros-ec,fan-steps.yaml deleted file mode 100644 index 3befe43868..0000000000 --- a/zephyr/dts/bindings/fan/cros-ec,fan-steps.yaml +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2022 The ChromiumOS Authors -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. -description: Fan steps parent node -compatible: "cros-ec,fan-steps" -child-binding: - description: Support multiple thermal sensor temperature to trigger different fans speed, - each step could have different rpm for each fan - properties: - temp_on: - required: false - type: array - description: - Temperatures for each sensor to trigger next fan level, - mapping to variant overlay - temp_off: - required: false - type: array - description: - Temperatures for each sensor to trigger previous fan level, - mapping to variant overlay - rpm_target: - required: false - type: array - description: - Support multiple fan speed target for each level (in RPM), - diff --git a/zephyr/dts/bindings/fan/cros-ec,fans.yaml b/zephyr/dts/bindings/fan/cros-ec,fans.yaml index a9d198e37c..9aa6317f61 100644 --- a/zephyr/dts/bindings/fan/cros-ec,fans.yaml +++ b/zephyr/dts/bindings/fan/cros-ec,fans.yaml @@ -24,12 +24,6 @@ child-binding: type: int description: Maximum fan speed (in RPM) - rpm_deviation: - required: false - default: 7 - type: int - description: - Percentage of fan rpm deviation pwms: type: phandle-array required: true diff --git a/zephyr/dts/bindings/gpio/gpio-enum-name.yaml b/zephyr/dts/bindings/gpio/gpio-enum-name.yaml index 5041b0646a..8252ca75e1 100644 --- a/zephyr/dts/bindings/gpio/gpio-enum-name.yaml +++ b/zephyr/dts/bindings/gpio/gpio-enum-name.yaml @@ -55,7 +55,6 @@ properties: - GPIO_EN_USB_A_5V - GPIO_IMVP9_VRRDY_OD - GPIO_KB_DISCRETE_INT - - GPIO_KBD_KSO2 - GPIO_LID_ACCEL_INT_L - GPIO_LID_OPEN - GPIO_PACKET_MODE_EN diff --git a/zephyr/dts/bindings/gpio/named-gpios.yaml b/zephyr/dts/bindings/gpio/named-gpios.yaml index 7b92f1a636..bf0ba7237e 100644 --- a/zephyr/dts/bindings/gpio/named-gpios.yaml +++ b/zephyr/dts/bindings/gpio/named-gpios.yaml @@ -15,6 +15,9 @@ child-binding: gpios: type: phandle-array required: false + "#led-pin-cells": + type: int + required: false no-auto-init: description: When set, the GPIO is not initialised, and can be @@ -33,3 +36,5 @@ child-binding: to the particular board's GPIO name. type: string required: false + led-pin-cells: + - value diff --git a/zephyr/dts/bindings/keyboard/cros-ec,keyscan.yaml b/zephyr/dts/bindings/keyboard/cros-ec,keyscan.yaml deleted file mode 100644 index 0e093bf015..0000000000 --- a/zephyr/dts/bindings/keyboard/cros-ec,keyscan.yaml +++ /dev/null @@ -1,82 +0,0 @@ - # Copyright 2021 The ChromiumOS Authors - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - -description: Keyboard scanning properties - -compatible: "cros-ec,keyscan" - -properties: - output-settle: - type: int - required: false - default: 80 - description: | - Delay time, in microseconds, between setting up output and waiting for - it to settle. 80 microseconds is the recommended value when column 2 - of the keyboard passes through the Google Security Chip. Otherwise 50 - microseconds is the recommended value. - - debounce-down: - type: int - required: false - default: 9000 - description: | - Time, in microseconds, to debounce key-down. - - debounce-up: - type: int - required: false - default: 30000 - description: | - Time, in microseconds, to debounce key-up. - - scan-period: - type: int - required: false - default: 3000 - description: | - Time between scans when keyboard scan task runs in polling mode. - - min-post-scan-delay: - type: int - required: false - default: 1000 - description: | - Minimum time between end of one scan and start of the next one. - This ensures keyboard scanning doesn't starve the rest of the system - if the scan period is set too short, or if other higher-priority - system activity is starving the keyboard scan task too. - - poll-timeout: - type: int - required: false - default: 100000 - description: | - Revert to interrupt mode after no keyboard activity for this period. - Specified in microseconds. - - actual-key-mask: - type: array - required: false - default: [ - 0x1c, # C0 - 0xff, # C1 - 0xff, # C2 - 0xff, # C3 - 0xff, # C4 - 0xf5, # C5 - 0xff, # C6 - 0xa4, # C7 - 0xfe, # C8 - 0x55, # C9 - 0xfa, # C10 - 0xff, # C11 - 0xca, # C12 - 0x00, # C13 for keypad - 0x00, # C14 for keypad - ] - description: | - Keyboard scanning mask. For each keyboard column, specify which - keyboard rows actually exist. Default key mask includes scanning for - full Chromebook keyboard, excluding the keypad. diff --git a/zephyr/dts/bindings/keyboard/cros-keyscan.yaml b/zephyr/dts/bindings/keyboard/cros-keyscan.yaml new file mode 100644 index 0000000000..a2ec2afc46 --- /dev/null +++ b/zephyr/dts/bindings/keyboard/cros-keyscan.yaml @@ -0,0 +1,82 @@ + # Copyright 2021 The ChromiumOS Authors + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + +description: Keyboard scanning properties + +compatible: "cros-keyscan" + +properties: + output-settle: + type: int + required: false + default: 80 + description: | + Delay time, in microseconds, between setting up output and waiting for + it to settle. 80 microseconds is the recommended value when column 2 + of the keyboard passes through the Google Security Chip. Otherwise 50 + microseconds is the recommended value. + + debounce-down: + type: int + required: false + default: 9000 + description: | + Time, in microseconds, to debounce key-down. + + debounce-up: + type: int + required: false + default: 30000 + description: | + Time, in microseconds, to debounce key-up. + + scan-period: + type: int + required: false + default: 3000 + description: | + Time between scans when keyboard scan task runs in polling mode. + + min-post-scan-delay: + type: int + required: false + default: 1000 + description: | + Minimum time between end of one scan and start of the next one. + This ensures keyboard scanning doesn't starve the rest of the system + if the scan period is set too short, or if other higher-priority + system activity is starving the keyboard scan task too. + + poll-timeout: + type: int + required: false + default: 100000 + description: | + Revert to interrupt mode after no keyboard activity for this period. + Specified in microseconds. + + actual-key-mask: + type: array + required: false + default: [ + 0x1c, # C0 + 0xff, # C1 + 0xff, # C2 + 0xff, # C3 + 0xff, # C4 + 0xf5, # C5 + 0xff, # C6 + 0xa4, # C7 + 0xfe, # C8 + 0x55, # C9 + 0xfa, # C10 + 0xff, # C11 + 0xca, # C12 + 0x00, # C13 for keypad + 0x00, # C14 for keypad + ] + description: | + Keyboard scanning mask. For each keyboard column, specify which + keyboard rows actually exist. Default key mask includes scanning for + full Chromebook keyboard, excluding the keypad. diff --git a/zephyr/dts/bindings/led/maxim,max695x.yaml b/zephyr/dts/bindings/led/maxim,max695x.yaml deleted file mode 100644 index a219512b0d..0000000000 --- a/zephyr/dts/bindings/led/maxim,max695x.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 2022 The ChromiumOS Authors -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -description: | - MAX6958/MAX6959 7-Segment LED Display - - Example configuration - - max695x@38 { - compatible = "maxim,max695x"; - reg = <0x38>; - }; - - -compatible: "maxim,max695x" - -include: i2c-device.yaml diff --git a/zephyr/dts/bindings/led/maxim,seven-seg-display.yaml b/zephyr/dts/bindings/led/maxim,seven-seg-display.yaml new file mode 100644 index 0000000000..d66a0cdca2 --- /dev/null +++ b/zephyr/dts/bindings/led/maxim,seven-seg-display.yaml @@ -0,0 +1,19 @@ +# Copyright 2022 The ChromiumOS Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +description: MAX6958/MAX6959 7-Segment LED Display + +compatible: "maxim,seven-seg-display" + +include: i2c-device.yaml + +# +# examples: +# +# seven_seg_display: max695x-seven-seg-display@38 { +# compatible = "maxim,seven-seg-display"; +# reg = <0x38>; +# label = "MAX695X_SEVEN_SEG_DISPLAY"; +# }; +# diff --git a/zephyr/dts/bindings/leds/cros-ec,gpio-led-pins.yaml b/zephyr/dts/bindings/leds/cros-ec,gpio-led-pins.yaml index fbf4e5217c..2e5fe7cff0 100644 --- a/zephyr/dts/bindings/leds/cros-ec,gpio-led-pins.yaml +++ b/zephyr/dts/bindings/leds/cros-ec,gpio-led-pins.yaml @@ -15,8 +15,8 @@ child-binding: the LED and 0 always turns off the LED. So a node looks like color-amber { led-color = "LED_AMBER"; - led-pins = <&gpio_ec_chg_led_y_c1 gpio_ec_chg_led_b_c1>; - led-values = <1 0>; + led-pins = <&gpio_ec_chg_led_y_c1 1>, + <&gpio_ec_chg_led_b_c1 0>; }; properties: led-color: @@ -61,15 +61,10 @@ child-binding: - EC_LED_COLOR_WHITE - EC_LED_COLOR_AMBER led-pins: - type: phandles + type: phandle-array required: true description: | - This property is used to specify an array of gpio pins to set a - particular color. - - led-values: - type: array - required: true - description: | - This property is used to specify an array of values to set on the - corresponding led-pins to set a particular color. + This property is used to specify an array of gpio pins and + corresponding values to enable a particular color. + e.g. Amber color - led-pins = <&gpio_ec_chg_led_y_c1 1>, + <&gpio_ec_chg_led_b_c1 0>; diff --git a/zephyr/dts/bindings/leds/cros-ec,pwm-led-pins.yaml b/zephyr/dts/bindings/leds/cros-ec,pwm-led-pins.yaml index 5ee8e112b5..19fee69be4 100644 --- a/zephyr/dts/bindings/leds/cros-ec,pwm-led-pins.yaml +++ b/zephyr/dts/bindings/leds/cros-ec,pwm-led-pins.yaml @@ -14,8 +14,8 @@ child-binding: looks like this where 100 is PWM duty cycle in percentage. color-amber { led-color = "LED_AMBER"; - led-pwms = <&pwm_led_y &pwm_led_b>; - led-values = <100 0>; + led-pins = <&pwm_led_y 100>, + <&pwm_led_b 0>; }; properties: led-color: @@ -59,16 +59,11 @@ child-binding: - EC_LED_COLOR_YELLOW - EC_LED_COLOR_WHITE - EC_LED_COLOR_AMBER - led-pwms: - type: phandles + led-pins: + type: phandle-array required: true description: | - This property is used to specify an array of pwms to set a - particular color. - - led-values: - type: array - required: true - description: | - This property is used to specify an array of values to set on the - corresponding pwm-pins to set a particular color. + This property is used to specify an array of PWM pins and + corresponding values to enable a particular color. + e.g. Amber color - led-pins = <&pwm_led_y 100>, + <&pwm_led_b 0>; diff --git a/zephyr/dts/bindings/leds/cros-ec,pwm-pin-config.yaml b/zephyr/dts/bindings/leds/cros-ec,pwm-pin-config.yaml new file mode 100644 index 0000000000..bdef6b6144 --- /dev/null +++ b/zephyr/dts/bindings/leds/cros-ec,pwm-pin-config.yaml @@ -0,0 +1,19 @@ +# Copyright 2022 The ChromiumOS Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +description: PWM LED pin configuration + +compatible: "cros-ec,pwm-pin-config" + +child-binding: + description: PWMs associated with LEDs + properties: + pwms: + type: phandle-array + required: true + "#led-pin-cells": + type: int + required: false + led-pin-cells: + - value diff --git a/zephyr/dts/bindings/power/intel,ap-pwr-signal-emul.yaml b/zephyr/dts/bindings/power/intel,ap-pwr-signal-emul.yaml deleted file mode 100644 index 1863349892..0000000000 --- a/zephyr/dts/bindings/power/intel,ap-pwr-signal-emul.yaml +++ /dev/null @@ -1,124 +0,0 @@ - # Copyright 2022 The ChromiumOS Authors - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - -description: | - Power Signal Emulator Node - - Power signal emulator allows executing AP Power Sequence in a virtual - environment by simulating power signals behavior. - - This file defines a node to bind two or more power signals. A node connects - one input-signal with one or more output-signals. When a node is loaded and - initialized by power signal emulator, its input-signal state will control - the value of its children output-signals. Behavior of output-signals are - configurable to meet AP power sequence test cases. - - Power Signals direction is determined from emulator node perspective. An input - signal in a node, is the one to be monitored by the emulator, while an output - signal gets its value altered when corresponding input signal's state changes. - -compatible: "intel,ap-pwr-signal-emul" - -properties: - input-signal: - type: phandle - required: true - description: | - Input signal whose value is monitored to control children output-signal`s - value. - - assert-value: - type: int - required: false - default: 1 - description: | - Value that indicates `input-signal` must be ASSERTED. - - A power signal state can be ASSERTED or DEASSERTED.`input-signal` is only - considered asserted if its new value is equal to `assert-value`, any - other value makes it deasserted. - - edge: - type: string - required: false - description: | - Controls when to trigger children value change, based on `input-signal` - new state. - - EDGE_ACTIVE_ON_ASSERT: Children value changes only when `input-signal` - state changes into asserted. - - EDGE_ACTIVE_ON_DEASSERT: Children value changes only when `input-signal` - state changes into deasserted. - - EDGE_ACTIVE_ON_DEASSERT: Children value changes everytime `input-signal` - state changes. - - default: EDGE_ACTIVE_ON_BOTH - enum: - - EDGE_ACTIVE_ON_ASSERT - - EDGE_ACTIVE_ON_DEASSERT - - EDGE_ACTIVE_ON_BOTH - - init-value: - type: int - required: false - description: | - Initial value of `input-signal`. - -child-binding: - description: | - Child power signals configuration. - - properties: - output-signal: - type: phandle - required: true - description: | - Output signal whose value will be controlled by parent `input-signal` - state. - - assert-value: - type: int - required: false - default: 1 - description: | - Value that will be assigned to this signal when parent `input-signal` - state is asserted. - - assert-delay-ms: - type: int - required: false - default: 10 - description: | - Milliseconds to delay setting this signal to its `assert-value` - after `input-signal` is asserted. - - deassert-value: - type: int - required: false - default: 0 - description: | - Value that will be assigned to this signal when parent `input-signal` - state is deasserted. - - deassert-delay-ms: - type: int - required: false - default: 10 - description: | - Milliseconds to delay setting this signal to its `deassert-value` - after `input-signal` is deasserted. - - init-value: - type: int - required: false - description: | - Value set to this power signal when initializing this node. - - invert-value: - type: boolean - description: | - Invert this power signal assertion logic, this applies to both values - and delays. diff --git a/zephyr/dts/bindings/power/intel,ap-pwr-test-platform.yaml b/zephyr/dts/bindings/power/intel,ap-pwr-test-platform.yaml deleted file mode 100644 index c2f7e10cd1..0000000000 --- a/zephyr/dts/bindings/power/intel,ap-pwr-test-platform.yaml +++ /dev/null @@ -1,18 +0,0 @@ - # Copyright 2022 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. - -description: | - Power Signal Test Platform - - This is a virtual representation of platform comprised of one or more power - signal emulator nodes. Test platform is loaded into power signal emulator. - -compatible: "intel,ap-pwr-test-platform" - -properties: - nodes: - type: phandles - required: true - description: | - phandle array of power signals nodes to be run by emulator. diff --git a/zephyr/dts/bindings/switchcap/cros-ec,switchcap-gpio.yaml b/zephyr/dts/bindings/switchcap/cros-ec,switchcap-gpio.yaml deleted file mode 100644 index 344738c8c0..0000000000 --- a/zephyr/dts/bindings/switchcap/cros-ec,switchcap-gpio.yaml +++ /dev/null @@ -1,22 +0,0 @@ -description: SwitchCap controlled by gpios - -compatible: "cros-ec,switchcap-gpio" - -properties: - enable-pin: - type: phandle - required: true - description: | - GPIO used to enable the switch cap - - power-good-pin: - type: phandle - required: false - description: | - GPIO used to read if power is good - - poff-delay-ms: - type: int - required: false - description: | - Additional power off delay required for some systems diff --git a/zephyr/dts/bindings/switchcap/lion,ln9310.yaml b/zephyr/dts/bindings/switchcap/lion,ln9310.yaml deleted file mode 100644 index c1c4a99bee..0000000000 --- a/zephyr/dts/bindings/switchcap/lion,ln9310.yaml +++ /dev/null @@ -1,28 +0,0 @@ -description: SwitchCap controlled by Lion Semiconductor LN9310 - -compatible: "lion,ln9310" - -properties: - enable-pin: - type: phandle - required: true - description: | - GPIO used to enable the switch cap. Relies on - GPIO flags to determine active low or high. - - port: - type: phandle - required: true - description: | - I2C port used to communicate with controller - - addr-flags: - type: string - default: "LN9310_I2C_ADDR_0_FLAGS" - enum: - - "LN9310_I2C_ADDR_0_FLAGS" - - "LN9310_I2C_ADDR_1_FLAGS" - - "LN9310_I2C_ADDR_2_FLAGS" - - "LN9310_I2C_ADDR_3_FLAGS" - description: | - I2C address of controller diff --git a/zephyr/dts/bindings/switchcap/switchcap-gpio.yaml b/zephyr/dts/bindings/switchcap/switchcap-gpio.yaml new file mode 100644 index 0000000000..0016401835 --- /dev/null +++ b/zephyr/dts/bindings/switchcap/switchcap-gpio.yaml @@ -0,0 +1,22 @@ +description: SwitchCap controlled by gpios + +compatible: "switchcap-gpio" + +properties: + enable-pin: + type: phandle + required: true + description: | + GPIO used to enable the switch cap + + power-good-pin: + type: phandle + required: false + description: | + GPIO used to read if power is good + + poff-delay-ms: + type: int + required: false + description: | + Additional power off delay required for some systems diff --git a/zephyr/dts/bindings/switchcap/switchcap-ln9310.yaml b/zephyr/dts/bindings/switchcap/switchcap-ln9310.yaml new file mode 100644 index 0000000000..2a73325cd3 --- /dev/null +++ b/zephyr/dts/bindings/switchcap/switchcap-ln9310.yaml @@ -0,0 +1,28 @@ +description: SwitchCap controlled by LN9310 + +compatible: "switchcap-ln9310" + +properties: + enable-pin: + type: phandle + required: true + description: | + GPIO used to enable the switch cap. Relies on + GPIO flags to determine active low or high. + + port: + type: phandle + required: true + description: | + I2C port used to communicate with controller + + addr-flags: + type: string + default: "LN9310_I2C_ADDR_0_FLAGS" + enum: + - "LN9310_I2C_ADDR_0_FLAGS" + - "LN9310_I2C_ADDR_1_FLAGS" + - "LN9310_I2C_ADDR_2_FLAGS" + - "LN9310_I2C_ADDR_3_FLAGS" + description: | + I2C address of controller diff --git a/zephyr/dts/bindings/usbc/bc12/richtek,rt9490-bc12.yaml b/zephyr/dts/bindings/usbc/bc12/richtek,rt9490-bc12.yaml new file mode 100644 index 0000000000..38791d65bf --- /dev/null +++ b/zephyr/dts/bindings/usbc/bc12/richtek,rt9490-bc12.yaml @@ -0,0 +1,15 @@ +# Copyright 2022 The ChromiumOS Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +description: USBC BC1.2 + +compatible: "richtek,rt9490-bc12" + +include: base.yaml + +properties: + irq: + type: phandles + description: | + GPIO interrupt from BC1.2 diff --git a/zephyr/dts/bindings/usbc/tcpc/renesas,raa489000.yaml b/zephyr/dts/bindings/usbc/tcpc/renesas,raa489000.yaml deleted file mode 100644 index f8dd9807ed..0000000000 --- a/zephyr/dts/bindings/usbc/tcpc/renesas,raa489000.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 2022 The ChromiumOS Authors -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -description: Renesas RAA489000 USB TCPC binding - -compatible: "renesas,raa489000" - -include: i2c-device.yaml - -properties: - tcpc-flags: - type: int - default: 0 - description: | - TCPC configuration flags diff --git a/zephyr/dts/board-overlays/native_posix.dts b/zephyr/dts/board-overlays/native_posix.dts index c8bfe02539..44a034d73b 100644 --- a/zephyr/dts/board-overlays/native_posix.dts +++ b/zephyr/dts/board-overlays/native_posix.dts @@ -4,9 +4,6 @@ */ #include -#include - -#define GPIO_VOLTAGE_1P8 NATIVE_POSIX_GPIO_VOLTAGE_1P8 / { named-gpios { diff --git a/zephyr/dts/it8xxx2_emul.dts b/zephyr/dts/it8xxx2_emul.dts index 5f517b0c1b..b22251b67b 100644 --- a/zephyr/dts/it8xxx2_emul.dts +++ b/zephyr/dts/it8xxx2_emul.dts @@ -8,9 +8,6 @@ */ #include -#include - -#define GPIO_VOLTAGE_1P8 NATIVE_POSIX_GPIO_VOLTAGE_1P8 / { gpioa: gpio@f01601 { @@ -185,11 +182,4 @@ #size-cells = <0>; reg = <0x00f03500 0x0080>; }; - - adc0: adc { - compatible = "zephyr,adc-emul"; - nchannels = <6>; - ref-internal-mv = <3300>; - #io-channel-cells = <1>; - }; }; -- cgit v1.2.1