From d3c688f15601a01691d6ec68b8ae3f3c5f8ecd19 Mon Sep 17 00:00:00 2001 From: Jason Yuan Date: Wed, 30 Nov 2022 16:15:59 -0800 Subject: zephyr: Devicetree organization - skyrim Smaller project specific devicetree changes are merged into the overlay file. Some shared devicetree nodes have been merged into program directory. BUG=b:254097911 TEST=Ran zmake compare-builds BRANCH=none Change-Id: Ie17e2854aaaffd29712054e41e3299d9328ce2cc Signed-off-by: Jason Yuan Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4072139 Tested-by: zhi cheng yuan Code-Coverage: Zoss Commit-Queue: zhi cheng yuan Reviewed-by: Diana Z --- zephyr/program/skyrim/winterhold/battery.dtsi | 33 ----- zephyr/program/skyrim/winterhold/project.overlay | 166 +++++++++++++++++++++- zephyr/program/skyrim/winterhold/winterhold.dtsi | 168 ----------------------- 3 files changed, 164 insertions(+), 203 deletions(-) delete mode 100644 zephyr/program/skyrim/winterhold/battery.dtsi delete mode 100644 zephyr/program/skyrim/winterhold/winterhold.dtsi (limited to 'zephyr/program/skyrim/winterhold') diff --git a/zephyr/program/skyrim/winterhold/battery.dtsi b/zephyr/program/skyrim/winterhold/battery.dtsi deleted file mode 100644 index 8e82e0d1f2..0000000000 --- a/zephyr/program/skyrim/winterhold/battery.dtsi +++ /dev/null @@ -1,33 +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. - */ - -/ { - batteries { - default_battery: lgc_xphx8 { - compatible = "lgc,xphx8", "battery-smart"; - }; - smp_atlxdy9k { - compatible = "smp,atlxdy9k", "battery-smart"; - }; - smp_cosxdy9k { - compatible = "smp,cosxdy9k", "battery-smart"; - }; - byd_wv3k8 { - compatible = "byd,wv3k8", "battery-smart"; - }; - cosmx_mvk11 { - compatible = "cosmx,mvk11", "battery-smart"; - }; - sunwoda_atlvkyjx { - compatible = "sunwoda,atlvkyjx", "battery-smart"; - }; - sunwoda_cosvkyjx { - compatible = "sunwoda,cosvkyjx", "battery-smart"; - }; - atl_cfd72 { - compatible = "atl,cfd72", "battery-smart"; - }; - }; -}; diff --git a/zephyr/program/skyrim/winterhold/project.overlay b/zephyr/program/skyrim/winterhold/project.overlay index 9a13a1a3cd..4ff49e81cc 100644 --- a/zephyr/program/skyrim/winterhold/project.overlay +++ b/zephyr/program/skyrim/winterhold/project.overlay @@ -7,13 +7,175 @@ #include "../adc.dtsi" #include "../fan.dtsi" #include "../gpio.dtsi" +#include "../i2c.dtsi" #include "../interrupts.dtsi" #include "../keyboard.dtsi" #include "../usbc.dtsi" /* winterhold project DTS includes*/ -#include "winterhold.dtsi" -#include "battery.dtsi" #include "led_pins.dtsi" #include "led_policy.dtsi" #include "motionsense.dtsi" + +/* Winterhold overrides follow... */ +/ { + /* battery overrides */ + batteries { + default_battery: lgc_xphx8 { + compatible = "lgc,xphx8", "battery-smart"; + }; + smp_atlxdy9k { + compatible = "smp,atlxdy9k", "battery-smart"; + }; + smp_cosxdy9k { + compatible = "smp,cosxdy9k", "battery-smart"; + }; + byd_wv3k8 { + compatible = "byd,wv3k8", "battery-smart"; + }; + cosmx_mvk11 { + compatible = "cosmx,mvk11", "battery-smart"; + }; + sunwoda_atlvkyjx { + compatible = "sunwoda,atlvkyjx", "battery-smart"; + }; + sunwoda_cosvkyjx { + compatible = "sunwoda,cosvkyjx", "battery-smart"; + }; + atl_cfd72 { + compatible = "atl,cfd72", "battery-smart"; + }; + }; + + named-gpios { + /* Winterhold-specific GPIO customizations */ + }; + + named-temp-sensors { + compatible = "cros-ec,temp-sensors"; + soc-pct2075 { + temp_host_high = <105>; + temp_host_halt = <110>; + temp_host_release_high = <95>; + temp_host_release_halt = <100>; + power-good-pin = <&gpio_pg_pwr_s5>; + sensor = <&soc_pct2075>; + }; + amb-pct2075 { + temp_host_warn = <50>; + temp_host_high = <105>; + temp_host_halt = <110>; + temp_host_release_warn = <45>; + temp_host_release_high = <95>; + temp_host_release_halt = <100>; + temp_fan_off = <35>; + temp_fan_max = <40>; + power-good-pin = <&gpio_pg_pwr_s5>; + sensor = <&amb_pct2075>; + }; + }; + + /* + * Note this is expected to vary per-board, so we keep it in the overlay + * files. + */ + Winterhold-fw-config { + compatible = "cros-ec,cbi-fw-config"; + + /* + * FW_CONFIG field to enable KB back light or not. + */ + kb-bl { + enum-name = "FW_KB_BL"; + start = <1>; + size = <1>; + + no-kb-bl { + compatible = "cros-ec,cbi-fw-config-value"; + enum-name = "FW_KB_BL_NOT_PRESENT"; + value = <0>; + }; + kb-bl-present { + compatible = "cros-ec,cbi-fw-config-value"; + enum-name = "FW_KB_BL_PRESENT"; + value = <1>; + }; + }; + }; + + /* Rotation matrices for motion sensors. */ + motionsense-rotation-ref { + compatible = "cros-ec,motionsense-rotation-ref"; + lid_rot_ref: lid-rotation-ref { + mat33 = <0 (-1) 0 + 1 0 0 + 0 0 1>; + }; + + base_rot_ref: base-rotation-ref { + mat33 = <0 1 0 + (-1) 0 0 + 0 0 1>; + }; + }; +}; + +/*i2c overrides */ +&i2c1_0 { + /delete-node/ ps8818@28; +}; + +&i2c4_1 { + /delete-node/ isl9241@9; + /delete-node/ isl9538@9; + charger: isl9238@9 { + compatible = "intersil,isl923x"; + status = "okay"; + reg = <0x9>; + }; +}; + +/* usbc overrides */ +&usbc_port0 { + /delete-property/ chg_alt; +}; + +&usbc_port1 { + /delete-node/ usb-mux-chain-1-ps; +}; + +/* fan overrides */ +&fan0 { + pwms = <&pwm0 0 PWM_KHZ(2) PWM_POLARITY_NORMAL>; + rpm_min = <2100>; + rpm_start = <2600>; + rpm_max = <4800>; +}; + +/* temperature sensor overrides */ +&temp_sensor_charger { + temp_host_high = <100>; + temp_host_halt = <110>; + temp_host_release_high = <90>; + temp_host_release_halt = <100>; +}; + +&temp_sensor_memory { + temp_host_high = <91>; + temp_host_halt = <96>; + temp_host_release_high = <81>; + temp_host_release_halt = <86>; +}; + +&temp_sensor_cpu { + /delete-property/ temp_host_high; + /delete-property/ temp_host_halt; + /delete-property/ temp_host_release_high; + /delete-property/ temp_fan_off; + /delete-property/ temp_fan_max; +}; + +/* handler overrides */ +&int_accel_gyro { + handler = "base_accel_interrupt"; +}; diff --git a/zephyr/program/skyrim/winterhold/winterhold.dtsi b/zephyr/program/skyrim/winterhold/winterhold.dtsi deleted file mode 100644 index a831cd9500..0000000000 --- a/zephyr/program/skyrim/winterhold/winterhold.dtsi +++ /dev/null @@ -1,168 +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. - */ - -#include - -#include "../i2c.dtsi" - -/ { - named-gpios { - /* Winterhold-specific GPIO customizations */ - }; - - named-temp-sensors { - compatible = "cros-ec,temp-sensors"; - soc-pct2075 { - temp_host_high = <105>; - temp_host_halt = <110>; - temp_host_release_high = <95>; - temp_host_release_halt = <100>; - power-good-pin = <&gpio_pg_pwr_s5>; - sensor = <&soc_pct2075>; - }; - amb-pct2075 { - temp_host_warn = <50>; - temp_host_high = <105>; - temp_host_halt = <110>; - temp_host_release_warn = <45>; - temp_host_release_high = <95>; - temp_host_release_halt = <100>; - temp_fan_off = <35>; - temp_fan_max = <40>; - power-good-pin = <&gpio_pg_pwr_s5>; - sensor = <&amb_pct2075>; - }; - }; - - /* - * Note this is expected to vary per-board, so we keep it in the board - * dts files. - */ - Winterhold-fw-config { - compatible = "cros-ec,cbi-fw-config"; - - /* - * FW_CONFIG field to enable KB back light or not. - */ - kb-bl { - enum-name = "FW_KB_BL"; - start = <1>; - size = <1>; - - no-kb-bl { - compatible = "cros-ec,cbi-fw-config-value"; - enum-name = "FW_KB_BL_NOT_PRESENT"; - value = <0>; - }; - kb-bl-present { - compatible = "cros-ec,cbi-fw-config-value"; - enum-name = "FW_KB_BL_PRESENT"; - value = <1>; - }; - }; - }; - - /* Rotation matrices for motion sensors. */ - motionsense-rotation-ref { - compatible = "cros-ec,motionsense-rotation-ref"; - lid_rot_ref: lid-rotation-ref { - mat33 = <0 (-1) 0 - 1 0 0 - 0 0 1>; - }; - - base_rot_ref: base-rotation-ref { - mat33 = <0 1 0 - (-1) 0 0 - 0 0 1>; - }; - }; -}; - -&i2c0_0 { - anx7483_port0: anx7483@3e { - compatible = "analogix,anx7483"; - reg = <0x3e>; - board-set = "board_anx7483_c0_mux_set"; - flags = ; - }; - ppc_port0: nx20p348x@71 { - compatible = "nxp,nx20p348x"; - status = "okay"; - reg = <0x71>; - }; -}; - -&i2c1_0 { - anx7483_port1: anx7483@3e { - compatible = "analogix,anx7483"; - reg = <0x3e>; - board-set = "board_anx7483_c1_mux_set"; - flags = ; - }; - ppc_port1: nx20p348x@71 { - compatible = "nxp,nx20p348x"; - status = "okay"; - reg = <0x71>; - }; -}; - -&i2c4_1 { - charger: isl9238@9 { - compatible = "intersil,isl923x"; - status = "okay"; - reg = <0x9>; - }; -}; - -&usbc_port0 { - ppc = <&ppc_port0>; - usb-mux-chain-0 { - compatible = "cros-ec,usb-mux-chain"; - usb-muxes = <&amd_fp6_port0 &anx7483_port0>; - }; -}; - -&usbc_port1 { - ppc = <&ppc_port1>; - usb-mux-chain-1-anx { - compatible = "cros-ec,usb-mux-chain"; - usb-muxes = <&amd_fp6_port1 &anx7483_port1>; - }; -}; - -&fan0 { - pwms = <&pwm0 0 PWM_KHZ(2) PWM_POLARITY_NORMAL>; - rpm_min = <2100>; - rpm_start = <2600>; - rpm_max = <4800>; -}; - -&temp_sensor_charger { - temp_host_high = <100>; - temp_host_halt = <110>; - temp_host_release_high = <90>; - temp_host_release_halt = <100>; -}; - -&temp_sensor_memory { - temp_host_high = <91>; - temp_host_halt = <96>; - temp_host_release_high = <81>; - temp_host_release_halt = <86>; -}; - -&temp_sensor_cpu { - /delete-property/ temp_host_high; - /delete-property/ temp_host_halt; - /delete-property/ temp_host_release_high; - /delete-property/ temp_fan_off; - /delete-property/ temp_fan_max; -}; - -/* Override handler */ -&int_accel_gyro { - handler = "base_accel_interrupt"; -}; -- cgit v1.2.1