diff options
Diffstat (limited to 'zephyr/include/cros')
-rw-r--r-- | zephyr/include/cros/binman.dtsi | 4 | ||||
-rw-r--r-- | zephyr/include/cros/ite/it8xxx2.dtsi | 6 | ||||
-rw-r--r-- | zephyr/include/cros/microchip/mec1727.dtsi | 3 | ||||
-rw-r--r-- | zephyr/include/cros/microchip/mec172x.dtsi | 5 | ||||
-rw-r--r-- | zephyr/include/cros/nuvoton/npcx.dtsi | 7 | ||||
-rw-r--r-- | zephyr/include/cros/nuvoton/npcx7.dtsi | 2 | ||||
-rw-r--r-- | zephyr/include/cros/nuvoton/npcx9.dtsi | 2 | ||||
-rw-r--r-- | zephyr/include/cros/thermistor/thermistor.dtsi | 91 |
8 files changed, 98 insertions, 22 deletions
diff --git a/zephyr/include/cros/binman.dtsi b/zephyr/include/cros/binman.dtsi index d33092ee44..167fd69d1c 100644 --- a/zephyr/include/cros/binman.dtsi +++ b/zephyr/include/cros/binman.dtsi @@ -1,4 +1,4 @@ -/* Copyright 2021 The Chromium OS Authors. All rights reserved. +/* 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. */ @@ -7,7 +7,7 @@ #address-cells = <1>; #size-cells = <1>; binman { - filename = "zephyr.bin"; + filename = "ec.bin"; pad-byte = <0x1d>; wp-ro { compatible = "cros-ec,flash-layout"; diff --git a/zephyr/include/cros/ite/it8xxx2.dtsi b/zephyr/include/cros/ite/it8xxx2.dtsi index 4631e64f6f..e9ecf9e716 100644 --- a/zephyr/include/cros/ite/it8xxx2.dtsi +++ b/zephyr/include/cros/ite/it8xxx2.dtsi @@ -1,4 +1,4 @@ -/* Copyright 2021 The Chromium OS Authors. All rights reserved. +/* 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. */ @@ -77,13 +77,11 @@ fiu0: cros-flash@80000000 { compatible = "ite,it8xxx2-cros-flash"; reg = <0x80000000 0x100000>; - label = "FLASH"; }; cros_kb_raw: cros-kb-raw@f01d00 { compatible = "ite,it8xxx2-cros-kb-raw"; reg = <0x00f01d00 0x29>; - label = "CROS_KB_RAW_0"; interrupt-parent = <&intc>; interrupts = <13 IRQ_TYPE_LEVEL_HIGH>; wucctrl = <&wuc_wu30 /* KSI[0] */ @@ -108,5 +106,7 @@ offset = <0x60000>; size = <0x60000>; }; + pad-byte = <0xff>; + pad-after = <0x40000>; }; }; diff --git a/zephyr/include/cros/microchip/mec1727.dtsi b/zephyr/include/cros/microchip/mec1727.dtsi index 340cff1956..5f84a1a99e 100644 --- a/zephyr/include/cros/microchip/mec1727.dtsi +++ b/zephyr/include/cros/microchip/mec1727.dtsi @@ -1,4 +1,4 @@ -/* Copyright 2022 The Chromium OS Authors. All rights reserved. +/* 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. */ @@ -75,6 +75,5 @@ fiu0: cros-flash { compatible = "microchip,xec-cros-flash"; - label = "INTERNAL_FLASH"; }; }; diff --git a/zephyr/include/cros/microchip/mec172x.dtsi b/zephyr/include/cros/microchip/mec172x.dtsi index 6833fa57d0..e2cb0ff1c2 100644 --- a/zephyr/include/cros/microchip/mec172x.dtsi +++ b/zephyr/include/cros/microchip/mec172x.dtsi @@ -1,4 +1,4 @@ -/* Copyright 2022 The Chromium OS Authors. All rights reserved. +/* 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. */ @@ -69,9 +69,8 @@ }; }; - fiu0: cros-flash{ + fiu0: cros-flash { compatible = "microchip,xec-cros-flash"; - label = "INTERNAL_FLASH"; }; /* diff --git a/zephyr/include/cros/nuvoton/npcx.dtsi b/zephyr/include/cros/nuvoton/npcx.dtsi index 094f5ff901..69f29367f5 100644 --- a/zephyr/include/cros/nuvoton/npcx.dtsi +++ b/zephyr/include/cros/nuvoton/npcx.dtsi @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 The Chromium OS Authors + * Copyright 2021 The ChromiumOS Authors * * SPDX-License-Identifier: Apache-2.0 */ @@ -68,9 +68,8 @@ }; }; - fiu0: cros-flash{ + fiu0: cros-flash { compatible = "nuvoton,npcx-cros-flash"; - label = "INTERNAL_FLASH"; }; soc { @@ -78,7 +77,6 @@ cros_kb_raw: cros-kb-raw@400a3000 { compatible = "nuvoton,npcx-cros-kb-raw"; reg = <0x400a3000 0x2000>; - label = "CROS_KB_RAW_0"; interrupts = <49 4>; clocks = <&pcc NPCX_CLOCK_BUS_APB1 NPCX_PWDWN_CTL1 0>; wui_maps = <&wui_io31 &wui_io30 &wui_io27 &wui_io26 @@ -89,7 +87,6 @@ compatible = "nuvoton,npcx-cros-mtc"; reg = <0x400b7000 0x2000>; mtc-alarm = <&wui_mtc>; - label = "MTC"; }; shi: shi@4000f000 { diff --git a/zephyr/include/cros/nuvoton/npcx7.dtsi b/zephyr/include/cros/nuvoton/npcx7.dtsi index 00683fe8ff..ca69343054 100644 --- a/zephyr/include/cros/nuvoton/npcx7.dtsi +++ b/zephyr/include/cros/nuvoton/npcx7.dtsi @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 The Chromium OS Authors + * Copyright 2021 The ChromiumOS Authors * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/zephyr/include/cros/nuvoton/npcx9.dtsi b/zephyr/include/cros/nuvoton/npcx9.dtsi index de492d3306..864ce20269 100644 --- a/zephyr/include/cros/nuvoton/npcx9.dtsi +++ b/zephyr/include/cros/nuvoton/npcx9.dtsi @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 The Chromium OS Authors + * Copyright 2021 The ChromiumOS Authors * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/zephyr/include/cros/thermistor/thermistor.dtsi b/zephyr/include/cros/thermistor/thermistor.dtsi index 033d5639e2..fb86c4f79a 100644 --- a/zephyr/include/cros/thermistor/thermistor.dtsi +++ b/zephyr/include/cros/thermistor/thermistor.dtsi @@ -1,5 +1,5 @@ / { - thermistor_3V3_30K9_47K_4050B: thermistor-3V3-30K9-47K-4050B { + /omit-if-no-ref/ thermistor_3V3_30K9_47K_4050B: thermistor-3V3-30K9-47K-4050B { status = "disabled"; compatible = "cros-ec,thermistor"; scaling-factor = <11>; @@ -64,8 +64,7 @@ }; }; - - thermistor_3V0_22K6_47K_4050B: thermistor-3V0-22K6-47K-4050B { + /omit-if-no-ref/ thermistor_3V0_22K6_47K_4050B: thermistor-3V0-22K6-47K-4050B { status = "disabled"; compatible = "cros-ec,thermistor"; scaling-factor = <11>; @@ -145,7 +144,7 @@ }; }; - thermistor_3V3_13K7_47K_4050B: thermistor-3V3-13K7-47K-4050B { + /omit-if-no-ref/ thermistor_3V3_13K7_47K_4050B: thermistor-3V3-13K7-47K-4050B { status = "disabled"; compatible = "cros-ec,thermistor"; scaling-factor = <13>; @@ -226,7 +225,7 @@ }; - thermistor_3V3_51K1_47K_4050B: thermistor-3V3-51K1-47K-4050B { + /omit-if-no-ref/ thermistor_3V3_51K1_47K_4050B: thermistor-3V3-51K1-47K-4050B { status = "disabled"; compatible = "cros-ec,thermistor"; scaling-factor = <11>; @@ -305,4 +304,86 @@ sample-index = <12>; }; }; + + /omit-if-no-ref/ thermistor_3V3_30K9_47K_NCP15WB: + thermistor-3V3-30K9-47K-NCP15WB { + status = "disabled"; + compatible = "cros-ec,thermistor"; + scaling-factor = <11>; + num-pairs = <13>; + steinhart-reference-mv = <3300>; + steinhart-reference-res = <30900>; + + /* + * Data derived from Steinhart-Hart equation in a resistor + * divider circuit with Vdd=3300mV, R = 30.9Kohm, + * and Murata NCP15WB-series thermistor + * (B = 4050, T0 = 298.15 K, nominal resistance (R0) = 47Kohm). + */ + sample-datum-0 { + milivolt = <(2761 / 11)>; + temp = <0>; + sample-index = <0>; + }; + sample-datum-1 { + milivolt = <(2492 / 11)>; + temp = <10>; + sample-index = <1>; + }; + sample-datum-2 { + milivolt = <(2167 / 11)>; + temp = <20>; + sample-index = <2>; + }; + sample-datum-3 { + milivolt = <(1812 / 11)>; + temp = <30>; + sample-index = <3>; + }; + sample-datum-4 { + milivolt = <(1462 / 11)>; + temp = <40>; + sample-index = <4>; + }; + sample-datum-5 { + milivolt = <(1146 / 11)>; + temp = <50>; + sample-index = <5>; + }; + sample-datum-6 { + milivolt = <(878 / 11)>; + temp = <60>; + sample-index = <6>; + }; + sample-datum-7 { + milivolt = <(665 / 11)>; + temp = <70>; + sample-index = <7>; + }; + sample-datum-8 { + milivolt = <(500 / 11)>; + temp = <80>; + sample-index = <8>; + }; + sample-datum-9 { + milivolt = <(434 / 11)>; + temp = <85>; + sample-index = <9>; + }; + sample-datum-10 { + milivolt = <( 376 / 11)>; + temp = <90>; + sample-index = <10>; + }; + sample-datum-11 { + milivolt = <( 326 / 11)>; + temp = <95>; + sample-index = <11>; + }; + sample-datum-12 { + milivolt = <( 283 / 11)>; + temp = <100>; + sample-index = <12>; + }; + }; }; |