diff options
| author | Zhuohao Lee <zhuohao@chromium.org> | 2022-09-13 22:25:52 +0800 |
|---|---|---|
| committer | Zhuohao Lee <zhuohao@chromium.org> | 2022-09-13 22:25:52 +0800 |
| commit | 447de52bf857ca5ce0cbfa952d28269f5794e261 (patch) | |
| tree | a011234c567cc6ec47796803f0fc1afa6499e60e | |
| parent | a1c1b694ad02efd59b3573b3e7390ee8218dbba5 (diff) | |
| parent | e8fdcaa03f1057fae35abc15d3d9259b6e469329 (diff) | |
| download | chrome-ec-447de52bf857ca5ce0cbfa952d28269f5794e261.tar.gz | |
Merge remote-tracking branch cros/main into firmware-dedede-13606.B-master
Generated by: util/update_release_branch.py --baseboard dedede --relevant_paths_file
util/dedede-relevant-paths.txt firmware-dedede-13606.B-master
Relevant changes:
git log --oneline a1c1b694ad..e8fdcaa03f -- baseboard/dedede
board/beadrix board/beetley board/blipper board/boten board/bugzzy
board/corori2 board/cret board/drawcia board/drawcia_riscv board/galtic
board/kracko board/lantis board/madoo board/magolor board/metaknight
board/pirika board/sasuke board/sasukette board/shotzo board/storo
board/waddledee board/waddledoo board/wheelie common/charge_state_v2.c
common/mkbp_* common/ocpc.c common/usbc/usb_tc_drp_acc_trysrc_sm.c
common/usbc/usb_sm.c common/usbc/*_pd_* common/usbc/dp_alt_mode.c
common/usbc/usb_prl_sm.c common/usbc/usb_pe_drp_sm.c
common/usb_charger.c common/usb_common.c common/usbc_ocp.c
driver/charger/sm5803.* driver/charger/isl923x.* driver/tcpm/raa489000.*
driver/tcpm/it83* include/power/icelake.h include/intel_x86.h
power/icelake.c power/intel_x86.c util/getversion.sh
e8f7493381 dedede: usb_mux: Split struct usb_mux in dedede boards
953d4674e6 zephyr: tests: Test host command EC_CMD_GET_NEXT_EVENT in `mkbp_event.c`
71b2ef709d Update license boilerplate text in source code files
234a3fd7dd shotzo: Modify power led behavior when suspending
BRANCH=None
BUG=b:236274003 b:245531291 chromium:1098010 b:235791717
TEST=`make -j buildall`
Signed-off-by: Zhuohao Lee <zhuohao@chromium.org>
Change-Id: I77e992e4f74e2db18da629a88a2a15564c7c5ab2
5452 files changed, 13438 insertions, 9098 deletions
diff --git a/.checkpatch.conf b/.checkpatch.conf index eb2de21617..511019b260 100644 --- a/.checkpatch.conf +++ b/.checkpatch.conf @@ -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. diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 107db30aa8..39cebf5279 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,8 +1,8 @@ -# 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. -image: sjg20/ubuntu-25feb22c +image: jbettis/ubuntu-07sep22 # You can update that image using this repo: # https://gitlab.com/zephyr-ec/gitlab-ci-runner/-/tree/main @@ -77,7 +77,7 @@ before_script: # Install Python and packages - python3 -V # Print out python version for debugging - python3 -m pip install "${EC_DIR}/zephyr/zmake[tests]" --user - - python3 -m pip install pyyaml packaging ply psutil + - python3 -m pip install pyyaml packaging ply psutil 'pyelftools>=0.28' - export PATH="$PATH:$HOME/.local/bin" - export PYTHONIOENCODING=utf-8 # Build directory @@ -113,11 +113,17 @@ seed_cache: -B "${BUILD_DIR}" -t ${TOOLCHAIN:-zephyr} "${PROJECT}" - for b in "${BUILD_DIR}/${PROJECT}"/build-* ; do - bdir=$(basename ${b}) ; - ninja -C ${b} ram_report >"${BUILD_DIR}/${PROJECT}/output/${bdir}_ram_report.txt" ; - cp ${b}/ram.json "${BUILD_DIR}/${PROJECT}/output/${bdir}_ram.json" ; - ninja -C ${b} rom_report >"${BUILD_DIR}/${PROJECT}/output/${bdir}_rom_report.txt" ; - cp ${b}/rom.json "${BUILD_DIR}/${PROJECT}/output/${bdir}_rom.json" ; + bdir=$(basename ${b}) ; + if ninja -C ${b} ram_report >"${BUILD_DIR}/${PROJECT}/output/${bdir}_ram_report.txt" ; then + cp ${b}/ram.json "${BUILD_DIR}/${PROJECT}/output/${bdir}_ram.json" ; + else + echo "Ram report failed" ; + fi ; + if ninja -C ${b} rom_report >"${BUILD_DIR}/${PROJECT}/output/${bdir}_rom_report.txt" ; then + cp ${b}/rom.json "${BUILD_DIR}/${PROJECT}/output/${bdir}_rom.json" ; + else + echo "Rom report failed" ; + fi ; done - ls "${BUILD_DIR}/${PROJECT}" "${BUILD_DIR}/${PROJECT}/output" artifacts: @@ -1,4 +1,4 @@ -// Copyright 2010 The Chromium OS Authors. All rights reserved. +// Copyright 2010 The ChromiumOS Authors // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are @@ -10,7 +10,7 @@ // copyright notice, this list of conditions and the following disclaimer // in the documentation and/or other materials provided with the // distribution. -// * Neither the name of Google Inc. nor the names of its +// * Neither the name of Google LLC nor the names of its // contributors may be used to endorse or promote products derived from // this software without specific prior written permission. // @@ -1,4 +1,4 @@ -# Copyright 2011 The Chromium OS Authors. All rights reserved. +# Copyright 2011 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/Makefile.ide b/Makefile.ide index b86f52226e..f8174f17df 100644 --- a/Makefile.ide +++ b/Makefile.ide @@ -1,6 +1,6 @@ # -*- makefile -*- # vim: set filetype=make : -# 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. # diff --git a/Makefile.rules b/Makefile.rules index b0cce893d4..6f45936a8c 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -1,6 +1,6 @@ # -*- makefile -*- # vim: set filetype=make : -# Copyright 2012 The Chromium OS Authors. All rights reserved. +# Copyright 2012 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/Makefile.toolchain b/Makefile.toolchain index 4735776bf9..c89777ae7e 100644 --- a/Makefile.toolchain +++ b/Makefile.toolchain @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2012 The Chromium OS Authors. All rights reserved. +# Copyright 2012 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # @@ -489,7 +489,7 @@ Other style notes: all contributions to the Chromium project: ``` - /* Copyright <year> The ChromiumOS Authors. + /* Copyright <year> The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/asurada/baseboard.c b/baseboard/asurada/baseboard.c index 3ec15ae80c..3a881c275a 100644 --- a/baseboard/asurada/baseboard.c +++ b/baseboard/asurada/baseboard.c @@ -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. */ diff --git a/baseboard/asurada/baseboard.h b/baseboard/asurada/baseboard.h index 609721d243..62f74e1f57 100644 --- a/baseboard/asurada/baseboard.h +++ b/baseboard/asurada/baseboard.h @@ -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. */ diff --git a/baseboard/asurada/baseboard_common.h b/baseboard/asurada/baseboard_common.h index abd5a9b5c6..4b8892e5b7 100644 --- a/baseboard/asurada/baseboard_common.h +++ b/baseboard/asurada/baseboard_common.h @@ -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. */ diff --git a/baseboard/asurada/board_chipset.c b/baseboard/asurada/board_chipset.c index 4d12fb0334..24754f597f 100644 --- a/baseboard/asurada/board_chipset.c +++ b/baseboard/asurada/board_chipset.c @@ -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. */ diff --git a/baseboard/asurada/board_id.c b/baseboard/asurada/board_id.c index ba83e4e272..9a316d8d40 100644 --- a/baseboard/asurada/board_id.c +++ b/baseboard/asurada/board_id.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/asurada/build.mk b/baseboard/asurada/build.mk index ce7b7272bd..ac4f1489d2 100644 --- a/baseboard/asurada/build.mk +++ b/baseboard/asurada/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/baseboard/asurada/hibernate.c b/baseboard/asurada/hibernate.c index 47d8a47f0c..60b191d3e6 100644 --- a/baseboard/asurada/hibernate.c +++ b/baseboard/asurada/hibernate.c @@ -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. */ diff --git a/baseboard/asurada/it5205_sbu.c b/baseboard/asurada/it5205_sbu.c index 53c9defecf..fc2cefd208 100644 --- a/baseboard/asurada/it5205_sbu.c +++ b/baseboard/asurada/it5205_sbu.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/baseboard/asurada/it5205_sbu.h b/baseboard/asurada/it5205_sbu.h index 8dc59520dd..2a17506cad 100644 --- a/baseboard/asurada/it5205_sbu.h +++ b/baseboard/asurada/it5205_sbu.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/baseboard/asurada/regulator.c b/baseboard/asurada/regulator.c index dae6ba13ea..e2731c8385 100644 --- a/baseboard/asurada/regulator.c +++ b/baseboard/asurada/regulator.c @@ -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. */ diff --git a/baseboard/asurada/usb_pd_policy.c b/baseboard/asurada/usb_pd_policy.c index 4fce60548c..afec537330 100644 --- a/baseboard/asurada/usb_pd_policy.c +++ b/baseboard/asurada/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/asurada/usbc_config.c b/baseboard/asurada/usbc_config.c index 08858489ab..0be43d343a 100644 --- a/baseboard/asurada/usbc_config.c +++ b/baseboard/asurada/usbc_config.c @@ -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. */ @@ -227,33 +227,45 @@ static int board_ps8743_mux_set(const struct usb_mux *me, mux_state_t mux_state) return ps8743_write(me, PS8743_REG_MODE, reg); } -const struct usb_mux usbc0_virtual_mux = { - .usb_port = 0, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +const struct usb_mux_chain usbc0_virtual_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; -const struct usb_mux usbc1_virtual_mux = { - .usb_port = 1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +const struct usb_mux_chain usbc1_virtual_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_MUX0, - .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, - .driver = &it5205_usb_mux_driver, - .next_mux = &usbc0_virtual_mux, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_MUX0, + .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, + .driver = &it5205_usb_mux_driver, + }, + .next = &usbc0_virtual_mux, }, { - .usb_port = 1, - .i2c_port = I2C_PORT_USB_MUX1, - .i2c_addr_flags = PS8743_I2C_ADDR0_FLAG, - .driver = &ps8743_usb_mux_driver, - .next_mux = &usbc1_virtual_mux, - .board_set = &board_ps8743_mux_set, + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .i2c_port = I2C_PORT_USB_MUX1, + .i2c_addr_flags = PS8743_I2C_ADDR0_FLAG, + .driver = &ps8743_usb_mux_driver, + .board_set = &board_ps8743_mux_set, + }, + .next = &usbc1_virtual_mux, }, }; diff --git a/baseboard/brask/baseboard.c b/baseboard/brask/baseboard.c index 042aa7d386..5a96ba49ca 100644 --- a/baseboard/brask/baseboard.c +++ b/baseboard/brask/baseboard.c @@ -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. */ diff --git a/baseboard/brask/baseboard.h b/baseboard/brask/baseboard.h index 7deece4b89..83a02bec2e 100644 --- a/baseboard/brask/baseboard.h +++ b/baseboard/brask/baseboard.h @@ -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. */ @@ -42,9 +42,9 @@ /* Host communication */ #define CONFIG_HOST_INTERFACE_ESPI -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S4 -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S5 -#define CONFIG_HOSTCMD_ESPI_RESET_SLP_SX_VW_ON_ESPI_RST +#define CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 +#define CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S5 +#define CONFIG_HOST_INTERFACE_ESPI_RESET_SLP_SX_VW_ON_ESPI_RST /* LED */ #define CONFIG_LED_COMMON @@ -86,8 +86,8 @@ /* ADL has new low-power features that requires extra-wide virtual wire * pulses. The EDS specifies 100 microseconds. */ -#undef CONFIG_ESPI_DEFAULT_VW_WIDTH_US -#define CONFIG_ESPI_DEFAULT_VW_WIDTH_US 100 +#undef CONFIG_HOST_INTERFACE_ESPI_DEFAULT_VW_WIDTH_US +#define CONFIG_HOST_INTERFACE_ESPI_DEFAULT_VW_WIDTH_US 100 /* Buttons */ #define CONFIG_DEDICATED_RECOVERY_BUTTON diff --git a/baseboard/brask/baseboard_usbc_config.h b/baseboard/brask/baseboard_usbc_config.h index 1b3d9e5d3f..8ebf4f9b6a 100644 --- a/baseboard/brask/baseboard_usbc_config.h +++ b/baseboard/brask/baseboard_usbc_config.h @@ -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. */ diff --git a/baseboard/brask/build.mk b/baseboard/brask/build.mk index e29bcaf4ac..4b540d94ad 100644 --- a/baseboard/brask/build.mk +++ b/baseboard/brask/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/baseboard/brask/cbi.c b/baseboard/brask/cbi.c index cee5755b2d..0dcfcca253 100644 --- a/baseboard/brask/cbi.c +++ b/baseboard/brask/cbi.c @@ -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. */ diff --git a/baseboard/brask/cbi.h b/baseboard/brask/cbi.h index 5fa41feadd..219718763f 100644 --- a/baseboard/brask/cbi.h +++ b/baseboard/brask/cbi.h @@ -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. */ diff --git a/baseboard/brask/usb_pd_policy.c b/baseboard/brask/usb_pd_policy.c index c203e9a41b..53e8052db1 100644 --- a/baseboard/brask/usb_pd_policy.c +++ b/baseboard/brask/usb_pd_policy.c @@ -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. */ diff --git a/baseboard/brya/baseboard.c b/baseboard/brya/baseboard.c index e11bf9ef8b..e65a384578 100644 --- a/baseboard/brya/baseboard.c +++ b/baseboard/brya/baseboard.c @@ -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. */ diff --git a/baseboard/brya/baseboard.h b/baseboard/brya/baseboard.h index 96404c4fe4..84fefa9b53 100644 --- a/baseboard/brya/baseboard.h +++ b/baseboard/brya/baseboard.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -46,8 +46,8 @@ /* Host communication */ #define CONFIG_HOST_INTERFACE_ESPI -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S4 -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S5 +#define CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 +#define CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S5 /* * TODO(b/179648721): implement sensors @@ -113,7 +113,7 @@ #define CONFIG_POWER_TRACK_HOST_SLEEP_STATE #define CONFIG_LOW_POWER_IDLE -#define CONFIG_HOSTCMD_ESPI_RESET_SLP_SX_VW_ON_ESPI_RST +#define CONFIG_HOST_INTERFACE_ESPI_RESET_SLP_SX_VW_ON_ESPI_RST #define CONFIG_BOARD_HAS_RTC_RESET #undef CONFIG_S5_EXIT_WAIT @@ -124,8 +124,8 @@ /* ADL has new lower-power features that require extra-wide virtual wire * pulses. The EDS specifies 100 microseconds. */ -#undef CONFIG_ESPI_DEFAULT_VW_WIDTH_US -#define CONFIG_ESPI_DEFAULT_VW_WIDTH_US 100 +#undef CONFIG_HOST_INTERFACE_ESPI_DEFAULT_VW_WIDTH_US +#define CONFIG_HOST_INTERFACE_ESPI_DEFAULT_VW_WIDTH_US 100 /* Buttons / Switches */ #define CONFIG_VOLUME_BUTTONS diff --git a/baseboard/brya/baseboard_usbc_config.h b/baseboard/brya/baseboard_usbc_config.h index f8b9fab35c..6d0cf828a3 100644 --- a/baseboard/brya/baseboard_usbc_config.h +++ b/baseboard/brya/baseboard_usbc_config.h @@ -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. */ diff --git a/baseboard/brya/battery_presence.c b/baseboard/brya/battery_presence.c index 34fffda436..1e4ab4ed44 100644 --- a/baseboard/brya/battery_presence.c +++ b/baseboard/brya/battery_presence.c @@ -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. * diff --git a/baseboard/brya/build.mk b/baseboard/brya/build.mk index 2ed0186242..c6e93c63f2 100644 --- a/baseboard/brya/build.mk +++ b/baseboard/brya/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/baseboard/brya/cbi.c b/baseboard/brya/cbi.c index 5bda205be1..7bc8dad117 100644 --- a/baseboard/brya/cbi.c +++ b/baseboard/brya/cbi.c @@ -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. */ diff --git a/baseboard/brya/cbi.h b/baseboard/brya/cbi.h index 2ad70aff96..37e02806bd 100644 --- a/baseboard/brya/cbi.h +++ b/baseboard/brya/cbi.h @@ -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. */ diff --git a/baseboard/brya/charger_bq25720.c b/baseboard/brya/charger_bq25720.c index cbc657271b..a4fa209246 100644 --- a/baseboard/brya/charger_bq25720.c +++ b/baseboard/brya/charger_bq25720.c @@ -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. */ diff --git a/baseboard/brya/prochot.c b/baseboard/brya/prochot.c index 02c4ca5262..f89ec5a263 100644 --- a/baseboard/brya/prochot.c +++ b/baseboard/brya/prochot.c @@ -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. */ diff --git a/baseboard/brya/usb_pd_policy.c b/baseboard/brya/usb_pd_policy.c index 3556addd6b..af8288483e 100644 --- a/baseboard/brya/usb_pd_policy.c +++ b/baseboard/brya/usb_pd_policy.c @@ -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. */ diff --git a/baseboard/cherry/baseboard.c b/baseboard/cherry/baseboard.c index ff9b5316fd..3f5f5c0e64 100644 --- a/baseboard/cherry/baseboard.c +++ b/baseboard/cherry/baseboard.c @@ -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. */ diff --git a/baseboard/cherry/baseboard.h b/baseboard/cherry/baseboard.h index b00949107c..2b0d03a436 100644 --- a/baseboard/cherry/baseboard.h +++ b/baseboard/cherry/baseboard.h @@ -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. */ diff --git a/baseboard/cherry/build.mk b/baseboard/cherry/build.mk index ae82c1ca68..74609511c3 100644 --- a/baseboard/cherry/build.mk +++ b/baseboard/cherry/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/baseboard/cherry/usb_pd_policy.c b/baseboard/cherry/usb_pd_policy.c index a6badfb160..450f5c06d7 100644 --- a/baseboard/cherry/usb_pd_policy.c +++ b/baseboard/cherry/usb_pd_policy.c @@ -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. */ diff --git a/baseboard/dedede/baseboard.c b/baseboard/dedede/baseboard.c index 98eba13f9f..cd55f37588 100644 --- a/baseboard/dedede/baseboard.c +++ b/baseboard/dedede/baseboard.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/dedede/baseboard.h b/baseboard/dedede/baseboard.h index 9b5fb12b14..e581a0e8d0 100644 --- a/baseboard/dedede/baseboard.h +++ b/baseboard/dedede/baseboard.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/dedede/build.mk b/baseboard/dedede/build.mk index 6d7452081e..af71eb2222 100644 --- a/baseboard/dedede/build.mk +++ b/baseboard/dedede/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/baseboard/dedede/cbi_fw_config.c b/baseboard/dedede/cbi_fw_config.c index 3c3ddf0f47..612c51700d 100644 --- a/baseboard/dedede/cbi_fw_config.c +++ b/baseboard/dedede/cbi_fw_config.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/dedede/cbi_fw_config.h b/baseboard/dedede/cbi_fw_config.h index 5205be7b2d..80712f2849 100644 --- a/baseboard/dedede/cbi_fw_config.h +++ b/baseboard/dedede/cbi_fw_config.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/dedede/variant_ec_it8320.c b/baseboard/dedede/variant_ec_it8320.c index eb22c11abc..37929ceb0b 100644 --- a/baseboard/dedede/variant_ec_it8320.c +++ b/baseboard/dedede/variant_ec_it8320.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/dedede/variant_ec_npcx796fc.c b/baseboard/dedede/variant_ec_npcx796fc.c index b4a2270698..366fca878e 100644 --- a/baseboard/dedede/variant_ec_npcx796fc.c +++ b/baseboard/dedede/variant_ec_npcx796fc.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/goroh/baseboard.c b/baseboard/goroh/baseboard.c index 94649d2670..f70f070fac 100644 --- a/baseboard/goroh/baseboard.c +++ b/baseboard/goroh/baseboard.c @@ -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. */ diff --git a/baseboard/goroh/baseboard.h b/baseboard/goroh/baseboard.h index 42f0e0f0a8..1488bb6fcf 100644 --- a/baseboard/goroh/baseboard.h +++ b/baseboard/goroh/baseboard.h @@ -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. */ diff --git a/baseboard/goroh/baseboard_usbc_config.h b/baseboard/goroh/baseboard_usbc_config.h index b5e76644ee..7da00c17d6 100644 --- a/baseboard/goroh/baseboard_usbc_config.h +++ b/baseboard/goroh/baseboard_usbc_config.h @@ -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. */ diff --git a/baseboard/goroh/board_id.c b/baseboard/goroh/board_id.c index b1184572f9..7bc77d5229 100644 --- a/baseboard/goroh/board_id.c +++ b/baseboard/goroh/board_id.c @@ -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. */ diff --git a/baseboard/goroh/build.mk b/baseboard/goroh/build.mk index 4488c4b395..6a3a386efb 100644 --- a/baseboard/goroh/build.mk +++ b/baseboard/goroh/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/baseboard/goroh/usb_pd_policy.c b/baseboard/goroh/usb_pd_policy.c index 0ec79d4956..e92ced5e89 100644 --- a/baseboard/goroh/usb_pd_policy.c +++ b/baseboard/goroh/usb_pd_policy.c @@ -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. */ diff --git a/baseboard/goroh/usbc_config.c b/baseboard/goroh/usbc_config.c index 43f1513a3c..d33b0ac836 100644 --- a/baseboard/goroh/usbc_config.c +++ b/baseboard/goroh/usbc_config.c @@ -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. */ @@ -76,25 +76,32 @@ static struct usb_mux_driver goroh_usb_c0_mux_driver = { .get = goroh_usb_c0_get_mux, }; -static const struct usb_mux goroh_usb_c1_ps8818_retimer = { - .usb_port = USBC_PORT_C1, - .i2c_port = I2C_PORT_USB_C1, - .i2c_addr_flags = PS8818_I2C_ADDR_FLAGS, - .driver = &ps8818_usb_retimer_driver, - .next_mux = NULL, +static const struct usb_mux_chain goroh_usb_c1_ps8818_retimer = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .i2c_port = I2C_PORT_USB_C1, + .i2c_addr_flags = PS8818_I2C_ADDR_FLAGS, + .driver = &ps8818_usb_retimer_driver, + }, + .next = NULL, }; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .driver = &goroh_usb_c0_mux_driver, - .hpd_update = &virtual_hpd_update, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .driver = &goroh_usb_c0_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }, [USBC_PORT_C1] = { - .usb_port = USBC_PORT_C1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, - .next_mux = &goroh_usb_c1_ps8818_retimer, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C1, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, + .next = &goroh_usb_c1_ps8818_retimer, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/baseboard/grunt/baseboard.c b/baseboard/grunt/baseboard.c index c8f80e2589..5fbf2823be 100644 --- a/baseboard/grunt/baseboard.c +++ b/baseboard/grunt/baseboard.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -280,25 +280,31 @@ static int ps8751_tune_mux(const struct usb_mux *me) return EC_SUCCESS; } -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { #ifdef VARIANT_GRUNT_TCPC_0_ANX3429 [USB_PD_PORT_ANX74XX] = { - .usb_port = USB_PD_PORT_ANX74XX, - .driver = &anx74xx_tcpm_usb_mux_driver, - .hpd_update = &anx74xx_tcpc_update_hpd_status, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_ANX74XX, + .driver = &anx74xx_tcpm_usb_mux_driver, + .hpd_update = &anx74xx_tcpc_update_hpd_status, + }, }, #elif defined(VARIANT_GRUNT_TCPC_0_ANX3447) [USB_PD_PORT_ANX74XX] = { - .usb_port = USB_PD_PORT_ANX74XX, - .driver = &anx7447_usb_mux_driver, - .hpd_update = &anx7447_tcpc_update_hpd_status, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_ANX74XX, + .driver = &anx7447_usb_mux_driver, + .hpd_update = &anx7447_tcpc_update_hpd_status, + }, }, #endif [USB_PD_PORT_PS8751] = { - .usb_port = USB_PD_PORT_PS8751, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, - .board_init = &ps8751_tune_mux, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_PS8751, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .board_init = &ps8751_tune_mux, + }, } }; diff --git a/baseboard/grunt/baseboard.h b/baseboard/grunt/baseboard.h index 4b2cc05065..1c19c05330 100644 --- a/baseboard/grunt/baseboard.h +++ b/baseboard/grunt/baseboard.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/grunt/build.mk b/baseboard/grunt/build.mk index cb9d607c36..c8a02aa85d 100644 --- a/baseboard/grunt/build.mk +++ b/baseboard/grunt/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2018 The Chromium OS Authors. All rights reserved. +# Copyright 2018 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/baseboard/grunt/usb_pd_policy.c b/baseboard/grunt/usb_pd_policy.c index 77966f346e..9cae485bc9 100644 --- a/baseboard/grunt/usb_pd_policy.c +++ b/baseboard/grunt/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/guybrush/base_fw_config.h b/baseboard/guybrush/base_fw_config.h index 2eea7a158f..a9504a6b45 100644 --- a/baseboard/guybrush/base_fw_config.h +++ b/baseboard/guybrush/base_fw_config.h @@ -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. */ diff --git a/baseboard/guybrush/base_gpio.inc b/baseboard/guybrush/base_gpio.inc index 6fd90ed0d3..82b042f890 100644 --- a/baseboard/guybrush/base_gpio.inc +++ b/baseboard/guybrush/base_gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/guybrush/baseboard.c b/baseboard/guybrush/baseboard.c index 6e6ce84a69..4c831b9769 100644 --- a/baseboard/guybrush/baseboard.c +++ b/baseboard/guybrush/baseboard.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -242,7 +242,7 @@ __overridable int board_c1_ps8818_mux_set(const struct usb_mux *me, return 0; } -struct usb_mux usbc1_ps8818 = { +const struct usb_mux usbc1_ps8818 = { .usb_port = USBC_PORT_C1, .i2c_port = I2C_PORT_TCPC1, .flags = USB_MUX_FLAG_RESETS_IN_G3, @@ -258,7 +258,7 @@ __overridable int board_c1_anx7451_mux_set(const struct usb_mux *me, return 0; } -struct usb_mux usbc1_anx7451 = { +const struct usb_mux usbc1_anx7451 = { .usb_port = USBC_PORT_C1, .i2c_port = I2C_PORT_TCPC1, .flags = USB_MUX_FLAG_RESETS_IN_G3, @@ -267,20 +267,27 @@ struct usb_mux usbc1_anx7451 = { .board_set = &board_c1_anx7451_mux_set, }; -struct usb_mux usb_muxes[] = { +/* Filled in by setup_mux based on fw_config */ +struct usb_mux_chain usbc1_mux1; + +struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .i2c_port = I2C_PORT_USB_MUX, - .i2c_addr_flags = AMD_FP6_C0_MUX_I2C_ADDR, - .driver = &amd_fp6_usb_mux_driver, - .board_set = &fsusb42umx_set_mux, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .i2c_port = I2C_PORT_USB_MUX, + .i2c_addr_flags = AMD_FP6_C0_MUX_I2C_ADDR, + .driver = &amd_fp6_usb_mux_driver, + .board_set = &fsusb42umx_set_mux, + }, }, [USBC_PORT_C1] = { - .usb_port = USBC_PORT_C1, - .i2c_port = I2C_PORT_USB_MUX, - .i2c_addr_flags = AMD_FP6_C4_MUX_I2C_ADDR, - .driver = &amd_fp6_usb_mux_driver, - /* .next_mux = filled in by setup_mux based on fw_config */ + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C1, + .i2c_port = I2C_PORT_USB_MUX, + .i2c_addr_flags = AMD_FP6_C4_MUX_I2C_ADDR, + .driver = &amd_fp6_usb_mux_driver, + }, + .next = &usbc1_mux1, } }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); @@ -373,14 +380,15 @@ static void setup_mux(void) switch (board_get_usb_c1_mux()) { case USB_C1_MUX_PS8818: CPRINTSUSB("C1: Setting PS8818 mux"); - usb_muxes[USBC_PORT_C1].next_mux = &usbc1_ps8818; + usbc1_mux1.mux = &usbc1_ps8818; break; case USB_C1_MUX_ANX7451: CPRINTSUSB("C1: Setting ANX7451 mux"); - usb_muxes[USBC_PORT_C1].next_mux = &usbc1_anx7451; + usbc1_mux1.mux = &usbc1_anx7451; break; default: CPRINTSUSB("C1: Mux is unknown"); + usb_muxes[USBC_PORT_C1].next = NULL; } } DECLARE_HOOK(HOOK_INIT, setup_mux, HOOK_PRIO_INIT_I2C); diff --git a/baseboard/guybrush/baseboard.h b/baseboard/guybrush/baseboard.h index 96056acf5e..04b1e10c97 100644 --- a/baseboard/guybrush/baseboard.h +++ b/baseboard/guybrush/baseboard.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/guybrush/build.mk b/baseboard/guybrush/build.mk index dff52adc93..8110e6e6c4 100644 --- a/baseboard/guybrush/build.mk +++ b/baseboard/guybrush/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/baseboard/guybrush/cbi.c b/baseboard/guybrush/cbi.c index 3036fb71d3..6ce6fe0eb7 100644 --- a/baseboard/guybrush/cbi.c +++ b/baseboard/guybrush/cbi.c @@ -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. */ diff --git a/baseboard/guybrush/usb_pd_policy.c b/baseboard/guybrush/usb_pd_policy.c index 79725e827a..8acb2c7a23 100644 --- a/baseboard/guybrush/usb_pd_policy.c +++ b/baseboard/guybrush/usb_pd_policy.c @@ -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. */ diff --git a/baseboard/hatch/baseboard.c b/baseboard/hatch/baseboard.c index dd34de956c..f5376700c5 100644 --- a/baseboard/hatch/baseboard.c +++ b/baseboard/hatch/baseboard.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/hatch/baseboard.h b/baseboard/hatch/baseboard.h index 866118de1a..d5d680e7bf 100644 --- a/baseboard/hatch/baseboard.h +++ b/baseboard/hatch/baseboard.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/hatch/battery.c b/baseboard/hatch/battery.c index 5cca5b02d8..5ae92e8ec8 100644 --- a/baseboard/hatch/battery.c +++ b/baseboard/hatch/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/baseboard/hatch/build.mk b/baseboard/hatch/build.mk index 864225f605..f98ffdcb3f 100644 --- a/baseboard/hatch/build.mk +++ b/baseboard/hatch/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/baseboard/hatch/usb_pd_policy.c b/baseboard/hatch/usb_pd_policy.c index ba12681b35..6abb6e4454 100644 --- a/baseboard/hatch/usb_pd_policy.c +++ b/baseboard/hatch/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/herobrine/baseboard.c b/baseboard/herobrine/baseboard.c index 41d40dd7ae..fca6e9c66d 100644 --- a/baseboard/herobrine/baseboard.c +++ b/baseboard/herobrine/baseboard.c @@ -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. */ diff --git a/baseboard/herobrine/baseboard.h b/baseboard/herobrine/baseboard.h index 065437dd52..0782612cb8 100644 --- a/baseboard/herobrine/baseboard.h +++ b/baseboard/herobrine/baseboard.h @@ -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. */ diff --git a/baseboard/herobrine/build.mk b/baseboard/herobrine/build.mk index f007fd7118..67c2e2143f 100644 --- a/baseboard/herobrine/build.mk +++ b/baseboard/herobrine/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/baseboard/herobrine/usb_pd_policy.c b/baseboard/herobrine/usb_pd_policy.c index 0710a799c2..9fa725c845 100644 --- a/baseboard/herobrine/usb_pd_policy.c +++ b/baseboard/herobrine/usb_pd_policy.c @@ -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. */ diff --git a/baseboard/herobrine/usbc_config.c b/baseboard/herobrine/usbc_config.c index f1a5d63411..2ebb8ae029 100644 --- a/baseboard/herobrine/usbc_config.c +++ b/baseboard/herobrine/usbc_config.c @@ -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. */ diff --git a/baseboard/honeybuns/baseboard.c b/baseboard/honeybuns/baseboard.c index add4b6d564..506eb6f265 100644 --- a/baseboard/honeybuns/baseboard.c +++ b/baseboard/honeybuns/baseboard.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/honeybuns/baseboard.h b/baseboard/honeybuns/baseboard.h index 65f3eb456f..4dd218f57d 100644 --- a/baseboard/honeybuns/baseboard.h +++ b/baseboard/honeybuns/baseboard.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/honeybuns/build.mk b/baseboard/honeybuns/build.mk index 2868911925..57e93b0587 100644 --- a/baseboard/honeybuns/build.mk +++ b/baseboard/honeybuns/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/baseboard/honeybuns/usb_pd_policy.c b/baseboard/honeybuns/usb_pd_policy.c index 7481eb90a9..956a73e7fb 100644 --- a/baseboard/honeybuns/usb_pd_policy.c +++ b/baseboard/honeybuns/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/honeybuns/usbc_support.c b/baseboard/honeybuns/usbc_support.c index 6082ff0715..db68ad527c 100644 --- a/baseboard/honeybuns/usbc_support.c +++ b/baseboard/honeybuns/usbc_support.c @@ -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. */ diff --git a/baseboard/intelrvp/adlrvp.c b/baseboard/intelrvp/adlrvp.c index 33b022b585..6f301be986 100644 --- a/baseboard/intelrvp/adlrvp.c +++ b/baseboard/intelrvp/adlrvp.c @@ -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. */ @@ -93,94 +93,123 @@ BUILD_ASSERT(ARRAY_SIZE(ppc_chips) == CONFIG_USB_PD_PORT_MAX_COUNT); unsigned int ppc_cnt = ARRAY_SIZE(ppc_chips); /* USB-C retimer Configuration */ -struct usb_mux usbc0_tcss_usb_mux = { +struct usb_mux bb_retimer0_usb_mux = { .usb_port = TYPE_C_PORT_0, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_TYPEC_0, + .i2c_addr_flags = I2C_PORT0_BB_RETIMER_ADDR, +}; +struct usb_mux_chain usbc0_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = TYPE_C_PORT_0, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; #if defined(HAS_TASK_PD_C1) -struct usb_mux usbc1_tcss_usb_mux = { +struct usb_mux bb_retimer1_usb_mux = { .usb_port = TYPE_C_PORT_1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_TYPEC_1, + .i2c_addr_flags = I2C_PORT1_BB_RETIMER_ADDR, +}; +struct usb_mux_chain usbc1_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = TYPE_C_PORT_1, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; #endif #if defined(HAS_TASK_PD_C2) -struct usb_mux usbc2_tcss_usb_mux = { +struct usb_mux bb_retimer2_usb_mux = { .usb_port = TYPE_C_PORT_2, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_TYPEC_2, + .i2c_addr_flags = I2C_PORT2_BB_RETIMER_ADDR, +}; +struct usb_mux_chain usbc2_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = TYPE_C_PORT_2, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; #endif #if defined(HAS_TASK_PD_C3) -struct usb_mux usbc3_tcss_usb_mux = { - .usb_port = TYPE_C_PORT_3, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +struct usb_mux_chain usbc3_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = TYPE_C_PORT_3, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; #endif /* USB muxes Configuration */ -struct usb_mux usb_muxes[] = { +struct usb_mux_chain usb_muxes[] = { [TYPE_C_PORT_0] = { - .usb_port = TYPE_C_PORT_0, - .next_mux = &usbc0_tcss_usb_mux, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_TYPEC_0, - .i2c_addr_flags = I2C_PORT0_BB_RETIMER_ADDR, + .mux = &bb_retimer0_usb_mux, + .next = &usbc0_tcss_usb_mux, }, #if defined(HAS_TASK_PD_C1) [TYPE_C_PORT_1] = { - .usb_port = TYPE_C_PORT_1, - .next_mux = &usbc1_tcss_usb_mux, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_TYPEC_1, - .i2c_addr_flags = I2C_PORT1_BB_RETIMER_ADDR, + .mux = &bb_retimer1_usb_mux, + .next = &usbc1_tcss_usb_mux, }, #endif #if defined(HAS_TASK_PD_C2) [TYPE_C_PORT_2] = { - .usb_port = TYPE_C_PORT_2, - .next_mux = &usbc2_tcss_usb_mux, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_TYPEC_2, - .i2c_addr_flags = I2C_PORT2_BB_RETIMER_ADDR, + .mux = &bb_retimer2_usb_mux, + .next = &usbc2_tcss_usb_mux, }, #endif #if defined(HAS_TASK_PD_C3) [TYPE_C_PORT_3] = { - .usb_port = TYPE_C_PORT_3, - .next_mux = &usbc3_tcss_usb_mux, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_TYPEC_3, - .i2c_addr_flags = I2C_PORT3_BB_RETIMER_ADDR, + .mux = &(const struct usb_mux) { + .usb_port = TYPE_C_PORT_3, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_TYPEC_3, + .i2c_addr_flags = I2C_PORT3_BB_RETIMER_ADDR, + }, + .next = &usbc3_tcss_usb_mux, }, #endif }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == CONFIG_USB_PD_PORT_MAX_COUNT); /* USB Mux Configuration for Soc side BB-Retimers for Dual retimer config */ -struct usb_mux soc_side_bb_retimer0_usb_mux = { - .usb_port = TYPE_C_PORT_0, - .next_mux = &usbc0_tcss_usb_mux, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_TYPEC_0, - .i2c_addr_flags = I2C_PORT0_BB_RETIMER_SOC_ADDR, +struct usb_mux_chain soc_side_bb_retimer0_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = TYPE_C_PORT_0, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_TYPEC_0, + .i2c_addr_flags = I2C_PORT0_BB_RETIMER_SOC_ADDR, + }, + .next = &usbc0_tcss_usb_mux, }; #if defined(HAS_TASK_PD_C1) -struct usb_mux soc_side_bb_retimer1_usb_mux = { - .usb_port = TYPE_C_PORT_1, - .next_mux = &usbc1_tcss_usb_mux, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_TYPEC_1, - .i2c_addr_flags = I2C_PORT1_BB_RETIMER_SOC_ADDR, +struct usb_mux_chain soc_side_bb_retimer1_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = TYPE_C_PORT_1, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_TYPEC_1, + .i2c_addr_flags = I2C_PORT1_BB_RETIMER_SOC_ADDR, + }, + .next = &usbc1_tcss_usb_mux, }; #endif @@ -378,21 +407,20 @@ static void configure_retimer_usbmux(void) case ADLN_LP5_ERB_SKU_BOARD_ID: case ADLN_LP5_RVP_SKU_BOARD_ID: /* enable TUSB1044RNQR redriver on Port0 */ - usb_muxes[TYPE_C_PORT_0].i2c_addr_flags = - TUSB1064_I2C_ADDR14_FLAGS; - usb_muxes[TYPE_C_PORT_0].driver = &tusb1064_usb_mux_driver; - usb_muxes[TYPE_C_PORT_0].hpd_update = tusb1044_hpd_update; + bb_retimer0_usb_mux.i2c_addr_flags = TUSB1064_I2C_ADDR14_FLAGS; + bb_retimer0_usb_mux.driver = &tusb1064_usb_mux_driver; + bb_retimer0_usb_mux.hpd_update = tusb1044_hpd_update; #if defined(HAS_TASK_PD_C1) - usb_muxes[TYPE_C_PORT_1].driver = NULL; - usb_muxes[TYPE_C_PORT_1].hpd_update = NULL; + bb_retimer1_usb_mux.driver = NULL; + bb_retimer1_usb_mux.hpd_update = NULL; #endif break; case ADLP_LP5_T4_RVP_SKU_BOARD_ID: /* No retimer on Port-2 */ #if defined(HAS_TASK_PD_C2) - usb_muxes[TYPE_C_PORT_2].driver = NULL; + bb_retimer2_usb_mux.driver = NULL; #endif break; @@ -402,11 +430,9 @@ static void configure_retimer_usbmux(void) * Change the default usb mux config on runtime to support * dual retimer topology. */ - usb_muxes[TYPE_C_PORT_0].next_mux = - &soc_side_bb_retimer0_usb_mux; + usb_muxes[TYPE_C_PORT_0].next = &soc_side_bb_retimer0_usb_mux; #if defined(HAS_TASK_PD_C1) - usb_muxes[TYPE_C_PORT_1].next_mux = - &soc_side_bb_retimer1_usb_mux; + usb_muxes[TYPE_C_PORT_1].next = &soc_side_bb_retimer1_usb_mux; #endif break; diff --git a/baseboard/intelrvp/adlrvp.h b/baseboard/intelrvp/adlrvp.h index fb2837cc2d..3e062db223 100644 --- a/baseboard/intelrvp/adlrvp.h +++ b/baseboard/intelrvp/adlrvp.h @@ -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. */ @@ -35,8 +35,8 @@ /* ADL has new low-power features that require extra-wide virtual wire * pulses. The EDS specifies 100 microseconds. */ -#undef CONFIG_ESPI_DEFAULT_VW_WIDTH_US -#define CONFIG_ESPI_DEFAULT_VW_WIDTH_US 100 +#undef CONFIG_HOST_INTERFACE_ESPI_DEFAULT_VW_WIDTH_US +#define CONFIG_HOST_INTERFACE_ESPI_DEFAULT_VW_WIDTH_US 100 /* USB PD config */ #if defined(HAS_TASK_PD_C3) diff --git a/baseboard/intelrvp/adlrvp_battery.c b/baseboard/intelrvp/adlrvp_battery.c index e5bf95827e..f7107cb1a4 100644 --- a/baseboard/intelrvp/adlrvp_battery.c +++ b/baseboard/intelrvp/adlrvp_battery.c @@ -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. * diff --git a/baseboard/intelrvp/adlrvp_ioex_gpio.inc b/baseboard/intelrvp/adlrvp_ioex_gpio.inc index 4519d3d853..b62dcf53a3 100644 --- a/baseboard/intelrvp/adlrvp_ioex_gpio.inc +++ b/baseboard/intelrvp/adlrvp_ioex_gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/baseboard/intelrvp/baseboard.c b/baseboard/intelrvp/baseboard.c index a39903f084..e1e0a06943 100644 --- a/baseboard/intelrvp/baseboard.c +++ b/baseboard/intelrvp/baseboard.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/intelrvp/baseboard.h b/baseboard/intelrvp/baseboard.h index b374d24b3a..b927632fc5 100644 --- a/baseboard/intelrvp/baseboard.h +++ b/baseboard/intelrvp/baseboard.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -121,9 +121,9 @@ /* SoC / PCH */ #define CONFIG_CHIPSET_RESET_HOOK #define CONFIG_HOST_INTERFACE_ESPI -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S3 -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S4 -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S5 +#define CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 +#define CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 +#define CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S5 #define CONFIG_MKBP_EVENT #define CONFIG_MKBP_USE_HOST_EVENT #define CONFIG_POWER_BUTTON diff --git a/baseboard/intelrvp/build.mk b/baseboard/intelrvp/build.mk index 21b4a7b0ec..b4cacf4cc2 100644 --- a/baseboard/intelrvp/build.mk +++ b/baseboard/intelrvp/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2018 The Chromium OS Authors. All rights reserved. +# Copyright 2018 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/baseboard/intelrvp/chg_usb_pd.c b/baseboard/intelrvp/chg_usb_pd.c index 5c277720d2..95aeea0441 100644 --- a/baseboard/intelrvp/chg_usb_pd.c +++ b/baseboard/intelrvp/chg_usb_pd.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/intelrvp/chg_usb_pd_mecc_1_0.c b/baseboard/intelrvp/chg_usb_pd_mecc_1_0.c index 95d9897ee8..cbc61e8402 100644 --- a/baseboard/intelrvp/chg_usb_pd_mecc_1_0.c +++ b/baseboard/intelrvp/chg_usb_pd_mecc_1_0.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/intelrvp/ite_ec.c b/baseboard/intelrvp/ite_ec.c index 15ed50d92c..76703d4f82 100644 --- a/baseboard/intelrvp/ite_ec.c +++ b/baseboard/intelrvp/ite_ec.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/intelrvp/ite_ec.h b/baseboard/intelrvp/ite_ec.h index 4e28379b5b..7ad147a5f9 100644 --- a/baseboard/intelrvp/ite_ec.h +++ b/baseboard/intelrvp/ite_ec.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/intelrvp/led.c b/baseboard/intelrvp/led.c index 7cb5fad368..10e4e08e63 100644 --- a/baseboard/intelrvp/led.c +++ b/baseboard/intelrvp/led.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/baseboard/intelrvp/led_states.c b/baseboard/intelrvp/led_states.c index a6f882c880..8629085c4f 100644 --- a/baseboard/intelrvp/led_states.c +++ b/baseboard/intelrvp/led_states.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/baseboard/intelrvp/led_states.h b/baseboard/intelrvp/led_states.h index 5d032c9960..3b584c6efc 100644 --- a/baseboard/intelrvp/led_states.h +++ b/baseboard/intelrvp/led_states.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/baseboard/intelrvp/mchp_ec.c b/baseboard/intelrvp/mchp_ec.c index f1eb4678c1..7ede17569b 100644 --- a/baseboard/intelrvp/mchp_ec.c +++ b/baseboard/intelrvp/mchp_ec.c @@ -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. */ diff --git a/baseboard/intelrvp/mchp_ec.h b/baseboard/intelrvp/mchp_ec.h index 594c5fa784..ec1e47c030 100644 --- a/baseboard/intelrvp/mchp_ec.h +++ b/baseboard/intelrvp/mchp_ec.h @@ -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. */ diff --git a/baseboard/intelrvp/npcx_ec.c b/baseboard/intelrvp/npcx_ec.c index d6eca2e55b..a90442e8b1 100644 --- a/baseboard/intelrvp/npcx_ec.c +++ b/baseboard/intelrvp/npcx_ec.c @@ -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. */ diff --git a/baseboard/intelrvp/npcx_ec.h b/baseboard/intelrvp/npcx_ec.h index 98f227e594..5fe6aa9786 100644 --- a/baseboard/intelrvp/npcx_ec.h +++ b/baseboard/intelrvp/npcx_ec.h @@ -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. */ diff --git a/baseboard/intelrvp/usb_pd_policy_mecc_1_0.c b/baseboard/intelrvp/usb_pd_policy_mecc_1_0.c index 5c871075e0..303d176405 100644 --- a/baseboard/intelrvp/usb_pd_policy_mecc_1_0.c +++ b/baseboard/intelrvp/usb_pd_policy_mecc_1_0.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/ite_evb/baseboard.c b/baseboard/ite_evb/baseboard.c index c76204d35c..70f50f054b 100644 --- a/baseboard/ite_evb/baseboard.c +++ b/baseboard/ite_evb/baseboard.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/ite_evb/baseboard.h b/baseboard/ite_evb/baseboard.h index 23b3f80fba..e16e708078 100644 --- a/baseboard/ite_evb/baseboard.h +++ b/baseboard/ite_evb/baseboard.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/ite_evb/build.mk b/baseboard/ite_evb/build.mk index 507222e6b3..38a49ff8b6 100644 --- a/baseboard/ite_evb/build.mk +++ b/baseboard/ite_evb/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/baseboard/ite_evb/usb_pd_pdo.c b/baseboard/ite_evb/usb_pd_pdo.c index 0b00fe5a35..0da735e458 100644 --- a/baseboard/ite_evb/usb_pd_pdo.c +++ b/baseboard/ite_evb/usb_pd_pdo.c @@ -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. */ diff --git a/baseboard/ite_evb/usb_pd_pdo.h b/baseboard/ite_evb/usb_pd_pdo.h index ce3300cc7d..4b19ca32d3 100644 --- a/baseboard/ite_evb/usb_pd_pdo.h +++ b/baseboard/ite_evb/usb_pd_pdo.h @@ -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. */ diff --git a/baseboard/ite_evb/usb_pd_policy.c b/baseboard/ite_evb/usb_pd_policy.c index 7def6871b9..71af9d2b1c 100644 --- a/baseboard/ite_evb/usb_pd_policy.c +++ b/baseboard/ite_evb/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/kalista/baseboard.c b/baseboard/kalista/baseboard.c index ef020ed6e7..e929e5449c 100644 --- a/baseboard/kalista/baseboard.c +++ b/baseboard/kalista/baseboard.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -177,12 +177,15 @@ static int ps8751_tune_mux(const struct usb_mux *me) return EC_SUCCESS; } -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, - .board_init = &ps8751_tune_mux, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .board_init = &ps8751_tune_mux, + }, }, }; diff --git a/baseboard/kalista/baseboard.h b/baseboard/kalista/baseboard.h index 608617ca3e..e3696ae48d 100644 --- a/baseboard/kalista/baseboard.h +++ b/baseboard/kalista/baseboard.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -64,8 +64,8 @@ #define CONFIG_CHIPSET_HAS_PRE_INIT_CALLBACK #define CONFIG_CHIPSET_RESET_HOOK #define CONFIG_HOST_INTERFACE_ESPI -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S3 -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#define CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 +#define CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 #define GPIO_PG_EC_RSMRST_ODL GPIO_RSMRST_L_PGOOD #define CONFIG_HOSTCMD_PD_CONTROL diff --git a/baseboard/kalista/build.mk b/baseboard/kalista/build.mk index fb844b19f1..6bb55b2023 100644 --- a/baseboard/kalista/build.mk +++ b/baseboard/kalista/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2018 The Chromium OS Authors. All rights reserved. +# Copyright 2018 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/baseboard/kalista/led.c b/baseboard/kalista/led.c index 7e78065641..c72ce84bb0 100644 --- a/baseboard/kalista/led.c +++ b/baseboard/kalista/led.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/baseboard/kalista/usb_pd_pdo.c b/baseboard/kalista/usb_pd_pdo.c index 30b6c30a7b..067b8eb9e7 100644 --- a/baseboard/kalista/usb_pd_pdo.c +++ b/baseboard/kalista/usb_pd_pdo.c @@ -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. */ diff --git a/baseboard/kalista/usb_pd_pdo.h b/baseboard/kalista/usb_pd_pdo.h index 1dad035d3d..119658b8a5 100644 --- a/baseboard/kalista/usb_pd_pdo.h +++ b/baseboard/kalista/usb_pd_pdo.h @@ -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. */ diff --git a/baseboard/kalista/usb_pd_policy.c b/baseboard/kalista/usb_pd_policy.c index a8ff0df3a3..017c340a1b 100644 --- a/baseboard/kalista/usb_pd_policy.c +++ b/baseboard/kalista/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/kukui/base_detect_kukui.c b/baseboard/kukui/base_detect_kukui.c index a41a676ef4..a3ccf4d507 100644 --- a/baseboard/kukui/base_detect_kukui.c +++ b/baseboard/kukui/base_detect_kukui.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/kukui/baseboard.c b/baseboard/kukui/baseboard.c index 5b34568840..04e444aad0 100644 --- a/baseboard/kukui/baseboard.c +++ b/baseboard/kukui/baseboard.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/kukui/baseboard.h b/baseboard/kukui/baseboard.h index 8f7f5ede4e..fc87b3441b 100644 --- a/baseboard/kukui/baseboard.h +++ b/baseboard/kukui/baseboard.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/kukui/battery_bq27541.c b/baseboard/kukui/battery_bq27541.c index 281fb13b78..453d5e984f 100644 --- a/baseboard/kukui/battery_bq27541.c +++ b/baseboard/kukui/battery_bq27541.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/baseboard/kukui/battery_max17055.c b/baseboard/kukui/battery_max17055.c index 4293ba70f4..5ebb220b0c 100644 --- a/baseboard/kukui/battery_max17055.c +++ b/baseboard/kukui/battery_max17055.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/baseboard/kukui/battery_mm8013.c b/baseboard/kukui/battery_mm8013.c index 418bd11d1a..26507d5915 100644 --- a/baseboard/kukui/battery_mm8013.c +++ b/baseboard/kukui/battery_mm8013.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/baseboard/kukui/battery_smart.c b/baseboard/kukui/battery_smart.c index 960177a560..b924b2e3a9 100644 --- a/baseboard/kukui/battery_smart.c +++ b/baseboard/kukui/battery_smart.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/baseboard/kukui/build.mk b/baseboard/kukui/build.mk index c64f6978c8..f35ed1f4ce 100644 --- a/baseboard/kukui/build.mk +++ b/baseboard/kukui/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/baseboard/kukui/charger_mt6370.c b/baseboard/kukui/charger_mt6370.c index dfd14bf8e2..398473bfc8 100644 --- a/baseboard/kukui/charger_mt6370.c +++ b/baseboard/kukui/charger_mt6370.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/kukui/charger_mt6370.h b/baseboard/kukui/charger_mt6370.h index 880b00a1a8..1de4e66b0b 100644 --- a/baseboard/kukui/charger_mt6370.h +++ b/baseboard/kukui/charger_mt6370.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/kukui/emmc.c b/baseboard/kukui/emmc.c index db165631f0..8731d7259c 100644 --- a/baseboard/kukui/emmc.c +++ b/baseboard/kukui/emmc.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/baseboard/kukui/emmc_ite.c b/baseboard/kukui/emmc_ite.c index d7441e27cb..2767199be0 100644 --- a/baseboard/kukui/emmc_ite.c +++ b/baseboard/kukui/emmc_ite.c @@ -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. */ diff --git a/baseboard/kukui/usb_pd_policy.c b/baseboard/kukui/usb_pd_policy.c index c0fe554366..2f2c141510 100644 --- a/baseboard/kukui/usb_pd_policy.c +++ b/baseboard/kukui/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/kukui/usb_pd_policy.h b/baseboard/kukui/usb_pd_policy.h index 78e0213f53..62d6bda062 100644 --- a/baseboard/kukui/usb_pd_policy.h +++ b/baseboard/kukui/usb_pd_policy.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/mtscp-rv32i/baseboard.c b/baseboard/mtscp-rv32i/baseboard.c index b9e8f11b14..c86ef15ad7 100644 --- a/baseboard/mtscp-rv32i/baseboard.c +++ b/baseboard/mtscp-rv32i/baseboard.c @@ -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. */ diff --git a/baseboard/mtscp-rv32i/baseboard.h b/baseboard/mtscp-rv32i/baseboard.h index 8776645d8f..49a18c8d9d 100644 --- a/baseboard/mtscp-rv32i/baseboard.h +++ b/baseboard/mtscp-rv32i/baseboard.h @@ -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. */ diff --git a/baseboard/mtscp-rv32i/build.mk b/baseboard/mtscp-rv32i/build.mk index 420a3a4e08..90b8ded4a1 100644 --- a/baseboard/mtscp-rv32i/build.mk +++ b/baseboard/mtscp-rv32i/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/baseboard/mtscp-rv32i/mdp.c b/baseboard/mtscp-rv32i/mdp.c index f33c37c8c3..4c054dc029 100644 --- a/baseboard/mtscp-rv32i/mdp.c +++ b/baseboard/mtscp-rv32i/mdp.c @@ -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. */ diff --git a/baseboard/mtscp-rv32i/mdp.h b/baseboard/mtscp-rv32i/mdp.h index 15c82846ea..48f4937ace 100644 --- a/baseboard/mtscp-rv32i/mdp.h +++ b/baseboard/mtscp-rv32i/mdp.h @@ -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. */ diff --git a/baseboard/mtscp-rv32i/vdec.c b/baseboard/mtscp-rv32i/vdec.c index 68681f63e8..7ff98fff10 100644 --- a/baseboard/mtscp-rv32i/vdec.c +++ b/baseboard/mtscp-rv32i/vdec.c @@ -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. */ diff --git a/baseboard/mtscp-rv32i/vdec.h b/baseboard/mtscp-rv32i/vdec.h index ce07e81352..c203c09fae 100644 --- a/baseboard/mtscp-rv32i/vdec.h +++ b/baseboard/mtscp-rv32i/vdec.h @@ -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. */ diff --git a/baseboard/mtscp-rv32i/venc.c b/baseboard/mtscp-rv32i/venc.c index b2a6a89801..bed2a2dbc6 100644 --- a/baseboard/mtscp-rv32i/venc.c +++ b/baseboard/mtscp-rv32i/venc.c @@ -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. */ diff --git a/baseboard/mtscp-rv32i/venc.h b/baseboard/mtscp-rv32i/venc.h index 673e91da68..c5c7df3883 100644 --- a/baseboard/mtscp-rv32i/venc.h +++ b/baseboard/mtscp-rv32i/venc.h @@ -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. */ diff --git a/baseboard/nucleo-f412zg/base-board.c b/baseboard/nucleo-f412zg/base-board.c index 15e46f006e..53c42e5a26 100644 --- a/baseboard/nucleo-f412zg/base-board.c +++ b/baseboard/nucleo-f412zg/base-board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/nucleo-f412zg/base-board.h b/baseboard/nucleo-f412zg/base-board.h index bd5710e247..0ce6c226e2 100644 --- a/baseboard/nucleo-f412zg/base-board.h +++ b/baseboard/nucleo-f412zg/base-board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/nucleo-f412zg/base-gpio.inc b/baseboard/nucleo-f412zg/base-gpio.inc index 4ebd99f91f..d0c48a46e5 100644 --- a/baseboard/nucleo-f412zg/base-gpio.inc +++ b/baseboard/nucleo-f412zg/base-gpio.inc @@ -1,5 +1,5 @@ /* - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/nucleo-f412zg/build.mk b/baseboard/nucleo-f412zg/build.mk index 1456331fec..d38a618d8c 100644 --- a/baseboard/nucleo-f412zg/build.mk +++ b/baseboard/nucleo-f412zg/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/baseboard/nucleo-f412zg/openocd-flash.cfg b/baseboard/nucleo-f412zg/openocd-flash.cfg index 3333d1163a..cbc9fe0218 100644 --- a/baseboard/nucleo-f412zg/openocd-flash.cfg +++ b/baseboard/nucleo-f412zg/openocd-flash.cfg @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/baseboard/nucleo-f412zg/openocd.cfg b/baseboard/nucleo-f412zg/openocd.cfg index 589d4400f4..3b286a4ebc 100644 --- a/baseboard/nucleo-f412zg/openocd.cfg +++ b/baseboard/nucleo-f412zg/openocd.cfg @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/baseboard/nucleo-h743zi/base-board.c b/baseboard/nucleo-h743zi/base-board.c index 15e46f006e..53c42e5a26 100644 --- a/baseboard/nucleo-h743zi/base-board.c +++ b/baseboard/nucleo-h743zi/base-board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/nucleo-h743zi/base-board.h b/baseboard/nucleo-h743zi/base-board.h index f96ba41bcc..eb4b8ac1fa 100644 --- a/baseboard/nucleo-h743zi/base-board.h +++ b/baseboard/nucleo-h743zi/base-board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/nucleo-h743zi/base-ec.tasklist b/baseboard/nucleo-h743zi/base-ec.tasklist index fae8952113..e8e752aa4e 100644 --- a/baseboard/nucleo-h743zi/base-ec.tasklist +++ b/baseboard/nucleo-h743zi/base-ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/nucleo-h743zi/base-gpio.inc b/baseboard/nucleo-h743zi/base-gpio.inc index ef224cbaf1..ad7d313328 100644 --- a/baseboard/nucleo-h743zi/base-gpio.inc +++ b/baseboard/nucleo-h743zi/base-gpio.inc @@ -1,5 +1,5 @@ /* - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/nucleo-h743zi/build.mk b/baseboard/nucleo-h743zi/build.mk index 470214aabc..36c0cfdf50 100644 --- a/baseboard/nucleo-h743zi/build.mk +++ b/baseboard/nucleo-h743zi/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/baseboard/nucleo-h743zi/openocd-flash.cfg b/baseboard/nucleo-h743zi/openocd-flash.cfg index 4517266d7b..8ee5dd6707 100644 --- a/baseboard/nucleo-h743zi/openocd-flash.cfg +++ b/baseboard/nucleo-h743zi/openocd-flash.cfg @@ -1,4 +1,4 @@ -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/baseboard/nucleo-h743zi/openocd.cfg b/baseboard/nucleo-h743zi/openocd.cfg index 528e8d6cab..9fa8aa89a9 100644 --- a/baseboard/nucleo-h743zi/openocd.cfg +++ b/baseboard/nucleo-h743zi/openocd.cfg @@ -1,4 +1,4 @@ -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/baseboard/octopus/baseboard.c b/baseboard/octopus/baseboard.c index 3c8e981bfc..0f012d1352 100644 --- a/baseboard/octopus/baseboard.c +++ b/baseboard/octopus/baseboard.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/octopus/baseboard.h b/baseboard/octopus/baseboard.h index 0a54f0efac..724540d0f0 100644 --- a/baseboard/octopus/baseboard.h +++ b/baseboard/octopus/baseboard.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/octopus/build.mk b/baseboard/octopus/build.mk index bb8a6f8267..696f60d42e 100644 --- a/baseboard/octopus/build.mk +++ b/baseboard/octopus/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2018 The Chromium OS Authors. All rights reserved. +# Copyright 2018 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/baseboard/octopus/cbi_ssfc.c b/baseboard/octopus/cbi_ssfc.c index 80d8614eb5..827d2e045e 100644 --- a/baseboard/octopus/cbi_ssfc.c +++ b/baseboard/octopus/cbi_ssfc.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/octopus/cbi_ssfc.h b/baseboard/octopus/cbi_ssfc.h index d2b2843ed5..570c240da1 100644 --- a/baseboard/octopus/cbi_ssfc.h +++ b/baseboard/octopus/cbi_ssfc.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/octopus/usb_pd_policy.c b/baseboard/octopus/usb_pd_policy.c index 3c02c89d4d..c8b8b96d3a 100644 --- a/baseboard/octopus/usb_pd_policy.c +++ b/baseboard/octopus/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/octopus/variant_ec_ite8320.c b/baseboard/octopus/variant_ec_ite8320.c index e63986ab96..e79f4cdb01 100644 --- a/baseboard/octopus/variant_ec_ite8320.c +++ b/baseboard/octopus/variant_ec_ite8320.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/octopus/variant_ec_npcx796fb.c b/baseboard/octopus/variant_ec_npcx796fb.c index e9e6da03e5..23a4f58bae 100644 --- a/baseboard/octopus/variant_ec_npcx796fb.c +++ b/baseboard/octopus/variant_ec_npcx796fb.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/octopus/variant_usbc_ec_tcpcs.c b/baseboard/octopus/variant_usbc_ec_tcpcs.c index 6b3d2e2315..983887bc08 100644 --- a/baseboard/octopus/variant_usbc_ec_tcpcs.c +++ b/baseboard/octopus/variant_usbc_ec_tcpcs.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -71,22 +71,26 @@ static void board_it83xx_hpd_status(const struct usb_mux *me, } /* This configuration might be override by each boards */ -struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { [USB_PD_PORT_ITE_0] = { - .usb_port = USB_PD_PORT_ITE_0, - .i2c_port = I2C_PORT_USB_MUX, - .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, - .driver = &it5205_usb_mux_driver, - .hpd_update = &board_it83xx_hpd_status, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_ITE_0, + .i2c_port = I2C_PORT_USB_MUX, + .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, + .driver = &it5205_usb_mux_driver, + .hpd_update = &board_it83xx_hpd_status, + }, }, [USB_PD_PORT_ITE_1] = { - .usb_port = USB_PD_PORT_ITE_1, - /* Use PS8751 as mux only */ - .i2c_port = I2C_PORT_USBC1, - .i2c_addr_flags = PS8XXX_I2C_ADDR1_FLAGS, - .flags = USB_MUX_FLAG_NOT_TCPC, - .driver = &ps8xxx_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_ITE_1, + /* Use PS8751 as mux only */ + .i2c_port = I2C_PORT_USBC1, + .i2c_addr_flags = PS8XXX_I2C_ADDR1_FLAGS, + .flags = USB_MUX_FLAG_NOT_TCPC, + .driver = &ps8xxx_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, } }; diff --git a/baseboard/octopus/variant_usbc_standalone_tcpcs.c b/baseboard/octopus/variant_usbc_standalone_tcpcs.c index 9ab2b8f9e2..abc325dfa3 100644 --- a/baseboard/octopus/variant_usbc_standalone_tcpcs.c +++ b/baseboard/octopus/variant_usbc_standalone_tcpcs.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -66,22 +66,26 @@ static int ps8751_tune_mux(const struct usb_mux *me) } #endif -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { [USB_PD_PORT_TCPC_0] = { - .usb_port = USB_PD_PORT_TCPC_0, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_TCPC_0, #if defined(VARIANT_OCTOPUS_TCPC_0_PS8751) - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, - .board_init = &ps8751_tune_mux, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .board_init = &ps8751_tune_mux, #else - .driver = &anx7447_usb_mux_driver, - .hpd_update = &anx7447_tcpc_update_hpd_status, + .driver = &anx7447_usb_mux_driver, + .hpd_update = &anx7447_tcpc_update_hpd_status, #endif + }, }, [USB_PD_PORT_TCPC_1] = { - .usb_port = USB_PD_PORT_TCPC_1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_TCPC_1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, } }; diff --git a/baseboard/trogdor/baseboard.c b/baseboard/trogdor/baseboard.c index 6f49ecb4ae..3f3c778ea5 100644 --- a/baseboard/trogdor/baseboard.c +++ b/baseboard/trogdor/baseboard.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/trogdor/baseboard.h b/baseboard/trogdor/baseboard.h index 1511e4cdf6..63813c89a0 100644 --- a/baseboard/trogdor/baseboard.h +++ b/baseboard/trogdor/baseboard.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/trogdor/build.mk b/baseboard/trogdor/build.mk index a51c7c7e17..02ed466d2b 100644 --- a/baseboard/trogdor/build.mk +++ b/baseboard/trogdor/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/baseboard/trogdor/hibernate.c b/baseboard/trogdor/hibernate.c index c28082e75d..19af7cfe2e 100644 --- a/baseboard/trogdor/hibernate.c +++ b/baseboard/trogdor/hibernate.c @@ -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. */ diff --git a/baseboard/trogdor/power.c b/baseboard/trogdor/power.c index a893369ced..a8076d0ed5 100644 --- a/baseboard/trogdor/power.c +++ b/baseboard/trogdor/power.c @@ -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. */ diff --git a/baseboard/trogdor/usb_pd_policy.c b/baseboard/trogdor/usb_pd_policy.c index a4f2b31f33..7954d0a352 100644 --- a/baseboard/trogdor/usb_pd_policy.c +++ b/baseboard/trogdor/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/volteer/baseboard.c b/baseboard/volteer/baseboard.c index a7940b2603..fd36aef81f 100644 --- a/baseboard/volteer/baseboard.c +++ b/baseboard/volteer/baseboard.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/volteer/baseboard.h b/baseboard/volteer/baseboard.h index e3ebee7c38..3b8e475fe5 100644 --- a/baseboard/volteer/baseboard.h +++ b/baseboard/volteer/baseboard.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -44,8 +44,8 @@ /* Host communication */ #define CONFIG_HOST_INTERFACE_ESPI -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S4 -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S5 +#define CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 +#define CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S5 /* Chipset config */ #define CONFIG_CHIPSET_TIGERLAKE diff --git a/baseboard/volteer/baseboard_usbc_config.h b/baseboard/volteer/baseboard_usbc_config.h index bf02b1cb34..db5e296d46 100644 --- a/baseboard/volteer/baseboard_usbc_config.h +++ b/baseboard/volteer/baseboard_usbc_config.h @@ -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. */ diff --git a/baseboard/volteer/battery_presence.c b/baseboard/volteer/battery_presence.c index 747f364088..f143b67c91 100644 --- a/baseboard/volteer/battery_presence.c +++ b/baseboard/volteer/battery_presence.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/baseboard/volteer/build.mk b/baseboard/volteer/build.mk index 08b68c5816..2b2f4e97b1 100644 --- a/baseboard/volteer/build.mk +++ b/baseboard/volteer/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/baseboard/volteer/cbi.c b/baseboard/volteer/cbi.c index 8a3dcef5ed..28606d7eaf 100644 --- a/baseboard/volteer/cbi.c +++ b/baseboard/volteer/cbi.c @@ -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. */ diff --git a/baseboard/volteer/cbi.h b/baseboard/volteer/cbi.h index 049c0f65e2..dc940f1edc 100644 --- a/baseboard/volteer/cbi.h +++ b/baseboard/volteer/cbi.h @@ -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. */ diff --git a/baseboard/volteer/cbi_ec_fw_config.c b/baseboard/volteer/cbi_ec_fw_config.c index 323b7b4703..7506278e16 100644 --- a/baseboard/volteer/cbi_ec_fw_config.c +++ b/baseboard/volteer/cbi_ec_fw_config.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/volteer/cbi_ec_fw_config.h b/baseboard/volteer/cbi_ec_fw_config.h index 3917dfcec1..da91dff27b 100644 --- a/baseboard/volteer/cbi_ec_fw_config.h +++ b/baseboard/volteer/cbi_ec_fw_config.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/volteer/cbi_ssfc.c b/baseboard/volteer/cbi_ssfc.c index 3238cfc933..f68602b558 100644 --- a/baseboard/volteer/cbi_ssfc.c +++ b/baseboard/volteer/cbi_ssfc.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/volteer/cbi_ssfc.h b/baseboard/volteer/cbi_ssfc.h index 830c430f4a..225ff8670e 100644 --- a/baseboard/volteer/cbi_ssfc.h +++ b/baseboard/volteer/cbi_ssfc.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/volteer/charger.c b/baseboard/volteer/charger.c index 70d07c2591..84fa4e037c 100644 --- a/baseboard/volteer/charger.c +++ b/baseboard/volteer/charger.c @@ -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. */ diff --git a/baseboard/volteer/power.c b/baseboard/volteer/power.c index b0d6b847ce..882c067b6d 100644 --- a/baseboard/volteer/power.c +++ b/baseboard/volteer/power.c @@ -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. */ diff --git a/baseboard/volteer/usb_pd_policy.c b/baseboard/volteer/usb_pd_policy.c index ffd16b0088..0c843b7078 100644 --- a/baseboard/volteer/usb_pd_policy.c +++ b/baseboard/volteer/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/volteer/usbc_config.c b/baseboard/volteer/usbc_config.c index 36ca78d513..001f47e45f 100644 --- a/baseboard/volteer/usbc_config.c +++ b/baseboard/volteer/usbc_config.c @@ -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. */ diff --git a/baseboard/zork/baseboard.c b/baseboard/zork/baseboard.c index 10c11e3ea8..593bcf1168 100644 --- a/baseboard/zork/baseboard.c +++ b/baseboard/zork/baseboard.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/zork/baseboard.h b/baseboard/zork/baseboard.h index 2c9920b4de..2289c1891b 100644 --- a/baseboard/zork/baseboard.h +++ b/baseboard/zork/baseboard.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/zork/build.mk b/baseboard/zork/build.mk index e79d60cc91..6cf67a1a39 100644 --- a/baseboard/zork/build.mk +++ b/baseboard/zork/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/baseboard/zork/cbi_ec_fw_config.c b/baseboard/zork/cbi_ec_fw_config.c index b5f1909f9f..4482a5cf40 100644 --- a/baseboard/zork/cbi_ec_fw_config.c +++ b/baseboard/zork/cbi_ec_fw_config.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/zork/cbi_ec_fw_config.h b/baseboard/zork/cbi_ec_fw_config.h index d5f30be098..a73e4504bb 100644 --- a/baseboard/zork/cbi_ec_fw_config.h +++ b/baseboard/zork/cbi_ec_fw_config.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/zork/cbi_ssfc.c b/baseboard/zork/cbi_ssfc.c index f5b997d803..9cc2fdcef3 100644 --- a/baseboard/zork/cbi_ssfc.c +++ b/baseboard/zork/cbi_ssfc.c @@ -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. */ diff --git a/baseboard/zork/cbi_ssfc.h b/baseboard/zork/cbi_ssfc.h index 1d201594b0..95bf5ba6e4 100644 --- a/baseboard/zork/cbi_ssfc.h +++ b/baseboard/zork/cbi_ssfc.h @@ -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. */ diff --git a/baseboard/zork/usb_pd_policy.c b/baseboard/zork/usb_pd_policy.c index 89418103ba..aeca706eb2 100644 --- a/baseboard/zork/usb_pd_policy.c +++ b/baseboard/zork/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/zork/variant_dalboz.c b/baseboard/zork/variant_dalboz.c index c45bac0777..599f29618b 100644 --- a/baseboard/zork/variant_dalboz.c +++ b/baseboard/zork/variant_dalboz.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/baseboard/zork/variant_trembyle.c b/baseboard/zork/variant_trembyle.c index c75ee4aa85..bf308badc1 100644 --- a/baseboard/zork/variant_trembyle.c +++ b/baseboard/zork/variant_trembyle.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -489,7 +489,7 @@ static int board_ps8818_mux_set(const struct usb_mux *me, mux_state_t mux_state) return rv; } -const struct usb_mux usbc1_ps8802 = { +struct usb_mux usbc1_ps8802 = { .usb_port = USBC_PORT_C1, .i2c_port = I2C_PORT_TCPC1, .i2c_addr_flags = PS8802_I2C_ADDR_FLAGS, diff --git a/board/adlrvpm_ite/board.h b/board/adlrvpm_ite/board.h index 4059cf05dd..37662a5d52 100644 --- a/board/adlrvpm_ite/board.h +++ b/board/adlrvpm_ite/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/adlrvpm_ite/ec.tasklist b/board/adlrvpm_ite/ec.tasklist index 48c033d14c..b0afc9e9a7 100644 --- a/board/adlrvpm_ite/ec.tasklist +++ b/board/adlrvpm_ite/ec.tasklist @@ -1,5 +1,5 @@ /* - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/adlrvpp_ite/board.c b/board/adlrvpp_ite/board.c index 15aa1c46d7..aa2764f823 100644 --- a/board/adlrvpp_ite/board.c +++ b/board/adlrvpp_ite/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/adlrvpp_ite/board.h b/board/adlrvpp_ite/board.h index 4059cf05dd..37662a5d52 100644 --- a/board/adlrvpp_ite/board.h +++ b/board/adlrvpp_ite/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/adlrvpp_ite/build.mk b/board/adlrvpp_ite/build.mk index fe5f548324..9da9f60561 100644 --- a/board/adlrvpp_ite/build.mk +++ b/board/adlrvpp_ite/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/adlrvpp_ite/ec.tasklist b/board/adlrvpp_ite/ec.tasklist index c110617d6b..8bd63b1730 100644 --- a/board/adlrvpp_ite/ec.tasklist +++ b/board/adlrvpp_ite/ec.tasklist @@ -1,5 +1,5 @@ /* - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/adlrvpp_ite/gpio.inc b/board/adlrvpp_ite/gpio.inc index f7cb8ea19c..22b97a7eff 100644 --- a/board/adlrvpp_ite/gpio.inc +++ b/board/adlrvpp_ite/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -21,10 +21,10 @@ GPIO_INT(PCH_SLP_S0_N, PIN(D, 4), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(VCCPDSW_3P3_EC, PIN(I, 3), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(VCCST_PWRGD, PIN(I, 5), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(PM_SLP_SUS_EC, PIN(K, 2), GPIO_INT_BOTH, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 GPIO_INT(SLP_S3_R_L, PIN(F, 2), GPIO_INT_BOTH, power_signal_interrupt) #endif -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 GPIO_INT(SLP_S4_R_L, PIN(F, 3), GPIO_INT_BOTH, power_signal_interrupt) #endif diff --git a/board/adlrvpp_mchp1521/board.c b/board/adlrvpp_mchp1521/board.c index 4a2f20f27c..a65a3ec60e 100644 --- a/board/adlrvpp_mchp1521/board.c +++ b/board/adlrvpp_mchp1521/board.c @@ -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. */ diff --git a/board/adlrvpp_mchp1521/board.h b/board/adlrvpp_mchp1521/board.h index 61ab5ac7c9..bcd46acf25 100644 --- a/board/adlrvpp_mchp1521/board.h +++ b/board/adlrvpp_mchp1521/board.h @@ -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. */ diff --git a/board/adlrvpp_mchp1521/build.mk b/board/adlrvpp_mchp1521/build.mk index b53a3bb479..5bc76c4429 100644 --- a/board/adlrvpp_mchp1521/build.mk +++ b/board/adlrvpp_mchp1521/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/adlrvpp_mchp1521/ec.tasklist b/board/adlrvpp_mchp1521/ec.tasklist index 6d30fe3312..0019755448 100644 --- a/board/adlrvpp_mchp1521/ec.tasklist +++ b/board/adlrvpp_mchp1521/ec.tasklist @@ -1,5 +1,5 @@ /* - * 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. */ diff --git a/board/adlrvpp_mchp1521/gpio.inc b/board/adlrvpp_mchp1521/gpio.inc index ce6d2de65f..848253fa17 100644 --- a/board/adlrvpp_mchp1521/gpio.inc +++ b/board/adlrvpp_mchp1521/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/adlrvpp_mchp1727/board.c b/board/adlrvpp_mchp1727/board.c index 4b232999e0..46092b91e3 100644 --- a/board/adlrvpp_mchp1727/board.c +++ b/board/adlrvpp_mchp1727/board.c @@ -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. */ diff --git a/board/adlrvpp_mchp1727/board.h b/board/adlrvpp_mchp1727/board.h index dcfdadba65..ad4d189b42 100644 --- a/board/adlrvpp_mchp1727/board.h +++ b/board/adlrvpp_mchp1727/board.h @@ -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. */ diff --git a/board/adlrvpp_mchp1727/build.mk b/board/adlrvpp_mchp1727/build.mk index 2a056943d4..0527f50d24 100644 --- a/board/adlrvpp_mchp1727/build.mk +++ b/board/adlrvpp_mchp1727/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/adlrvpp_mchp1727/ec.tasklist b/board/adlrvpp_mchp1727/ec.tasklist index 8c3776ccad..3ae4784397 100644 --- a/board/adlrvpp_mchp1727/ec.tasklist +++ b/board/adlrvpp_mchp1727/ec.tasklist @@ -1,5 +1,5 @@ /* - * 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. */ diff --git a/board/adlrvpp_mchp1727/gpio.inc b/board/adlrvpp_mchp1727/gpio.inc index 42973648b4..582da4c46a 100644 --- a/board/adlrvpp_mchp1727/gpio.inc +++ b/board/adlrvpp_mchp1727/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ @@ -18,12 +18,12 @@ GPIO_INT(PCH_SLP_S0_N, PIN(0243), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(VCCPDSW_3P3, PIN(0201), GPIO_INT_BOTH, power_signal_interrupt) /* TODO: GPIO_INT(VCCST_PWRGD_MECC, PIN(0207), GPIO_INT_BOTH, power_signal_interrupt) */ GPIO_INT(PM_SLP_SUS_EC_N, PIN(0227), GPIO_INT_BOTH, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 GPIO_INT(PM_SLP_S3_N, PIN(0161), GPIO_INT_BOTH, power_signal_interrupt) #else GPIO(PM_SLP_S3_N, PIN(0161), GPIO_INPUT) #endif -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 GPIO_INT(PM_SLP_S4_N, PIN(0162), GPIO_INT_BOTH, power_signal_interrupt) #else GPIO(PM_SLP_S4_N, PIN(0162), GPIO_INPUT) diff --git a/board/adlrvpp_npcx/board.c b/board/adlrvpp_npcx/board.c index 412cebdb9a..f0b2a4408d 100644 --- a/board/adlrvpp_npcx/board.c +++ b/board/adlrvpp_npcx/board.c @@ -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. */ diff --git a/board/adlrvpp_npcx/board.h b/board/adlrvpp_npcx/board.h index 3db2df61b6..ff214ddec2 100644 --- a/board/adlrvpp_npcx/board.h +++ b/board/adlrvpp_npcx/board.h @@ -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. */ diff --git a/board/adlrvpp_npcx/build.mk b/board/adlrvpp_npcx/build.mk index ec3450ee7e..db43110a34 100644 --- a/board/adlrvpp_npcx/build.mk +++ b/board/adlrvpp_npcx/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/adlrvpp_npcx/ec.tasklist b/board/adlrvpp_npcx/ec.tasklist index 08521ac10e..df3dc2c67d 100644 --- a/board/adlrvpp_npcx/ec.tasklist +++ b/board/adlrvpp_npcx/ec.tasklist @@ -1,5 +1,5 @@ /* - * 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. */ diff --git a/board/adlrvpp_npcx/gpio.inc b/board/adlrvpp_npcx/gpio.inc index 4a696e4c09..ebc04045bf 100644 --- a/board/adlrvpp_npcx/gpio.inc +++ b/board/adlrvpp_npcx/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ @@ -16,12 +16,12 @@ GPIO_INT(PCH_SLP_S0_N, PIN(A, 1), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(VCCPDSW_3P3, PIN(4, 5), GPIO_INT_BOTH, power_signal_interrupt) /* TODO: GPIO_INT(VCCST_PWRGD_MECC, PIN(7, 1), GPIO_INT_BOTH, power_signal_interrupt) */ GPIO_INT(PM_SLP_SUS_EC_N, PIN(8, 6), GPIO_INT_BOTH, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 GPIO_INT(PM_SLP_S3_N, PIN(B, 0), GPIO_INT_BOTH, power_signal_interrupt) #else GPIO(PM_SLP_S3_N, PIN(B, 0), GPIO_INPUT) #endif -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 GPIO_INT(PM_SLP_S4_N, PIN(A, 5), GPIO_INT_BOTH, power_signal_interrupt) #else GPIO(PM_SLP_S4_N, PIN(A, 5), GPIO_INPUT) diff --git a/board/agah/battery.c b/board/agah/battery.c index b9adcb4db9..92e2ad4b07 100644 --- a/board/agah/battery.c +++ b/board/agah/battery.c @@ -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. * diff --git a/board/agah/board.c b/board/agah/board.c index c2c6686b36..c8c98621d3 100644 --- a/board/agah/board.c +++ b/board/agah/board.c @@ -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. */ diff --git a/board/agah/board.h b/board/agah/board.h index 77a4ba4562..0622e33df3 100644 --- a/board/agah/board.h +++ b/board/agah/board.h @@ -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. */ diff --git a/board/agah/build.mk b/board/agah/build.mk index fbdd503bc4..d2f2db68df 100644 --- a/board/agah/build.mk +++ b/board/agah/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/agah/charger_isl9241.c b/board/agah/charger_isl9241.c index 9578a5bd9a..47e8261f78 100644 --- a/board/agah/charger_isl9241.c +++ b/board/agah/charger_isl9241.c @@ -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. */ diff --git a/board/agah/ec.tasklist b/board/agah/ec.tasklist index 187609f36e..ebbfd239f9 100644 --- a/board/agah/ec.tasklist +++ b/board/agah/ec.tasklist @@ -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. */ diff --git a/board/agah/fans.c b/board/agah/fans.c index 236c1021a5..45533d9e8c 100644 --- a/board/agah/fans.c +++ b/board/agah/fans.c @@ -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. */ diff --git a/board/agah/fw_config.c b/board/agah/fw_config.c index b53950af97..a16cf10d5a 100644 --- a/board/agah/fw_config.c +++ b/board/agah/fw_config.c @@ -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. */ diff --git a/board/agah/fw_config.h b/board/agah/fw_config.h index 9507811e8d..7efdae51ac 100644 --- a/board/agah/fw_config.h +++ b/board/agah/fw_config.h @@ -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. */ diff --git a/board/agah/gpio.inc b/board/agah/gpio.inc index 2059b1eaed..a3a6610ac8 100644 --- a/board/agah/gpio.inc +++ b/board/agah/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/agah/i2c.c b/board/agah/i2c.c index 0b8a465d9d..5bdf6936c1 100644 --- a/board/agah/i2c.c +++ b/board/agah/i2c.c @@ -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. */ diff --git a/board/agah/keyboard.c b/board/agah/keyboard.c index da5174ee37..cb34543db8 100644 --- a/board/agah/keyboard.c +++ b/board/agah/keyboard.c @@ -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. */ diff --git a/board/agah/led.c b/board/agah/led.c index d8f9894ba2..e16b3df5d6 100644 --- a/board/agah/led.c +++ b/board/agah/led.c @@ -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. * diff --git a/board/agah/pwm.c b/board/agah/pwm.c index 69616f6f04..9fa0f41eff 100644 --- a/board/agah/pwm.c +++ b/board/agah/pwm.c @@ -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. */ diff --git a/board/agah/sensors.c b/board/agah/sensors.c index 56e98f2812..046787872d 100644 --- a/board/agah/sensors.c +++ b/board/agah/sensors.c @@ -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. */ diff --git a/board/agah/usbc_config.c b/board/agah/usbc_config.c index aca14304dd..fe5157e420 100644 --- a/board/agah/usbc_config.c +++ b/board/agah/usbc_config.c @@ -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. */ @@ -144,26 +144,33 @@ int board_ps8818_mux_set(const struct usb_mux *me, mux_state_t mux_state) return rv; } -const static struct usb_mux usbc2_ps8818 = { - .usb_port = USBC_PORT_C2, - .i2c_port = I2C_PORT_USB_C2_TCPC, - .i2c_addr_flags = PS8818_I2C_ADDR_FLAGS, - .driver = &ps8818_usb_retimer_driver, - .board_set = &board_ps8818_mux_set, +const static struct usb_mux_chain usbc2_ps8818 = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C2, + .i2c_port = I2C_PORT_USB_C2_TCPC, + .i2c_addr_flags = PS8818_I2C_ADDR_FLAGS, + .driver = &ps8818_usb_retimer_driver, + .board_set = &board_ps8818_mux_set, + }, }; /* USBC mux configuration - Alder Lake includes internal mux */ -const struct usb_mux usb_muxes[] = { +const struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }, [USBC_PORT_C2] = { - .usb_port = USBC_PORT_C2, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, - .next_mux = &usbc2_ps8818, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C2, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, + .next = &usbc2_ps8818, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/board/agah/usbc_config.h b/board/agah/usbc_config.h index 43e7b20411..e353263f5f 100644 --- a/board/agah/usbc_config.h +++ b/board/agah/usbc_config.h @@ -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. */ diff --git a/board/akemi/battery.c b/board/akemi/battery.c index 238716b116..de380ac01c 100644 --- a/board/akemi/battery.c +++ b/board/akemi/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/akemi/board.c b/board/akemi/board.c index 31fcf74828..7d480b1268 100644 --- a/board/akemi/board.c +++ b/board/akemi/board.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -140,16 +140,20 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }, }; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { [USB_PD_PORT_TCPC_0] = { - .usb_port = USB_PD_PORT_TCPC_0, - .driver = &anx7447_usb_mux_driver, - .hpd_update = &anx7447_tcpc_update_hpd_status, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_TCPC_0, + .driver = &anx7447_usb_mux_driver, + .hpd_update = &anx7447_tcpc_update_hpd_status, + }, }, [USB_PD_PORT_TCPC_1] = { - .usb_port = USB_PD_PORT_TCPC_1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_TCPC_1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, } }; diff --git a/board/akemi/board.h b/board/akemi/board.h index c7eab2f48f..bdc18638f8 100644 --- a/board/akemi/board.h +++ b/board/akemi/board.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/akemi/build.mk b/board/akemi/build.mk index 733912454f..13153c1526 100644 --- a/board/akemi/build.mk +++ b/board/akemi/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/akemi/ec.tasklist b/board/akemi/ec.tasklist index 4a1024a091..829be2b7c8 100644 --- a/board/akemi/ec.tasklist +++ b/board/akemi/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/akemi/gpio.inc b/board/akemi/gpio.inc index 1ea8cca58a..05466078c7 100644 --- a/board/akemi/gpio.inc +++ b/board/akemi/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -16,10 +16,10 @@ GPIO_INT(ACOK_OD, PIN(0, 0), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, ex /* Power sequencing interrupts */ GPIO_INT(SLP_S0_L, PIN(D, 5), GPIO_INT_BOTH, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 GPIO_INT(SLP_S3_L, PIN(A, 5), GPIO_INT_BOTH, power_signal_interrupt) #endif -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 GPIO_INT(SLP_S4_L, PIN(D, 4), GPIO_INT_BOTH, power_signal_interrupt) #endif GPIO_INT(PG_EC_RSMRST_L, PIN(E, 2), GPIO_INT_BOTH, intel_x86_rsmrst_signal_interrupt) diff --git a/board/akemi/led.c b/board/akemi/led.c index 91b7d54aaf..49f767a28e 100644 --- a/board/akemi/led.c +++ b/board/akemi/led.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/aleena/battery.c b/board/aleena/battery.c index b3abae7f73..0862ba209f 100644 --- a/board/aleena/battery.c +++ b/board/aleena/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/aleena/board.c b/board/aleena/board.c index ebc47deb67..0970a7513c 100644 --- a/board/aleena/board.c +++ b/board/aleena/board.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/aleena/board.h b/board/aleena/board.h index dfca82a3cc..f51b7b3e16 100644 --- a/board/aleena/board.h +++ b/board/aleena/board.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/aleena/build.mk b/board/aleena/build.mk index c808e65aed..d24127ddae 100644 --- a/board/aleena/build.mk +++ b/board/aleena/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2015 The Chromium OS Authors. All rights reserved. +# Copyright 2015 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/aleena/ec.tasklist b/board/aleena/ec.tasklist index dc898c4502..9572d61c8f 100644 --- a/board/aleena/ec.tasklist +++ b/board/aleena/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/aleena/gpio.inc b/board/aleena/gpio.inc index 6fefcf88f1..669c833e56 100644 --- a/board/aleena/gpio.inc +++ b/board/aleena/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2017 The Chromium OS Authors. All rights reserved. + * Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/aleena/led.c b/board/aleena/led.c index f2fdbc2b80..c24bc404cc 100644 --- a/board/aleena/led.c +++ b/board/aleena/led.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/ambassador/board.c b/board/ambassador/board.c index 360dab72e4..f2bc7557ec 100644 --- a/board/ambassador/board.c +++ b/board/ambassador/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -271,11 +271,13 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { .flags = TCPC_FLAGS_RESET_ACTIVE_HIGH, }, }; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { [USB_PD_PORT_TCPC_0] = { - .usb_port = USB_PD_PORT_TCPC_0, - .driver = &anx7447_usb_mux_driver, - .hpd_update = &anx7447_tcpc_update_hpd_status, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_TCPC_0, + .driver = &anx7447_usb_mux_driver, + .hpd_update = &anx7447_tcpc_update_hpd_status, + }, }, }; diff --git a/board/ambassador/board.h b/board/ambassador/board.h index 135133a40d..fb9659bda7 100644 --- a/board/ambassador/board.h +++ b/board/ambassador/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/ambassador/build.mk b/board/ambassador/build.mk index 0f55c45f77..f9096c64ff 100644 --- a/board/ambassador/build.mk +++ b/board/ambassador/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/ambassador/ec.tasklist b/board/ambassador/ec.tasklist index f820cf903c..42b9542d96 100644 --- a/board/ambassador/ec.tasklist +++ b/board/ambassador/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/ambassador/gpio.inc b/board/ambassador/gpio.inc index 871031ebf9..46b6118ce2 100644 --- a/board/ambassador/gpio.inc +++ b/board/ambassador/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -25,12 +25,12 @@ GPIO_INT(PG_VPRIM_CORE_A_OD, PIN(2, 3), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(PG_PP1050_A_OD, PIN(2, 2), GPIO_INT_BOTH, power_signal_interrupt) /* EC output, but also interrupt so this can be polled as a power signal */ GPIO_INT(EC_PCH_RSMRST_L, PIN(A, 6), GPIO_OUTPUT | GPIO_INT_F_RISING | GPIO_INT_F_FALLING, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 GPIO_INT(SLP_S4_L, PIN(D, 4), GPIO_INT_BOTH, power_signal_interrupt) #endif GPIO_INT(PG_PP2500_DRAM_U_OD, PIN(2, 0), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(PG_PP1200_U_OD, PIN(2, 1), GPIO_INT_BOTH, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 GPIO_INT(SLP_S3_L, PIN(A, 5), GPIO_INT_BOTH, slp_s3_interrupt) #endif GPIO_INT(PG_PP950_VCCIO_OD, PIN(1, 7), GPIO_INT_BOTH, power_signal_interrupt) diff --git a/board/ambassador/led.c b/board/ambassador/led.c index 36f7a127fa..3baf867580 100644 --- a/board/ambassador/led.c +++ b/board/ambassador/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/ambassador/usb_pd_policy.c b/board/ambassador/usb_pd_policy.c index a89fd35074..fbb4edf23e 100644 --- a/board/ambassador/usb_pd_policy.c +++ b/board/ambassador/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/ampton/battery.c b/board/ampton/battery.c index f52f0d5d7a..18bf4e591a 100644 --- a/board/ampton/battery.c +++ b/board/ampton/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/ampton/board.c b/board/ampton/board.c index 4ba0bbd60d..f1346a6b07 100644 --- a/board/ampton/board.c +++ b/board/ampton/board.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/ampton/board.h b/board/ampton/board.h index 52ee8fa464..4a00f82cd2 100644 --- a/board/ampton/board.h +++ b/board/ampton/board.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/ampton/build.mk b/board/ampton/build.mk index cc6b73093e..daf4529f19 100644 --- a/board/ampton/build.mk +++ b/board/ampton/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2018 The Chromium OS Authors. All rights reserved. +# Copyright 2018 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/ampton/ec.tasklist b/board/ampton/ec.tasklist index 2703dd0b5c..466dd4c60f 100644 --- a/board/ampton/ec.tasklist +++ b/board/ampton/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/ampton/gpio.inc b/board/ampton/gpio.inc index 854a28655d..c1d7769668 100644 --- a/board/ampton/gpio.inc +++ b/board/ampton/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2018 The Chromium OS Authors. All rights reserved. + * Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/ampton/led.c b/board/ampton/led.c index 31385aacb4..02bafec4e0 100644 --- a/board/ampton/led.c +++ b/board/ampton/led.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/anahera/battery.c b/board/anahera/battery.c index 95ca9be206..f7b0b6f43f 100644 --- a/board/anahera/battery.c +++ b/board/anahera/battery.c @@ -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. * diff --git a/board/anahera/board.c b/board/anahera/board.c index f1da042cc7..e087d629a7 100644 --- a/board/anahera/board.c +++ b/board/anahera/board.c @@ -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. */ diff --git a/board/anahera/board.h b/board/anahera/board.h index 4a38765a65..18360171e3 100644 --- a/board/anahera/board.h +++ b/board/anahera/board.h @@ -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. */ diff --git a/board/anahera/build.mk b/board/anahera/build.mk index b3aef429a6..dda59fdd82 100644 --- a/board/anahera/build.mk +++ b/board/anahera/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/anahera/charger.c b/board/anahera/charger.c index cbc657271b..a4fa209246 100644 --- a/board/anahera/charger.c +++ b/board/anahera/charger.c @@ -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. */ diff --git a/board/anahera/ec.tasklist b/board/anahera/ec.tasklist index 187609f36e..ebbfd239f9 100644 --- a/board/anahera/ec.tasklist +++ b/board/anahera/ec.tasklist @@ -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. */ diff --git a/board/anahera/fans.c b/board/anahera/fans.c index 1ecf1d4a75..7d08701dc0 100644 --- a/board/anahera/fans.c +++ b/board/anahera/fans.c @@ -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. */ diff --git a/board/anahera/fw_config.c b/board/anahera/fw_config.c index 1144a30fbe..6073384f53 100644 --- a/board/anahera/fw_config.c +++ b/board/anahera/fw_config.c @@ -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. */ diff --git a/board/anahera/fw_config.h b/board/anahera/fw_config.h index ddbb741ffc..32787c1e4f 100644 --- a/board/anahera/fw_config.h +++ b/board/anahera/fw_config.h @@ -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. */ diff --git a/board/anahera/gpio.inc b/board/anahera/gpio.inc index 794e8750b4..5cce74abff 100644 --- a/board/anahera/gpio.inc +++ b/board/anahera/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/anahera/i2c.c b/board/anahera/i2c.c index 7748066514..7e7993b4d5 100644 --- a/board/anahera/i2c.c +++ b/board/anahera/i2c.c @@ -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. */ diff --git a/board/anahera/keyboard.c b/board/anahera/keyboard.c index 43164df58c..8588191460 100644 --- a/board/anahera/keyboard.c +++ b/board/anahera/keyboard.c @@ -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. */ diff --git a/board/anahera/led.c b/board/anahera/led.c index c00e56a12a..d7a3d07efc 100644 --- a/board/anahera/led.c +++ b/board/anahera/led.c @@ -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. * diff --git a/board/anahera/pwm.c b/board/anahera/pwm.c index 54d0d05afb..b242683306 100644 --- a/board/anahera/pwm.c +++ b/board/anahera/pwm.c @@ -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. */ diff --git a/board/anahera/sensors.c b/board/anahera/sensors.c index 1b4e657843..05d9a9080b 100644 --- a/board/anahera/sensors.c +++ b/board/anahera/sensors.c @@ -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. */ diff --git a/board/anahera/thermal.c b/board/anahera/thermal.c index 86b1ecd2d3..b5b5a0c1cc 100644 --- a/board/anahera/thermal.c +++ b/board/anahera/thermal.c @@ -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. */ diff --git a/board/anahera/usbc_config.c b/board/anahera/usbc_config.c index 7248cda081..b0fd5551d9 100644 --- a/board/anahera/usbc_config.c +++ b/board/anahera/usbc_config.c @@ -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. */ @@ -79,33 +79,43 @@ BUILD_ASSERT(ARRAY_SIZE(ppc_chips) == USBC_PORT_COUNT); unsigned int ppc_cnt = ARRAY_SIZE(ppc_chips); /* USBC mux configuration - Alder Lake includes internal mux */ -static const struct usb_mux usbc0_tcss_usb_mux = { - .usb_port = USBC_PORT_C0, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +static const struct usb_mux_chain usbc0_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C0, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; -static const struct usb_mux usbc1_tcss_usb_mux = { - .usb_port = USBC_PORT_C1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +static const struct usb_mux_chain usbc1_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; -const struct usb_mux usb_muxes[] = { +const struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_C0_MUX, - .i2c_addr_flags = USBC_PORT_C0_BB_RETIMER_I2C_ADDR, - .next_mux = &usbc0_tcss_usb_mux, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_C0_MUX, + .i2c_addr_flags = USBC_PORT_C0_BB_RETIMER_I2C_ADDR, + }, + .next = &usbc0_tcss_usb_mux, }, [USBC_PORT_C1] = { - .usb_port = USBC_PORT_C1, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_C1_MUX, - .i2c_addr_flags = USBC_PORT_C1_BB_RETIMER_I2C_ADDR, - .next_mux = &usbc1_tcss_usb_mux, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C1, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_C1_MUX, + .i2c_addr_flags = USBC_PORT_C1_BB_RETIMER_I2C_ADDR, + }, + .next = &usbc1_tcss_usb_mux, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/board/anahera/usbc_config.h b/board/anahera/usbc_config.h index 785cfdb082..c476919027 100644 --- a/board/anahera/usbc_config.h +++ b/board/anahera/usbc_config.h @@ -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. */ diff --git a/board/arcada_ish/board.c b/board/arcada_ish/board.c index 9fcb250b14..d340f61251 100644 --- a/board/arcada_ish/board.c +++ b/board/arcada_ish/board.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/arcada_ish/board.h b/board/arcada_ish/board.h index 7275714aab..129640d60f 100644 --- a/board/arcada_ish/board.h +++ b/board/arcada_ish/board.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/arcada_ish/build.mk b/board/arcada_ish/build.mk index a57c08e6ba..80cf4886eb 100644 --- a/board/arcada_ish/build.mk +++ b/board/arcada_ish/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2018 The Chromium OS Authors. All rights reserved. +# Copyright 2018 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/arcada_ish/ec.tasklist b/board/arcada_ish/ec.tasklist index d72fdf309e..81d3c5dc20 100644 --- a/board/arcada_ish/ec.tasklist +++ b/board/arcada_ish/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/arcada_ish/gpio.inc b/board/arcada_ish/gpio.inc index 336f807269..6a577d0efe 100644 --- a/board/arcada_ish/gpio.inc +++ b/board/arcada_ish/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2018 The Chromium OS Authors. All rights reserved. + * Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/asurada/battery.c b/board/asurada/battery.c index 6237a5058c..ad49477366 100644 --- a/board/asurada/battery.c +++ b/board/asurada/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/asurada/board.c b/board/asurada/board.c index 60cd12e10b..4e4aede76d 100644 --- a/board/asurada/board.c +++ b/board/asurada/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/asurada/board.h b/board/asurada/board.h index e2315f44c2..6d9a19b884 100644 --- a/board/asurada/board.h +++ b/board/asurada/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/asurada/build.mk b/board/asurada/build.mk index d6866f8568..72015fba95 100644 --- a/board/asurada/build.mk +++ b/board/asurada/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/asurada/ec.tasklist b/board/asurada/ec.tasklist index ff47718bae..c8e234a412 100644 --- a/board/asurada/ec.tasklist +++ b/board/asurada/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/asurada/gpio.inc b/board/asurada/gpio.inc index 75d1fbafa5..46700a7749 100644 --- a/board/asurada/gpio.inc +++ b/board/asurada/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/asurada/led.c b/board/asurada/led.c index 6dcf401441..ca29f0be45 100644 --- a/board/asurada/led.c +++ b/board/asurada/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/asurada/led_hayato.c b/board/asurada/led_hayato.c index 4285127f5c..be1a352289 100644 --- a/board/asurada/led_hayato.c +++ b/board/asurada/led_hayato.c @@ -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. */ diff --git a/board/asurada/usbc_config.c b/board/asurada/usbc_config.c index d826500911..ba6461b0f8 100644 --- a/board/asurada/usbc_config.c +++ b/board/asurada/usbc_config.c @@ -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. */ @@ -17,11 +17,11 @@ __override int syv682x_board_is_syv682c(int port) void board_usb_mux_init(void) { if (board_get_sub_board() == SUB_BOARD_TYPEC) { - ps8743_tune_usb_eq(&usb_muxes[1], PS8743_USB_EQ_TX_12_8_DB, + ps8743_tune_usb_eq(usb_muxes[1].mux, PS8743_USB_EQ_TX_12_8_DB, PS8743_USB_EQ_RX_12_8_DB); - ps8743_write(&usb_muxes[1], PS8743_REG_HS_DET_THRESHOLD, + ps8743_write(usb_muxes[1].mux, PS8743_REG_HS_DET_THRESHOLD, PS8743_USB_HS_THRESH_NEG_10); - ps8743_field_update(&usb_muxes[1], PS8743_REG_DCI_CONFIG_2, + ps8743_field_update(usb_muxes[1].mux, PS8743_REG_DCI_CONFIG_2, PS8743_AUTO_DCI_MODE_MASK, PS8743_AUTO_DCI_MODE_FORCE_USB); } diff --git a/board/asurada_scp/board.h b/board/asurada_scp/board.h index e91e8adb0e..b70a39d20d 100644 --- a/board/asurada_scp/board.h +++ b/board/asurada_scp/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/asurada_scp/build.mk b/board/asurada_scp/build.mk index f3c4a82a10..94efa82a6f 100644 --- a/board/asurada_scp/build.mk +++ b/board/asurada_scp/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/asurada_scp/ec.tasklist b/board/asurada_scp/ec.tasklist index 6e2f613c6d..1e43d6d30d 100644 --- a/board/asurada_scp/ec.tasklist +++ b/board/asurada_scp/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/asurada_scp/gpio.inc b/board/asurada_scp/gpio.inc index 3222a34e08..efc5675875 100644 --- a/board/asurada_scp/gpio.inc +++ b/board/asurada_scp/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/atlas/battery.c b/board/atlas/battery.c index 2d07d360ef..78b3be16a4 100644 --- a/board/atlas/battery.c +++ b/board/atlas/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/atlas/board.c b/board/atlas/board.c index 9617006094..6fbbb64b16 100644 --- a/board/atlas/board.c +++ b/board/atlas/board.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -193,16 +193,22 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }, }; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, }, { - .usb_port = 1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, }, }; diff --git a/board/atlas/board.h b/board/atlas/board.h index 6937b5d434..0882b5742e 100644 --- a/board/atlas/board.h +++ b/board/atlas/board.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -55,8 +55,8 @@ #define CONFIG_CHIPSET_RESET_HOOK #define CONFIG_CPU_PROCHOT_ACTIVE_LOW #define CONFIG_HOST_INTERFACE_ESPI -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S3 -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#define CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 +#define CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 #define CONFIG_KEYBOARD_COL2_INVERTED #define CONFIG_KEYBOARD_PROTOCOL_8042 diff --git a/board/atlas/build.mk b/board/atlas/build.mk index f1619f73cd..b7eeeb0a61 100644 --- a/board/atlas/build.mk +++ b/board/atlas/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2018 The Chromium OS Authors. All rights reserved. +# Copyright 2018 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/atlas/ec.tasklist b/board/atlas/ec.tasklist index 33e3cccb16..b0bf043717 100644 --- a/board/atlas/ec.tasklist +++ b/board/atlas/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/atlas/gpio.inc b/board/atlas/gpio.inc index 4ce44cc130..ea76ab8841 100644 --- a/board/atlas/gpio.inc +++ b/board/atlas/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2018 The Chromium OS Authors. All rights reserved. + * Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/atlas/led.c b/board/atlas/led.c index 6cc36c1e9a..2a297848e3 100644 --- a/board/atlas/led.c +++ b/board/atlas/led.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/atlas/usb_pd_policy.c b/board/atlas/usb_pd_policy.c index 0d1cad4004..fc7a2141f5 100644 --- a/board/atlas/usb_pd_policy.c +++ b/board/atlas/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/baklava/board.c b/board/baklava/board.c index 5b89a7cf61..dc0b3a952a 100644 --- a/board/baklava/board.c +++ b/board/baklava/board.c @@ -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. */ @@ -154,13 +154,15 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }, }; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { [USB_PD_PORT_HOST] = { - .usb_port = USB_PD_PORT_HOST, - .i2c_port = I2C_PORT_I2C1, - .i2c_addr_flags = PS8822_I2C_ADDR3_FLAG, - .driver = &ps8822_usb_mux_driver, - .board_set = &board_ps8822_mux_set, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_HOST, + .i2c_port = I2C_PORT_I2C1, + .i2c_addr_flags = PS8822_I2C_ADDR3_FLAG, + .driver = &ps8822_usb_mux_driver, + .board_set = &board_ps8822_mux_set, + }, }, }; diff --git a/board/baklava/board.h b/board/baklava/board.h index 1dca7bbf4a..8cbe1cdc76 100644 --- a/board/baklava/board.h +++ b/board/baklava/board.h @@ -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. */ diff --git a/board/baklava/build.mk b/board/baklava/build.mk index 7e3e1240fd..258bafe87d 100644 --- a/board/baklava/build.mk +++ b/board/baklava/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/baklava/ec.tasklist b/board/baklava/ec.tasklist index 14c2c31393..a478fbe2e0 100644 --- a/board/baklava/ec.tasklist +++ b/board/baklava/ec.tasklist @@ -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. */ diff --git a/board/baklava/gpio.inc b/board/baklava/gpio.inc index 144a5e3f8c..2745ae7caf 100644 --- a/board/baklava/gpio.inc +++ b/board/baklava/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/banshee/battery.c b/board/banshee/battery.c index 8143e6cec8..35d6a7a935 100644 --- a/board/banshee/battery.c +++ b/board/banshee/battery.c @@ -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. * diff --git a/board/banshee/board.c b/board/banshee/board.c index 04ea76fe90..611686f88d 100644 --- a/board/banshee/board.c +++ b/board/banshee/board.c @@ -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. */ @@ -47,7 +47,7 @@ void set_bb_retimer_usb3_state(bool enable) mux_state_t mux_state = 0; for (int i = 0; i < CONFIG_USB_PD_PORT_MAX_COUNT; i++) { - const struct usb_mux *mux = &usb_muxes[i]; + const struct usb_mux *mux = usb_muxes[i].mux; mux_state = usb_mux_get(i); diff --git a/board/banshee/board.h b/board/banshee/board.h index f21e319b50..c456a17e68 100644 --- a/board/banshee/board.h +++ b/board/banshee/board.h @@ -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. */ diff --git a/board/banshee/build.mk b/board/banshee/build.mk index c4c9ce0a78..78c675a67a 100644 --- a/board/banshee/build.mk +++ b/board/banshee/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/banshee/charger.c b/board/banshee/charger.c index 32dd2ddddb..88f5b85a41 100644 --- a/board/banshee/charger.c +++ b/board/banshee/charger.c @@ -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. */ diff --git a/board/banshee/ec.tasklist b/board/banshee/ec.tasklist index 0b8d0e412b..b193da8f9f 100644 --- a/board/banshee/ec.tasklist +++ b/board/banshee/ec.tasklist @@ -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. */ diff --git a/board/banshee/fans.c b/board/banshee/fans.c index 295dce6baa..0658dc8859 100644 --- a/board/banshee/fans.c +++ b/board/banshee/fans.c @@ -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. */ diff --git a/board/banshee/fw_config.c b/board/banshee/fw_config.c index dba01cf28d..dc7fe7ca2a 100644 --- a/board/banshee/fw_config.c +++ b/board/banshee/fw_config.c @@ -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. */ diff --git a/board/banshee/fw_config.h b/board/banshee/fw_config.h index 1771b05867..912aebca7e 100644 --- a/board/banshee/fw_config.h +++ b/board/banshee/fw_config.h @@ -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. */ diff --git a/board/banshee/gpio.inc b/board/banshee/gpio.inc index 2a0e90e675..e33fa5ec06 100644 --- a/board/banshee/gpio.inc +++ b/board/banshee/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/banshee/i2c.c b/board/banshee/i2c.c index 556f27822e..ea3fd38e62 100644 --- a/board/banshee/i2c.c +++ b/board/banshee/i2c.c @@ -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. */ diff --git a/board/banshee/keyboard.c b/board/banshee/keyboard.c index ce1fcacf4c..928f02e025 100644 --- a/board/banshee/keyboard.c +++ b/board/banshee/keyboard.c @@ -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. */ diff --git a/board/banshee/keyboard_customization.c b/board/banshee/keyboard_customization.c index 50c1f9e54b..dfec873343 100644 --- a/board/banshee/keyboard_customization.c +++ b/board/banshee/keyboard_customization.c @@ -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. */ diff --git a/board/banshee/keyboard_customization.h b/board/banshee/keyboard_customization.h index 7ccb358cc6..1b4994ded0 100644 --- a/board/banshee/keyboard_customization.h +++ b/board/banshee/keyboard_customization.h @@ -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. */ diff --git a/board/banshee/led.c b/board/banshee/led.c index 130c2d969d..1471388085 100644 --- a/board/banshee/led.c +++ b/board/banshee/led.c @@ -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. */ diff --git a/board/banshee/pwm.c b/board/banshee/pwm.c index e02d19064d..bfe5071eca 100644 --- a/board/banshee/pwm.c +++ b/board/banshee/pwm.c @@ -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. */ diff --git a/board/banshee/sensors.c b/board/banshee/sensors.c index 7dbeb62a62..57b81b2af8 100644 --- a/board/banshee/sensors.c +++ b/board/banshee/sensors.c @@ -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. */ diff --git a/board/banshee/usbc_config.c b/board/banshee/usbc_config.c index 20c8983979..7840b865ab 100644 --- a/board/banshee/usbc_config.c +++ b/board/banshee/usbc_config.c @@ -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. */ @@ -113,59 +113,79 @@ BUILD_ASSERT(ARRAY_SIZE(ppc_chips) == USBC_PORT_COUNT); unsigned int ppc_cnt = ARRAY_SIZE(ppc_chips); /* USBC mux configuration - Alder Lake includes internal mux */ -static const struct usb_mux usbc0_tcss_usb_mux = { - .usb_port = USBC_PORT_C0, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +static const struct usb_mux_chain usbc0_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C0, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; -static const struct usb_mux usbc1_tcss_usb_mux = { - .usb_port = USBC_PORT_C1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +static const struct usb_mux_chain usbc1_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; -static const struct usb_mux usbc2_tcss_usb_mux = { - .usb_port = USBC_PORT_C2, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +static const struct usb_mux_chain usbc2_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C2, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; -static const struct usb_mux usbc3_tcss_usb_mux = { - .usb_port = USBC_PORT_C3, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +static const struct usb_mux_chain usbc3_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C3, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; -const struct usb_mux usb_muxes[] = { +const struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_C0_C1_MUX, - .i2c_addr_flags = USBC_PORT_C0_BB_RETIMER_I2C_ADDR, - .next_mux = &usbc0_tcss_usb_mux, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_C0_C1_MUX, + .i2c_addr_flags = USBC_PORT_C0_BB_RETIMER_I2C_ADDR, + }, + .next = &usbc0_tcss_usb_mux, }, [USBC_PORT_C1] = { - .usb_port = USBC_PORT_C1, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_C0_C1_MUX, - .i2c_addr_flags = USBC_PORT_C1_BB_RETIMER_I2C_ADDR, - .next_mux = &usbc1_tcss_usb_mux, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C1, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_C0_C1_MUX, + .i2c_addr_flags = USBC_PORT_C1_BB_RETIMER_I2C_ADDR, + }, + .next = &usbc1_tcss_usb_mux, }, [USBC_PORT_C2] = { - .usb_port = USBC_PORT_C2, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_C2_C3_MUX, - .i2c_addr_flags = USBC_PORT_C2_BB_RETIMER_I2C_ADDR, - .next_mux = &usbc2_tcss_usb_mux, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C2, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_C2_C3_MUX, + .i2c_addr_flags = USBC_PORT_C2_BB_RETIMER_I2C_ADDR, + }, + .next = &usbc2_tcss_usb_mux, }, [USBC_PORT_C3] = { - .usb_port = USBC_PORT_C3, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_C2_C3_MUX, - .i2c_addr_flags = USBC_PORT_C3_BB_RETIMER_I2C_ADDR, - .next_mux = &usbc3_tcss_usb_mux, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C3, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_C2_C3_MUX, + .i2c_addr_flags = USBC_PORT_C3_BB_RETIMER_I2C_ADDR, + }, + .next = &usbc3_tcss_usb_mux, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/board/banshee/usbc_config.h b/board/banshee/usbc_config.h index e1e0d53ea4..5085b28bec 100644 --- a/board/banshee/usbc_config.h +++ b/board/banshee/usbc_config.h @@ -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. */ diff --git a/board/beadrix/battery.c b/board/beadrix/battery.c index 8ebdaf466d..48defc0481 100644 --- a/board/beadrix/battery.c +++ b/board/beadrix/battery.c @@ -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. * diff --git a/board/beadrix/board.c b/board/beadrix/board.c index dd6f1146a2..5cea32f90c 100644 --- a/board/beadrix/board.c +++ b/board/beadrix/board.c @@ -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. */ @@ -219,30 +219,39 @@ static int board_nb7v904m_mux_set(const struct usb_mux *me, mux_state_t mux_state); /* USB Retimer */ -const struct usb_mux usbc1_retimer = { - .usb_port = 1, - .i2c_port = I2C_PORT_SUB_USB_C1, - .i2c_addr_flags = NB7V904M_I2C_ADDR0, - .driver = &nb7v904m_usb_redriver_drv, - .board_set = &board_nb7v904m_mux_set, +const struct usb_mux_chain usbc1_retimer = { + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .i2c_port = I2C_PORT_SUB_USB_C1, + .i2c_addr_flags = NB7V904M_I2C_ADDR0, + .driver = &nb7v904m_usb_redriver_drv, + .board_set = &board_nb7v904m_mux_set, + }, }; /* USB Muxes */ -struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_C0, - .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, - .driver = &it5205_usb_mux_driver, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_C0, + .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, + .driver = &it5205_usb_mux_driver, + }, }, { /* Used as MUX only*/ - .usb_port = 1, - .i2c_port = I2C_PORT_SUB_USB_C1, - .i2c_addr_flags = AN7447_TCPC0_I2C_ADDR_FLAGS, - .flags = USB_MUX_FLAG_NOT_TCPC, - .driver = &anx7447_usb_mux_driver, - .next_mux = &usbc1_retimer, + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .i2c_port = I2C_PORT_SUB_USB_C1, + .i2c_addr_flags = AN7447_TCPC0_I2C_ADDR_FLAGS, + .flags = USB_MUX_FLAG_NOT_TCPC, + .driver = &anx7447_usb_mux_driver, + }, + .next = &usbc1_retimer, }, }; diff --git a/board/beadrix/board.h b/board/beadrix/board.h index 94cbc4891a..82a7802445 100644 --- a/board/beadrix/board.h +++ b/board/beadrix/board.h @@ -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. */ diff --git a/board/beadrix/build.mk b/board/beadrix/build.mk index 8167ca9966..01b890bf29 100644 --- a/board/beadrix/build.mk +++ b/board/beadrix/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/beadrix/cbi_ssfc.c b/board/beadrix/cbi_ssfc.c index 39fd4929a1..81f3ee0dad 100644 --- a/board/beadrix/cbi_ssfc.c +++ b/board/beadrix/cbi_ssfc.c @@ -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. */ diff --git a/board/beadrix/cbi_ssfc.h b/board/beadrix/cbi_ssfc.h index 942f0cf5f4..bf8853a43a 100644 --- a/board/beadrix/cbi_ssfc.h +++ b/board/beadrix/cbi_ssfc.h @@ -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. */ diff --git a/board/beadrix/ec.tasklist b/board/beadrix/ec.tasklist index 74b7663d69..253501100e 100644 --- a/board/beadrix/ec.tasklist +++ b/board/beadrix/ec.tasklist @@ -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. */ diff --git a/board/beadrix/gpio.inc b/board/beadrix/gpio.inc index b5e557f01f..b450c520e8 100644 --- a/board/beadrix/gpio.inc +++ b/board/beadrix/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/beadrix/led.c b/board/beadrix/led.c index da8cb5f052..8bef7c0bd9 100644 --- a/board/beadrix/led.c +++ b/board/beadrix/led.c @@ -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. */ diff --git a/board/beadrix/usb_pd_policy.c b/board/beadrix/usb_pd_policy.c index fb0f60802f..c22c68d224 100644 --- a/board/beadrix/usb_pd_policy.c +++ b/board/beadrix/usb_pd_policy.c @@ -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. */ diff --git a/board/beetley/battery.c b/board/beetley/battery.c index 94f5dbb630..0402ef33fd 100644 --- a/board/beetley/battery.c +++ b/board/beetley/battery.c @@ -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. * diff --git a/board/beetley/board.c b/board/beetley/board.c index 2cf45faf93..f6b1f1008c 100644 --- a/board/beetley/board.c +++ b/board/beetley/board.c @@ -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. */ @@ -168,12 +168,15 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }; /* USB Muxes */ -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_C0, - .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, - .driver = &it5205_usb_mux_driver, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_C0, + .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, + .driver = &it5205_usb_mux_driver, + }, }, }; diff --git a/board/beetley/board.h b/board/beetley/board.h index 610578abcf..a70ee73ebb 100644 --- a/board/beetley/board.h +++ b/board/beetley/board.h @@ -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. */ diff --git a/board/beetley/build.mk b/board/beetley/build.mk index 8167ca9966..01b890bf29 100644 --- a/board/beetley/build.mk +++ b/board/beetley/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/beetley/cbi_ssfc.c b/board/beetley/cbi_ssfc.c index 39fd4929a1..81f3ee0dad 100644 --- a/board/beetley/cbi_ssfc.c +++ b/board/beetley/cbi_ssfc.c @@ -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. */ diff --git a/board/beetley/cbi_ssfc.h b/board/beetley/cbi_ssfc.h index 942f0cf5f4..bf8853a43a 100644 --- a/board/beetley/cbi_ssfc.h +++ b/board/beetley/cbi_ssfc.h @@ -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. */ diff --git a/board/beetley/ec.tasklist b/board/beetley/ec.tasklist index bdcbcdf074..8ccdfc81b2 100644 --- a/board/beetley/ec.tasklist +++ b/board/beetley/ec.tasklist @@ -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. */ diff --git a/board/beetley/gpio.inc b/board/beetley/gpio.inc index bbb793ee44..0677e5a2ac 100644 --- a/board/beetley/gpio.inc +++ b/board/beetley/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/beetley/led.c b/board/beetley/led.c index e29b61c514..e3d4eb543e 100644 --- a/board/beetley/led.c +++ b/board/beetley/led.c @@ -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. * diff --git a/board/beetley/usb_pd_policy.c b/board/beetley/usb_pd_policy.c index 814287a417..a7633b73ac 100644 --- a/board/beetley/usb_pd_policy.c +++ b/board/beetley/usb_pd_policy.c @@ -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. */ diff --git a/board/bellis/battery.c b/board/bellis/battery.c index 7c086fb8e2..d74876ec27 100644 --- a/board/bellis/battery.c +++ b/board/bellis/battery.c @@ -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. */ diff --git a/board/bellis/board.c b/board/bellis/board.c index fa1e808c94..e03ae1c36c 100644 --- a/board/bellis/board.c +++ b/board/bellis/board.c @@ -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. */ @@ -165,13 +165,16 @@ static void board_hpd_status(const struct usb_mux *me, mux_state_t mux_state, host_set_single_event(EC_HOST_EVENT_USB_MUX); } -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_MUX, - .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, - .driver = &it5205_usb_mux_driver, - .hpd_update = &board_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_MUX, + .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, + .driver = &it5205_usb_mux_driver, + .hpd_update = &board_hpd_status, + }, }, }; diff --git a/board/bellis/board.h b/board/bellis/board.h index 3948e704af..d502c4c5ef 100644 --- a/board/bellis/board.h +++ b/board/bellis/board.h @@ -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. */ diff --git a/board/bellis/build.mk b/board/bellis/build.mk index f88dde8da8..604790d66c 100644 --- a/board/bellis/build.mk +++ b/board/bellis/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/bellis/ec.tasklist b/board/bellis/ec.tasklist index faecc9d405..2d69c1b113 100644 --- a/board/bellis/ec.tasklist +++ b/board/bellis/ec.tasklist @@ -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. */ diff --git a/board/bellis/gpio.inc b/board/bellis/gpio.inc index 5fa1383483..a80ef27c97 100644 --- a/board/bellis/gpio.inc +++ b/board/bellis/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/bellis/led.c b/board/bellis/led.c index 24725c4274..658533d075 100644 --- a/board/bellis/led.c +++ b/board/bellis/led.c @@ -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. * diff --git a/board/berknip/battery.c b/board/berknip/battery.c index 526375c0db..d024e710c3 100644 --- a/board/berknip/battery.c +++ b/board/berknip/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/berknip/board.c b/board/berknip/board.c index f189263803..cade20a3c7 100644 --- a/board/berknip/board.c +++ b/board/berknip/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -142,14 +142,21 @@ const struct usb_mux_driver usbc0_sbu_mux_driver = { * Since PI3USB221 is not a i2c device, .i2c_port and * .i2c_addr_flags are not required here. */ -const struct usb_mux usbc0_sbu_mux = { - .usb_port = USBC_PORT_C0, - .driver = &usbc0_sbu_mux_driver, +const struct usb_mux_chain usbc0_sbu_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C0, + .driver = &usbc0_sbu_mux_driver, + }, }; /***************************************************************************** * USB-C MUX/Retimer dynamic configuration */ + +/* Place holder for second mux in USBC1 chain */ +struct usb_mux_chain usbc1_mux1; + static void setup_mux(void) { if (ec_config_has_usbc1_retimer_tusb544()) { @@ -160,10 +167,9 @@ static void setup_mux(void) * Replace usb_muxes[USBC_PORT_C1] with the AMD FP5 * table entry. */ - memcpy(&usb_muxes[USBC_PORT_C1], &usbc1_amd_fp5_usb_mux, - sizeof(struct usb_mux)); + usb_muxes[USBC_PORT_C1].mux = &usbc1_amd_fp5_usb_mux; /* Set the TUSB544 as the secondary MUX */ - usb_muxes[USBC_PORT_C1].next_mux = &usbc1_tusb544; + usbc1_mux1.mux = &usbc1_tusb544; } else if (ec_config_has_usbc1_retimer_ps8743()) { ccprints("C1 PS8743 detected"); /* @@ -172,25 +178,27 @@ static void setup_mux(void) * Replace usb_muxes[USBC_PORT_C1] with the PS8743 * table entry. */ - memcpy(&usb_muxes[USBC_PORT_C1], &usbc1_ps8743, - sizeof(struct usb_mux)); + usb_muxes[USBC_PORT_C1].mux = &usbc1_ps8743; /* Set the AMD FP5 as the secondary MUX */ - usb_muxes[USBC_PORT_C1].next_mux = &usbc1_amd_fp5_usb_mux; + usbc1_mux1.mux = &usbc1_amd_fp5_usb_mux; /* Don't have the AMD FP5 flip */ usbc1_amd_fp5_usb_mux.flags = USB_MUX_FLAG_SET_WITHOUT_FLIP; } } -struct usb_mux usb_muxes[] = { +struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .i2c_port = I2C_PORT_USB_AP_MUX, - .i2c_addr_flags = AMD_FP5_MUX_I2C_ADDR_FLAGS, - .driver = &amd_fp5_usb_mux_driver, - .next_mux = &usbc0_sbu_mux, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .i2c_port = I2C_PORT_USB_AP_MUX, + .i2c_addr_flags = AMD_FP5_MUX_I2C_ADDR_FLAGS, + .driver = &amd_fp5_usb_mux_driver, + }, + .next = &usbc0_sbu_mux, }, [USBC_PORT_C1] = { /* Filled in dynamically at startup */ + .next = &usbc1_mux1, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/board/berknip/board.h b/board/berknip/board.h index 9235acc56f..62261f284b 100644 --- a/board/berknip/board.h +++ b/board/berknip/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/berknip/build.mk b/board/berknip/build.mk index 1c0cbc4f63..45c71f962c 100644 --- a/board/berknip/build.mk +++ b/board/berknip/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/berknip/ec.tasklist b/board/berknip/ec.tasklist index 3a08ebc972..779bd4fdd6 100644 --- a/board/berknip/ec.tasklist +++ b/board/berknip/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/berknip/gpio.inc b/board/berknip/gpio.inc index 860cbba284..1bba6a3a69 100644 --- a/board/berknip/gpio.inc +++ b/board/berknip/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/berknip/led.c b/board/berknip/led.c index 154b82b0cc..afa3c3e5d2 100644 --- a/board/berknip/led.c +++ b/board/berknip/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/blipper/battery.c b/board/blipper/battery.c index 114cfbc313..61ad95d4b7 100644 --- a/board/blipper/battery.c +++ b/board/blipper/battery.c @@ -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. * diff --git a/board/blipper/board.c b/board/blipper/board.c index 8b2da26be2..766f55579c 100644 --- a/board/blipper/board.c +++ b/board/blipper/board.c @@ -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. */ @@ -173,12 +173,15 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }; /* USB Muxes */ -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_C0, - .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, - .driver = &it5205_usb_mux_driver, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_C0, + .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, + .driver = &it5205_usb_mux_driver, + }, }, }; diff --git a/board/blipper/board.h b/board/blipper/board.h index a213019842..379a92a007 100644 --- a/board/blipper/board.h +++ b/board/blipper/board.h @@ -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. */ diff --git a/board/blipper/build.mk b/board/blipper/build.mk index 8167ca9966..01b890bf29 100644 --- a/board/blipper/build.mk +++ b/board/blipper/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/blipper/cbi_ssfc.c b/board/blipper/cbi_ssfc.c index 39fd4929a1..81f3ee0dad 100644 --- a/board/blipper/cbi_ssfc.c +++ b/board/blipper/cbi_ssfc.c @@ -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. */ diff --git a/board/blipper/cbi_ssfc.h b/board/blipper/cbi_ssfc.h index 7b29a1c585..bc6bc92286 100644 --- a/board/blipper/cbi_ssfc.h +++ b/board/blipper/cbi_ssfc.h @@ -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. */ diff --git a/board/blipper/ec.tasklist b/board/blipper/ec.tasklist index bdcbcdf074..8ccdfc81b2 100644 --- a/board/blipper/ec.tasklist +++ b/board/blipper/ec.tasklist @@ -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. */ diff --git a/board/blipper/gpio.inc b/board/blipper/gpio.inc index 8558aab638..215f31a281 100644 --- a/board/blipper/gpio.inc +++ b/board/blipper/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/blipper/led.c b/board/blipper/led.c index 43afc9873f..c6617d081c 100644 --- a/board/blipper/led.c +++ b/board/blipper/led.c @@ -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. * diff --git a/board/blipper/usb_pd_policy.c b/board/blipper/usb_pd_policy.c index 814287a417..a7633b73ac 100644 --- a/board/blipper/usb_pd_policy.c +++ b/board/blipper/usb_pd_policy.c @@ -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. */ diff --git a/board/bloog/battery.c b/board/bloog/battery.c index f67b21d3b5..af3282576a 100644 --- a/board/bloog/battery.c +++ b/board/bloog/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/bloog/board.c b/board/bloog/board.c index c44d4966c9..9250dfe299 100644 --- a/board/bloog/board.c +++ b/board/bloog/board.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/bloog/board.h b/board/bloog/board.h index f9b6b2a2e2..38e8484df2 100644 --- a/board/bloog/board.h +++ b/board/bloog/board.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/bloog/build.mk b/board/bloog/build.mk index 137e208b53..fee77e38b5 100644 --- a/board/bloog/build.mk +++ b/board/bloog/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/bloog/ec.tasklist b/board/bloog/ec.tasklist index 6eac78a042..6c56976091 100644 --- a/board/bloog/ec.tasklist +++ b/board/bloog/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/bloog/gpio.inc b/board/bloog/gpio.inc index 3ee2f88eb1..f07b380974 100644 --- a/board/bloog/gpio.inc +++ b/board/bloog/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/bloog/led.c b/board/bloog/led.c index 965cca73ea..22f5bc5523 100644 --- a/board/bloog/led.c +++ b/board/bloog/led.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/bobba/battery.c b/board/bobba/battery.c index dbebf250d9..ab77c44062 100644 --- a/board/bobba/battery.c +++ b/board/bobba/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/bobba/board.c b/board/bobba/board.c index 44101476ea..64e713a55e 100644 --- a/board/bobba/board.c +++ b/board/bobba/board.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/bobba/board.h b/board/bobba/board.h index d8ec1cbfc4..2a1be082e8 100644 --- a/board/bobba/board.h +++ b/board/bobba/board.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/bobba/build.mk b/board/bobba/build.mk index 3d04b75731..998a65a3de 100644 --- a/board/bobba/build.mk +++ b/board/bobba/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2018 The Chromium OS Authors. All rights reserved. +# Copyright 2018 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/bobba/ec.tasklist b/board/bobba/ec.tasklist index d98db145e7..977b8b01be 100644 --- a/board/bobba/ec.tasklist +++ b/board/bobba/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/bobba/gpio.inc b/board/bobba/gpio.inc index edb76d05f6..f57ea6bf12 100644 --- a/board/bobba/gpio.inc +++ b/board/bobba/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2018 The Chromium OS Authors. All rights reserved. + * Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/bobba/led.c b/board/bobba/led.c index bf987d322a..54227ed107 100644 --- a/board/bobba/led.c +++ b/board/bobba/led.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/boldar/battery.c b/board/boldar/battery.c index 48f7fcda84..2b2a9f4842 100644 --- a/board/boldar/battery.c +++ b/board/boldar/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/boldar/board.c b/board/boldar/board.c index d2bfda4bae..19b8f44020 100644 --- a/board/boldar/board.c +++ b/board/boldar/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -281,24 +281,33 @@ static const struct tcpc_config_t tcpc_config_p1_usb3 = { * virtual_usb_mux_driver so the AP gets notified of mux changes and updates * the TCSS configuration on state changes. */ -static const struct usb_mux usbc1_usb3_db_retimer = { - .usb_port = USBC_PORT_C1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, - .next_mux = NULL, +static const struct usb_mux_chain usbc1_usb3_db_retimer = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, + .next = NULL, }; -static const struct usb_mux mux_config_p1_usb3_active = { - .usb_port = USBC_PORT_C1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, - .next_mux = &usbc1_usb3_db_retimer, +static const struct usb_mux_chain mux_config_p1_usb3_active = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, + .next = &usbc1_usb3_db_retimer, }; -static const struct usb_mux mux_config_p1_usb3_passive = { - .usb_port = USBC_PORT_C1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +static const struct usb_mux_chain mux_config_p1_usb3_passive = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; /******************************************************************************/ @@ -509,33 +518,43 @@ BUILD_ASSERT(CONFIG_USB_PD_PORT_MAX_COUNT == USBC_PORT_COUNT); /******************************************************************************/ /* USBC mux configuration - Tiger Lake includes internal mux */ -struct usb_mux usbc0_tcss_usb_mux = { - .usb_port = USBC_PORT_C0, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +struct usb_mux_chain usbc0_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C0, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; -struct usb_mux usbc1_tcss_usb_mux = { - .usb_port = USBC_PORT_C1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +struct usb_mux_chain usbc1_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; -struct usb_mux usb_muxes[] = { +struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .next_mux = &usbc0_tcss_usb_mux, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_1_MIX, - .i2c_addr_flags = USBC_PORT_C0_BB_RETIMER_I2C_ADDR, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_1_MIX, + .i2c_addr_flags = USBC_PORT_C0_BB_RETIMER_I2C_ADDR, + }, + .next = &usbc0_tcss_usb_mux, }, [USBC_PORT_C1] = { - .usb_port = USBC_PORT_C1, - .next_mux = &usbc1_tcss_usb_mux, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_1_MIX, - .i2c_addr_flags = USBC_PORT_C1_BB_RETIMER_I2C_ADDR, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C1, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_1_MIX, + .i2c_addr_flags = USBC_PORT_C1_BB_RETIMER_I2C_ADDR, + }, + .next = &usbc1_tcss_usb_mux, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/board/boldar/board.h b/board/boldar/board.h index 44ca16ccc6..f2a76dab82 100644 --- a/board/boldar/board.h +++ b/board/boldar/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -25,7 +25,7 @@ #define CONFIG_POWER_BUTTON -#define CONFIG_HOSTCMD_ESPI_RESET_SLP_SX_VW_ON_ESPI_RST +#define CONFIG_HOST_INTERFACE_ESPI_RESET_SLP_SX_VW_ON_ESPI_RST #undef CONFIG_UART_TX_BUF_SIZE #define CONFIG_UART_TX_BUF_SIZE 4096 diff --git a/board/boldar/build.mk b/board/boldar/build.mk index 838d6a16ce..c994631759 100644 --- a/board/boldar/build.mk +++ b/board/boldar/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/boldar/ec.tasklist b/board/boldar/ec.tasklist index 3e20d8ae39..c29125d517 100644 --- a/board/boldar/ec.tasklist +++ b/board/boldar/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/boldar/gpio.inc b/board/boldar/gpio.inc index 4f55b5c503..f06541ebbb 100644 --- a/board/boldar/gpio.inc +++ b/board/boldar/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -16,7 +16,7 @@ GPIO_INT(ACOK_OD, PIN(0, 0), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, ex /* Power sequencing interrupts */ GPIO_INT(SLP_S0_L, PIN(D, 5), GPIO_INT_BOTH, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 GPIO_INT(SLP_S3_L, PIN(A, 5), GPIO_INT_BOTH, power_signal_interrupt) #endif GPIO_INT(SLP_SUS_L, PIN(D, 7), GPIO_INT_BOTH, power_signal_interrupt) diff --git a/board/boldar/led.c b/board/boldar/led.c index 1cd5d092a2..d2425d13b6 100644 --- a/board/boldar/led.c +++ b/board/boldar/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/boldar/sensors.c b/board/boldar/sensors.c index 1d9cb27558..0670223f13 100644 --- a/board/boldar/sensors.c +++ b/board/boldar/sensors.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/boten/battery.c b/board/boten/battery.c index 0f4c8ffeb9..c4b4f9261d 100644 --- a/board/boten/battery.c +++ b/board/boten/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/boten/board.c b/board/boten/board.c index 83845098d0..c47b9e46f0 100644 --- a/board/boten/board.c +++ b/board/boten/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -195,12 +195,15 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }; /* USB Muxes */ -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_C0, - .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, - .driver = &it5205_usb_mux_driver, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_C0, + .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, + .driver = &it5205_usb_mux_driver, + }, }, }; diff --git a/board/boten/board.h b/board/boten/board.h index 68e50cbade..ec5d25ff9f 100644 --- a/board/boten/board.h +++ b/board/boten/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/boten/build.mk b/board/boten/build.mk index 806168ea0d..9b862c7624 100644 --- a/board/boten/build.mk +++ b/board/boten/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/boten/cbi_ssfc.c b/board/boten/cbi_ssfc.c index 39fd4929a1..81f3ee0dad 100644 --- a/board/boten/cbi_ssfc.c +++ b/board/boten/cbi_ssfc.c @@ -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. */ diff --git a/board/boten/cbi_ssfc.h b/board/boten/cbi_ssfc.h index 942f0cf5f4..bf8853a43a 100644 --- a/board/boten/cbi_ssfc.h +++ b/board/boten/cbi_ssfc.h @@ -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. */ diff --git a/board/boten/ec.tasklist b/board/boten/ec.tasklist index be1f92aff2..e610e8ad33 100644 --- a/board/boten/ec.tasklist +++ b/board/boten/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/boten/gpio.inc b/board/boten/gpio.inc index 4e8290c277..4c9890441d 100644 --- a/board/boten/gpio.inc +++ b/board/boten/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/boten/led.c b/board/boten/led.c index 90e6bab217..ca2f7c9399 100644 --- a/board/boten/led.c +++ b/board/boten/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/boten/usb_pd_policy.c b/board/boten/usb_pd_policy.c index d5aa77fe93..74167850ee 100644 --- a/board/boten/usb_pd_policy.c +++ b/board/boten/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/brask/board.c b/board/brask/board.c index 50ced8af47..bd9d1d7998 100644 --- a/board/brask/board.c +++ b/board/brask/board.c @@ -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. */ diff --git a/board/brask/board.h b/board/brask/board.h index 6dfc5ebe48..dde8b85412 100644 --- a/board/brask/board.h +++ b/board/brask/board.h @@ -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. */ diff --git a/board/brask/build.mk b/board/brask/build.mk index f92c283725..f180fcb8ef 100644 --- a/board/brask/build.mk +++ b/board/brask/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/brask/ec.tasklist b/board/brask/ec.tasklist index a366e05682..3572543743 100644 --- a/board/brask/ec.tasklist +++ b/board/brask/ec.tasklist @@ -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. */ diff --git a/board/brask/fans.c b/board/brask/fans.c index 62492fe063..6828438a10 100644 --- a/board/brask/fans.c +++ b/board/brask/fans.c @@ -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. */ diff --git a/board/brask/fw_config.c b/board/brask/fw_config.c index 5b987f7ebc..3ee71e6a0f 100644 --- a/board/brask/fw_config.c +++ b/board/brask/fw_config.c @@ -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. */ diff --git a/board/brask/fw_config.h b/board/brask/fw_config.h index ff1f3583fe..95d81f1e05 100644 --- a/board/brask/fw_config.h +++ b/board/brask/fw_config.h @@ -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. */ diff --git a/board/brask/gpio.inc b/board/brask/gpio.inc index 5bd13beaee..5fa07523f6 100644 --- a/board/brask/gpio.inc +++ b/board/brask/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/brask/i2c.c b/board/brask/i2c.c index 190f4f019e..3af3e43d75 100644 --- a/board/brask/i2c.c +++ b/board/brask/i2c.c @@ -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. */ diff --git a/board/brask/led.c b/board/brask/led.c index 44f2fa4198..0a57994ca0 100644 --- a/board/brask/led.c +++ b/board/brask/led.c @@ -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. * diff --git a/board/brask/pwm.c b/board/brask/pwm.c index a2ae9988f5..1804cb5586 100644 --- a/board/brask/pwm.c +++ b/board/brask/pwm.c @@ -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. */ diff --git a/board/brask/sensors.c b/board/brask/sensors.c index 2f69e81502..b5caaaf717 100644 --- a/board/brask/sensors.c +++ b/board/brask/sensors.c @@ -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. */ diff --git a/board/brask/usbc_config.c b/board/brask/usbc_config.c index d320b4f77a..5cec791afc 100644 --- a/board/brask/usbc_config.c +++ b/board/brask/usbc_config.c @@ -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. */ @@ -91,20 +91,29 @@ BUILD_ASSERT(ARRAY_SIZE(ppc_chips) == USBC_PORT_COUNT); unsigned int ppc_cnt = ARRAY_SIZE(ppc_chips); /* USBC mux configuration - Alder Lake includes internal mux */ -static const struct usb_mux usbc0_tcss_usb_mux = { - .usb_port = USBC_PORT_C0, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +static const struct usb_mux_chain usbc0_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C0, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; -static const struct usb_mux usbc1_tcss_usb_mux = { - .usb_port = USBC_PORT_C1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +static const struct usb_mux_chain usbc1_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; -static const struct usb_mux usbc2_tcss_usb_mux = { - .usb_port = USBC_PORT_C2, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +static const struct usb_mux_chain usbc2_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C2, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; struct kb800x_control_t kb800x_control[] = { @@ -124,29 +133,35 @@ struct kb800x_control_t kb800x_control[] = { }; BUILD_ASSERT(ARRAY_SIZE(kb800x_control) == USBC_PORT_COUNT); -const struct usb_mux usb_muxes[] = { +const struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_C0_C2_MUX, - .i2c_addr_flags = USBC_PORT_C0_BB_RETIMER_I2C_ADDR, - .next_mux = &usbc0_tcss_usb_mux, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_C0_C2_MUX, + .i2c_addr_flags = USBC_PORT_C0_BB_RETIMER_I2C_ADDR, + }, + .next = &usbc0_tcss_usb_mux, }, [USBC_PORT_C1] = { - .usb_port = USBC_PORT_C1, - .driver = &kb800x_usb_mux_driver, - .i2c_port = I2C_PORT_USB_C1_MUX, - .i2c_addr_flags = KB800X_I2C_ADDR0_FLAGS, - .next_mux = &usbc1_tcss_usb_mux, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C1, + .driver = &kb800x_usb_mux_driver, + .i2c_port = I2C_PORT_USB_C1_MUX, + .i2c_addr_flags = KB800X_I2C_ADDR0_FLAGS, + }, + .next = &usbc1_tcss_usb_mux, }, [USBC_PORT_C2] = { - .usb_port = USBC_PORT_C2, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_C0_C2_MUX, - .i2c_addr_flags = USBC_PORT_C2_BB_RETIMER_I2C_ADDR, - .next_mux = &usbc2_tcss_usb_mux, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C2, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_C0_C2_MUX, + .i2c_addr_flags = USBC_PORT_C2_BB_RETIMER_I2C_ADDR, + }, + .next = &usbc2_tcss_usb_mux, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/board/brask/usbc_config.h b/board/brask/usbc_config.h index a57b3c486e..0d4f62651a 100644 --- a/board/brask/usbc_config.h +++ b/board/brask/usbc_config.h @@ -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. */ diff --git a/board/brya/battery.c b/board/brya/battery.c index 000a483e6d..71b46082d8 100644 --- a/board/brya/battery.c +++ b/board/brya/battery.c @@ -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. * diff --git a/board/brya/board.c b/board/brya/board.c index b73f7b2d8b..50b13e8743 100644 --- a/board/brya/board.c +++ b/board/brya/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/brya/board.h b/board/brya/board.h index 6901735f6f..8b0aceb93b 100644 --- a/board/brya/board.h +++ b/board/brya/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/brya/build.mk b/board/brya/build.mk index 5ca5590ee1..bc3e3cd31e 100644 --- a/board/brya/build.mk +++ b/board/brya/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/brya/charger.c b/board/brya/charger.c index cbc657271b..a4fa209246 100644 --- a/board/brya/charger.c +++ b/board/brya/charger.c @@ -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. */ diff --git a/board/brya/ec.tasklist b/board/brya/ec.tasklist index 260f6561d9..3b94575196 100644 --- a/board/brya/ec.tasklist +++ b/board/brya/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/brya/fans.c b/board/brya/fans.c index c65680bb62..eb9bb8a809 100644 --- a/board/brya/fans.c +++ b/board/brya/fans.c @@ -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. */ diff --git a/board/brya/fw_config.c b/board/brya/fw_config.c index 295ae72bea..3a4c91acf1 100644 --- a/board/brya/fw_config.c +++ b/board/brya/fw_config.c @@ -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. */ diff --git a/board/brya/fw_config.h b/board/brya/fw_config.h index 7f9b472d83..fea6c9a8da 100644 --- a/board/brya/fw_config.h +++ b/board/brya/fw_config.h @@ -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. */ diff --git a/board/brya/gpio.inc b/board/brya/gpio.inc index 0c6bba7a06..d68dfc4dd0 100644 --- a/board/brya/gpio.inc +++ b/board/brya/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/brya/i2c.c b/board/brya/i2c.c index c8928ebd72..feed4023d7 100644 --- a/board/brya/i2c.c +++ b/board/brya/i2c.c @@ -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. */ diff --git a/board/brya/keyboard.c b/board/brya/keyboard.c index a9f033130d..0ebe25dc90 100644 --- a/board/brya/keyboard.c +++ b/board/brya/keyboard.c @@ -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. */ diff --git a/board/brya/led.c b/board/brya/led.c index cddf8c971f..fec5a13311 100644 --- a/board/brya/led.c +++ b/board/brya/led.c @@ -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. */ diff --git a/board/brya/pwm.c b/board/brya/pwm.c index e736bc77ef..bb578968b7 100644 --- a/board/brya/pwm.c +++ b/board/brya/pwm.c @@ -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. */ diff --git a/board/brya/sensors.c b/board/brya/sensors.c index 08dd55a0e7..8ab5b58d7e 100644 --- a/board/brya/sensors.c +++ b/board/brya/sensors.c @@ -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. */ diff --git a/board/brya/usbc_config.c b/board/brya/usbc_config.c index 192f564c1a..2693fb347d 100644 --- a/board/brya/usbc_config.c +++ b/board/brya/usbc_config.c @@ -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. */ @@ -121,15 +121,21 @@ unsigned int ppc_cnt = ARRAY_SIZE(ppc_chips); #ifndef CONFIG_ZEPHYR /* USBC mux configuration - Alder Lake includes internal mux */ -static const struct usb_mux usbc0_tcss_usb_mux = { - .usb_port = USBC_PORT_C0, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +static const struct usb_mux_chain usbc0_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C0, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; -static const struct usb_mux usbc2_tcss_usb_mux = { - .usb_port = USBC_PORT_C2, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +static const struct usb_mux_chain usbc2_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C2, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; /* @@ -137,35 +143,44 @@ static const struct usb_mux usbc2_tcss_usb_mux = { * to the virtual_usb_mux_driver so the AP gets notified of mux changes * and updates the TCSS configuration on state changes. */ -static const struct usb_mux usbc1_usb3_db_retimer = { - .usb_port = USBC_PORT_C1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, +static const struct usb_mux_chain usbc1_usb3_db_retimer = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, }; -const struct usb_mux usb_muxes[] = { +const struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_C0_C2_MUX, - .i2c_addr_flags = USBC_PORT_C0_BB_RETIMER_I2C_ADDR, - .next_mux = &usbc0_tcss_usb_mux, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_C0_C2_MUX, + .i2c_addr_flags = USBC_PORT_C0_BB_RETIMER_I2C_ADDR, + }, + .next = &usbc0_tcss_usb_mux, }, [USBC_PORT_C1] = { - /* PS8815 DB */ - .usb_port = USBC_PORT_C1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, - .next_mux = &usbc1_usb3_db_retimer, + .mux = &(const struct usb_mux) { + /* PS8815 DB */ + .usb_port = USBC_PORT_C1, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, + .next = &usbc1_usb3_db_retimer, }, [USBC_PORT_C2] = { - .usb_port = USBC_PORT_C2, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_C0_C2_MUX, - .i2c_addr_flags = USBC_PORT_C2_BB_RETIMER_I2C_ADDR, - .next_mux = &usbc2_tcss_usb_mux, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C2, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_C0_C2_MUX, + .i2c_addr_flags = USBC_PORT_C2_BB_RETIMER_I2C_ADDR, + }, + .next = &usbc2_tcss_usb_mux, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/board/brya/usbc_config.h b/board/brya/usbc_config.h index 97b3e7f5fd..bff89438d4 100644 --- a/board/brya/usbc_config.h +++ b/board/brya/usbc_config.h @@ -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. */ diff --git a/board/bugzzy/battery.c b/board/bugzzy/battery.c index 47b88fb21e..2df4848d05 100644 --- a/board/bugzzy/battery.c +++ b/board/bugzzy/battery.c @@ -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. * diff --git a/board/bugzzy/board.c b/board/bugzzy/board.c index ea9d2251cb..5a28fb2c25 100644 --- a/board/bugzzy/board.c +++ b/board/bugzzy/board.c @@ -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. */ @@ -658,20 +658,26 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { static int ps8743_tune_mux_c0(const struct usb_mux *me); static int ps8743_tune_mux_c1(const struct usb_mux *me); -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_C0, - .i2c_addr_flags = PS8743_I2C_ADDR0_FLAG, - .driver = &ps8743_usb_mux_driver, - .board_init = &ps8743_tune_mux_c0, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_C0, + .i2c_addr_flags = PS8743_I2C_ADDR0_FLAG, + .driver = &ps8743_usb_mux_driver, + .board_init = &ps8743_tune_mux_c0, + }, }, { - .usb_port = 1, - .i2c_port = I2C_PORT_SUB_USB_C1, - .i2c_addr_flags = PS8743_I2C_ADDR0_FLAG, - .driver = &ps8743_usb_mux_driver, - .board_init = &ps8743_tune_mux_c1, + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .i2c_port = I2C_PORT_SUB_USB_C1, + .i2c_addr_flags = PS8743_I2C_ADDR0_FLAG, + .driver = &ps8743_usb_mux_driver, + .board_init = &ps8743_tune_mux_c1, + }, } }; /* USB Mux C0 : board_init of PS8743 */ diff --git a/board/bugzzy/board.h b/board/bugzzy/board.h index bf4f9c8b8e..707314d02a 100644 --- a/board/bugzzy/board.h +++ b/board/bugzzy/board.h @@ -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. */ diff --git a/board/bugzzy/build.mk b/board/bugzzy/build.mk index 815a285d83..5b37e085ef 100644 --- a/board/bugzzy/build.mk +++ b/board/bugzzy/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/bugzzy/cbi_ssfc.c b/board/bugzzy/cbi_ssfc.c index 39fd4929a1..81f3ee0dad 100644 --- a/board/bugzzy/cbi_ssfc.c +++ b/board/bugzzy/cbi_ssfc.c @@ -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. */ diff --git a/board/bugzzy/cbi_ssfc.h b/board/bugzzy/cbi_ssfc.h index 942f0cf5f4..bf8853a43a 100644 --- a/board/bugzzy/cbi_ssfc.h +++ b/board/bugzzy/cbi_ssfc.h @@ -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. */ diff --git a/board/bugzzy/ec.tasklist b/board/bugzzy/ec.tasklist index d4fb416bce..29666dd959 100644 --- a/board/bugzzy/ec.tasklist +++ b/board/bugzzy/ec.tasklist @@ -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. */ diff --git a/board/bugzzy/gpio.inc b/board/bugzzy/gpio.inc index b8bd5bf604..8e0fa56768 100644 --- a/board/bugzzy/gpio.inc +++ b/board/bugzzy/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/bugzzy/led.c b/board/bugzzy/led.c index bb4c7c2cd5..cad2d5ed0b 100644 --- a/board/bugzzy/led.c +++ b/board/bugzzy/led.c @@ -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. * diff --git a/board/bugzzy/usb_pd_policy.c b/board/bugzzy/usb_pd_policy.c index 89df538eaa..83c09bb99e 100644 --- a/board/bugzzy/usb_pd_policy.c +++ b/board/bugzzy/usb_pd_policy.c @@ -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. */ diff --git a/board/burnet/battery.c b/board/burnet/battery.c index 7d9b659ad1..d76634d6ce 100644 --- a/board/burnet/battery.c +++ b/board/burnet/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/burnet/board.c b/board/burnet/board.c index 055cff8c3c..aa378ca289 100644 --- a/board/burnet/board.c +++ b/board/burnet/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -167,13 +167,16 @@ static void board_hpd_status(const struct usb_mux *me, mux_state_t mux_state, host_set_single_event(EC_HOST_EVENT_USB_MUX); } -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_MUX, - .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, - .driver = &it5205_usb_mux_driver, - .hpd_update = &board_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_MUX, + .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, + .driver = &it5205_usb_mux_driver, + .hpd_update = &board_hpd_status, + }, }, }; diff --git a/board/burnet/board.h b/board/burnet/board.h index 8702502d69..6870ccc2d2 100644 --- a/board/burnet/board.h +++ b/board/burnet/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/burnet/build.mk b/board/burnet/build.mk index a6e1c010d7..f583684804 100644 --- a/board/burnet/build.mk +++ b/board/burnet/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/burnet/ec.tasklist b/board/burnet/ec.tasklist index c1330b86f8..fb131b8eb4 100644 --- a/board/burnet/ec.tasklist +++ b/board/burnet/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/burnet/gpio.inc b/board/burnet/gpio.inc index c43a232870..9bb0aa73db 100644 --- a/board/burnet/gpio.inc +++ b/board/burnet/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/burnet/led.c b/board/burnet/led.c index a28a6860d6..4aa91c63e2 100644 --- a/board/burnet/led.c +++ b/board/burnet/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/c2d2/board.c b/board/c2d2/board.c index 2fbbaef433..0b7117c829 100644 --- a/board/c2d2/board.c +++ b/board/c2d2/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/c2d2/board.h b/board/c2d2/board.h index 607138f3e8..6b1ac69efd 100644 --- a/board/c2d2/board.h +++ b/board/c2d2/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/c2d2/build.mk b/board/c2d2/build.mk index 559b6b8e95..d5940c3885 100644 --- a/board/c2d2/build.mk +++ b/board/c2d2/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/c2d2/ec.tasklist b/board/c2d2/ec.tasklist index c1fb169118..c45a1e89a7 100644 --- a/board/c2d2/ec.tasklist +++ b/board/c2d2/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/c2d2/gpio.inc b/board/c2d2/gpio.inc index 485a603453..b100250f20 100644 --- a/board/c2d2/gpio.inc +++ b/board/c2d2/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/cappy2/battery.c b/board/cappy2/battery.c index 8cdff76ad6..19be1825eb 100644 --- a/board/cappy2/battery.c +++ b/board/cappy2/battery.c @@ -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. * diff --git a/board/cappy2/board.c b/board/cappy2/board.c index 6fe550d8ef..de651ac874 100644 --- a/board/cappy2/board.c +++ b/board/cappy2/board.c @@ -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. */ @@ -284,12 +284,15 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }, }; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_C0, - .i2c_addr_flags = PS8743_I2C_ADDR0_FLAG, - .driver = &ps8743_usb_mux_driver, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_C0, + .i2c_addr_flags = PS8743_I2C_ADDR0_FLAG, + .driver = &ps8743_usb_mux_driver, + }, }, }; diff --git a/board/cappy2/board.h b/board/cappy2/board.h index 6175d13c89..b21a20d6e5 100644 --- a/board/cappy2/board.h +++ b/board/cappy2/board.h @@ -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. */ diff --git a/board/cappy2/build.mk b/board/cappy2/build.mk index b012d8d502..eb422dae93 100644 --- a/board/cappy2/build.mk +++ b/board/cappy2/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/cappy2/cbi_ssfc.c b/board/cappy2/cbi_ssfc.c index 39fd4929a1..81f3ee0dad 100644 --- a/board/cappy2/cbi_ssfc.c +++ b/board/cappy2/cbi_ssfc.c @@ -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. */ diff --git a/board/cappy2/cbi_ssfc.h b/board/cappy2/cbi_ssfc.h index 942f0cf5f4..bf8853a43a 100644 --- a/board/cappy2/cbi_ssfc.h +++ b/board/cappy2/cbi_ssfc.h @@ -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. */ diff --git a/board/cappy2/ec.tasklist b/board/cappy2/ec.tasklist index 0025c2985b..386e8625b3 100644 --- a/board/cappy2/ec.tasklist +++ b/board/cappy2/ec.tasklist @@ -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. */ diff --git a/board/cappy2/gpio.inc b/board/cappy2/gpio.inc index 00799bfdd8..1a32f31e06 100644 --- a/board/cappy2/gpio.inc +++ b/board/cappy2/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/cappy2/led.c b/board/cappy2/led.c index e556ab9ef5..dba215ab51 100644 --- a/board/cappy2/led.c +++ b/board/cappy2/led.c @@ -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. * diff --git a/board/cappy2/usb_pd_policy.c b/board/cappy2/usb_pd_policy.c index 98b770be8f..3410726e87 100644 --- a/board/cappy2/usb_pd_policy.c +++ b/board/cappy2/usb_pd_policy.c @@ -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. */ diff --git a/board/careena/battery.c b/board/careena/battery.c index 7180109168..ae8b2f905a 100644 --- a/board/careena/battery.c +++ b/board/careena/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/careena/board.c b/board/careena/board.c index 6e6f26102c..cfe7199a91 100644 --- a/board/careena/board.c +++ b/board/careena/board.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/careena/board.h b/board/careena/board.h index e5a847a807..86b88b64f0 100644 --- a/board/careena/board.h +++ b/board/careena/board.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/careena/build.mk b/board/careena/build.mk index c808e65aed..d24127ddae 100644 --- a/board/careena/build.mk +++ b/board/careena/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2015 The Chromium OS Authors. All rights reserved. +# Copyright 2015 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/careena/ec.tasklist b/board/careena/ec.tasklist index b562761311..24300fe7da 100644 --- a/board/careena/ec.tasklist +++ b/board/careena/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/careena/gpio.inc b/board/careena/gpio.inc index c84c81a68e..477b17234e 100644 --- a/board/careena/gpio.inc +++ b/board/careena/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2017 The Chromium OS Authors. All rights reserved. + * Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/careena/led.c b/board/careena/led.c index db82fe392d..48a065fdb9 100644 --- a/board/careena/led.c +++ b/board/careena/led.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/casta/battery.c b/board/casta/battery.c index 246a05c43d..efee023d6a 100644 --- a/board/casta/battery.c +++ b/board/casta/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/casta/board.c b/board/casta/board.c index 8fe51fe191..512a7c224b 100644 --- a/board/casta/board.c +++ b/board/casta/board.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/casta/board.h b/board/casta/board.h index c5ba310446..3e7fe066cc 100644 --- a/board/casta/board.h +++ b/board/casta/board.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/casta/build.mk b/board/casta/build.mk index 3d04b75731..998a65a3de 100644 --- a/board/casta/build.mk +++ b/board/casta/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2018 The Chromium OS Authors. All rights reserved. +# Copyright 2018 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/casta/ec.tasklist b/board/casta/ec.tasklist index ac41d643dc..5a1dc02a25 100644 --- a/board/casta/ec.tasklist +++ b/board/casta/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/casta/gpio.inc b/board/casta/gpio.inc index e37926b72e..724efd36ce 100644 --- a/board/casta/gpio.inc +++ b/board/casta/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2018 The Chromium OS Authors. All rights reserved. + * Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/casta/led.c b/board/casta/led.c index cb0518a4e7..7dfdc39151 100644 --- a/board/casta/led.c +++ b/board/casta/led.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/cerise/battery.c b/board/cerise/battery.c index 50d2bf397c..9edab52867 100644 --- a/board/cerise/battery.c +++ b/board/cerise/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/cerise/board.c b/board/cerise/board.c index 6dc393fbfc..e3fa60c76a 100644 --- a/board/cerise/board.c +++ b/board/cerise/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -165,13 +165,16 @@ static void board_hpd_status(const struct usb_mux *me, mux_state_t mux_state, host_set_single_event(EC_HOST_EVENT_USB_MUX); } -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_MUX, - .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, - .driver = &it5205_usb_mux_driver, - .hpd_update = &board_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_MUX, + .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, + .driver = &it5205_usb_mux_driver, + .hpd_update = &board_hpd_status, + }, }, }; diff --git a/board/cerise/board.h b/board/cerise/board.h index 07736a9dd9..41d86b956d 100644 --- a/board/cerise/board.h +++ b/board/cerise/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/cerise/build.mk b/board/cerise/build.mk index a6e1c010d7..f583684804 100644 --- a/board/cerise/build.mk +++ b/board/cerise/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/cerise/ec.tasklist b/board/cerise/ec.tasklist index 36be2e96a4..e77603a8e2 100644 --- a/board/cerise/ec.tasklist +++ b/board/cerise/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/cerise/gpio.inc b/board/cerise/gpio.inc index d7d5b9837d..6edf1f1eab 100644 --- a/board/cerise/gpio.inc +++ b/board/cerise/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/cerise/led.c b/board/cerise/led.c index cbde98e94a..81203ba331 100644 --- a/board/cerise/led.c +++ b/board/cerise/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/cherry/battery.c b/board/cherry/battery.c index 72daf4966d..4f3a12e43d 100644 --- a/board/cherry/battery.c +++ b/board/cherry/battery.c @@ -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. */ diff --git a/board/cherry/board.c b/board/cherry/board.c index 77669173be..c2ad54acb2 100644 --- a/board/cherry/board.c +++ b/board/cherry/board.c @@ -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. */ @@ -238,21 +238,27 @@ static int board_anx3443_mux_set(const struct usb_mux *me, return EC_SUCCESS; } -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_MUX0, - .i2c_addr_flags = PS8802_I2C_ADDR_FLAGS, - .driver = &ps8802_usb_mux_driver, - .board_init = &board_ps8762_mux_init, - .board_set = &board_ps8762_mux_set, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_MUX0, + .i2c_addr_flags = PS8802_I2C_ADDR_FLAGS, + .driver = &ps8802_usb_mux_driver, + .board_init = &board_ps8762_mux_init, + .board_set = &board_ps8762_mux_set, + }, }, { - .usb_port = 1, - .i2c_port = I2C_PORT_USB_MUX1, - .i2c_addr_flags = ANX3443_I2C_ADDR0_FLAGS, - .driver = &anx3443_usb_mux_driver, - .board_set = &board_anx3443_mux_set, + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .i2c_port = I2C_PORT_USB_MUX1, + .i2c_addr_flags = ANX3443_I2C_ADDR0_FLAGS, + .driver = &anx3443_usb_mux_driver, + .board_set = &board_anx3443_mux_set, + }, }, }; diff --git a/board/cherry/board.h b/board/cherry/board.h index e9119e6a34..c94f862ede 100644 --- a/board/cherry/board.h +++ b/board/cherry/board.h @@ -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. */ diff --git a/board/cherry/build.mk b/board/cherry/build.mk index 0b0569c6d8..998e4d2750 100644 --- a/board/cherry/build.mk +++ b/board/cherry/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/cherry/ec.tasklist b/board/cherry/ec.tasklist index f9050fef87..5ce0fab583 100644 --- a/board/cherry/ec.tasklist +++ b/board/cherry/ec.tasklist @@ -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. */ diff --git a/board/cherry/gpio.inc b/board/cherry/gpio.inc index 296e3a418e..b953b16b27 100644 --- a/board/cherry/gpio.inc +++ b/board/cherry/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/cherry/led.c b/board/cherry/led.c index c1e3aaf7bc..0607301d4c 100644 --- a/board/cherry/led.c +++ b/board/cherry/led.c @@ -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. */ diff --git a/board/cherry_scp/board.h b/board/cherry_scp/board.h index 576b412c40..0f6d006a44 100644 --- a/board/cherry_scp/board.h +++ b/board/cherry_scp/board.h @@ -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. */ diff --git a/board/cherry_scp/build.mk b/board/cherry_scp/build.mk index 0d6c33755f..498bee2848 100644 --- a/board/cherry_scp/build.mk +++ b/board/cherry_scp/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/cherry_scp/ec.tasklist b/board/cherry_scp/ec.tasklist index 1c8cd120a0..353e5ee686 100644 --- a/board/cherry_scp/ec.tasklist +++ b/board/cherry_scp/ec.tasklist @@ -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. */ diff --git a/board/cherry_scp/gpio.inc b/board/cherry_scp/gpio.inc index 48b397b9a9..8301fb437f 100644 --- a/board/cherry_scp/gpio.inc +++ b/board/cherry_scp/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/chocodile_vpdmcu/board.c b/board/chocodile_vpdmcu/board.c index 5cf52dd1fd..a64da1633e 100644 --- a/board/chocodile_vpdmcu/board.c +++ b/board/chocodile_vpdmcu/board.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/chocodile_vpdmcu/board.h b/board/chocodile_vpdmcu/board.h index dc39da47ca..ede07dd9a0 100644 --- a/board/chocodile_vpdmcu/board.h +++ b/board/chocodile_vpdmcu/board.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/chocodile_vpdmcu/build.mk b/board/chocodile_vpdmcu/build.mk index d4e5f58962..21c257bd7e 100644 --- a/board/chocodile_vpdmcu/build.mk +++ b/board/chocodile_vpdmcu/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/chocodile_vpdmcu/chocodile.html b/board/chocodile_vpdmcu/chocodile.html index b38edf94ec..6aec670f2a 100644 --- a/board/chocodile_vpdmcu/chocodile.html +++ b/board/chocodile_vpdmcu/chocodile.html @@ -866,7 +866,7 @@ th.expander input { <text stroke="none" x="4750" y="-25" font-size="40" text-anchor="middle">10</text> <text stroke="none" x="250" y="-25" font-size="40" text-anchor="middle">1</text> <text stroke="none" x="38" y="-250" font-size="40" text-anchor="middle">A</text> -<text stroke="none" x="99" y="-97" font-size="24">FOLLOWING NOTICE SHALL APPLY: COPYRIGHT C 2009 GOOGLE, INC. ALL RIGHTS RESERVED.</text> +<text stroke="none" x="99" y="-97" font-size="24">FOLLOWING NOTICE SHALL APPLY: COPYRIGHT 2009 GOOGLE LLC</text> <text stroke="none" x="38" y="-3750" font-size="40" text-anchor="middle">H</text> <text stroke="none" x="5750" y="-25" font-size="40" text-anchor="middle">12</text> <text stroke="none" x="92" y="-200" font-size="24">THESE MATERIALS (INCLUDING ALL TEXT, SOFTWARE,CODE, DISPLAYS, ARTWORK, AND IMAGES) CONTAIN TRADE SECRETS AND CONFIDENTIAL INFORMATION WHICH ARE PROPRIETARY TO GOOGLE, INC. ANY USE, REPRODUCTION, DISTRIBUTION,</text> diff --git a/board/chocodile_vpdmcu/ec.tasklist b/board/chocodile_vpdmcu/ec.tasklist index 6753502b92..ecbd3b052c 100644 --- a/board/chocodile_vpdmcu/ec.tasklist +++ b/board/chocodile_vpdmcu/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/chocodile_vpdmcu/gpio.inc b/board/chocodile_vpdmcu/gpio.inc index a34c617ef1..060054f719 100644 --- a/board/chocodile_vpdmcu/gpio.inc +++ b/board/chocodile_vpdmcu/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/chocodile_vpdmcu/usb_pd_config.h b/board/chocodile_vpdmcu/usb_pd_config.h index dcf63588eb..7fe608eb2a 100644 --- a/board/chocodile_vpdmcu/usb_pd_config.h +++ b/board/chocodile_vpdmcu/usb_pd_config.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/chocodile_vpdmcu/vpd_api.c b/board/chocodile_vpdmcu/vpd_api.c index d4c57f9ff0..fdfdf47efc 100644 --- a/board/chocodile_vpdmcu/vpd_api.c +++ b/board/chocodile_vpdmcu/vpd_api.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/chocodile_vpdmcu/vpd_api.h b/board/chocodile_vpdmcu/vpd_api.h index e77a868214..5d2fd24afb 100644 --- a/board/chocodile_vpdmcu/vpd_api.h +++ b/board/chocodile_vpdmcu/vpd_api.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/chronicler/battery.c b/board/chronicler/battery.c index aee0095765..1d885607b7 100644 --- a/board/chronicler/battery.c +++ b/board/chronicler/battery.c @@ -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. * diff --git a/board/chronicler/board.c b/board/chronicler/board.c index 8d4639193c..40cefc714d 100644 --- a/board/chronicler/board.c +++ b/board/chronicler/board.c @@ -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. */ diff --git a/board/chronicler/board.h b/board/chronicler/board.h index 9fe197b87c..71ef0bd959 100644 --- a/board/chronicler/board.h +++ b/board/chronicler/board.h @@ -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. */ diff --git a/board/chronicler/build.mk b/board/chronicler/build.mk index c0daa31eaa..f317b88795 100644 --- a/board/chronicler/build.mk +++ b/board/chronicler/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/chronicler/cbi.c b/board/chronicler/cbi.c index 210207eeac..712461cd2c 100644 --- a/board/chronicler/cbi.c +++ b/board/chronicler/cbi.c @@ -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. */ diff --git a/board/chronicler/ec.tasklist b/board/chronicler/ec.tasklist index df7495f2a1..644c36cd37 100644 --- a/board/chronicler/ec.tasklist +++ b/board/chronicler/ec.tasklist @@ -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. */ diff --git a/board/chronicler/gpio.inc b/board/chronicler/gpio.inc index b8b8d4f5e7..b0a9ad6981 100644 --- a/board/chronicler/gpio.inc +++ b/board/chronicler/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ @@ -16,7 +16,7 @@ GPIO_INT(ACOK_OD, PIN(0, 0), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, ex /* Power sequencing interrupts */ GPIO_INT(SLP_S0_L, PIN(D, 5), GPIO_INT_BOTH, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 GPIO_INT(SLP_S3_L, PIN(A, 5), GPIO_INT_BOTH, power_signal_interrupt) #endif GPIO_INT(SLP_SUS_L, PIN(D, 7), GPIO_INT_BOTH, power_signal_interrupt) diff --git a/board/chronicler/keyboard.c b/board/chronicler/keyboard.c index b9cc378295..9e04d77ca3 100644 --- a/board/chronicler/keyboard.c +++ b/board/chronicler/keyboard.c @@ -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. */ diff --git a/board/chronicler/led.c b/board/chronicler/led.c index 5129f3fc68..8fd743101a 100644 --- a/board/chronicler/led.c +++ b/board/chronicler/led.c @@ -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. * diff --git a/board/chronicler/usbc_config.c b/board/chronicler/usbc_config.c index c03f00576b..b05cd4ecfd 100644 --- a/board/chronicler/usbc_config.c +++ b/board/chronicler/usbc_config.c @@ -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. */ @@ -30,11 +30,14 @@ * virtual_usb_mux_driver so the AP gets notified of mux changes and updates * the TCSS configuration on state changes. */ -static const struct usb_mux usbc1_usb3_db_retimer = { - .usb_port = USBC_PORT_C1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, - .next_mux = NULL, +static const struct usb_mux_chain usbc1_usb3_db_retimer = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, + .next = NULL, }; /******************************************************************************/ @@ -104,17 +107,21 @@ const int usb_port_enable[USB_PORT_COUNT] = { /******************************************************************************/ /* USBC mux configuration - Tiger Lake includes internal mux */ -const struct usb_mux usb_muxes[] = { +const struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }, [USBC_PORT_C1] = { - .usb_port = USBC_PORT_C1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, - .next_mux = &usbc1_usb3_db_retimer, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C1, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, + .next = &usbc1_usb3_db_retimer, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/board/chronicler/usbc_config.h b/board/chronicler/usbc_config.h index a13944250a..7428d0c436 100644 --- a/board/chronicler/usbc_config.h +++ b/board/chronicler/usbc_config.h @@ -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. */ diff --git a/board/coachz/base_detect.c b/board/coachz/base_detect.c index 6465bd7a1d..f2195f4d8a 100644 --- a/board/coachz/base_detect.c +++ b/board/coachz/base_detect.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/coachz/battery.c b/board/coachz/battery.c index a5be64df0f..a89b26f49a 100644 --- a/board/coachz/battery.c +++ b/board/coachz/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/coachz/board.c b/board/coachz/board.c index 4b363260b2..c9a22d8211 100644 --- a/board/coachz/board.c +++ b/board/coachz/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -293,16 +293,22 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { * to AP. But the TCPC chip is also needed to know the HPD status; otherwise, * the mux misbehaves. */ -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, }, { - .usb_port = 1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, } }; diff --git a/board/coachz/board.h b/board/coachz/board.h index ff404855ed..8d21cbc68c 100644 --- a/board/coachz/board.h +++ b/board/coachz/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/coachz/build.mk b/board/coachz/build.mk index e8e293064e..01678fc8bb 100644 --- a/board/coachz/build.mk +++ b/board/coachz/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/coachz/ec.tasklist b/board/coachz/ec.tasklist index dc5b32b4cf..ecb6672d32 100644 --- a/board/coachz/ec.tasklist +++ b/board/coachz/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/coachz/gpio.inc b/board/coachz/gpio.inc index d7ca61ac6b..1bb8e9135b 100644 --- a/board/coachz/gpio.inc +++ b/board/coachz/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/coachz/led.c b/board/coachz/led.c index 35d55bea84..6623089db0 100644 --- a/board/coachz/led.c +++ b/board/coachz/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/coachz/usbc_config.c b/board/coachz/usbc_config.c index cb63a780c5..9409ee04fc 100644 --- a/board/coachz/usbc_config.c +++ b/board/coachz/usbc_config.c @@ -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. */ diff --git a/board/coffeecake/board.c b/board/coffeecake/board.c index f911100cfd..3df1f86128 100644 --- a/board/coffeecake/board.c +++ b/board/coffeecake/board.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/coffeecake/board.h b/board/coffeecake/board.h index 50c42a5a1e..966a5b2516 100644 --- a/board/coffeecake/board.h +++ b/board/coffeecake/board.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/coffeecake/build.mk b/board/coffeecake/build.mk index 59ca88486b..26ddbbd925 100644 --- a/board/coffeecake/build.mk +++ b/board/coffeecake/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2017 The Chromium OS Authors. All rights reserved. +# Copyright 2017 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/coffeecake/ec.tasklist b/board/coffeecake/ec.tasklist index d6686d72e9..e02c0620f8 100644 --- a/board/coffeecake/ec.tasklist +++ b/board/coffeecake/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/coffeecake/gpio.inc b/board/coffeecake/gpio.inc index bab62a6bea..9d0a02ea40 100644 --- a/board/coffeecake/gpio.inc +++ b/board/coffeecake/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2017 The Chromium OS Authors. All rights reserved. + * Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/coffeecake/usb_pd_config.h b/board/coffeecake/usb_pd_config.h index d4543d64f7..728d96bafe 100644 --- a/board/coffeecake/usb_pd_config.h +++ b/board/coffeecake/usb_pd_config.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/coffeecake/usb_pd_pdo.c b/board/coffeecake/usb_pd_pdo.c index 6dcc48e7ba..c0d2298706 100644 --- a/board/coffeecake/usb_pd_pdo.c +++ b/board/coffeecake/usb_pd_pdo.c @@ -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. */ diff --git a/board/coffeecake/usb_pd_pdo.h b/board/coffeecake/usb_pd_pdo.h index f695defddb..2ec925955d 100644 --- a/board/coffeecake/usb_pd_pdo.h +++ b/board/coffeecake/usb_pd_pdo.h @@ -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. */ diff --git a/board/coffeecake/usb_pd_policy.c b/board/coffeecake/usb_pd_policy.c index 60ddf6240a..525d1057e2 100644 --- a/board/coffeecake/usb_pd_policy.c +++ b/board/coffeecake/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/collis/battery.c b/board/collis/battery.c index 5da46e9caa..21c7b80901 100644 --- a/board/collis/battery.c +++ b/board/collis/battery.c @@ -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. * diff --git a/board/collis/board.c b/board/collis/board.c index 2a4dfd2b9d..6b2c81bc02 100644 --- a/board/collis/board.c +++ b/board/collis/board.c @@ -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. */ @@ -318,32 +318,42 @@ BUILD_ASSERT(CONFIG_USB_PD_PORT_MAX_COUNT == USBC_PORT_COUNT); /******************************************************************************/ /* USBC mux configuration - Tiger Lake includes internal mux */ -static const struct usb_mux usbc0_usb3_mb_retimer = { - .usb_port = USBC_PORT_C0, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, - .next_mux = NULL, +static const struct usb_mux_chain usbc0_usb3_mb_retimer = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C0, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, + .next = NULL, }; -static const struct usb_mux usbc1_usb3_db_retimer = { - .usb_port = USBC_PORT_C1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, - .next_mux = NULL, +static const struct usb_mux_chain usbc1_usb3_db_retimer = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, + .next = NULL, }; -const struct usb_mux usb_muxes[] = { +const struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, - .next_mux = &usbc0_usb3_mb_retimer, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, + .next = &usbc0_usb3_mb_retimer, }, [USBC_PORT_C1] = { - .usb_port = USBC_PORT_C1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, - .next_mux = &usbc1_usb3_db_retimer, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C1, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, + .next = &usbc1_usb3_db_retimer, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/board/collis/board.h b/board/collis/board.h index f98e3fc432..d9e903c6b3 100644 --- a/board/collis/board.h +++ b/board/collis/board.h @@ -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. */ diff --git a/board/collis/build.mk b/board/collis/build.mk index 546bcba8d2..18397fdec3 100644 --- a/board/collis/build.mk +++ b/board/collis/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/collis/ec.tasklist b/board/collis/ec.tasklist index ca6d9fbf14..07a91894ed 100644 --- a/board/collis/ec.tasklist +++ b/board/collis/ec.tasklist @@ -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. */ diff --git a/board/collis/gpio.inc b/board/collis/gpio.inc index 95e0ca8ba2..51c5f6b144 100644 --- a/board/collis/gpio.inc +++ b/board/collis/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ @@ -16,7 +16,7 @@ GPIO_INT(ACOK_OD, PIN(0, 0), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, ex /* Power sequencing interrupts */ GPIO_INT(SLP_S0_L, PIN(D, 5), GPIO_INT_BOTH, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 GPIO_INT(SLP_S3_L, PIN(A, 5), GPIO_INT_BOTH, power_signal_interrupt) #endif GPIO_INT(SLP_SUS_L, PIN(D, 7), GPIO_INT_BOTH, power_signal_interrupt) diff --git a/board/collis/led.c b/board/collis/led.c index 6444eb6a89..9220b7a95c 100644 --- a/board/collis/led.c +++ b/board/collis/led.c @@ -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. */ diff --git a/board/collis/sensors.c b/board/collis/sensors.c index 91ead904a2..e647fe7d61 100644 --- a/board/collis/sensors.c +++ b/board/collis/sensors.c @@ -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. */ diff --git a/board/copano/battery.c b/board/copano/battery.c index add2094b52..85f3d67448 100644 --- a/board/copano/battery.c +++ b/board/copano/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/copano/board.c b/board/copano/board.c index ce442cdaaa..b4a8c5eb20 100644 --- a/board/copano/board.c +++ b/board/copano/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -250,12 +250,15 @@ void board_reset_pd_mcu(void) } /* USBC mux configuration - Tiger Lake includes internal mux */ -struct usb_mux usbc0_usb4_mb_retimer = { - .usb_port = USBC_PORT_C0, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_0_MIX, - .i2c_addr_flags = USBC_PORT_C0_BB_RETIMER_I2C_ADDR, +struct usb_mux_chain usbc0_usb4_mb_retimer = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C0, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_0_MIX, + .i2c_addr_flags = USBC_PORT_C0_BB_RETIMER_I2C_ADDR, + }, }; /***************************************************************************** * USB-C MUX/Retimer dynamic configuration. @@ -264,7 +267,7 @@ static void setup_mux(void) { CPRINTS("C0 supports bb-retimer"); /* USB-C port 0 have a retimer */ - usb_muxes[USBC_PORT_C0].next_mux = &usbc0_usb4_mb_retimer; + usb_muxes[USBC_PORT_C0].next = &usbc0_usb4_mb_retimer; } __override void board_cbi_init(void) @@ -351,24 +354,31 @@ BUILD_ASSERT(CONFIG_USB_PD_PORT_MAX_COUNT == USBC_PORT_COUNT); /******************************************************************************/ /* USBC mux configuration - Tiger Lake includes internal mux */ -struct usb_mux usbc1_tcss_usb_mux = { - .usb_port = USBC_PORT_C1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +struct usb_mux_chain usbc1_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; -struct usb_mux usb_muxes[] = { +struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }, [USBC_PORT_C1] = { - .usb_port = USBC_PORT_C1, - .next_mux = &usbc1_tcss_usb_mux, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_1_MIX, - .i2c_addr_flags = USBC_PORT_C1_BB_RETIMER_I2C_ADDR, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C1, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_1_MIX, + .i2c_addr_flags = USBC_PORT_C1_BB_RETIMER_I2C_ADDR, + }, + .next = &usbc1_tcss_usb_mux, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/board/copano/board.h b/board/copano/board.h index ccddf8244f..6efd3e88ee 100644 --- a/board/copano/board.h +++ b/board/copano/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/copano/build.mk b/board/copano/build.mk index 838d6a16ce..c994631759 100644 --- a/board/copano/build.mk +++ b/board/copano/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/copano/ec.tasklist b/board/copano/ec.tasklist index 3e20d8ae39..c29125d517 100644 --- a/board/copano/ec.tasklist +++ b/board/copano/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/copano/gpio.inc b/board/copano/gpio.inc index 52be1271f1..c6271c20f4 100644 --- a/board/copano/gpio.inc +++ b/board/copano/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -16,7 +16,7 @@ GPIO_INT(ACOK_OD, PIN(0, 0), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, ex /* Power sequencing interrupts */ GPIO_INT(SLP_S0_L, PIN(D, 5), GPIO_INT_BOTH, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 GPIO_INT(SLP_S3_L, PIN(A, 5), GPIO_INT_BOTH, power_signal_interrupt) #endif GPIO_INT(SLP_SUS_L, PIN(D, 7), GPIO_INT_BOTH, power_signal_interrupt) diff --git a/board/copano/led.c b/board/copano/led.c index fbd97d7a5d..15daf7b2b9 100644 --- a/board/copano/led.c +++ b/board/copano/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/copano/sensors.c b/board/copano/sensors.c index 8b0da8b67a..3884c5cc93 100644 --- a/board/copano/sensors.c +++ b/board/copano/sensors.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/coral/battery.c b/board/coral/battery.c index 02dc763664..3b105c90ca 100644 --- a/board/coral/battery.c +++ b/board/coral/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/coral/board.c b/board/coral/board.c index fac55b0d00..c63a2f6ddc 100644 --- a/board/coral/board.c +++ b/board/coral/board.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -289,17 +289,21 @@ static int ps8751_tune_mux(const struct usb_mux *me) return EC_SUCCESS; } -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { [USB_PD_PORT_ANX74XX] = { - .usb_port = USB_PD_PORT_ANX74XX, - .driver = &anx74xx_tcpm_usb_mux_driver, - .hpd_update = &anx74xx_tcpc_update_hpd_status, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_ANX74XX, + .driver = &anx74xx_tcpm_usb_mux_driver, + .hpd_update = &anx74xx_tcpc_update_hpd_status, + }, }, [USB_PD_PORT_PS8751] = { - .usb_port = USB_PD_PORT_PS8751, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, - .board_init = &ps8751_tune_mux, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_PS8751, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .board_init = &ps8751_tune_mux, + }, } }; diff --git a/board/coral/board.h b/board/coral/board.h index 1b06a70772..bc6226152c 100644 --- a/board/coral/board.h +++ b/board/coral/board.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/coral/build.mk b/board/coral/build.mk index 728d027803..470e439b13 100644 --- a/board/coral/build.mk +++ b/board/coral/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2015 The Chromium OS Authors. All rights reserved. +# Copyright 2015 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/coral/ec.tasklist b/board/coral/ec.tasklist index eeebc0cc59..bc8668a1db 100644 --- a/board/coral/ec.tasklist +++ b/board/coral/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/coral/gpio.inc b/board/coral/gpio.inc index da15615c86..7f09fe0735 100644 --- a/board/coral/gpio.inc +++ b/board/coral/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2016 The Chromium OS Authors. All rights reserved. + * Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/coral/led.c b/board/coral/led.c index f8832f5632..8af0f6f3e2 100644 --- a/board/coral/led.c +++ b/board/coral/led.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/coral/sku.h b/board/coral/sku.h index 98ff548ffd..c12777a2f7 100644 --- a/board/coral/sku.h +++ b/board/coral/sku.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/coral/usb_pd_policy.c b/board/coral/usb_pd_policy.c index b3a1edc1b6..a2e1f3c412 100644 --- a/board/coral/usb_pd_policy.c +++ b/board/coral/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/corori/battery.c b/board/corori/battery.c index 405a69751a..f4e126d42e 100644 --- a/board/corori/battery.c +++ b/board/corori/battery.c @@ -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. * diff --git a/board/corori/board.c b/board/corori/board.c index b4a8c2a8ef..4fe1e01fec 100644 --- a/board/corori/board.c +++ b/board/corori/board.c @@ -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. */ @@ -394,12 +394,15 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }, }; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_C0, - .i2c_addr_flags = PI3USB3X532_I2C_ADDR0, - .driver = &pi3usb3x532_usb_mux_driver, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_C0, + .i2c_addr_flags = PI3USB3X532_I2C_ADDR0, + .driver = &pi3usb3x532_usb_mux_driver, + }, }, }; diff --git a/board/corori/board.h b/board/corori/board.h index 9273508fcc..75e0e4eec6 100644 --- a/board/corori/board.h +++ b/board/corori/board.h @@ -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. */ diff --git a/board/corori/build.mk b/board/corori/build.mk index b012d8d502..eb422dae93 100644 --- a/board/corori/build.mk +++ b/board/corori/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/corori/cbi_ssfc.c b/board/corori/cbi_ssfc.c index 39fd4929a1..81f3ee0dad 100644 --- a/board/corori/cbi_ssfc.c +++ b/board/corori/cbi_ssfc.c @@ -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. */ diff --git a/board/corori/cbi_ssfc.h b/board/corori/cbi_ssfc.h index 942f0cf5f4..bf8853a43a 100644 --- a/board/corori/cbi_ssfc.h +++ b/board/corori/cbi_ssfc.h @@ -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. */ diff --git a/board/corori/ec.tasklist b/board/corori/ec.tasklist index 0025c2985b..386e8625b3 100644 --- a/board/corori/ec.tasklist +++ b/board/corori/ec.tasklist @@ -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. */ diff --git a/board/corori/gpio.inc b/board/corori/gpio.inc index 5f6f119648..038c70243f 100644 --- a/board/corori/gpio.inc +++ b/board/corori/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/corori/led.c b/board/corori/led.c index 37bbf7032a..89799c8e74 100644 --- a/board/corori/led.c +++ b/board/corori/led.c @@ -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. * diff --git a/board/corori/usb_pd_policy.c b/board/corori/usb_pd_policy.c index 98b770be8f..3410726e87 100644 --- a/board/corori/usb_pd_policy.c +++ b/board/corori/usb_pd_policy.c @@ -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. */ diff --git a/board/corori2/battery.c b/board/corori2/battery.c index 1263e4cef0..a59663c751 100644 --- a/board/corori2/battery.c +++ b/board/corori2/battery.c @@ -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. * diff --git a/board/corori2/board.c b/board/corori2/board.c index 29885dc0a8..efebc3af2e 100644 --- a/board/corori2/board.c +++ b/board/corori2/board.c @@ -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. */ @@ -650,25 +650,34 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }, }; -const struct usb_mux usbc1_retimer = { - .usb_port = 1, - .i2c_port = I2C_PORT_SUB_USB_C1, - .i2c_addr_flags = NB7V904M_I2C_ADDR0, - .driver = &nb7v904m_usb_redriver_drv, +const struct usb_mux_chain usbc1_retimer = { + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .i2c_port = I2C_PORT_SUB_USB_C1, + .i2c_addr_flags = NB7V904M_I2C_ADDR0, + .driver = &nb7v904m_usb_redriver_drv, + }, }; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_C0, - .i2c_addr_flags = PI3USB3X532_I2C_ADDR0, - .driver = &pi3usb3x532_usb_mux_driver, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_C0, + .i2c_addr_flags = PI3USB3X532_I2C_ADDR0, + .driver = &pi3usb3x532_usb_mux_driver, + }, }, { - .usb_port = 1, - .i2c_port = I2C_PORT_SUB_USB_C1, - .i2c_addr_flags = PI3USB3X532_I2C_ADDR0, - .driver = &pi3usb3x532_usb_mux_driver, - .next_mux = &usbc1_retimer, + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .i2c_port = I2C_PORT_SUB_USB_C1, + .i2c_addr_flags = PI3USB3X532_I2C_ADDR0, + .driver = &pi3usb3x532_usb_mux_driver, + }, + .next = &usbc1_retimer, } }; diff --git a/board/corori2/board.h b/board/corori2/board.h index 350ec20cf7..0fc4423020 100644 --- a/board/corori2/board.h +++ b/board/corori2/board.h @@ -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. */ diff --git a/board/corori2/build.mk b/board/corori2/build.mk index af526189dd..1512a49379 100644 --- a/board/corori2/build.mk +++ b/board/corori2/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/corori2/cbi_ssfc.c b/board/corori2/cbi_ssfc.c index 39fd4929a1..81f3ee0dad 100644 --- a/board/corori2/cbi_ssfc.c +++ b/board/corori2/cbi_ssfc.c @@ -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. */ diff --git a/board/corori2/cbi_ssfc.h b/board/corori2/cbi_ssfc.h index 942f0cf5f4..bf8853a43a 100644 --- a/board/corori2/cbi_ssfc.h +++ b/board/corori2/cbi_ssfc.h @@ -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. */ diff --git a/board/corori2/ec.tasklist b/board/corori2/ec.tasklist index d4fb416bce..29666dd959 100644 --- a/board/corori2/ec.tasklist +++ b/board/corori2/ec.tasklist @@ -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. */ diff --git a/board/corori2/gpio.inc b/board/corori2/gpio.inc index 78d41aab16..63b16a1bc3 100644 --- a/board/corori2/gpio.inc +++ b/board/corori2/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/corori2/led.c b/board/corori2/led.c index 1df2e00a5b..71a8159a07 100644 --- a/board/corori2/led.c +++ b/board/corori2/led.c @@ -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. */ diff --git a/board/corori2/usb_pd_policy.c b/board/corori2/usb_pd_policy.c index 89df538eaa..83c09bb99e 100644 --- a/board/corori2/usb_pd_policy.c +++ b/board/corori2/usb_pd_policy.c @@ -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. */ diff --git a/board/cret/battery.c b/board/cret/battery.c index a78ec43836..27bfed5355 100644 --- a/board/cret/battery.c +++ b/board/cret/battery.c @@ -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. * diff --git a/board/cret/board.c b/board/cret/board.c index e0b6cd6e68..c9c34d6d32 100644 --- a/board/cret/board.c +++ b/board/cret/board.c @@ -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. */ @@ -480,12 +480,15 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { .drv = &raa489000_tcpm_drv, }, }; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_C0, - .i2c_addr_flags = PI3USB3X532_I2C_ADDR0, - .driver = &pi3usb3x532_usb_mux_driver, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_C0, + .i2c_addr_flags = PI3USB3X532_I2C_ADDR0, + .driver = &pi3usb3x532_usb_mux_driver, + }, }, }; diff --git a/board/cret/board.h b/board/cret/board.h index ef0d6a2443..2080185c7c 100644 --- a/board/cret/board.h +++ b/board/cret/board.h @@ -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. */ diff --git a/board/cret/build.mk b/board/cret/build.mk index af526189dd..1512a49379 100644 --- a/board/cret/build.mk +++ b/board/cret/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/cret/cbi_ssfc.c b/board/cret/cbi_ssfc.c index 39fd4929a1..81f3ee0dad 100644 --- a/board/cret/cbi_ssfc.c +++ b/board/cret/cbi_ssfc.c @@ -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. */ diff --git a/board/cret/cbi_ssfc.h b/board/cret/cbi_ssfc.h index 34c2be182c..bef606bc72 100644 --- a/board/cret/cbi_ssfc.h +++ b/board/cret/cbi_ssfc.h @@ -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. */ diff --git a/board/cret/ec.tasklist b/board/cret/ec.tasklist index ee5333eb17..a98ca6fd86 100644 --- a/board/cret/ec.tasklist +++ b/board/cret/ec.tasklist @@ -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. */ diff --git a/board/cret/gpio.inc b/board/cret/gpio.inc index 352f689620..5f39fedc80 100644 --- a/board/cret/gpio.inc +++ b/board/cret/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/cret/led.c b/board/cret/led.c index 1a94e473c1..8a7a343fb3 100644 --- a/board/cret/led.c +++ b/board/cret/led.c @@ -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. */ diff --git a/board/cret/usb_pd_policy.c b/board/cret/usb_pd_policy.c index 89df538eaa..83c09bb99e 100644 --- a/board/cret/usb_pd_policy.c +++ b/board/cret/usb_pd_policy.c @@ -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. */ diff --git a/board/crota/battery.c b/board/crota/battery.c index 23a558e416..4738b5910f 100644 --- a/board/crota/battery.c +++ b/board/crota/battery.c @@ -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. * diff --git a/board/crota/board.c b/board/crota/board.c index 7975059575..04f64bd2a5 100644 --- a/board/crota/board.c +++ b/board/crota/board.c @@ -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. */ diff --git a/board/crota/board.h b/board/crota/board.h index 1b72eae84d..0271a369bc 100644 --- a/board/crota/board.h +++ b/board/crota/board.h @@ -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. */ diff --git a/board/crota/build.mk b/board/crota/build.mk index cd6a38a852..8b85854cf0 100644 --- a/board/crota/build.mk +++ b/board/crota/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/crota/charger.c b/board/crota/charger.c index 25423c0927..c7dcf7b0c1 100644 --- a/board/crota/charger.c +++ b/board/crota/charger.c @@ -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. */ diff --git a/board/crota/ec.tasklist b/board/crota/ec.tasklist index 296654d39d..17eeb4ae7c 100644 --- a/board/crota/ec.tasklist +++ b/board/crota/ec.tasklist @@ -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. */ diff --git a/board/crota/fans.c b/board/crota/fans.c index c47004617f..17e19dc863 100644 --- a/board/crota/fans.c +++ b/board/crota/fans.c @@ -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. */ diff --git a/board/crota/fw_config.c b/board/crota/fw_config.c index e03c708d45..5feb8a2d3e 100644 --- a/board/crota/fw_config.c +++ b/board/crota/fw_config.c @@ -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. */ diff --git a/board/crota/fw_config.h b/board/crota/fw_config.h index 3f39fc0d97..407af32472 100644 --- a/board/crota/fw_config.h +++ b/board/crota/fw_config.h @@ -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. */ diff --git a/board/crota/gpio.inc b/board/crota/gpio.inc index 1dcc502287..7668442b7b 100644 --- a/board/crota/gpio.inc +++ b/board/crota/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/crota/i2c.c b/board/crota/i2c.c index 6f9df1f5a9..681e600bf2 100644 --- a/board/crota/i2c.c +++ b/board/crota/i2c.c @@ -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. */ diff --git a/board/crota/keyboard.c b/board/crota/keyboard.c index 30ae99a6a1..8911d48b81 100644 --- a/board/crota/keyboard.c +++ b/board/crota/keyboard.c @@ -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. */ diff --git a/board/crota/led.c b/board/crota/led.c index f43b1e1315..83f3789e36 100644 --- a/board/crota/led.c +++ b/board/crota/led.c @@ -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. */ diff --git a/board/crota/pwm.c b/board/crota/pwm.c index 51bee909ff..26da4e4f7d 100644 --- a/board/crota/pwm.c +++ b/board/crota/pwm.c @@ -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. */ diff --git a/board/crota/sensors.c b/board/crota/sensors.c index c757743c35..bbd2686512 100644 --- a/board/crota/sensors.c +++ b/board/crota/sensors.c @@ -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. */ diff --git a/board/crota/usbc_config.c b/board/crota/usbc_config.c index 7ff908c7fa..84b0934dd8 100644 --- a/board/crota/usbc_config.c +++ b/board/crota/usbc_config.c @@ -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. */ @@ -98,40 +98,53 @@ BUILD_ASSERT(ARRAY_SIZE(ppc_chips) == USBC_PORT_COUNT); unsigned int ppc_cnt = ARRAY_SIZE(ppc_chips); /* USBC mux configuration - Alder Lake includes internal mux */ -static const struct usb_mux usbc0_tcss_usb_mux = { - .usb_port = USBC_PORT_C0, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +static const struct usb_mux_chain usbc0_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C0, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; -static const struct usb_mux usbc1_tcss_usb_mux = { - .usb_port = USBC_PORT_C1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +static const struct usb_mux_chain usbc1_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; -struct usb_mux soc_side_bb_retimer_usb_mux = { - .usb_port = USBC_PORT_C1, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_C0_C1_MUX, - .i2c_addr_flags = USBC_PORT_C1_SOC_BB_RETIMER_I2C_ADDR, - .next_mux = &usbc1_tcss_usb_mux, +struct usb_mux_chain soc_side_bb_retimer_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_C0_C1_MUX, + .i2c_addr_flags = USBC_PORT_C1_SOC_BB_RETIMER_I2C_ADDR, + }, + .next = &usbc1_tcss_usb_mux, }; -const struct usb_mux usb_muxes[] = { +const struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_C0_C1_MUX, - .i2c_addr_flags = USBC_PORT_C0_BB_RETIMER_I2C_ADDR, - .next_mux = &usbc0_tcss_usb_mux, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_C0_C1_MUX, + .i2c_addr_flags = USBC_PORT_C0_BB_RETIMER_I2C_ADDR, + }, + .next = &usbc0_tcss_usb_mux, }, [USBC_PORT_C1] = { - .usb_port = USBC_PORT_C1, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_C0_C1_MUX, - .i2c_addr_flags = USBC_PORT_C1_BB_RETIMER_I2C_ADDR, - .next_mux = &soc_side_bb_retimer_usb_mux, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C1, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_C0_C1_MUX, + .i2c_addr_flags = USBC_PORT_C1_BB_RETIMER_I2C_ADDR, + }, + .next = &soc_side_bb_retimer_usb_mux, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/board/crota/usbc_config.h b/board/crota/usbc_config.h index 76528b1b6a..63e077ea95 100644 --- a/board/crota/usbc_config.h +++ b/board/crota/usbc_config.h @@ -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. */ diff --git a/board/dalboz/battery.c b/board/dalboz/battery.c index 5a90a767c8..e5adf3c4b3 100644 --- a/board/dalboz/battery.c +++ b/board/dalboz/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/dalboz/board.c b/board/dalboz/board.c index f43bdeb17a..471446878f 100644 --- a/board/dalboz/board.c +++ b/board/dalboz/board.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -266,33 +266,45 @@ const struct usb_mux_driver usbc0_sbu_mux_driver = { * Since FSUSB42UMX is not a i2c device, .i2c_port and * .i2c_addr_flags are not required here. */ -const struct usb_mux usbc0_sbu_mux = { - .usb_port = USBC_PORT_C0, - .driver = &usbc0_sbu_mux_driver, +const struct usb_mux_chain usbc0_sbu_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C0, + .driver = &usbc0_sbu_mux_driver, + }, }; -struct usb_mux usbc1_amd_fp5_usb_mux = { +struct usb_mux usbc1_ps8xxx_mux = { .usb_port = USBC_PORT_C1, - .i2c_port = I2C_PORT_USB_AP_MUX, - .i2c_addr_flags = AMD_FP5_MUX_I2C_ADDR_FLAGS, - .driver = &amd_fp5_usb_mux_driver, - .flags = USB_MUX_FLAG_SET_WITHOUT_FLIP, + .i2c_port = I2C_PORT_TCPC1, + .i2c_addr_flags = PS8743_I2C_ADDR1_FLAG, + .driver = &ps8743_usb_mux_driver, +}; + +struct usb_mux_chain usbc1_amd_fp5_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .i2c_port = I2C_PORT_USB_AP_MUX, + .i2c_addr_flags = AMD_FP5_MUX_I2C_ADDR_FLAGS, + .driver = &amd_fp5_usb_mux_driver, + .flags = USB_MUX_FLAG_SET_WITHOUT_FLIP, + }, }; -struct usb_mux usb_muxes[] = { +struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .i2c_port = I2C_PORT_USB_AP_MUX, - .i2c_addr_flags = AMD_FP5_MUX_I2C_ADDR_FLAGS, - .driver = &amd_fp5_usb_mux_driver, - .next_mux = &usbc0_sbu_mux, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .i2c_port = I2C_PORT_USB_AP_MUX, + .i2c_addr_flags = AMD_FP5_MUX_I2C_ADDR_FLAGS, + .driver = &amd_fp5_usb_mux_driver, + }, + .next = &usbc0_sbu_mux, }, [USBC_PORT_C1] = { - .usb_port = USBC_PORT_C1, - .i2c_port = I2C_PORT_TCPC1, - .i2c_addr_flags = PS8743_I2C_ADDR1_FLAG, - .driver = &ps8743_usb_mux_driver, - .next_mux = &usbc1_amd_fp5_usb_mux, + .mux = &usbc1_ps8xxx_mux, + .next = &usbc1_amd_fp5_usb_mux, } }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); @@ -542,14 +554,14 @@ static void setup_fw_config(void) if (cbi_get_board_version(&board_version) == EC_SUCCESS && board_version >= 2) { ccprints("PS8743 USB MUX"); - usb_muxes[USBC_PORT_C1].i2c_addr_flags = PS8743_I2C_ADDR1_FLAG; - usb_muxes[USBC_PORT_C1].driver = &ps8743_usb_mux_driver; - usb_muxes[USBC_PORT_C1].board_set = &board_ps8743_mux_set; + usbc1_ps8xxx_mux.i2c_addr_flags = PS8743_I2C_ADDR1_FLAG; + usbc1_ps8xxx_mux.driver = &ps8743_usb_mux_driver; + usbc1_ps8xxx_mux.board_set = &board_ps8743_mux_set; } else { ccprints("PS8740 USB MUX"); - usb_muxes[USBC_PORT_C1].i2c_addr_flags = PS8740_I2C_ADDR0_FLAG; - usb_muxes[USBC_PORT_C1].driver = &ps8740_usb_mux_driver; - usb_muxes[USBC_PORT_C1].board_set = NULL; + usbc1_ps8xxx_mux.i2c_addr_flags = PS8740_I2C_ADDR0_FLAG; + usbc1_ps8xxx_mux.driver = &ps8740_usb_mux_driver; + usbc1_ps8xxx_mux.board_set = NULL; } if (ec_config_get_usb_db() == DALBOZ_DB_D_OPT2_USBA_HDMI) { diff --git a/board/dalboz/board.h b/board/dalboz/board.h index 8c8bf241b5..967d1dce8f 100644 --- a/board/dalboz/board.h +++ b/board/dalboz/board.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/dalboz/build.mk b/board/dalboz/build.mk index 4ca0cbd96f..cd58c2b91b 100644 --- a/board/dalboz/build.mk +++ b/board/dalboz/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/dalboz/ec.tasklist b/board/dalboz/ec.tasklist index 41b83cf4f3..4bb60ed55d 100644 --- a/board/dalboz/ec.tasklist +++ b/board/dalboz/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/dalboz/gpio.inc b/board/dalboz/gpio.inc index 74fe019b47..386898f013 100644 --- a/board/dalboz/gpio.inc +++ b/board/dalboz/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/dalboz/led.c b/board/dalboz/led.c index 8d2cfe4044..d9614539e5 100644 --- a/board/dalboz/led.c +++ b/board/dalboz/led.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/damu/battery.c b/board/damu/battery.c index c85240a108..2c3b259a23 100644 --- a/board/damu/battery.c +++ b/board/damu/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/damu/board.c b/board/damu/board.c index 0b8812866c..ddc8885e22 100644 --- a/board/damu/board.c +++ b/board/damu/board.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -165,13 +165,16 @@ static void board_hpd_status(const struct usb_mux *me, mux_state_t mux_state, host_set_single_event(EC_HOST_EVENT_USB_MUX); } -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_MUX, - .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, - .driver = &it5205_usb_mux_driver, - .hpd_update = &board_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_MUX, + .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, + .driver = &it5205_usb_mux_driver, + .hpd_update = &board_hpd_status, + }, }, }; diff --git a/board/damu/board.h b/board/damu/board.h index 4ca152f58b..49875e6883 100644 --- a/board/damu/board.h +++ b/board/damu/board.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/damu/build.mk b/board/damu/build.mk index 0b3565fd84..6a7e557a0e 100644 --- a/board/damu/build.mk +++ b/board/damu/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/damu/ec.tasklist b/board/damu/ec.tasklist index 19d2f34687..30e9967a0a 100644 --- a/board/damu/ec.tasklist +++ b/board/damu/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/damu/gpio.inc b/board/damu/gpio.inc index 9ee4035917..9db5b49238 100644 --- a/board/damu/gpio.inc +++ b/board/damu/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2018 The Chromium OS Authors. All rights reserved. + * Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/damu/led.c b/board/damu/led.c index 9bbea50150..9d2b70795b 100644 --- a/board/damu/led.c +++ b/board/damu/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/delbin/battery.c b/board/delbin/battery.c index e907a3574f..6d6ae2afad 100644 --- a/board/delbin/battery.c +++ b/board/delbin/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/delbin/board.c b/board/delbin/board.c index fe1c3f10ee..1cdb42d954 100644 --- a/board/delbin/board.c +++ b/board/delbin/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -483,32 +483,42 @@ BUILD_ASSERT(CONFIG_USB_PD_PORT_MAX_COUNT == USBC_PORT_COUNT); /******************************************************************************/ /* USBC mux configuration - Tiger Lake includes internal mux */ -static const struct usb_mux usbc0_usb3_mb_retimer = { - .usb_port = USBC_PORT_C0, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, - .next_mux = NULL, +static const struct usb_mux_chain usbc0_usb3_mb_retimer = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C0, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, + .next = NULL, }; -static const struct usb_mux usbc1_usb3_db_retimer = { - .usb_port = USBC_PORT_C1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, - .next_mux = NULL, +static const struct usb_mux_chain usbc1_usb3_db_retimer = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, + .next = NULL, }; -const struct usb_mux usb_muxes[] = { +const struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, - .next_mux = &usbc0_usb3_mb_retimer, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, + .next = &usbc0_usb3_mb_retimer, }, [USBC_PORT_C1] = { - .usb_port = USBC_PORT_C1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, - .next_mux = &usbc1_usb3_db_retimer, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C1, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, + .next = &usbc1_usb3_db_retimer, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/board/delbin/board.h b/board/delbin/board.h index efdb2d503a..50759b74d2 100644 --- a/board/delbin/board.h +++ b/board/delbin/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/delbin/build.mk b/board/delbin/build.mk index 003b3d871d..26007095af 100644 --- a/board/delbin/build.mk +++ b/board/delbin/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/delbin/ec.tasklist b/board/delbin/ec.tasklist index 3e20d8ae39..c29125d517 100644 --- a/board/delbin/ec.tasklist +++ b/board/delbin/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/delbin/gpio.inc b/board/delbin/gpio.inc index 61dae06cde..f229e50dcc 100644 --- a/board/delbin/gpio.inc +++ b/board/delbin/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -16,7 +16,7 @@ GPIO_INT(ACOK_OD, PIN(0, 0), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, ex /* Power sequencing interrupts */ GPIO_INT(SLP_S0_L, PIN(D, 5), GPIO_INT_BOTH, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 GPIO_INT(SLP_S3_L, PIN(A, 5), GPIO_INT_BOTH, power_signal_interrupt) #endif GPIO_INT(SLP_SUS_L, PIN(D, 7), GPIO_INT_BOTH, power_signal_interrupt) diff --git a/board/delbin/keyboard_customization.c b/board/delbin/keyboard_customization.c index 1f6c71e4e9..2cbe1ac57b 100644 --- a/board/delbin/keyboard_customization.c +++ b/board/delbin/keyboard_customization.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/board/delbin/keyboard_customization.h b/board/delbin/keyboard_customization.h index 71d4a54ceb..bfe5c3b584 100644 --- a/board/delbin/keyboard_customization.h +++ b/board/delbin/keyboard_customization.h @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/board/delbin/led.c b/board/delbin/led.c index aa7295e4c5..27eb98a75e 100644 --- a/board/delbin/led.c +++ b/board/delbin/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/delbin/sensors.c b/board/delbin/sensors.c index 10dcd6b7b6..77b5757e28 100644 --- a/board/delbin/sensors.c +++ b/board/delbin/sensors.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/dewatt/battery.c b/board/dewatt/battery.c index 40d5f930e3..9b3e15cfcf 100644 --- a/board/dewatt/battery.c +++ b/board/dewatt/battery.c @@ -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. * diff --git a/board/dewatt/board.c b/board/dewatt/board.c index be7e51914f..1ce6858d8f 100644 --- a/board/dewatt/board.c +++ b/board/dewatt/board.c @@ -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. */ diff --git a/board/dewatt/board.h b/board/dewatt/board.h index ff01f1ab23..58990c97d3 100644 --- a/board/dewatt/board.h +++ b/board/dewatt/board.h @@ -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. */ diff --git a/board/dewatt/board_fw_config.c b/board/dewatt/board_fw_config.c index 40e19aaca8..7128a153ca 100644 --- a/board/dewatt/board_fw_config.c +++ b/board/dewatt/board_fw_config.c @@ -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. */ diff --git a/board/dewatt/board_fw_config.h b/board/dewatt/board_fw_config.h index b51eddaa08..4477aca6fd 100644 --- a/board/dewatt/board_fw_config.h +++ b/board/dewatt/board_fw_config.h @@ -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. */ diff --git a/board/dewatt/build.mk b/board/dewatt/build.mk index 8f2b78ddc8..8a1ce35e1e 100644 --- a/board/dewatt/build.mk +++ b/board/dewatt/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/dewatt/ec.tasklist b/board/dewatt/ec.tasklist index 94ff657db3..14ecddebc9 100644 --- a/board/dewatt/ec.tasklist +++ b/board/dewatt/ec.tasklist @@ -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. */ diff --git a/board/dewatt/gpio.inc b/board/dewatt/gpio.inc index 1bab89ed63..9798239af5 100644 --- a/board/dewatt/gpio.inc +++ b/board/dewatt/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/dewatt/led.c b/board/dewatt/led.c index 4d5ab312e0..9453bd8e6e 100644 --- a/board/dewatt/led.c +++ b/board/dewatt/led.c @@ -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. * diff --git a/board/dewatt/thermal.c b/board/dewatt/thermal.c index c35de5775b..bd63fda984 100644 --- a/board/dewatt/thermal.c +++ b/board/dewatt/thermal.c @@ -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. */ diff --git a/board/dingdong/board.c b/board/dingdong/board.c index 78bcbc82da..8e4bdff6a3 100644 --- a/board/dingdong/board.c +++ b/board/dingdong/board.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/dingdong/board.h b/board/dingdong/board.h index 62898d195a..c0372c9322 100644 --- a/board/dingdong/board.h +++ b/board/dingdong/board.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/dingdong/build.mk b/board/dingdong/build.mk index 71cea3f845..b6fbbe7a9e 100644 --- a/board/dingdong/build.mk +++ b/board/dingdong/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2014 The Chromium OS Authors. All rights reserved. +# Copyright 2014 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/dingdong/ec.tasklist b/board/dingdong/ec.tasklist index 41fc047d6a..5a82344122 100644 --- a/board/dingdong/ec.tasklist +++ b/board/dingdong/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/dingdong/gpio.inc b/board/dingdong/gpio.inc index ec1e9a7fa9..d8ea0dfc8f 100644 --- a/board/dingdong/gpio.inc +++ b/board/dingdong/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2014 The Chromium OS Authors. All rights reserved. + * Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/dingdong/usb_pd_config.h b/board/dingdong/usb_pd_config.h index e783ff874c..5a7dfd12a6 100644 --- a/board/dingdong/usb_pd_config.h +++ b/board/dingdong/usb_pd_config.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/dingdong/usb_pd_pdo.c b/board/dingdong/usb_pd_pdo.c index 6caee22d29..7b4ed3e2d8 100644 --- a/board/dingdong/usb_pd_pdo.c +++ b/board/dingdong/usb_pd_pdo.c @@ -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. */ diff --git a/board/dingdong/usb_pd_pdo.h b/board/dingdong/usb_pd_pdo.h index 66bb713ee8..e1b628c3a8 100644 --- a/board/dingdong/usb_pd_pdo.h +++ b/board/dingdong/usb_pd_pdo.h @@ -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. */ diff --git a/board/dingdong/usb_pd_policy.c b/board/dingdong/usb_pd_policy.c index 2301e8280a..493897c6da 100644 --- a/board/dingdong/usb_pd_policy.c +++ b/board/dingdong/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/dirinboz/battery.c b/board/dirinboz/battery.c index c148f9aa52..d02d424ba4 100644 --- a/board/dirinboz/battery.c +++ b/board/dirinboz/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/dirinboz/board.c b/board/dirinboz/board.c index 472e10bd78..c6e35cf7e8 100644 --- a/board/dirinboz/board.c +++ b/board/dirinboz/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -98,33 +98,43 @@ const struct usb_mux_driver usbc0_sbu_mux_driver = { * Since PI3USB221 is not a i2c device, .i2c_port and * .i2c_addr_flags are not required here. */ -const struct usb_mux usbc0_sbu_mux = { - .usb_port = USBC_PORT_C0, - .driver = &usbc0_sbu_mux_driver, +const struct usb_mux_chain usbc0_sbu_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C0, + .driver = &usbc0_sbu_mux_driver, + }, }; -struct usb_mux usbc1_amd_fp5_usb_mux = { - .usb_port = USBC_PORT_C1, - .i2c_port = I2C_PORT_USB_AP_MUX, - .i2c_addr_flags = AMD_FP5_MUX_I2C_ADDR_FLAGS, - .driver = &amd_fp5_usb_mux_driver, - .flags = USB_MUX_FLAG_SET_WITHOUT_FLIP, +struct usb_mux_chain usbc1_amd_fp5_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .i2c_port = I2C_PORT_USB_AP_MUX, + .i2c_addr_flags = AMD_FP5_MUX_I2C_ADDR_FLAGS, + .driver = &amd_fp5_usb_mux_driver, + .flags = USB_MUX_FLAG_SET_WITHOUT_FLIP, + }, }; -struct usb_mux usb_muxes[] = { +struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .i2c_port = I2C_PORT_USB_AP_MUX, - .i2c_addr_flags = AMD_FP5_MUX_I2C_ADDR_FLAGS, - .driver = &amd_fp5_usb_mux_driver, - .next_mux = &usbc0_sbu_mux, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .i2c_port = I2C_PORT_USB_AP_MUX, + .i2c_addr_flags = AMD_FP5_MUX_I2C_ADDR_FLAGS, + .driver = &amd_fp5_usb_mux_driver, + }, + .next = &usbc0_sbu_mux, }, [USBC_PORT_C1] = { - .usb_port = USBC_PORT_C1, - .i2c_port = I2C_PORT_TCPC1, - .i2c_addr_flags = PS8743_I2C_ADDR1_FLAG, - .driver = &ps8743_usb_mux_driver, - .next_mux = &usbc1_amd_fp5_usb_mux, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C1, + .i2c_port = I2C_PORT_TCPC1, + .i2c_addr_flags = PS8743_I2C_ADDR1_FLAG, + .driver = &ps8743_usb_mux_driver, + }, + .next = &usbc1_amd_fp5_usb_mux, } }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/board/dirinboz/board.h b/board/dirinboz/board.h index 45bd93790e..a27176fcae 100644 --- a/board/dirinboz/board.h +++ b/board/dirinboz/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/dirinboz/build.mk b/board/dirinboz/build.mk index 1c0cbc4f63..45c71f962c 100644 --- a/board/dirinboz/build.mk +++ b/board/dirinboz/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/dirinboz/ec.tasklist b/board/dirinboz/ec.tasklist index 3a08ebc972..779bd4fdd6 100644 --- a/board/dirinboz/ec.tasklist +++ b/board/dirinboz/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/dirinboz/gpio.inc b/board/dirinboz/gpio.inc index f4de7e567a..ab1b83c55f 100644 --- a/board/dirinboz/gpio.inc +++ b/board/dirinboz/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/dirinboz/led.c b/board/dirinboz/led.c index 6190b2546b..1c53b9173e 100644 --- a/board/dirinboz/led.c +++ b/board/dirinboz/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/discovery-stm32f072/board.c b/board/discovery-stm32f072/board.c index 5932e9611d..52a31566a9 100644 --- a/board/discovery-stm32f072/board.c +++ b/board/discovery-stm32f072/board.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/discovery-stm32f072/board.h b/board/discovery-stm32f072/board.h index d9be019aaa..d5db803b65 100644 --- a/board/discovery-stm32f072/board.h +++ b/board/discovery-stm32f072/board.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/discovery-stm32f072/build.mk b/board/discovery-stm32f072/build.mk index c1892335ed..21613f74eb 100644 --- a/board/discovery-stm32f072/build.mk +++ b/board/discovery-stm32f072/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2014 The Chromium OS Authors. All rights reserved. +# Copyright 2014 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/discovery-stm32f072/ec.tasklist b/board/discovery-stm32f072/ec.tasklist index cc4c2ad42d..2bd7e2f5ce 100644 --- a/board/discovery-stm32f072/ec.tasklist +++ b/board/discovery-stm32f072/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/discovery-stm32f072/gpio.inc b/board/discovery-stm32f072/gpio.inc index 65bdd0179b..25b5f1b0e0 100644 --- a/board/discovery-stm32f072/gpio.inc +++ b/board/discovery-stm32f072/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2014 The Chromium OS Authors. All rights reserved. + * Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/discovery-stm32f072/openocd-flash.cfg b/board/discovery-stm32f072/openocd-flash.cfg index ec32416934..05a697acf8 100644 --- a/board/discovery-stm32f072/openocd-flash.cfg +++ b/board/discovery-stm32f072/openocd-flash.cfg @@ -1,4 +1,4 @@ -# Copyright 2014 The Chromium OS Authors. All rights reserved. +# Copyright 2014 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/board/discovery/board.c b/board/discovery/board.c index 74c187bf08..a9ba174a4f 100644 --- a/board/discovery/board.c +++ b/board/discovery/board.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/discovery/board.h b/board/discovery/board.h index ddd2461a56..e348454af1 100644 --- a/board/discovery/board.h +++ b/board/discovery/board.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/discovery/build.mk b/board/discovery/build.mk index 42f9f9a0fc..e07d8af33d 100644 --- a/board/discovery/build.mk +++ b/board/discovery/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2013 The Chromium OS Authors. All rights reserved. +# Copyright 2013 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/discovery/ec.tasklist b/board/discovery/ec.tasklist index 3822ab3779..e58390c01d 100644 --- a/board/discovery/ec.tasklist +++ b/board/discovery/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/discovery/gpio.inc b/board/discovery/gpio.inc index 821f38ca46..da2742ff7a 100644 --- a/board/discovery/gpio.inc +++ b/board/discovery/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2014 The Chromium OS Authors. All rights reserved. + * Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/discovery/openocd-flash.cfg b/board/discovery/openocd-flash.cfg index 6426ad5473..f87c191576 100644 --- a/board/discovery/openocd-flash.cfg +++ b/board/discovery/openocd-flash.cfg @@ -1,4 +1,4 @@ -# Copyright 2015 The Chromium OS Authors. All rights reserved. +# Copyright 2015 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/board/dojo/battery.c b/board/dojo/battery.c index 40d1290309..a766ea3e59 100644 --- a/board/dojo/battery.c +++ b/board/dojo/battery.c @@ -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. */ diff --git a/board/dojo/board.c b/board/dojo/board.c index a53c2af881..65a1635111 100644 --- a/board/dojo/board.c +++ b/board/dojo/board.c @@ -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. */ @@ -442,21 +442,27 @@ static int board_anx3443_mux_set(const struct usb_mux *me, return EC_SUCCESS; } -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_MUX0, - .i2c_addr_flags = PS8802_I2C_ADDR_FLAGS, - .driver = &ps8802_usb_mux_driver, - .board_init = &board_ps8762_mux_init, - .board_set = &board_ps8762_mux_set, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_MUX0, + .i2c_addr_flags = PS8802_I2C_ADDR_FLAGS, + .driver = &ps8802_usb_mux_driver, + .board_init = &board_ps8762_mux_init, + .board_set = &board_ps8762_mux_set, + }, }, { - .usb_port = 1, - .i2c_port = I2C_PORT_USB_MUX1, - .i2c_addr_flags = ANX3443_I2C_ADDR0_FLAGS, - .driver = &anx3443_usb_mux_driver, - .board_set = &board_anx3443_mux_set, + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .i2c_port = I2C_PORT_USB_MUX1, + .i2c_addr_flags = ANX3443_I2C_ADDR0_FLAGS, + .driver = &anx3443_usb_mux_driver, + .board_set = &board_anx3443_mux_set, + }, }, }; diff --git a/board/dojo/board.h b/board/dojo/board.h index 160d98d3ff..cc2d5eba2f 100644 --- a/board/dojo/board.h +++ b/board/dojo/board.h @@ -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. */ diff --git a/board/dojo/build.mk b/board/dojo/build.mk index e32df81d01..740cd30a9d 100644 --- a/board/dojo/build.mk +++ b/board/dojo/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/dojo/cbi_fw_config.c b/board/dojo/cbi_fw_config.c index 7db743a8f9..96e6d9b266 100644 --- a/board/dojo/cbi_fw_config.c +++ b/board/dojo/cbi_fw_config.c @@ -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. */ diff --git a/board/dojo/cbi_fw_config.h b/board/dojo/cbi_fw_config.h index 66dcf1f782..6ca0e5b9a8 100644 --- a/board/dojo/cbi_fw_config.h +++ b/board/dojo/cbi_fw_config.h @@ -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. */ diff --git a/board/dojo/cbi_ssfc.c b/board/dojo/cbi_ssfc.c index 6ece151e12..3b7ed483f5 100644 --- a/board/dojo/cbi_ssfc.c +++ b/board/dojo/cbi_ssfc.c @@ -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. */ diff --git a/board/dojo/cbi_ssfc.h b/board/dojo/cbi_ssfc.h index 53caad7ac8..da37dbaca1 100644 --- a/board/dojo/cbi_ssfc.h +++ b/board/dojo/cbi_ssfc.h @@ -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. */ diff --git a/board/dojo/ec.tasklist b/board/dojo/ec.tasklist index f9050fef87..5ce0fab583 100644 --- a/board/dojo/ec.tasklist +++ b/board/dojo/ec.tasklist @@ -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. */ diff --git a/board/dojo/gpio.inc b/board/dojo/gpio.inc index 01cf57258d..0fb85b47b7 100644 --- a/board/dojo/gpio.inc +++ b/board/dojo/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/dojo/led.c b/board/dojo/led.c index 56b53a542d..4b2b379a1b 100644 --- a/board/dojo/led.c +++ b/board/dojo/led.c @@ -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. */ diff --git a/board/dood/battery.c b/board/dood/battery.c index da5f4c47dc..8564eb0926 100644 --- a/board/dood/battery.c +++ b/board/dood/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/dood/board.c b/board/dood/board.c index de107a2fc7..9d395d3bfe 100644 --- a/board/dood/board.c +++ b/board/dood/board.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/dood/board.h b/board/dood/board.h index be3262dd55..8c9f225a59 100644 --- a/board/dood/board.h +++ b/board/dood/board.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/dood/build.mk b/board/dood/build.mk index 3d04b75731..998a65a3de 100644 --- a/board/dood/build.mk +++ b/board/dood/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2018 The Chromium OS Authors. All rights reserved. +# Copyright 2018 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/dood/ec.tasklist b/board/dood/ec.tasklist index d98db145e7..977b8b01be 100644 --- a/board/dood/ec.tasklist +++ b/board/dood/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/dood/gpio.inc b/board/dood/gpio.inc index 961acf8ee0..b10c377ddf 100644 --- a/board/dood/gpio.inc +++ b/board/dood/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2018 The Chromium OS Authors. All rights reserved. + * Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/dood/led.c b/board/dood/led.c index 649444007d..248dae037f 100644 --- a/board/dood/led.c +++ b/board/dood/led.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/dooly/board.c b/board/dooly/board.c index 04e32ee4a3..6e1f6ebbeb 100644 --- a/board/dooly/board.c +++ b/board/dooly/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -507,16 +507,20 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { .flags = TCPC_FLAGS_RESET_ACTIVE_HIGH, }, }; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { [USB_PD_PORT_TCPC_0] = { - .usb_port = USB_PD_PORT_TCPC_0, - .driver = &anx7447_usb_mux_driver, - .hpd_update = &anx7447_tcpc_update_hpd_status, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_TCPC_0, + .driver = &anx7447_usb_mux_driver, + .hpd_update = &anx7447_tcpc_update_hpd_status, + }, }, [USB_PD_PORT_TCPC_1] = { - .usb_port = USB_PD_PORT_TCPC_1, - .driver = &anx7447_usb_mux_driver, - .hpd_update = &anx7447_tcpc_update_hpd_status, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_TCPC_1, + .driver = &anx7447_usb_mux_driver, + .hpd_update = &anx7447_tcpc_update_hpd_status, + }, }, }; diff --git a/board/dooly/board.h b/board/dooly/board.h index 3cdbb86028..cb9d12f4ff 100644 --- a/board/dooly/board.h +++ b/board/dooly/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/dooly/build.mk b/board/dooly/build.mk index 0f55c45f77..f9096c64ff 100644 --- a/board/dooly/build.mk +++ b/board/dooly/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/dooly/ec.tasklist b/board/dooly/ec.tasklist index 72b81be8d8..cf509f86a2 100644 --- a/board/dooly/ec.tasklist +++ b/board/dooly/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/dooly/gpio.inc b/board/dooly/gpio.inc index 65488936b7..d92dedd145 100644 --- a/board/dooly/gpio.inc +++ b/board/dooly/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -25,12 +25,12 @@ GPIO_INT(PG_VPRIM_CORE_A_OD, PIN(2, 3), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(PG_PP1050_A_OD, PIN(2, 2), GPIO_INT_BOTH, power_signal_interrupt) /* EC output, but also interrupt so this can be polled as a power signal */ GPIO_INT(EC_PCH_RSMRST_L, PIN(A, 6), GPIO_OUTPUT | GPIO_INT_F_RISING | GPIO_INT_F_FALLING, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 GPIO_INT(SLP_S4_L, PIN(D, 4), GPIO_INT_BOTH, power_signal_interrupt) #endif GPIO_INT(PG_PP2500_DRAM_U_OD, PIN(2, 0), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(PG_PP1200_U_OD, PIN(2, 1), GPIO_INT_BOTH, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 GPIO_INT(SLP_S3_L, PIN(A, 5), GPIO_INT_BOTH, slp_s3_interrupt) #endif GPIO_INT(PG_PP950_VCCIO_OD, PIN(1, 7), GPIO_INT_BOTH, power_signal_interrupt) diff --git a/board/dooly/led.c b/board/dooly/led.c index 22d2000f04..224db77dc0 100644 --- a/board/dooly/led.c +++ b/board/dooly/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/dooly/usb_pd_policy.c b/board/dooly/usb_pd_policy.c index 9259586da2..71396e8797 100644 --- a/board/dooly/usb_pd_policy.c +++ b/board/dooly/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/drallion_ish/board.c b/board/drallion_ish/board.c index f42ebb6132..b23748b62d 100644 --- a/board/drallion_ish/board.c +++ b/board/drallion_ish/board.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/drallion_ish/board.h b/board/drallion_ish/board.h index 019645d6e4..d87acc48c3 100644 --- a/board/drallion_ish/board.h +++ b/board/drallion_ish/board.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/drallion_ish/build.mk b/board/drallion_ish/build.mk index 51bd96d339..50d4bf1042 100644 --- a/board/drallion_ish/build.mk +++ b/board/drallion_ish/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/drallion_ish/ec.tasklist b/board/drallion_ish/ec.tasklist index a4db486e9a..de7d256324 100644 --- a/board/drallion_ish/ec.tasklist +++ b/board/drallion_ish/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/drallion_ish/gpio.inc b/board/drallion_ish/gpio.inc index 93e6752e2b..b1c585b329 100644 --- a/board/drallion_ish/gpio.inc +++ b/board/drallion_ish/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/dratini/battery.c b/board/dratini/battery.c index 77c84cd973..5cb57e4ba5 100644 --- a/board/dratini/battery.c +++ b/board/dratini/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/dratini/board.c b/board/dratini/board.c index 428c4316d4..84759b74b6 100644 --- a/board/dratini/board.c +++ b/board/dratini/board.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -163,16 +163,20 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }, }; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { [USB_PD_PORT_TCPC_0] = { - .usb_port = USB_PD_PORT_TCPC_0, - .driver = &anx7447_usb_mux_driver, - .hpd_update = &anx7447_tcpc_update_hpd_status, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_TCPC_0, + .driver = &anx7447_usb_mux_driver, + .hpd_update = &anx7447_tcpc_update_hpd_status, + }, }, [USB_PD_PORT_TCPC_1] = { - .usb_port = USB_PD_PORT_TCPC_1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_TCPC_1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, } }; diff --git a/board/dratini/board.h b/board/dratini/board.h index 7fb4998d81..9bb4347158 100644 --- a/board/dratini/board.h +++ b/board/dratini/board.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/dratini/build.mk b/board/dratini/build.mk index 733912454f..13153c1526 100644 --- a/board/dratini/build.mk +++ b/board/dratini/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/dratini/ec.tasklist b/board/dratini/ec.tasklist index 4a1024a091..829be2b7c8 100644 --- a/board/dratini/ec.tasklist +++ b/board/dratini/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/dratini/gpio.inc b/board/dratini/gpio.inc index c242919a89..b8649ca3b1 100644 --- a/board/dratini/gpio.inc +++ b/board/dratini/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -17,10 +17,10 @@ GPIO_INT(ACOK_OD, PIN(0, 0), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, ex /* Power sequencing interrupts */ GPIO_INT(SLP_S0_L, PIN(D, 5), GPIO_INT_BOTH, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 GPIO_INT(SLP_S3_L, PIN(A, 5), GPIO_INT_BOTH, power_signal_interrupt) #endif -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 GPIO_INT(SLP_S4_L, PIN(D, 4), GPIO_INT_BOTH, power_signal_interrupt) #endif GPIO_INT(PG_EC_RSMRST_L, PIN(E, 2), GPIO_INT_BOTH, intel_x86_rsmrst_signal_interrupt) diff --git a/board/dratini/led.c b/board/dratini/led.c index f85ea1f343..029ae11da8 100644 --- a/board/dratini/led.c +++ b/board/dratini/led.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/drawcia/battery.c b/board/drawcia/battery.c index 62d6e95947..acc50ca048 100644 --- a/board/drawcia/battery.c +++ b/board/drawcia/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/drawcia/board.c b/board/drawcia/board.c index a86c163db8..118b3178be 100644 --- a/board/drawcia/board.c +++ b/board/drawcia/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -260,19 +260,25 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }; /* USB Muxes */ -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_C0, - .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, - .driver = &it5205_usb_mux_driver, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_C0, + .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, + .driver = &it5205_usb_mux_driver, + }, }, { - .usb_port = 1, - .i2c_port = I2C_PORT_SUB_USB_C1, - .i2c_addr_flags = PS8XXX_I2C_ADDR1_FLAGS, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .i2c_port = I2C_PORT_SUB_USB_C1, + .i2c_addr_flags = PS8XXX_I2C_ADDR1_FLAGS, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, }, }; diff --git a/board/drawcia/board.h b/board/drawcia/board.h index 3b1314a276..afad544ef8 100644 --- a/board/drawcia/board.h +++ b/board/drawcia/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/drawcia/build.mk b/board/drawcia/build.mk index 806168ea0d..9b862c7624 100644 --- a/board/drawcia/build.mk +++ b/board/drawcia/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/drawcia/cbi_ssfc.c b/board/drawcia/cbi_ssfc.c index 39fd4929a1..81f3ee0dad 100644 --- a/board/drawcia/cbi_ssfc.c +++ b/board/drawcia/cbi_ssfc.c @@ -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. */ diff --git a/board/drawcia/cbi_ssfc.h b/board/drawcia/cbi_ssfc.h index 3257d00e9b..37e7d9c26f 100644 --- a/board/drawcia/cbi_ssfc.h +++ b/board/drawcia/cbi_ssfc.h @@ -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. */ diff --git a/board/drawcia/ec.tasklist b/board/drawcia/ec.tasklist index 2edf48ee05..c3c360febb 100644 --- a/board/drawcia/ec.tasklist +++ b/board/drawcia/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/drawcia/gpio.inc b/board/drawcia/gpio.inc index 2bfbb9c91b..0c4599911a 100644 --- a/board/drawcia/gpio.inc +++ b/board/drawcia/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/drawcia/led.c b/board/drawcia/led.c index 48dc7fd1d9..8e6263fbbc 100644 --- a/board/drawcia/led.c +++ b/board/drawcia/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/drawcia/usb_pd_policy.c b/board/drawcia/usb_pd_policy.c index ef687f0f9c..2433b25431 100644 --- a/board/drawcia/usb_pd_policy.c +++ b/board/drawcia/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/drawcia_riscv/battery.c b/board/drawcia_riscv/battery.c index 4aa0f49043..074bc78d58 100644 --- a/board/drawcia_riscv/battery.c +++ b/board/drawcia_riscv/battery.c @@ -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. * diff --git a/board/drawcia_riscv/board.c b/board/drawcia_riscv/board.c index 20d6d35e18..cbc977d64b 100644 --- a/board/drawcia_riscv/board.c +++ b/board/drawcia_riscv/board.c @@ -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. */ @@ -243,19 +243,25 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }; /* USB Muxes */ -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_C0, - .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, - .driver = &it5205_usb_mux_driver, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_C0, + .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, + .driver = &it5205_usb_mux_driver, + }, }, { - .usb_port = 1, - .i2c_port = I2C_PORT_SUB_USB_C1, - .i2c_addr_flags = PS8XXX_I2C_ADDR1_FLAGS, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .i2c_port = I2C_PORT_SUB_USB_C1, + .i2c_addr_flags = PS8XXX_I2C_ADDR1_FLAGS, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, }, }; diff --git a/board/drawcia_riscv/board.h b/board/drawcia_riscv/board.h index f1d0e27de6..2867412cf8 100644 --- a/board/drawcia_riscv/board.h +++ b/board/drawcia_riscv/board.h @@ -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. */ diff --git a/board/drawcia_riscv/build.mk b/board/drawcia_riscv/build.mk index cf62dfc823..b63b7a58b9 100644 --- a/board/drawcia_riscv/build.mk +++ b/board/drawcia_riscv/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/drawcia_riscv/cbi_ssfc.c b/board/drawcia_riscv/cbi_ssfc.c index 39fd4929a1..81f3ee0dad 100644 --- a/board/drawcia_riscv/cbi_ssfc.c +++ b/board/drawcia_riscv/cbi_ssfc.c @@ -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. */ diff --git a/board/drawcia_riscv/cbi_ssfc.h b/board/drawcia_riscv/cbi_ssfc.h index 942f0cf5f4..bf8853a43a 100644 --- a/board/drawcia_riscv/cbi_ssfc.h +++ b/board/drawcia_riscv/cbi_ssfc.h @@ -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. */ diff --git a/board/drawcia_riscv/ec.tasklist b/board/drawcia_riscv/ec.tasklist index 5c9a2d1a01..c13df44543 100644 --- a/board/drawcia_riscv/ec.tasklist +++ b/board/drawcia_riscv/ec.tasklist @@ -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. */ diff --git a/board/drawcia_riscv/gpio.inc b/board/drawcia_riscv/gpio.inc index cf0e3377cd..ad20442673 100644 --- a/board/drawcia_riscv/gpio.inc +++ b/board/drawcia_riscv/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/drawcia_riscv/led.c b/board/drawcia_riscv/led.c index 5ed8ee4832..3cb7cb835e 100644 --- a/board/drawcia_riscv/led.c +++ b/board/drawcia_riscv/led.c @@ -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. */ diff --git a/board/drawcia_riscv/usb_pd_policy.c b/board/drawcia_riscv/usb_pd_policy.c index 54fa6f6933..8a2c07c575 100644 --- a/board/drawcia_riscv/usb_pd_policy.c +++ b/board/drawcia_riscv/usb_pd_policy.c @@ -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. */ diff --git a/board/driblee/battery.c b/board/driblee/battery.c index cc1661b7e2..d73bc104ac 100644 --- a/board/driblee/battery.c +++ b/board/driblee/battery.c @@ -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. * diff --git a/board/driblee/board.c b/board/driblee/board.c index f5c7e0e3cc..30075e683e 100644 --- a/board/driblee/board.c +++ b/board/driblee/board.c @@ -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. */ @@ -440,12 +440,15 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }, }; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_C0, - .i2c_addr_flags = PI3USB3X532_I2C_ADDR0, - .driver = &pi3usb3x532_usb_mux_driver, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_C0, + .i2c_addr_flags = PI3USB3X532_I2C_ADDR0, + .driver = &pi3usb3x532_usb_mux_driver, + }, }, }; diff --git a/board/driblee/board.h b/board/driblee/board.h index cbc01a428a..f6a3ac9130 100644 --- a/board/driblee/board.h +++ b/board/driblee/board.h @@ -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. */ diff --git a/board/driblee/build.mk b/board/driblee/build.mk index b012d8d502..eb422dae93 100644 --- a/board/driblee/build.mk +++ b/board/driblee/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/driblee/cbi_ssfc.c b/board/driblee/cbi_ssfc.c index 39fd4929a1..81f3ee0dad 100644 --- a/board/driblee/cbi_ssfc.c +++ b/board/driblee/cbi_ssfc.c @@ -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. */ diff --git a/board/driblee/cbi_ssfc.h b/board/driblee/cbi_ssfc.h index 942f0cf5f4..bf8853a43a 100644 --- a/board/driblee/cbi_ssfc.h +++ b/board/driblee/cbi_ssfc.h @@ -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. */ diff --git a/board/driblee/ec.tasklist b/board/driblee/ec.tasklist index 0025c2985b..386e8625b3 100644 --- a/board/driblee/ec.tasklist +++ b/board/driblee/ec.tasklist @@ -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. */ diff --git a/board/driblee/gpio.inc b/board/driblee/gpio.inc index 82ba0d67bc..acd6a33852 100644 --- a/board/driblee/gpio.inc +++ b/board/driblee/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/driblee/led.c b/board/driblee/led.c index 9f417d2c0c..7aa983ea79 100644 --- a/board/driblee/led.c +++ b/board/driblee/led.c @@ -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. * diff --git a/board/driblee/usb_pd_policy.c b/board/driblee/usb_pd_policy.c index 18fada590e..157f4be2cb 100644 --- a/board/driblee/usb_pd_policy.c +++ b/board/driblee/usb_pd_policy.c @@ -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. */ diff --git a/board/drobit/battery.c b/board/drobit/battery.c index f8f3eb296f..0db543a12f 100644 --- a/board/drobit/battery.c +++ b/board/drobit/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/drobit/board.c b/board/drobit/board.c index c04df3e5a5..19b5162092 100644 --- a/board/drobit/board.c +++ b/board/drobit/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -363,33 +363,43 @@ BUILD_ASSERT(CONFIG_USB_PD_PORT_MAX_COUNT == USBC_PORT_COUNT); /******************************************************************************/ /* USBC mux configuration - Tiger Lake includes internal mux */ -struct usb_mux usbc0_tcss_usb_mux = { - .usb_port = USBC_PORT_C0, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +struct usb_mux_chain usbc0_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C0, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; -struct usb_mux usbc1_tcss_usb_mux = { - .usb_port = USBC_PORT_C1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +struct usb_mux_chain usbc1_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; -struct usb_mux usb_muxes[] = { +struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .next_mux = &usbc0_tcss_usb_mux, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_1_MIX, - .i2c_addr_flags = USBC_PORT_C0_BB_RETIMER_I2C_ADDR, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_1_MIX, + .i2c_addr_flags = USBC_PORT_C0_BB_RETIMER_I2C_ADDR, + }, + .next = &usbc0_tcss_usb_mux, }, [USBC_PORT_C1] = { - .usb_port = USBC_PORT_C1, - .next_mux = &usbc1_tcss_usb_mux, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_1_MIX, - .i2c_addr_flags = USBC_PORT_C1_BB_RETIMER_I2C_ADDR, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C1, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_1_MIX, + .i2c_addr_flags = USBC_PORT_C1_BB_RETIMER_I2C_ADDR, + }, + .next = &usbc1_tcss_usb_mux, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/board/drobit/board.h b/board/drobit/board.h index 9c7982f294..d6fda98f3d 100644 --- a/board/drobit/board.h +++ b/board/drobit/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/drobit/build.mk b/board/drobit/build.mk index 43b40c644c..d590255d2a 100644 --- a/board/drobit/build.mk +++ b/board/drobit/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/drobit/ec.tasklist b/board/drobit/ec.tasklist index c1b0295d37..a1b5d30d93 100644 --- a/board/drobit/ec.tasklist +++ b/board/drobit/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/drobit/gpio.inc b/board/drobit/gpio.inc index 6bacab4474..2057cfd27a 100644 --- a/board/drobit/gpio.inc +++ b/board/drobit/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -16,7 +16,7 @@ GPIO_INT(ACOK_OD, PIN(0, 0), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, ex /* Power sequencing interrupts */ GPIO_INT(SLP_S0_L, PIN(D, 5), GPIO_INT_BOTH, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 GPIO_INT(SLP_S3_L, PIN(A, 5), GPIO_INT_BOTH, power_signal_interrupt) #endif GPIO_INT(SLP_SUS_L, PIN(D, 7), GPIO_INT_BOTH, power_signal_interrupt) diff --git a/board/drobit/led.c b/board/drobit/led.c index 5aae69adee..bb712a8fe0 100644 --- a/board/drobit/led.c +++ b/board/drobit/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/eldrid/battery.c b/board/eldrid/battery.c index e988373672..6f9e6df5af 100644 --- a/board/eldrid/battery.c +++ b/board/eldrid/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/eldrid/board.c b/board/eldrid/board.c index 25ec4ea376..717878bc95 100644 --- a/board/eldrid/board.c +++ b/board/eldrid/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -325,24 +325,33 @@ static const struct tcpc_config_t tcpc_config_p1_usb3 = { * virtual_usb_mux_driver so the AP gets notified of mux changes and updates * the TCSS configuration on state changes. */ -static const struct usb_mux usbc1_usb3_db_retimer = { - .usb_port = USBC_PORT_C1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, - .next_mux = NULL, +static const struct usb_mux_chain usbc1_usb3_db_retimer = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, + .next = NULL, }; -static const struct usb_mux mux_config_p1_usb3_active = { - .usb_port = USBC_PORT_C1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, - .next_mux = &usbc1_usb3_db_retimer, +static const struct usb_mux_chain mux_config_p1_usb3_active = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, + .next = &usbc1_usb3_db_retimer, }; -static const struct usb_mux mux_config_p1_usb3_passive = { - .usb_port = USBC_PORT_C1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +static const struct usb_mux_chain mux_config_p1_usb3_passive = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; /******************************************************************************/ @@ -551,16 +560,20 @@ BUILD_ASSERT(CONFIG_USB_PD_PORT_MAX_COUNT == USBC_PORT_COUNT); /******************************************************************************/ /* USBC mux configuration - Tiger Lake includes internal mux */ -struct usb_mux usb_muxes[] = { +struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }, [USBC_PORT_C1] = { - .usb_port = USBC_PORT_C1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C1, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/board/eldrid/board.h b/board/eldrid/board.h index 4deae609d5..1bbe183425 100644 --- a/board/eldrid/board.h +++ b/board/eldrid/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/eldrid/build.mk b/board/eldrid/build.mk index 868a463932..91041efa43 100644 --- a/board/eldrid/build.mk +++ b/board/eldrid/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/eldrid/ec.tasklist b/board/eldrid/ec.tasklist index 3e20d8ae39..c29125d517 100644 --- a/board/eldrid/ec.tasklist +++ b/board/eldrid/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/eldrid/gpio.inc b/board/eldrid/gpio.inc index 9d5b374c40..08d754b366 100644 --- a/board/eldrid/gpio.inc +++ b/board/eldrid/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -16,7 +16,7 @@ GPIO_INT(ACOK_OD, PIN(0, 0), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, ex /* Power sequencing interrupts */ GPIO_INT(SLP_S0_L, PIN(D, 5), GPIO_INT_BOTH, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 GPIO_INT(SLP_S3_L, PIN(A, 5), GPIO_INT_BOTH, power_signal_interrupt) #endif GPIO_INT(SLP_SUS_L, PIN(D, 7), GPIO_INT_BOTH, power_signal_interrupt) diff --git a/board/eldrid/led.c b/board/eldrid/led.c index 8c9166175e..797b6d4bda 100644 --- a/board/eldrid/led.c +++ b/board/eldrid/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/eldrid/sensors.c b/board/eldrid/sensors.c index 986606fe6b..538cacb985 100644 --- a/board/eldrid/sensors.c +++ b/board/eldrid/sensors.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/eldrid/thermal.c b/board/eldrid/thermal.c index e78cf7dd47..5ce7b362fc 100644 --- a/board/eldrid/thermal.c +++ b/board/eldrid/thermal.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/elemi/battery.c b/board/elemi/battery.c index 602176b718..f24c4c6847 100644 --- a/board/elemi/battery.c +++ b/board/elemi/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/elemi/board.c b/board/elemi/board.c index e5a4012ec1..6b166e1206 100644 --- a/board/elemi/board.c +++ b/board/elemi/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -258,11 +258,14 @@ __override void board_ps8xxx_tcpc_init(int port) * virtual_usb_mux_driver so the AP gets notified of mux changes and updates * the TCSS configuration on state changes. */ -static const struct usb_mux usbc1_usb3_db_retimer = { - .usb_port = USBC_PORT_C1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, - .next_mux = NULL, +static const struct usb_mux_chain usbc1_usb3_db_retimer = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, + .next = NULL, }; /******************************************************************************/ @@ -390,17 +393,21 @@ BUILD_ASSERT(CONFIG_USB_PD_PORT_MAX_COUNT == USBC_PORT_COUNT); /******************************************************************************/ /* USBC mux configuration - Tiger Lake includes internal mux */ -const struct usb_mux usb_muxes[] = { +const struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }, [USBC_PORT_C1] = { - .usb_port = USBC_PORT_C1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, - .next_mux = &usbc1_usb3_db_retimer, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C1, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, + .next = &usbc1_usb3_db_retimer, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/board/elemi/board.h b/board/elemi/board.h index 3699c52fb3..aa6756d0ce 100644 --- a/board/elemi/board.h +++ b/board/elemi/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/elemi/build.mk b/board/elemi/build.mk index 43b40c644c..d590255d2a 100644 --- a/board/elemi/build.mk +++ b/board/elemi/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/elemi/ec.tasklist b/board/elemi/ec.tasklist index c1b0295d37..a1b5d30d93 100644 --- a/board/elemi/ec.tasklist +++ b/board/elemi/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/elemi/gpio.inc b/board/elemi/gpio.inc index 9886497e24..3dbf9b35c7 100644 --- a/board/elemi/gpio.inc +++ b/board/elemi/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -16,7 +16,7 @@ GPIO_INT(ACOK_OD, PIN(0, 0), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, ex /* Power sequencing interrupts */ GPIO_INT(SLP_S0_L, PIN(D, 5), GPIO_INT_BOTH, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 GPIO_INT(SLP_S3_L, PIN(A, 5), GPIO_INT_BOTH, power_signal_interrupt) #endif GPIO_INT(SLP_SUS_L, PIN(D, 7), GPIO_INT_BOTH, power_signal_interrupt) diff --git a/board/elemi/led.c b/board/elemi/led.c index 2c2bca50c3..8deb12474a 100644 --- a/board/elemi/led.c +++ b/board/elemi/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/elm/battery.c b/board/elm/battery.c index 787f654439..9ef59414a2 100644 --- a/board/elm/battery.c +++ b/board/elm/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/elm/board.c b/board/elm/board.c index e01476e16c..4007d34379 100644 --- a/board/elm/board.c +++ b/board/elm/board.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -168,10 +168,13 @@ const struct temp_sensor_t temp_sensors[] = { }; BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT); -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .driver = &anx7688_usb_mux_driver, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .driver = &anx7688_usb_mux_driver, + }, }, }; diff --git a/board/elm/board.h b/board/elm/board.h index f7ff1e0aa2..10cb6bb75d 100644 --- a/board/elm/board.h +++ b/board/elm/board.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/elm/build.mk b/board/elm/build.mk index 172a88e843..4d6ba76cae 100644 --- a/board/elm/build.mk +++ b/board/elm/build.mk @@ -1,5 +1,5 @@ #-*- makefile -*- -# Copyright 2016 The Chromium OS Authors. All rights reserved. +# Copyright 2016 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/elm/ec.tasklist b/board/elm/ec.tasklist index 3ea68bf9f8..be745f7487 100644 --- a/board/elm/ec.tasklist +++ b/board/elm/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/elm/gpio.inc b/board/elm/gpio.inc index 0dc89269ba..ef77ad732e 100644 --- a/board/elm/gpio.inc +++ b/board/elm/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2016 The Chromium OS Authors. All rights reserved. + * Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/elm/led.c b/board/elm/led.c index 8d7d83ffaa..29140ce237 100644 --- a/board/elm/led.c +++ b/board/elm/led.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/elm/usb_pd_policy.c b/board/elm/usb_pd_policy.c index 8165caeb4e..0ba277f71d 100644 --- a/board/elm/usb_pd_policy.c +++ b/board/elm/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/endeavour/board.c b/board/endeavour/board.c index 973126c569..0d5e633ea0 100644 --- a/board/endeavour/board.c +++ b/board/endeavour/board.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/endeavour/board.h b/board/endeavour/board.h index b7d50e3fef..9c0836b0e3 100644 --- a/board/endeavour/board.h +++ b/board/endeavour/board.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -59,8 +59,8 @@ #define CONFIG_CHIPSET_HAS_PRE_INIT_CALLBACK #define CONFIG_CHIPSET_RESET_HOOK #define CONFIG_HOST_INTERFACE_ESPI -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S3 -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#define CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 +#define CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 #define GPIO_PG_EC_RSMRST_ODL GPIO_RSMRST_L_PGOOD #define CONFIG_EXTPOWER_GPIO diff --git a/board/endeavour/build.mk b/board/endeavour/build.mk index 20f3f4d02c..2b19f6b43d 100644 --- a/board/endeavour/build.mk +++ b/board/endeavour/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/endeavour/ec.tasklist b/board/endeavour/ec.tasklist index ef58c6267a..9a4435f43e 100644 --- a/board/endeavour/ec.tasklist +++ b/board/endeavour/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/endeavour/gpio.inc b/board/endeavour/gpio.inc index 85904aab0c..e67f88347a 100644 --- a/board/endeavour/gpio.inc +++ b/board/endeavour/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/endeavour/led.c b/board/endeavour/led.c index 312d43921f..91bd6a3410 100644 --- a/board/endeavour/led.c +++ b/board/endeavour/led.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/endeavour/pse.c b/board/endeavour/pse.c index afcb0e07dd..bda7e1994d 100644 --- a/board/endeavour/pse.c +++ b/board/endeavour/pse.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/eve/battery.c b/board/eve/battery.c index 40b211440d..d1ce1fd74a 100644 --- a/board/eve/battery.c +++ b/board/eve/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/eve/board.c b/board/eve/board.c index 009beda658..9b7395b039 100644 --- a/board/eve/board.c +++ b/board/eve/board.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -240,16 +240,22 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }, }; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .driver = &anx74xx_tcpm_usb_mux_driver, - .hpd_update = &anx74xx_tcpc_update_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .driver = &anx74xx_tcpm_usb_mux_driver, + .hpd_update = &anx74xx_tcpc_update_hpd_status, + }, }, { - .usb_port = 1, - .driver = &anx74xx_tcpm_usb_mux_driver, - .hpd_update = &anx74xx_tcpc_update_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .driver = &anx74xx_tcpm_usb_mux_driver, + .hpd_update = &anx74xx_tcpc_update_hpd_status, + }, }, }; diff --git a/board/eve/board.h b/board/eve/board.h index 70f105beae..defc3e746e 100644 --- a/board/eve/board.h +++ b/board/eve/board.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -73,8 +73,8 @@ #define CONFIG_CHIPSET_HAS_PLATFORM_PMIC_RESET #define CONFIG_CHIPSET_RESET_HOOK #define CONFIG_HOST_INTERFACE_ESPI -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S3 -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#define CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 +#define CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 #define GPIO_PG_EC_RSMRST_ODL GPIO_RSMRST_L_PGOOD #define CONFIG_KEYBOARD_COL2_INVERTED diff --git a/board/eve/build.mk b/board/eve/build.mk index f47b5d9caf..0913dd9370 100644 --- a/board/eve/build.mk +++ b/board/eve/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2016 The Chromium OS Authors. All rights reserved. +# Copyright 2016 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/eve/ec.tasklist b/board/eve/ec.tasklist index 99de365243..75e5f918c5 100644 --- a/board/eve/ec.tasklist +++ b/board/eve/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/eve/gpio.inc b/board/eve/gpio.inc index f9b0c3cfc4..6bf357f0c3 100644 --- a/board/eve/gpio.inc +++ b/board/eve/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2016 The Chromium OS Authors. All rights reserved. + * Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/eve/led.c b/board/eve/led.c index c7334efcab..9fe3becabd 100644 --- a/board/eve/led.c +++ b/board/eve/led.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/eve/usb_pd_policy.c b/board/eve/usb_pd_policy.c index 2a47a73074..729cdfa018 100644 --- a/board/eve/usb_pd_policy.c +++ b/board/eve/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/ezkinil/battery.c b/board/ezkinil/battery.c index 8c5ec9e1d7..1260b428ae 100644 --- a/board/ezkinil/battery.c +++ b/board/ezkinil/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/ezkinil/board.c b/board/ezkinil/board.c index f51ae73c36..c9e1aca267 100644 --- a/board/ezkinil/board.c +++ b/board/ezkinil/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -339,9 +339,12 @@ const struct usb_mux_driver usbc0_sbu_mux_driver = { * Since FSUSB42UMX is not a i2c device, .i2c_port and * .i2c_addr_flags are not required here. */ -const struct usb_mux usbc0_sbu_mux = { - .usb_port = USBC_PORT_C0, - .driver = &usbc0_sbu_mux_driver, +const struct usb_mux_chain usbc0_sbu_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C0, + .driver = &usbc0_sbu_mux_driver, + }, }; /***************************************************************************** @@ -386,6 +389,9 @@ void motion_interrupt(enum gpio_signal signal) * USB-C MUX/Retimer dynamic configuration */ +/* Place holder for second mux in USBC1 chain */ +struct usb_mux_chain usbc1_mux1; + int board_usbc1_retimer_inhpd = IOEX_USB_C1_HPD_IN_DB; static void setup_mux(void) @@ -403,10 +409,9 @@ static void setup_mux(void) * Replace usb_muxes[USBC_PORT_C1] with the AMD FP5 * table entry. */ - memcpy(&usb_muxes[USBC_PORT_C1], &usbc1_amd_fp5_usb_mux, - sizeof(struct usb_mux)); + usb_muxes[USBC_PORT_C1].mux = &usbc1_amd_fp5_usb_mux; /* Set the PS8818 as the secondary MUX */ - usb_muxes[USBC_PORT_C1].next_mux = &usbc1_ps8818; + usbc1_mux1.mux = &usbc1_ps8818; } else if (mux == SSFC_C1_MUX_TUSB544) { ccprints("C1 TUSB544 detected"); /* @@ -415,10 +420,9 @@ static void setup_mux(void) * Replace usb_muxes[USBC_PORT_C1] with the AMD FP5 * table entry. */ - memcpy(&usb_muxes[USBC_PORT_C1], &usbc1_amd_fp5_usb_mux, - sizeof(struct usb_mux)); + usb_muxes[USBC_PORT_C1].mux = &usbc1_amd_fp5_usb_mux; /* Set the TUSB544 as the secondary MUX */ - usb_muxes[USBC_PORT_C1].next_mux = &usbc1_tusb544; + usbc1_mux1.mux = &usbc1_tusb544; } else if (ec_config_has_usbc1_retimer_ps8743()) { ccprints("C1 PS8743 detected"); /* @@ -427,25 +431,27 @@ static void setup_mux(void) * Replace usb_muxes[USBC_PORT_C1] with the PS8743 * table entry. */ - memcpy(&usb_muxes[USBC_PORT_C1], &usbc1_ps8743, - sizeof(struct usb_mux)); + usb_muxes[USBC_PORT_C1].mux = &usbc1_ps8743; /* Set the AMD FP5 as the secondary MUX */ - usb_muxes[USBC_PORT_C1].next_mux = &usbc1_amd_fp5_usb_mux; + usbc1_mux1.mux = &usbc1_amd_fp5_usb_mux; /* Don't have the AMD FP5 flip */ usbc1_amd_fp5_usb_mux.flags = USB_MUX_FLAG_SET_WITHOUT_FLIP; } } -struct usb_mux usb_muxes[] = { +struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .i2c_port = I2C_PORT_USB_AP_MUX, - .i2c_addr_flags = AMD_FP5_MUX_I2C_ADDR_FLAGS, - .driver = &amd_fp5_usb_mux_driver, - .next_mux = &usbc0_sbu_mux, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .i2c_port = I2C_PORT_USB_AP_MUX, + .i2c_addr_flags = AMD_FP5_MUX_I2C_ADDR_FLAGS, + .driver = &amd_fp5_usb_mux_driver, + }, + .next = &usbc0_sbu_mux, }, [USBC_PORT_C1] = { /* Filled in dynamically at startup */ + .next = &usbc1_mux1, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/board/ezkinil/board.h b/board/ezkinil/board.h index 9c784e3397..aa1fe065f4 100644 --- a/board/ezkinil/board.h +++ b/board/ezkinil/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/ezkinil/build.mk b/board/ezkinil/build.mk index 1c0cbc4f63..45c71f962c 100644 --- a/board/ezkinil/build.mk +++ b/board/ezkinil/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/ezkinil/ec.tasklist b/board/ezkinil/ec.tasklist index d9c1606eb2..abc796f74f 100644 --- a/board/ezkinil/ec.tasklist +++ b/board/ezkinil/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/ezkinil/gpio.inc b/board/ezkinil/gpio.inc index 8e75ec9975..4ea6712424 100644 --- a/board/ezkinil/gpio.inc +++ b/board/ezkinil/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/ezkinil/led.c b/board/ezkinil/led.c index b16e09bd44..328b47a9e4 100644 --- a/board/ezkinil/led.c +++ b/board/ezkinil/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/felwinter/battery.c b/board/felwinter/battery.c index 08c129d118..257d7e8255 100644 --- a/board/felwinter/battery.c +++ b/board/felwinter/battery.c @@ -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. * diff --git a/board/felwinter/board.c b/board/felwinter/board.c index 461b629374..556ea2475e 100644 --- a/board/felwinter/board.c +++ b/board/felwinter/board.c @@ -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. */ diff --git a/board/felwinter/board.h b/board/felwinter/board.h index 8cd431fb99..17e1cf9246 100644 --- a/board/felwinter/board.h +++ b/board/felwinter/board.h @@ -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. */ diff --git a/board/felwinter/build.mk b/board/felwinter/build.mk index 5a0a20b5e6..848c76f457 100644 --- a/board/felwinter/build.mk +++ b/board/felwinter/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/felwinter/charger_isl9241.c b/board/felwinter/charger_isl9241.c index 65d2860e35..dd2535ea7c 100644 --- a/board/felwinter/charger_isl9241.c +++ b/board/felwinter/charger_isl9241.c @@ -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. */ diff --git a/board/felwinter/ec.tasklist b/board/felwinter/ec.tasklist index 6d995d6b44..29fd0bf4cb 100644 --- a/board/felwinter/ec.tasklist +++ b/board/felwinter/ec.tasklist @@ -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. */ diff --git a/board/felwinter/fans.c b/board/felwinter/fans.c index dad20e180d..5f68df09ff 100644 --- a/board/felwinter/fans.c +++ b/board/felwinter/fans.c @@ -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. */ diff --git a/board/felwinter/fw_config.c b/board/felwinter/fw_config.c index 7db3b24f74..0a4905bc9d 100644 --- a/board/felwinter/fw_config.c +++ b/board/felwinter/fw_config.c @@ -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. */ diff --git a/board/felwinter/fw_config.h b/board/felwinter/fw_config.h index 10e9b69536..2a8a175efd 100644 --- a/board/felwinter/fw_config.h +++ b/board/felwinter/fw_config.h @@ -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. */ diff --git a/board/felwinter/gpio.inc b/board/felwinter/gpio.inc index 112047c35f..df992a18eb 100644 --- a/board/felwinter/gpio.inc +++ b/board/felwinter/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/felwinter/i2c.c b/board/felwinter/i2c.c index a850c12544..b765ccff98 100644 --- a/board/felwinter/i2c.c +++ b/board/felwinter/i2c.c @@ -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. */ diff --git a/board/felwinter/keyboard.c b/board/felwinter/keyboard.c index e854eb4d3e..cee23af8c3 100644 --- a/board/felwinter/keyboard.c +++ b/board/felwinter/keyboard.c @@ -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. */ diff --git a/board/felwinter/led.c b/board/felwinter/led.c index 8e8f0e03af..2770e7fae8 100644 --- a/board/felwinter/led.c +++ b/board/felwinter/led.c @@ -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. * diff --git a/board/felwinter/pwm.c b/board/felwinter/pwm.c index fea431c4ce..97b5c17a03 100644 --- a/board/felwinter/pwm.c +++ b/board/felwinter/pwm.c @@ -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. */ diff --git a/board/felwinter/sensors.c b/board/felwinter/sensors.c index 6e9e956245..6b62f5f4d2 100644 --- a/board/felwinter/sensors.c +++ b/board/felwinter/sensors.c @@ -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. */ diff --git a/board/felwinter/usbc_config.c b/board/felwinter/usbc_config.c index f303dedf3d..ebe77bf7c7 100644 --- a/board/felwinter/usbc_config.c +++ b/board/felwinter/usbc_config.c @@ -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. */ @@ -99,16 +99,22 @@ struct ppc_config_t ppc_chips_c1 = { }; /* USBC mux configuration - Alder Lake includes internal mux */ -static const struct usb_mux usbc2_tcss_usb_mux = { - .usb_port = USBC_PORT_C2, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +static const struct usb_mux_chain usbc2_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C2, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; -static const struct usb_mux usbc1_tcss_usb_mux = { - .usb_port = USBC_PORT_C1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +static const struct usb_mux_chain usbc1_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; /* @@ -116,44 +122,57 @@ static const struct usb_mux usbc1_tcss_usb_mux = { * to the virtual_usb_mux_driver so the AP gets notified of mux changes * and updates the TCSS configuration on state changes. */ -static const struct usb_mux usbc1_usb3_db_retimer = { - .usb_port = USBC_PORT_C1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, +static const struct usb_mux_chain usbc1_usb3_db_retimer = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, }; -struct usb_mux usb_muxes[] = { +struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C2] = { - .usb_port = USBC_PORT_C2, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C2, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }, [USBC_PORT_C1] = { - /* PS8815 DB */ - .usb_port = USBC_PORT_C1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, - .next_mux = &usbc1_usb3_db_retimer, + .mux = &(const struct usb_mux) { + /* PS8815 DB */ + .usb_port = USBC_PORT_C1, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, + .next = &usbc1_usb3_db_retimer, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); -static const struct usb_mux usb_muxes_c1 = { - .usb_port = USBC_PORT_C1, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_C1_MUX, - .i2c_addr_flags = USBC_PORT_C1_BB_RETIMER_I2C_ADDR, - .next_mux = &usbc1_tcss_usb_mux, +static const struct usb_mux_chain usb_muxes_c1 = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_C1_MUX, + .i2c_addr_flags = USBC_PORT_C1_BB_RETIMER_I2C_ADDR, + }, + .next = &usbc1_tcss_usb_mux, }; -static const struct usb_mux usb_muxes_c2 = { - .usb_port = USBC_PORT_C2, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_C2_MUX, - .i2c_addr_flags = USBC_PORT_C2_BB_RETIMER_I2C_ADDR, - .next_mux = &usbc2_tcss_usb_mux, +static const struct usb_mux_chain usb_muxes_c2 = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C2, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_C2_MUX, + .i2c_addr_flags = USBC_PORT_C2_BB_RETIMER_I2C_ADDR, + }, + .next = &usbc2_tcss_usb_mux, }; /* BC1.2 charger detect configuration */ diff --git a/board/felwinter/usbc_config.h b/board/felwinter/usbc_config.h index 22247e67cc..cab32351f5 100644 --- a/board/felwinter/usbc_config.h +++ b/board/felwinter/usbc_config.h @@ -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. */ diff --git a/board/fennel/battery.c b/board/fennel/battery.c index cfd17a136f..882ff0c5a2 100644 --- a/board/fennel/battery.c +++ b/board/fennel/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/fennel/board.c b/board/fennel/board.c index 279bff059c..563f680dee 100644 --- a/board/fennel/board.c +++ b/board/fennel/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -166,13 +166,16 @@ static void board_hpd_status(const struct usb_mux *me, mux_state_t mux_state, host_set_single_event(EC_HOST_EVENT_USB_MUX); } -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_MUX, - .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, - .driver = &it5205_usb_mux_driver, - .hpd_update = &board_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_MUX, + .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, + .driver = &it5205_usb_mux_driver, + .hpd_update = &board_hpd_status, + }, }, }; diff --git a/board/fennel/board.h b/board/fennel/board.h index ffd67e9f77..6bb90ef0f3 100644 --- a/board/fennel/board.h +++ b/board/fennel/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/fennel/build.mk b/board/fennel/build.mk index a6e1c010d7..f583684804 100644 --- a/board/fennel/build.mk +++ b/board/fennel/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/fennel/ec.tasklist b/board/fennel/ec.tasklist index c1330b86f8..fb131b8eb4 100644 --- a/board/fennel/ec.tasklist +++ b/board/fennel/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/fennel/gpio.inc b/board/fennel/gpio.inc index 29518fbc4e..5ebecfac53 100644 --- a/board/fennel/gpio.inc +++ b/board/fennel/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/fennel/led.c b/board/fennel/led.c index b6b906a070..e6badd92bc 100644 --- a/board/fennel/led.c +++ b/board/fennel/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/fizz/board.c b/board/fizz/board.c index 446afe0d84..f58083c6ed 100644 --- a/board/fizz/board.c +++ b/board/fizz/board.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -212,11 +212,14 @@ static int ps8751_tune_mux(const struct usb_mux *me) return EC_SUCCESS; } -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, - .board_init = &ps8751_tune_mux, +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .board_init = &ps8751_tune_mux, + }, } }; const int usb_port_enable[USB_PORT_COUNT] = { diff --git a/board/fizz/board.h b/board/fizz/board.h index a40b7d04b2..a1499f6105 100644 --- a/board/fizz/board.h +++ b/board/fizz/board.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -71,8 +71,8 @@ #define CONFIG_CHIPSET_HAS_PRE_INIT_CALLBACK #define CONFIG_CHIPSET_RESET_HOOK #define CONFIG_HOST_INTERFACE_ESPI -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S3 -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#define CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 +#define CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 #define GPIO_PG_EC_RSMRST_ODL GPIO_RSMRST_L_PGOOD /* Charger */ diff --git a/board/fizz/build.mk b/board/fizz/build.mk index febbb7fac2..b07b1b4cf3 100644 --- a/board/fizz/build.mk +++ b/board/fizz/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2017 The Chromium OS Authors. All rights reserved. +# Copyright 2017 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/fizz/ec.tasklist b/board/fizz/ec.tasklist index 75a09a43df..6212516e6a 100644 --- a/board/fizz/ec.tasklist +++ b/board/fizz/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/fizz/gpio.inc b/board/fizz/gpio.inc index 7da0bfce71..2eee02bfd3 100644 --- a/board/fizz/gpio.inc +++ b/board/fizz/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2017 The Chromium OS Authors. All rights reserved. + * Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -13,10 +13,10 @@ GPIO_INT(AC_PRESENT, PIN(C, 1), GPIO_INT_BOTH, extpower_interrupt) GPIO_INT(POWER_BUTTON_L, PIN(0, 4), GPIO_INT_BOTH | GPIO_PULL_UP, power_button_interrupt) /* MECH_PWR_BTN_ODL */ GPIO_INT(PCH_SLP_S0_L, PIN(7, 5), GPIO_INT_BOTH, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 GPIO_INT(PCH_SLP_S3_L, PIN(7, 3), GPIO_INT_BOTH, power_signal_interrupt) #endif -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 GPIO_INT(PCH_SLP_S4_L, PIN(8, 6), GPIO_INT_BOTH, power_signal_interrupt) #endif GPIO_INT(PCH_SLP_SUS_L, PIN(6, 2), GPIO_INT_BOTH, power_signal_interrupt) diff --git a/board/fizz/led.c b/board/fizz/led.c index 6607ef299c..acd0eb5918 100644 --- a/board/fizz/led.c +++ b/board/fizz/led.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/fizz/usb_pd_pdo.c b/board/fizz/usb_pd_pdo.c index b117ac6c7a..edcc43f15a 100644 --- a/board/fizz/usb_pd_pdo.c +++ b/board/fizz/usb_pd_pdo.c @@ -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. */ diff --git a/board/fizz/usb_pd_pdo.h b/board/fizz/usb_pd_pdo.h index de4f8f9474..97ee437a3f 100644 --- a/board/fizz/usb_pd_pdo.h +++ b/board/fizz/usb_pd_pdo.h @@ -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. */ diff --git a/board/fizz/usb_pd_policy.c b/board/fizz/usb_pd_policy.c index ad6fac133f..b3b1ee5971 100644 --- a/board/fizz/usb_pd_policy.c +++ b/board/fizz/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/fleex/battery.c b/board/fleex/battery.c index 57a5246052..e5efb19920 100644 --- a/board/fleex/battery.c +++ b/board/fleex/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/fleex/board.c b/board/fleex/board.c index 605d6c6182..063222fbe3 100644 --- a/board/fleex/board.c +++ b/board/fleex/board.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/fleex/board.h b/board/fleex/board.h index a579924af7..3095fad271 100644 --- a/board/fleex/board.h +++ b/board/fleex/board.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/fleex/build.mk b/board/fleex/build.mk index 7e806f4667..0eab0adc21 100644 --- a/board/fleex/build.mk +++ b/board/fleex/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2018 The Chromium OS Authors. All rights reserved. +# Copyright 2018 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/fleex/ec.tasklist b/board/fleex/ec.tasklist index d98db145e7..977b8b01be 100644 --- a/board/fleex/ec.tasklist +++ b/board/fleex/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/fleex/gpio.inc b/board/fleex/gpio.inc index efedd6989b..0b74f8fa76 100644 --- a/board/fleex/gpio.inc +++ b/board/fleex/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2018 The Chromium OS Authors. All rights reserved. + * Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/fleex/led.c b/board/fleex/led.c index dc67160013..4ba3c18457 100644 --- a/board/fleex/led.c +++ b/board/fleex/led.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/fleex/usb_pd_policy.c b/board/fleex/usb_pd_policy.c index 82922f9a4d..bfcf4484e4 100644 --- a/board/fleex/usb_pd_policy.c +++ b/board/fleex/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/fluffy/board.c b/board/fluffy/board.c index 8765e32bd6..fb9e1eb1e3 100644 --- a/board/fluffy/board.c +++ b/board/fluffy/board.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/fluffy/board.h b/board/fluffy/board.h index 76faf9f7c5..1309c41901 100644 --- a/board/fluffy/board.h +++ b/board/fluffy/board.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/fluffy/build.mk b/board/fluffy/build.mk index 63010ac889..82aa7522d0 100644 --- a/board/fluffy/build.mk +++ b/board/fluffy/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/fluffy/ec.tasklist b/board/fluffy/ec.tasklist index c732944a23..9c45739414 100644 --- a/board/fluffy/ec.tasklist +++ b/board/fluffy/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/fluffy/gpio.inc b/board/fluffy/gpio.inc index 4c802554f9..532422ae5b 100644 --- a/board/fluffy/gpio.inc +++ b/board/fluffy/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/foob/battery.c b/board/foob/battery.c index 01a6654920..fe5692eec2 100644 --- a/board/foob/battery.c +++ b/board/foob/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/foob/board.c b/board/foob/board.c index 31299597e1..c9bf0934ad 100644 --- a/board/foob/board.c +++ b/board/foob/board.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/foob/board.h b/board/foob/board.h index e3e1ec602e..f6d0f20607 100644 --- a/board/foob/board.h +++ b/board/foob/board.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/foob/build.mk b/board/foob/build.mk index 137e208b53..fee77e38b5 100644 --- a/board/foob/build.mk +++ b/board/foob/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/foob/ec.tasklist b/board/foob/ec.tasklist index 6eac78a042..6c56976091 100644 --- a/board/foob/ec.tasklist +++ b/board/foob/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/foob/gpio.inc b/board/foob/gpio.inc index ad6773a211..3a553f6e91 100644 --- a/board/foob/gpio.inc +++ b/board/foob/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/foob/led.c b/board/foob/led.c index fa5287a7aa..b8cdc4c252 100644 --- a/board/foob/led.c +++ b/board/foob/led.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/fusb307bgevb/board.c b/board/fusb307bgevb/board.c index 3e8771a63b..6835c1b942 100644 --- a/board/fusb307bgevb/board.c +++ b/board/fusb307bgevb/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/fusb307bgevb/board.h b/board/fusb307bgevb/board.h index 762ba5bed0..5e45b346b7 100644 --- a/board/fusb307bgevb/board.h +++ b/board/fusb307bgevb/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/fusb307bgevb/build.mk b/board/fusb307bgevb/build.mk index 1372562107..923b144165 100644 --- a/board/fusb307bgevb/build.mk +++ b/board/fusb307bgevb/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/fusb307bgevb/ec.tasklist b/board/fusb307bgevb/ec.tasklist index e25b8f7a68..bca2d075be 100644 --- a/board/fusb307bgevb/ec.tasklist +++ b/board/fusb307bgevb/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/fusb307bgevb/gpio.inc b/board/fusb307bgevb/gpio.inc index 16a845576d..ba3b84fb08 100644 --- a/board/fusb307bgevb/gpio.inc +++ b/board/fusb307bgevb/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/fusb307bgevb/lcd.c b/board/fusb307bgevb/lcd.c index 268801146b..f907de7462 100644 --- a/board/fusb307bgevb/lcd.c +++ b/board/fusb307bgevb/lcd.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/fusb307bgevb/lcd.h b/board/fusb307bgevb/lcd.h index f25e6852e6..9ed773d92f 100644 --- a/board/fusb307bgevb/lcd.h +++ b/board/fusb307bgevb/lcd.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/gaelin/board.c b/board/gaelin/board.c index dff60f4986..3409aa750f 100644 --- a/board/gaelin/board.c +++ b/board/gaelin/board.c @@ -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. */ diff --git a/board/gaelin/board.h b/board/gaelin/board.h index bb339a080e..f113c6cffd 100644 --- a/board/gaelin/board.h +++ b/board/gaelin/board.h @@ -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. */ diff --git a/board/gaelin/build.mk b/board/gaelin/build.mk index 9c668e0e2a..3de758d1bd 100644 --- a/board/gaelin/build.mk +++ b/board/gaelin/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/gaelin/ec.tasklist b/board/gaelin/ec.tasklist index 0688607266..d16fc35f52 100644 --- a/board/gaelin/ec.tasklist +++ b/board/gaelin/ec.tasklist @@ -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. */ diff --git a/board/gaelin/fans.c b/board/gaelin/fans.c index 62492fe063..6828438a10 100644 --- a/board/gaelin/fans.c +++ b/board/gaelin/fans.c @@ -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. */ diff --git a/board/gaelin/fw_config.c b/board/gaelin/fw_config.c index 5b987f7ebc..3ee71e6a0f 100644 --- a/board/gaelin/fw_config.c +++ b/board/gaelin/fw_config.c @@ -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. */ diff --git a/board/gaelin/fw_config.h b/board/gaelin/fw_config.h index ff1f3583fe..95d81f1e05 100644 --- a/board/gaelin/fw_config.h +++ b/board/gaelin/fw_config.h @@ -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. */ diff --git a/board/gaelin/gpio.inc b/board/gaelin/gpio.inc index 617463b7f6..51cf0010c6 100644 --- a/board/gaelin/gpio.inc +++ b/board/gaelin/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/gaelin/i2c.c b/board/gaelin/i2c.c index 9c92852461..0a0b6b69a6 100644 --- a/board/gaelin/i2c.c +++ b/board/gaelin/i2c.c @@ -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. */ diff --git a/board/gaelin/led.c b/board/gaelin/led.c index 386e7e6137..842cee0530 100644 --- a/board/gaelin/led.c +++ b/board/gaelin/led.c @@ -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. * diff --git a/board/gaelin/pwm.c b/board/gaelin/pwm.c index 6d66ad7c31..3d4335f453 100644 --- a/board/gaelin/pwm.c +++ b/board/gaelin/pwm.c @@ -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. */ diff --git a/board/gaelin/sensors.c b/board/gaelin/sensors.c index 0f91d47f3b..162140d37d 100644 --- a/board/gaelin/sensors.c +++ b/board/gaelin/sensors.c @@ -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. */ diff --git a/board/gaelin/usbc_config.c b/board/gaelin/usbc_config.c index 020a4696a5..806ff2c4ee 100644 --- a/board/gaelin/usbc_config.c +++ b/board/gaelin/usbc_config.c @@ -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. */ @@ -91,20 +91,29 @@ BUILD_ASSERT(ARRAY_SIZE(ppc_chips) == USBC_PORT_COUNT); unsigned int ppc_cnt = ARRAY_SIZE(ppc_chips); /* USBC mux configuration - Alder Lake includes internal mux */ -static const struct usb_mux usbc0_tcss_usb_mux = { - .usb_port = USBC_PORT_C0, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +static const struct usb_mux_chain usbc0_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C0, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; -static const struct usb_mux usbc1_tcss_usb_mux = { - .usb_port = USBC_PORT_C1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +static const struct usb_mux_chain usbc1_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; -static const struct usb_mux usbc2_tcss_usb_mux = { - .usb_port = USBC_PORT_C2, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +static const struct usb_mux_chain usbc2_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C2, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; struct kb800x_control_t kb800x_control[] = { @@ -124,29 +133,35 @@ struct kb800x_control_t kb800x_control[] = { }; BUILD_ASSERT(ARRAY_SIZE(kb800x_control) == USBC_PORT_COUNT); -const struct usb_mux usb_muxes[] = { +const struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_C0_C2_MUX, - .i2c_addr_flags = USBC_PORT_C0_BB_RETIMER_I2C_ADDR, - .next_mux = &usbc0_tcss_usb_mux, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_C0_C2_MUX, + .i2c_addr_flags = USBC_PORT_C0_BB_RETIMER_I2C_ADDR, + }, + .next = &usbc0_tcss_usb_mux, }, [USBC_PORT_C1] = { - .usb_port = USBC_PORT_C1, - .driver = &kb800x_usb_mux_driver, - .i2c_port = I2C_PORT_USB_C1_MUX, - .i2c_addr_flags = KB800X_I2C_ADDR0_FLAGS, - .next_mux = &usbc1_tcss_usb_mux, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C1, + .driver = &kb800x_usb_mux_driver, + .i2c_port = I2C_PORT_USB_C1_MUX, + .i2c_addr_flags = KB800X_I2C_ADDR0_FLAGS, + }, + .next = &usbc1_tcss_usb_mux, }, [USBC_PORT_C2] = { - .usb_port = USBC_PORT_C2, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_C0_C2_MUX, - .i2c_addr_flags = USBC_PORT_C2_BB_RETIMER_I2C_ADDR, - .next_mux = &usbc2_tcss_usb_mux, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C2, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_C0_C2_MUX, + .i2c_addr_flags = USBC_PORT_C2_BB_RETIMER_I2C_ADDR, + }, + .next = &usbc2_tcss_usb_mux, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/board/gaelin/usbc_config.h b/board/gaelin/usbc_config.h index e9d77e6683..5e7beae21a 100644 --- a/board/gaelin/usbc_config.h +++ b/board/gaelin/usbc_config.h @@ -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. */ diff --git a/board/galtic/battery.c b/board/galtic/battery.c index df23027815..10fc273303 100644 --- a/board/galtic/battery.c +++ b/board/galtic/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/galtic/board.c b/board/galtic/board.c index df339f7313..af0638be20 100644 --- a/board/galtic/board.c +++ b/board/galtic/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -322,20 +322,31 @@ const struct usb_mux usbc1_virtual_mux_ps8743 = { .hpd_update = &virtual_hpd_update, }; +struct usb_mux usbc1_mux0_data = { + .usb_port = 1, + .i2c_port = I2C_PORT_SUB_USB_C1, + .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, + .driver = &it5205_usb_mux_driver, +}; + +struct usb_mux_chain usbc1_mux1 = { + .mux = &usbc1_retimer, +}; + /* USB Muxes */ -struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_C0, - .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, - .driver = &it5205_usb_mux_driver, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_C0, + .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, + .driver = &it5205_usb_mux_driver, + }, }, { - .usb_port = 1, - .i2c_port = I2C_PORT_SUB_USB_C1, - .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, - .driver = &it5205_usb_mux_driver, - .next_mux = &usbc1_retimer, + .mux = &usbc1_mux0_data, + .next = &usbc1_mux1, }, }; @@ -423,10 +434,10 @@ DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT); void setup_mux_config(void) { if (get_cbi_ssfc_mux_redriver() == SSFC_MUX_PS8743) { - usb_muxes[1].i2c_addr_flags = PS8743_I2C_ADDR1_FLAG; - usb_muxes[1].driver = &ps8743_usb_mux_driver; - usb_muxes[1].next_mux = &usbc1_virtual_mux_ps8743; - usb_muxes[1].board_set = &board_ps8743_mux_set; + usbc1_mux0_data.i2c_addr_flags = PS8743_I2C_ADDR1_FLAG; + usbc1_mux0_data.driver = &ps8743_usb_mux_driver; + usbc1_mux1.mux = &usbc1_virtual_mux_ps8743; + usbc1_mux0_data.board_set = &board_ps8743_mux_set; } } DECLARE_HOOK(HOOK_INIT, setup_mux_config, HOOK_PRIO_INIT_I2C + 2); diff --git a/board/galtic/board.h b/board/galtic/board.h index 3a0abcec79..cfed23b359 100644 --- a/board/galtic/board.h +++ b/board/galtic/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/galtic/build.mk b/board/galtic/build.mk index 806168ea0d..9b862c7624 100644 --- a/board/galtic/build.mk +++ b/board/galtic/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/galtic/cbi_ssfc.c b/board/galtic/cbi_ssfc.c index 74deb858a0..7a7ed9f7cf 100644 --- a/board/galtic/cbi_ssfc.c +++ b/board/galtic/cbi_ssfc.c @@ -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. */ diff --git a/board/galtic/cbi_ssfc.h b/board/galtic/cbi_ssfc.h index bcfddbca72..84f321977e 100644 --- a/board/galtic/cbi_ssfc.h +++ b/board/galtic/cbi_ssfc.h @@ -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. */ diff --git a/board/galtic/ec.tasklist b/board/galtic/ec.tasklist index 762325a825..bc2fea6148 100644 --- a/board/galtic/ec.tasklist +++ b/board/galtic/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/galtic/gpio.inc b/board/galtic/gpio.inc index bd8787acb3..721a193f36 100644 --- a/board/galtic/gpio.inc +++ b/board/galtic/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/galtic/led.c b/board/galtic/led.c index e65536e4bd..1438ccd91a 100644 --- a/board/galtic/led.c +++ b/board/galtic/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/galtic/usb_pd_policy.c b/board/galtic/usb_pd_policy.c index 9edc5a181d..23166f7fca 100644 --- a/board/galtic/usb_pd_policy.c +++ b/board/galtic/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/garg/battery.c b/board/garg/battery.c index ac65572d09..5706344191 100644 --- a/board/garg/battery.c +++ b/board/garg/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/garg/board.c b/board/garg/board.c index b08b5a979c..60365a6312 100644 --- a/board/garg/board.c +++ b/board/garg/board.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/garg/board.h b/board/garg/board.h index b7ded81827..23f44b469e 100644 --- a/board/garg/board.h +++ b/board/garg/board.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/garg/build.mk b/board/garg/build.mk index 137e208b53..fee77e38b5 100644 --- a/board/garg/build.mk +++ b/board/garg/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/garg/ec.tasklist b/board/garg/ec.tasklist index 6eac78a042..6c56976091 100644 --- a/board/garg/ec.tasklist +++ b/board/garg/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/garg/gpio.inc b/board/garg/gpio.inc index 995986d600..57feead408 100644 --- a/board/garg/gpio.inc +++ b/board/garg/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/garg/led.c b/board/garg/led.c index d232101513..eff8c1307b 100644 --- a/board/garg/led.c +++ b/board/garg/led.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/gelarshie/base_detect.c b/board/gelarshie/base_detect.c index ecac6c7a85..e045e9ea4f 100644 --- a/board/gelarshie/base_detect.c +++ b/board/gelarshie/base_detect.c @@ -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. */ diff --git a/board/gelarshie/battery.c b/board/gelarshie/battery.c index 45934366b7..da96b773f8 100644 --- a/board/gelarshie/battery.c +++ b/board/gelarshie/battery.c @@ -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. * diff --git a/board/gelarshie/board.c b/board/gelarshie/board.c index 9cade37b9f..11346a3c7d 100644 --- a/board/gelarshie/board.c +++ b/board/gelarshie/board.c @@ -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. */ @@ -275,16 +275,22 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { * to AP. But the TCPC chip is also needed to know the HPD status; otherwise, * the mux misbehaves. */ -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, }, { - .usb_port = 1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, } }; diff --git a/board/gelarshie/board.h b/board/gelarshie/board.h index 56777d12c6..7e27c7a62f 100644 --- a/board/gelarshie/board.h +++ b/board/gelarshie/board.h @@ -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. */ diff --git a/board/gelarshie/build.mk b/board/gelarshie/build.mk index 84616b4e1c..5b0f734fda 100644 --- a/board/gelarshie/build.mk +++ b/board/gelarshie/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/gelarshie/ec.tasklist b/board/gelarshie/ec.tasklist index 0d861dda25..7d193fecf3 100644 --- a/board/gelarshie/ec.tasklist +++ b/board/gelarshie/ec.tasklist @@ -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. */ diff --git a/board/gelarshie/gpio.inc b/board/gelarshie/gpio.inc index cb0f842102..189a9657a6 100644 --- a/board/gelarshie/gpio.inc +++ b/board/gelarshie/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/gelarshie/led.c b/board/gelarshie/led.c index 7455602e93..e401787f7f 100644 --- a/board/gelarshie/led.c +++ b/board/gelarshie/led.c @@ -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. * diff --git a/board/gelarshie/usbc_config.c b/board/gelarshie/usbc_config.c index 4813dbfdcc..7389f8cb52 100644 --- a/board/gelarshie/usbc_config.c +++ b/board/gelarshie/usbc_config.c @@ -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. */ diff --git a/board/genesis/board.c b/board/genesis/board.c index c34f86bd0a..5c3f1c5c00 100644 --- a/board/genesis/board.c +++ b/board/genesis/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/genesis/board.h b/board/genesis/board.h index 7a806597fc..41de23b6a8 100644 --- a/board/genesis/board.h +++ b/board/genesis/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/genesis/build.mk b/board/genesis/build.mk index 2785133e11..50d3763d2b 100644 --- a/board/genesis/build.mk +++ b/board/genesis/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/genesis/ec.tasklist b/board/genesis/ec.tasklist index 3828142c55..c43d643410 100644 --- a/board/genesis/ec.tasklist +++ b/board/genesis/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/genesis/gpio.inc b/board/genesis/gpio.inc index d8f2989b8e..7d2c33c5a9 100644 --- a/board/genesis/gpio.inc +++ b/board/genesis/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -25,12 +25,12 @@ GPIO_INT(PG_VPRIM_CORE_A_OD, PIN(2, 3), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(PG_PP1050_A_OD, PIN(2, 2), GPIO_INT_BOTH, power_signal_interrupt) /* EC output, but also interrupt so this can be polled as a power signal */ GPIO_INT(EC_PCH_RSMRST_L, PIN(A, 6), GPIO_OUTPUT | GPIO_INT_F_RISING | GPIO_INT_F_FALLING, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 GPIO_INT(SLP_S4_L, PIN(D, 4), GPIO_INT_BOTH, power_signal_interrupt) #endif GPIO_INT(PG_PP2500_DRAM_U_OD, PIN(2, 0), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(PG_PP1200_U_OD, PIN(2, 1), GPIO_INT_BOTH, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 GPIO_INT(SLP_S3_L, PIN(A, 5), GPIO_INT_BOTH, slp_s3_interrupt) #endif GPIO_INT(PG_PP950_VCCIO_OD, PIN(1, 7), GPIO_INT_BOTH, power_signal_interrupt) diff --git a/board/genesis/led.c b/board/genesis/led.c index 52a4f0f047..9258b6eb6d 100644 --- a/board/genesis/led.c +++ b/board/genesis/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/genesis/pse.c b/board/genesis/pse.c index afcb0e07dd..bda7e1994d 100644 --- a/board/genesis/pse.c +++ b/board/genesis/pse.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/gimble/battery.c b/board/gimble/battery.c index 235503a6f1..89b0ddf1e2 100644 --- a/board/gimble/battery.c +++ b/board/gimble/battery.c @@ -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. * diff --git a/board/gimble/board.c b/board/gimble/board.c index 85cb1bdb9e..0ca135b9fd 100644 --- a/board/gimble/board.c +++ b/board/gimble/board.c @@ -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. */ diff --git a/board/gimble/board.h b/board/gimble/board.h index 3593ccac0d..015f3f78e6 100644 --- a/board/gimble/board.h +++ b/board/gimble/board.h @@ -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. */ diff --git a/board/gimble/build.mk b/board/gimble/build.mk index c43f37b4dd..cad0da2a4e 100644 --- a/board/gimble/build.mk +++ b/board/gimble/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/gimble/charger.c b/board/gimble/charger.c index cbc657271b..a4fa209246 100644 --- a/board/gimble/charger.c +++ b/board/gimble/charger.c @@ -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. */ diff --git a/board/gimble/ec.tasklist b/board/gimble/ec.tasklist index 9207f8729d..27ab9a6e63 100644 --- a/board/gimble/ec.tasklist +++ b/board/gimble/ec.tasklist @@ -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. */ diff --git a/board/gimble/fans.c b/board/gimble/fans.c index 53294139f6..90e251511f 100644 --- a/board/gimble/fans.c +++ b/board/gimble/fans.c @@ -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. */ diff --git a/board/gimble/fw_config.c b/board/gimble/fw_config.c index d50b388550..8698145efd 100644 --- a/board/gimble/fw_config.c +++ b/board/gimble/fw_config.c @@ -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. */ diff --git a/board/gimble/fw_config.h b/board/gimble/fw_config.h index a621d3ac53..fcf24b4094 100644 --- a/board/gimble/fw_config.h +++ b/board/gimble/fw_config.h @@ -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. */ diff --git a/board/gimble/gpio.inc b/board/gimble/gpio.inc index 412673c227..1961f1bcb4 100644 --- a/board/gimble/gpio.inc +++ b/board/gimble/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/gimble/i2c.c b/board/gimble/i2c.c index 7bedcc05db..621e7bf3f0 100644 --- a/board/gimble/i2c.c +++ b/board/gimble/i2c.c @@ -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. */ diff --git a/board/gimble/keyboard.c b/board/gimble/keyboard.c index 97cc41cee9..e1b0ca8a21 100644 --- a/board/gimble/keyboard.c +++ b/board/gimble/keyboard.c @@ -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. */ diff --git a/board/gimble/led.c b/board/gimble/led.c index f0476599ab..7b6fd5c24e 100644 --- a/board/gimble/led.c +++ b/board/gimble/led.c @@ -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. */ diff --git a/board/gimble/pwm.c b/board/gimble/pwm.c index 54ffd9411d..9f9a8ed94f 100644 --- a/board/gimble/pwm.c +++ b/board/gimble/pwm.c @@ -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. */ diff --git a/board/gimble/sensors.c b/board/gimble/sensors.c index 7701056808..d39d43d887 100644 --- a/board/gimble/sensors.c +++ b/board/gimble/sensors.c @@ -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. */ diff --git a/board/gimble/thermal.c b/board/gimble/thermal.c index b985c9de75..37184f92f2 100644 --- a/board/gimble/thermal.c +++ b/board/gimble/thermal.c @@ -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. */ diff --git a/board/gimble/usbc_config.c b/board/gimble/usbc_config.c index b67250f138..feb123a525 100644 --- a/board/gimble/usbc_config.c +++ b/board/gimble/usbc_config.c @@ -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. */ @@ -88,26 +88,33 @@ unsigned int ppc_cnt = ARRAY_SIZE(ppc_chips); * to the virtual_usb_mux_driver so the AP gets notified of mux changes * and updates the TCSS configuration on state changes. */ -static const struct usb_mux usbc1_usb3_db_retimer = { - .usb_port = USBC_PORT_C1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, - .next_mux = NULL, +static const struct usb_mux_chain usbc1_usb3_db_retimer = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, + .next = NULL, }; /* USBC mux configuration - Alder Lake includes internal mux */ -const struct usb_mux usb_muxes[] = { +const struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }, [USBC_PORT_C1] = { - /* PS8815 DB */ - .usb_port = USBC_PORT_C1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, - .next_mux = &usbc1_usb3_db_retimer, + .mux = &(const struct usb_mux) { + /* PS8815 DB */ + .usb_port = USBC_PORT_C1, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, + .next = &usbc1_usb3_db_retimer, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/board/gimble/usbc_config.h b/board/gimble/usbc_config.h index 56878a51f2..ab2dabc1e9 100644 --- a/board/gimble/usbc_config.h +++ b/board/gimble/usbc_config.h @@ -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. */ diff --git a/board/gingerbread/board.c b/board/gingerbread/board.c index 1997ab0d3b..5a16593481 100644 --- a/board/gingerbread/board.c +++ b/board/gingerbread/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -186,20 +186,24 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }, }; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { [USB_PD_PORT_HOST] = { - .usb_port = USB_PD_PORT_HOST, - .i2c_port = I2C_PORT_I2C1, - .i2c_addr_flags = TUSB1064_I2C_ADDR0_FLAGS, - .driver = &tusb1064_usb_mux_driver, - .board_set = &board_tusb1064_dp_rx_eq_set, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_HOST, + .i2c_port = I2C_PORT_I2C1, + .i2c_addr_flags = TUSB1064_I2C_ADDR0_FLAGS, + .driver = &tusb1064_usb_mux_driver, + .board_set = &board_tusb1064_dp_rx_eq_set, + }, }, [USB_PD_PORT_DP] = { - .usb_port = USB_PD_PORT_DP, - .i2c_port = I2C_PORT_I2C3, - .i2c_addr_flags = PS8XXX_I2C_ADDR2_FLAGS, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_DP, + .i2c_port = I2C_PORT_I2C3, + .i2c_addr_flags = PS8XXX_I2C_ADDR2_FLAGS, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, }, }; diff --git a/board/gingerbread/board.h b/board/gingerbread/board.h index 9951271372..09e9e0b7fe 100644 --- a/board/gingerbread/board.h +++ b/board/gingerbread/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/gingerbread/build.mk b/board/gingerbread/build.mk index f994cc1434..d7ca7b35b5 100644 --- a/board/gingerbread/build.mk +++ b/board/gingerbread/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/gingerbread/ec.tasklist b/board/gingerbread/ec.tasklist index cc36bf5a74..ffd4a604c9 100644 --- a/board/gingerbread/ec.tasklist +++ b/board/gingerbread/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/gingerbread/gpio.inc b/board/gingerbread/gpio.inc index 6226ff747e..4da3c973c1 100644 --- a/board/gingerbread/gpio.inc +++ b/board/gingerbread/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/gooey/battery.c b/board/gooey/battery.c index c40e0d7ec7..e8cec5af5f 100644 --- a/board/gooey/battery.c +++ b/board/gooey/battery.c @@ -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. * diff --git a/board/gooey/board.c b/board/gooey/board.c index 03fcc5df8e..250f6afd61 100644 --- a/board/gooey/board.c +++ b/board/gooey/board.c @@ -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. */ @@ -180,12 +180,15 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }; /* USB Muxes */ -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_C0, - .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, - .driver = &it5205_usb_mux_driver, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_C0, + .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, + .driver = &it5205_usb_mux_driver, + }, }, }; diff --git a/board/gooey/board.h b/board/gooey/board.h index 943ee2580d..b586c0f334 100644 --- a/board/gooey/board.h +++ b/board/gooey/board.h @@ -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. */ diff --git a/board/gooey/build.mk b/board/gooey/build.mk index ff15b3e8e4..f65b5e8f0c 100644 --- a/board/gooey/build.mk +++ b/board/gooey/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/gooey/ec.tasklist b/board/gooey/ec.tasklist index bdcbcdf074..8ccdfc81b2 100644 --- a/board/gooey/ec.tasklist +++ b/board/gooey/ec.tasklist @@ -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. */ diff --git a/board/gooey/gpio.inc b/board/gooey/gpio.inc index 1eaae9e354..8eb1f5ef22 100644 --- a/board/gooey/gpio.inc +++ b/board/gooey/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/gooey/led.c b/board/gooey/led.c index 3c8db4d897..5c7eb08407 100644 --- a/board/gooey/led.c +++ b/board/gooey/led.c @@ -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. * diff --git a/board/gooey/usb_pd_policy.c b/board/gooey/usb_pd_policy.c index 814287a417..a7633b73ac 100644 --- a/board/gooey/usb_pd_policy.c +++ b/board/gooey/usb_pd_policy.c @@ -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. */ diff --git a/board/goroh/battery.c b/board/goroh/battery.c index f76af4d99b..4da7b255e0 100644 --- a/board/goroh/battery.c +++ b/board/goroh/battery.c @@ -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. */ diff --git a/board/goroh/board.c b/board/goroh/board.c index 116b579f95..a9eaa35b92 100644 --- a/board/goroh/board.c +++ b/board/goroh/board.c @@ -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. */ diff --git a/board/goroh/board.h b/board/goroh/board.h index 70a23447a5..b15c7de076 100644 --- a/board/goroh/board.h +++ b/board/goroh/board.h @@ -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. */ diff --git a/board/goroh/build.mk b/board/goroh/build.mk index 4bc0561678..5f2dea191a 100644 --- a/board/goroh/build.mk +++ b/board/goroh/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/goroh/ec.tasklist b/board/goroh/ec.tasklist index 6bc80781d8..148b7679ae 100644 --- a/board/goroh/ec.tasklist +++ b/board/goroh/ec.tasklist @@ -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. */ diff --git a/board/goroh/fans.c b/board/goroh/fans.c index 415eb9681d..1ac9a79acb 100644 --- a/board/goroh/fans.c +++ b/board/goroh/fans.c @@ -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. */ diff --git a/board/goroh/gpio.inc b/board/goroh/gpio.inc index 9d10ea37bd..5d534044fe 100644 --- a/board/goroh/gpio.inc +++ b/board/goroh/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/goroh/led.c b/board/goroh/led.c index f4d8e0b5fb..7ed155acc0 100644 --- a/board/goroh/led.c +++ b/board/goroh/led.c @@ -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. */ diff --git a/board/goroh/sensors.c b/board/goroh/sensors.c index fe0a50b762..4499ebf64c 100644 --- a/board/goroh/sensors.c +++ b/board/goroh/sensors.c @@ -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. */ diff --git a/board/goroh/usbc_confg.c b/board/goroh/usbc_confg.c index 57a52da986..2f1b4a021f 100644 --- a/board/goroh/usbc_confg.c +++ b/board/goroh/usbc_confg.c @@ -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. */ diff --git a/board/grunt/battery.c b/board/grunt/battery.c index 359ec9785b..7c7ec44c56 100644 --- a/board/grunt/battery.c +++ b/board/grunt/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/grunt/board.c b/board/grunt/board.c index 1941932e6e..9c4666fec5 100644 --- a/board/grunt/board.c +++ b/board/grunt/board.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/grunt/board.h b/board/grunt/board.h index 2a002b0a31..b8cb063dee 100644 --- a/board/grunt/board.h +++ b/board/grunt/board.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/grunt/build.mk b/board/grunt/build.mk index c808e65aed..d24127ddae 100644 --- a/board/grunt/build.mk +++ b/board/grunt/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2015 The Chromium OS Authors. All rights reserved. +# Copyright 2015 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/grunt/ec.tasklist b/board/grunt/ec.tasklist index dc898c4502..9572d61c8f 100644 --- a/board/grunt/ec.tasklist +++ b/board/grunt/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/grunt/gpio.inc b/board/grunt/gpio.inc index 97f5afabfd..8c75686f47 100644 --- a/board/grunt/gpio.inc +++ b/board/grunt/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2017 The Chromium OS Authors. All rights reserved. + * Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/grunt/led.c b/board/grunt/led.c index 41de9b6c66..0a7a794bfd 100644 --- a/board/grunt/led.c +++ b/board/grunt/led.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/gumboz/battery.c b/board/gumboz/battery.c index 7d1831fdbc..8b9b3ddf96 100644 --- a/board/gumboz/battery.c +++ b/board/gumboz/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/gumboz/board.c b/board/gumboz/board.c index 66f7fe3dc3..82522ada4d 100644 --- a/board/gumboz/board.c +++ b/board/gumboz/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -195,33 +195,43 @@ const struct usb_mux_driver usbc0_sbu_mux_driver = { * Since PI3USB221 is not a i2c device, .i2c_port and * .i2c_addr_flags are not required here. */ -const struct usb_mux usbc0_sbu_mux = { - .usb_port = USBC_PORT_C0, - .driver = &usbc0_sbu_mux_driver, +const struct usb_mux_chain usbc0_sbu_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C0, + .driver = &usbc0_sbu_mux_driver, + }, }; -struct usb_mux usbc1_amd_fp5_usb_mux = { - .usb_port = USBC_PORT_C1, - .i2c_port = I2C_PORT_USB_AP_MUX, - .i2c_addr_flags = AMD_FP5_MUX_I2C_ADDR_FLAGS, - .driver = &amd_fp5_usb_mux_driver, - .flags = USB_MUX_FLAG_SET_WITHOUT_FLIP, +struct usb_mux_chain usbc1_amd_fp5_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .i2c_port = I2C_PORT_USB_AP_MUX, + .i2c_addr_flags = AMD_FP5_MUX_I2C_ADDR_FLAGS, + .driver = &amd_fp5_usb_mux_driver, + .flags = USB_MUX_FLAG_SET_WITHOUT_FLIP, + }, }; -struct usb_mux usb_muxes[] = { +struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .i2c_port = I2C_PORT_USB_AP_MUX, - .i2c_addr_flags = AMD_FP5_MUX_I2C_ADDR_FLAGS, - .driver = &amd_fp5_usb_mux_driver, - .next_mux = &usbc0_sbu_mux, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .i2c_port = I2C_PORT_USB_AP_MUX, + .i2c_addr_flags = AMD_FP5_MUX_I2C_ADDR_FLAGS, + .driver = &amd_fp5_usb_mux_driver, + }, + .next = &usbc0_sbu_mux, }, [USBC_PORT_C1] = { - .usb_port = USBC_PORT_C1, - .i2c_port = I2C_PORT_TCPC1, - .i2c_addr_flags = PS8743_I2C_ADDR1_FLAG, - .driver = &ps8743_usb_mux_driver, - .next_mux = &usbc1_amd_fp5_usb_mux, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C1, + .i2c_port = I2C_PORT_TCPC1, + .i2c_addr_flags = PS8743_I2C_ADDR1_FLAG, + .driver = &ps8743_usb_mux_driver, + }, + .next = &usbc1_amd_fp5_usb_mux, } }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/board/gumboz/board.h b/board/gumboz/board.h index 415d797132..b2f7682ed8 100644 --- a/board/gumboz/board.h +++ b/board/gumboz/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/gumboz/build.mk b/board/gumboz/build.mk index 1c0cbc4f63..45c71f962c 100644 --- a/board/gumboz/build.mk +++ b/board/gumboz/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/gumboz/ec.tasklist b/board/gumboz/ec.tasklist index d9c1606eb2..abc796f74f 100644 --- a/board/gumboz/ec.tasklist +++ b/board/gumboz/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/gumboz/gpio.inc b/board/gumboz/gpio.inc index 9beaecc17a..2e7e4b78a9 100644 --- a/board/gumboz/gpio.inc +++ b/board/gumboz/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/gumboz/led.c b/board/gumboz/led.c index de6548951a..95f61494f9 100644 --- a/board/gumboz/led.c +++ b/board/gumboz/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/guybrush/battery.c b/board/guybrush/battery.c index ddf3adff50..e7163c8a11 100644 --- a/board/guybrush/battery.c +++ b/board/guybrush/battery.c @@ -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. * diff --git a/board/guybrush/board.c b/board/guybrush/board.c index e388c359bb..e7fc1e09ee 100644 --- a/board/guybrush/board.c +++ b/board/guybrush/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/guybrush/board.h b/board/guybrush/board.h index 64e1058b07..094b98f23e 100644 --- a/board/guybrush/board.h +++ b/board/guybrush/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/guybrush/board_fw_config.c b/board/guybrush/board_fw_config.c index 7c29112f2d..0484b82461 100644 --- a/board/guybrush/board_fw_config.c +++ b/board/guybrush/board_fw_config.c @@ -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. */ diff --git a/board/guybrush/board_fw_config.h b/board/guybrush/board_fw_config.h index b51eddaa08..4477aca6fd 100644 --- a/board/guybrush/board_fw_config.h +++ b/board/guybrush/board_fw_config.h @@ -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. */ diff --git a/board/guybrush/build.mk b/board/guybrush/build.mk index a7865db889..806e8988a2 100644 --- a/board/guybrush/build.mk +++ b/board/guybrush/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/guybrush/ec.tasklist b/board/guybrush/ec.tasklist index f7cf0f7205..7a64850dfb 100644 --- a/board/guybrush/ec.tasklist +++ b/board/guybrush/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/guybrush/gpio.inc b/board/guybrush/gpio.inc index b7381f588d..ffc567b261 100644 --- a/board/guybrush/gpio.inc +++ b/board/guybrush/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/guybrush/led.c b/board/guybrush/led.c index 35da8c9f9c..26b1fc826a 100644 --- a/board/guybrush/led.c +++ b/board/guybrush/led.c @@ -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. * diff --git a/board/guybrush/thermal.c b/board/guybrush/thermal.c index 517e374c6a..5bb1295f84 100644 --- a/board/guybrush/thermal.c +++ b/board/guybrush/thermal.c @@ -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. */ diff --git a/board/haboki/battery.c b/board/haboki/battery.c index 551ff1cbc0..72ad9ad6cb 100644 --- a/board/haboki/battery.c +++ b/board/haboki/battery.c @@ -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. * diff --git a/board/haboki/board.c b/board/haboki/board.c index d3a57be9f4..d7509115b5 100644 --- a/board/haboki/board.c +++ b/board/haboki/board.c @@ -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. */ @@ -242,19 +242,25 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }; /* USB Muxes */ -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_C0, - .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, - .driver = &it5205_usb_mux_driver, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_C0, + .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, + .driver = &it5205_usb_mux_driver, + }, }, { - .usb_port = 1, - .i2c_port = I2C_PORT_SUB_USB_C1, - .i2c_addr_flags = PS8XXX_I2C_ADDR1_FLAGS, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .i2c_port = I2C_PORT_SUB_USB_C1, + .i2c_addr_flags = PS8XXX_I2C_ADDR1_FLAGS, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, }, }; diff --git a/board/haboki/board.h b/board/haboki/board.h index 822b918dd2..0365d094ea 100644 --- a/board/haboki/board.h +++ b/board/haboki/board.h @@ -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. */ diff --git a/board/haboki/build.mk b/board/haboki/build.mk index aa0e3b766e..4362df50a4 100644 --- a/board/haboki/build.mk +++ b/board/haboki/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/haboki/cbi_ssfc.c b/board/haboki/cbi_ssfc.c index 39fd4929a1..81f3ee0dad 100644 --- a/board/haboki/cbi_ssfc.c +++ b/board/haboki/cbi_ssfc.c @@ -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. */ diff --git a/board/haboki/cbi_ssfc.h b/board/haboki/cbi_ssfc.h index 942f0cf5f4..bf8853a43a 100644 --- a/board/haboki/cbi_ssfc.h +++ b/board/haboki/cbi_ssfc.h @@ -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. */ diff --git a/board/haboki/ec.tasklist b/board/haboki/ec.tasklist index 5c9a2d1a01..c13df44543 100644 --- a/board/haboki/ec.tasklist +++ b/board/haboki/ec.tasklist @@ -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. */ diff --git a/board/haboki/gpio.inc b/board/haboki/gpio.inc index c1a03bfd56..8ecc458a19 100644 --- a/board/haboki/gpio.inc +++ b/board/haboki/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/haboki/led.c b/board/haboki/led.c index 3918a55c1a..b31d4fab75 100644 --- a/board/haboki/led.c +++ b/board/haboki/led.c @@ -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. */ diff --git a/board/haboki/usb_pd_policy.c b/board/haboki/usb_pd_policy.c index 54fa6f6933..8a2c07c575 100644 --- a/board/haboki/usb_pd_policy.c +++ b/board/haboki/usb_pd_policy.c @@ -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. */ diff --git a/board/hammer/battery.c b/board/hammer/battery.c index 08b9f560df..df6a716cd7 100644 --- a/board/hammer/battery.c +++ b/board/hammer/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/hammer/board.c b/board/hammer/board.c index 76a4df7eeb..c703fcae88 100644 --- a/board/hammer/board.c +++ b/board/hammer/board.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/hammer/board.h b/board/hammer/board.h index 871ad40c39..bce7dc39f4 100644 --- a/board/hammer/board.h +++ b/board/hammer/board.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/hammer/build.mk b/board/hammer/build.mk index b32a6b768a..d41aed0d84 100644 --- a/board/hammer/build.mk +++ b/board/hammer/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2016 The Chromium OS Authors. All rights reserved. +# Copyright 2016 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/hammer/ec.tasklist b/board/hammer/ec.tasklist index b568619065..e528d20cd8 100644 --- a/board/hammer/ec.tasklist +++ b/board/hammer/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/hammer/gpio.inc b/board/hammer/gpio.inc index 8372d4fc4b..d79895564d 100644 --- a/board/hammer/gpio.inc +++ b/board/hammer/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2016 The Chromium OS Authors. All rights reserved. + * Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/hammer/variants.h b/board/hammer/variants.h index 3f0993d645..06dbe3d0f7 100644 --- a/board/hammer/variants.h +++ b/board/hammer/variants.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/hatch/battery.c b/board/hatch/battery.c index b81fa795b9..444262b353 100644 --- a/board/hatch/battery.c +++ b/board/hatch/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/hatch/board.c b/board/hatch/board.c index e33a522225..a15e276113 100644 --- a/board/hatch/board.c +++ b/board/hatch/board.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -144,16 +144,20 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }, }; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { [USB_PD_PORT_TCPC_0] = { - .usb_port = USB_PD_PORT_TCPC_0, - .driver = &anx7447_usb_mux_driver, - .hpd_update = &anx7447_tcpc_update_hpd_status, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_TCPC_0, + .driver = &anx7447_usb_mux_driver, + .hpd_update = &anx7447_tcpc_update_hpd_status, + }, }, [USB_PD_PORT_TCPC_1] = { - .usb_port = USB_PD_PORT_TCPC_1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_TCPC_1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, } }; diff --git a/board/hatch/board.h b/board/hatch/board.h index 7e61d2cdad..0de9a4828f 100644 --- a/board/hatch/board.h +++ b/board/hatch/board.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/hatch/build.mk b/board/hatch/build.mk index 733912454f..13153c1526 100644 --- a/board/hatch/build.mk +++ b/board/hatch/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/hatch/ec.tasklist b/board/hatch/ec.tasklist index 4a1024a091..829be2b7c8 100644 --- a/board/hatch/ec.tasklist +++ b/board/hatch/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/hatch/gpio.inc b/board/hatch/gpio.inc index cd241f15f5..22cda73feb 100644 --- a/board/hatch/gpio.inc +++ b/board/hatch/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -16,10 +16,10 @@ GPIO_INT(ACOK_OD, PIN(0, 0), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, ex /* Power sequencing interrupts */ GPIO_INT(SLP_S0_L, PIN(D, 5), GPIO_INT_BOTH, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 GPIO_INT(SLP_S3_L, PIN(A, 5), GPIO_INT_BOTH, power_signal_interrupt) #endif -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 GPIO_INT(SLP_S4_L, PIN(D, 4), GPIO_INT_BOTH, power_signal_interrupt) #endif GPIO_INT(PG_EC_RSMRST_L, PIN(E, 2), GPIO_INT_BOTH, intel_x86_rsmrst_signal_interrupt) diff --git a/board/hatch/led.c b/board/hatch/led.c index a355df8cf5..5bb76e1812 100644 --- a/board/hatch/led.c +++ b/board/hatch/led.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/hatch_fp/board.c b/board/hatch_fp/board.c index b48dce2b7e..00e7949083 100644 --- a/board/hatch_fp/board.c +++ b/board/hatch_fp/board.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/hatch_fp/board.h b/board/hatch_fp/board.h index a4c4e2923b..d36a9228c1 100644 --- a/board/hatch_fp/board.h +++ b/board/hatch_fp/board.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/hatch_fp/board_rw.c b/board/hatch_fp/board_rw.c index 00a6b89b19..93a62b09bc 100644 --- a/board/hatch_fp/board_rw.c +++ b/board/hatch_fp/board_rw.c @@ -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. */ diff --git a/board/hatch_fp/board_rw.h b/board/hatch_fp/board_rw.h index 1bee6c947d..fc38dcc259 100644 --- a/board/hatch_fp/board_rw.h +++ b/board/hatch_fp/board_rw.h @@ -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. */ diff --git a/board/hatch_fp/build.mk b/board/hatch_fp/build.mk index caac6f5822..d42dc15918 100644 --- a/board/hatch_fp/build.mk +++ b/board/hatch_fp/build.mk @@ -1,4 +1,4 @@ -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/hatch_fp/ec.tasklist b/board/hatch_fp/ec.tasklist index ed1e6ed294..2a4771fa98 100644 --- a/board/hatch_fp/ec.tasklist +++ b/board/hatch_fp/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/hatch_fp/fpsensor_detect.c b/board/hatch_fp/fpsensor_detect.c index 638b5fbfe0..7e3b99cac7 100644 --- a/board/hatch_fp/fpsensor_detect.c +++ b/board/hatch_fp/fpsensor_detect.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/hatch_fp/fpsensor_detect_rw.c b/board/hatch_fp/fpsensor_detect_rw.c index 274cfee054..2a313cda18 100644 --- a/board/hatch_fp/fpsensor_detect_rw.c +++ b/board/hatch_fp/fpsensor_detect_rw.c @@ -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. */ diff --git a/board/hatch_fp/gpio.inc b/board/hatch_fp/gpio.inc index c5319c2bee..dc185751bc 100644 --- a/board/hatch_fp/gpio.inc +++ b/board/hatch_fp/gpio.inc @@ -1,5 +1,5 @@ /* - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/hatch_fp/gpio_rw.inc b/board/hatch_fp/gpio_rw.inc index 3dfe890c12..dc82cd984a 100644 --- a/board/hatch_fp/gpio_rw.inc +++ b/board/hatch_fp/gpio_rw.inc @@ -1,5 +1,5 @@ /* - * 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. */ diff --git a/board/helios/battery.c b/board/helios/battery.c index c7168caf8a..dcc9503244 100644 --- a/board/helios/battery.c +++ b/board/helios/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/helios/board.c b/board/helios/board.c index 0f2a460848..256459314c 100644 --- a/board/helios/board.c +++ b/board/helios/board.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -168,16 +168,20 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }, }; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { [USB_PD_PORT_TCPC_0] = { - .usb_port = USB_PD_PORT_TCPC_0, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_TCPC_0, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, }, [USB_PD_PORT_TCPC_1] = { - .usb_port = USB_PD_PORT_TCPC_1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_TCPC_1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, } }; diff --git a/board/helios/board.h b/board/helios/board.h index f5c31bc3ab..83ffd2b4b7 100644 --- a/board/helios/board.h +++ b/board/helios/board.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/helios/build.mk b/board/helios/build.mk index 733912454f..13153c1526 100644 --- a/board/helios/build.mk +++ b/board/helios/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/helios/ec.tasklist b/board/helios/ec.tasklist index 63d366a33b..7fb3e38b63 100644 --- a/board/helios/ec.tasklist +++ b/board/helios/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/helios/gpio.inc b/board/helios/gpio.inc index d16e1643be..65fc10f761 100644 --- a/board/helios/gpio.inc +++ b/board/helios/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -17,10 +17,10 @@ GPIO_INT(ACOK_OD, PIN(0, 0), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, ex /* Power sequencing interrupts */ GPIO_INT(SLP_S0_L, PIN(D, 5), GPIO_INT_BOTH, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 GPIO_INT(SLP_S3_L, PIN(A, 5), GPIO_INT_BOTH, power_signal_interrupt) #endif -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 GPIO_INT(SLP_S4_L, PIN(D, 4), GPIO_INT_BOTH, power_signal_interrupt) #endif GPIO_INT(PG_EC_RSMRST_L, PIN(E, 2), GPIO_INT_BOTH, intel_x86_rsmrst_signal_interrupt) diff --git a/board/helios/led.c b/board/helios/led.c index b95b745e5d..92fb7d80ce 100644 --- a/board/helios/led.c +++ b/board/helios/led.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/herobrine/battery.c b/board/herobrine/battery.c index 38e22aafb3..84c43cc263 100644 --- a/board/herobrine/battery.c +++ b/board/herobrine/battery.c @@ -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. * diff --git a/board/herobrine/board.c b/board/herobrine/board.c index a3d2a120b6..1ef1801c44 100644 --- a/board/herobrine/board.c +++ b/board/herobrine/board.c @@ -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. */ diff --git a/board/herobrine/board.h b/board/herobrine/board.h index a208eea156..59580826f5 100644 --- a/board/herobrine/board.h +++ b/board/herobrine/board.h @@ -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. */ diff --git a/board/herobrine/build.mk b/board/herobrine/build.mk index 601c45a042..6827780a6c 100644 --- a/board/herobrine/build.mk +++ b/board/herobrine/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/herobrine/ec.tasklist b/board/herobrine/ec.tasklist index 5beeb38feb..228828af3c 100644 --- a/board/herobrine/ec.tasklist +++ b/board/herobrine/ec.tasklist @@ -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. */ diff --git a/board/herobrine/gpio.inc b/board/herobrine/gpio.inc index 239bedd95d..9628684737 100644 --- a/board/herobrine/gpio.inc +++ b/board/herobrine/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/herobrine/led.c b/board/herobrine/led.c index ace04fcc4a..fb68e85deb 100644 --- a/board/herobrine/led.c +++ b/board/herobrine/led.c @@ -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. * diff --git a/board/herobrine/switchcap.c b/board/herobrine/switchcap.c index 16b0db6ef6..5173e27f75 100644 --- a/board/herobrine/switchcap.c +++ b/board/herobrine/switchcap.c @@ -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. */ diff --git a/board/herobrine/usbc_config.c b/board/herobrine/usbc_config.c index 2bf0133eaf..98d1b70bac 100644 --- a/board/herobrine/usbc_config.c +++ b/board/herobrine/usbc_config.c @@ -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. */ @@ -120,16 +120,22 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { * to AP. But the TCPC chip is also needed to know the HPD status; otherwise, * the mux misbehaves. */ -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, }, { - .usb_port = 1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, } }; diff --git a/board/herobrine/usbc_config.h b/board/herobrine/usbc_config.h index 69f546ef85..da19a67d2d 100644 --- a/board/herobrine/usbc_config.h +++ b/board/herobrine/usbc_config.h @@ -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. */ diff --git a/board/hoho/board.c b/board/hoho/board.c index e36f89a1b9..a2a9842ae5 100644 --- a/board/hoho/board.c +++ b/board/hoho/board.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/hoho/board.h b/board/hoho/board.h index 28e558869e..7768ab7293 100644 --- a/board/hoho/board.h +++ b/board/hoho/board.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/hoho/build.mk b/board/hoho/build.mk index 71cea3f845..b6fbbe7a9e 100644 --- a/board/hoho/build.mk +++ b/board/hoho/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2014 The Chromium OS Authors. All rights reserved. +# Copyright 2014 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/hoho/ec.tasklist b/board/hoho/ec.tasklist index 41fc047d6a..5a82344122 100644 --- a/board/hoho/ec.tasklist +++ b/board/hoho/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/hoho/gpio.inc b/board/hoho/gpio.inc index 6d0701ded1..56a4f8808e 100644 --- a/board/hoho/gpio.inc +++ b/board/hoho/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2014 The Chromium OS Authors. All rights reserved. + * Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/hoho/usb_pd_config.h b/board/hoho/usb_pd_config.h index e783ff874c..5a7dfd12a6 100644 --- a/board/hoho/usb_pd_config.h +++ b/board/hoho/usb_pd_config.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/hoho/usb_pd_pdo.c b/board/hoho/usb_pd_pdo.c index 20ebd7d9fe..c52179acfc 100644 --- a/board/hoho/usb_pd_pdo.c +++ b/board/hoho/usb_pd_pdo.c @@ -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. */ diff --git a/board/hoho/usb_pd_pdo.h b/board/hoho/usb_pd_pdo.h index 8a43db795e..e04c3aa677 100644 --- a/board/hoho/usb_pd_pdo.h +++ b/board/hoho/usb_pd_pdo.h @@ -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. */ diff --git a/board/hoho/usb_pd_policy.c b/board/hoho/usb_pd_policy.c index e9754d5cda..baf05d0e71 100644 --- a/board/hoho/usb_pd_policy.c +++ b/board/hoho/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/homestar/base_detect.c b/board/homestar/base_detect.c index cf5866626c..7625db02d7 100644 --- a/board/homestar/base_detect.c +++ b/board/homestar/base_detect.c @@ -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. */ diff --git a/board/homestar/battery.c b/board/homestar/battery.c index 7cfd201b0f..01fdb29f6a 100644 --- a/board/homestar/battery.c +++ b/board/homestar/battery.c @@ -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. * diff --git a/board/homestar/board.c b/board/homestar/board.c index 458ed8d1c4..ab4b95b625 100644 --- a/board/homestar/board.c +++ b/board/homestar/board.c @@ -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. */ @@ -223,16 +223,22 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { * to AP. But the TCPC chip is also needed to know the HPD status; otherwise, * the mux misbehaves. */ -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, }, { - .usb_port = 1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, } }; diff --git a/board/homestar/board.h b/board/homestar/board.h index 790c401183..230aa6e7d3 100644 --- a/board/homestar/board.h +++ b/board/homestar/board.h @@ -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. */ diff --git a/board/homestar/build.mk b/board/homestar/build.mk index 452abeb591..363ef59a16 100644 --- a/board/homestar/build.mk +++ b/board/homestar/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/homestar/ec.tasklist b/board/homestar/ec.tasklist index ea2aaa97f5..8fc8115afc 100644 --- a/board/homestar/ec.tasklist +++ b/board/homestar/ec.tasklist @@ -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. */ diff --git a/board/homestar/gpio.inc b/board/homestar/gpio.inc index 77a69a5faa..37e71977ac 100644 --- a/board/homestar/gpio.inc +++ b/board/homestar/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/homestar/led.c b/board/homestar/led.c index 786934dca3..c314d584c3 100644 --- a/board/homestar/led.c +++ b/board/homestar/led.c @@ -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. * diff --git a/board/homestar/usbc_config.c b/board/homestar/usbc_config.c index 73666d087c..5d30adb6e2 100644 --- a/board/homestar/usbc_config.c +++ b/board/homestar/usbc_config.c @@ -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. */ diff --git a/board/host/battery.c b/board/host/battery.c index 93688973ed..f3ce1766f5 100644 --- a/board/host/battery.c +++ b/board/host/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/host/board.c b/board/host/board.c index c364fdf6e2..baaed22b43 100644 --- a/board/host/board.c +++ b/board/host/board.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/host/board.h b/board/host/board.h index fc7f9ea6af..165331ce4c 100644 --- a/board/host/board.h +++ b/board/host/board.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/host/build.mk b/board/host/build.mk index 17927528c2..a1fad4723a 100644 --- a/board/host/build.mk +++ b/board/host/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2013 The Chromium OS Authors. All rights reserved. +# Copyright 2013 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/host/charger.c b/board/host/charger.c index 9249b1d591..fddadf245d 100644 --- a/board/host/charger.c +++ b/board/host/charger.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/host/chipset.c b/board/host/chipset.c index 0a7385fc84..47ad097c53 100644 --- a/board/host/chipset.c +++ b/board/host/chipset.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/host/ec.tasklist b/board/host/ec.tasklist index c056c51e8a..0195800932 100644 --- a/board/host/ec.tasklist +++ b/board/host/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/host/fan.c b/board/host/fan.c index 40d59609fd..de335afa06 100644 --- a/board/host/fan.c +++ b/board/host/fan.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/host/gpio.inc b/board/host/gpio.inc index ce69385259..ab30915881 100644 --- a/board/host/gpio.inc +++ b/board/host/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2014 The Chromium OS Authors. All rights reserved. + * Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/host/usb_pd_config.c b/board/host/usb_pd_config.c index 878e747342..10ed9536fa 100644 --- a/board/host/usb_pd_config.c +++ b/board/host/usb_pd_config.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/host/usb_pd_config.h b/board/host/usb_pd_config.h index fb12b2ce7d..0fff2af019 100644 --- a/board/host/usb_pd_config.h +++ b/board/host/usb_pd_config.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/host/usb_pd_pdo.c b/board/host/usb_pd_pdo.c index f820f6bec5..a352148ecb 100644 --- a/board/host/usb_pd_pdo.c +++ b/board/host/usb_pd_pdo.c @@ -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. */ diff --git a/board/host/usb_pd_pdo.h b/board/host/usb_pd_pdo.h index 64d73c7a15..4f1a64dced 100644 --- a/board/host/usb_pd_pdo.h +++ b/board/host/usb_pd_pdo.h @@ -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. */ diff --git a/board/host/usb_pd_policy.c b/board/host/usb_pd_policy.c index fe3e9b6a02..dc965ca192 100644 --- a/board/host/usb_pd_policy.c +++ b/board/host/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/hyperdebug/board.c b/board/hyperdebug/board.c index 9c6363127a..49ed4551f4 100644 --- a/board/hyperdebug/board.c +++ b/board/hyperdebug/board.c @@ -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. */ diff --git a/board/hyperdebug/board.h b/board/hyperdebug/board.h index 1924e740d2..2ebc8467a1 100644 --- a/board/hyperdebug/board.h +++ b/board/hyperdebug/board.h @@ -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. */ diff --git a/board/hyperdebug/build.mk b/board/hyperdebug/build.mk index 140ec9f8c2..d65418f259 100644 --- a/board/hyperdebug/build.mk +++ b/board/hyperdebug/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/hyperdebug/ec.tasklist b/board/hyperdebug/ec.tasklist index 650d5f3550..ed894a7f87 100644 --- a/board/hyperdebug/ec.tasklist +++ b/board/hyperdebug/ec.tasklist @@ -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. */ diff --git a/board/hyperdebug/gpio.inc b/board/hyperdebug/gpio.inc index 5ea99ec7a4..290118edfc 100644 --- a/board/hyperdebug/gpio.inc +++ b/board/hyperdebug/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/icarus/battery.c b/board/icarus/battery.c index 6f6b49899a..5e1671f5f3 100644 --- a/board/icarus/battery.c +++ b/board/icarus/battery.c @@ -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. */ diff --git a/board/icarus/board.c b/board/icarus/board.c index 04f01fb032..be464e3a77 100644 --- a/board/icarus/board.c +++ b/board/icarus/board.c @@ -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. */ @@ -150,13 +150,16 @@ static void board_hpd_status(const struct usb_mux *me, mux_state_t mux_state, host_set_single_event(EC_HOST_EVENT_USB_MUX); } -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_MUX, - .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, - .driver = &it5205_usb_mux_driver, - .hpd_update = &board_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_MUX, + .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, + .driver = &it5205_usb_mux_driver, + .hpd_update = &board_hpd_status, + }, }, }; diff --git a/board/icarus/board.h b/board/icarus/board.h index bf664da5aa..98b6da3fd5 100644 --- a/board/icarus/board.h +++ b/board/icarus/board.h @@ -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. */ diff --git a/board/icarus/build.mk b/board/icarus/build.mk index 9ca7933e2a..a1ca27116e 100644 --- a/board/icarus/build.mk +++ b/board/icarus/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/icarus/ec.tasklist b/board/icarus/ec.tasklist index e8ad538bc2..9b6e29ea07 100644 --- a/board/icarus/ec.tasklist +++ b/board/icarus/ec.tasklist @@ -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. */ diff --git a/board/icarus/gpio.inc b/board/icarus/gpio.inc index a3a097c17b..1ec4c9cc41 100644 --- a/board/icarus/gpio.inc +++ b/board/icarus/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/icarus/led.c b/board/icarus/led.c index c0e6db6874..bbbad7ceb8 100644 --- a/board/icarus/led.c +++ b/board/icarus/led.c @@ -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. * diff --git a/board/it83xx_evb/board.c b/board/it83xx_evb/board.c index a18b8b3b70..37ee2f48ed 100644 --- a/board/it83xx_evb/board.c +++ b/board/it83xx_evb/board.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/it83xx_evb/board.h b/board/it83xx_evb/board.h index 754474174c..d3eec7f09e 100644 --- a/board/it83xx_evb/board.h +++ b/board/it83xx_evb/board.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/it83xx_evb/build.mk b/board/it83xx_evb/build.mk index e4c8c01b89..9a78775633 100644 --- a/board/it83xx_evb/build.mk +++ b/board/it83xx_evb/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2013 The Chromium OS Authors. All rights reserved. +# Copyright 2013 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/it83xx_evb/ec.tasklist b/board/it83xx_evb/ec.tasklist index 3ca78d55db..e5d2d246df 100644 --- a/board/it83xx_evb/ec.tasklist +++ b/board/it83xx_evb/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/it83xx_evb/gpio.inc b/board/it83xx_evb/gpio.inc index 505f91ad64..e3014814d7 100644 --- a/board/it83xx_evb/gpio.inc +++ b/board/it83xx_evb/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2014 The Chromium OS Authors. All rights reserved. + * Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/it8xxx2_evb/board.c b/board/it8xxx2_evb/board.c index 0daa3d48cd..404a575e42 100644 --- a/board/it8xxx2_evb/board.c +++ b/board/it8xxx2_evb/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/it8xxx2_evb/board.h b/board/it8xxx2_evb/board.h index 1369e43496..766f0fab4f 100644 --- a/board/it8xxx2_evb/board.h +++ b/board/it8xxx2_evb/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/it8xxx2_evb/build.mk b/board/it8xxx2_evb/build.mk index b54a2fcbb6..6fefa1fc6c 100644 --- a/board/it8xxx2_evb/build.mk +++ b/board/it8xxx2_evb/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/it8xxx2_evb/ec.tasklist b/board/it8xxx2_evb/ec.tasklist index ff184489e3..a25dab19eb 100644 --- a/board/it8xxx2_evb/ec.tasklist +++ b/board/it8xxx2_evb/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/it8xxx2_evb/gpio.inc b/board/it8xxx2_evb/gpio.inc index e5e7d5e942..32d9de4a05 100644 --- a/board/it8xxx2_evb/gpio.inc +++ b/board/it8xxx2_evb/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/it8xxx2_pdevb/board.c b/board/it8xxx2_pdevb/board.c index 46198f406b..2bcc58a58c 100644 --- a/board/it8xxx2_pdevb/board.c +++ b/board/it8xxx2_pdevb/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/it8xxx2_pdevb/board.h b/board/it8xxx2_pdevb/board.h index 710e878564..e617a015bd 100644 --- a/board/it8xxx2_pdevb/board.h +++ b/board/it8xxx2_pdevb/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/it8xxx2_pdevb/build.mk b/board/it8xxx2_pdevb/build.mk index b54a2fcbb6..6fefa1fc6c 100644 --- a/board/it8xxx2_pdevb/build.mk +++ b/board/it8xxx2_pdevb/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/it8xxx2_pdevb/ec.tasklist b/board/it8xxx2_pdevb/ec.tasklist index 41fc733526..ef1195fe7e 100644 --- a/board/it8xxx2_pdevb/ec.tasklist +++ b/board/it8xxx2_pdevb/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/it8xxx2_pdevb/gpio.inc b/board/it8xxx2_pdevb/gpio.inc index afc83a82c3..a03509507b 100644 --- a/board/it8xxx2_pdevb/gpio.inc +++ b/board/it8xxx2_pdevb/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/jacuzzi/battery.c b/board/jacuzzi/battery.c index d4a33f2cee..1caeb7e3c5 100644 --- a/board/jacuzzi/battery.c +++ b/board/jacuzzi/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/jacuzzi/board.c b/board/jacuzzi/board.c index b248b26f76..129b75f8e2 100644 --- a/board/jacuzzi/board.c +++ b/board/jacuzzi/board.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -173,13 +173,16 @@ static void board_hpd_status(const struct usb_mux *me, mux_state_t mux_state, host_set_single_event(EC_HOST_EVENT_USB_MUX); } -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_MUX, - .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, - .driver = &it5205_usb_mux_driver, - .hpd_update = &board_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_MUX, + .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, + .driver = &it5205_usb_mux_driver, + .hpd_update = &board_hpd_status, + }, }, }; diff --git a/board/jacuzzi/board.h b/board/jacuzzi/board.h index 616c257897..0fd5f6496d 100644 --- a/board/jacuzzi/board.h +++ b/board/jacuzzi/board.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/jacuzzi/build.mk b/board/jacuzzi/build.mk index e449fce9fc..80c34a4e46 100644 --- a/board/jacuzzi/build.mk +++ b/board/jacuzzi/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2018 The Chromium OS Authors. All rights reserved. +# Copyright 2018 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/jacuzzi/ec.tasklist b/board/jacuzzi/ec.tasklist index b695d05a71..dd3b853c27 100644 --- a/board/jacuzzi/ec.tasklist +++ b/board/jacuzzi/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/jacuzzi/gpio.inc b/board/jacuzzi/gpio.inc index 60288e7195..b534ad2ea1 100644 --- a/board/jacuzzi/gpio.inc +++ b/board/jacuzzi/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2018 The Chromium OS Authors. All rights reserved. + * Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/jacuzzi/led.c b/board/jacuzzi/led.c index 0c53bdf41c..f648e879d0 100644 --- a/board/jacuzzi/led.c +++ b/board/jacuzzi/led.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/jinlon/battery.c b/board/jinlon/battery.c index 12c2e38d84..9cf4c15458 100644 --- a/board/jinlon/battery.c +++ b/board/jinlon/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/jinlon/board.c b/board/jinlon/board.c index b5f9f863a3..717c8db09c 100644 --- a/board/jinlon/board.c +++ b/board/jinlon/board.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -151,16 +151,20 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }, }; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { [USB_PD_PORT_TCPC_0] = { - .usb_port = USB_PD_PORT_TCPC_0, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_TCPC_0, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, }, [USB_PD_PORT_TCPC_1] = { - .usb_port = USB_PD_PORT_TCPC_1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_TCPC_1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, } }; diff --git a/board/jinlon/board.h b/board/jinlon/board.h index cbd8da5d62..350376dd63 100644 --- a/board/jinlon/board.h +++ b/board/jinlon/board.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/jinlon/build.mk b/board/jinlon/build.mk index 2d6118ea70..4e42a0616e 100644 --- a/board/jinlon/build.mk +++ b/board/jinlon/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/jinlon/ec.tasklist b/board/jinlon/ec.tasklist index 4a1024a091..829be2b7c8 100644 --- a/board/jinlon/ec.tasklist +++ b/board/jinlon/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/jinlon/gpio.inc b/board/jinlon/gpio.inc index f57a331436..91002dacc1 100644 --- a/board/jinlon/gpio.inc +++ b/board/jinlon/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -17,10 +17,10 @@ GPIO_INT(ACOK_OD, PIN(0, 0), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, ex /* Power sequencing interrupts */ GPIO_INT(SLP_S0_L, PIN(D, 5), GPIO_INT_BOTH, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 GPIO_INT(SLP_S3_L, PIN(A, 5), GPIO_INT_BOTH, power_signal_interrupt) #endif -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 GPIO_INT(SLP_S4_L, PIN(D, 4), GPIO_INT_BOTH, power_signal_interrupt) #endif GPIO_INT(PG_EC_RSMRST_L, PIN(E, 2), GPIO_INT_BOTH, intel_x86_rsmrst_signal_interrupt) diff --git a/board/jinlon/led.c b/board/jinlon/led.c index d25d953dc2..8ab3d7631f 100644 --- a/board/jinlon/led.c +++ b/board/jinlon/led.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/jinlon/thermal.c b/board/jinlon/thermal.c index 3ce641d202..70e6016109 100644 --- a/board/jinlon/thermal.c +++ b/board/jinlon/thermal.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/kakadu/board.c b/board/kakadu/board.c index 97a96e25c2..4be1e3f795 100644 --- a/board/kakadu/board.c +++ b/board/kakadu/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -142,13 +142,16 @@ __override const struct rt946x_init_setting *board_rt946x_init_setting(void) return &battery_init_setting; } -struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_MUX, - .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, - .driver = &it5205_usb_mux_driver, - .hpd_update = &board_hpd_update, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_MUX, + .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, + .driver = &it5205_usb_mux_driver, + .hpd_update = &board_hpd_update, + }, }, }; diff --git a/board/kakadu/board.h b/board/kakadu/board.h index 89a8881fc7..5d64af2f6b 100644 --- a/board/kakadu/board.h +++ b/board/kakadu/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/kakadu/build.mk b/board/kakadu/build.mk index 7a3953b8bb..52ee1b3354 100644 --- a/board/kakadu/build.mk +++ b/board/kakadu/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/kakadu/ec.tasklist b/board/kakadu/ec.tasklist index fc26f445b2..8be28c373d 100644 --- a/board/kakadu/ec.tasklist +++ b/board/kakadu/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/kakadu/gpio.inc b/board/kakadu/gpio.inc index f52f2b7f2f..6f494a9388 100644 --- a/board/kakadu/gpio.inc +++ b/board/kakadu/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/kakadu/led.c b/board/kakadu/led.c index 7d05b6fd0d..26e1ea22bb 100644 --- a/board/kakadu/led.c +++ b/board/kakadu/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/kano/battery.c b/board/kano/battery.c index 395b45371d..0b1d956173 100644 --- a/board/kano/battery.c +++ b/board/kano/battery.c @@ -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. * diff --git a/board/kano/board.c b/board/kano/board.c index d59a1d03da..06f4a543d8 100644 --- a/board/kano/board.c +++ b/board/kano/board.c @@ -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. */ diff --git a/board/kano/board.h b/board/kano/board.h index 7b4f793db9..156df67af0 100644 --- a/board/kano/board.h +++ b/board/kano/board.h @@ -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. */ diff --git a/board/kano/build.mk b/board/kano/build.mk index df453187bf..0393829e6e 100644 --- a/board/kano/build.mk +++ b/board/kano/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/kano/charger.c b/board/kano/charger.c index fbfb3ae90a..ab48a7338c 100644 --- a/board/kano/charger.c +++ b/board/kano/charger.c @@ -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. */ diff --git a/board/kano/ec.tasklist b/board/kano/ec.tasklist index f52567d9fa..64edf7bf2e 100644 --- a/board/kano/ec.tasklist +++ b/board/kano/ec.tasklist @@ -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. */ diff --git a/board/kano/fans.c b/board/kano/fans.c index 8453dd48bc..54ec134fd2 100644 --- a/board/kano/fans.c +++ b/board/kano/fans.c @@ -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. */ diff --git a/board/kano/fw_config.c b/board/kano/fw_config.c index 8127e78b2f..f04fd0063b 100644 --- a/board/kano/fw_config.c +++ b/board/kano/fw_config.c @@ -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. */ diff --git a/board/kano/fw_config.h b/board/kano/fw_config.h index 56218a8f87..9f0c1c3373 100644 --- a/board/kano/fw_config.h +++ b/board/kano/fw_config.h @@ -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. */ diff --git a/board/kano/gpio.inc b/board/kano/gpio.inc index cfcc6bbd3f..2ace5cbbca 100644 --- a/board/kano/gpio.inc +++ b/board/kano/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/kano/i2c.c b/board/kano/i2c.c index e779e119e3..6f5983c928 100644 --- a/board/kano/i2c.c +++ b/board/kano/i2c.c @@ -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. */ diff --git a/board/kano/keyboard.c b/board/kano/keyboard.c index 9e9182331c..a96971c781 100644 --- a/board/kano/keyboard.c +++ b/board/kano/keyboard.c @@ -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. */ diff --git a/board/kano/led.c b/board/kano/led.c index ec1febf29b..1bbfc283de 100644 --- a/board/kano/led.c +++ b/board/kano/led.c @@ -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. * Power and battery LED control for kano diff --git a/board/kano/pwm.c b/board/kano/pwm.c index f2c0d0db7d..6aae786cf3 100644 --- a/board/kano/pwm.c +++ b/board/kano/pwm.c @@ -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. */ diff --git a/board/kano/sensors.c b/board/kano/sensors.c index b89de1def6..5eb1f6f933 100644 --- a/board/kano/sensors.c +++ b/board/kano/sensors.c @@ -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. */ diff --git a/board/kano/usbc_config.c b/board/kano/usbc_config.c index 14df81b696..ed18b2d021 100644 --- a/board/kano/usbc_config.c +++ b/board/kano/usbc_config.c @@ -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. */ @@ -79,43 +79,56 @@ BUILD_ASSERT(ARRAY_SIZE(ppc_chips) == USBC_PORT_COUNT); unsigned int ppc_cnt = ARRAY_SIZE(ppc_chips); /* USBC mux configuration - Alder Lake includes internal mux */ -static const struct usb_mux usbc0_tcss_usb_mux = { - .usb_port = USBC_PORT_C0, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +static const struct usb_mux_chain usbc0_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C0, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; -static const struct usb_mux usbc1_tcss_usb_mux = { - .usb_port = USBC_PORT_C1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +static const struct usb_mux_chain usbc1_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; -struct usb_mux soc_side_bb_retimer_usb_mux = { - .usb_port = USBC_PORT_C1, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_C1_MUX, - .i2c_addr_flags = USBC_PORT_C1_SOC_BB_RETIMER_I2C_ADDR, - .next_mux = &usbc1_tcss_usb_mux, +struct usb_mux_chain soc_side_bb_retimer_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_C1_MUX, + .i2c_addr_flags = USBC_PORT_C1_SOC_BB_RETIMER_I2C_ADDR, + }, + .next = &usbc1_tcss_usb_mux, }; -const struct usb_mux usb_muxes[] = { +const struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_C0_C2_MUX, - .i2c_addr_flags = USBC_PORT_C0_BB_RETIMER_I2C_ADDR, - .next_mux = &usbc0_tcss_usb_mux, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_C0_C2_MUX, + .i2c_addr_flags = USBC_PORT_C0_BB_RETIMER_I2C_ADDR, + }, + .next = &usbc0_tcss_usb_mux, }, [USBC_PORT_C1] = { - .usb_port = USBC_PORT_C1, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_C1_MUX, - .i2c_addr_flags = USBC_PORT_C1_BB_RETIMER_I2C_ADDR, - .next_mux = &soc_side_bb_retimer_usb_mux, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C1, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_C1_MUX, + .i2c_addr_flags = USBC_PORT_C1_BB_RETIMER_I2C_ADDR, + }, + .next = &soc_side_bb_retimer_usb_mux, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/board/kano/usbc_config.h b/board/kano/usbc_config.h index 0422f9fc58..72e26c31c1 100644 --- a/board/kano/usbc_config.h +++ b/board/kano/usbc_config.h @@ -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. */ diff --git a/board/kappa/battery.c b/board/kappa/battery.c index a098e2b8ce..bd8f05b418 100644 --- a/board/kappa/battery.c +++ b/board/kappa/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/kappa/board.c b/board/kappa/board.c index 6610ee647f..c04b24d3ed 100644 --- a/board/kappa/board.c +++ b/board/kappa/board.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -162,13 +162,16 @@ static void board_hpd_status(const struct usb_mux *me, mux_state_t mux_state, host_set_single_event(EC_HOST_EVENT_USB_MUX); } -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_MUX, - .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, - .driver = &it5205_usb_mux_driver, - .hpd_update = &board_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_MUX, + .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, + .driver = &it5205_usb_mux_driver, + .hpd_update = &board_hpd_status, + }, }, }; diff --git a/board/kappa/board.h b/board/kappa/board.h index e8136377d7..6b6461ae83 100644 --- a/board/kappa/board.h +++ b/board/kappa/board.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/kappa/build.mk b/board/kappa/build.mk index e449fce9fc..80c34a4e46 100644 --- a/board/kappa/build.mk +++ b/board/kappa/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2018 The Chromium OS Authors. All rights reserved. +# Copyright 2018 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/kappa/ec.tasklist b/board/kappa/ec.tasklist index c41e203780..3705823bac 100644 --- a/board/kappa/ec.tasklist +++ b/board/kappa/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/kappa/gpio.inc b/board/kappa/gpio.inc index 0e01d54f10..d7d6c5267b 100644 --- a/board/kappa/gpio.inc +++ b/board/kappa/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2018 The Chromium OS Authors. All rights reserved. + * Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/kappa/led.c b/board/kappa/led.c index 60c0e4f294..1c7979eac0 100644 --- a/board/kappa/led.c +++ b/board/kappa/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/karma/board.c b/board/karma/board.c index ed80cde3d2..df053ad782 100644 --- a/board/karma/board.c +++ b/board/karma/board.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/karma/board.h b/board/karma/board.h index 372b18509b..c3b6cd074a 100644 --- a/board/karma/board.h +++ b/board/karma/board.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/karma/build.mk b/board/karma/build.mk index 2554425920..bee5d9f886 100644 --- a/board/karma/build.mk +++ b/board/karma/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2018 The Chromium OS Authors. All rights reserved. +# Copyright 2018 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/karma/ec.tasklist b/board/karma/ec.tasklist index ca4e3b5ee6..829c9f19bc 100644 --- a/board/karma/ec.tasklist +++ b/board/karma/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/karma/gpio.inc b/board/karma/gpio.inc index bdf0ab93be..2f0fef053e 100644 --- a/board/karma/gpio.inc +++ b/board/karma/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2018 The Chromium OS Authors. All rights reserved. + * Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/katsu/board.c b/board/katsu/board.c index 12945e70c3..3527214f62 100644 --- a/board/katsu/board.c +++ b/board/katsu/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -141,13 +141,16 @@ __override const struct rt946x_init_setting *board_rt946x_init_setting(void) return &battery_init_setting; } -struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_MUX, - .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, - .driver = &it5205_usb_mux_driver, - .hpd_update = &board_hpd_update, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_MUX, + .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, + .driver = &it5205_usb_mux_driver, + .hpd_update = &board_hpd_update, + }, }, }; diff --git a/board/katsu/board.h b/board/katsu/board.h index e4494630c9..6f53801ffc 100644 --- a/board/katsu/board.h +++ b/board/katsu/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/katsu/build.mk b/board/katsu/build.mk index 7a3953b8bb..52ee1b3354 100644 --- a/board/katsu/build.mk +++ b/board/katsu/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/katsu/ec.tasklist b/board/katsu/ec.tasklist index fc26f445b2..8be28c373d 100644 --- a/board/katsu/ec.tasklist +++ b/board/katsu/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/katsu/gpio.inc b/board/katsu/gpio.inc index f938153045..82f7ddb3af 100644 --- a/board/katsu/gpio.inc +++ b/board/katsu/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/katsu/led.c b/board/katsu/led.c index f94a474b0c..3ce9466613 100644 --- a/board/katsu/led.c +++ b/board/katsu/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/kindred/battery.c b/board/kindred/battery.c index 9db25ac059..a087d0a85f 100644 --- a/board/kindred/battery.c +++ b/board/kindred/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/kindred/board.c b/board/kindred/board.c index 7e31c17b74..d6c9372d47 100644 --- a/board/kindred/board.c +++ b/board/kindred/board.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -172,16 +172,20 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }, }; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { [USB_PD_PORT_TCPC_0] = { - .usb_port = USB_PD_PORT_TCPC_0, - .driver = &anx7447_usb_mux_driver, - .hpd_update = &anx7447_tcpc_update_hpd_status, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_TCPC_0, + .driver = &anx7447_usb_mux_driver, + .hpd_update = &anx7447_tcpc_update_hpd_status, + }, }, [USB_PD_PORT_TCPC_1] = { - .usb_port = USB_PD_PORT_TCPC_1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_TCPC_1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, } }; diff --git a/board/kindred/board.h b/board/kindred/board.h index d3150078ea..1372887446 100644 --- a/board/kindred/board.h +++ b/board/kindred/board.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/kindred/build.mk b/board/kindred/build.mk index 733912454f..13153c1526 100644 --- a/board/kindred/build.mk +++ b/board/kindred/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/kindred/ec.tasklist b/board/kindred/ec.tasklist index 4a1024a091..829be2b7c8 100644 --- a/board/kindred/ec.tasklist +++ b/board/kindred/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/kindred/gpio.inc b/board/kindred/gpio.inc index 2adb08f564..ec336c5542 100644 --- a/board/kindred/gpio.inc +++ b/board/kindred/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -16,10 +16,10 @@ GPIO_INT(ACOK_OD, PIN(0, 0), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, ex /* Power sequencing interrupts */ GPIO_INT(SLP_S0_L, PIN(D, 5), GPIO_INT_BOTH, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 GPIO_INT(SLP_S3_L, PIN(A, 5), GPIO_INT_BOTH, power_signal_interrupt) #endif -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 GPIO_INT(SLP_S4_L, PIN(D, 4), GPIO_INT_BOTH, power_signal_interrupt) #endif GPIO_INT(PG_EC_RSMRST_L, PIN(E, 2), GPIO_INT_BOTH, intel_x86_rsmrst_signal_interrupt) diff --git a/board/kindred/led.c b/board/kindred/led.c index 87e7f9d1ca..05cc15b617 100644 --- a/board/kindred/led.c +++ b/board/kindred/led.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/kingoftown/battery.c b/board/kingoftown/battery.c index 3fd82bc282..3a74f99907 100644 --- a/board/kingoftown/battery.c +++ b/board/kingoftown/battery.c @@ -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. * diff --git a/board/kingoftown/board.c b/board/kingoftown/board.c index 54e0e495a5..9ee1402380 100644 --- a/board/kingoftown/board.c +++ b/board/kingoftown/board.c @@ -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. */ diff --git a/board/kingoftown/board.h b/board/kingoftown/board.h index 2bee2621ba..6b553f65fa 100644 --- a/board/kingoftown/board.h +++ b/board/kingoftown/board.h @@ -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. */ diff --git a/board/kingoftown/build.mk b/board/kingoftown/build.mk index 5415d90b29..2c5eb4ae2e 100644 --- a/board/kingoftown/build.mk +++ b/board/kingoftown/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/kingoftown/ec.tasklist b/board/kingoftown/ec.tasklist index 5beeb38feb..228828af3c 100644 --- a/board/kingoftown/ec.tasklist +++ b/board/kingoftown/ec.tasklist @@ -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. */ diff --git a/board/kingoftown/gpio.inc b/board/kingoftown/gpio.inc index 612de59128..7147869ea3 100644 --- a/board/kingoftown/gpio.inc +++ b/board/kingoftown/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/kingoftown/hibernate.c b/board/kingoftown/hibernate.c index e32f56db83..9b64e85053 100644 --- a/board/kingoftown/hibernate.c +++ b/board/kingoftown/hibernate.c @@ -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. */ diff --git a/board/kingoftown/led.c b/board/kingoftown/led.c index ded9586f52..2bbb0de0af 100644 --- a/board/kingoftown/led.c +++ b/board/kingoftown/led.c @@ -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. * diff --git a/board/kingoftown/switchcap.c b/board/kingoftown/switchcap.c index 16b0db6ef6..5173e27f75 100644 --- a/board/kingoftown/switchcap.c +++ b/board/kingoftown/switchcap.c @@ -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. */ diff --git a/board/kingoftown/usbc_config.c b/board/kingoftown/usbc_config.c index ca0820da84..f0f17e93a9 100644 --- a/board/kingoftown/usbc_config.c +++ b/board/kingoftown/usbc_config.c @@ -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. */ @@ -168,16 +168,22 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { * to AP. But the TCPC chip is also needed to know the HPD status; otherwise, * the mux misbehaves. */ -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, }, { - .usb_port = 1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, } }; diff --git a/board/kingoftown/usbc_config.h b/board/kingoftown/usbc_config.h index 654da35f74..7718aea74c 100644 --- a/board/kingoftown/usbc_config.h +++ b/board/kingoftown/usbc_config.h @@ -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. */ diff --git a/board/kinox/board.c b/board/kinox/board.c index d88e76de7e..7c55fba876 100644 --- a/board/kinox/board.c +++ b/board/kinox/board.c @@ -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. */ diff --git a/board/kinox/board.h b/board/kinox/board.h index c473c1a9a7..5e22e22269 100644 --- a/board/kinox/board.h +++ b/board/kinox/board.h @@ -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. */ diff --git a/board/kinox/build.mk b/board/kinox/build.mk index 440d137968..3eb2d2b2d5 100644 --- a/board/kinox/build.mk +++ b/board/kinox/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/kinox/ec.tasklist b/board/kinox/ec.tasklist index 025d8f86b4..6524d9c2b0 100644 --- a/board/kinox/ec.tasklist +++ b/board/kinox/ec.tasklist @@ -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. */ diff --git a/board/kinox/fans.c b/board/kinox/fans.c index 60cf5878d6..cb65e95f62 100644 --- a/board/kinox/fans.c +++ b/board/kinox/fans.c @@ -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. */ diff --git a/board/kinox/fw_config.c b/board/kinox/fw_config.c index f710ad1ed4..9736de1110 100644 --- a/board/kinox/fw_config.c +++ b/board/kinox/fw_config.c @@ -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. */ diff --git a/board/kinox/fw_config.h b/board/kinox/fw_config.h index 8e30af576a..a3efa7bfe9 100644 --- a/board/kinox/fw_config.h +++ b/board/kinox/fw_config.h @@ -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. */ diff --git a/board/kinox/gpio.inc b/board/kinox/gpio.inc index 6e2784e081..f3d94ebf07 100644 --- a/board/kinox/gpio.inc +++ b/board/kinox/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/kinox/i2c.c b/board/kinox/i2c.c index d58deaa89a..0213134fcb 100644 --- a/board/kinox/i2c.c +++ b/board/kinox/i2c.c @@ -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. */ diff --git a/board/kinox/led.c b/board/kinox/led.c index 2ddb14aa52..d2a9a599cf 100644 --- a/board/kinox/led.c +++ b/board/kinox/led.c @@ -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. * diff --git a/board/kinox/power_detection.c b/board/kinox/power_detection.c index 5e833737c2..c5b4a1a1ab 100644 --- a/board/kinox/power_detection.c +++ b/board/kinox/power_detection.c @@ -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. */ diff --git a/board/kinox/pwm.c b/board/kinox/pwm.c index f47008ceb9..ce1f83e187 100644 --- a/board/kinox/pwm.c +++ b/board/kinox/pwm.c @@ -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. */ diff --git a/board/kinox/sensors.c b/board/kinox/sensors.c index 7272e1b711..86c60b1427 100644 --- a/board/kinox/sensors.c +++ b/board/kinox/sensors.c @@ -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. */ diff --git a/board/kinox/usbc_config.c b/board/kinox/usbc_config.c index a2b8fdca3e..feeb3be6d1 100644 --- a/board/kinox/usbc_config.c +++ b/board/kinox/usbc_config.c @@ -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. */ @@ -61,19 +61,24 @@ BUILD_ASSERT(ARRAY_SIZE(ppc_chips) == USBC_PORT_COUNT); unsigned int ppc_cnt = ARRAY_SIZE(ppc_chips); /* USBC mux configuration - Alder Lake includes internal mux */ -static const struct usb_mux usbc0_usb3_retimer = { - .usb_port = USBC_PORT_C0, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, +static const struct usb_mux_chain usbc0_usb3_retimer = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C0, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, }; -const struct usb_mux usb_muxes[] = { +const struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - /* PS8815 */ - .usb_port = USBC_PORT_C0, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, - .next_mux = &usbc0_usb3_retimer, + .mux = &(const struct usb_mux) { + /* PS8815 */ + .usb_port = USBC_PORT_C0, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, + .next = &usbc0_usb3_retimer, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/board/kinox/usbc_config.h b/board/kinox/usbc_config.h index 439d36e19a..7a212f8fb6 100644 --- a/board/kinox/usbc_config.h +++ b/board/kinox/usbc_config.h @@ -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. */ diff --git a/board/kodama/battery.c b/board/kodama/battery.c index 727ad83727..1c6737bd3a 100644 --- a/board/kodama/battery.c +++ b/board/kodama/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/kodama/board.c b/board/kodama/board.c index eb8069ab4a..5ebcf00d40 100644 --- a/board/kodama/board.c +++ b/board/kodama/board.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -144,13 +144,16 @@ __override const struct rt946x_init_setting *board_rt946x_init_setting(void) return &battery_init_setting; } -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_MUX, - .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, - .driver = &it5205_usb_mux_driver, - .hpd_update = &board_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_MUX, + .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, + .driver = &it5205_usb_mux_driver, + .hpd_update = &board_hpd_status, + }, }, }; diff --git a/board/kodama/board.h b/board/kodama/board.h index 9bfc0ff89f..b16e9f84a7 100644 --- a/board/kodama/board.h +++ b/board/kodama/board.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/kodama/build.mk b/board/kodama/build.mk index 0b3565fd84..6a7e557a0e 100644 --- a/board/kodama/build.mk +++ b/board/kodama/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/kodama/ec.tasklist b/board/kodama/ec.tasklist index f71a208dd6..e66c52616b 100644 --- a/board/kodama/ec.tasklist +++ b/board/kodama/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/kodama/gpio.inc b/board/kodama/gpio.inc index 75a3db7d20..d72532ff70 100644 --- a/board/kodama/gpio.inc +++ b/board/kodama/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/kodama/led.c b/board/kodama/led.c index 2abfd55353..d6c4297a44 100644 --- a/board/kodama/led.c +++ b/board/kodama/led.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/kohaku/battery.c b/board/kohaku/battery.c index 8d35008f6e..693c5b5221 100644 --- a/board/kohaku/battery.c +++ b/board/kohaku/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/kohaku/board.c b/board/kohaku/board.c index 5c704b718e..42a5304353 100644 --- a/board/kohaku/board.c +++ b/board/kohaku/board.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -129,16 +129,20 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }, }; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { [USB_PD_PORT_TCPC_0] = { - .usb_port = USB_PD_PORT_TCPC_0, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_TCPC_0, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, }, [USB_PD_PORT_TCPC_1] = { - .usb_port = USB_PD_PORT_TCPC_1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_TCPC_1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, } }; diff --git a/board/kohaku/board.h b/board/kohaku/board.h index 8b1339fc89..d120e308aa 100644 --- a/board/kohaku/board.h +++ b/board/kohaku/board.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/kohaku/build.mk b/board/kohaku/build.mk index 733912454f..13153c1526 100644 --- a/board/kohaku/build.mk +++ b/board/kohaku/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/kohaku/ec.tasklist b/board/kohaku/ec.tasklist index 63d366a33b..7fb3e38b63 100644 --- a/board/kohaku/ec.tasklist +++ b/board/kohaku/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/kohaku/gpio.inc b/board/kohaku/gpio.inc index 742a570cf8..eaddb14e2b 100644 --- a/board/kohaku/gpio.inc +++ b/board/kohaku/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -16,10 +16,10 @@ GPIO_INT(ACOK_OD, PIN(0, 0), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, ex /* Power sequencing interrupts */ GPIO_INT(SLP_S0_L, PIN(D, 5), GPIO_INT_BOTH, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 GPIO_INT(SLP_S3_L, PIN(A, 5), GPIO_INT_BOTH, power_signal_interrupt) #endif -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 GPIO_INT(SLP_S4_L, PIN(D, 4), GPIO_INT_BOTH, power_signal_interrupt) #endif GPIO_INT(PG_EC_RSMRST_L, PIN(E, 2), GPIO_INT_BOTH, intel_x86_rsmrst_signal_interrupt) diff --git a/board/kohaku/led.c b/board/kohaku/led.c index afb6122fa3..2fbf2da3a5 100644 --- a/board/kohaku/led.c +++ b/board/kohaku/led.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/kracko/battery.c b/board/kracko/battery.c index 13faf9f12b..4b8bbb7351 100644 --- a/board/kracko/battery.c +++ b/board/kracko/battery.c @@ -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. * diff --git a/board/kracko/board.c b/board/kracko/board.c index 722c7ac3e2..136b05ea1e 100644 --- a/board/kracko/board.c +++ b/board/kracko/board.c @@ -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. */ @@ -244,19 +244,25 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }; /* USB Muxes */ -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_C0, - .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, - .driver = &it5205_usb_mux_driver, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_C0, + .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, + .driver = &it5205_usb_mux_driver, + }, }, { - .usb_port = 1, - .i2c_port = I2C_PORT_SUB_USB_C1, - .i2c_addr_flags = PS8XXX_I2C_ADDR1_FLAGS, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .i2c_port = I2C_PORT_SUB_USB_C1, + .i2c_addr_flags = PS8XXX_I2C_ADDR1_FLAGS, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, }, }; diff --git a/board/kracko/board.h b/board/kracko/board.h index a33131803c..78b1be8662 100644 --- a/board/kracko/board.h +++ b/board/kracko/board.h @@ -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. */ diff --git a/board/kracko/build.mk b/board/kracko/build.mk index 8167ca9966..01b890bf29 100644 --- a/board/kracko/build.mk +++ b/board/kracko/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/kracko/cbi_ssfc.c b/board/kracko/cbi_ssfc.c index 39fd4929a1..81f3ee0dad 100644 --- a/board/kracko/cbi_ssfc.c +++ b/board/kracko/cbi_ssfc.c @@ -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. */ diff --git a/board/kracko/cbi_ssfc.h b/board/kracko/cbi_ssfc.h index 942f0cf5f4..bf8853a43a 100644 --- a/board/kracko/cbi_ssfc.h +++ b/board/kracko/cbi_ssfc.h @@ -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. */ diff --git a/board/kracko/ec.tasklist b/board/kracko/ec.tasklist index 5c9a2d1a01..c13df44543 100644 --- a/board/kracko/ec.tasklist +++ b/board/kracko/ec.tasklist @@ -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. */ diff --git a/board/kracko/gpio.inc b/board/kracko/gpio.inc index cdcf8834c7..a138a925f3 100644 --- a/board/kracko/gpio.inc +++ b/board/kracko/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/kracko/led.c b/board/kracko/led.c index 5ebb483219..22a906807b 100644 --- a/board/kracko/led.c +++ b/board/kracko/led.c @@ -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. */ diff --git a/board/kracko/usb_pd_policy.c b/board/kracko/usb_pd_policy.c index 54fa6f6933..8a2c07c575 100644 --- a/board/kracko/usb_pd_policy.c +++ b/board/kracko/usb_pd_policy.c @@ -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. */ diff --git a/board/kukui/board.c b/board/kukui/board.c index 91c6f0192a..6fafc949e1 100644 --- a/board/kukui/board.c +++ b/board/kukui/board.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -158,13 +158,17 @@ __override const struct rt946x_init_setting *board_rt946x_init_setting(void) return &battery_init_setting; } -struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +struct usb_mux usbc0_mux0 = { + .usb_port = 0, + .i2c_port = I2C_PORT_USB_MUX, + .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, + .driver = &it5205_usb_mux_driver, + .hpd_update = &board_hpd_update, +}; + +struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_MUX, - .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, - .driver = &it5205_usb_mux_driver, - .hpd_update = &board_hpd_update, + .mux = &usbc0_mux0, }, }; @@ -359,8 +363,8 @@ static void board_rev_init(void) if (board_get_version() < 5) { gpio_set_flags(GPIO_USB_C0_DP_OE_L, GPIO_OUT_HIGH); gpio_set_flags(GPIO_USB_C0_DP_POLARITY, GPIO_OUT_LOW); - usb_muxes[0].driver = &virtual_usb_mux_driver; - usb_muxes[0].hpd_update = &virtual_hpd_update; + usbc0_mux0.driver = &virtual_usb_mux_driver; + usbc0_mux0.hpd_update = &virtual_hpd_update; } } DECLARE_HOOK(HOOK_INIT, board_rev_init, HOOK_PRIO_INIT_ADC + 1); diff --git a/board/kukui/board.h b/board/kukui/board.h index 91ccd000f9..94c05a1209 100644 --- a/board/kukui/board.h +++ b/board/kukui/board.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/kukui/build.mk b/board/kukui/build.mk index 694879cee6..b60b9cf091 100644 --- a/board/kukui/build.mk +++ b/board/kukui/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2018 The Chromium OS Authors. All rights reserved. +# Copyright 2018 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/kukui/ec.tasklist b/board/kukui/ec.tasklist index 9ba564ce52..2551038b66 100644 --- a/board/kukui/ec.tasklist +++ b/board/kukui/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/kukui/gpio.inc b/board/kukui/gpio.inc index eed1fea828..efac70d681 100644 --- a/board/kukui/gpio.inc +++ b/board/kukui/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2018 The Chromium OS Authors. All rights reserved. + * Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/kukui/led.c b/board/kukui/led.c index 9c4afcc0da..9cfdf855be 100644 --- a/board/kukui/led.c +++ b/board/kukui/led.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/kukui_scp/board.c b/board/kukui_scp/board.c index d86e7e5fc6..7eab3c59a6 100644 --- a/board/kukui_scp/board.c +++ b/board/kukui_scp/board.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/kukui_scp/board.h b/board/kukui_scp/board.h index 16aba19948..64104060ab 100644 --- a/board/kukui_scp/board.h +++ b/board/kukui_scp/board.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/kukui_scp/build.mk b/board/kukui_scp/build.mk index 0fdaa1c820..f04d506057 100644 --- a/board/kukui_scp/build.mk +++ b/board/kukui_scp/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2018 The Chromium OS Authors. All rights reserved. +# Copyright 2018 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/kukui_scp/ec.tasklist b/board/kukui_scp/ec.tasklist index 935d409b00..82bb6db382 100644 --- a/board/kukui_scp/ec.tasklist +++ b/board/kukui_scp/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/kukui_scp/fd.c b/board/kukui_scp/fd.c index 09f4f64f27..be0bdeab57 100644 --- a/board/kukui_scp/fd.c +++ b/board/kukui_scp/fd.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/kukui_scp/fd.h b/board/kukui_scp/fd.h index 3f70387400..cea5817942 100644 --- a/board/kukui_scp/fd.h +++ b/board/kukui_scp/fd.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/kukui_scp/gpio.inc b/board/kukui_scp/gpio.inc index b186904aad..6cc2e0495e 100644 --- a/board/kukui_scp/gpio.inc +++ b/board/kukui_scp/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2018 The Chromium OS Authors. All rights reserved. + * Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/kukui_scp/isp_p1_srv.c b/board/kukui_scp/isp_p1_srv.c index 39b2a41a07..40dd37ff90 100644 --- a/board/kukui_scp/isp_p1_srv.c +++ b/board/kukui_scp/isp_p1_srv.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/kukui_scp/isp_p1_srv.h b/board/kukui_scp/isp_p1_srv.h index dbecef96d9..e0abe9e4c8 100644 --- a/board/kukui_scp/isp_p1_srv.h +++ b/board/kukui_scp/isp_p1_srv.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/kukui_scp/isp_p2_srv.c b/board/kukui_scp/isp_p2_srv.c index a21cd585b5..f38d4401ff 100644 --- a/board/kukui_scp/isp_p2_srv.c +++ b/board/kukui_scp/isp_p2_srv.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/kukui_scp/isp_p2_srv.h b/board/kukui_scp/isp_p2_srv.h index 63db5791e3..3c1ba50f1c 100644 --- a/board/kukui_scp/isp_p2_srv.h +++ b/board/kukui_scp/isp_p2_srv.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/kukui_scp/mdp_ipi_message.c b/board/kukui_scp/mdp_ipi_message.c index 934ac1be1f..f0bf7f2f92 100644 --- a/board/kukui_scp/mdp_ipi_message.c +++ b/board/kukui_scp/mdp_ipi_message.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/kukui_scp/mdp_ipi_message.h b/board/kukui_scp/mdp_ipi_message.h index 173b9487ec..0e46b947b2 100644 --- a/board/kukui_scp/mdp_ipi_message.h +++ b/board/kukui_scp/mdp_ipi_message.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/kukui_scp/update_scp b/board/kukui_scp/update_scp index 448a8f74db..67aaacdcdc 100755 --- a/board/kukui_scp/update_scp +++ b/board/kukui_scp/update_scp @@ -1,5 +1,5 @@ #!/bin/bash -# 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. diff --git a/board/kukui_scp/vdec.c b/board/kukui_scp/vdec.c index 13620e0211..317d83d0d5 100644 --- a/board/kukui_scp/vdec.c +++ b/board/kukui_scp/vdec.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/kukui_scp/vdec.h b/board/kukui_scp/vdec.h index ddb7d1f36f..9284c28a40 100644 --- a/board/kukui_scp/vdec.h +++ b/board/kukui_scp/vdec.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/kukui_scp/venc.c b/board/kukui_scp/venc.c index cd6ae7550b..1f07a6eea0 100644 --- a/board/kukui_scp/venc.c +++ b/board/kukui_scp/venc.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/kukui_scp/venc.h b/board/kukui_scp/venc.h index b1337c194d..1fc8421795 100644 --- a/board/kukui_scp/venc.h +++ b/board/kukui_scp/venc.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/kuldax/board.c b/board/kuldax/board.c index 953d1da6da..44b7dfdc3f 100644 --- a/board/kuldax/board.c +++ b/board/kuldax/board.c @@ -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. */ diff --git a/board/kuldax/board.h b/board/kuldax/board.h index 8b9bc2833a..64804bf16a 100644 --- a/board/kuldax/board.h +++ b/board/kuldax/board.h @@ -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. */ diff --git a/board/kuldax/build.mk b/board/kuldax/build.mk index 9c668e0e2a..3de758d1bd 100644 --- a/board/kuldax/build.mk +++ b/board/kuldax/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/kuldax/ec.tasklist b/board/kuldax/ec.tasklist index 13d51d7bd6..23218133a8 100644 --- a/board/kuldax/ec.tasklist +++ b/board/kuldax/ec.tasklist @@ -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. */ diff --git a/board/kuldax/fans.c b/board/kuldax/fans.c index 89ed0f90bc..a2acd805f8 100644 --- a/board/kuldax/fans.c +++ b/board/kuldax/fans.c @@ -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. */ diff --git a/board/kuldax/fw_config.c b/board/kuldax/fw_config.c index 5b987f7ebc..3ee71e6a0f 100644 --- a/board/kuldax/fw_config.c +++ b/board/kuldax/fw_config.c @@ -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. */ diff --git a/board/kuldax/fw_config.h b/board/kuldax/fw_config.h index ff1f3583fe..95d81f1e05 100644 --- a/board/kuldax/fw_config.h +++ b/board/kuldax/fw_config.h @@ -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. */ diff --git a/board/kuldax/gpio.inc b/board/kuldax/gpio.inc index 0c43d7734f..253d9b7fc3 100644 --- a/board/kuldax/gpio.inc +++ b/board/kuldax/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/kuldax/i2c.c b/board/kuldax/i2c.c index b114cfe64d..b38080f6a5 100644 --- a/board/kuldax/i2c.c +++ b/board/kuldax/i2c.c @@ -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. */ diff --git a/board/kuldax/led.c b/board/kuldax/led.c index 386e7e6137..842cee0530 100644 --- a/board/kuldax/led.c +++ b/board/kuldax/led.c @@ -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. * diff --git a/board/kuldax/pwm.c b/board/kuldax/pwm.c index 15cb430fcf..fe7e82894a 100644 --- a/board/kuldax/pwm.c +++ b/board/kuldax/pwm.c @@ -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. */ diff --git a/board/kuldax/sensors.c b/board/kuldax/sensors.c index ac9f5f9971..96f49de8a3 100644 --- a/board/kuldax/sensors.c +++ b/board/kuldax/sensors.c @@ -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. */ diff --git a/board/kuldax/usbc_config.c b/board/kuldax/usbc_config.c index a048dcbe22..c0d34fc581 100644 --- a/board/kuldax/usbc_config.c +++ b/board/kuldax/usbc_config.c @@ -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. */ @@ -57,20 +57,25 @@ struct ppc_config_t ppc_chips[CONFIG_USB_PD_PORT_MAX_COUNT] = { unsigned int ppc_cnt = ARRAY_SIZE(ppc_chips); /* USBC mux configuration - Alder Lake includes internal mux */ -static const struct usb_mux usbc0_tcss_usb_mux = { - .usb_port = USBC_PORT_C0, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +static const struct usb_mux_chain usbc0_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C0, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_C0_C2_MUX, - .i2c_addr_flags = USBC_PORT_C0_BB_RETIMER_I2C_ADDR, - .next_mux = &usbc0_tcss_usb_mux, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_C0_C2_MUX, + .i2c_addr_flags = USBC_PORT_C0_BB_RETIMER_I2C_ADDR, + }, + .next = &usbc0_tcss_usb_mux, }, }; diff --git a/board/kuldax/usbc_config.h b/board/kuldax/usbc_config.h index 439d36e19a..7a212f8fb6 100644 --- a/board/kuldax/usbc_config.h +++ b/board/kuldax/usbc_config.h @@ -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. */ diff --git a/board/lalala/battery.c b/board/lalala/battery.c index 326ac93a6b..4edf5fa864 100644 --- a/board/lalala/battery.c +++ b/board/lalala/battery.c @@ -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. * diff --git a/board/lalala/board.c b/board/lalala/board.c index 1cf225b6f2..78404d6821 100644 --- a/board/lalala/board.c +++ b/board/lalala/board.c @@ -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. */ @@ -726,18 +726,24 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }, }; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_C0, - .i2c_addr_flags = PI3USB3X532_I2C_ADDR0, - .driver = &pi3usb3x532_usb_mux_driver, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_C0, + .i2c_addr_flags = PI3USB3X532_I2C_ADDR0, + .driver = &pi3usb3x532_usb_mux_driver, + }, }, { - .usb_port = 1, - .i2c_port = I2C_PORT_SUB_USB_C1, - .i2c_addr_flags = PS8802_I2C_ADDR_FLAGS_CUSTOM, - .driver = &ps8802_usb_mux_driver, + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .i2c_port = I2C_PORT_SUB_USB_C1, + .i2c_addr_flags = PS8802_I2C_ADDR_FLAGS_CUSTOM, + .driver = &ps8802_usb_mux_driver, + }, } }; diff --git a/board/lalala/board.h b/board/lalala/board.h index 05ebabe24a..4967e49752 100644 --- a/board/lalala/board.h +++ b/board/lalala/board.h @@ -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. */ diff --git a/board/lalala/build.mk b/board/lalala/build.mk index b012d8d502..eb422dae93 100644 --- a/board/lalala/build.mk +++ b/board/lalala/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/lalala/cbi_ssfc.c b/board/lalala/cbi_ssfc.c index 39fd4929a1..81f3ee0dad 100644 --- a/board/lalala/cbi_ssfc.c +++ b/board/lalala/cbi_ssfc.c @@ -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. */ diff --git a/board/lalala/cbi_ssfc.h b/board/lalala/cbi_ssfc.h index 942f0cf5f4..bf8853a43a 100644 --- a/board/lalala/cbi_ssfc.h +++ b/board/lalala/cbi_ssfc.h @@ -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. */ diff --git a/board/lalala/ec.tasklist b/board/lalala/ec.tasklist index d4fb416bce..29666dd959 100644 --- a/board/lalala/ec.tasklist +++ b/board/lalala/ec.tasklist @@ -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. */ diff --git a/board/lalala/gpio.inc b/board/lalala/gpio.inc index 3d81cd089d..8d37079ca4 100644 --- a/board/lalala/gpio.inc +++ b/board/lalala/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/lalala/led.c b/board/lalala/led.c index a726ebcd84..db36e2cb0b 100644 --- a/board/lalala/led.c +++ b/board/lalala/led.c @@ -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. * diff --git a/board/lalala/usb_pd_policy.c b/board/lalala/usb_pd_policy.c index 98b770be8f..3410726e87 100644 --- a/board/lalala/usb_pd_policy.c +++ b/board/lalala/usb_pd_policy.c @@ -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. */ diff --git a/board/lantis/battery.c b/board/lantis/battery.c index 9f9deddb2b..6dfb91ef50 100644 --- a/board/lantis/battery.c +++ b/board/lantis/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/lantis/board.c b/board/lantis/board.c index 5e705bae93..08fc84e222 100644 --- a/board/lantis/board.c +++ b/board/lantis/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -261,19 +261,25 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }; /* USB Muxes */ -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_C0, - .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, - .driver = &it5205_usb_mux_driver, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_C0, + .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, + .driver = &it5205_usb_mux_driver, + }, }, { - .usb_port = 1, - .i2c_port = I2C_PORT_SUB_USB_C1, - .i2c_addr_flags = PS8XXX_I2C_ADDR1_FLAGS, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .i2c_port = I2C_PORT_SUB_USB_C1, + .i2c_addr_flags = PS8XXX_I2C_ADDR1_FLAGS, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, }, }; diff --git a/board/lantis/board.h b/board/lantis/board.h index 4db3fd3d0f..bda4b01280 100644 --- a/board/lantis/board.h +++ b/board/lantis/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/lantis/build.mk b/board/lantis/build.mk index 806168ea0d..9b862c7624 100644 --- a/board/lantis/build.mk +++ b/board/lantis/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/lantis/cbi_ssfc.c b/board/lantis/cbi_ssfc.c index 39fd4929a1..81f3ee0dad 100644 --- a/board/lantis/cbi_ssfc.c +++ b/board/lantis/cbi_ssfc.c @@ -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. */ diff --git a/board/lantis/cbi_ssfc.h b/board/lantis/cbi_ssfc.h index b2cd930d8b..e6606e8b1b 100644 --- a/board/lantis/cbi_ssfc.h +++ b/board/lantis/cbi_ssfc.h @@ -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. */ diff --git a/board/lantis/ec.tasklist b/board/lantis/ec.tasklist index 2edf48ee05..c3c360febb 100644 --- a/board/lantis/ec.tasklist +++ b/board/lantis/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/lantis/gpio.inc b/board/lantis/gpio.inc index 2be82d2358..6afb9ccc4b 100644 --- a/board/lantis/gpio.inc +++ b/board/lantis/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/lantis/led.c b/board/lantis/led.c index 2624933b7f..d6dbc929a8 100644 --- a/board/lantis/led.c +++ b/board/lantis/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/lantis/usb_pd_policy.c b/board/lantis/usb_pd_policy.c index ef687f0f9c..2433b25431 100644 --- a/board/lantis/usb_pd_policy.c +++ b/board/lantis/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/lazor/battery.c b/board/lazor/battery.c index 6cad716e2c..61de35da12 100644 --- a/board/lazor/battery.c +++ b/board/lazor/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/lazor/board.c b/board/lazor/board.c index f61da16406..974f09e55f 100644 --- a/board/lazor/board.c +++ b/board/lazor/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/lazor/board.h b/board/lazor/board.h index a7f825b5b7..427db5e82e 100644 --- a/board/lazor/board.h +++ b/board/lazor/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/lazor/build.mk b/board/lazor/build.mk index 8cf8679e35..c17ab5e40c 100644 --- a/board/lazor/build.mk +++ b/board/lazor/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/lazor/ec.tasklist b/board/lazor/ec.tasklist index 2b55c26c20..92d5a1dde1 100644 --- a/board/lazor/ec.tasklist +++ b/board/lazor/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/lazor/gpio.inc b/board/lazor/gpio.inc index b5c15b3729..c7af05eb3b 100644 --- a/board/lazor/gpio.inc +++ b/board/lazor/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/lazor/hibernate.c b/board/lazor/hibernate.c index d262a33121..67d9b30791 100644 --- a/board/lazor/hibernate.c +++ b/board/lazor/hibernate.c @@ -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. */ diff --git a/board/lazor/led.c b/board/lazor/led.c index be3658bff6..cf1f68d77e 100644 --- a/board/lazor/led.c +++ b/board/lazor/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/lazor/sku.c b/board/lazor/sku.c index d1843b8fe1..625231f5a9 100644 --- a/board/lazor/sku.c +++ b/board/lazor/sku.c @@ -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. */ diff --git a/board/lazor/sku.h b/board/lazor/sku.h index 85f549858a..3ba687939d 100644 --- a/board/lazor/sku.h +++ b/board/lazor/sku.h @@ -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. */ diff --git a/board/lazor/switchcap.c b/board/lazor/switchcap.c index d5c7a0b764..f18378cab7 100644 --- a/board/lazor/switchcap.c +++ b/board/lazor/switchcap.c @@ -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. */ diff --git a/board/lazor/usbc_config.c b/board/lazor/usbc_config.c index a9390db9bb..11cc649573 100644 --- a/board/lazor/usbc_config.c +++ b/board/lazor/usbc_config.c @@ -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. */ @@ -186,16 +186,22 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { * to AP. But the TCPC chip is also needed to know the HPD status; otherwise, * the mux misbehaves. */ -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, }, { - .usb_port = 1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, } }; diff --git a/board/lazor/usbc_config.h b/board/lazor/usbc_config.h index 9c1d8d1e74..53d6df3983 100644 --- a/board/lazor/usbc_config.h +++ b/board/lazor/usbc_config.h @@ -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. */ diff --git a/board/liara/battery.c b/board/liara/battery.c index bf244125b0..291925cd06 100644 --- a/board/liara/battery.c +++ b/board/liara/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/liara/board.c b/board/liara/board.c index 6a32557f43..f51fa1e2dd 100644 --- a/board/liara/board.c +++ b/board/liara/board.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/liara/board.h b/board/liara/board.h index dbd31d8483..4ef9a11793 100644 --- a/board/liara/board.h +++ b/board/liara/board.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/liara/build.mk b/board/liara/build.mk index c808e65aed..d24127ddae 100644 --- a/board/liara/build.mk +++ b/board/liara/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2015 The Chromium OS Authors. All rights reserved. +# Copyright 2015 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/liara/ec.tasklist b/board/liara/ec.tasklist index b562761311..24300fe7da 100644 --- a/board/liara/ec.tasklist +++ b/board/liara/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/liara/gpio.inc b/board/liara/gpio.inc index 343c50f503..a1c3e1a25f 100644 --- a/board/liara/gpio.inc +++ b/board/liara/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2017 The Chromium OS Authors. All rights reserved. + * Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/liara/led.c b/board/liara/led.c index db4e00bc2f..45cc43edc8 100644 --- a/board/liara/led.c +++ b/board/liara/led.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/lick/battery.c b/board/lick/battery.c index fa746a8c9f..01ab23dd3b 100644 --- a/board/lick/battery.c +++ b/board/lick/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/lick/board.c b/board/lick/board.c index 0714e54cbc..d20aad2968 100644 --- a/board/lick/board.c +++ b/board/lick/board.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/lick/board.h b/board/lick/board.h index 7f84f31aae..05f24f141d 100644 --- a/board/lick/board.h +++ b/board/lick/board.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/lick/build.mk b/board/lick/build.mk index 137e208b53..fee77e38b5 100644 --- a/board/lick/build.mk +++ b/board/lick/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/lick/ec.tasklist b/board/lick/ec.tasklist index 6eac78a042..6c56976091 100644 --- a/board/lick/ec.tasklist +++ b/board/lick/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/lick/gpio.inc b/board/lick/gpio.inc index ad6773a211..3a553f6e91 100644 --- a/board/lick/gpio.inc +++ b/board/lick/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/lick/led.c b/board/lick/led.c index 21361fc64a..80972c468b 100644 --- a/board/lick/led.c +++ b/board/lick/led.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/lindar/battery.c b/board/lindar/battery.c index e12d521dab..e206a5c6aa 100644 --- a/board/lindar/battery.c +++ b/board/lindar/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/lindar/board.c b/board/lindar/board.c index 23d58fbf28..5bb155550e 100644 --- a/board/lindar/board.c +++ b/board/lindar/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -525,25 +525,32 @@ BUILD_ASSERT(CONFIG_USB_PD_PORT_MAX_COUNT == USBC_PORT_COUNT); /******************************************************************************/ /* USBC mux configuration - Tiger Lake includes internal mux */ -static const struct usb_mux usbc1_usb3_db_retimer = { - .usb_port = USBC_PORT_C1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, - .next_mux = NULL, +static const struct usb_mux_chain usbc1_usb3_db_retimer = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, + .next = NULL, }; -const struct usb_mux usb_muxes[] = { +const struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, - .next_mux = NULL, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, + .next = NULL, }, [USBC_PORT_C1] = { - .usb_port = USBC_PORT_C1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, - .next_mux = &usbc1_usb3_db_retimer, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C1, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, + .next = &usbc1_usb3_db_retimer, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/board/lindar/board.h b/board/lindar/board.h index 5681295207..7c407d05a7 100644 --- a/board/lindar/board.h +++ b/board/lindar/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/lindar/build.mk b/board/lindar/build.mk index 43b40c644c..d590255d2a 100644 --- a/board/lindar/build.mk +++ b/board/lindar/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/lindar/ec.tasklist b/board/lindar/ec.tasklist index 3e20d8ae39..c29125d517 100644 --- a/board/lindar/ec.tasklist +++ b/board/lindar/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/lindar/gpio.inc b/board/lindar/gpio.inc index 30dd2a3920..f8c036b96c 100644 --- a/board/lindar/gpio.inc +++ b/board/lindar/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -16,7 +16,7 @@ GPIO_INT(ACOK_OD, PIN(0, 0), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, ex /* Power sequencing interrupts */ GPIO_INT(SLP_S0_L, PIN(D, 5), GPIO_INT_BOTH, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 GPIO_INT(SLP_S3_L, PIN(A, 5), GPIO_INT_BOTH, power_signal_interrupt) #endif GPIO_INT(SLP_SUS_L, PIN(D, 7), GPIO_INT_BOTH, power_signal_interrupt) diff --git a/board/lindar/ktd20xx.h b/board/lindar/ktd20xx.h index 80689946a6..63e3bfb363 100644 --- a/board/lindar/ktd20xx.h +++ b/board/lindar/ktd20xx.h @@ -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. * diff --git a/board/lindar/led.c b/board/lindar/led.c index 4c088c3bf0..9ad7b48fb2 100644 --- a/board/lindar/led.c +++ b/board/lindar/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/madoo/battery.c b/board/madoo/battery.c index f3c87c7455..b37cb463dd 100644 --- a/board/madoo/battery.c +++ b/board/madoo/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/madoo/board.c b/board/madoo/board.c index 359f1cca10..eedf8e6fdd 100644 --- a/board/madoo/board.c +++ b/board/madoo/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -512,31 +512,43 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }, }; -const struct usb_mux usbc0_retimer = { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_C0, - .i2c_addr_flags = NB7V904M_I2C_ADDR0, - .driver = &nb7v904m_usb_redriver_drv, +const struct usb_mux_chain usbc0_retimer = { + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_C0, + .i2c_addr_flags = NB7V904M_I2C_ADDR0, + .driver = &nb7v904m_usb_redriver_drv, + }, }; -const struct usb_mux usbc1_retimer = { - .usb_port = 1, - .i2c_port = I2C_PORT_SUB_USB_C1, - .i2c_addr_flags = NB7V904M_I2C_ADDR0, - .driver = &nb7v904m_usb_redriver_drv, +const struct usb_mux_chain usbc1_retimer = { + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .i2c_port = I2C_PORT_SUB_USB_C1, + .i2c_addr_flags = NB7V904M_I2C_ADDR0, + .driver = &nb7v904m_usb_redriver_drv, + }, }; -struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_C0, - .i2c_addr_flags = PI3USB3X532_I2C_ADDR0, - .driver = &pi3usb3x532_usb_mux_driver, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_C0, + .i2c_addr_flags = PI3USB3X532_I2C_ADDR0, + .driver = &pi3usb3x532_usb_mux_driver, + }, }, { - .usb_port = 1, - .i2c_port = I2C_PORT_SUB_USB_C1, - .i2c_addr_flags = PI3USB3X532_I2C_ADDR0, - .driver = &pi3usb3x532_usb_mux_driver, - .next_mux = &usbc1_retimer, + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .i2c_port = I2C_PORT_SUB_USB_C1, + .i2c_addr_flags = PI3USB3X532_I2C_ADDR0, + .driver = &pi3usb3x532_usb_mux_driver, + }, + .next = &usbc1_retimer, } }; @@ -544,7 +556,7 @@ static void reconfigure_usbmux(void) { if (system_get_board_version() < 2) { CPRINTS("add redriver at usbc0"); - usb_muxes[0].next_mux = &usbc0_retimer; + usb_muxes[0].next = &usbc0_retimer; } } DECLARE_HOOK(HOOK_INIT, reconfigure_usbmux, HOOK_PRIO_INIT_I2C + 1); diff --git a/board/madoo/board.h b/board/madoo/board.h index 895be0cda2..82cfa30b0e 100644 --- a/board/madoo/board.h +++ b/board/madoo/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/madoo/build.mk b/board/madoo/build.mk index cd002a20e7..1531d1f3ae 100644 --- a/board/madoo/build.mk +++ b/board/madoo/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/madoo/cbi_ssfc.c b/board/madoo/cbi_ssfc.c index 39fd4929a1..81f3ee0dad 100644 --- a/board/madoo/cbi_ssfc.c +++ b/board/madoo/cbi_ssfc.c @@ -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. */ diff --git a/board/madoo/cbi_ssfc.h b/board/madoo/cbi_ssfc.h index 501d629703..13800bcc85 100644 --- a/board/madoo/cbi_ssfc.h +++ b/board/madoo/cbi_ssfc.h @@ -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. */ diff --git a/board/madoo/ec.tasklist b/board/madoo/ec.tasklist index 0aba1fabeb..ba5855412d 100644 --- a/board/madoo/ec.tasklist +++ b/board/madoo/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/madoo/gpio.inc b/board/madoo/gpio.inc index b26c7814ce..d3eb97ed11 100644 --- a/board/madoo/gpio.inc +++ b/board/madoo/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/madoo/led.c b/board/madoo/led.c index 1811b996f2..90cd0ab210 100644 --- a/board/madoo/led.c +++ b/board/madoo/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/madoo/usb_pd_policy.c b/board/madoo/usb_pd_policy.c index f2e62044b5..2bad4d6931 100644 --- a/board/madoo/usb_pd_policy.c +++ b/board/madoo/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/magolor/battery.c b/board/magolor/battery.c index 84f75732ec..e9bacbbf58 100644 --- a/board/magolor/battery.c +++ b/board/magolor/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/magolor/board.c b/board/magolor/board.c index f98b4ff6a8..bfa77375e5 100644 --- a/board/magolor/board.c +++ b/board/magolor/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -827,11 +827,18 @@ DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN, pen_charge_check, HOOK_PRIO_LAST); /***************************************************************************** * USB-C MUX/Retimer dynamic configuration */ +struct usb_mux usbc1_mux0 = { + .usb_port = 1, + .i2c_port = I2C_PORT_SUB_USB_C1, + .i2c_addr_flags = PS8802_I2C_ADDR_FLAGS_CUSTOM, + .driver = &ps8802_usb_mux_driver, +}; + static void setup_mux(void) { if (get_cbi_ssfc_usb_mux() == SSFC_USBMUX_PS8743) { - usb_muxes[USBC_PORT_C1].i2c_addr_flags = PS8743_I2C_ADDR0_FLAG; - usb_muxes[USBC_PORT_C1].driver = &ps8743_usb_mux_driver; + usbc1_mux0.i2c_addr_flags = PS8743_I2C_ADDR0_FLAG; + usbc1_mux0.driver = &ps8743_usb_mux_driver; ccprints("PS8743 USB MUX"); } else ccprints("PS8762 USB MUX"); @@ -1026,18 +1033,17 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }, }; -struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { [USBC_PORT_C0] = { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_C0, - .i2c_addr_flags = PI3USB3X532_I2C_ADDR0, - .driver = &pi3usb3x532_usb_mux_driver, + .mux = &(const struct usb_mux) { + .usb_port = 0, + .i2c_port = I2C_PORT_USB_C0, + .i2c_addr_flags = PI3USB3X532_I2C_ADDR0, + .driver = &pi3usb3x532_usb_mux_driver, + }, }, [USBC_PORT_C1] = { - .usb_port = 1, - .i2c_port = I2C_PORT_SUB_USB_C1, - .i2c_addr_flags = PS8802_I2C_ADDR_FLAGS_CUSTOM, - .driver = &ps8802_usb_mux_driver, + .mux = &usbc1_mux0, } }; diff --git a/board/magolor/board.h b/board/magolor/board.h index cd337f978d..481856323f 100644 --- a/board/magolor/board.h +++ b/board/magolor/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/magolor/build.mk b/board/magolor/build.mk index fcf5dec3ed..c69e903608 100644 --- a/board/magolor/build.mk +++ b/board/magolor/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/magolor/cbi_ssfc.c b/board/magolor/cbi_ssfc.c index 23791e4ee0..155ecae6bf 100644 --- a/board/magolor/cbi_ssfc.c +++ b/board/magolor/cbi_ssfc.c @@ -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. */ diff --git a/board/magolor/cbi_ssfc.h b/board/magolor/cbi_ssfc.h index 2cb70172f6..78e32f5810 100644 --- a/board/magolor/cbi_ssfc.h +++ b/board/magolor/cbi_ssfc.h @@ -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. */ diff --git a/board/magolor/ec.tasklist b/board/magolor/ec.tasklist index 0aba1fabeb..ba5855412d 100644 --- a/board/magolor/ec.tasklist +++ b/board/magolor/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/magolor/gpio.inc b/board/magolor/gpio.inc index 00a6b4effc..77cf523de1 100644 --- a/board/magolor/gpio.inc +++ b/board/magolor/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/magolor/led.c b/board/magolor/led.c index fd8f9d6c83..891bc4cecb 100644 --- a/board/magolor/led.c +++ b/board/magolor/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/magolor/usb_pd_policy.c b/board/magolor/usb_pd_policy.c index f2e62044b5..2bad4d6931 100644 --- a/board/magolor/usb_pd_policy.c +++ b/board/magolor/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/makomo/battery.c b/board/makomo/battery.c index 1b162e93c7..1f5be3dbe3 100644 --- a/board/makomo/battery.c +++ b/board/makomo/battery.c @@ -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. */ diff --git a/board/makomo/board.c b/board/makomo/board.c index 4c88d630bb..24b34d9a75 100644 --- a/board/makomo/board.c +++ b/board/makomo/board.c @@ -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. */ @@ -164,13 +164,16 @@ static void board_hpd_status(const struct usb_mux *me, mux_state_t mux_state, host_set_single_event(EC_HOST_EVENT_USB_MUX); } -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_MUX, - .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, - .driver = &it5205_usb_mux_driver, - .hpd_update = &board_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_MUX, + .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, + .driver = &it5205_usb_mux_driver, + .hpd_update = &board_hpd_status, + }, }, }; diff --git a/board/makomo/board.h b/board/makomo/board.h index 465fcf0bb3..bf705e9560 100644 --- a/board/makomo/board.h +++ b/board/makomo/board.h @@ -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. */ diff --git a/board/makomo/build.mk b/board/makomo/build.mk index 04b88d3d79..5b31bc2d67 100644 --- a/board/makomo/build.mk +++ b/board/makomo/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/makomo/ec.tasklist b/board/makomo/ec.tasklist index e943459024..23b568cb28 100644 --- a/board/makomo/ec.tasklist +++ b/board/makomo/ec.tasklist @@ -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. */ diff --git a/board/makomo/gpio.inc b/board/makomo/gpio.inc index 287ebbda1f..8cbdef529e 100644 --- a/board/makomo/gpio.inc +++ b/board/makomo/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/makomo/led.c b/board/makomo/led.c index c2fc156082..0870806eff 100644 --- a/board/makomo/led.c +++ b/board/makomo/led.c @@ -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. * diff --git a/board/marzipan/battery.c b/board/marzipan/battery.c index 3a9a1cbaf1..fa3a4ec189 100644 --- a/board/marzipan/battery.c +++ b/board/marzipan/battery.c @@ -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. * diff --git a/board/marzipan/board.c b/board/marzipan/board.c index 28bfe034b5..125c39a826 100644 --- a/board/marzipan/board.c +++ b/board/marzipan/board.c @@ -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. */ @@ -199,16 +199,22 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { * to AP. But the TCPC chip is also needed to know the HPD status; otherwise, * the mux misbehaves. */ -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, }, { - .usb_port = 1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, } }; diff --git a/board/marzipan/board.h b/board/marzipan/board.h index bcb655d937..c651e55965 100644 --- a/board/marzipan/board.h +++ b/board/marzipan/board.h @@ -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. */ diff --git a/board/marzipan/build.mk b/board/marzipan/build.mk index 09853a26d7..048f0787f7 100644 --- a/board/marzipan/build.mk +++ b/board/marzipan/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/marzipan/ec.tasklist b/board/marzipan/ec.tasklist index 5beeb38feb..228828af3c 100644 --- a/board/marzipan/ec.tasklist +++ b/board/marzipan/ec.tasklist @@ -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. */ diff --git a/board/marzipan/gpio.inc b/board/marzipan/gpio.inc index 11fa6b5a53..633f689c66 100644 --- a/board/marzipan/gpio.inc +++ b/board/marzipan/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/marzipan/led.c b/board/marzipan/led.c index 4475718a87..0a6d8df959 100644 --- a/board/marzipan/led.c +++ b/board/marzipan/led.c @@ -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. * diff --git a/board/marzipan/switchcap.c b/board/marzipan/switchcap.c index 03198485b2..853f677f27 100644 --- a/board/marzipan/switchcap.c +++ b/board/marzipan/switchcap.c @@ -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. */ diff --git a/board/marzipan/usbc_config.c b/board/marzipan/usbc_config.c index da3eccb251..5b41e22d33 100644 --- a/board/marzipan/usbc_config.c +++ b/board/marzipan/usbc_config.c @@ -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. */ diff --git a/board/marzipan/usbc_config.h b/board/marzipan/usbc_config.h index 7f72b01700..56cdb155ea 100644 --- a/board/marzipan/usbc_config.h +++ b/board/marzipan/usbc_config.h @@ -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. */ diff --git a/board/max32660-eval/board.c b/board/max32660-eval/board.c index 15a856ab4e..91e78287f3 100644 --- a/board/max32660-eval/board.c +++ b/board/max32660-eval/board.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/max32660-eval/board.h b/board/max32660-eval/board.h index bcca57f18a..9061b0b958 100644 --- a/board/max32660-eval/board.h +++ b/board/max32660-eval/board.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/max32660-eval/build.mk b/board/max32660-eval/build.mk index a613922cd2..3e50dd9a00 100644 --- a/board/max32660-eval/build.mk +++ b/board/max32660-eval/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/max32660-eval/ec.tasklist b/board/max32660-eval/ec.tasklist index 5e58b9dea8..c92b25295b 100644 --- a/board/max32660-eval/ec.tasklist +++ b/board/max32660-eval/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/max32660-eval/gpio.inc b/board/max32660-eval/gpio.inc index 3ced37a77f..e7397e11a4 100644 --- a/board/max32660-eval/gpio.inc +++ b/board/max32660-eval/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/mchpevb1/battery.c b/board/mchpevb1/battery.c index 74a08a66b5..d8f7496fa0 100644 --- a/board/mchpevb1/battery.c +++ b/board/mchpevb1/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/mchpevb1/board.c b/board/mchpevb1/board.c index 757a8d6c41..23135108f6 100644 --- a/board/mchpevb1/board.c +++ b/board/mchpevb1/board.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -349,18 +349,24 @@ struct pi3usb9281_config pi3usb9281_chips[] = { BUILD_ASSERT(ARRAY_SIZE(pi3usb9281_chips) == CONFIG_BC12_DETECT_PI3USB9281_CHIP_COUNT); -struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_MUX, - .i2c_addr_flags = PI3USB3X532_I2C_ADDR0, - .driver = &pi3usb3x532_usb_mux_driver, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_MUX, + .i2c_addr_flags = PI3USB3X532_I2C_ADDR0, + .driver = &pi3usb3x532_usb_mux_driver, + }, }, { - .usb_port = 1, - .i2c_port = I2C_PORT_USB_MUX, - .i2c_addr_flags = 0x10, - .driver = &ps8740_usb_mux_driver, + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .i2c_port = I2C_PORT_USB_MUX, + .i2c_addr_flags = 0x10, + .driver = &ps8740_usb_mux_driver, + }, } }; #endif diff --git a/board/mchpevb1/board.h b/board/mchpevb1/board.h index 74898cb028..10208ca736 100644 --- a/board/mchpevb1/board.h +++ b/board/mchpevb1/board.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -103,7 +103,7 @@ * Values in MHz are 20, 25, 33, 50, and 66 */ /* KBL + EVB fly-wire hook up only supports 20MHz */ -#define CONFIG_HOSTCMD_ESPI_EC_MAX_FREQ MCHP_ESPI_CAP1_MAX_FREQ_20M +#define CONFIG_HOST_INTERFACE_ESPI_EC_MAX_FREQ MCHP_ESPI_CAP1_MAX_FREQ_20M /* * EC eSPI advertises IO lanes @@ -113,7 +113,7 @@ * 3 = Single, Dual, and Quad */ /* KBL + EVB fly-wire hook up only support Single mode */ -#define CONFIG_HOSTCMD_ESPI_EC_MODE MCHP_ESPI_CAP1_SINGLE_MODE +#define CONFIG_HOST_INTERFACE_ESPI_EC_MODE MCHP_ESPI_CAP1_SINGLE_MODE /* * Bit map of eSPI channels EC advertises @@ -122,7 +122,7 @@ * bit[2] = 1 OOB channel * bit[3] = 1 Flash channel */ -#define CONFIG_HOSTCMD_ESPI_EC_CHAN_BITMAP MCHP_ESPI_CAP0_ALL_CHAN_SUPP +#define CONFIG_HOST_INTERFACE_ESPI_EC_CHAN_BITMAP MCHP_ESPI_CAP0_ALL_CHAN_SUPP #define CONFIG_MCHP_ESPI_VW_SAVE_ON_SLEEP @@ -162,8 +162,8 @@ #define CONFIG_CHIPSET_RESET_HOOK #define CONFIG_HOST_INTERFACE_ESPI -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S3 -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#define CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 +#define CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 #define GPIO_PG_EC_RSMRST_ODL GPIO_RSMRST_L_PGOOD #define CONFIG_CLOCK_CRYSTAL diff --git a/board/mchpevb1/build.mk b/board/mchpevb1/build.mk index 412b04d46b..c92a045646 100644 --- a/board/mchpevb1/build.mk +++ b/board/mchpevb1/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2015 The Chromium OS Authors. All rights reserved. +# Copyright 2015 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/mchpevb1/ec.tasklist b/board/mchpevb1/ec.tasklist index 6fcd5faa98..f187bb914a 100644 --- a/board/mchpevb1/ec.tasklist +++ b/board/mchpevb1/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/mchpevb1/gpio.inc b/board/mchpevb1/gpio.inc index 3949e31843..b3aa29941e 100644 --- a/board/mchpevb1/gpio.inc +++ b/board/mchpevb1/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2017 The Chromium OS Authors. All rights reserved. + * Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/mchpevb1/led.c b/board/mchpevb1/led.c index c34e6a91e2..8a5d85e97d 100644 --- a/board/mchpevb1/led.c +++ b/board/mchpevb1/led.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/mchpevb1/usb_pd_policy.c b/board/mchpevb1/usb_pd_policy.c index a1ac41854e..f84d5d1171 100644 --- a/board/mchpevb1/usb_pd_policy.c +++ b/board/mchpevb1/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/meep/battery.c b/board/meep/battery.c index ca9fc531b3..56434d98da 100644 --- a/board/meep/battery.c +++ b/board/meep/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/meep/board.c b/board/meep/board.c index e20ca0987a..62e4881b1b 100644 --- a/board/meep/board.c +++ b/board/meep/board.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/meep/board.h b/board/meep/board.h index 9418499efb..6f437fb852 100644 --- a/board/meep/board.h +++ b/board/meep/board.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/meep/build.mk b/board/meep/build.mk index 3d04b75731..998a65a3de 100644 --- a/board/meep/build.mk +++ b/board/meep/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2018 The Chromium OS Authors. All rights reserved. +# Copyright 2018 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/meep/ec.tasklist b/board/meep/ec.tasklist index d98db145e7..977b8b01be 100644 --- a/board/meep/ec.tasklist +++ b/board/meep/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/meep/gpio.inc b/board/meep/gpio.inc index ebb69bdf53..aeb659624a 100644 --- a/board/meep/gpio.inc +++ b/board/meep/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2018 The Chromium OS Authors. All rights reserved. + * Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/meep/led.c b/board/meep/led.c index 825a7817fb..87d94904c4 100644 --- a/board/meep/led.c +++ b/board/meep/led.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/metaknight/battery.c b/board/metaknight/battery.c index 943771ffa4..cff274ae4f 100644 --- a/board/metaknight/battery.c +++ b/board/metaknight/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/metaknight/board.c b/board/metaknight/board.c index 5502d2667e..5aa3a21cc0 100644 --- a/board/metaknight/board.c +++ b/board/metaknight/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -729,12 +729,15 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }, }; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_C0, - .i2c_addr_flags = PI3USB3X532_I2C_ADDR0, - .driver = &pi3usb3x532_usb_mux_driver, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_C0, + .i2c_addr_flags = PI3USB3X532_I2C_ADDR0, + .driver = &pi3usb3x532_usb_mux_driver, + }, }, }; diff --git a/board/metaknight/board.h b/board/metaknight/board.h index d56ebfc054..5bd3c56a83 100644 --- a/board/metaknight/board.h +++ b/board/metaknight/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/metaknight/build.mk b/board/metaknight/build.mk index cd002a20e7..1531d1f3ae 100644 --- a/board/metaknight/build.mk +++ b/board/metaknight/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/metaknight/cbi_ssfc.c b/board/metaknight/cbi_ssfc.c index 39fd4929a1..81f3ee0dad 100644 --- a/board/metaknight/cbi_ssfc.c +++ b/board/metaknight/cbi_ssfc.c @@ -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. */ diff --git a/board/metaknight/cbi_ssfc.h b/board/metaknight/cbi_ssfc.h index 942f0cf5f4..bf8853a43a 100644 --- a/board/metaknight/cbi_ssfc.h +++ b/board/metaknight/cbi_ssfc.h @@ -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. */ diff --git a/board/metaknight/ec.tasklist b/board/metaknight/ec.tasklist index dc4065cf98..6316569c9a 100644 --- a/board/metaknight/ec.tasklist +++ b/board/metaknight/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/metaknight/gpio.inc b/board/metaknight/gpio.inc index dee2e2dadf..4d68595d65 100644 --- a/board/metaknight/gpio.inc +++ b/board/metaknight/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/metaknight/led.c b/board/metaknight/led.c index a93f7b8a2e..a48b4bcf2a 100644 --- a/board/metaknight/led.c +++ b/board/metaknight/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/metaknight/usb_pd_policy.c b/board/metaknight/usb_pd_policy.c index 9edc5a181d..23166f7fca 100644 --- a/board/metaknight/usb_pd_policy.c +++ b/board/metaknight/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/mithrax/battery.c b/board/mithrax/battery.c index b0d8a46f9f..16840d5b3d 100644 --- a/board/mithrax/battery.c +++ b/board/mithrax/battery.c @@ -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. * diff --git a/board/mithrax/board.c b/board/mithrax/board.c index 686da1bbb1..69ba7d5b32 100644 --- a/board/mithrax/board.c +++ b/board/mithrax/board.c @@ -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. */ diff --git a/board/mithrax/board.h b/board/mithrax/board.h index 2f6d5b3bf9..2dccec9a43 100644 --- a/board/mithrax/board.h +++ b/board/mithrax/board.h @@ -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. */ diff --git a/board/mithrax/build.mk b/board/mithrax/build.mk index a7ec1987de..ca2d2e6c70 100644 --- a/board/mithrax/build.mk +++ b/board/mithrax/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/mithrax/charger_isl9241.c b/board/mithrax/charger_isl9241.c index 4168bad2fd..a9eafe353e 100644 --- a/board/mithrax/charger_isl9241.c +++ b/board/mithrax/charger_isl9241.c @@ -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. */ diff --git a/board/mithrax/ec.tasklist b/board/mithrax/ec.tasklist index b6a6557d1e..8949bb98e7 100644 --- a/board/mithrax/ec.tasklist +++ b/board/mithrax/ec.tasklist @@ -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. */ diff --git a/board/mithrax/fans.c b/board/mithrax/fans.c index a88af148f5..fd7b380f77 100644 --- a/board/mithrax/fans.c +++ b/board/mithrax/fans.c @@ -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. */ diff --git a/board/mithrax/fw_config.c b/board/mithrax/fw_config.c index d0f7d084ee..17b623371f 100644 --- a/board/mithrax/fw_config.c +++ b/board/mithrax/fw_config.c @@ -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. */ diff --git a/board/mithrax/fw_config.h b/board/mithrax/fw_config.h index d1240a81db..c7053c0da4 100644 --- a/board/mithrax/fw_config.h +++ b/board/mithrax/fw_config.h @@ -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. */ diff --git a/board/mithrax/gpio.inc b/board/mithrax/gpio.inc index 133efd0390..1ee2ae40f0 100644 --- a/board/mithrax/gpio.inc +++ b/board/mithrax/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/mithrax/i2c.c b/board/mithrax/i2c.c index 7833d1c154..76a9dfdc1c 100644 --- a/board/mithrax/i2c.c +++ b/board/mithrax/i2c.c @@ -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. */ diff --git a/board/mithrax/keyboard.c b/board/mithrax/keyboard.c index 21e75ee56a..36830958f5 100644 --- a/board/mithrax/keyboard.c +++ b/board/mithrax/keyboard.c @@ -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. */ diff --git a/board/mithrax/keyboard_customization.c b/board/mithrax/keyboard_customization.c index b6830f17a3..cc3623390f 100644 --- a/board/mithrax/keyboard_customization.c +++ b/board/mithrax/keyboard_customization.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/board/mithrax/keyboard_customization.h b/board/mithrax/keyboard_customization.h index e319330365..1d0e6ec483 100644 --- a/board/mithrax/keyboard_customization.h +++ b/board/mithrax/keyboard_customization.h @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/board/mithrax/led.c b/board/mithrax/led.c index 2b08edc252..660fc8ce2d 100644 --- a/board/mithrax/led.c +++ b/board/mithrax/led.c @@ -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. * diff --git a/board/mithrax/pwm.c b/board/mithrax/pwm.c index ffc90e910a..8f3759316e 100644 --- a/board/mithrax/pwm.c +++ b/board/mithrax/pwm.c @@ -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. */ diff --git a/board/mithrax/sensors.c b/board/mithrax/sensors.c index dd9cf4d699..b72022a0e0 100644 --- a/board/mithrax/sensors.c +++ b/board/mithrax/sensors.c @@ -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. */ diff --git a/board/mithrax/usbc_config.c b/board/mithrax/usbc_config.c index 1e46e7043f..10189bbf50 100644 --- a/board/mithrax/usbc_config.c +++ b/board/mithrax/usbc_config.c @@ -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. */ @@ -86,24 +86,31 @@ unsigned int ppc_cnt = ARRAY_SIZE(ppc_chips); * to the virtual_usb_mux_driver so the AP gets notified of mux changes * and updates the TCSS configuration on state changes. */ -static const struct usb_mux usbc1_usb3_db_retimer = { - .usb_port = USBC_PORT_C1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, +static const struct usb_mux_chain usbc1_usb3_db_retimer = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, }; -struct usb_mux usb_muxes[] = { +struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C2] = { - .usb_port = USBC_PORT_C2, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C2, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }, [USBC_PORT_C1] = { - /* PS8815 DB */ - .usb_port = USBC_PORT_C1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, - .next_mux = &usbc1_usb3_db_retimer, + .mux = &(const struct usb_mux) { + /* PS8815 DB */ + .usb_port = USBC_PORT_C1, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, + .next = &usbc1_usb3_db_retimer, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/board/mithrax/usbc_config.h b/board/mithrax/usbc_config.h index fc7cc71995..22242d7c5b 100644 --- a/board/mithrax/usbc_config.h +++ b/board/mithrax/usbc_config.h @@ -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. */ diff --git a/board/moli/board.c b/board/moli/board.c index 72152f3bd1..acc12f9831 100644 --- a/board/moli/board.c +++ b/board/moli/board.c @@ -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. */ diff --git a/board/moli/board.h b/board/moli/board.h index 3927506a36..ddd86c4e35 100644 --- a/board/moli/board.h +++ b/board/moli/board.h @@ -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. */ diff --git a/board/moli/build.mk b/board/moli/build.mk index 548879ba3b..4897d446b2 100644 --- a/board/moli/build.mk +++ b/board/moli/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/moli/ec.tasklist b/board/moli/ec.tasklist index f51cbddd1b..2fda1cfb5e 100644 --- a/board/moli/ec.tasklist +++ b/board/moli/ec.tasklist @@ -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. */ diff --git a/board/moli/fans.c b/board/moli/fans.c index fe0e535df2..7ad99d4af1 100644 --- a/board/moli/fans.c +++ b/board/moli/fans.c @@ -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. */ diff --git a/board/moli/gpio.inc b/board/moli/gpio.inc index 5dcb1eedc2..fb3b508573 100644 --- a/board/moli/gpio.inc +++ b/board/moli/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/moli/i2c.c b/board/moli/i2c.c index 534cc89a57..97625c9b29 100644 --- a/board/moli/i2c.c +++ b/board/moli/i2c.c @@ -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. */ diff --git a/board/moli/led.c b/board/moli/led.c index 9a7d0fe516..f2ab214418 100644 --- a/board/moli/led.c +++ b/board/moli/led.c @@ -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. * diff --git a/board/moli/pwm.c b/board/moli/pwm.c index f7dde565bf..480c90a78f 100644 --- a/board/moli/pwm.c +++ b/board/moli/pwm.c @@ -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. */ diff --git a/board/moli/sensors.c b/board/moli/sensors.c index a7a4dea5f0..5394f16f5d 100644 --- a/board/moli/sensors.c +++ b/board/moli/sensors.c @@ -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. */ diff --git a/board/moli/thermal.c b/board/moli/thermal.c index 610b22fdca..110d8ae2db 100644 --- a/board/moli/thermal.c +++ b/board/moli/thermal.c @@ -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. */ diff --git a/board/moli/usbc_config.c b/board/moli/usbc_config.c index e191973a34..fce8b46aa2 100644 --- a/board/moli/usbc_config.c +++ b/board/moli/usbc_config.c @@ -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. */ @@ -76,34 +76,44 @@ BUILD_ASSERT(ARRAY_SIZE(ppc_chips) == USBC_PORT_COUNT); unsigned int ppc_cnt = ARRAY_SIZE(ppc_chips); /* USBC mux configuration - Alder Lake includes internal mux */ -static const struct usb_mux usbc0_tcss_usb_mux = { - .usb_port = USBC_PORT_C0, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +static const struct usb_mux_chain usbc0_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C0, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; -static const struct usb_mux usbc1_tcss_usb_mux = { - .usb_port = USBC_PORT_C1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +static const struct usb_mux_chain usbc1_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; -const struct usb_mux usb_muxes[] = { +const struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_C0_C1_MUX, - .i2c_addr_flags = USBC_PORT_C0_BB_RETIMER_I2C_ADDR, - .next_mux = &usbc0_tcss_usb_mux, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_C0_C1_MUX, + .i2c_addr_flags = USBC_PORT_C0_BB_RETIMER_I2C_ADDR, + }, + .next = &usbc0_tcss_usb_mux, }, [USBC_PORT_C1] = { - .usb_port = USBC_PORT_C1, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_C0_C1_MUX, - .i2c_addr_flags = USBC_PORT_C1_BB_RETIMER_I2C_ADDR, - .next_mux = &usbc1_tcss_usb_mux, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C1, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_C0_C1_MUX, + .i2c_addr_flags = USBC_PORT_C1_BB_RETIMER_I2C_ADDR, + }, + .next = &usbc1_tcss_usb_mux, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/board/moli/usbc_config.h b/board/moli/usbc_config.h index db4249dcf5..219ad9a745 100644 --- a/board/moli/usbc_config.h +++ b/board/moli/usbc_config.h @@ -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. */ diff --git a/board/moonbuggy/board.c b/board/moonbuggy/board.c index 6ee831abd5..9d8162c2d0 100644 --- a/board/moonbuggy/board.c +++ b/board/moonbuggy/board.c @@ -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. */ diff --git a/board/moonbuggy/board.h b/board/moonbuggy/board.h index 996ad95f05..26e230b2a7 100644 --- a/board/moonbuggy/board.h +++ b/board/moonbuggy/board.h @@ -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. */ diff --git a/board/moonbuggy/build.mk b/board/moonbuggy/build.mk index 0acd315b39..aca2a91e5c 100644 --- a/board/moonbuggy/build.mk +++ b/board/moonbuggy/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/moonbuggy/ec.tasklist b/board/moonbuggy/ec.tasklist index 3828142c55..c43d643410 100644 --- a/board/moonbuggy/ec.tasklist +++ b/board/moonbuggy/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/moonbuggy/gpio.inc b/board/moonbuggy/gpio.inc index b2d25440a6..bb914d2254 100644 --- a/board/moonbuggy/gpio.inc +++ b/board/moonbuggy/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -25,12 +25,12 @@ GPIO_INT(PG_VPRIM_CORE_A_OD, PIN(2, 3), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(PG_PP1050_A_OD, PIN(2, 2), GPIO_INT_BOTH, power_signal_interrupt) /* EC output, but also interrupt so this can be polled as a power signal */ GPIO_INT(EC_PCH_RSMRST_L, PIN(A, 6), GPIO_OUTPUT | GPIO_INT_F_RISING | GPIO_INT_F_FALLING, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 GPIO_INT(SLP_S4_L, PIN(D, 4), GPIO_INT_BOTH, power_signal_interrupt) #endif GPIO_INT(PG_PP2500_DRAM_U_OD, PIN(2, 0), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(PG_PP1200_U_OD, PIN(2, 1), GPIO_INT_BOTH, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 GPIO_INT(SLP_S3_L, PIN(A, 5), GPIO_INT_BOTH, slp_s3_interrupt) #endif GPIO_INT(PG_PP950_VCCIO_OD, PIN(1, 7), GPIO_INT_BOTH, power_signal_interrupt) diff --git a/board/moonbuggy/led.c b/board/moonbuggy/led.c index db1be04aef..cc76c36dce 100644 --- a/board/moonbuggy/led.c +++ b/board/moonbuggy/led.c @@ -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. * diff --git a/board/moonbuggy/pse.c b/board/moonbuggy/pse.c index f268738895..c309db887a 100644 --- a/board/moonbuggy/pse.c +++ b/board/moonbuggy/pse.c @@ -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. */ diff --git a/board/morphius/battery.c b/board/morphius/battery.c index 6d8a8190b2..6867bcd8bd 100644 --- a/board/morphius/battery.c +++ b/board/morphius/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/morphius/board.c b/board/morphius/board.c index cb4758be09..e801fd8569 100644 --- a/board/morphius/board.c +++ b/board/morphius/board.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -287,6 +287,10 @@ void motion_interrupt(enum gpio_signal signal) /***************************************************************************** * USB-C MUX/Retimer dynamic configuration */ + +/* Place holder for second mux in USBC1 chain */ +struct usb_mux_chain usbc1_mux1; + static void setup_mux(void) { if (ec_config_has_usbc1_retimer_ps8802()) { @@ -298,11 +302,10 @@ static void setup_mux(void) * Replace usb_muxes[USBC_PORT_C1] with the PS8802 * table entry. */ - memcpy(&usb_muxes[USBC_PORT_C1], &usbc1_ps8802, - sizeof(struct usb_mux)); + usb_muxes[USBC_PORT_C1].mux = &usbc1_ps8802; /* Set the AMD FP5 as the secondary MUX */ - usb_muxes[USBC_PORT_C1].next_mux = &usbc1_amd_fp5_usb_mux; + usbc1_mux1.mux = &usbc1_amd_fp5_usb_mux; /* Don't have the AMD FP5 flip */ usbc1_amd_fp5_usb_mux.flags = USB_MUX_FLAG_SET_WITHOUT_FLIP; @@ -316,11 +319,10 @@ static void setup_mux(void) * Replace usb_muxes[USBC_PORT_C1] with the AMD FP5 * table entry. */ - memcpy(&usb_muxes[USBC_PORT_C1], &usbc1_amd_fp5_usb_mux, - sizeof(struct usb_mux)); + usb_muxes[USBC_PORT_C1].mux = &usbc1_amd_fp5_usb_mux; /* Set the PS8818 as the secondary MUX */ - usb_muxes[USBC_PORT_C1].next_mux = &usbc1_ps8818; + usbc1_mux1.mux = &usbc1_ps8818; } } @@ -334,23 +336,29 @@ const struct pi3dpx1207_usb_control pi3dpx1207_controls[] = { }; BUILD_ASSERT(ARRAY_SIZE(pi3dpx1207_controls) == USBC_PORT_COUNT); -const struct usb_mux usbc0_pi3dpx1207_usb_retimer = { - .usb_port = USBC_PORT_C0, - .i2c_port = I2C_PORT_TCPC0, - .i2c_addr_flags = PI3DPX1207_I2C_ADDR_FLAGS, - .driver = &pi3dpx1207_usb_retimer, +const struct usb_mux_chain usbc0_pi3dpx1207_usb_retimer = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C0, + .i2c_port = I2C_PORT_TCPC0, + .i2c_addr_flags = PI3DPX1207_I2C_ADDR_FLAGS, + .driver = &pi3dpx1207_usb_retimer, + }, }; -struct usb_mux usb_muxes[] = { +struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .i2c_port = I2C_PORT_USB_AP_MUX, - .i2c_addr_flags = AMD_FP5_MUX_I2C_ADDR_FLAGS, - .driver = &amd_fp5_usb_mux_driver, - .next_mux = &usbc0_pi3dpx1207_usb_retimer, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .i2c_port = I2C_PORT_USB_AP_MUX, + .i2c_addr_flags = AMD_FP5_MUX_I2C_ADDR_FLAGS, + .driver = &amd_fp5_usb_mux_driver, + }, + .next = &usbc0_pi3dpx1207_usb_retimer, }, [USBC_PORT_C1] = { /* Filled in dynamically at startup */ + .next = &usbc1_mux1, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/board/morphius/board.h b/board/morphius/board.h index 6454d4a1a5..39bce41a46 100644 --- a/board/morphius/board.h +++ b/board/morphius/board.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -206,9 +206,9 @@ void motion_interrupt(enum gpio_signal signal); int board_usbc_port_to_hpd_gpio_or_ioex(int port); #define PORT_TO_HPD(port) board_usbc_port_to_hpd_gpio_or_ioex(port) -extern const struct usb_mux usbc0_pi3dpx1207_usb_retimer; -extern const struct usb_mux usbc1_ps8802; +extern const struct usb_mux_chain usbc0_pi3dpx1207_usb_retimer; extern const struct usb_mux usbc1_ps8818; +extern struct usb_mux usbc1_ps8802; extern struct usb_mux usbc1_amd_fp5_usb_mux; #endif /* !__ASSEMBLER__ */ diff --git a/board/morphius/build.mk b/board/morphius/build.mk index 4c2a6c5546..d6a15192ec 100644 --- a/board/morphius/build.mk +++ b/board/morphius/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/morphius/ec.tasklist b/board/morphius/ec.tasklist index 41b83cf4f3..4bb60ed55d 100644 --- a/board/morphius/ec.tasklist +++ b/board/morphius/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/morphius/gpio.inc b/board/morphius/gpio.inc index f14c56c66f..0597419c63 100644 --- a/board/morphius/gpio.inc +++ b/board/morphius/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/morphius/led.c b/board/morphius/led.c index 1d74629106..23f715da02 100644 --- a/board/morphius/led.c +++ b/board/morphius/led.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/morphius/thermal.c b/board/morphius/thermal.c index a5618bbd8f..2ffc2d105b 100644 --- a/board/morphius/thermal.c +++ b/board/morphius/thermal.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/mrbland/base_detect.c b/board/mrbland/base_detect.c index 4b4c8a17dc..82326ab456 100644 --- a/board/mrbland/base_detect.c +++ b/board/mrbland/base_detect.c @@ -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. */ diff --git a/board/mrbland/battery.c b/board/mrbland/battery.c index ee58ff70bb..d6dda523be 100644 --- a/board/mrbland/battery.c +++ b/board/mrbland/battery.c @@ -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. * diff --git a/board/mrbland/board.c b/board/mrbland/board.c index 6b2ec41a7b..50ba008512 100644 --- a/board/mrbland/board.c +++ b/board/mrbland/board.c @@ -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. */ @@ -195,11 +195,14 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { * to AP. But the TCPC chip is also needed to know the HPD status; otherwise, * the mux misbehaves. */ -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, }, }; diff --git a/board/mrbland/board.h b/board/mrbland/board.h index 8b40f63a11..0f78db50d9 100644 --- a/board/mrbland/board.h +++ b/board/mrbland/board.h @@ -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. */ diff --git a/board/mrbland/build.mk b/board/mrbland/build.mk index 452abeb591..363ef59a16 100644 --- a/board/mrbland/build.mk +++ b/board/mrbland/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/mrbland/ec.tasklist b/board/mrbland/ec.tasklist index 493c39dc6c..fc40a8b684 100644 --- a/board/mrbland/ec.tasklist +++ b/board/mrbland/ec.tasklist @@ -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. */ diff --git a/board/mrbland/gpio.inc b/board/mrbland/gpio.inc index 6d09e87688..b5ff32f0b8 100644 --- a/board/mrbland/gpio.inc +++ b/board/mrbland/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/mrbland/led.c b/board/mrbland/led.c index 3960c3e2bc..07994b8f51 100644 --- a/board/mrbland/led.c +++ b/board/mrbland/led.c @@ -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. * diff --git a/board/mrbland/usbc_config.c b/board/mrbland/usbc_config.c index 73666d087c..5d30adb6e2 100644 --- a/board/mrbland/usbc_config.c +++ b/board/mrbland/usbc_config.c @@ -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. */ diff --git a/board/munna/battery.c b/board/munna/battery.c index 1b162e93c7..1f5be3dbe3 100644 --- a/board/munna/battery.c +++ b/board/munna/battery.c @@ -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. */ diff --git a/board/munna/board.c b/board/munna/board.c index 229dbe55e4..f6996b8460 100644 --- a/board/munna/board.c +++ b/board/munna/board.c @@ -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. */ @@ -165,13 +165,16 @@ static void board_hpd_status(const struct usb_mux *me, mux_state_t mux_state, host_set_single_event(EC_HOST_EVENT_USB_MUX); } -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_MUX, - .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, - .driver = &it5205_usb_mux_driver, - .hpd_update = &board_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_MUX, + .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, + .driver = &it5205_usb_mux_driver, + .hpd_update = &board_hpd_status, + }, }, }; diff --git a/board/munna/board.h b/board/munna/board.h index f31d0809c1..5dc35c68df 100644 --- a/board/munna/board.h +++ b/board/munna/board.h @@ -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. */ diff --git a/board/munna/build.mk b/board/munna/build.mk index 594bac4de9..aab7974af2 100644 --- a/board/munna/build.mk +++ b/board/munna/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/munna/ec.tasklist b/board/munna/ec.tasklist index 6b29595620..1e7e61108b 100644 --- a/board/munna/ec.tasklist +++ b/board/munna/ec.tasklist @@ -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. */ diff --git a/board/munna/gpio.inc b/board/munna/gpio.inc index 50e5ee3a47..72de7677dc 100644 --- a/board/munna/gpio.inc +++ b/board/munna/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/munna/led.c b/board/munna/led.c index 903e5a8d76..bd286b25a3 100644 --- a/board/munna/led.c +++ b/board/munna/led.c @@ -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. * diff --git a/board/mushu/battery.c b/board/mushu/battery.c index 7e48dfdc19..d523d918f7 100644 --- a/board/mushu/battery.c +++ b/board/mushu/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/mushu/board.c b/board/mushu/board.c index 05ec281a35..7197f7e136 100644 --- a/board/mushu/board.c +++ b/board/mushu/board.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -149,16 +149,20 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }, }; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { [USB_PD_PORT_TCPC_0] = { - .usb_port = USB_PD_PORT_TCPC_0, - .driver = &anx7447_usb_mux_driver, - .hpd_update = &anx7447_tcpc_update_hpd_status, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_TCPC_0, + .driver = &anx7447_usb_mux_driver, + .hpd_update = &anx7447_tcpc_update_hpd_status, + }, }, [USB_PD_PORT_TCPC_1] = { - .usb_port = USB_PD_PORT_TCPC_1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_TCPC_1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, } }; diff --git a/board/mushu/board.h b/board/mushu/board.h index 5a3193c388..02443bbfa3 100644 --- a/board/mushu/board.h +++ b/board/mushu/board.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/mushu/build.mk b/board/mushu/build.mk index 2d6118ea70..4e42a0616e 100644 --- a/board/mushu/build.mk +++ b/board/mushu/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/mushu/ec.tasklist b/board/mushu/ec.tasklist index 4a1024a091..829be2b7c8 100644 --- a/board/mushu/ec.tasklist +++ b/board/mushu/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/mushu/gpio.inc b/board/mushu/gpio.inc index cc8c7a0154..e1711a87e1 100644 --- a/board/mushu/gpio.inc +++ b/board/mushu/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -16,10 +16,10 @@ GPIO_INT(ACOK_OD, PIN(0, 0), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, ex /* Power sequencing interrupts */ GPIO_INT(SLP_S0_L, PIN(D, 5), GPIO_INT_BOTH, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 GPIO_INT(SLP_S3_L, PIN(A, 5), GPIO_INT_BOTH, power_signal_interrupt) #endif -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 GPIO_INT(SLP_S4_L, PIN(D, 4), GPIO_INT_BOTH, power_signal_interrupt) #endif GPIO_INT(PG_EC_RSMRST_L, PIN(E, 2), GPIO_INT_BOTH, intel_x86_rsmrst_signal_interrupt) diff --git a/board/mushu/led.c b/board/mushu/led.c index 4763babb89..6d20ecdedf 100644 --- a/board/mushu/led.c +++ b/board/mushu/led.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/mushu/thermal.c b/board/mushu/thermal.c index 3b6645ffa2..da8f29de08 100644 --- a/board/mushu/thermal.c +++ b/board/mushu/thermal.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nami/battery.c b/board/nami/battery.c index f9ad0e8841..18f03fc9de 100644 --- a/board/nami/battery.c +++ b/board/nami/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/nami/board.c b/board/nami/board.c index 29e9913ada..02fb27a283 100644 --- a/board/nami/board.c +++ b/board/nami/board.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -282,16 +282,22 @@ static int ps8751_tune_mux(const struct usb_mux *me) return EC_SUCCESS; } -struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +struct usb_mux usb_mux_ps8751 = { + .usb_port = USB_PD_PORT_PS8751, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, +}; + +struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { [USB_PD_PORT_PS8751] = { - .usb_port = USB_PD_PORT_PS8751, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = &usb_mux_ps8751, }, [USB_PD_PORT_ANX7447] = { - .usb_port = USB_PD_PORT_ANX7447, - .driver = &anx7447_usb_mux_driver, - .hpd_update = &anx7447_tcpc_update_hpd_status, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_ANX7447, + .driver = &anx7447_usb_mux_driver, + .hpd_update = &anx7447_tcpc_update_hpd_status, + }, } }; @@ -345,7 +351,7 @@ void board_tcpc_init(void) gpio_enable_interrupt(GPIO_USB_C1_PD_INT_ODL); if (oem == PROJECT_SONA && model != MODEL_SYNDRA) - usb_muxes[USB_PD_PORT_PS8751].board_init = ps8751_tune_mux; + usb_mux_ps8751.board_init = ps8751_tune_mux; /* * Initialize HPD to low; after sysjump SOC needs to see diff --git a/board/nami/board.h b/board/nami/board.h index 4975ca08ba..879fb443be 100644 --- a/board/nami/board.h +++ b/board/nami/board.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -74,8 +74,8 @@ #define CONFIG_CHIPSET_HAS_PRE_INIT_CALLBACK #define CONFIG_CHIPSET_RESET_HOOK #define CONFIG_HOST_INTERFACE_ESPI -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S3 -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#define CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 +#define CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 #define CONFIG_HOSTCMD_FLASH_SPI_INFO #define GPIO_PG_EC_RSMRST_ODL GPIO_RSMRST_L_PGOOD diff --git a/board/nami/build.mk b/board/nami/build.mk index f4bf21113d..8f3a138f56 100644 --- a/board/nami/build.mk +++ b/board/nami/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2017 The Chromium OS Authors. All rights reserved. +# Copyright 2017 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/nami/ec.tasklist b/board/nami/ec.tasklist index 93fcda9f91..99d0f15b70 100644 --- a/board/nami/ec.tasklist +++ b/board/nami/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nami/gpio.inc b/board/nami/gpio.inc index f4119c96a6..124af79f49 100644 --- a/board/nami/gpio.inc +++ b/board/nami/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2017 The Chromium OS Authors. All rights reserved. + * Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nami/led.c b/board/nami/led.c index 859119b5c9..ce9cefed7f 100644 --- a/board/nami/led.c +++ b/board/nami/led.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/nami/usb_pd_policy.c b/board/nami/usb_pd_policy.c index 3f0098f5e1..e022adc5d9 100644 --- a/board/nami/usb_pd_policy.c +++ b/board/nami/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nautilus/battery.c b/board/nautilus/battery.c index eca26a3a4e..dd9b72e222 100644 --- a/board/nautilus/battery.c +++ b/board/nautilus/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/nautilus/board.c b/board/nautilus/board.c index 3b05dc6fb7..3cdd7abaf1 100644 --- a/board/nautilus/board.c +++ b/board/nautilus/board.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -187,16 +187,22 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }, }; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, }, { - .usb_port = 1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, } }; diff --git a/board/nautilus/board.h b/board/nautilus/board.h index cf545050e7..10d31f8555 100644 --- a/board/nautilus/board.h +++ b/board/nautilus/board.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -63,8 +63,8 @@ #define CONFIG_CHIPSET_HAS_PLATFORM_PMIC_RESET #define CONFIG_CHIPSET_RESET_HOOK #define CONFIG_HOST_INTERFACE_ESPI -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S3 -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#define CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 +#define CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 #define GPIO_PG_EC_RSMRST_ODL GPIO_RSMRST_L_PGOOD /* Battery */ diff --git a/board/nautilus/build.mk b/board/nautilus/build.mk index f4bf21113d..8f3a138f56 100644 --- a/board/nautilus/build.mk +++ b/board/nautilus/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2017 The Chromium OS Authors. All rights reserved. +# Copyright 2017 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/nautilus/ec.tasklist b/board/nautilus/ec.tasklist index 8257734572..bcc5fc37e5 100644 --- a/board/nautilus/ec.tasklist +++ b/board/nautilus/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nautilus/gpio.inc b/board/nautilus/gpio.inc index 9cfc1e0bfd..13305d50fb 100644 --- a/board/nautilus/gpio.inc +++ b/board/nautilus/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2017 The Chromium OS Authors. All rights reserved. + * Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -14,10 +14,10 @@ GPIO_INT(USB_C1_PD_INT_ODL, PIN(C, 5), GPIO_INT_FALLING, tcpc_alert_event) GPIO_INT(PCH_SLP_S0_L, PIN(7, 5), GPIO_INT_BOTH, power_signal_interrupt) #endif /* Use VW signals instead of GPIOs */ -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 GPIO_INT(PCH_SLP_S3_L, PIN(7, 3), GPIO_INT_BOTH, power_signal_interrupt) #endif -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 GPIO_INT(PCH_SLP_S4_L, PIN(8, 6), GPIO_INT_BOTH, power_signal_interrupt) #endif GPIO_INT(PCH_SLP_SUS_L, PIN(6, 2), GPIO_INT_BOTH, power_signal_interrupt) diff --git a/board/nautilus/led.c b/board/nautilus/led.c index 1439768326..3fab136610 100644 --- a/board/nautilus/led.c +++ b/board/nautilus/led.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/nautilus/usb_pd_policy.c b/board/nautilus/usb_pd_policy.c index 1129fd9cb2..e01fd75f73 100644 --- a/board/nautilus/usb_pd_policy.c +++ b/board/nautilus/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nightfury/battery.c b/board/nightfury/battery.c index 5ef85f06fc..9e9b9baa74 100644 --- a/board/nightfury/battery.c +++ b/board/nightfury/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/nightfury/board.c b/board/nightfury/board.c index d601265b68..bfcdd14628 100644 --- a/board/nightfury/board.c +++ b/board/nightfury/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -135,14 +135,18 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }, }; -struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { [USB_PD_PORT_TCPC_0] = { - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = &(const struct usb_mux) { + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, }, [USB_PD_PORT_TCPC_1] = { - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = &(const struct usb_mux) { + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, } }; diff --git a/board/nightfury/board.h b/board/nightfury/board.h index fdfc1af5dd..9831741d5a 100644 --- a/board/nightfury/board.h +++ b/board/nightfury/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nightfury/build.mk b/board/nightfury/build.mk index e91262fd43..169668e64c 100644 --- a/board/nightfury/build.mk +++ b/board/nightfury/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/nightfury/ec.tasklist b/board/nightfury/ec.tasklist index 101713dc6e..507845b304 100644 --- a/board/nightfury/ec.tasklist +++ b/board/nightfury/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nightfury/gpio.inc b/board/nightfury/gpio.inc index 68d847fe92..710bf07c17 100644 --- a/board/nightfury/gpio.inc +++ b/board/nightfury/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -16,10 +16,10 @@ GPIO_INT(ACOK_OD, PIN(0, 0), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, ex /* Power sequencing interrupts */ GPIO_INT(SLP_S0_L, PIN(D, 5), GPIO_INT_BOTH, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 GPIO_INT(SLP_S3_L, PIN(A, 5), GPIO_INT_BOTH, power_signal_interrupt) #endif -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 GPIO_INT(SLP_S4_L, PIN(D, 4), GPIO_INT_BOTH, power_signal_interrupt) #endif GPIO_INT(PG_EC_RSMRST_L, PIN(E, 2), GPIO_INT_BOTH, intel_x86_rsmrst_signal_interrupt) diff --git a/board/nightfury/led.c b/board/nightfury/led.c index 603f69195f..9d2c367ab5 100644 --- a/board/nightfury/led.c +++ b/board/nightfury/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/nipperkin/battery.c b/board/nipperkin/battery.c index 5a3656c734..b8bedb535e 100644 --- a/board/nipperkin/battery.c +++ b/board/nipperkin/battery.c @@ -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. * diff --git a/board/nipperkin/board.c b/board/nipperkin/board.c index 1b109187b6..b418448fb1 100644 --- a/board/nipperkin/board.c +++ b/board/nipperkin/board.c @@ -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. */ diff --git a/board/nipperkin/board.h b/board/nipperkin/board.h index 3af121dac4..af684e1f49 100644 --- a/board/nipperkin/board.h +++ b/board/nipperkin/board.h @@ -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. */ diff --git a/board/nipperkin/board_fw_config.c b/board/nipperkin/board_fw_config.c index 747158507c..e21e42689f 100644 --- a/board/nipperkin/board_fw_config.c +++ b/board/nipperkin/board_fw_config.c @@ -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. */ diff --git a/board/nipperkin/board_fw_config.h b/board/nipperkin/board_fw_config.h index f542892075..f4673f732e 100644 --- a/board/nipperkin/board_fw_config.h +++ b/board/nipperkin/board_fw_config.h @@ -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. */ diff --git a/board/nipperkin/build.mk b/board/nipperkin/build.mk index 5f5ffb9ce4..aad8b2ae09 100644 --- a/board/nipperkin/build.mk +++ b/board/nipperkin/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/nipperkin/ec.tasklist b/board/nipperkin/ec.tasklist index ccdff9847c..a127b13eba 100644 --- a/board/nipperkin/ec.tasklist +++ b/board/nipperkin/ec.tasklist @@ -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. */ diff --git a/board/nipperkin/gpio.inc b/board/nipperkin/gpio.inc index bd00c932af..0a8c6d9a65 100644 --- a/board/nipperkin/gpio.inc +++ b/board/nipperkin/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/nipperkin/led.c b/board/nipperkin/led.c index 720724828c..c7d6e0e0bc 100644 --- a/board/nipperkin/led.c +++ b/board/nipperkin/led.c @@ -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. */ diff --git a/board/nipperkin/thermal.c b/board/nipperkin/thermal.c index 9574de4ca0..117a6d08fa 100644 --- a/board/nipperkin/thermal.c +++ b/board/nipperkin/thermal.c @@ -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. */ diff --git a/board/nocturne/base_detect.c b/board/nocturne/base_detect.c index 75b4222e1a..807aa3e14a 100644 --- a/board/nocturne/base_detect.c +++ b/board/nocturne/base_detect.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nocturne/battery.c b/board/nocturne/battery.c index 9603243347..c81640e983 100644 --- a/board/nocturne/battery.c +++ b/board/nocturne/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/nocturne/board.c b/board/nocturne/board.c index 92c676f26b..d32f036844 100644 --- a/board/nocturne/board.c +++ b/board/nocturne/board.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -319,17 +319,23 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }, }; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, }, { - .usb_port = 1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, }, }; diff --git a/board/nocturne/board.h b/board/nocturne/board.h index 5975053622..279016ec98 100644 --- a/board/nocturne/board.h +++ b/board/nocturne/board.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nocturne/build.mk b/board/nocturne/build.mk index 1c2e1e04f2..3a43716534 100644 --- a/board/nocturne/build.mk +++ b/board/nocturne/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2018 The Chromium OS Authors. All rights reserved. +# Copyright 2018 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/nocturne/ec.tasklist b/board/nocturne/ec.tasklist index 4fb7a035a9..5c7988f1d6 100644 --- a/board/nocturne/ec.tasklist +++ b/board/nocturne/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nocturne/gpio.inc b/board/nocturne/gpio.inc index 75d2275424..e820bca8f0 100644 --- a/board/nocturne/gpio.inc +++ b/board/nocturne/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2018 The Chromium OS Authors. All rights reserved. + * Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nocturne/led.c b/board/nocturne/led.c index 7891d8459d..ba3320cd22 100644 --- a/board/nocturne/led.c +++ b/board/nocturne/led.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nocturne/usb_pd_policy.c b/board/nocturne/usb_pd_policy.c index 68763ad797..5f1e5af365 100644 --- a/board/nocturne/usb_pd_policy.c +++ b/board/nocturne/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nocturne_fp/board.h b/board/nocturne_fp/board.h index 2d0f5586cf..e7d34445b0 100644 --- a/board/nocturne_fp/board.h +++ b/board/nocturne_fp/board.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nocturne_fp/board_ro.c b/board/nocturne_fp/board_ro.c index 25c1114024..f215cd91cf 100644 --- a/board/nocturne_fp/board_ro.c +++ b/board/nocturne_fp/board_ro.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nocturne_fp/board_rw.c b/board/nocturne_fp/board_rw.c index abc6bf88d8..fd5899c799 100644 --- a/board/nocturne_fp/board_rw.c +++ b/board/nocturne_fp/board_rw.c @@ -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. */ diff --git a/board/nocturne_fp/board_rw.h b/board/nocturne_fp/board_rw.h index 6ef7cc29b4..1687da3737 100644 --- a/board/nocturne_fp/board_rw.h +++ b/board/nocturne_fp/board_rw.h @@ -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. */ diff --git a/board/nocturne_fp/build.mk b/board/nocturne_fp/build.mk index c24b9a0d0d..55f6f95b4b 100644 --- a/board/nocturne_fp/build.mk +++ b/board/nocturne_fp/build.mk @@ -1,4 +1,4 @@ -# Copyright 2017 The Chromium OS Authors. All rights reserved. +# Copyright 2017 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/nocturne_fp/ec.tasklist b/board/nocturne_fp/ec.tasklist index ed1e6ed294..2a4771fa98 100644 --- a/board/nocturne_fp/ec.tasklist +++ b/board/nocturne_fp/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nocturne_fp/fpsensor_detect.c b/board/nocturne_fp/fpsensor_detect.c index 5a4b95e64c..2541aa3c68 100644 --- a/board/nocturne_fp/fpsensor_detect.c +++ b/board/nocturne_fp/fpsensor_detect.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nocturne_fp/fpsensor_detect_rw.c b/board/nocturne_fp/fpsensor_detect_rw.c index e4a670e211..d26927c187 100644 --- a/board/nocturne_fp/fpsensor_detect_rw.c +++ b/board/nocturne_fp/fpsensor_detect_rw.c @@ -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. */ diff --git a/board/nocturne_fp/gpio.inc b/board/nocturne_fp/gpio.inc index dc15ab0ef0..b0e1c3a80b 100644 --- a/board/nocturne_fp/gpio.inc +++ b/board/nocturne_fp/gpio.inc @@ -1,5 +1,5 @@ /* - * Copyright 2017 The Chromium OS Authors. All rights reserved. + * Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nocturne_fp/gpio_rw.inc b/board/nocturne_fp/gpio_rw.inc index 2de4c3e92a..9ee3af139f 100644 --- a/board/nocturne_fp/gpio_rw.inc +++ b/board/nocturne_fp/gpio_rw.inc @@ -1,5 +1,5 @@ /* - * 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. */ diff --git a/board/nocturne_fp/ro_workarounds.c b/board/nocturne_fp/ro_workarounds.c index 1dcf6d5602..11f025fd5b 100644 --- a/board/nocturne_fp/ro_workarounds.c +++ b/board/nocturne_fp/ro_workarounds.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/npcx7_evb/board.c b/board/npcx7_evb/board.c index 1cd4108266..c78a30f3de 100644 --- a/board/npcx7_evb/board.c +++ b/board/npcx7_evb/board.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/npcx7_evb/board.h b/board/npcx7_evb/board.h index 498ca6a9e8..8a7b0246e9 100644 --- a/board/npcx7_evb/board.h +++ b/board/npcx7_evb/board.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -29,8 +29,8 @@ #define CONFIG_I2C /* Features of eSPI */ #define CONFIG_HOST_INTERFACE_ESPI -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S3 -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#define CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 +#define CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 /* Optional features */ #define CONFIG_ENABLE_JTAG_SELECTION diff --git a/board/npcx7_evb/build.mk b/board/npcx7_evb/build.mk index 4bd829202c..e51c3bdc5c 100644 --- a/board/npcx7_evb/build.mk +++ b/board/npcx7_evb/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2017 The Chromium OS Authors. All rights reserved. +# Copyright 2017 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/npcx7_evb/ec.tasklist b/board/npcx7_evb/ec.tasklist index 88b5ffaa62..24e3b42d7c 100644 --- a/board/npcx7_evb/ec.tasklist +++ b/board/npcx7_evb/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/npcx7_evb/gpio.inc b/board/npcx7_evb/gpio.inc index 145a48de85..b8cfa1d8d5 100644 --- a/board/npcx7_evb/gpio.inc +++ b/board/npcx7_evb/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2017 The Chromium OS Authors. All rights reserved. + * Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/npcx9_evb/board.c b/board/npcx9_evb/board.c index fd1e2276e4..d0c90ee9b1 100644 --- a/board/npcx9_evb/board.c +++ b/board/npcx9_evb/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/npcx9_evb/board.h b/board/npcx9_evb/board.h index e707c0258e..681e36157a 100644 --- a/board/npcx9_evb/board.h +++ b/board/npcx9_evb/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -14,8 +14,8 @@ #define CONFIG_I2C /* Features of eSPI */ #define CONFIG_HOST_INTERFACE_ESPI -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S3 -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#define CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 +#define CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 /* Optional features */ #define CONFIG_ENABLE_JTAG_SELECTION diff --git a/board/npcx9_evb/build.mk b/board/npcx9_evb/build.mk index 92bcc84144..d2526afb1b 100644 --- a/board/npcx9_evb/build.mk +++ b/board/npcx9_evb/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/npcx9_evb/ec.tasklist b/board/npcx9_evb/ec.tasklist index 9560b43561..d41f0ade2f 100644 --- a/board/npcx9_evb/ec.tasklist +++ b/board/npcx9_evb/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/npcx9_evb/gpio.inc b/board/npcx9_evb/gpio.inc index ec57c1afc5..28dbbba93a 100644 --- a/board/npcx9_evb/gpio.inc +++ b/board/npcx9_evb/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/npcx_evb/board.c b/board/npcx_evb/board.c index b38dafc02d..06ab55f94a 100644 --- a/board/npcx_evb/board.c +++ b/board/npcx_evb/board.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/npcx_evb/board.h b/board/npcx_evb/board.h index 6c26d347eb..82675ee9d8 100644 --- a/board/npcx_evb/board.h +++ b/board/npcx_evb/board.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/npcx_evb/build.mk b/board/npcx_evb/build.mk index 7dfc4544f2..c86457489f 100644 --- a/board/npcx_evb/build.mk +++ b/board/npcx_evb/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2014 The Chromium OS Authors. All rights reserved. +# Copyright 2014 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/npcx_evb/ec.tasklist b/board/npcx_evb/ec.tasklist index b0d584174e..82d4d031a2 100644 --- a/board/npcx_evb/ec.tasklist +++ b/board/npcx_evb/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/npcx_evb/gpio.inc b/board/npcx_evb/gpio.inc index c4e673fd25..584cbfd9b2 100644 --- a/board/npcx_evb/gpio.inc +++ b/board/npcx_evb/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2014 The Chromium OS Authors. All rights reserved. + * Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/npcx_evb_arm/board.c b/board/npcx_evb_arm/board.c index 63024ced5a..209bf047e2 100644 --- a/board/npcx_evb_arm/board.c +++ b/board/npcx_evb_arm/board.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/npcx_evb_arm/board.h b/board/npcx_evb_arm/board.h index 31a99da62e..f342d5c37f 100644 --- a/board/npcx_evb_arm/board.h +++ b/board/npcx_evb_arm/board.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/npcx_evb_arm/build.mk b/board/npcx_evb_arm/build.mk index 48116c5454..e1a3762504 100644 --- a/board/npcx_evb_arm/build.mk +++ b/board/npcx_evb_arm/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2015 The Chromium OS Authors. All rights reserved. +# Copyright 2015 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/npcx_evb_arm/ec.tasklist b/board/npcx_evb_arm/ec.tasklist index a014b86350..078059e9d8 100644 --- a/board/npcx_evb_arm/ec.tasklist +++ b/board/npcx_evb_arm/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/npcx_evb_arm/gpio.inc b/board/npcx_evb_arm/gpio.inc index 1cdda98300..dc94a8ac7b 100644 --- a/board/npcx_evb_arm/gpio.inc +++ b/board/npcx_evb_arm/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2015 The Chromium OS Authors. All rights reserved. + * Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nucleo-dartmonkey/board.c b/board/nucleo-dartmonkey/board.c index 59226cea56..1cd6ef5dee 100644 --- a/board/nucleo-dartmonkey/board.c +++ b/board/nucleo-dartmonkey/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nucleo-dartmonkey/board.h b/board/nucleo-dartmonkey/board.h index 4b17ba253b..76e278b4ca 100644 --- a/board/nucleo-dartmonkey/board.h +++ b/board/nucleo-dartmonkey/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nucleo-dartmonkey/build.mk b/board/nucleo-dartmonkey/build.mk index dc3f1139ef..8aa93b8fe5 100644 --- a/board/nucleo-dartmonkey/build.mk +++ b/board/nucleo-dartmonkey/build.mk @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/nucleo-dartmonkey/ec.tasklist b/board/nucleo-dartmonkey/ec.tasklist index 80e226637b..7f35361949 100644 --- a/board/nucleo-dartmonkey/ec.tasklist +++ b/board/nucleo-dartmonkey/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nucleo-dartmonkey/fpsensor_detect.c b/board/nucleo-dartmonkey/fpsensor_detect.c index 72b9b89e11..7a9c128211 100644 --- a/board/nucleo-dartmonkey/fpsensor_detect.c +++ b/board/nucleo-dartmonkey/fpsensor_detect.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nucleo-dartmonkey/gpio.inc b/board/nucleo-dartmonkey/gpio.inc index 11709fe738..a9e5101855 100644 --- a/board/nucleo-dartmonkey/gpio.inc +++ b/board/nucleo-dartmonkey/gpio.inc @@ -1,5 +1,5 @@ /* - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nucleo-f072rb/board.c b/board/nucleo-f072rb/board.c index 17181fb600..729589a702 100644 --- a/board/nucleo-f072rb/board.c +++ b/board/nucleo-f072rb/board.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nucleo-f072rb/board.h b/board/nucleo-f072rb/board.h index 8bc3d3a342..d807209564 100644 --- a/board/nucleo-f072rb/board.h +++ b/board/nucleo-f072rb/board.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nucleo-f072rb/build.mk b/board/nucleo-f072rb/build.mk index 0e069a31ad..7ac70706fc 100644 --- a/board/nucleo-f072rb/build.mk +++ b/board/nucleo-f072rb/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2016 The Chromium OS Authors. All rights reserved. +# Copyright 2016 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/nucleo-f072rb/ec.tasklist b/board/nucleo-f072rb/ec.tasklist index a6385530b5..3ddec80f41 100644 --- a/board/nucleo-f072rb/ec.tasklist +++ b/board/nucleo-f072rb/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nucleo-f072rb/gpio.inc b/board/nucleo-f072rb/gpio.inc index 6f3b592845..a14c7a5470 100644 --- a/board/nucleo-f072rb/gpio.inc +++ b/board/nucleo-f072rb/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2016 The Chromium OS Authors. All rights reserved. + * Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nucleo-f072rb/openocd-flash.cfg b/board/nucleo-f072rb/openocd-flash.cfg index 91e3805c74..f06b3c22a2 100644 --- a/board/nucleo-f072rb/openocd-flash.cfg +++ b/board/nucleo-f072rb/openocd-flash.cfg @@ -1,4 +1,4 @@ -# Copyright 2016 The Chromium OS Authors. All rights reserved. +# Copyright 2016 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/board/nucleo-f411re/board.c b/board/nucleo-f411re/board.c index a8b02c66b7..0c77a64e71 100644 --- a/board/nucleo-f411re/board.c +++ b/board/nucleo-f411re/board.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nucleo-f411re/board.h b/board/nucleo-f411re/board.h index ebadcac182..d4e299dcff 100644 --- a/board/nucleo-f411re/board.h +++ b/board/nucleo-f411re/board.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nucleo-f411re/build.mk b/board/nucleo-f411re/build.mk index 3a5fc28558..93a0a02ecc 100644 --- a/board/nucleo-f411re/build.mk +++ b/board/nucleo-f411re/build.mk @@ -1,4 +1,4 @@ -# Copyright 2015 The Chromium OS Authors. All rights reserved. +# Copyright 2015 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/nucleo-f411re/ec.tasklist b/board/nucleo-f411re/ec.tasklist index b5e3cb82b2..a9566a92aa 100644 --- a/board/nucleo-f411re/ec.tasklist +++ b/board/nucleo-f411re/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nucleo-f411re/gpio.inc b/board/nucleo-f411re/gpio.inc index 83a9e51a08..2fd98f2a4a 100644 --- a/board/nucleo-f411re/gpio.inc +++ b/board/nucleo-f411re/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2015 The Chromium OS Authors. All rights reserved. + * Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nucleo-f411re/openocd-flash.cfg b/board/nucleo-f411re/openocd-flash.cfg index 7a6ea6316c..23da86c6ba 100644 --- a/board/nucleo-f411re/openocd-flash.cfg +++ b/board/nucleo-f411re/openocd-flash.cfg @@ -1,4 +1,4 @@ -# Copyright 2016 The Chromium OS Authors. All rights reserved. +# Copyright 2016 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/board/nucleo-f412zg/board.c b/board/nucleo-f412zg/board.c index e1c84aaecc..9ab9bfa190 100644 --- a/board/nucleo-f412zg/board.c +++ b/board/nucleo-f412zg/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nucleo-f412zg/board.h b/board/nucleo-f412zg/board.h index 2ef279cb71..7e3c8d976d 100644 --- a/board/nucleo-f412zg/board.h +++ b/board/nucleo-f412zg/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nucleo-f412zg/build.mk b/board/nucleo-f412zg/build.mk index 64a3472e5e..be4f65063b 100644 --- a/board/nucleo-f412zg/build.mk +++ b/board/nucleo-f412zg/build.mk @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/nucleo-f412zg/ec.tasklist b/board/nucleo-f412zg/ec.tasklist index 896eb2fdb3..04e21000f9 100644 --- a/board/nucleo-f412zg/ec.tasklist +++ b/board/nucleo-f412zg/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nucleo-f412zg/gpio.inc b/board/nucleo-f412zg/gpio.inc index 57f78203ba..6cc09a20df 100644 --- a/board/nucleo-f412zg/gpio.inc +++ b/board/nucleo-f412zg/gpio.inc @@ -1,5 +1,5 @@ /* - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nucleo-g431rb/board.c b/board/nucleo-g431rb/board.c index c25eee95b7..ef73c00924 100644 --- a/board/nucleo-g431rb/board.c +++ b/board/nucleo-g431rb/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nucleo-g431rb/board.h b/board/nucleo-g431rb/board.h index 908c1c49d6..905b4ea110 100644 --- a/board/nucleo-g431rb/board.h +++ b/board/nucleo-g431rb/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nucleo-g431rb/build.mk b/board/nucleo-g431rb/build.mk index 8140048cdd..a5a00675ee 100644 --- a/board/nucleo-g431rb/build.mk +++ b/board/nucleo-g431rb/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/nucleo-g431rb/ec.tasklist b/board/nucleo-g431rb/ec.tasklist index c272906fc7..682e6d8290 100644 --- a/board/nucleo-g431rb/ec.tasklist +++ b/board/nucleo-g431rb/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nucleo-g431rb/gpio.inc b/board/nucleo-g431rb/gpio.inc index 4dd4a6d966..4c7507eff9 100644 --- a/board/nucleo-g431rb/gpio.inc +++ b/board/nucleo-g431rb/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nucleo-h743zi/board.c b/board/nucleo-h743zi/board.c index 0de182edcd..f63c362d5f 100644 --- a/board/nucleo-h743zi/board.c +++ b/board/nucleo-h743zi/board.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nucleo-h743zi/board.h b/board/nucleo-h743zi/board.h index a3dd376c12..81cdd60fc9 100644 --- a/board/nucleo-h743zi/board.h +++ b/board/nucleo-h743zi/board.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nucleo-h743zi/build.mk b/board/nucleo-h743zi/build.mk index b961c4841e..0fb7975f32 100644 --- a/board/nucleo-h743zi/build.mk +++ b/board/nucleo-h743zi/build.mk @@ -1,4 +1,4 @@ -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/nucleo-h743zi/ec.tasklist b/board/nucleo-h743zi/ec.tasklist index 9c37e0b58b..ed124cd672 100644 --- a/board/nucleo-h743zi/ec.tasklist +++ b/board/nucleo-h743zi/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nucleo-h743zi/gpio.inc b/board/nucleo-h743zi/gpio.inc index 0f2bb32d75..a93133abd7 100644 --- a/board/nucleo-h743zi/gpio.inc +++ b/board/nucleo-h743zi/gpio.inc @@ -1,5 +1,5 @@ /* - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nuwani/battery.c b/board/nuwani/battery.c index 5cbbeb5123..e24b442049 100644 --- a/board/nuwani/battery.c +++ b/board/nuwani/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/nuwani/board.c b/board/nuwani/board.c index c69ffff280..eb36ad9df8 100644 --- a/board/nuwani/board.c +++ b/board/nuwani/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nuwani/board.h b/board/nuwani/board.h index b89bdc27aa..b58102efe7 100644 --- a/board/nuwani/board.h +++ b/board/nuwani/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nuwani/build.mk b/board/nuwani/build.mk index 85b141b15d..c754c96237 100644 --- a/board/nuwani/build.mk +++ b/board/nuwani/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/nuwani/ec.tasklist b/board/nuwani/ec.tasklist index 2874dff927..c5db864fe5 100644 --- a/board/nuwani/ec.tasklist +++ b/board/nuwani/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nuwani/gpio.inc b/board/nuwani/gpio.inc index 18c72c8125..e01af85e34 100644 --- a/board/nuwani/gpio.inc +++ b/board/nuwani/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/nuwani/led.c b/board/nuwani/led.c index a926b7e2d8..4013f22bd5 100644 --- a/board/nuwani/led.c +++ b/board/nuwani/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/oak/battery.c b/board/oak/battery.c index 3ff104bb07..b9b410932d 100644 --- a/board/oak/battery.c +++ b/board/oak/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/oak/board.c b/board/oak/board.c index 77592eea99..468b6e6677 100644 --- a/board/oak/board.c +++ b/board/oak/board.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -195,23 +195,29 @@ struct als_t als[] = { BUILD_ASSERT(ARRAY_SIZE(als) == ALS_COUNT); #endif -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_MUX, - .i2c_addr_flags = PI3USB3X532_I2C_ADDR0, - .driver = &pi3usb3x532_usb_mux_driver, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_MUX, + .i2c_addr_flags = PI3USB3X532_I2C_ADDR0, + .driver = &pi3usb3x532_usb_mux_driver, + }, }, { - .usb_port = 1, - .i2c_port = I2C_PORT_USB_MUX, + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .i2c_port = I2C_PORT_USB_MUX, #if (BOARD_REV <= OAK_REV4) - .i2c_addr_flags = PI3USB3X532_I2C_ADDR1, - .driver = &pi3usb3x532_usb_mux_driver, + .i2c_addr_flags = PI3USB3X532_I2C_ADDR1, + .driver = &pi3usb3x532_usb_mux_driver, #else - .i2c_addr_flags = 0x10, - .driver = &ps8740_usb_mux_driver, + .i2c_addr_flags = 0x10, + .driver = &ps8740_usb_mux_driver, #endif + }, }, }; diff --git a/board/oak/board.h b/board/oak/board.h index 56468b6eaf..6f5ed3fc87 100644 --- a/board/oak/board.h +++ b/board/oak/board.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/oak/board_revs.h b/board/oak/board_revs.h index 8d4d65be9b..6220a05fb0 100644 --- a/board/oak/board_revs.h +++ b/board/oak/board_revs.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/oak/build.mk b/board/oak/build.mk index dc21970df0..1cbbb2ac63 100644 --- a/board/oak/build.mk +++ b/board/oak/build.mk @@ -1,5 +1,5 @@ #-*- makefile -*- -# Copyright 2015 The Chromium OS Authors. All rights reserved. +# Copyright 2015 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/oak/ec.tasklist b/board/oak/ec.tasklist index 2af7da77eb..80c39f2617 100644 --- a/board/oak/ec.tasklist +++ b/board/oak/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/oak/gpio.inc b/board/oak/gpio.inc index 3789f3ec35..b2ce008363 100644 --- a/board/oak/gpio.inc +++ b/board/oak/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2015 The Chromium OS Authors. All rights reserved. + * Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/oak/led.c b/board/oak/led.c index 686a7d68f8..64f5123b3c 100644 --- a/board/oak/led.c +++ b/board/oak/led.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/oak/usb_pd_policy.c b/board/oak/usb_pd_policy.c index aaa69bb322..c337aa4b59 100644 --- a/board/oak/usb_pd_policy.c +++ b/board/oak/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/osiris/battery.c b/board/osiris/battery.c index 3a43835ec6..9664c4279b 100644 --- a/board/osiris/battery.c +++ b/board/osiris/battery.c @@ -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. * diff --git a/board/osiris/board.c b/board/osiris/board.c index e64c68a9de..6cfd7d8c26 100644 --- a/board/osiris/board.c +++ b/board/osiris/board.c @@ -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. */ diff --git a/board/osiris/board.h b/board/osiris/board.h index 246fc2b7d6..b1eaf3a5c2 100644 --- a/board/osiris/board.h +++ b/board/osiris/board.h @@ -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. */ diff --git a/board/osiris/build.mk b/board/osiris/build.mk index b4a75892a5..fc29a4bb0e 100644 --- a/board/osiris/build.mk +++ b/board/osiris/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/osiris/charger.c b/board/osiris/charger.c index 32dd2ddddb..88f5b85a41 100644 --- a/board/osiris/charger.c +++ b/board/osiris/charger.c @@ -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. */ diff --git a/board/osiris/ec.tasklist b/board/osiris/ec.tasklist index cc968777a2..1b6c9cb361 100644 --- a/board/osiris/ec.tasklist +++ b/board/osiris/ec.tasklist @@ -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. */ diff --git a/board/osiris/fans.c b/board/osiris/fans.c index 523893653d..5878d4c4c5 100644 --- a/board/osiris/fans.c +++ b/board/osiris/fans.c @@ -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. */ diff --git a/board/osiris/fw_config.c b/board/osiris/fw_config.c index 67f23349cf..1fb085fe6e 100644 --- a/board/osiris/fw_config.c +++ b/board/osiris/fw_config.c @@ -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. */ diff --git a/board/osiris/fw_config.h b/board/osiris/fw_config.h index c44144e25c..fb776dc5a4 100644 --- a/board/osiris/fw_config.h +++ b/board/osiris/fw_config.h @@ -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. */ diff --git a/board/osiris/gpio.inc b/board/osiris/gpio.inc index 6e7d3ac1ba..ea196571f8 100644 --- a/board/osiris/gpio.inc +++ b/board/osiris/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/osiris/i2c.c b/board/osiris/i2c.c index 23eac76a21..2d0656c484 100644 --- a/board/osiris/i2c.c +++ b/board/osiris/i2c.c @@ -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. */ diff --git a/board/osiris/keyboard.c b/board/osiris/keyboard.c index 874c785cc0..cd557760eb 100644 --- a/board/osiris/keyboard.c +++ b/board/osiris/keyboard.c @@ -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. */ diff --git a/board/osiris/led.c b/board/osiris/led.c index 6ac4852bc2..993c2969d4 100644 --- a/board/osiris/led.c +++ b/board/osiris/led.c @@ -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. * Power and battery LED control for osiris diff --git a/board/osiris/pwm.c b/board/osiris/pwm.c index a922473361..eb178750e9 100644 --- a/board/osiris/pwm.c +++ b/board/osiris/pwm.c @@ -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. */ diff --git a/board/osiris/sensors.c b/board/osiris/sensors.c index 65551e5198..9ad528c069 100644 --- a/board/osiris/sensors.c +++ b/board/osiris/sensors.c @@ -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. */ diff --git a/board/osiris/usbc_config.c b/board/osiris/usbc_config.c index fc85e6783a..d116e080ad 100644 --- a/board/osiris/usbc_config.c +++ b/board/osiris/usbc_config.c @@ -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. */ @@ -100,32 +100,42 @@ unsigned int ppc_cnt = ARRAY_SIZE(ppc_chips); * and updates the TCSS configuration on state changes. */ -static const struct usb_mux usbc0_usb3_mb_retimer = { - .usb_port = USBC_PORT_C0, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, +static const struct usb_mux_chain usbc0_usb3_mb_retimer = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C0, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, }; -static const struct usb_mux usbc1_usb3_db_retimer = { - .usb_port = USBC_PORT_C1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, +static const struct usb_mux_chain usbc1_usb3_db_retimer = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, }; -const struct usb_mux usb_muxes[] = { +const struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - /* PS8815 MB */ - .usb_port = USBC_PORT_C0, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, - .next_mux = &usbc0_usb3_mb_retimer, + .mux = &(const struct usb_mux) { + /* PS8815 MB */ + .usb_port = USBC_PORT_C0, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, + .next = &usbc0_usb3_mb_retimer, }, [USBC_PORT_C1] = { - /* PS8815 DB */ - .usb_port = USBC_PORT_C1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, - .next_mux = &usbc1_usb3_db_retimer, + .mux = &(const struct usb_mux) { + /* PS8815 DB */ + .usb_port = USBC_PORT_C1, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, + .next = &usbc1_usb3_db_retimer, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/board/osiris/usbc_config.h b/board/osiris/usbc_config.h index 3551496f7d..dac4177f0c 100644 --- a/board/osiris/usbc_config.h +++ b/board/osiris/usbc_config.h @@ -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. */ diff --git a/board/palkia/battery.c b/board/palkia/battery.c index 76e58aa618..ed7efdb423 100644 --- a/board/palkia/battery.c +++ b/board/palkia/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/palkia/board.c b/board/palkia/board.c index c1bce997b7..e0aab014a0 100644 --- a/board/palkia/board.c +++ b/board/palkia/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -144,11 +144,13 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { } }; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { [USB_PD_PORT_TCPC_0] = { - .usb_port = USB_PD_PORT_TCPC_0, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_TCPC_0, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, }, }; diff --git a/board/palkia/board.h b/board/palkia/board.h index e7aeea49b9..d4de1aca39 100644 --- a/board/palkia/board.h +++ b/board/palkia/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/palkia/build.mk b/board/palkia/build.mk index cf0939b776..3ad9efe889 100644 --- a/board/palkia/build.mk +++ b/board/palkia/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/palkia/ec.tasklist b/board/palkia/ec.tasklist index be39ae64a2..2a0d89d14e 100644 --- a/board/palkia/ec.tasklist +++ b/board/palkia/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/palkia/gpio.inc b/board/palkia/gpio.inc index ec7ce25538..dfe92f8a81 100644 --- a/board/palkia/gpio.inc +++ b/board/palkia/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -16,10 +16,10 @@ GPIO_INT(ACOK_OD, PIN(0, 0), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, ex /* Power sequencing interrupts */ GPIO_INT(SLP_S0_L, PIN(D, 5), GPIO_INT_BOTH, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 GPIO_INT(SLP_S3_L, PIN(A, 5), GPIO_INT_BOTH, power_signal_interrupt) #endif -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 GPIO_INT(SLP_S4_L, PIN(D, 4), GPIO_INT_BOTH, power_signal_interrupt) #endif GPIO_INT(PG_EC_RSMRST_L, PIN(E, 2), GPIO_INT_BOTH, intel_x86_rsmrst_signal_interrupt) diff --git a/board/palkia/keyboard_customization.c b/board/palkia/keyboard_customization.c index 7cd37070be..da69078c35 100644 --- a/board/palkia/keyboard_customization.c +++ b/board/palkia/keyboard_customization.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/palkia/keyboard_customization.h b/board/palkia/keyboard_customization.h index a21190028c..fc97ffd728 100644 --- a/board/palkia/keyboard_customization.h +++ b/board/palkia/keyboard_customization.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/palkia/led.c b/board/palkia/led.c index 13059eee95..f5242a04c0 100644 --- a/board/palkia/led.c +++ b/board/palkia/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/panqueque/board.c b/board/panqueque/board.c index 39554e46d8..786fe5f5aa 100644 --- a/board/panqueque/board.c +++ b/board/panqueque/board.c @@ -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. */ @@ -154,13 +154,15 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }, }; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { [USB_PD_PORT_HOST] = { - .usb_port = USB_PD_PORT_HOST, - .i2c_port = I2C_PORT_I2C1, - .i2c_addr_flags = PS8822_I2C_ADDR3_FLAG, - .driver = &ps8822_usb_mux_driver, - .board_set = &board_ps8822_mux_set, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_HOST, + .i2c_port = I2C_PORT_I2C1, + .i2c_addr_flags = PS8822_I2C_ADDR3_FLAG, + .driver = &ps8822_usb_mux_driver, + .board_set = &board_ps8822_mux_set, + }, }, }; diff --git a/board/panqueque/board.h b/board/panqueque/board.h index 95249696fd..24eeebabe5 100644 --- a/board/panqueque/board.h +++ b/board/panqueque/board.h @@ -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. */ diff --git a/board/panqueque/build.mk b/board/panqueque/build.mk index 49775523af..8f9795eca9 100644 --- a/board/panqueque/build.mk +++ b/board/panqueque/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/panqueque/ec.tasklist b/board/panqueque/ec.tasklist index 7a67fce776..7bd8acaa5f 100644 --- a/board/panqueque/ec.tasklist +++ b/board/panqueque/ec.tasklist @@ -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. */ diff --git a/board/panqueque/gpio.inc b/board/panqueque/gpio.inc index fa1b900c82..4fd80ec754 100644 --- a/board/panqueque/gpio.inc +++ b/board/panqueque/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/pazquel/battery.c b/board/pazquel/battery.c index e1415f5682..bd600aed5b 100644 --- a/board/pazquel/battery.c +++ b/board/pazquel/battery.c @@ -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. * diff --git a/board/pazquel/board.c b/board/pazquel/board.c index bcbf6a8e07..90dcc6cd0d 100644 --- a/board/pazquel/board.c +++ b/board/pazquel/board.c @@ -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. */ @@ -236,16 +236,22 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { * to AP. But the TCPC chip is also needed to know the HPD status; otherwise, * the mux misbehaves. */ -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, }, { - .usb_port = 1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, } }; diff --git a/board/pazquel/board.h b/board/pazquel/board.h index 782d3a2ccc..414c8ab7dd 100644 --- a/board/pazquel/board.h +++ b/board/pazquel/board.h @@ -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. */ diff --git a/board/pazquel/build.mk b/board/pazquel/build.mk index f130540bd4..3bc07db568 100644 --- a/board/pazquel/build.mk +++ b/board/pazquel/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/pazquel/ec.tasklist b/board/pazquel/ec.tasklist index 5beeb38feb..228828af3c 100644 --- a/board/pazquel/ec.tasklist +++ b/board/pazquel/ec.tasklist @@ -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. */ diff --git a/board/pazquel/gpio.inc b/board/pazquel/gpio.inc index 4d1cc57b36..8d9a2827bc 100644 --- a/board/pazquel/gpio.inc +++ b/board/pazquel/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/pazquel/led.c b/board/pazquel/led.c index 184794f613..180e9829f5 100644 --- a/board/pazquel/led.c +++ b/board/pazquel/led.c @@ -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. * diff --git a/board/pazquel/usbc_config.c b/board/pazquel/usbc_config.c index 73666d087c..5d30adb6e2 100644 --- a/board/pazquel/usbc_config.c +++ b/board/pazquel/usbc_config.c @@ -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. */ diff --git a/board/pdeval-stm32f072/board.c b/board/pdeval-stm32f072/board.c index e089a34cef..93bf073ce7 100644 --- a/board/pdeval-stm32f072/board.c +++ b/board/pdeval-stm32f072/board.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/pdeval-stm32f072/board.h b/board/pdeval-stm32f072/board.h index 8554291ae0..7cbbfd6435 100644 --- a/board/pdeval-stm32f072/board.h +++ b/board/pdeval-stm32f072/board.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/pdeval-stm32f072/build.mk b/board/pdeval-stm32f072/build.mk index 30d5bf8ac8..2238f8f59a 100644 --- a/board/pdeval-stm32f072/build.mk +++ b/board/pdeval-stm32f072/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2015 The Chromium OS Authors. All rights reserved. +# Copyright 2015 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/pdeval-stm32f072/ec.tasklist b/board/pdeval-stm32f072/ec.tasklist index 5003fc7ba1..e897969a55 100644 --- a/board/pdeval-stm32f072/ec.tasklist +++ b/board/pdeval-stm32f072/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/pdeval-stm32f072/gpio.inc b/board/pdeval-stm32f072/gpio.inc index 5409077c34..fb8537ffbe 100644 --- a/board/pdeval-stm32f072/gpio.inc +++ b/board/pdeval-stm32f072/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2015 The Chromium OS Authors. All rights reserved. + * Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/pdeval-stm32f072/openocd-flash.cfg b/board/pdeval-stm32f072/openocd-flash.cfg index ec32416934..05a697acf8 100644 --- a/board/pdeval-stm32f072/openocd-flash.cfg +++ b/board/pdeval-stm32f072/openocd-flash.cfg @@ -1,4 +1,4 @@ -# Copyright 2014 The Chromium OS Authors. All rights reserved. +# Copyright 2014 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/board/pdeval-stm32f072/usb_pd_pdo.c b/board/pdeval-stm32f072/usb_pd_pdo.c index 442e708923..31d84f9785 100644 --- a/board/pdeval-stm32f072/usb_pd_pdo.c +++ b/board/pdeval-stm32f072/usb_pd_pdo.c @@ -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. */ diff --git a/board/pdeval-stm32f072/usb_pd_pdo.h b/board/pdeval-stm32f072/usb_pd_pdo.h index 58fd1f153c..13640a7471 100644 --- a/board/pdeval-stm32f072/usb_pd_pdo.h +++ b/board/pdeval-stm32f072/usb_pd_pdo.h @@ -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. */ diff --git a/board/pdeval-stm32f072/usb_pd_policy.c b/board/pdeval-stm32f072/usb_pd_policy.c index 8cfca952cd..df41d0c77a 100644 --- a/board/pdeval-stm32f072/usb_pd_policy.c +++ b/board/pdeval-stm32f072/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -24,10 +24,13 @@ static int vbus_present; #if defined(CONFIG_USB_PD_TCPM_MUX) && defined(CONFIG_USB_PD_TCPM_ANX7447) -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .driver = &anx7447_usb_mux_driver, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .driver = &anx7447_usb_mux_driver, + }, }, }; #endif @@ -187,7 +190,7 @@ __override int svdm_dp_config(int port, uint32_t *payload) int pin_mode = pd_dfp_dp_get_pin_mode(port, dp_status[port]); bool unused; #if defined(CONFIG_USB_PD_TCPM_MUX) && defined(CONFIG_USB_PD_TCPM_ANX7447) - const struct usb_mux *mux = &usb_muxes[port]; + const struct usb_mux *mux = usb_muxes[port].mux; #endif #ifdef CONFIG_USB_PD_TCPM_ANX7447 @@ -236,7 +239,7 @@ __override int svdm_dp_config(int port, uint32_t *payload) __override void svdm_dp_post_config(int port) { bool unused; - const struct usb_mux *mux = &usb_muxes[port]; + const struct usb_mux *mux = usb_muxes[port].mux; dp_flags[port] |= DP_FLAGS_DP_ON; if (!(dp_flags[port] & DP_FLAGS_HPD_HI_PENDING)) @@ -254,7 +257,7 @@ __override int svdm_dp_attention(int port, uint32_t *payload) #ifdef CONFIG_USB_PD_TCPM_ANX7447 int lvl = PD_VDO_DPSTS_HPD_LVL(payload[1]); int irq = PD_VDO_DPSTS_HPD_IRQ(payload[1]); - const struct usb_mux *mux = &usb_muxes[port]; + const struct usb_mux *mux = usb_muxes[port].mux; bool unused; mux_state_t mux_state = diff --git a/board/phaser/battery.c b/board/phaser/battery.c index 2e1f77d552..25a0fbce92 100644 --- a/board/phaser/battery.c +++ b/board/phaser/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/phaser/board.c b/board/phaser/board.c index df950371c8..6ebaab0b4a 100644 --- a/board/phaser/board.c +++ b/board/phaser/board.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/phaser/board.h b/board/phaser/board.h index fbdc55ff3a..54f3cf3b32 100644 --- a/board/phaser/board.h +++ b/board/phaser/board.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/phaser/build.mk b/board/phaser/build.mk index 3d04b75731..998a65a3de 100644 --- a/board/phaser/build.mk +++ b/board/phaser/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2018 The Chromium OS Authors. All rights reserved. +# Copyright 2018 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/phaser/ec.tasklist b/board/phaser/ec.tasklist index d98db145e7..977b8b01be 100644 --- a/board/phaser/ec.tasklist +++ b/board/phaser/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/phaser/gpio.inc b/board/phaser/gpio.inc index 639ed914b6..c6d2be7fc6 100644 --- a/board/phaser/gpio.inc +++ b/board/phaser/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2018 The Chromium OS Authors. All rights reserved. + * Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/phaser/led.c b/board/phaser/led.c index 31cbba2a16..998b948804 100644 --- a/board/phaser/led.c +++ b/board/phaser/led.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/pico/battery.c b/board/pico/battery.c index 6f6b49899a..5e1671f5f3 100644 --- a/board/pico/battery.c +++ b/board/pico/battery.c @@ -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. */ diff --git a/board/pico/board.c b/board/pico/board.c index 30d5d4beb7..f884545b6d 100644 --- a/board/pico/board.c +++ b/board/pico/board.c @@ -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. */ @@ -266,13 +266,16 @@ static void board_hpd_status(const struct usb_mux *me, mux_state_t mux_state, host_set_single_event(EC_HOST_EVENT_USB_MUX); } -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_MUX, - .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, - .driver = &it5205_usb_mux_driver, - .hpd_update = &board_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_MUX, + .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, + .driver = &it5205_usb_mux_driver, + .hpd_update = &board_hpd_status, + }, }, }; diff --git a/board/pico/board.h b/board/pico/board.h index 422a7d6814..665cf59691 100644 --- a/board/pico/board.h +++ b/board/pico/board.h @@ -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. */ diff --git a/board/pico/build.mk b/board/pico/build.mk index 9ca7933e2a..a1ca27116e 100644 --- a/board/pico/build.mk +++ b/board/pico/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/pico/ec.tasklist b/board/pico/ec.tasklist index 5c272d04f4..883033408a 100644 --- a/board/pico/ec.tasklist +++ b/board/pico/ec.tasklist @@ -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. */ diff --git a/board/pico/gpio.inc b/board/pico/gpio.inc index 34ac5cf7af..359e25451e 100644 --- a/board/pico/gpio.inc +++ b/board/pico/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/pico/led.c b/board/pico/led.c index c0e6db6874..bbbad7ceb8 100644 --- a/board/pico/led.c +++ b/board/pico/led.c @@ -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. * diff --git a/board/pirika/battery.c b/board/pirika/battery.c index 2da3296106..f753eba554 100644 --- a/board/pirika/battery.c +++ b/board/pirika/battery.c @@ -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. * diff --git a/board/pirika/board.c b/board/pirika/board.c index 19b7d31e71..8913ec0f07 100644 --- a/board/pirika/board.c +++ b/board/pirika/board.c @@ -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. */ @@ -360,28 +360,37 @@ static int board_tusb544_set(const struct usb_mux *me, mux_state_t mux_state) return rv; } -const struct usb_mux usbc1_retimer = { - .usb_port = 1, - .i2c_port = I2C_PORT_SUB_USB_C1, - .i2c_addr_flags = TUSB544_I2C_ADDR_FLAGS0, - .driver = &tusb544_drv, - .board_set = &board_tusb544_set, +const struct usb_mux_chain usbc1_retimer = { + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .i2c_port = I2C_PORT_SUB_USB_C1, + .i2c_addr_flags = TUSB544_I2C_ADDR_FLAGS0, + .driver = &tusb544_drv, + .board_set = &board_tusb544_set, + }, }; /* USB Muxes */ -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_C0, - .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, - .driver = &it5205_usb_mux_driver, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_C0, + .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, + .driver = &it5205_usb_mux_driver, + }, }, { - .usb_port = 1, - .i2c_port = I2C_PORT_SUB_USB_C1, - .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, - .driver = &it5205_usb_mux_driver, - .next_mux = &usbc1_retimer, + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .i2c_port = I2C_PORT_SUB_USB_C1, + .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, + .driver = &it5205_usb_mux_driver, + }, + .next = &usbc1_retimer, }, }; diff --git a/board/pirika/board.h b/board/pirika/board.h index d8ccbe6529..c8e2f3eb35 100644 --- a/board/pirika/board.h +++ b/board/pirika/board.h @@ -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. */ diff --git a/board/pirika/build.mk b/board/pirika/build.mk index 8167ca9966..01b890bf29 100644 --- a/board/pirika/build.mk +++ b/board/pirika/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/pirika/cbi_ssfc.c b/board/pirika/cbi_ssfc.c index 39fd4929a1..81f3ee0dad 100644 --- a/board/pirika/cbi_ssfc.c +++ b/board/pirika/cbi_ssfc.c @@ -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. */ diff --git a/board/pirika/cbi_ssfc.h b/board/pirika/cbi_ssfc.h index 942f0cf5f4..bf8853a43a 100644 --- a/board/pirika/cbi_ssfc.h +++ b/board/pirika/cbi_ssfc.h @@ -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. */ diff --git a/board/pirika/ec.tasklist b/board/pirika/ec.tasklist index d6fa610141..f7c32f66bf 100644 --- a/board/pirika/ec.tasklist +++ b/board/pirika/ec.tasklist @@ -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. */ diff --git a/board/pirika/gpio.inc b/board/pirika/gpio.inc index 90e6de2607..5ec1003a70 100644 --- a/board/pirika/gpio.inc +++ b/board/pirika/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/pirika/led.c b/board/pirika/led.c index 8d5b564c74..916f691dd6 100644 --- a/board/pirika/led.c +++ b/board/pirika/led.c @@ -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. */ diff --git a/board/pirika/usb_pd_policy.c b/board/pirika/usb_pd_policy.c index 89df538eaa..83c09bb99e 100644 --- a/board/pirika/usb_pd_policy.c +++ b/board/pirika/usb_pd_policy.c @@ -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. */ diff --git a/board/plankton/board.c b/board/plankton/board.c index 8a4a0e0da3..2bf57084ce 100644 --- a/board/plankton/board.c +++ b/board/plankton/board.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/plankton/board.h b/board/plankton/board.h index 89bdad9d84..224364269b 100644 --- a/board/plankton/board.h +++ b/board/plankton/board.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/plankton/build.mk b/board/plankton/build.mk index 662be139c7..0e597a478f 100644 --- a/board/plankton/build.mk +++ b/board/plankton/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2014 The Chromium OS Authors. All rights reserved. +# Copyright 2014 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/plankton/ec.tasklist b/board/plankton/ec.tasklist index 41fc047d6a..5a82344122 100644 --- a/board/plankton/ec.tasklist +++ b/board/plankton/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/plankton/gpio.inc b/board/plankton/gpio.inc index 9c618dbaa6..edccec814c 100644 --- a/board/plankton/gpio.inc +++ b/board/plankton/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2014 The Chromium OS Authors. All rights reserved. + * Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/plankton/usb_pd_config.h b/board/plankton/usb_pd_config.h index 17a2dcd456..47614c3fce 100644 --- a/board/plankton/usb_pd_config.h +++ b/board/plankton/usb_pd_config.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/plankton/usb_pd_pdo.c b/board/plankton/usb_pd_pdo.c index 67fe6b65b2..52dcc11352 100644 --- a/board/plankton/usb_pd_pdo.c +++ b/board/plankton/usb_pd_pdo.c @@ -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. */ diff --git a/board/plankton/usb_pd_pdo.h b/board/plankton/usb_pd_pdo.h index 20e8976348..030dab9287 100644 --- a/board/plankton/usb_pd_pdo.h +++ b/board/plankton/usb_pd_pdo.h @@ -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. */ diff --git a/board/plankton/usb_pd_policy.c b/board/plankton/usb_pd_policy.c index 51993dd1fa..355919e06a 100644 --- a/board/plankton/usb_pd_policy.c +++ b/board/plankton/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/polyberry/board.c b/board/polyberry/board.c index f394d6b847..0edff8eb51 100644 --- a/board/polyberry/board.c +++ b/board/polyberry/board.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/polyberry/board.h b/board/polyberry/board.h index 5fab50286d..41069f2722 100644 --- a/board/polyberry/board.h +++ b/board/polyberry/board.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/polyberry/build.mk b/board/polyberry/build.mk index 6b06f2bb8f..61e4b79d47 100644 --- a/board/polyberry/build.mk +++ b/board/polyberry/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2016 The Chromium OS Authors. All rights reserved. +# Copyright 2016 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/polyberry/ec.tasklist b/board/polyberry/ec.tasklist index c1fb169118..c45a1e89a7 100644 --- a/board/polyberry/ec.tasklist +++ b/board/polyberry/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/polyberry/gpio.inc b/board/polyberry/gpio.inc index 536dccc5ff..d862155c4d 100644 --- a/board/polyberry/gpio.inc +++ b/board/polyberry/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2016 The Chromium OS Authors. All rights reserved. + * Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/pompom/battery.c b/board/pompom/battery.c index 7ce8eec202..2566813651 100644 --- a/board/pompom/battery.c +++ b/board/pompom/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/pompom/board.c b/board/pompom/board.c index 6a21a57b10..394f06be8e 100644 --- a/board/pompom/board.c +++ b/board/pompom/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -207,11 +207,14 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { * to AP. But the TCPC chip is also needed to know the HPD status; otherwise, * the mux misbehaves. */ -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, }, }; diff --git a/board/pompom/board.h b/board/pompom/board.h index 1b9557d4e3..40e7185c16 100644 --- a/board/pompom/board.h +++ b/board/pompom/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/pompom/board_revs.h b/board/pompom/board_revs.h index 5b6f850a1b..8edc249df0 100644 --- a/board/pompom/board_revs.h +++ b/board/pompom/board_revs.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/pompom/build.mk b/board/pompom/build.mk index 04c90da3fe..8d302988f4 100644 --- a/board/pompom/build.mk +++ b/board/pompom/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/pompom/ec.tasklist b/board/pompom/ec.tasklist index 7ec8b46059..9145e6dd84 100644 --- a/board/pompom/ec.tasklist +++ b/board/pompom/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/pompom/gpio.inc b/board/pompom/gpio.inc index 531452eae3..3016f8b9d5 100644 --- a/board/pompom/gpio.inc +++ b/board/pompom/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/pompom/led.c b/board/pompom/led.c index c99da21aff..31fccbf4e2 100644 --- a/board/pompom/led.c +++ b/board/pompom/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/pompom/usbc_config.c b/board/pompom/usbc_config.c index 73666d087c..5d30adb6e2 100644 --- a/board/pompom/usbc_config.c +++ b/board/pompom/usbc_config.c @@ -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. */ diff --git a/board/poppy/base_detect_lux.c b/board/poppy/base_detect_lux.c index f1be68d42d..8b799a3dbd 100644 --- a/board/poppy/base_detect_lux.c +++ b/board/poppy/base_detect_lux.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/poppy/base_detect_poppy.c b/board/poppy/base_detect_poppy.c index 49a58bb963..e6ac6e8da7 100644 --- a/board/poppy/base_detect_poppy.c +++ b/board/poppy/base_detect_poppy.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/poppy/battery.c b/board/poppy/battery.c index 923acd900f..5006edf123 100644 --- a/board/poppy/battery.c +++ b/board/poppy/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/poppy/board.c b/board/poppy/board.c index 2a35b4df9d..a69fdd3f16 100644 --- a/board/poppy/board.c +++ b/board/poppy/board.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -229,16 +229,22 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }, }; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .driver = &anx74xx_tcpm_usb_mux_driver, - .hpd_update = &anx74xx_tcpc_update_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .driver = &anx74xx_tcpm_usb_mux_driver, + .hpd_update = &anx74xx_tcpc_update_hpd_status, + }, }, { - .usb_port = 1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, } }; diff --git a/board/poppy/board.h b/board/poppy/board.h index 8f365dc8df..6f95a9abeb 100644 --- a/board/poppy/board.h +++ b/board/poppy/board.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -64,8 +64,8 @@ #define CONFIG_CHIPSET_HAS_PLATFORM_PMIC_RESET #define CONFIG_CHIPSET_RESET_HOOK #define CONFIG_HOST_INTERFACE_ESPI -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S3 -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#define CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 +#define CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 #define GPIO_PG_EC_RSMRST_ODL GPIO_RSMRST_L_PGOOD /* Battery */ diff --git a/board/poppy/build.mk b/board/poppy/build.mk index df32a7ca8f..36c55d3048 100644 --- a/board/poppy/build.mk +++ b/board/poppy/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2016 The Chromium OS Authors. All rights reserved. +# Copyright 2016 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/poppy/ec.tasklist b/board/poppy/ec.tasklist index 7591137bc9..4ee0b53a32 100644 --- a/board/poppy/ec.tasklist +++ b/board/poppy/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/poppy/gpio.inc b/board/poppy/gpio.inc index 286085d39c..63a8d3ce99 100644 --- a/board/poppy/gpio.inc +++ b/board/poppy/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2016 The Chromium OS Authors. All rights reserved. + * Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -13,14 +13,14 @@ GPIO_INT(USB_C1_PD_INT_ODL, PIN(C, 5), GPIO_INT_FALLING, tcpc_alert_event) #ifdef CONFIG_POWER_S0IX GPIO_INT(PCH_SLP_S0_L, PIN(7, 5), GPIO_INT_BOTH, power_signal_interrupt) #endif -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 #ifdef BOARD_LUX GPIO_INT(PCH_SLP_S3_L, PIN(2, 2), GPIO_INT_BOTH, power_signal_interrupt) #else GPIO_INT(PCH_SLP_S3_L, PIN(7, 3), GPIO_INT_BOTH, power_signal_interrupt) #endif -#endif /* CONFIG_HOSTCMD_ESPI_VW_SLP_S3 */ -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#endif /* CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 */ +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 GPIO_INT(PCH_SLP_S4_L, PIN(8, 6), GPIO_INT_BOTH, power_signal_interrupt) #endif GPIO_INT(PCH_SLP_SUS_L, PIN(6, 2), GPIO_INT_BOTH, power_signal_interrupt) diff --git a/board/poppy/led.c b/board/poppy/led.c index 7fb45d3823..f388dd0326 100644 --- a/board/poppy/led.c +++ b/board/poppy/led.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/poppy/usb_pd_policy.c b/board/poppy/usb_pd_policy.c index 0362ab4212..ec2ea00076 100644 --- a/board/poppy/usb_pd_policy.c +++ b/board/poppy/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/primus/battery.c b/board/primus/battery.c index e61817d95b..1b0d74bed3 100644 --- a/board/primus/battery.c +++ b/board/primus/battery.c @@ -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. * diff --git a/board/primus/board.c b/board/primus/board.c index 0f98512725..8b5f1a86fc 100644 --- a/board/primus/board.c +++ b/board/primus/board.c @@ -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. */ diff --git a/board/primus/board.h b/board/primus/board.h index 55ca70b510..7346acc2ab 100644 --- a/board/primus/board.h +++ b/board/primus/board.h @@ -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. */ diff --git a/board/primus/build.mk b/board/primus/build.mk index ddf50b46e2..409a9dd45e 100644 --- a/board/primus/build.mk +++ b/board/primus/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/primus/cbi_ssfc.c b/board/primus/cbi_ssfc.c index dd59bb2c9f..45afa622ab 100644 --- a/board/primus/cbi_ssfc.c +++ b/board/primus/cbi_ssfc.c @@ -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. */ diff --git a/board/primus/cbi_ssfc.h b/board/primus/cbi_ssfc.h index d1ad8c991f..fe4c2fb4e5 100644 --- a/board/primus/cbi_ssfc.h +++ b/board/primus/cbi_ssfc.h @@ -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. */ diff --git a/board/primus/charger.c b/board/primus/charger.c index cbc657271b..a4fa209246 100644 --- a/board/primus/charger.c +++ b/board/primus/charger.c @@ -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. */ diff --git a/board/primus/ec.tasklist b/board/primus/ec.tasklist index bf2ec04c62..3afcca805e 100644 --- a/board/primus/ec.tasklist +++ b/board/primus/ec.tasklist @@ -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. */ diff --git a/board/primus/fans.c b/board/primus/fans.c index 79eed79630..b3c72c074b 100644 --- a/board/primus/fans.c +++ b/board/primus/fans.c @@ -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. */ diff --git a/board/primus/fw_config.c b/board/primus/fw_config.c index 25a89255f7..82ba396901 100644 --- a/board/primus/fw_config.c +++ b/board/primus/fw_config.c @@ -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. */ diff --git a/board/primus/fw_config.h b/board/primus/fw_config.h index a985583af0..81fa5481f8 100644 --- a/board/primus/fw_config.h +++ b/board/primus/fw_config.h @@ -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. */ diff --git a/board/primus/gpio.inc b/board/primus/gpio.inc index ce66027514..9928eb0cc5 100644 --- a/board/primus/gpio.inc +++ b/board/primus/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/primus/i2c.c b/board/primus/i2c.c index 019862f441..21939347b1 100644 --- a/board/primus/i2c.c +++ b/board/primus/i2c.c @@ -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. */ diff --git a/board/primus/keyboard.c b/board/primus/keyboard.c index 5b45b60b19..9c9a37e9fc 100644 --- a/board/primus/keyboard.c +++ b/board/primus/keyboard.c @@ -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. */ diff --git a/board/primus/led.c b/board/primus/led.c index d2c839f5ee..70c1c89188 100644 --- a/board/primus/led.c +++ b/board/primus/led.c @@ -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. */ diff --git a/board/primus/ps2.c b/board/primus/ps2.c index 8cf1e641d8..2a0a764d5e 100644 --- a/board/primus/ps2.c +++ b/board/primus/ps2.c @@ -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. */ diff --git a/board/primus/ps2.h b/board/primus/ps2.h index abdec687b6..a82d6d566a 100644 --- a/board/primus/ps2.h +++ b/board/primus/ps2.h @@ -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. */ diff --git a/board/primus/pwm.c b/board/primus/pwm.c index 26ca6e5b92..f2889c2b8e 100644 --- a/board/primus/pwm.c +++ b/board/primus/pwm.c @@ -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. */ diff --git a/board/primus/sensors.c b/board/primus/sensors.c index 91878cebae..9c0a9d69e8 100644 --- a/board/primus/sensors.c +++ b/board/primus/sensors.c @@ -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. */ diff --git a/board/primus/thermal.c b/board/primus/thermal.c index be6ced03f0..00e2dddf98 100644 --- a/board/primus/thermal.c +++ b/board/primus/thermal.c @@ -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. */ diff --git a/board/primus/usbc_config.c b/board/primus/usbc_config.c index a3a92f6d9f..a11a8d588f 100644 --- a/board/primus/usbc_config.c +++ b/board/primus/usbc_config.c @@ -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. */ @@ -74,33 +74,43 @@ BUILD_ASSERT(ARRAY_SIZE(ppc_chips) == USBC_PORT_COUNT); unsigned int ppc_cnt = ARRAY_SIZE(ppc_chips); /* USBC mux configuration - Alder Lake includes internal mux */ -static const struct usb_mux usbc0_tcss_usb_mux = { - .usb_port = USBC_PORT_C0, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +static const struct usb_mux_chain usbc0_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C0, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; -static const struct usb_mux usbc1_tcss_usb_mux = { - .usb_port = USBC_PORT_C1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +static const struct usb_mux_chain usbc1_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; -const struct usb_mux usb_muxes[] = { +const struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_C0_C1_RT, - .i2c_addr_flags = USBC_PORT_C0_BB_RETIMER_I2C_ADDR, - .next_mux = &usbc0_tcss_usb_mux, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_C0_C1_RT, + .i2c_addr_flags = USBC_PORT_C0_BB_RETIMER_I2C_ADDR, + }, + .next = &usbc0_tcss_usb_mux, }, [USBC_PORT_C1] = { - .usb_port = USBC_PORT_C1, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_C0_C1_RT, - .i2c_addr_flags = USBC_PORT_C1_BB_RETIMER_I2C_ADDR, - .next_mux = &usbc1_tcss_usb_mux, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C1, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_C0_C1_RT, + .i2c_addr_flags = USBC_PORT_C1_BB_RETIMER_I2C_ADDR, + }, + .next = &usbc1_tcss_usb_mux, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/board/primus/usbc_config.h b/board/primus/usbc_config.h index a7eabddd4e..1e087f083c 100644 --- a/board/primus/usbc_config.h +++ b/board/primus/usbc_config.h @@ -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. */ diff --git a/board/prism/board.c b/board/prism/board.c index 122310ea4a..06498cb171 100644 --- a/board/prism/board.c +++ b/board/prism/board.c @@ -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. */ diff --git a/board/prism/board.h b/board/prism/board.h index 7b450c822f..9cca111ba2 100644 --- a/board/prism/board.h +++ b/board/prism/board.h @@ -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. */ diff --git a/board/prism/build.mk b/board/prism/build.mk index 824b05cab8..aed193a2e9 100644 --- a/board/prism/build.mk +++ b/board/prism/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2016 The Chromium OS Authors. All rights reserved. +# Copyright 2016 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/prism/ec.tasklist b/board/prism/ec.tasklist index 10fdb1b75f..aaf9b15a5e 100644 --- a/board/prism/ec.tasklist +++ b/board/prism/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/prism/gpio.inc b/board/prism/gpio.inc index 096ccffb01..2b8f2ee9b8 100644 --- a/board/prism/gpio.inc +++ b/board/prism/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/puff/board.c b/board/puff/board.c index be7371f521..d863b5fc0b 100644 --- a/board/puff/board.c +++ b/board/puff/board.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -272,11 +272,13 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { .flags = TCPC_FLAGS_RESET_ACTIVE_HIGH, }, }; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { [USB_PD_PORT_TCPC_0] = { - .usb_port = USB_PD_PORT_TCPC_0, - .driver = &anx7447_usb_mux_driver, - .hpd_update = &anx7447_tcpc_update_hpd_status, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_TCPC_0, + .driver = &anx7447_usb_mux_driver, + .hpd_update = &anx7447_tcpc_update_hpd_status, + }, }, }; diff --git a/board/puff/board.h b/board/puff/board.h index 021b8545fa..59c177c604 100644 --- a/board/puff/board.h +++ b/board/puff/board.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/puff/build.mk b/board/puff/build.mk index e9968d5710..3edfc84c2f 100644 --- a/board/puff/build.mk +++ b/board/puff/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/puff/ec.tasklist b/board/puff/ec.tasklist index ae10417dff..d579f65fd9 100644 --- a/board/puff/ec.tasklist +++ b/board/puff/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/puff/gpio.inc b/board/puff/gpio.inc index b51f595e81..5f7650a682 100644 --- a/board/puff/gpio.inc +++ b/board/puff/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -25,12 +25,12 @@ GPIO_INT(PG_VPRIM_CORE_A_OD, PIN(2, 3), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(PG_PP1050_A_OD, PIN(2, 2), GPIO_INT_BOTH, power_signal_interrupt) /* EC output, but also interrupt so this can be polled as a power signal */ GPIO_INT(EC_PCH_RSMRST_L, PIN(A, 6), GPIO_OUTPUT | GPIO_INT_F_RISING | GPIO_INT_F_FALLING, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 GPIO_INT(SLP_S4_L, PIN(D, 4), GPIO_INT_BOTH, power_signal_interrupt) #endif GPIO_INT(PG_PP2500_DRAM_U_OD, PIN(2, 0), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(PG_PP1200_U_OD, PIN(2, 1), GPIO_INT_BOTH, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 GPIO_INT(SLP_S3_L, PIN(A, 5), GPIO_INT_BOTH, slp_s3_interrupt) #endif GPIO_INT(PG_PP950_VCCIO_OD, PIN(1, 7), GPIO_INT_BOTH, power_signal_interrupt) diff --git a/board/puff/led.c b/board/puff/led.c index 29367a68dc..9cca110467 100644 --- a/board/puff/led.c +++ b/board/puff/led.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/puff/usb_pd_policy.c b/board/puff/usb_pd_policy.c index a7d6e63243..e3fc86c8ca 100644 --- a/board/puff/usb_pd_policy.c +++ b/board/puff/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/quackingstick/base_detect.c b/board/quackingstick/base_detect.c index c24d016e7b..620381f09b 100644 --- a/board/quackingstick/base_detect.c +++ b/board/quackingstick/base_detect.c @@ -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. */ diff --git a/board/quackingstick/battery.c b/board/quackingstick/battery.c index 43cd8b9d8b..5376e74dc5 100644 --- a/board/quackingstick/battery.c +++ b/board/quackingstick/battery.c @@ -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. * diff --git a/board/quackingstick/board.c b/board/quackingstick/board.c index 1a44ab5a3d..6cdf814c74 100644 --- a/board/quackingstick/board.c +++ b/board/quackingstick/board.c @@ -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. */ @@ -221,11 +221,14 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { * to AP. But the TCPC chip is also needed to know the HPD status; otherwise, * the mux misbehaves. */ -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, }, }; diff --git a/board/quackingstick/board.h b/board/quackingstick/board.h index 40a93ab1c0..9b50237b4d 100644 --- a/board/quackingstick/board.h +++ b/board/quackingstick/board.h @@ -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. */ diff --git a/board/quackingstick/build.mk b/board/quackingstick/build.mk index 452abeb591..363ef59a16 100644 --- a/board/quackingstick/build.mk +++ b/board/quackingstick/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/quackingstick/ec.tasklist b/board/quackingstick/ec.tasklist index 0b6b66ab71..6cc550374d 100644 --- a/board/quackingstick/ec.tasklist +++ b/board/quackingstick/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/quackingstick/gpio.inc b/board/quackingstick/gpio.inc index c126b59977..ee3cedf704 100644 --- a/board/quackingstick/gpio.inc +++ b/board/quackingstick/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/quackingstick/led.c b/board/quackingstick/led.c index 3a62865bec..a18124f2be 100644 --- a/board/quackingstick/led.c +++ b/board/quackingstick/led.c @@ -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. * diff --git a/board/quackingstick/usbc_config.c b/board/quackingstick/usbc_config.c index c4853a2041..8107e2c286 100644 --- a/board/quackingstick/usbc_config.c +++ b/board/quackingstick/usbc_config.c @@ -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. */ diff --git a/board/quiche/board.c b/board/quiche/board.c index 104600510a..a8933e15a9 100644 --- a/board/quiche/board.c +++ b/board/quiche/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -186,20 +186,24 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }, }; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { [USB_PD_PORT_HOST] = { - .usb_port = USB_PD_PORT_HOST, - .i2c_port = I2C_PORT_I2C1, - .i2c_addr_flags = PS8822_I2C_ADDR3_FLAG, - .driver = &ps8822_usb_mux_driver, - .board_set = &board_ps8822_mux_set, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_HOST, + .i2c_port = I2C_PORT_I2C1, + .i2c_addr_flags = PS8822_I2C_ADDR3_FLAG, + .driver = &ps8822_usb_mux_driver, + .board_set = &board_ps8822_mux_set, + }, }, [USB_PD_PORT_DP] = { - .usb_port = USB_PD_PORT_DP, - .i2c_port = I2C_PORT_I2C1, - .i2c_addr_flags = PS8XXX_I2C_ADDR2_FLAGS, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_DP, + .i2c_port = I2C_PORT_I2C1, + .i2c_addr_flags = PS8XXX_I2C_ADDR2_FLAGS, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, }, }; diff --git a/board/quiche/board.h b/board/quiche/board.h index cd109cc8f5..b1ba0c5eba 100644 --- a/board/quiche/board.h +++ b/board/quiche/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/quiche/build.mk b/board/quiche/build.mk index 1a8ec0d625..76a59e502a 100644 --- a/board/quiche/build.mk +++ b/board/quiche/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/quiche/ec.tasklist b/board/quiche/ec.tasklist index cc36bf5a74..ffd4a604c9 100644 --- a/board/quiche/ec.tasklist +++ b/board/quiche/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/quiche/gpio.inc b/board/quiche/gpio.inc index 9514858ca7..afd18e5bb6 100644 --- a/board/quiche/gpio.inc +++ b/board/quiche/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/rainier/board.c b/board/rainier/board.c index f7f9e656e8..07a006b671 100644 --- a/board/rainier/board.c +++ b/board/rainier/board.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -139,11 +139,14 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }, }; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }, }; diff --git a/board/rainier/board.h b/board/rainier/board.h index fab8e0c9fe..3cf5405f9a 100644 --- a/board/rainier/board.h +++ b/board/rainier/board.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/rainier/build.mk b/board/rainier/build.mk index b77a900d56..b95d9dc46e 100644 --- a/board/rainier/build.mk +++ b/board/rainier/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2017 The Chromium OS Authors. All rights reserved. +# Copyright 2017 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/rainier/ec.tasklist b/board/rainier/ec.tasklist index ed574a1d6a..5008495942 100644 --- a/board/rainier/ec.tasklist +++ b/board/rainier/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/rainier/gpio.inc b/board/rainier/gpio.inc index f5a4f360b3..1cf1080e05 100644 --- a/board/rainier/gpio.inc +++ b/board/rainier/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2017 The Chromium OS Authors. All rights reserved. + * Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/rainier/usb_pd_policy.c b/board/rainier/usb_pd_policy.c index 3c13d516ef..45a51015a6 100644 --- a/board/rainier/usb_pd_policy.c +++ b/board/rainier/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/rammus/battery.c b/board/rammus/battery.c index 5d394e4fc0..9a538cc5e6 100644 --- a/board/rammus/battery.c +++ b/board/rammus/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/rammus/board.c b/board/rammus/board.c index 9c47838758..8cbc6c6856 100644 --- a/board/rammus/board.c +++ b/board/rammus/board.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -202,16 +202,20 @@ struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }, }; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { [USB_PD_PORT_PS8751] = { - .usb_port = USB_PD_PORT_PS8751, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_PS8751, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, }, [USB_PD_PORT_ANX7447] = { - .usb_port = USB_PD_PORT_ANX7447, - .driver = &anx7447_usb_mux_driver, - .hpd_update = &anx7447_tcpc_update_hpd_status, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_ANX7447, + .driver = &anx7447_usb_mux_driver, + .hpd_update = &anx7447_tcpc_update_hpd_status, + }, } }; diff --git a/board/rammus/board.h b/board/rammus/board.h index a3cbfa6122..77515a40ba 100644 --- a/board/rammus/board.h +++ b/board/rammus/board.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -67,8 +67,8 @@ #define CONFIG_CHIPSET_HAS_PLATFORM_PMIC_RESET #define CONFIG_CHIPSET_RESET_HOOK #define CONFIG_HOST_INTERFACE_ESPI -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S3 -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#define CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 +#define CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 #define CONFIG_HOSTCMD_FLASH_SPI_INFO /* Battery */ diff --git a/board/rammus/build.mk b/board/rammus/build.mk index 5a9cabdcae..9bc5e8a822 100644 --- a/board/rammus/build.mk +++ b/board/rammus/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2018 The Chromium OS Authors. All rights reserved. +# Copyright 2018 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/rammus/cbi_ssfc.c b/board/rammus/cbi_ssfc.c index 9dc7842219..99c303eac5 100644 --- a/board/rammus/cbi_ssfc.c +++ b/board/rammus/cbi_ssfc.c @@ -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. */ diff --git a/board/rammus/cbi_ssfc.h b/board/rammus/cbi_ssfc.h index 2ca20f2376..e6351db03f 100644 --- a/board/rammus/cbi_ssfc.h +++ b/board/rammus/cbi_ssfc.h @@ -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. */ diff --git a/board/rammus/ec.tasklist b/board/rammus/ec.tasklist index f708a41386..c2738d28b5 100644 --- a/board/rammus/ec.tasklist +++ b/board/rammus/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/rammus/gpio.inc b/board/rammus/gpio.inc index 1e05cbe9a7..df12930ccd 100644 --- a/board/rammus/gpio.inc +++ b/board/rammus/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2018 The Chromium OS Authors. All rights reserved. + * Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/rammus/led.c b/board/rammus/led.c index 453a43b08f..5ae415a61a 100644 --- a/board/rammus/led.c +++ b/board/rammus/led.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/rammus/usb_pd_policy.c b/board/rammus/usb_pd_policy.c index 754882518f..6242625d26 100644 --- a/board/rammus/usb_pd_policy.c +++ b/board/rammus/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/redrix/battery.c b/board/redrix/battery.c index 4e74b92acb..c5c144113b 100644 --- a/board/redrix/battery.c +++ b/board/redrix/battery.c @@ -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. * diff --git a/board/redrix/board.c b/board/redrix/board.c index 37dd049a47..e66a1ce518 100644 --- a/board/redrix/board.c +++ b/board/redrix/board.c @@ -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. */ diff --git a/board/redrix/board.h b/board/redrix/board.h index 8ba66657de..211af39816 100644 --- a/board/redrix/board.h +++ b/board/redrix/board.h @@ -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. */ diff --git a/board/redrix/build.mk b/board/redrix/build.mk index 7177a844ad..e021ebc4f4 100644 --- a/board/redrix/build.mk +++ b/board/redrix/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/redrix/cbi_ssfc.c b/board/redrix/cbi_ssfc.c index 364b3d96fe..e0e954a7a6 100644 --- a/board/redrix/cbi_ssfc.c +++ b/board/redrix/cbi_ssfc.c @@ -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. */ diff --git a/board/redrix/cbi_ssfc.h b/board/redrix/cbi_ssfc.h index ddcfbb9281..724daa3782 100644 --- a/board/redrix/cbi_ssfc.h +++ b/board/redrix/cbi_ssfc.h @@ -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. */ diff --git a/board/redrix/charger.c b/board/redrix/charger.c index cbc657271b..a4fa209246 100644 --- a/board/redrix/charger.c +++ b/board/redrix/charger.c @@ -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. */ diff --git a/board/redrix/ec.tasklist b/board/redrix/ec.tasklist index cfc1fea6ea..f755b40858 100644 --- a/board/redrix/ec.tasklist +++ b/board/redrix/ec.tasklist @@ -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. */ diff --git a/board/redrix/fans.c b/board/redrix/fans.c index 1d736dff4d..9adf3cabce 100644 --- a/board/redrix/fans.c +++ b/board/redrix/fans.c @@ -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. */ diff --git a/board/redrix/fw_config.c b/board/redrix/fw_config.c index aca12c984e..cfbf46291c 100644 --- a/board/redrix/fw_config.c +++ b/board/redrix/fw_config.c @@ -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. */ diff --git a/board/redrix/fw_config.h b/board/redrix/fw_config.h index 1153ee0e3e..02157bf23e 100644 --- a/board/redrix/fw_config.h +++ b/board/redrix/fw_config.h @@ -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. */ diff --git a/board/redrix/gpio.inc b/board/redrix/gpio.inc index 99f5237003..0f39efe33b 100644 --- a/board/redrix/gpio.inc +++ b/board/redrix/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/redrix/i2c.c b/board/redrix/i2c.c index 5b71c4eb71..0d6f92ad90 100644 --- a/board/redrix/i2c.c +++ b/board/redrix/i2c.c @@ -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. */ diff --git a/board/redrix/keyboard.c b/board/redrix/keyboard.c index d491633ed3..11cfaaa02d 100644 --- a/board/redrix/keyboard.c +++ b/board/redrix/keyboard.c @@ -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. */ diff --git a/board/redrix/led.c b/board/redrix/led.c index d775397baf..c8654b3589 100644 --- a/board/redrix/led.c +++ b/board/redrix/led.c @@ -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. * diff --git a/board/redrix/pwm.c b/board/redrix/pwm.c index 8e3d9c4022..dac3991526 100644 --- a/board/redrix/pwm.c +++ b/board/redrix/pwm.c @@ -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. */ diff --git a/board/redrix/sensors.c b/board/redrix/sensors.c index 3771da18ca..db645e5942 100644 --- a/board/redrix/sensors.c +++ b/board/redrix/sensors.c @@ -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. */ diff --git a/board/redrix/thermal.c b/board/redrix/thermal.c index 6187fa3464..e192157943 100644 --- a/board/redrix/thermal.c +++ b/board/redrix/thermal.c @@ -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. */ diff --git a/board/redrix/usbc_config.c b/board/redrix/usbc_config.c index 3f47a06f1c..a53e2c8909 100644 --- a/board/redrix/usbc_config.c +++ b/board/redrix/usbc_config.c @@ -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. */ @@ -78,33 +78,43 @@ BUILD_ASSERT(ARRAY_SIZE(ppc_chips) == USBC_PORT_COUNT); unsigned int ppc_cnt = ARRAY_SIZE(ppc_chips); /* USBC mux configuration - Alder Lake includes internal mux */ -static const struct usb_mux usbc0_tcss_usb_mux = { - .usb_port = USBC_PORT_C0, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +static const struct usb_mux_chain usbc0_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C0, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; -static const struct usb_mux usbc1_tcss_usb_mux = { - .usb_port = USBC_PORT_C1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +static const struct usb_mux_chain usbc1_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; -const struct usb_mux usb_muxes[] = { +const struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_C0_MUX, - .i2c_addr_flags = USBC_PORT_C0_BB_RETIMER_I2C_ADDR, - .next_mux = &usbc0_tcss_usb_mux, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_C0_MUX, + .i2c_addr_flags = USBC_PORT_C0_BB_RETIMER_I2C_ADDR, + }, + .next = &usbc0_tcss_usb_mux, }, [USBC_PORT_C1] = { - .usb_port = USBC_PORT_C1, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_C1_MUX, - .i2c_addr_flags = USBC_PORT_C1_BB_RETIMER_I2C_ADDR, - .next_mux = &usbc1_tcss_usb_mux, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C1, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_C1_MUX, + .i2c_addr_flags = USBC_PORT_C1_BB_RETIMER_I2C_ADDR, + }, + .next = &usbc1_tcss_usb_mux, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/board/redrix/usbc_config.h b/board/redrix/usbc_config.h index 0cb266046b..248e697572 100644 --- a/board/redrix/usbc_config.h +++ b/board/redrix/usbc_config.h @@ -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. */ diff --git a/board/reef/battery.c b/board/reef/battery.c index e0d20d7692..52ec2a0471 100644 --- a/board/reef/battery.c +++ b/board/reef/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/reef/board.c b/board/reef/board.c index 98231cabd9..5e608ee4ee 100644 --- a/board/reef/board.c +++ b/board/reef/board.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -296,17 +296,21 @@ static int ps8751_tune_mux(const struct usb_mux *me) return EC_SUCCESS; } -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { [USB_PD_PORT_ANX74XX] = { - .usb_port = USB_PD_PORT_ANX74XX, - .driver = &anx74xx_tcpm_usb_mux_driver, - .hpd_update = &anx74xx_tcpc_update_hpd_status, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_ANX74XX, + .driver = &anx74xx_tcpm_usb_mux_driver, + .hpd_update = &anx74xx_tcpc_update_hpd_status, + }, }, [USB_PD_PORT_PS8751] = { - .usb_port = USB_PD_PORT_PS8751, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, - .board_init = &ps8751_tune_mux, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_PS8751, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .board_init = &ps8751_tune_mux, + }, } }; diff --git a/board/reef/board.h b/board/reef/board.h index e2583bbb93..fc25024dff 100644 --- a/board/reef/board.h +++ b/board/reef/board.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/reef/build.mk b/board/reef/build.mk index 728d027803..470e439b13 100644 --- a/board/reef/build.mk +++ b/board/reef/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2015 The Chromium OS Authors. All rights reserved. +# Copyright 2015 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/reef/ec.tasklist b/board/reef/ec.tasklist index eeebc0cc59..bc8668a1db 100644 --- a/board/reef/ec.tasklist +++ b/board/reef/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/reef/gpio.inc b/board/reef/gpio.inc index f508d7a84e..5693274284 100644 --- a/board/reef/gpio.inc +++ b/board/reef/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2016 The Chromium OS Authors. All rights reserved. + * Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/reef/led.c b/board/reef/led.c index 6315e67ff3..95db062d10 100644 --- a/board/reef/led.c +++ b/board/reef/led.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/reef/usb_pd_policy.c b/board/reef/usb_pd_policy.c index dbc7aa96d1..e21d4984c1 100644 --- a/board/reef/usb_pd_policy.c +++ b/board/reef/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/reef_it8320/battery.c b/board/reef_it8320/battery.c index 6d33867861..f03000f3c7 100644 --- a/board/reef_it8320/battery.c +++ b/board/reef_it8320/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/reef_it8320/board.c b/board/reef_it8320/board.c index 36e81b9ea8..b00e451842 100644 --- a/board/reef_it8320/board.c +++ b/board/reef_it8320/board.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -133,20 +133,26 @@ static void it83xx_tcpc_update_hpd_status(const struct usb_mux *me, } } -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_MUX, - .i2c_addr_flags = PI3USB3X532_I2C_ADDR0, - .driver = &pi3usb3x532_usb_mux_driver, - .hpd_update = &it83xx_tcpc_update_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_MUX, + .i2c_addr_flags = PI3USB3X532_I2C_ADDR0, + .driver = &pi3usb3x532_usb_mux_driver, + .hpd_update = &it83xx_tcpc_update_hpd_status, + }, }, { - .usb_port = 1, - .i2c_port = I2C_PORT_USB_MUX, - .i2c_addr_flags = 0x10, - .driver = &ps8740_usb_mux_driver, - .hpd_update = &it83xx_tcpc_update_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .i2c_port = I2C_PORT_USB_MUX, + .i2c_addr_flags = 0x10, + .driver = &ps8740_usb_mux_driver, + .hpd_update = &it83xx_tcpc_update_hpd_status, + }, }, }; diff --git a/board/reef_it8320/board.h b/board/reef_it8320/board.h index b3cb1691e8..45abf34151 100644 --- a/board/reef_it8320/board.h +++ b/board/reef_it8320/board.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/reef_it8320/build.mk b/board/reef_it8320/build.mk index e5c12f9090..0c2fcec14f 100644 --- a/board/reef_it8320/build.mk +++ b/board/reef_it8320/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2017 The Chromium OS Authors. All rights reserved. +# Copyright 2017 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/reef_it8320/ec.tasklist b/board/reef_it8320/ec.tasklist index fdaf792a17..7faf124d53 100644 --- a/board/reef_it8320/ec.tasklist +++ b/board/reef_it8320/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/reef_it8320/gpio.inc b/board/reef_it8320/gpio.inc index ac2fbf486e..54528d3818 100644 --- a/board/reef_it8320/gpio.inc +++ b/board/reef_it8320/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2017 The Chromium OS Authors. All rights reserved. + * Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/reef_it8320/led.c b/board/reef_it8320/led.c index 2c168bb8d7..1b521b9409 100644 --- a/board/reef_it8320/led.c +++ b/board/reef_it8320/led.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/reef_it8320/usb_pd_policy.c b/board/reef_it8320/usb_pd_policy.c index 85787c96f9..ce909520a2 100644 --- a/board/reef_it8320/usb_pd_policy.c +++ b/board/reef_it8320/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/reef_mchp/battery.c b/board/reef_mchp/battery.c index b4b5bf2dd0..d18caec5d0 100644 --- a/board/reef_mchp/battery.c +++ b/board/reef_mchp/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/reef_mchp/board.c b/board/reef_mchp/board.c index 92d34b3a20..39196cb308 100644 --- a/board/reef_mchp/board.c +++ b/board/reef_mchp/board.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -399,17 +399,21 @@ static int ps8751_tune_mux(const struct usb_mux *me) * tcpc_config array. The tcpc_config array contains the actual EC I2C * port, device address, and a function pointer into the driver code. */ -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { [USB_PD_PORT_ANX74XX] = { - .usb_port = USB_PD_PORT_ANX74XX, - .driver = &anx74xx_tcpm_usb_mux_driver, - .hpd_update = &anx74xx_tcpc_update_hpd_status, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_ANX74XX, + .driver = &anx74xx_tcpm_usb_mux_driver, + .hpd_update = &anx74xx_tcpc_update_hpd_status, + }, }, [USB_PD_PORT_PS8751] = { - .usb_port = USB_PD_PORT_PS8751, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, - .board_init = &ps8751_tune_mux, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_PS8751, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .board_init = &ps8751_tune_mux, + }, } }; diff --git a/board/reef_mchp/board.h b/board/reef_mchp/board.h index cb6c105052..bde2d831d3 100644 --- a/board/reef_mchp/board.h +++ b/board/reef_mchp/board.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/reef_mchp/build.mk b/board/reef_mchp/build.mk index 19fffbaf0d..afc530837e 100644 --- a/board/reef_mchp/build.mk +++ b/board/reef_mchp/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2018 The Chromium OS Authors. All rights reserved. +# Copyright 2018 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/reef_mchp/ec.tasklist b/board/reef_mchp/ec.tasklist index adf63fae62..8611d09301 100644 --- a/board/reef_mchp/ec.tasklist +++ b/board/reef_mchp/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/reef_mchp/gpio.inc b/board/reef_mchp/gpio.inc index 3274af3bff..9783649e25 100644 --- a/board/reef_mchp/gpio.inc +++ b/board/reef_mchp/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2016 The Chromium OS Authors. All rights reserved. + * Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/reef_mchp/led.c b/board/reef_mchp/led.c index f80d792a23..469758dc26 100644 --- a/board/reef_mchp/led.c +++ b/board/reef_mchp/led.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/reef_mchp/usb_pd_policy.c b/board/reef_mchp/usb_pd_policy.c index efe97c9bd7..478f760989 100644 --- a/board/reef_mchp/usb_pd_policy.c +++ b/board/reef_mchp/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/sasuke/battery.c b/board/sasuke/battery.c index bfa3c979e1..c06f88ddfd 100644 --- a/board/sasuke/battery.c +++ b/board/sasuke/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/sasuke/board.c b/board/sasuke/board.c index 415e92effc..ddd5279d62 100644 --- a/board/sasuke/board.c +++ b/board/sasuke/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -176,7 +176,7 @@ BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT); static int board_id = -1; static int mux_c1 = SSFC_USB_SS_MUX_DEFAULT; -extern const struct usb_mux usbc0_retimer; +extern const struct usb_mux_chain usbc0_retimer; extern const struct usb_mux usbmux_ps8743; void board_init(void) @@ -227,7 +227,7 @@ void board_init(void) if (board_id == 2) { nb7v904m_lpm_disable = 1; nb7v904m_set_aux_ch_switch( - &usbc0_retimer, + usbc0_retimer.mux, NB7V904M_AUX_CH_FLIPPED); } } @@ -235,8 +235,10 @@ void board_init(void) mux_c1 = get_cbi_ssfc_usb_ss_mux(); - if (mux_c1 == SSFC_USB_SS_MUX_PS8743) - memcpy(&usb_muxes[1], &usbmux_ps8743, sizeof(struct usb_mux)); + if (mux_c1 == SSFC_USB_SS_MUX_PS8743) { + usb_muxes[1].mux = &usbmux_ps8743; + usb_muxes[1].next = NULL; + } } DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT); @@ -486,19 +488,25 @@ static int board_nb7v904m_mux_set(const struct usb_mux *me, mux_state_t mux_state); static int ps8743_tune_mux(const struct usb_mux *me); -const struct usb_mux usbc0_retimer = { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_C0, - .i2c_addr_flags = NB7V904M_I2C_ADDR0, - .driver = &nb7v904m_usb_redriver_drv, - .board_set = &board_nb7v904m_mux_set_c0, +const struct usb_mux_chain usbc0_retimer = { + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_C0, + .i2c_addr_flags = NB7V904M_I2C_ADDR0, + .driver = &nb7v904m_usb_redriver_drv, + .board_set = &board_nb7v904m_mux_set_c0, + }, }; -const struct usb_mux usbc1_retimer = { - .usb_port = 1, - .i2c_port = I2C_PORT_SUB_USB_C1, - .i2c_addr_flags = NB7V904M_I2C_ADDR0, - .driver = &nb7v904m_usb_redriver_drv, - .board_set = &board_nb7v904m_mux_set, +const struct usb_mux_chain usbc1_retimer = { + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .i2c_port = I2C_PORT_SUB_USB_C1, + .i2c_addr_flags = NB7V904M_I2C_ADDR0, + .driver = &nb7v904m_usb_redriver_drv, + .board_set = &board_nb7v904m_mux_set, + }, }; const struct usb_mux usbmux_ps8743 = { @@ -509,20 +517,26 @@ const struct usb_mux usbmux_ps8743 = { .board_init = &ps8743_tune_mux, }; -struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_C0, - .i2c_addr_flags = PI3USB3X532_I2C_ADDR0, - .driver = &pi3usb3x532_usb_mux_driver, - .next_mux = &usbc0_retimer, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_C0, + .i2c_addr_flags = PI3USB3X532_I2C_ADDR0, + .driver = &pi3usb3x532_usb_mux_driver, + }, + .next = &usbc0_retimer, }, { - .usb_port = 1, - .i2c_port = I2C_PORT_SUB_USB_C1, - .i2c_addr_flags = PI3USB3X532_I2C_ADDR0, - .driver = &pi3usb3x532_usb_mux_driver, - .next_mux = &usbc1_retimer, + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .i2c_port = I2C_PORT_SUB_USB_C1, + .i2c_addr_flags = PI3USB3X532_I2C_ADDR0, + .driver = &pi3usb3x532_usb_mux_driver, + }, + .next = &usbc1_retimer, } }; /* USB Mux C1 : board_init of PS8743 */ diff --git a/board/sasuke/board.h b/board/sasuke/board.h index d834c94b6e..64c830df0f 100644 --- a/board/sasuke/board.h +++ b/board/sasuke/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/sasuke/build.mk b/board/sasuke/build.mk index cd002a20e7..1531d1f3ae 100644 --- a/board/sasuke/build.mk +++ b/board/sasuke/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/sasuke/cbi_ssfc.c b/board/sasuke/cbi_ssfc.c index 97812a1b1c..4f726ce6a3 100644 --- a/board/sasuke/cbi_ssfc.c +++ b/board/sasuke/cbi_ssfc.c @@ -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. */ diff --git a/board/sasuke/cbi_ssfc.h b/board/sasuke/cbi_ssfc.h index 7312ce8382..7cf6e954a1 100644 --- a/board/sasuke/cbi_ssfc.h +++ b/board/sasuke/cbi_ssfc.h @@ -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. */ diff --git a/board/sasuke/ec.tasklist b/board/sasuke/ec.tasklist index a867bdbbae..17d4f989b3 100644 --- a/board/sasuke/ec.tasklist +++ b/board/sasuke/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/sasuke/gpio.inc b/board/sasuke/gpio.inc index 4b970f9798..46069c35eb 100644 --- a/board/sasuke/gpio.inc +++ b/board/sasuke/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/sasuke/led.c b/board/sasuke/led.c index 6f84ce5edd..8ccce58d4c 100644 --- a/board/sasuke/led.c +++ b/board/sasuke/led.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/sasuke/usb_pd_policy.c b/board/sasuke/usb_pd_policy.c index 9edc5a181d..23166f7fca 100644 --- a/board/sasuke/usb_pd_policy.c +++ b/board/sasuke/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/sasukette/battery.c b/board/sasukette/battery.c index b81b8c8212..7a4670816e 100644 --- a/board/sasukette/battery.c +++ b/board/sasukette/battery.c @@ -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. * diff --git a/board/sasukette/board.c b/board/sasukette/board.c index c72425fc36..e45213a63a 100644 --- a/board/sasukette/board.c +++ b/board/sasukette/board.c @@ -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. */ @@ -146,11 +146,14 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }; /* USB Muxes */ -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_C0, - .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, - .driver = &it5205_usb_mux_driver, +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_C0, + .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, + .driver = &it5205_usb_mux_driver, + }, } }; static uint32_t board_id; diff --git a/board/sasukette/board.h b/board/sasukette/board.h index 50da5285b8..44cb65239a 100644 --- a/board/sasukette/board.h +++ b/board/sasukette/board.h @@ -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. */ diff --git a/board/sasukette/build.mk b/board/sasukette/build.mk index 8167ca9966..01b890bf29 100644 --- a/board/sasukette/build.mk +++ b/board/sasukette/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/sasukette/cbi_ssfc.c b/board/sasukette/cbi_ssfc.c index 39fd4929a1..81f3ee0dad 100644 --- a/board/sasukette/cbi_ssfc.c +++ b/board/sasukette/cbi_ssfc.c @@ -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. */ diff --git a/board/sasukette/cbi_ssfc.h b/board/sasukette/cbi_ssfc.h index 942f0cf5f4..bf8853a43a 100644 --- a/board/sasukette/cbi_ssfc.h +++ b/board/sasukette/cbi_ssfc.h @@ -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. */ diff --git a/board/sasukette/ec.tasklist b/board/sasukette/ec.tasklist index bb4d9c6a61..d4a6c2cab3 100644 --- a/board/sasukette/ec.tasklist +++ b/board/sasukette/ec.tasklist @@ -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. */ diff --git a/board/sasukette/gpio.inc b/board/sasukette/gpio.inc index 396a5595fa..de63737e75 100644 --- a/board/sasukette/gpio.inc +++ b/board/sasukette/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/sasukette/led.c b/board/sasukette/led.c index b8db6772d9..af6d3635ac 100644 --- a/board/sasukette/led.c +++ b/board/sasukette/led.c @@ -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. * diff --git a/board/sasukette/usb_pd_policy.c b/board/sasukette/usb_pd_policy.c index 89df538eaa..83c09bb99e 100644 --- a/board/sasukette/usb_pd_policy.c +++ b/board/sasukette/usb_pd_policy.c @@ -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. */ diff --git a/board/scarlet/battery.c b/board/scarlet/battery.c index 96cc0e557e..5d4412f66c 100644 --- a/board/scarlet/battery.c +++ b/board/scarlet/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/scarlet/board.c b/board/scarlet/board.c index 169851c95d..34e5cc456c 100644 --- a/board/scarlet/board.c +++ b/board/scarlet/board.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -151,11 +151,14 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }, }; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }, }; diff --git a/board/scarlet/board.h b/board/scarlet/board.h index eb4432eba4..1d1a7ced79 100644 --- a/board/scarlet/board.h +++ b/board/scarlet/board.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/scarlet/build.mk b/board/scarlet/build.mk index f2966fea6a..adecf6b4ea 100644 --- a/board/scarlet/build.mk +++ b/board/scarlet/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2016 The Chromium OS Authors. All rights reserved. +# Copyright 2016 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/scarlet/ec.tasklist b/board/scarlet/ec.tasklist index 1548272184..08baec1e86 100644 --- a/board/scarlet/ec.tasklist +++ b/board/scarlet/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/scarlet/gpio.inc b/board/scarlet/gpio.inc index 9c45295a7f..15ce1cb681 100644 --- a/board/scarlet/gpio.inc +++ b/board/scarlet/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2016 The Chromium OS Authors. All rights reserved. + * Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/scarlet/led.c b/board/scarlet/led.c index 2ec838702c..6f42f462cf 100644 --- a/board/scarlet/led.c +++ b/board/scarlet/led.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/scarlet/usb_pd_policy.c b/board/scarlet/usb_pd_policy.c index f2d784a8e9..919e7a8864 100644 --- a/board/scarlet/usb_pd_policy.c +++ b/board/scarlet/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/scout/board.c b/board/scout/board.c index 41b7ae48a1..2c391ecd32 100644 --- a/board/scout/board.c +++ b/board/scout/board.c @@ -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. */ diff --git a/board/scout/board.h b/board/scout/board.h index 636bcee8fd..41a93845d7 100644 --- a/board/scout/board.h +++ b/board/scout/board.h @@ -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. */ diff --git a/board/scout/build.mk b/board/scout/build.mk index cf964a2d15..7b9d891a0c 100644 --- a/board/scout/build.mk +++ b/board/scout/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/scout/ec.tasklist b/board/scout/ec.tasklist index 0e4ec4d284..0c3296d173 100644 --- a/board/scout/ec.tasklist +++ b/board/scout/ec.tasklist @@ -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. */ diff --git a/board/scout/gpio.inc b/board/scout/gpio.inc index 914dbe8639..8a6b5bb074 100644 --- a/board/scout/gpio.inc +++ b/board/scout/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ @@ -25,12 +25,12 @@ GPIO_INT(PG_VPRIM_CORE_A_OD, PIN(2, 3), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(PG_PP1050_A_OD, PIN(2, 2), GPIO_INT_BOTH, power_signal_interrupt) /* EC output, but also interrupt so this can be polled as a power signal */ GPIO_INT(EC_PCH_RSMRST_L, PIN(A, 6), GPIO_OUTPUT | GPIO_INT_F_RISING | GPIO_INT_F_FALLING, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 GPIO_INT(SLP_S4_L, PIN(D, 4), GPIO_INT_BOTH, power_signal_interrupt) #endif GPIO_INT(PG_PP2500_DRAM_U_OD, PIN(2, 0), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(PG_PP1200_U_OD, PIN(2, 1), GPIO_INT_BOTH, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 GPIO_INT(SLP_S3_L, PIN(A, 5), GPIO_INT_BOTH, slp_s3_interrupt) #endif GPIO_INT(PG_PP950_VCCIO_OD, PIN(1, 7), GPIO_INT_BOTH, power_signal_interrupt) diff --git a/board/scout/led.c b/board/scout/led.c index 369d339f4f..ad244ab99e 100644 --- a/board/scout/led.c +++ b/board/scout/led.c @@ -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. * diff --git a/board/servo_micro/board.c b/board/servo_micro/board.c index a5b72c3fd5..ce9c1edbec 100644 --- a/board/servo_micro/board.c +++ b/board/servo_micro/board.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/servo_micro/board.h b/board/servo_micro/board.h index 26e3a56ba6..801b67e07e 100644 --- a/board/servo_micro/board.h +++ b/board/servo_micro/board.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/servo_micro/build.mk b/board/servo_micro/build.mk index 0e069a31ad..7ac70706fc 100644 --- a/board/servo_micro/build.mk +++ b/board/servo_micro/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2016 The Chromium OS Authors. All rights reserved. +# Copyright 2016 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/servo_micro/ccd.md b/board/servo_micro/ccd.md index 267da66776..2398e1dd46 100644 --- a/board/servo_micro/ccd.md +++ b/board/servo_micro/ccd.md @@ -1,5 +1,5 @@ <!-- - Copyright 2018 The Chromium OS Authors. All rights reserved. + Copyright 2018 The ChromiumOS Authors Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. --> diff --git a/board/servo_micro/ec.tasklist b/board/servo_micro/ec.tasklist index c1fb169118..c45a1e89a7 100644 --- a/board/servo_micro/ec.tasklist +++ b/board/servo_micro/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/servo_micro/gpio.inc b/board/servo_micro/gpio.inc index 10e411c5f2..ad1739f1e6 100644 --- a/board/servo_micro/gpio.inc +++ b/board/servo_micro/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2016 The Chromium OS Authors. All rights reserved. + * Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/servo_v4/board.c b/board/servo_v4/board.c index 26bdad6faa..2a7241fcd1 100644 --- a/board/servo_v4/board.c +++ b/board/servo_v4/board.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/servo_v4/board.h b/board/servo_v4/board.h index a7163e563d..289c117989 100644 --- a/board/servo_v4/board.h +++ b/board/servo_v4/board.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/servo_v4/build.mk b/board/servo_v4/build.mk index 6c39be0475..05a0684696 100644 --- a/board/servo_v4/build.mk +++ b/board/servo_v4/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2016 The Chromium OS Authors. All rights reserved. +# Copyright 2016 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/servo_v4/ec.tasklist b/board/servo_v4/ec.tasklist index 2111c6b761..f51780dce4 100644 --- a/board/servo_v4/ec.tasklist +++ b/board/servo_v4/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/servo_v4/gpio.inc b/board/servo_v4/gpio.inc index 76b9a06d0f..afc5789636 100644 --- a/board/servo_v4/gpio.inc +++ b/board/servo_v4/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2016 The Chromium OS Authors. All rights reserved. + * Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/servo_v4/usb_pd_config.h b/board/servo_v4/usb_pd_config.h index aa4e150645..8437af3118 100644 --- a/board/servo_v4/usb_pd_config.h +++ b/board/servo_v4/usb_pd_config.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/servo_v4/usb_pd_pdo.c b/board/servo_v4/usb_pd_pdo.c index 225f17d99c..b2eeee8e52 100644 --- a/board/servo_v4/usb_pd_pdo.c +++ b/board/servo_v4/usb_pd_pdo.c @@ -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. */ diff --git a/board/servo_v4/usb_pd_pdo.h b/board/servo_v4/usb_pd_pdo.h index bb9d8adca6..acab299690 100644 --- a/board/servo_v4/usb_pd_pdo.h +++ b/board/servo_v4/usb_pd_pdo.h @@ -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. */ diff --git a/board/servo_v4/usb_pd_policy.c b/board/servo_v4/usb_pd_policy.c index 097d6e8ab9..1dbe586585 100644 --- a/board/servo_v4/usb_pd_policy.c +++ b/board/servo_v4/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -63,6 +63,8 @@ #define CONF_DRPDTS(c) \ CONF_SET_CLEAR(c, CC_ALLOW_SRC | CC_ENABLE_DRP, \ CC_DISABLE_DTS | CC_SNK_WITH_PD) +#define CONF_DTSOFF(c) CONF_SET_CLEAR(c, CC_DISABLE_DTS, 0) +#define CONF_DTSON(c) CONF_SET_CLEAR(c, 0, CC_DISABLE_DTS) /* Macros to apply Rd/Rp to CC lines */ #define DUT_ACTIVE_CC_SET(r, flags) \ @@ -1084,6 +1086,10 @@ static int command_cc(int argc, const char **argv) cc_config_new = CONF_PDSNKDTS(cc_config_new); else if (!strcasecmp(argv[1], "drpdts")) cc_config_new = CONF_DRPDTS(cc_config_new); + else if (!strcasecmp(argv[1], "dtsoff")) + cc_config_new = CONF_DTSOFF(cc_config_new); + else if (!strcasecmp(argv[1], "dtson")) + cc_config_new = CONF_DTSON(cc_config_new); else return EC_ERROR_PARAM2; } @@ -1102,7 +1108,7 @@ static int command_cc(int argc, const char **argv) } DECLARE_CONSOLE_COMMAND(cc, command_cc, "[off|on|src|snk|pdsnk|drp|srcdts|snkdts|pdsnkdts|" - "drpdts] [cc1|cc2]", + "drpdts|dtsoff|dtson] [cc1|cc2]", "Servo_v4 DTS and CHG mode"); static void fake_disconnect_end(void) diff --git a/board/servo_v4p1/board.c b/board/servo_v4p1/board.c index 80a701358e..d71cc721df 100644 --- a/board/servo_v4p1/board.c +++ b/board/servo_v4p1/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -85,14 +85,20 @@ static int board_tusb1064_dp_rx_eq_set(const struct usb_mux *me, return rv; } -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { - [CHG] = { /* CHG port connected directly to USB 3.0 hub, no mux */ }, - [DUT] = { /* DUT port with UFP mux */ - .usb_port = DUT, - .i2c_port = I2C_PORT_MASTER, - .i2c_addr_flags = TUSB1064_I2C_ADDR10_FLAGS, - .driver = &tusb1064_usb_mux_driver, - .board_set = &board_tusb1064_dp_rx_eq_set, +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { + [CHG] = { + /* CHG port connected directly to USB 3.0 hub, no mux */ + }, + [DUT] = { + /* DUT port with UFP mux */ + .mux = + &(const struct usb_mux){ + .usb_port = DUT, + .i2c_port = I2C_PORT_MASTER, + .i2c_addr_flags = TUSB1064_I2C_ADDR10_FLAGS, + .driver = &tusb1064_usb_mux_driver, + .board_set = &board_tusb1064_dp_rx_eq_set, + }, } }; diff --git a/board/servo_v4p1/board.h b/board/servo_v4p1/board.h index 49f2811188..b6c7915c6c 100644 --- a/board/servo_v4p1/board.h +++ b/board/servo_v4p1/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/servo_v4p1/build.mk b/board/servo_v4p1/build.mk index 872b4d4281..c1e8db9cd8 100644 --- a/board/servo_v4p1/build.mk +++ b/board/servo_v4p1/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/servo_v4p1/ccd_measure_sbu.c b/board/servo_v4p1/ccd_measure_sbu.c index 75f836cfb1..41d53ab597 100644 --- a/board/servo_v4p1/ccd_measure_sbu.c +++ b/board/servo_v4p1/ccd_measure_sbu.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/servo_v4p1/ccd_measure_sbu.h b/board/servo_v4p1/ccd_measure_sbu.h index 0dd1ce0de7..8635f892a4 100644 --- a/board/servo_v4p1/ccd_measure_sbu.h +++ b/board/servo_v4p1/ccd_measure_sbu.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/servo_v4p1/chg_control.c b/board/servo_v4p1/chg_control.c index 8cbbacf019..76f3dc9649 100644 --- a/board/servo_v4p1/chg_control.c +++ b/board/servo_v4p1/chg_control.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/servo_v4p1/chg_control.h b/board/servo_v4p1/chg_control.h index 660dd0a204..91e3601ac8 100644 --- a/board/servo_v4p1/chg_control.h +++ b/board/servo_v4p1/chg_control.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/servo_v4p1/dacs.c b/board/servo_v4p1/dacs.c index 47eaefa81a..355e27684b 100644 --- a/board/servo_v4p1/dacs.c +++ b/board/servo_v4p1/dacs.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/servo_v4p1/dacs.h b/board/servo_v4p1/dacs.h index bd0ecd67da..4b2028c648 100644 --- a/board/servo_v4p1/dacs.h +++ b/board/servo_v4p1/dacs.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/servo_v4p1/ec.tasklist b/board/servo_v4p1/ec.tasklist index 07250f018e..6c9abf1c07 100644 --- a/board/servo_v4p1/ec.tasklist +++ b/board/servo_v4p1/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/servo_v4p1/fusb302b.c b/board/servo_v4p1/fusb302b.c index 79a92b4930..e8fdbde68b 100644 --- a/board/servo_v4p1/fusb302b.c +++ b/board/servo_v4p1/fusb302b.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/servo_v4p1/fusb302b.h b/board/servo_v4p1/fusb302b.h index d9837c73ba..cebf5409f5 100644 --- a/board/servo_v4p1/fusb302b.h +++ b/board/servo_v4p1/fusb302b.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/servo_v4p1/gpio.inc b/board/servo_v4p1/gpio.inc index 070aa90098..fe631aca80 100644 --- a/board/servo_v4p1/gpio.inc +++ b/board/servo_v4p1/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/servo_v4p1/ina231s.c b/board/servo_v4p1/ina231s.c index 92e60d8248..637a878ef7 100644 --- a/board/servo_v4p1/ina231s.c +++ b/board/servo_v4p1/ina231s.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/servo_v4p1/ina231s.h b/board/servo_v4p1/ina231s.h index 9c3804e769..6f0828127b 100644 --- a/board/servo_v4p1/ina231s.h +++ b/board/servo_v4p1/ina231s.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/servo_v4p1/ioexpanders.c b/board/servo_v4p1/ioexpanders.c index 3c871f45e5..275804de89 100644 --- a/board/servo_v4p1/ioexpanders.c +++ b/board/servo_v4p1/ioexpanders.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/servo_v4p1/ioexpanders.h b/board/servo_v4p1/ioexpanders.h index 9ca6915818..313fea46a4 100644 --- a/board/servo_v4p1/ioexpanders.h +++ b/board/servo_v4p1/ioexpanders.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/servo_v4p1/pathsel.c b/board/servo_v4p1/pathsel.c index 7b71fba169..eba1733e05 100644 --- a/board/servo_v4p1/pathsel.c +++ b/board/servo_v4p1/pathsel.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/servo_v4p1/pathsel.h b/board/servo_v4p1/pathsel.h index 7365d3adf3..5f228aceb9 100644 --- a/board/servo_v4p1/pathsel.h +++ b/board/servo_v4p1/pathsel.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/servo_v4p1/pi3usb9201.c b/board/servo_v4p1/pi3usb9201.c index bb4a25f135..976c213c49 100644 --- a/board/servo_v4p1/pi3usb9201.c +++ b/board/servo_v4p1/pi3usb9201.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/servo_v4p1/pi3usb9201.h b/board/servo_v4p1/pi3usb9201.h index 34a927b3bf..863fc4129a 100644 --- a/board/servo_v4p1/pi3usb9201.h +++ b/board/servo_v4p1/pi3usb9201.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/servo_v4p1/usb_pd_config.h b/board/servo_v4p1/usb_pd_config.h index 2660d32963..e65ed3cd62 100644 --- a/board/servo_v4p1/usb_pd_config.h +++ b/board/servo_v4p1/usb_pd_config.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/servo_v4p1/usb_pd_policy.c b/board/servo_v4p1/usb_pd_policy.c index 44fcb97829..98d6255c29 100644 --- a/board/servo_v4p1/usb_pd_policy.c +++ b/board/servo_v4p1/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -63,6 +63,8 @@ #define CONF_DRPDTS(c) \ CONF_SET_CLEAR(c, CC_ALLOW_SRC | CC_ENABLE_DRP, \ CC_DISABLE_DTS | CC_SNK_WITH_PD) +#define CONF_DTSOFF(c) CONF_SET_CLEAR(c, CC_DISABLE_DTS, 0) +#define CONF_DTSON(c) CONF_SET_CLEAR(c, 0, CC_DISABLE_DTS) /* Macros to apply Rd/Rp to CC lines */ #define DUT_ACTIVE_CC_SET(r, flags) \ @@ -1216,6 +1218,10 @@ static int command_cc(int argc, const char **argv) cc_config_new = CONF_PDSNKDTS(cc_config_new); else if (!strcasecmp(argv[1], "drpdts")) cc_config_new = CONF_DRPDTS(cc_config_new); + else if (!strcasecmp(argv[1], "dtsoff")) + cc_config_new = CONF_DTSOFF(cc_config_new); + else if (!strcasecmp(argv[1], "dtson")) + cc_config_new = CONF_DTSON(cc_config_new); else if (!strcasecmp(argv[1], "emca")) cc_config_new |= CC_EMCA_SERVO; else if (!strcasecmp(argv[1], "nonemca")) @@ -1238,7 +1244,7 @@ static int command_cc(int argc, const char **argv) } DECLARE_CONSOLE_COMMAND(cc, command_cc, "[off|on|src|snk|pdsnk|drp|srcdts|snkdts|pdsnkdts|" - "drpdts|emca|nonemca] [cc1|cc2]", + "drpdts|dtsoff|dtson|emca|nonemca] [cc1|cc2]", "Servo_v4 DTS and CHG mode"); static void fake_disconnect_end(void) diff --git a/board/servo_v4p1/usb_sm.c b/board/servo_v4p1/usb_sm.c index 2016484bdd..4c448b7c9d 100644 --- a/board/servo_v4p1/usb_sm.c +++ b/board/servo_v4p1/usb_sm.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/servo_v4p1/usb_tc_snk_sm.c b/board/servo_v4p1/usb_tc_snk_sm.c index 5b3f2757e4..d76c2fe24f 100644 --- a/board/servo_v4p1/usb_tc_snk_sm.c +++ b/board/servo_v4p1/usb_tc_snk_sm.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/shotzo/board.c b/board/shotzo/board.c index eec7a17e9d..dea75ee7d2 100644 --- a/board/shotzo/board.c +++ b/board/shotzo/board.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ @@ -23,8 +23,6 @@ #include "intc.h" #include "power.h" #include "power_button.h" -#include "pwm.h" -#include "pwm_chip.h" #include "switch.h" #include "system.h" #include "task.h" @@ -213,11 +211,14 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { { } }; /* USB Muxes */ -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_C0, - .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, - .driver = &it5205_usb_mux_driver, +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_C0, + .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, + .driver = &it5205_usb_mux_driver, + }, } }; void oz554_board_init(void) @@ -467,16 +468,6 @@ __override void typec_set_source_current_limit(int port, enum tcpc_rp_value rp) charger_set_otg_current_voltage(port, current, 5000); } -/* PWM channels. Must be in the exactly same order as in enum pwm_channel. */ -const struct pwm_t pwm_channels[] = { - [PWM_CH_LED_WHITE] = { - .channel = 1, - .flags = PWM_CONFIG_ACTIVE_LOW | PWM_CONFIG_DSLEEP, - .freq_hz = 2000, - }, -}; -BUILD_ASSERT(ARRAY_SIZE(pwm_channels) == PWM_CH_COUNT); - /* Thermistors */ const struct temp_sensor_t temp_sensors[] = { [TEMP_SENSOR_1] = { .name = "Memory", diff --git a/board/shotzo/board.h b/board/shotzo/board.h index 9046bc036d..c6fcceb045 100644 --- a/board/shotzo/board.h +++ b/board/shotzo/board.h @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ @@ -20,9 +20,6 @@ #define CONFIG_USB_PD_5V_CHARGER_CTRL #define CONFIG_CHARGER_OTG -/* PWM */ -#define CONFIG_PWM - /* TCPC */ #define CONFIG_USB_PD_PORT_MAX_COUNT 1 #define CONFIG_USB_PD_TCPM_ITE_ON_CHIP /* C0: ITE EC TCPC */ @@ -81,11 +78,6 @@ #include "gpio_signal.h" #include "registers.h" -enum pwm_channel { - PWM_CH_LED_WHITE, - PWM_CH_COUNT, -}; - /* ADC channels */ enum adc_channel { ADC_VSNS_PP3300_A, /* ADC0 */ diff --git a/board/shotzo/build.mk b/board/shotzo/build.mk index 2e1b7dca8e..07ea50c392 100644 --- a/board/shotzo/build.mk +++ b/board/shotzo/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2022 The ChromiumOS Authors. +# 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. # diff --git a/board/shotzo/ec.tasklist b/board/shotzo/ec.tasklist index 1350cdf734..1447f9db15 100644 --- a/board/shotzo/ec.tasklist +++ b/board/shotzo/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/board/shotzo/gpio.inc b/board/shotzo/gpio.inc index 5befcf8d2c..4a26d2631a 100644 --- a/board/shotzo/gpio.inc +++ b/board/shotzo/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2022 The ChromiumOS Authors. + * 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. */ @@ -142,6 +142,9 @@ GPIO(KSO13_NC, PIN(KSO_H, 5), GPIO_INPUT | GPIO_PULL_DOWN) GPIO(KSO14_NC, PIN(KSO_H, 6), GPIO_INPUT | GPIO_PULL_DOWN) GPIO(KSO15_NC, PIN(KSO_H, 7), GPIO_INPUT | GPIO_PULL_DOWN) +/* LED */ +GPIO(PWR_LED_WHITE_L, PIN(A, 1), GPIO_OUT_HIGH) + /* Alternate functions GPIO definitions */ GPIO(EC_KSO_02_INV, PIN(KSO_L, 2), GPIO_OUT_HIGH) /* KSO2 inverted */ @@ -158,6 +161,3 @@ ALTERNATE(PIN_MASK(A, BIT(4) | BIT(5)), 0, MODULE_I2C, 0) /* I2C5 */ /* ADC */ ALTERNATE(PIN_MASK(L, BIT(0) | BIT(2) | BIT(3)), 0, MODULE_ADC, 0) /* ADC13: EC_SUB_ANALOG, ADC15: TEMP_SENSOR_3, ADC16: TEMP_SENSOR_4 */ ALTERNATE(PIN_MASK(I, BIT(0) | BIT(2) | BIT(3)), 0, MODULE_ADC, 0) /* ADC0: EC_VSNS_PP3300_A, ADC2: TEMP_SENSOR_1, ADC3: TEMP_SENSOR_2 */ - -/* PWM */ -ALTERNATE(PIN_MASK(A, BIT(1)), 0, MODULE_PWM, 0) /* LED_WHITE_PWM */ diff --git a/board/shotzo/led.c b/board/shotzo/led.c index a163831396..9ca9e7a498 100644 --- a/board/shotzo/led.c +++ b/board/shotzo/led.c @@ -1,11 +1,11 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ /* Power LED control for Shotzo. * Solid white - active power - * Breathing white, 1s to 100% and 1s to 0% - suspend + * 25% duty cycle white, 1s on and 3s off- suspend * Blinking quicky white, 0.5s on and 0.5s off - alert * 2 long 2 short white, long for 1s, short for 0.5s and interval * is 0.5s - critical @@ -14,9 +14,9 @@ #include "chipset.h" #include "console.h" +#include "gpio.h" #include "hooks.h" #include "led_common.h" -#include "pwm.h" #include "timer.h" #include "util.h" @@ -27,12 +27,8 @@ */ #define LED_CPU_DELAY_MS (2000 * MSEC) -/* When pulsing is enabled, brightness is incremented from 0 to 100% - * in LED_PULSE_US usec. Then it's decremented likewise. - */ -#define LED_PULSE_US (1 * SECOND) -/* 40 msec for nice and smooth transition. */ -#define LED_PULSE_TICK_US (40 * MSEC) +#define POWER_LED_ON 0 +#define POWER_LED_OFF 1 const enum ec_led_id supported_led_ids[] = { EC_LED_ID_POWER_LED }; @@ -44,53 +40,28 @@ enum led_color { LED_COLOR_COUNT /* Number of colors, not a color itself */ }; -static struct { - uint32_t interval; - int duty_inc; - enum led_color color; - int duty; -} led_pulse; - -/* When pulsing is enabled, brightness is incremented by <duty_inc> every - * <interval> usec from 0 to 100% Then it's decremented likewise. - */ -static void config_tick(uint32_t interval, int duty_inc, enum led_color color) -{ - led_pulse.interval = interval; - led_pulse.duty_inc = duty_inc; - led_pulse.color = color; - led_pulse.duty = 0; -} - -#define CONFIGURE_TICK(interval, color) \ - config_tick((interval), 100 / (LED_PULSE_US / (interval)), (color)) - -static int led_set_color_duty(enum led_color color, int duty) +static int led_set_color_power(enum led_color color) { - if (duty < 0 || 100 < duty) - return EC_ERROR_UNKNOWN; - switch (color) { case LED_OFF: - pwm_set_duty(PWM_CH_LED_WHITE, 0); + gpio_set_level(GPIO_PWR_LED_WHITE_L, POWER_LED_OFF); break; case LED_WHITE: - pwm_set_duty(PWM_CH_LED_WHITE, duty); + gpio_set_level(GPIO_PWR_LED_WHITE_L, POWER_LED_ON); break; default: return EC_ERROR_UNKNOWN; } - return EC_SUCCESS; } -static int led_set_color(enum ec_led_id led_id, enum led_color color, int duty) +static int led_set_color(enum ec_led_id led_id, enum led_color color) { int rv; switch (led_id) { case EC_LED_ID_POWER_LED: - rv = led_set_color_duty(color, duty); + rv = led_set_color_power(color); break; default: return EC_ERROR_UNKNOWN; @@ -98,32 +69,6 @@ static int led_set_color(enum ec_led_id led_id, enum led_color color, int duty) return rv; } -static void pulse_power_led(enum led_color color) -{ - led_set_color(EC_LED_ID_POWER_LED, color, led_pulse.duty); - if (led_pulse.duty + led_pulse.duty_inc > 100) - led_pulse.duty_inc = led_pulse.duty_inc * -1; - else if (led_pulse.duty + led_pulse.duty_inc < 0) - led_pulse.duty_inc = led_pulse.duty_inc * -1; - led_pulse.duty += led_pulse.duty_inc; - led_pulse.duty = MIN(100, MAX(led_pulse.duty, 0)); -} - -static void led_tick(void); -DECLARE_DEFERRED(led_tick); -static void led_tick(void) -{ - uint32_t elapsed; - uint32_t next = 0; - uint32_t start = get_time().le.lo; - - if (led_auto_control_is_enabled(EC_LED_ID_POWER_LED)) - pulse_power_led(led_pulse.color); - elapsed = get_time().le.lo - start; - next = led_pulse.interval > elapsed ? led_pulse.interval - elapsed : 0; - hook_call_deferred(&led_tick_data, next); -} - /* When blinking is enabled, led will blinking according to led_blinking_array. * 1 means led on, 0 means led off, restart from head after reaching the tail. * The interval is LED_BLINKING_MS. @@ -152,11 +97,11 @@ static void led_blinking(void) if (led_auto_control_is_enabled(EC_LED_ID_POWER_LED)) { switch (signal) { case 0: - led_set_color(EC_LED_ID_POWER_LED, LED_OFF, 0); + led_set_color(EC_LED_ID_POWER_LED, LED_OFF); led_blinking_index += 1; break; case 1: - led_set_color(EC_LED_ID_POWER_LED, LED_WHITE, 100); + led_set_color(EC_LED_ID_POWER_LED, LED_WHITE); led_blinking_index += 1; break; default: @@ -169,23 +114,26 @@ static void led_blinking(void) hook_call_deferred(&led_blinking_data, next); } +static int led_suspend_array[] = { 1, 1, 0, 0, 0, 0, 0, 0 }; +const int led_suspend_count = ARRAY_SIZE(led_suspend_array); static void led_suspend(void) { - CONFIGURE_TICK(LED_PULSE_TICK_US, LED_WHITE); - led_tick(); + led_blinking_array = led_suspend_array; + led_blinking_count = led_suspend_count; + led_blinking_index = 0; + led_blinking(); } DECLARE_DEFERRED(led_suspend); static void led_shutdown(void) { if (led_auto_control_is_enabled(EC_LED_ID_POWER_LED)) - led_set_color(EC_LED_ID_POWER_LED, LED_OFF, 0); + led_set_color(EC_LED_ID_POWER_LED, LED_OFF); } DECLARE_DEFERRED(led_shutdown); static void led_suspend_hook(void) { - hook_call_deferred(&led_tick_data, -1); hook_call_deferred(&led_blinking_data, -1); hook_call_deferred(&led_shutdown_data, -1); hook_call_deferred(&led_suspend_data, LED_CPU_DELAY_MS); @@ -194,7 +142,6 @@ DECLARE_HOOK(HOOK_CHIPSET_SUSPEND, led_suspend_hook, HOOK_PRIO_DEFAULT); static void led_shutdown_hook(void) { - hook_call_deferred(&led_tick_data, -1); hook_call_deferred(&led_blinking_data, -1); hook_call_deferred(&led_suspend_data, -1); hook_call_deferred(&led_shutdown_data, LED_CPU_DELAY_MS); @@ -203,19 +150,12 @@ DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN, led_shutdown_hook, HOOK_PRIO_DEFAULT); static void led_resume_hook(void) { - /* Assume there is no race condition with led_pulse and led_blinking, - * which also runs in hook_task. - */ - hook_call_deferred(&led_tick_data, -1); hook_call_deferred(&led_blinking_data, -1); - /* - * Avoid invoking the suspend/shutdown delayed hooks. - */ hook_call_deferred(&led_suspend_data, -1); hook_call_deferred(&led_shutdown_data, -1); if (led_auto_control_is_enabled(EC_LED_ID_POWER_LED)) - led_set_color(EC_LED_ID_POWER_LED, LED_WHITE, 100); + led_set_color(EC_LED_ID_POWER_LED, LED_WHITE); } DECLARE_HOOK(HOOK_CHIPSET_RESUME, led_resume_hook, HOOK_PRIO_DEFAULT); @@ -225,7 +165,6 @@ void led_alert(int enable) { if (enable) { /* Overwrite the current signal */ - hook_call_deferred(&led_tick_data, -1); hook_call_deferred(&led_blinking_data, -1); led_blinking_array = led_alert_array; led_blinking_count = led_alert_count; @@ -246,7 +185,6 @@ static int led_critical_array[] = { 1, 1, 0, 1, 1, 0, 1, 0, 1, 0 }; const int led_critical_count = ARRAY_SIZE(led_critical_array); void show_critical_error(void) { - hook_call_deferred(&led_tick_data, -1); hook_call_deferred(&led_blinking_data, -1); led_blinking_array = led_critical_array; led_blinking_count = led_critical_count; @@ -254,17 +192,11 @@ void show_critical_error(void) led_blinking(); } -static void led_init(void) -{ - pwm_enable(PWM_CH_LED_WHITE, 1); -} -DECLARE_HOOK(HOOK_INIT, led_init, HOOK_PRIO_INIT_PWM + 1); - void led_get_brightness_range(enum ec_led_id led_id, uint8_t *brightness_range) { switch (led_id) { case EC_LED_ID_POWER_LED: - brightness_range[EC_LED_COLOR_WHITE] = 100; + brightness_range[EC_LED_COLOR_WHITE] = 1; break; default: break; @@ -274,9 +206,9 @@ void led_get_brightness_range(enum ec_led_id led_id, uint8_t *brightness_range) int led_set_brightness(enum ec_led_id id, const uint8_t *brightness) { if (brightness[EC_LED_COLOR_WHITE] != 0) - led_set_color(id, LED_WHITE, brightness[EC_LED_COLOR_WHITE]); + led_set_color(id, LED_WHITE); else - led_set_color(id, LED_OFF, 0); + led_set_color(id, LED_OFF); return EC_SUCCESS; } @@ -292,9 +224,9 @@ static int command_led(int argc, const char **argv) led_auto_control(id, !led_auto_control_is_enabled(id)); ccprintf("o%s\n", led_auto_control_is_enabled(id) ? "ff" : "n"); } else if (!strcasecmp(argv[1], "off")) { - led_set_color(id, LED_OFF, 0); + led_set_color(id, LED_OFF); } else if (!strcasecmp(argv[1], "white")) { - led_set_color(id, LED_WHITE, 100); + led_set_color(id, LED_WHITE); } else if (!strcasecmp(argv[1], "alert")) { led_alert(1); } else if (!strcasecmp(argv[1], "crit")) { diff --git a/board/shotzo/usb_pd_policy.c b/board/shotzo/usb_pd_policy.c index 9098938476..8c2b840121 100644 --- a/board/shotzo/usb_pd_policy.c +++ b/board/shotzo/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/board/shuboz/battery.c b/board/shuboz/battery.c index 4e40c9357c..f24c50d931 100644 --- a/board/shuboz/battery.c +++ b/board/shuboz/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/shuboz/board.c b/board/shuboz/board.c index af0f9988b1..41d985df7c 100644 --- a/board/shuboz/board.c +++ b/board/shuboz/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -276,34 +276,44 @@ const struct usb_mux_driver usbc0_sbu_mux_driver = { * Since FSUSB42UMX is not a i2c device, .i2c_port and * .i2c_addr_flags are not required here. */ -const struct usb_mux usbc0_sbu_mux = { - .usb_port = USBC_PORT_C0, - .driver = &usbc0_sbu_mux_driver, +const struct usb_mux_chain usbc0_sbu_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C0, + .driver = &usbc0_sbu_mux_driver, + }, }; -struct usb_mux usbc1_amd_fp5_usb_mux = { - .usb_port = USBC_PORT_C1, - .i2c_port = I2C_PORT_USB_AP_MUX, - .i2c_addr_flags = AMD_FP5_MUX_I2C_ADDR_FLAGS, - .driver = &amd_fp5_usb_mux_driver, - .flags = USB_MUX_FLAG_SET_WITHOUT_FLIP, +struct usb_mux_chain usbc1_amd_fp5_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .i2c_port = I2C_PORT_USB_AP_MUX, + .i2c_addr_flags = AMD_FP5_MUX_I2C_ADDR_FLAGS, + .driver = &amd_fp5_usb_mux_driver, + .flags = USB_MUX_FLAG_SET_WITHOUT_FLIP, + }, }; -struct usb_mux usb_muxes[] = { +struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .i2c_port = I2C_PORT_USB_AP_MUX, - .i2c_addr_flags = AMD_FP5_MUX_I2C_ADDR_FLAGS, - .driver = &amd_fp5_usb_mux_driver, - .next_mux = &usbc0_sbu_mux, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .i2c_port = I2C_PORT_USB_AP_MUX, + .i2c_addr_flags = AMD_FP5_MUX_I2C_ADDR_FLAGS, + .driver = &amd_fp5_usb_mux_driver, + }, + .next = &usbc0_sbu_mux, }, [USBC_PORT_C1] = { - .usb_port = USBC_PORT_C1, - .i2c_port = I2C_PORT_TCPC1, - .i2c_addr_flags = PS8743_I2C_ADDR1_FLAG, - .driver = &ps8743_usb_mux_driver, - .board_set = &board_ps8743_mux_set, - .next_mux = &usbc1_amd_fp5_usb_mux, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C1, + .i2c_port = I2C_PORT_TCPC1, + .i2c_addr_flags = PS8743_I2C_ADDR1_FLAG, + .driver = &ps8743_usb_mux_driver, + .board_set = &board_ps8743_mux_set, + }, + .next = &usbc1_amd_fp5_usb_mux, } }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/board/shuboz/board.h b/board/shuboz/board.h index 9bb82a17e6..ada5b1499d 100644 --- a/board/shuboz/board.h +++ b/board/shuboz/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/shuboz/build.mk b/board/shuboz/build.mk index 1c0cbc4f63..45c71f962c 100644 --- a/board/shuboz/build.mk +++ b/board/shuboz/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/shuboz/ec.tasklist b/board/shuboz/ec.tasklist index d9c1606eb2..abc796f74f 100644 --- a/board/shuboz/ec.tasklist +++ b/board/shuboz/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/shuboz/gpio.inc b/board/shuboz/gpio.inc index b093a7e6d6..c824a80cd4 100644 --- a/board/shuboz/gpio.inc +++ b/board/shuboz/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/shuboz/led.c b/board/shuboz/led.c index b007009cba..dc3361ba5a 100644 --- a/board/shuboz/led.c +++ b/board/shuboz/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/spherion/battery.c b/board/spherion/battery.c index 395acace08..83361bd9fc 100644 --- a/board/spherion/battery.c +++ b/board/spherion/battery.c @@ -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. */ diff --git a/board/spherion/board.c b/board/spherion/board.c index 63d443d5f8..0170a8998e 100644 --- a/board/spherion/board.c +++ b/board/spherion/board.c @@ -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. */ @@ -104,9 +104,9 @@ DECLARE_HOOK(HOOK_CHIPSET_SUSPEND, kb_backlight_disable, HOOK_PRIO_DEFAULT); void board_usb_mux_init(void) { if (board_get_sub_board() == SUB_BOARD_TYPEC) { - ps8743_tune_usb_eq(&usb_muxes[1], PS8743_USB_EQ_TX_12_8_DB, + ps8743_tune_usb_eq(usb_muxes[1].mux, PS8743_USB_EQ_TX_12_8_DB, PS8743_USB_EQ_RX_12_8_DB); - ps8743_field_update(&usb_muxes[1], PS8743_REG_DCI_CONFIG_2, + ps8743_field_update(usb_muxes[1].mux, PS8743_REG_DCI_CONFIG_2, PS8743_AUTO_DCI_MODE_MASK, PS8743_AUTO_DCI_MODE_FORCE_USB); } diff --git a/board/spherion/board.h b/board/spherion/board.h index aa862415a5..07f36a4efc 100644 --- a/board/spherion/board.h +++ b/board/spherion/board.h @@ -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. */ diff --git a/board/spherion/build.mk b/board/spherion/build.mk index 4dc5a3e62e..9126acf43f 100644 --- a/board/spherion/build.mk +++ b/board/spherion/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/spherion/ec.tasklist b/board/spherion/ec.tasklist index c92920ade6..ea717385a0 100644 --- a/board/spherion/ec.tasklist +++ b/board/spherion/ec.tasklist @@ -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. */ diff --git a/board/spherion/gpio.inc b/board/spherion/gpio.inc index b618911e02..177ccd07ca 100644 --- a/board/spherion/gpio.inc +++ b/board/spherion/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/spherion/led.c b/board/spherion/led.c index bd41fe24cb..54f073b8cb 100644 --- a/board/spherion/led.c +++ b/board/spherion/led.c @@ -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. * diff --git a/board/stern/battery.c b/board/stern/battery.c index 50d2bf397c..9edab52867 100644 --- a/board/stern/battery.c +++ b/board/stern/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/stern/board.c b/board/stern/board.c index 6399d421a8..26576ede86 100644 --- a/board/stern/board.c +++ b/board/stern/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -165,13 +165,16 @@ static void board_hpd_status(const struct usb_mux *me, mux_state_t mux_state, host_set_single_event(EC_HOST_EVENT_USB_MUX); } -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_MUX, - .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, - .driver = &it5205_usb_mux_driver, - .hpd_update = &board_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_MUX, + .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, + .driver = &it5205_usb_mux_driver, + .hpd_update = &board_hpd_status, + }, }, }; diff --git a/board/stern/board.h b/board/stern/board.h index 8b1b8b19d8..eedbc2a44c 100644 --- a/board/stern/board.h +++ b/board/stern/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/stern/build.mk b/board/stern/build.mk index a6e1c010d7..f583684804 100644 --- a/board/stern/build.mk +++ b/board/stern/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/stern/ec.tasklist b/board/stern/ec.tasklist index 36be2e96a4..e77603a8e2 100644 --- a/board/stern/ec.tasklist +++ b/board/stern/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/stern/gpio.inc b/board/stern/gpio.inc index 3a162d6124..85d080b2e9 100644 --- a/board/stern/gpio.inc +++ b/board/stern/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/stern/led.c b/board/stern/led.c index 7ae753c1ab..8a5f9d26d8 100644 --- a/board/stern/led.c +++ b/board/stern/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/stm32f446e-eval/board.c b/board/stm32f446e-eval/board.c index dafc98f9e3..038915fc0a 100644 --- a/board/stm32f446e-eval/board.c +++ b/board/stm32f446e-eval/board.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/stm32f446e-eval/board.h b/board/stm32f446e-eval/board.h index 10eeef7675..4ae9117829 100644 --- a/board/stm32f446e-eval/board.h +++ b/board/stm32f446e-eval/board.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/stm32f446e-eval/build.mk b/board/stm32f446e-eval/build.mk index 6b06f2bb8f..61e4b79d47 100644 --- a/board/stm32f446e-eval/build.mk +++ b/board/stm32f446e-eval/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2016 The Chromium OS Authors. All rights reserved. +# Copyright 2016 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/stm32f446e-eval/ec.tasklist b/board/stm32f446e-eval/ec.tasklist index 2a1ffbf652..6a12f02976 100644 --- a/board/stm32f446e-eval/ec.tasklist +++ b/board/stm32f446e-eval/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/stm32f446e-eval/gpio.inc b/board/stm32f446e-eval/gpio.inc index afc8d1e486..8eb7c6090d 100644 --- a/board/stm32f446e-eval/gpio.inc +++ b/board/stm32f446e-eval/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2016 The Chromium OS Authors. All rights reserved. + * Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/stm32l476g-eval/board.c b/board/stm32l476g-eval/board.c index dd57087581..e3f467ac50 100644 --- a/board/stm32l476g-eval/board.c +++ b/board/stm32l476g-eval/board.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/stm32l476g-eval/board.h b/board/stm32l476g-eval/board.h index 95582284df..26ea530e4e 100644 --- a/board/stm32l476g-eval/board.h +++ b/board/stm32l476g-eval/board.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/stm32l476g-eval/build.mk b/board/stm32l476g-eval/build.mk index 23c7cd9d38..d453ea9979 100644 --- a/board/stm32l476g-eval/build.mk +++ b/board/stm32l476g-eval/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2016 The Chromium OS Authors. All rights reserved. +# Copyright 2016 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/stm32l476g-eval/ec.tasklist b/board/stm32l476g-eval/ec.tasklist index adfd7c7e92..f580a9d9e5 100644 --- a/board/stm32l476g-eval/ec.tasklist +++ b/board/stm32l476g-eval/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/stm32l476g-eval/gpio.inc b/board/stm32l476g-eval/gpio.inc index 9cf5bc0aa4..e84543f8f6 100644 --- a/board/stm32l476g-eval/gpio.inc +++ b/board/stm32l476g-eval/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2016 The Chromium OS Authors. All rights reserved. + * Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/stm32l476g-eval/openocd-flash.cfg b/board/stm32l476g-eval/openocd-flash.cfg index a347f88b79..2f6a266d93 100644 --- a/board/stm32l476g-eval/openocd-flash.cfg +++ b/board/stm32l476g-eval/openocd-flash.cfg @@ -1,4 +1,4 @@ -# Copyright 2016 The Chromium OS Authors. All rights reserved. +# Copyright 2016 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/board/storo/battery.c b/board/storo/battery.c index b28e5bbf37..5a927ffc26 100644 --- a/board/storo/battery.c +++ b/board/storo/battery.c @@ -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. * diff --git a/board/storo/board.c b/board/storo/board.c index 513a66c592..f6f3ed5750 100644 --- a/board/storo/board.c +++ b/board/storo/board.c @@ -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. */ @@ -317,28 +317,37 @@ static int board_tusb544_set(const struct usb_mux *me, mux_state_t mux_state) } /* USB Retimer */ -const struct usb_mux usbc1_retimer = { - .usb_port = 1, - .i2c_port = I2C_PORT_SUB_USB_C1, - .i2c_addr_flags = TUSB544_I2C_ADDR_FLAGS0, - .driver = &tusb544_drv, - .board_set = &board_tusb544_set, +const struct usb_mux_chain usbc1_retimer = { + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .i2c_port = I2C_PORT_SUB_USB_C1, + .i2c_addr_flags = TUSB544_I2C_ADDR_FLAGS0, + .driver = &tusb544_drv, + .board_set = &board_tusb544_set, + }, }; /* USB Muxes */ -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_C0, - .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, - .driver = &it5205_usb_mux_driver, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_C0, + .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, + .driver = &it5205_usb_mux_driver, + }, }, { - .usb_port = 1, - .i2c_port = I2C_PORT_SUB_USB_C1, - .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, - .driver = &it5205_usb_mux_driver, - .next_mux = &usbc1_retimer, + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .i2c_port = I2C_PORT_SUB_USB_C1, + .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, + .driver = &it5205_usb_mux_driver, + }, + .next = &usbc1_retimer, }, }; diff --git a/board/storo/board.h b/board/storo/board.h index de95dd5dd4..93dd573ba1 100644 --- a/board/storo/board.h +++ b/board/storo/board.h @@ -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. */ diff --git a/board/storo/build.mk b/board/storo/build.mk index 8167ca9966..01b890bf29 100644 --- a/board/storo/build.mk +++ b/board/storo/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/storo/cbi_ssfc.c b/board/storo/cbi_ssfc.c index 39fd4929a1..81f3ee0dad 100644 --- a/board/storo/cbi_ssfc.c +++ b/board/storo/cbi_ssfc.c @@ -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. */ diff --git a/board/storo/cbi_ssfc.h b/board/storo/cbi_ssfc.h index 7b29a1c585..bc6bc92286 100644 --- a/board/storo/cbi_ssfc.h +++ b/board/storo/cbi_ssfc.h @@ -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. */ diff --git a/board/storo/ec.tasklist b/board/storo/ec.tasklist index d54ff847e6..8abd36b4be 100644 --- a/board/storo/ec.tasklist +++ b/board/storo/ec.tasklist @@ -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. */ diff --git a/board/storo/gpio.inc b/board/storo/gpio.inc index b7541c5259..cb07474f52 100644 --- a/board/storo/gpio.inc +++ b/board/storo/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/storo/led.c b/board/storo/led.c index f5480489aa..76bfc05861 100644 --- a/board/storo/led.c +++ b/board/storo/led.c @@ -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. * diff --git a/board/storo/usb_pd_policy.c b/board/storo/usb_pd_policy.c index 89df538eaa..83c09bb99e 100644 --- a/board/storo/usb_pd_policy.c +++ b/board/storo/usb_pd_policy.c @@ -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. */ diff --git a/board/stryke/battery.c b/board/stryke/battery.c index 0144c049b5..7690cd420f 100644 --- a/board/stryke/battery.c +++ b/board/stryke/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/stryke/board.c b/board/stryke/board.c index 46a4176b46..1d1bbbe949 100644 --- a/board/stryke/board.c +++ b/board/stryke/board.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -143,16 +143,20 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }, }; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { [USB_PD_PORT_TCPC_0] = { - .usb_port = USB_PD_PORT_TCPC_0, - .driver = &anx7447_usb_mux_driver, - .hpd_update = &anx7447_tcpc_update_hpd_status, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_TCPC_0, + .driver = &anx7447_usb_mux_driver, + .hpd_update = &anx7447_tcpc_update_hpd_status, + }, }, [USB_PD_PORT_TCPC_1] = { - .usb_port = USB_PD_PORT_TCPC_1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = &(const struct usb_mux) { + .usb_port = USB_PD_PORT_TCPC_1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, } }; diff --git a/board/stryke/board.h b/board/stryke/board.h index ee49ade1f8..165cdd53a8 100644 --- a/board/stryke/board.h +++ b/board/stryke/board.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/stryke/build.mk b/board/stryke/build.mk index 733912454f..13153c1526 100644 --- a/board/stryke/build.mk +++ b/board/stryke/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/stryke/ec.tasklist b/board/stryke/ec.tasklist index 4a1024a091..829be2b7c8 100644 --- a/board/stryke/ec.tasklist +++ b/board/stryke/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/stryke/gpio.inc b/board/stryke/gpio.inc index 8b241b2850..f839d16f84 100644 --- a/board/stryke/gpio.inc +++ b/board/stryke/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -16,10 +16,10 @@ GPIO_INT(ACOK_OD, PIN(0, 0), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, ex /* Power sequencing interrupts */ GPIO_INT(SLP_S0_L, PIN(D, 5), GPIO_INT_BOTH, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 GPIO_INT(SLP_S3_L, PIN(A, 5), GPIO_INT_BOTH, power_signal_interrupt) #endif -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 GPIO_INT(SLP_S4_L, PIN(D, 4), GPIO_INT_BOTH, power_signal_interrupt) #endif GPIO_INT(PG_EC_RSMRST_L, PIN(E, 2), GPIO_INT_BOTH, intel_x86_rsmrst_signal_interrupt) diff --git a/board/stryke/led.c b/board/stryke/led.c index 3ef9a3cdfd..d49e29782c 100644 --- a/board/stryke/led.c +++ b/board/stryke/led.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/sweetberry/board.c b/board/sweetberry/board.c index 64a70c52a3..9e2cefb8fb 100644 --- a/board/sweetberry/board.c +++ b/board/sweetberry/board.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/sweetberry/board.h b/board/sweetberry/board.h index 9290886784..4387cd4094 100644 --- a/board/sweetberry/board.h +++ b/board/sweetberry/board.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/sweetberry/build.mk b/board/sweetberry/build.mk index 6b06f2bb8f..61e4b79d47 100644 --- a/board/sweetberry/build.mk +++ b/board/sweetberry/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2016 The Chromium OS Authors. All rights reserved. +# Copyright 2016 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/sweetberry/ec.tasklist b/board/sweetberry/ec.tasklist index c1fb169118..c45a1e89a7 100644 --- a/board/sweetberry/ec.tasklist +++ b/board/sweetberry/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/sweetberry/gpio.inc b/board/sweetberry/gpio.inc index cfab7fc1f3..28b91d0dec 100644 --- a/board/sweetberry/gpio.inc +++ b/board/sweetberry/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2016 The Chromium OS Authors. All rights reserved. + * Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/taeko/battery.c b/board/taeko/battery.c index 835b2a1e7b..24ce4c1bdf 100644 --- a/board/taeko/battery.c +++ b/board/taeko/battery.c @@ -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. * diff --git a/board/taeko/board.c b/board/taeko/board.c index 2e4627c3bf..79ef4029d6 100644 --- a/board/taeko/board.c +++ b/board/taeko/board.c @@ -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. */ diff --git a/board/taeko/board.h b/board/taeko/board.h index a3990e30a0..c3193c8847 100644 --- a/board/taeko/board.h +++ b/board/taeko/board.h @@ -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. */ diff --git a/board/taeko/build.mk b/board/taeko/build.mk index 442d30718f..9d193faf4e 100644 --- a/board/taeko/build.mk +++ b/board/taeko/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/taeko/charger.c b/board/taeko/charger.c index cbc657271b..a4fa209246 100644 --- a/board/taeko/charger.c +++ b/board/taeko/charger.c @@ -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. */ diff --git a/board/taeko/ec.tasklist b/board/taeko/ec.tasklist index 6d995d6b44..29fd0bf4cb 100644 --- a/board/taeko/ec.tasklist +++ b/board/taeko/ec.tasklist @@ -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. */ diff --git a/board/taeko/fans.c b/board/taeko/fans.c index ae026fdd7e..de3a49d45d 100644 --- a/board/taeko/fans.c +++ b/board/taeko/fans.c @@ -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. */ diff --git a/board/taeko/fw_config.c b/board/taeko/fw_config.c index 0d3c6fc493..e04386051d 100644 --- a/board/taeko/fw_config.c +++ b/board/taeko/fw_config.c @@ -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. */ diff --git a/board/taeko/fw_config.h b/board/taeko/fw_config.h index a858598f04..5217a72d0a 100644 --- a/board/taeko/fw_config.h +++ b/board/taeko/fw_config.h @@ -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. */ diff --git a/board/taeko/gpio.inc b/board/taeko/gpio.inc index 216ecfe99d..44cb489257 100644 --- a/board/taeko/gpio.inc +++ b/board/taeko/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/taeko/i2c.c b/board/taeko/i2c.c index 2c990254fa..79eddd663d 100644 --- a/board/taeko/i2c.c +++ b/board/taeko/i2c.c @@ -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. */ diff --git a/board/taeko/keyboard.c b/board/taeko/keyboard.c index 194e90053b..943f9f2635 100644 --- a/board/taeko/keyboard.c +++ b/board/taeko/keyboard.c @@ -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. */ @@ -43,7 +43,7 @@ static const struct ec_response_keybd_config taeko_kb = { }; static const struct ec_response_keybd_config tarlo_kb = { - .num_top_row_keys = 14, + .num_top_row_keys = 11, .action_keys = { TK_BACK, /* T1 */ TK_REFRESH, /* T2 */ @@ -52,22 +52,58 @@ static const struct ec_response_keybd_config tarlo_kb = { TK_SNAPSHOT, /* T5 */ TK_BRIGHTNESS_DOWN, /* T6 */ TK_BRIGHTNESS_UP, /* T7 */ - TK_ABSENT, /* T8 */ - TK_ABSENT, /* T9 */ - TK_ABSENT, /* T10 */ - TK_MICMUTE, /* T11 */ - TK_VOL_MUTE, /* T12 */ - TK_VOL_DOWN, /* T13 */ - TK_VOL_UP, /* T14 */ + TK_MICMUTE, /* T8 */ + TK_VOL_MUTE, /* T9 */ + TK_VOL_DOWN, /* T10 */ + TK_VOL_UP, /* T11 */ }, .capabilities = KEYBD_CAP_SCRNLOCK_KEY | KEYBD_CAP_NUMERIC_KEYPAD, }; +/* + * Row Column info for Top row keys T1 - T15. + * Since tarlo keyboard top row keys have some issue when press with search + * key together. + * Needs to add row and col setting for top row. + * Change T8 row, col to (0,1) + * Change T9 row, col to (1,5) + * Change T10 row, col to (3,5) + * Change T11 row, col to (0,9) + */ +__override struct key { + uint8_t row; + uint8_t col; +} vivaldi_keys[] = { + { .row = 0, .col = 2 }, /* T1 */ + { .row = 3, .col = 2 }, /* T2 */ + { .row = 2, .col = 2 }, /* T3 */ + { .row = 1, .col = 2 }, /* T4 */ + { .row = 3, .col = 4 }, /* T5 */ + { .row = 2, .col = 4 }, /* T6 */ + { .row = 1, .col = 4 }, /* T7 */ + { .row = 0, .col = 1 }, /* T8 */ + { .row = 1, .col = 5 }, /* T9 */ + { .row = 3, .col = 5 }, /* T10 */ + { .row = 0, .col = 9 }, /* T11 */ + { .row = 2, .col = 9 }, /* T12 */ + { .row = 1, .col = 9 }, /* T13 */ + { .row = 0, .col = 4 }, /* T14 */ + { .row = 0, .col = 11 }, /* T15 */ +}; +BUILD_ASSERT(ARRAY_SIZE(vivaldi_keys) == MAX_TOP_ROW_KEYS); + __override const struct ec_response_keybd_config * board_vivaldi_keybd_config(void) { if (ec_cfg_has_keyboard_number_pad()) return &tarlo_kb; - else + else { + vivaldi_keys[7].row = 2; /* T8 */ + vivaldi_keys[7].col = 9; + vivaldi_keys[8].row = 1; /* T9 */ + vivaldi_keys[8].col = 9; + vivaldi_keys[9].row = 0; /* T10 */ + vivaldi_keys[9].col = 4; return &taeko_kb; + } } diff --git a/board/taeko/led.c b/board/taeko/led.c index be1bdde30a..7a58e486b0 100644 --- a/board/taeko/led.c +++ b/board/taeko/led.c @@ -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. */ diff --git a/board/taeko/pwm.c b/board/taeko/pwm.c index 985305449b..899cf1db15 100644 --- a/board/taeko/pwm.c +++ b/board/taeko/pwm.c @@ -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. */ diff --git a/board/taeko/sensors.c b/board/taeko/sensors.c index 331ec82ba6..f695862fa8 100644 --- a/board/taeko/sensors.c +++ b/board/taeko/sensors.c @@ -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. */ diff --git a/board/taeko/usbc_config.c b/board/taeko/usbc_config.c index 02a67cc5bc..71a495c402 100644 --- a/board/taeko/usbc_config.c +++ b/board/taeko/usbc_config.c @@ -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. */ @@ -99,24 +99,31 @@ unsigned int ppc_cnt = ARRAY_SIZE(ppc_chips); * to the virtual_usb_mux_driver so the AP gets notified of mux changes * and updates the TCSS configuration on state changes. */ -static const struct usb_mux usbc1_usb3_db_retimer = { - .usb_port = USBC_PORT_C1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, +static const struct usb_mux_chain usbc1_usb3_db_retimer = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, }; -const struct usb_mux usb_muxes[] = { +const struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }, [USBC_PORT_C1] = { - /* PS8815 DB */ - .usb_port = USBC_PORT_C1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, - .next_mux = &usbc1_usb3_db_retimer, + .mux = &(const struct usb_mux) { + /* PS8815 DB */ + .usb_port = USBC_PORT_C1, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, + .next = &usbc1_usb3_db_retimer, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/board/taeko/usbc_config.h b/board/taeko/usbc_config.h index 98b7ab28a0..9a35b4880f 100644 --- a/board/taeko/usbc_config.h +++ b/board/taeko/usbc_config.h @@ -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. */ diff --git a/board/taniks/battery.c b/board/taniks/battery.c index c84452e9bb..013c27602c 100644 --- a/board/taniks/battery.c +++ b/board/taniks/battery.c @@ -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. * diff --git a/board/taniks/board.c b/board/taniks/board.c index 44e1617545..5da998524b 100644 --- a/board/taniks/board.c +++ b/board/taniks/board.c @@ -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. */ diff --git a/board/taniks/board.h b/board/taniks/board.h index 63660dc357..6cd42ad7bb 100644 --- a/board/taniks/board.h +++ b/board/taniks/board.h @@ -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. */ diff --git a/board/taniks/build.mk b/board/taniks/build.mk index 2afcd5a0f8..7d01cfff96 100644 --- a/board/taniks/build.mk +++ b/board/taniks/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/taniks/charger.c b/board/taniks/charger.c index cbc657271b..a4fa209246 100644 --- a/board/taniks/charger.c +++ b/board/taniks/charger.c @@ -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. */ diff --git a/board/taniks/ec.tasklist b/board/taniks/ec.tasklist index 12beb39a23..c879d3f77c 100644 --- a/board/taniks/ec.tasklist +++ b/board/taniks/ec.tasklist @@ -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. */ diff --git a/board/taniks/fans.c b/board/taniks/fans.c index d3ffa45eb9..aeb2ff2caa 100644 --- a/board/taniks/fans.c +++ b/board/taniks/fans.c @@ -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. */ diff --git a/board/taniks/fw_config.c b/board/taniks/fw_config.c index ee544fbffd..7d6323c868 100644 --- a/board/taniks/fw_config.c +++ b/board/taniks/fw_config.c @@ -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. */ diff --git a/board/taniks/fw_config.h b/board/taniks/fw_config.h index 7b708716c9..05ca552538 100644 --- a/board/taniks/fw_config.h +++ b/board/taniks/fw_config.h @@ -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. */ diff --git a/board/taniks/gpio.inc b/board/taniks/gpio.inc index 0dff3216de..d2c2bdffb9 100644 --- a/board/taniks/gpio.inc +++ b/board/taniks/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/taniks/i2c.c b/board/taniks/i2c.c index 64c5e8f127..5be2ad4b85 100644 --- a/board/taniks/i2c.c +++ b/board/taniks/i2c.c @@ -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. */ diff --git a/board/taniks/keyboard.c b/board/taniks/keyboard.c index dd47bb3752..069627a168 100644 --- a/board/taniks/keyboard.c +++ b/board/taniks/keyboard.c @@ -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. */ @@ -28,7 +28,7 @@ __override struct keyboard_scan_config keyscan_config = { }; static const struct ec_response_keybd_config taniks_kb = { - .num_top_row_keys = 14, + .num_top_row_keys = 11, .action_keys = { TK_BACK, /* T1 */ TK_REFRESH, /* T2 */ @@ -37,17 +37,47 @@ static const struct ec_response_keybd_config taniks_kb = { TK_SNAPSHOT, /* T5 */ TK_BRIGHTNESS_DOWN, /* T6 */ TK_BRIGHTNESS_UP, /* T7 */ - TK_ABSENT, /* T8 */ - TK_ABSENT, /* T9 */ - TK_ABSENT, /* T10 */ - TK_MICMUTE, /* T11 */ - TK_VOL_MUTE, /* T12 */ - TK_VOL_DOWN, /* T13 */ - TK_VOL_UP, /* T14 */ + TK_MICMUTE, /* T8 */ + TK_VOL_MUTE, /* T9 */ + TK_VOL_DOWN, /* T10 */ + TK_VOL_UP, /* T11 */ }, .capabilities = KEYBD_CAP_SCRNLOCK_KEY | KEYBD_CAP_NUMERIC_KEYPAD, }; +/* + * Row Column info for Top row keys T1 - T15. + * For taniks keyboard layout(T11 - T14) and + * printing(F8 - F11) are different issue. + * Move T11 - T14 row and col setting to T8 - T11. + * Need define row col to mapping matrix layout. + * Change T8 row, col to (0,1) + * Change T9 row, col to (1,5) + * Change T10 row, col to (3,5) + * Change T11 row, col to (0,9) + */ +__override const struct key { + uint8_t row; + uint8_t col; +} vivaldi_keys[] = { + { .row = 0, .col = 2 }, /* T1 */ + { .row = 3, .col = 2 }, /* T2 */ + { .row = 2, .col = 2 }, /* T3 */ + { .row = 1, .col = 2 }, /* T4 */ + { .row = 3, .col = 4 }, /* T5 */ + { .row = 2, .col = 4 }, /* T6 */ + { .row = 1, .col = 4 }, /* T7 */ + { .row = 0, .col = 1 }, /* T8 */ + { .row = 1, .col = 5 }, /* T9 */ + { .row = 3, .col = 5 }, /* T10 */ + { .row = 0, .col = 9 }, /* T11 */ + { .row = 2, .col = 9 }, /* T12 */ + { .row = 1, .col = 9 }, /* T13 */ + { .row = 0, .col = 4 }, /* T14 */ + { .row = 0, .col = 11 }, /* T15 */ +}; +BUILD_ASSERT(ARRAY_SIZE(vivaldi_keys) == MAX_TOP_ROW_KEYS); + static struct rgb_s grid0[RGB_GRID0_COL * RGB_GRID0_ROW]; struct rgbkbd rgbkbds[] = { diff --git a/board/taniks/led.c b/board/taniks/led.c index ec53a2613a..6b7e0bb6cd 100644 --- a/board/taniks/led.c +++ b/board/taniks/led.c @@ -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. */ diff --git a/board/taniks/pwm.c b/board/taniks/pwm.c index 468a83788b..d23358db5f 100644 --- a/board/taniks/pwm.c +++ b/board/taniks/pwm.c @@ -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. */ diff --git a/board/taniks/sensors.c b/board/taniks/sensors.c index 840e0e186b..5371f94081 100644 --- a/board/taniks/sensors.c +++ b/board/taniks/sensors.c @@ -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. */ diff --git a/board/taniks/usbc_config.c b/board/taniks/usbc_config.c index 02a67cc5bc..71a495c402 100644 --- a/board/taniks/usbc_config.c +++ b/board/taniks/usbc_config.c @@ -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. */ @@ -99,24 +99,31 @@ unsigned int ppc_cnt = ARRAY_SIZE(ppc_chips); * to the virtual_usb_mux_driver so the AP gets notified of mux changes * and updates the TCSS configuration on state changes. */ -static const struct usb_mux usbc1_usb3_db_retimer = { - .usb_port = USBC_PORT_C1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, +static const struct usb_mux_chain usbc1_usb3_db_retimer = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, }; -const struct usb_mux usb_muxes[] = { +const struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }, [USBC_PORT_C1] = { - /* PS8815 DB */ - .usb_port = USBC_PORT_C1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, - .next_mux = &usbc1_usb3_db_retimer, + .mux = &(const struct usb_mux) { + /* PS8815 DB */ + .usb_port = USBC_PORT_C1, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, + .next = &usbc1_usb3_db_retimer, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/board/taniks/usbc_config.h b/board/taniks/usbc_config.h index 09fd179aa1..c9b8a8d71c 100644 --- a/board/taniks/usbc_config.h +++ b/board/taniks/usbc_config.h @@ -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. */ diff --git a/board/terrador/battery.c b/board/terrador/battery.c index d129ede528..caaf3d6d55 100644 --- a/board/terrador/battery.c +++ b/board/terrador/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/terrador/board.c b/board/terrador/board.c index eb5941f0e5..8426216e79 100644 --- a/board/terrador/board.c +++ b/board/terrador/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -243,12 +243,15 @@ void board_reset_pd_mcu(void) } /* USBC mux configuration - Tiger Lake includes internal mux */ -struct usb_mux usbc0_usb4_mb_retimer = { - .usb_port = USBC_PORT_C0, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_0_MIX, - .i2c_addr_flags = USBC_PORT_C0_BB_RETIMER_I2C_ADDR, +struct usb_mux_chain usbc0_usb4_mb_retimer = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C0, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_0_MIX, + .i2c_addr_flags = USBC_PORT_C0_BB_RETIMER_I2C_ADDR, + }, }; /***************************************************************************** * USB-C MUX/Retimer dynamic configuration. @@ -257,7 +260,7 @@ static void setup_mux(void) { CPRINTS("C0 supports bb-retimer"); /* USB-C port 0 have a retimer */ - usb_muxes[USBC_PORT_C0].next_mux = &usbc0_usb4_mb_retimer; + usb_muxes[USBC_PORT_C0].next = &usbc0_usb4_mb_retimer; } __override void board_cbi_init(void) @@ -342,24 +345,31 @@ BUILD_ASSERT(CONFIG_USB_PD_PORT_MAX_COUNT == USBC_PORT_COUNT); /******************************************************************************/ /* USBC mux configuration - Tiger Lake includes internal mux */ -struct usb_mux usbc1_tcss_usb_mux = { - .usb_port = USBC_PORT_C1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +struct usb_mux_chain usbc1_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; -struct usb_mux usb_muxes[] = { +struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }, [USBC_PORT_C1] = { - .usb_port = USBC_PORT_C1, - .next_mux = &usbc1_tcss_usb_mux, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_1_MIX, - .i2c_addr_flags = USBC_PORT_C1_BB_RETIMER_I2C_ADDR, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C1, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_1_MIX, + .i2c_addr_flags = USBC_PORT_C1_BB_RETIMER_I2C_ADDR, + }, + .next = &usbc1_tcss_usb_mux, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/board/terrador/board.h b/board/terrador/board.h index 9c7010fe96..e0a075df9c 100644 --- a/board/terrador/board.h +++ b/board/terrador/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/terrador/build.mk b/board/terrador/build.mk index b78172d3cf..824bac888e 100644 --- a/board/terrador/build.mk +++ b/board/terrador/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/terrador/ec.tasklist b/board/terrador/ec.tasklist index 3e20d8ae39..c29125d517 100644 --- a/board/terrador/ec.tasklist +++ b/board/terrador/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/terrador/gpio.inc b/board/terrador/gpio.inc index f32b8328e3..6d3c4cb720 100644 --- a/board/terrador/gpio.inc +++ b/board/terrador/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -16,7 +16,7 @@ GPIO_INT(ACOK_OD, PIN(0, 0), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, ex /* Power sequencing interrupts */ GPIO_INT(SLP_S0_L, PIN(D, 5), GPIO_INT_BOTH, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 GPIO_INT(SLP_S3_L, PIN(A, 5), GPIO_INT_BOTH, power_signal_interrupt) #endif GPIO_INT(SLP_SUS_L, PIN(D, 7), GPIO_INT_BOTH, power_signal_interrupt) diff --git a/board/terrador/led.c b/board/terrador/led.c index 18bbb8c170..ce2d497ea7 100644 --- a/board/terrador/led.c +++ b/board/terrador/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/terrador/sensors.c b/board/terrador/sensors.c index cce3807d91..8f187f904c 100644 --- a/board/terrador/sensors.c +++ b/board/terrador/sensors.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/tglrvp_ish/board.c b/board/tglrvp_ish/board.c index e6412b5067..f05d7d337c 100644 --- a/board/tglrvp_ish/board.c +++ b/board/tglrvp_ish/board.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/tglrvp_ish/board.h b/board/tglrvp_ish/board.h index 49582fb078..702494cdcc 100644 --- a/board/tglrvp_ish/board.h +++ b/board/tglrvp_ish/board.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/tglrvp_ish/build.mk b/board/tglrvp_ish/build.mk index 74ec3c865f..4a84a1f475 100644 --- a/board/tglrvp_ish/build.mk +++ b/board/tglrvp_ish/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/tglrvp_ish/ec.tasklist b/board/tglrvp_ish/ec.tasklist index a4db486e9a..de7d256324 100644 --- a/board/tglrvp_ish/ec.tasklist +++ b/board/tglrvp_ish/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/tglrvp_ish/gpio.inc b/board/tglrvp_ish/gpio.inc index 286309e388..8b25af63cb 100644 --- a/board/tglrvp_ish/gpio.inc +++ b/board/tglrvp_ish/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/tigertail/board.c b/board/tigertail/board.c index 599653aaf2..5b01308396 100644 --- a/board/tigertail/board.c +++ b/board/tigertail/board.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/tigertail/board.h b/board/tigertail/board.h index 8c8f49d4da..ea4d11db06 100644 --- a/board/tigertail/board.h +++ b/board/tigertail/board.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/tigertail/build.mk b/board/tigertail/build.mk index 9e7fae1c07..7766dd5e6b 100644 --- a/board/tigertail/build.mk +++ b/board/tigertail/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2017 The Chromium OS Authors. All rights reserved. +# Copyright 2017 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/tigertail/ec.tasklist b/board/tigertail/ec.tasklist index afdb5dedc7..c254025ebc 100644 --- a/board/tigertail/ec.tasklist +++ b/board/tigertail/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/tigertail/gpio.inc b/board/tigertail/gpio.inc index 107d3b2a2e..41c96cba46 100644 --- a/board/tigertail/gpio.inc +++ b/board/tigertail/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2017 The Chromium OS Authors. All rights reserved. + * Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/treeya/battery.c b/board/treeya/battery.c index a98a38d3e9..8dce09612b 100644 --- a/board/treeya/battery.c +++ b/board/treeya/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/treeya/board.c b/board/treeya/board.c index 0ee3baaca5..9a887a9f2d 100644 --- a/board/treeya/board.c +++ b/board/treeya/board.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/treeya/board.h b/board/treeya/board.h index 2fb817b91c..75c093cd71 100644 --- a/board/treeya/board.h +++ b/board/treeya/board.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/treeya/build.mk b/board/treeya/build.mk index 250abe6712..618554c11f 100644 --- a/board/treeya/build.mk +++ b/board/treeya/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/treeya/ec.tasklist b/board/treeya/ec.tasklist index fb6e2f75a1..7c9bfc2aff 100644 --- a/board/treeya/ec.tasklist +++ b/board/treeya/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/treeya/gpio.inc b/board/treeya/gpio.inc index 70e2e1b29c..f0de3fc62c 100644 --- a/board/treeya/gpio.inc +++ b/board/treeya/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/treeya/led.c b/board/treeya/led.c index 872cb290c3..74d3bdef7e 100644 --- a/board/treeya/led.c +++ b/board/treeya/led.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/trembyle/battery.c b/board/trembyle/battery.c index 33e4e9ce5d..22724f11b4 100644 --- a/board/trembyle/battery.c +++ b/board/trembyle/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/trembyle/board.c b/board/trembyle/board.c index e4d8431e91..d9d71a0895 100644 --- a/board/trembyle/board.c +++ b/board/trembyle/board.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -252,6 +252,10 @@ DECLARE_HOOK(HOOK_CHIPSET_SUSPEND, board_chipset_suspend, HOOK_PRIO_DEFAULT); /***************************************************************************** * USB-C MUX/Retimer dynamic configuration */ + +/* Place holder for second mux in USBC1 chain */ +struct usb_mux_chain usbc1_mux1; + static void setup_mux(void) { if (ec_config_has_usbc1_retimer_ps8802()) { @@ -261,11 +265,10 @@ static void setup_mux(void) * Replace usb_muxes[USBC_PORT_C1] with the PS8802 * table entry. */ - memcpy(&usb_muxes[USBC_PORT_C1], &usbc1_ps8802, - sizeof(struct usb_mux)); + usb_muxes[USBC_PORT_C1].mux = &usbc1_ps8802; /* Set the AMD FP5 as the secondary MUX */ - usb_muxes[USBC_PORT_C1].next_mux = &usbc1_amd_fp5_usb_mux; + usbc1_mux1.mux = &usbc1_amd_fp5_usb_mux; /* Don't have the AMD FP5 flip */ usbc1_amd_fp5_usb_mux.flags = USB_MUX_FLAG_SET_WITHOUT_FLIP; @@ -277,11 +280,10 @@ static void setup_mux(void) * Replace usb_muxes[USBC_PORT_C1] with the AMD FP5 * table entry. */ - memcpy(&usb_muxes[USBC_PORT_C1], &usbc1_amd_fp5_usb_mux, - sizeof(struct usb_mux)); + usb_muxes[USBC_PORT_C1].mux = &usbc1_amd_fp5_usb_mux; /* Set the PS8818 as the secondary MUX */ - usb_muxes[USBC_PORT_C1].next_mux = &usbc1_ps8818; + usbc1_mux1.mux = &usbc1_ps8818; } } @@ -295,23 +297,29 @@ const struct pi3dpx1207_usb_control pi3dpx1207_controls[] = { }; BUILD_ASSERT(ARRAY_SIZE(pi3dpx1207_controls) == USBC_PORT_COUNT); -const struct usb_mux usbc0_pi3dpx1207_usb_retimer = { - .usb_port = USBC_PORT_C0, - .i2c_port = I2C_PORT_TCPC0, - .i2c_addr_flags = PI3DPX1207_I2C_ADDR_FLAGS, - .driver = &pi3dpx1207_usb_retimer, +const struct usb_mux_chain usbc0_pi3dpx1207_usb_retimer = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C0, + .i2c_port = I2C_PORT_TCPC0, + .i2c_addr_flags = PI3DPX1207_I2C_ADDR_FLAGS, + .driver = &pi3dpx1207_usb_retimer, + }, }; -struct usb_mux usb_muxes[] = { +struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .i2c_port = I2C_PORT_USB_AP_MUX, - .i2c_addr_flags = AMD_FP5_MUX_I2C_ADDR_FLAGS, - .driver = &amd_fp5_usb_mux_driver, - .next_mux = &usbc0_pi3dpx1207_usb_retimer, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .i2c_port = I2C_PORT_USB_AP_MUX, + .i2c_addr_flags = AMD_FP5_MUX_I2C_ADDR_FLAGS, + .driver = &amd_fp5_usb_mux_driver, + }, + .next = &usbc0_pi3dpx1207_usb_retimer, }, [USBC_PORT_C1] = { /* Filled in dynamically at startup */ + .next = &usbc1_mux1, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/board/trembyle/board.h b/board/trembyle/board.h index 38b1739c5f..2e3d40ac8f 100644 --- a/board/trembyle/board.h +++ b/board/trembyle/board.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -183,9 +183,9 @@ static inline bool ec_config_has_hdmi_conn_hpd(void) (ec_config_has_usbc1_retimer_ps8802()) ? GPIO_DP1_HPD : \ GPIO_DP2_HPD) -extern const struct usb_mux usbc0_pi3dpx1207_usb_retimer; -extern const struct usb_mux usbc1_ps8802; +extern const struct usb_mux_chain usbc0_pi3dpx1207_usb_retimer; extern const struct usb_mux usbc1_ps8818; +extern struct usb_mux usbc1_ps8802; extern struct usb_mux usbc1_amd_fp5_usb_mux; void hdmi_hpd_interrupt(enum ioex_signal signal); diff --git a/board/trembyle/build.mk b/board/trembyle/build.mk index 4ca0cbd96f..cd58c2b91b 100644 --- a/board/trembyle/build.mk +++ b/board/trembyle/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/trembyle/ec.tasklist b/board/trembyle/ec.tasklist index 41b83cf4f3..4bb60ed55d 100644 --- a/board/trembyle/ec.tasklist +++ b/board/trembyle/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/trembyle/gpio.inc b/board/trembyle/gpio.inc index 6cc3e6fe09..7c49eef74e 100644 --- a/board/trembyle/gpio.inc +++ b/board/trembyle/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/trembyle/led.c b/board/trembyle/led.c index f639ba2b99..ec4e93dca5 100644 --- a/board/trembyle/led.c +++ b/board/trembyle/led.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/trogdor/battery.c b/board/trogdor/battery.c index e95735eda7..cffda632bc 100644 --- a/board/trogdor/battery.c +++ b/board/trogdor/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/trogdor/board.c b/board/trogdor/board.c index 089442c5bc..863f2884b8 100644 --- a/board/trogdor/board.c +++ b/board/trogdor/board.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/trogdor/board.h b/board/trogdor/board.h index 73be10ebd6..2c8e67d26b 100644 --- a/board/trogdor/board.h +++ b/board/trogdor/board.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/trogdor/build.mk b/board/trogdor/build.mk index 7fe4452669..becaf09262 100644 --- a/board/trogdor/build.mk +++ b/board/trogdor/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/trogdor/ec.tasklist b/board/trogdor/ec.tasklist index eb14fab204..97b5046f7f 100644 --- a/board/trogdor/ec.tasklist +++ b/board/trogdor/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/trogdor/gpio.inc b/board/trogdor/gpio.inc index aaac15839e..63d6e84963 100644 --- a/board/trogdor/gpio.inc +++ b/board/trogdor/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/trogdor/hibernate.c b/board/trogdor/hibernate.c index e32f56db83..9b64e85053 100644 --- a/board/trogdor/hibernate.c +++ b/board/trogdor/hibernate.c @@ -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. */ diff --git a/board/trogdor/led.c b/board/trogdor/led.c index 20c574d4e2..3a7d8df108 100644 --- a/board/trogdor/led.c +++ b/board/trogdor/led.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/trogdor/switchcap.c b/board/trogdor/switchcap.c index 16b0db6ef6..5173e27f75 100644 --- a/board/trogdor/switchcap.c +++ b/board/trogdor/switchcap.c @@ -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. */ diff --git a/board/trogdor/usbc_config.c b/board/trogdor/usbc_config.c index 9fe4928a44..39a54f659e 100644 --- a/board/trogdor/usbc_config.c +++ b/board/trogdor/usbc_config.c @@ -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. */ @@ -168,16 +168,22 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { * to AP. But the TCPC chip is also needed to know the HPD status; otherwise, * the mux misbehaves. */ -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, }, { - .usb_port = 1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, } }; diff --git a/board/trogdor/usbc_config.h b/board/trogdor/usbc_config.h index 75adf93b3c..c9b676fc61 100644 --- a/board/trogdor/usbc_config.h +++ b/board/trogdor/usbc_config.h @@ -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. */ diff --git a/board/twinkie/board.c b/board/twinkie/board.c index 6b33d5ea20..68511e641b 100644 --- a/board/twinkie/board.c +++ b/board/twinkie/board.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/twinkie/board.h b/board/twinkie/board.h index 4410c4c57f..b1379fb15b 100644 --- a/board/twinkie/board.h +++ b/board/twinkie/board.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/twinkie/build.mk b/board/twinkie/build.mk index 3ced5f2966..f710000486 100644 --- a/board/twinkie/build.mk +++ b/board/twinkie/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2014 The Chromium OS Authors. All rights reserved. +# Copyright 2014 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/twinkie/ec.tasklist b/board/twinkie/ec.tasklist index 600df47c60..0dcfd38308 100644 --- a/board/twinkie/ec.tasklist +++ b/board/twinkie/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/twinkie/gpio.inc b/board/twinkie/gpio.inc index 551cb73748..45b34de766 100644 --- a/board/twinkie/gpio.inc +++ b/board/twinkie/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2014 The Chromium OS Authors. All rights reserved. + * Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/twinkie/injector.c b/board/twinkie/injector.c index dd2d47537c..7688b68128 100644 --- a/board/twinkie/injector.c +++ b/board/twinkie/injector.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/twinkie/injector.h b/board/twinkie/injector.h index 9ff9dbd534..ed39522969 100644 --- a/board/twinkie/injector.h +++ b/board/twinkie/injector.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/twinkie/simpletrace.c b/board/twinkie/simpletrace.c index fdad25fff9..fdc4cbfbb2 100644 --- a/board/twinkie/simpletrace.c +++ b/board/twinkie/simpletrace.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/twinkie/sniffer.c b/board/twinkie/sniffer.c index 574679679e..ff7ad02f87 100644 --- a/board/twinkie/sniffer.c +++ b/board/twinkie/sniffer.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/twinkie/usb_pd_config.h b/board/twinkie/usb_pd_config.h index 17512c95c6..062c174d8a 100644 --- a/board/twinkie/usb_pd_config.h +++ b/board/twinkie/usb_pd_config.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/twinkie/usb_pd_pdo.c b/board/twinkie/usb_pd_pdo.c index ebb40aec84..fbc0624f80 100644 --- a/board/twinkie/usb_pd_pdo.c +++ b/board/twinkie/usb_pd_pdo.c @@ -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. */ diff --git a/board/twinkie/usb_pd_pdo.h b/board/twinkie/usb_pd_pdo.h index 377ccce1b5..0badd0f7bf 100644 --- a/board/twinkie/usb_pd_pdo.h +++ b/board/twinkie/usb_pd_pdo.h @@ -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. */ diff --git a/board/twinkie/usb_pd_policy.c b/board/twinkie/usb_pd_policy.c index 4d39992e50..c99dfb5750 100644 --- a/board/twinkie/usb_pd_policy.c +++ b/board/twinkie/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/vell/battery.c b/board/vell/battery.c index 15041415a1..0ffb7fb015 100644 --- a/board/vell/battery.c +++ b/board/vell/battery.c @@ -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. * diff --git a/board/vell/board.c b/board/vell/board.c index 85f0927cad..7496df1b86 100644 --- a/board/vell/board.c +++ b/board/vell/board.c @@ -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. */ diff --git a/board/vell/board.h b/board/vell/board.h index 38ba96971c..a17be43a50 100644 --- a/board/vell/board.h +++ b/board/vell/board.h @@ -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. */ diff --git a/board/vell/build.mk b/board/vell/build.mk index c43f37b4dd..cad0da2a4e 100644 --- a/board/vell/build.mk +++ b/board/vell/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/vell/charger.c b/board/vell/charger.c index 233c06a75d..e33a0ed44a 100644 --- a/board/vell/charger.c +++ b/board/vell/charger.c @@ -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. */ diff --git a/board/vell/ec.tasklist b/board/vell/ec.tasklist index 924d708a6b..0bae104a07 100644 --- a/board/vell/ec.tasklist +++ b/board/vell/ec.tasklist @@ -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. */ diff --git a/board/vell/fans.c b/board/vell/fans.c index c1a778627d..b3fc2f8585 100644 --- a/board/vell/fans.c +++ b/board/vell/fans.c @@ -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. */ diff --git a/board/vell/fw_config.c b/board/vell/fw_config.c index 7b5549dc89..bf5e29fe05 100644 --- a/board/vell/fw_config.c +++ b/board/vell/fw_config.c @@ -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. */ diff --git a/board/vell/fw_config.h b/board/vell/fw_config.h index 7f9b472d83..fea6c9a8da 100644 --- a/board/vell/fw_config.h +++ b/board/vell/fw_config.h @@ -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. */ diff --git a/board/vell/gpio.inc b/board/vell/gpio.inc index 6e0239fc12..9f6ce7cc7e 100644 --- a/board/vell/gpio.inc +++ b/board/vell/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/vell/i2c.c b/board/vell/i2c.c index 4f505d74c7..822de9a0d1 100644 --- a/board/vell/i2c.c +++ b/board/vell/i2c.c @@ -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. */ diff --git a/board/vell/keyboard.c b/board/vell/keyboard.c index 33e9bb9c07..f541f51e3b 100644 --- a/board/vell/keyboard.c +++ b/board/vell/keyboard.c @@ -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. */ diff --git a/board/vell/led.c b/board/vell/led.c index 93173fab66..cd9304b2cf 100644 --- a/board/vell/led.c +++ b/board/vell/led.c @@ -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. * diff --git a/board/vell/pwm.c b/board/vell/pwm.c index 90fb4dac68..94fb4e8929 100644 --- a/board/vell/pwm.c +++ b/board/vell/pwm.c @@ -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. */ diff --git a/board/vell/sensors.c b/board/vell/sensors.c index 5d0555780f..f088fc8867 100644 --- a/board/vell/sensors.c +++ b/board/vell/sensors.c @@ -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. */ diff --git a/board/vell/thermal.c b/board/vell/thermal.c index 5ce87fd3a5..29d438761b 100644 --- a/board/vell/thermal.c +++ b/board/vell/thermal.c @@ -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. */ diff --git a/board/vell/usbc_config.c b/board/vell/usbc_config.c index 29c436d01d..694ce202d1 100644 --- a/board/vell/usbc_config.c +++ b/board/vell/usbc_config.c @@ -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. */ @@ -119,59 +119,79 @@ struct ppc_config_t ppc_chips_old_c3 = { }; /* USBC mux configuration - Alder Lake includes internal mux */ -static const struct usb_mux usbc0_tcss_usb_mux = { - .usb_port = USBC_PORT_C0, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +static const struct usb_mux_chain usbc0_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C0, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; -static const struct usb_mux usbc1_tcss_usb_mux = { - .usb_port = USBC_PORT_C1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +static const struct usb_mux_chain usbc1_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; -static const struct usb_mux usbc2_tcss_usb_mux = { - .usb_port = USBC_PORT_C2, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +static const struct usb_mux_chain usbc2_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C2, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; -static const struct usb_mux usbc3_tcss_usb_mux = { - .usb_port = USBC_PORT_C3, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +static const struct usb_mux_chain usbc3_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C3, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; -const struct usb_mux usb_muxes[] = { +const struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_C0_C1_MUX, - .i2c_addr_flags = USBC_PORT_C0_BB_RETIMER_I2C_ADDR, - .next_mux = &usbc0_tcss_usb_mux, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_C0_C1_MUX, + .i2c_addr_flags = USBC_PORT_C0_BB_RETIMER_I2C_ADDR, + }, + .next = &usbc0_tcss_usb_mux, }, [USBC_PORT_C1] = { - .usb_port = USBC_PORT_C1, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_C0_C1_MUX, - .i2c_addr_flags = USBC_PORT_C1_BB_RETIMER_I2C_ADDR, - .next_mux = &usbc1_tcss_usb_mux, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C1, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_C0_C1_MUX, + .i2c_addr_flags = USBC_PORT_C1_BB_RETIMER_I2C_ADDR, + }, + .next = &usbc1_tcss_usb_mux, }, [USBC_PORT_C2] = { - .usb_port = USBC_PORT_C2, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_C2_C3_MUX, - .i2c_addr_flags = USBC_PORT_C2_BB_RETIMER_I2C_ADDR, - .next_mux = &usbc2_tcss_usb_mux, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C2, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_C2_C3_MUX, + .i2c_addr_flags = USBC_PORT_C2_BB_RETIMER_I2C_ADDR, + }, + .next = &usbc2_tcss_usb_mux, }, [USBC_PORT_C3] = { - .usb_port = USBC_PORT_C3, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_C2_C3_MUX, - .i2c_addr_flags = USBC_PORT_C3_BB_RETIMER_I2C_ADDR, - .next_mux = &usbc3_tcss_usb_mux, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C3, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_C2_C3_MUX, + .i2c_addr_flags = USBC_PORT_C3_BB_RETIMER_I2C_ADDR, + }, + .next = &usbc3_tcss_usb_mux, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/board/vell/usbc_config.h b/board/vell/usbc_config.h index cd539741cb..694b316ee8 100644 --- a/board/vell/usbc_config.h +++ b/board/vell/usbc_config.h @@ -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. */ diff --git a/board/vilboz/battery.c b/board/vilboz/battery.c index 22187fa7df..a119ce38e8 100644 --- a/board/vilboz/battery.c +++ b/board/vilboz/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/vilboz/board.c b/board/vilboz/board.c index 6c634da62e..7c74794d9d 100644 --- a/board/vilboz/board.c +++ b/board/vilboz/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -176,18 +176,23 @@ const struct usb_mux_driver usbc0_sbu_mux_driver = { * Since FSUSB42UMX is not a i2c device, .i2c_port and * .i2c_addr_flags are not required here. */ -const struct usb_mux usbc0_sbu_mux = { - .usb_port = USBC_PORT_C0, - .driver = &usbc0_sbu_mux_driver, +const struct usb_mux_chain usbc0_sbu_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C0, + .driver = &usbc0_sbu_mux_driver, + }, }; -const struct usb_mux usb_muxes[] = { +const struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .i2c_port = I2C_PORT_USB_AP_MUX, - .i2c_addr_flags = AMD_FP5_MUX_I2C_ADDR_FLAGS, - .driver = &amd_fp5_usb_mux_driver, - .next_mux = &usbc0_sbu_mux, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .i2c_port = I2C_PORT_USB_AP_MUX, + .i2c_addr_flags = AMD_FP5_MUX_I2C_ADDR_FLAGS, + .driver = &amd_fp5_usb_mux_driver, + }, + .next = &usbc0_sbu_mux, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/board/vilboz/board.h b/board/vilboz/board.h index 3fb52d008b..5160abbc26 100644 --- a/board/vilboz/board.h +++ b/board/vilboz/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/vilboz/build.mk b/board/vilboz/build.mk index 1c0cbc4f63..45c71f962c 100644 --- a/board/vilboz/build.mk +++ b/board/vilboz/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/vilboz/ec.tasklist b/board/vilboz/ec.tasklist index 08801d1786..864ca42492 100644 --- a/board/vilboz/ec.tasklist +++ b/board/vilboz/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/vilboz/gpio.inc b/board/vilboz/gpio.inc index 78baa0eccc..6897f16890 100644 --- a/board/vilboz/gpio.inc +++ b/board/vilboz/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/vilboz/led.c b/board/vilboz/led.c index 0d7b77da3e..fa28eb5f40 100644 --- a/board/vilboz/led.c +++ b/board/vilboz/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/voema/battery.c b/board/voema/battery.c index d345cb72ec..dcd45d31fd 100644 --- a/board/voema/battery.c +++ b/board/voema/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/voema/board.c b/board/voema/board.c index b2f2a5ea3e..c4563df105 100644 --- a/board/voema/board.c +++ b/board/voema/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -358,26 +358,33 @@ BUILD_ASSERT(CONFIG_USB_PD_PORT_MAX_COUNT == USBC_PORT_COUNT); * virtual_usb_mux_driver so the AP gets notified of mux changes and updates * the TCSS configuration on state changes. */ -static const struct usb_mux usbc1_usb3_db_retimer = { - .usb_port = USBC_PORT_C1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, - .next_mux = NULL, +static const struct usb_mux_chain usbc1_usb3_db_retimer = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, + .next = NULL, }; /******************************************************************************/ /* USBC mux configuration - Tiger Lake includes internal mux */ -const struct usb_mux usb_muxes[] = { +const struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }, [USBC_PORT_C1] = { - .usb_port = USBC_PORT_C1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, - .next_mux = &usbc1_usb3_db_retimer, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C1, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, + .next = &usbc1_usb3_db_retimer, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/board/voema/board.h b/board/voema/board.h index 15233edbe0..f10192b0b6 100644 --- a/board/voema/board.h +++ b/board/voema/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/voema/build.mk b/board/voema/build.mk index d7d771ebab..7d375fe291 100644 --- a/board/voema/build.mk +++ b/board/voema/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/voema/ec.tasklist b/board/voema/ec.tasklist index 3e20d8ae39..c29125d517 100644 --- a/board/voema/ec.tasklist +++ b/board/voema/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/voema/gpio.inc b/board/voema/gpio.inc index 7506ccdbd1..e1a931094c 100644 --- a/board/voema/gpio.inc +++ b/board/voema/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -16,7 +16,7 @@ GPIO_INT(ACOK_OD, PIN(0, 0), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, ex /* Power sequencing interrupts */ GPIO_INT(SLP_S0_L, PIN(D, 5), GPIO_INT_BOTH, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 GPIO_INT(SLP_S3_L, PIN(A, 5), GPIO_INT_BOTH, power_signal_interrupt) #endif GPIO_INT(SLP_SUS_L, PIN(D, 7), GPIO_INT_BOTH, power_signal_interrupt) diff --git a/board/voema/led.c b/board/voema/led.c index 817fb80b3e..bb808e6d72 100644 --- a/board/voema/led.c +++ b/board/voema/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/voema/sensors.c b/board/voema/sensors.c index b55afcc9c2..d532a64148 100644 --- a/board/voema/sensors.c +++ b/board/voema/sensors.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/volet/battery.c b/board/volet/battery.c index 2e4fb7dc71..89769e8364 100644 --- a/board/volet/battery.c +++ b/board/volet/battery.c @@ -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. * diff --git a/board/volet/board.c b/board/volet/board.c index e934d37675..474ec9cb0e 100644 --- a/board/volet/board.c +++ b/board/volet/board.c @@ -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. */ @@ -430,26 +430,33 @@ BUILD_ASSERT(CONFIG_USB_PD_PORT_MAX_COUNT == USBC_PORT_COUNT); * virtual_usb_mux_driver so the AP gets notified of mux changes and updates * the TCSS configuration on state changes. */ -static const struct usb_mux usbc1_usb3_db_retimer = { - .usb_port = USBC_PORT_C1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, - .next_mux = NULL, +static const struct usb_mux_chain usbc1_usb3_db_retimer = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, + .next = NULL, }; /******************************************************************************/ /* USBC mux configuration - Tiger Lake includes internal mux */ -const struct usb_mux usb_muxes[] = { +const struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }, [USBC_PORT_C1] = { - .usb_port = USBC_PORT_C1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, - .next_mux = &usbc1_usb3_db_retimer, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C1, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, + .next = &usbc1_usb3_db_retimer, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/board/volet/board.h b/board/volet/board.h index c76cca4e58..c616b1cbe1 100644 --- a/board/volet/board.h +++ b/board/volet/board.h @@ -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. */ diff --git a/board/volet/build.mk b/board/volet/build.mk index 546bcba8d2..18397fdec3 100644 --- a/board/volet/build.mk +++ b/board/volet/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/volet/ec.tasklist b/board/volet/ec.tasklist index ca6d9fbf14..07a91894ed 100644 --- a/board/volet/ec.tasklist +++ b/board/volet/ec.tasklist @@ -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. */ diff --git a/board/volet/gpio.inc b/board/volet/gpio.inc index 16471d0817..079c731785 100644 --- a/board/volet/gpio.inc +++ b/board/volet/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ @@ -16,7 +16,7 @@ GPIO_INT(ACOK_OD, PIN(0, 0), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, ex /* Power sequencing interrupts */ GPIO_INT(SLP_S0_L, PIN(D, 5), GPIO_INT_BOTH, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 GPIO_INT(SLP_S3_L, PIN(A, 5), GPIO_INT_BOTH, power_signal_interrupt) #endif GPIO_INT(SLP_SUS_L, PIN(D, 7), GPIO_INT_BOTH, power_signal_interrupt) diff --git a/board/volet/led.c b/board/volet/led.c index fc16d7f3ff..dceadd416f 100644 --- a/board/volet/led.c +++ b/board/volet/led.c @@ -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. * diff --git a/board/volet/sensors.c b/board/volet/sensors.c index 06ea238618..0ea3f4b74a 100644 --- a/board/volet/sensors.c +++ b/board/volet/sensors.c @@ -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. */ diff --git a/board/volmar/battery.c b/board/volmar/battery.c index 639ec0dc57..061d05d403 100644 --- a/board/volmar/battery.c +++ b/board/volmar/battery.c @@ -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. * diff --git a/board/volmar/board.c b/board/volmar/board.c index 89d92b635c..865e1ce5bb 100644 --- a/board/volmar/board.c +++ b/board/volmar/board.c @@ -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. */ diff --git a/board/volmar/board.h b/board/volmar/board.h index 424ba7b25d..fd9c5a4585 100644 --- a/board/volmar/board.h +++ b/board/volmar/board.h @@ -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. */ diff --git a/board/volmar/build.mk b/board/volmar/build.mk index 82ffaa9fe2..ed25f9c9aa 100644 --- a/board/volmar/build.mk +++ b/board/volmar/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/volmar/charger.c b/board/volmar/charger.c index 32dd2ddddb..88f5b85a41 100644 --- a/board/volmar/charger.c +++ b/board/volmar/charger.c @@ -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. */ diff --git a/board/volmar/ec.tasklist b/board/volmar/ec.tasklist index b6470bf76b..70b64bc757 100644 --- a/board/volmar/ec.tasklist +++ b/board/volmar/ec.tasklist @@ -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. */ diff --git a/board/volmar/fans.c b/board/volmar/fans.c index 46d64727e2..404e6f60df 100644 --- a/board/volmar/fans.c +++ b/board/volmar/fans.c @@ -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. */ diff --git a/board/volmar/fw_config.c b/board/volmar/fw_config.c index 5d2cc0fe3f..5c62ed17b8 100644 --- a/board/volmar/fw_config.c +++ b/board/volmar/fw_config.c @@ -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. */ diff --git a/board/volmar/fw_config.h b/board/volmar/fw_config.h index c5a3ed3d9b..4dddec9273 100644 --- a/board/volmar/fw_config.h +++ b/board/volmar/fw_config.h @@ -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. */ diff --git a/board/volmar/gpio.inc b/board/volmar/gpio.inc index 59b9d69cd4..b1d4e8c3dc 100644 --- a/board/volmar/gpio.inc +++ b/board/volmar/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/volmar/i2c.c b/board/volmar/i2c.c index 829fb4b0ea..29dd2904c1 100644 --- a/board/volmar/i2c.c +++ b/board/volmar/i2c.c @@ -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. */ diff --git a/board/volmar/keyboard.c b/board/volmar/keyboard.c index c6d46c37d7..16857b53c9 100644 --- a/board/volmar/keyboard.c +++ b/board/volmar/keyboard.c @@ -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. */ diff --git a/board/volmar/led.c b/board/volmar/led.c index 1174adf474..6c8c20299b 100644 --- a/board/volmar/led.c +++ b/board/volmar/led.c @@ -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. * Power and battery LED control for volmar diff --git a/board/volmar/pwm.c b/board/volmar/pwm.c index 47986f1ec8..ad4093ed0e 100644 --- a/board/volmar/pwm.c +++ b/board/volmar/pwm.c @@ -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. */ diff --git a/board/volmar/sensors.c b/board/volmar/sensors.c index b6c2a39a45..f03469cef4 100644 --- a/board/volmar/sensors.c +++ b/board/volmar/sensors.c @@ -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. */ diff --git a/board/volmar/usbc_config.c b/board/volmar/usbc_config.c index 23ed58fa54..6a6c5c709f 100644 --- a/board/volmar/usbc_config.c +++ b/board/volmar/usbc_config.c @@ -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. */ @@ -97,24 +97,31 @@ unsigned int ppc_cnt = ARRAY_SIZE(ppc_chips); * to the virtual_usb_mux_driver so the AP gets notified of mux changes * and updates the TCSS configuration on state changes. */ -static const struct usb_mux usbc1_usb3_db_retimer = { - .usb_port = USBC_PORT_C1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, +static const struct usb_mux_chain usbc1_usb3_db_retimer = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, }; -const struct usb_mux usb_muxes[] = { +const struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }, [USBC_PORT_C1] = { - /* PS8815 DB */ - .usb_port = USBC_PORT_C1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, - .next_mux = &usbc1_usb3_db_retimer, + .mux = &(const struct usb_mux) { + /* PS8815 DB */ + .usb_port = USBC_PORT_C1, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, + .next = &usbc1_usb3_db_retimer, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/board/volmar/usbc_config.h b/board/volmar/usbc_config.h index 73344d4f9e..0722d00d6b 100644 --- a/board/volmar/usbc_config.h +++ b/board/volmar/usbc_config.h @@ -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. */ diff --git a/board/volteer/battery.c b/board/volteer/battery.c index 1c24e1ec24..31cb7faaf9 100644 --- a/board/volteer/battery.c +++ b/board/volteer/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/volteer/board.c b/board/volteer/board.c index 352f32d026..ecf3e12e5e 100644 --- a/board/volteer/board.c +++ b/board/volteer/board.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/volteer/board.h b/board/volteer/board.h index 181e3c0667..ba34658e54 100644 --- a/board/volteer/board.h +++ b/board/volteer/board.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/volteer/build.mk b/board/volteer/build.mk index 5adcffff56..fc7828e29b 100644 --- a/board/volteer/build.mk +++ b/board/volteer/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/volteer/cbi.c b/board/volteer/cbi.c index b39f0d7d2f..46c7dae7bf 100644 --- a/board/volteer/cbi.c +++ b/board/volteer/cbi.c @@ -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. */ diff --git a/board/volteer/ec.tasklist b/board/volteer/ec.tasklist index d94a4445b9..0492fcc3c0 100644 --- a/board/volteer/ec.tasklist +++ b/board/volteer/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/volteer/gpio.inc b/board/volteer/gpio.inc index 45aa5b28c4..04982595fe 100644 --- a/board/volteer/gpio.inc +++ b/board/volteer/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -16,7 +16,7 @@ GPIO_INT(ACOK_OD, PIN(0, 0), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, ex /* Power sequencing interrupts */ GPIO_INT(SLP_S0_L, PIN(D, 5), GPIO_INT_BOTH, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 GPIO_INT(SLP_S3_L, PIN(A, 5), GPIO_INT_BOTH, power_signal_interrupt) #endif GPIO_INT(SLP_SUS_L, PIN(D, 7), GPIO_INT_BOTH, power_signal_interrupt) diff --git a/board/volteer/led.c b/board/volteer/led.c index a3a83ccf37..adc8f7b4a6 100644 --- a/board/volteer/led.c +++ b/board/volteer/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/volteer/sensors.c b/board/volteer/sensors.c index 92e510429d..b6ed795777 100644 --- a/board/volteer/sensors.c +++ b/board/volteer/sensors.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/volteer/usbc_config.c b/board/volteer/usbc_config.c index f28588f296..f5e21cb9f4 100644 --- a/board/volteer/usbc_config.c +++ b/board/volteer/usbc_config.c @@ -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. */ @@ -41,24 +41,33 @@ static const struct tcpc_config_t tcpc_config_p1_usb3 = { * virtual_usb_mux_driver so the AP gets notified of mux changes and updates * the TCSS configuration on state changes. */ -static const struct usb_mux usbc1_usb3_db_retimer = { - .usb_port = USBC_PORT_C1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, - .next_mux = NULL, +static const struct usb_mux_chain usbc1_usb3_db_retimer = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, + .next = NULL, }; -static const struct usb_mux mux_config_p1_usb3_active = { - .usb_port = USBC_PORT_C1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, - .next_mux = &usbc1_usb3_db_retimer, +static const struct usb_mux_chain mux_config_p1_usb3_active = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, + .next = &usbc1_usb3_db_retimer, }; -static const struct usb_mux mux_config_p1_usb3_passive = { - .usb_port = USBC_PORT_C1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +static const struct usb_mux_chain mux_config_p1_usb3_passive = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + } }; /* @@ -208,25 +217,32 @@ const int usb_port_enable[USB_PORT_COUNT] = { /******************************************************************************/ /* USBC mux configuration - Tiger Lake includes internal mux */ -struct usb_mux usbc1_tcss_usb_mux = { - .usb_port = USBC_PORT_C1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +struct usb_mux_chain usbc1_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + } }; -struct usb_mux usb_muxes[] = { +struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }, [USBC_PORT_C1] = { - .usb_port = USBC_PORT_C1, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .next_mux = &usbc1_tcss_usb_mux, - .i2c_port = I2C_PORT_USB_1_MIX, - .i2c_addr_flags = USBC_PORT_C1_BB_RETIMER_I2C_ADDR, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C1, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_1_MIX, + .i2c_addr_flags = USBC_PORT_C1_BB_RETIMER_I2C_ADDR, + }, + .next = &usbc1_tcss_usb_mux, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/board/volteer/usbc_config.h b/board/volteer/usbc_config.h index a13944250a..7428d0c436 100644 --- a/board/volteer/usbc_config.h +++ b/board/volteer/usbc_config.h @@ -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. */ diff --git a/board/volteer_ish/board.c b/board/volteer_ish/board.c index 514a0bf5b9..1f209dfb4d 100644 --- a/board/volteer_ish/board.c +++ b/board/volteer_ish/board.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/volteer_ish/board.h b/board/volteer_ish/board.h index c5f8d161d0..6f7d3bd1b7 100644 --- a/board/volteer_ish/board.h +++ b/board/volteer_ish/board.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/volteer_ish/build.mk b/board/volteer_ish/build.mk index 74ec3c865f..4a84a1f475 100644 --- a/board/volteer_ish/build.mk +++ b/board/volteer_ish/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/volteer_ish/ec.tasklist b/board/volteer_ish/ec.tasklist index a4db486e9a..de7d256324 100644 --- a/board/volteer_ish/ec.tasklist +++ b/board/volteer_ish/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/volteer_ish/gpio.inc b/board/volteer_ish/gpio.inc index 286309e388..8b25af63cb 100644 --- a/board/volteer_ish/gpio.inc +++ b/board/volteer_ish/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/voxel/battery.c b/board/voxel/battery.c index 4f51b79ad9..887ba27344 100644 --- a/board/voxel/battery.c +++ b/board/voxel/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/voxel/board.c b/board/voxel/board.c index ab83384eaa..40dfbe8dc4 100644 --- a/board/voxel/board.c +++ b/board/voxel/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -428,33 +428,43 @@ BUILD_ASSERT(CONFIG_USB_PD_PORT_MAX_COUNT == USBC_PORT_COUNT); /******************************************************************************/ /* USBC mux configuration - Tiger Lake includes internal mux */ -struct usb_mux usbc0_tcss_usb_mux = { - .usb_port = USBC_PORT_C0, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +struct usb_mux_chain usbc0_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C0, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; -struct usb_mux usbc1_tcss_usb_mux = { - .usb_port = USBC_PORT_C1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +struct usb_mux_chain usbc1_tcss_usb_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; -struct usb_mux usb_muxes[] = { +struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .next_mux = &usbc0_tcss_usb_mux, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_0_MIX, - .i2c_addr_flags = USBC_PORT_C0_BB_RETIMER_I2C_ADDR, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_0_MIX, + .i2c_addr_flags = USBC_PORT_C0_BB_RETIMER_I2C_ADDR, + }, + .next = &usbc0_tcss_usb_mux, }, [USBC_PORT_C1] = { - .usb_port = USBC_PORT_C1, - .next_mux = &usbc1_tcss_usb_mux, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_1_MIX, - .i2c_addr_flags = USBC_PORT_C1_BB_RETIMER_I2C_ADDR, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C1, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_1_MIX, + .i2c_addr_flags = USBC_PORT_C1_BB_RETIMER_I2C_ADDR, + }, + .next = &usbc1_tcss_usb_mux, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/board/voxel/board.h b/board/voxel/board.h index 8c8adeabec..1b866a5749 100644 --- a/board/voxel/board.h +++ b/board/voxel/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/voxel/build.mk b/board/voxel/build.mk index 838d6a16ce..c994631759 100644 --- a/board/voxel/build.mk +++ b/board/voxel/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/voxel/ec.tasklist b/board/voxel/ec.tasklist index 174a47eea3..ebcf47c499 100644 --- a/board/voxel/ec.tasklist +++ b/board/voxel/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/voxel/gpio.inc b/board/voxel/gpio.inc index 3b0c04d21d..171288a639 100644 --- a/board/voxel/gpio.inc +++ b/board/voxel/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -16,7 +16,7 @@ GPIO_INT(ACOK_OD, PIN(0, 0), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, ex /* Power sequencing interrupts */ GPIO_INT(SLP_S0_L, PIN(D, 5), GPIO_INT_BOTH, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 +#ifndef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 GPIO_INT(SLP_S3_L, PIN(A, 5), GPIO_INT_BOTH, power_signal_interrupt) #endif GPIO_INT(SLP_SUS_L, PIN(D, 7), GPIO_INT_BOTH, power_signal_interrupt) diff --git a/board/voxel/led.c b/board/voxel/led.c index c57a3bc1c1..5b15c9620f 100644 --- a/board/voxel/led.c +++ b/board/voxel/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/voxel/sensors.c b/board/voxel/sensors.c index b65897cd37..c3c074da9d 100644 --- a/board/voxel/sensors.c +++ b/board/voxel/sensors.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/waddledee/battery.c b/board/waddledee/battery.c index 8f1ccc1ade..37b2dd2e3d 100644 --- a/board/waddledee/battery.c +++ b/board/waddledee/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/waddledee/board.c b/board/waddledee/board.c index 90bb4efa6d..d7abda740c 100644 --- a/board/waddledee/board.c +++ b/board/waddledee/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -196,27 +196,36 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }; /* USB Retimer */ -const struct usb_mux usbc1_retimer = { - .usb_port = 1, - .i2c_port = I2C_PORT_SUB_USB_C1, - .i2c_addr_flags = TUSB544_I2C_ADDR_FLAGS0, - .driver = &tusb544_drv, +const struct usb_mux_chain usbc1_retimer = { + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .i2c_port = I2C_PORT_SUB_USB_C1, + .i2c_addr_flags = TUSB544_I2C_ADDR_FLAGS0, + .driver = &tusb544_drv, + }, }; /* USB Muxes */ -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_C0, - .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, - .driver = &it5205_usb_mux_driver, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_C0, + .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, + .driver = &it5205_usb_mux_driver, + }, }, { - .usb_port = 1, - .i2c_port = I2C_PORT_SUB_USB_C1, - .i2c_addr_flags = AN7447_TCPC0_I2C_ADDR_FLAGS, - .driver = &anx7447_usb_mux_driver, - .next_mux = &usbc1_retimer, + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .i2c_port = I2C_PORT_SUB_USB_C1, + .i2c_addr_flags = AN7447_TCPC0_I2C_ADDR_FLAGS, + .driver = &anx7447_usb_mux_driver, + }, + .next = &usbc1_retimer, }, }; diff --git a/board/waddledee/board.h b/board/waddledee/board.h index d5a8cf97e9..1ac3fc76da 100644 --- a/board/waddledee/board.h +++ b/board/waddledee/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/waddledee/build.mk b/board/waddledee/build.mk index 806168ea0d..9b862c7624 100644 --- a/board/waddledee/build.mk +++ b/board/waddledee/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/waddledee/cbi_ssfc.c b/board/waddledee/cbi_ssfc.c index 39fd4929a1..81f3ee0dad 100644 --- a/board/waddledee/cbi_ssfc.c +++ b/board/waddledee/cbi_ssfc.c @@ -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. */ diff --git a/board/waddledee/cbi_ssfc.h b/board/waddledee/cbi_ssfc.h index 942f0cf5f4..bf8853a43a 100644 --- a/board/waddledee/cbi_ssfc.h +++ b/board/waddledee/cbi_ssfc.h @@ -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. */ diff --git a/board/waddledee/ec.tasklist b/board/waddledee/ec.tasklist index 2edf48ee05..c3c360febb 100644 --- a/board/waddledee/ec.tasklist +++ b/board/waddledee/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/waddledee/gpio.inc b/board/waddledee/gpio.inc index 63e0055199..b0c8d8cd03 100644 --- a/board/waddledee/gpio.inc +++ b/board/waddledee/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/waddledee/led.c b/board/waddledee/led.c index 121a760515..1a2bc16898 100644 --- a/board/waddledee/led.c +++ b/board/waddledee/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/waddledee/usb_pd_policy.c b/board/waddledee/usb_pd_policy.c index ef687f0f9c..2433b25431 100644 --- a/board/waddledee/usb_pd_policy.c +++ b/board/waddledee/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/waddledoo/battery.c b/board/waddledoo/battery.c index 64af3b4302..29eac40158 100644 --- a/board/waddledoo/battery.c +++ b/board/waddledoo/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/waddledoo/board.c b/board/waddledoo/board.c index 4436c43be3..e207e59456 100644 --- a/board/waddledoo/board.c +++ b/board/waddledoo/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -586,25 +586,34 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }, }; -const struct usb_mux usbc1_retimer = { - .usb_port = 1, - .i2c_port = I2C_PORT_SUB_USB_C1, - .i2c_addr_flags = NB7V904M_I2C_ADDR0, - .driver = &nb7v904m_usb_redriver_drv, +const struct usb_mux_chain usbc1_retimer = { + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .i2c_port = I2C_PORT_SUB_USB_C1, + .i2c_addr_flags = NB7V904M_I2C_ADDR0, + .driver = &nb7v904m_usb_redriver_drv, + }, }; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_C0, - .i2c_addr_flags = PI3USB3X532_I2C_ADDR0, - .driver = &pi3usb3x532_usb_mux_driver, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_C0, + .i2c_addr_flags = PI3USB3X532_I2C_ADDR0, + .driver = &pi3usb3x532_usb_mux_driver, + }, }, { - .usb_port = 1, - .i2c_port = I2C_PORT_SUB_USB_C1, - .i2c_addr_flags = PI3USB3X532_I2C_ADDR0, - .driver = &pi3usb3x532_usb_mux_driver, - .next_mux = &usbc1_retimer, + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .i2c_port = I2C_PORT_SUB_USB_C1, + .i2c_addr_flags = PI3USB3X532_I2C_ADDR0, + .driver = &pi3usb3x532_usb_mux_driver, + }, + .next = &usbc1_retimer, } }; diff --git a/board/waddledoo/board.h b/board/waddledoo/board.h index 3ba479edc6..727f1bdb33 100644 --- a/board/waddledoo/board.h +++ b/board/waddledoo/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/waddledoo/build.mk b/board/waddledoo/build.mk index d467fee6e6..6f205ebcf4 100644 --- a/board/waddledoo/build.mk +++ b/board/waddledoo/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/waddledoo/cbi_ssfc.c b/board/waddledoo/cbi_ssfc.c index 39fd4929a1..81f3ee0dad 100644 --- a/board/waddledoo/cbi_ssfc.c +++ b/board/waddledoo/cbi_ssfc.c @@ -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. */ diff --git a/board/waddledoo/cbi_ssfc.h b/board/waddledoo/cbi_ssfc.h index 942f0cf5f4..bf8853a43a 100644 --- a/board/waddledoo/cbi_ssfc.h +++ b/board/waddledoo/cbi_ssfc.h @@ -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. */ diff --git a/board/waddledoo/ec.tasklist b/board/waddledoo/ec.tasklist index 0aba1fabeb..ba5855412d 100644 --- a/board/waddledoo/ec.tasklist +++ b/board/waddledoo/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/waddledoo/gpio.inc b/board/waddledoo/gpio.inc index 69f6bc6307..6b55d890b2 100644 --- a/board/waddledoo/gpio.inc +++ b/board/waddledoo/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/waddledoo/led.c b/board/waddledoo/led.c index f8568a5c27..4315e0b87d 100644 --- a/board/waddledoo/led.c +++ b/board/waddledoo/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/waddledoo/usb_pd_policy.c b/board/waddledoo/usb_pd_policy.c index 9edc5a181d..23166f7fca 100644 --- a/board/waddledoo/usb_pd_policy.c +++ b/board/waddledoo/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/waddledoo2/battery.c b/board/waddledoo2/battery.c index 887c66e355..3696d4e38c 100644 --- a/board/waddledoo2/battery.c +++ b/board/waddledoo2/battery.c @@ -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. * diff --git a/board/waddledoo2/board.c b/board/waddledoo2/board.c index e3c5e49bbd..fd12aec449 100644 --- a/board/waddledoo2/board.c +++ b/board/waddledoo2/board.c @@ -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. */ @@ -726,18 +726,24 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }, }; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_C0, - .i2c_addr_flags = PI3USB3X532_I2C_ADDR0, - .driver = &pi3usb3x532_usb_mux_driver, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_C0, + .i2c_addr_flags = PI3USB3X532_I2C_ADDR0, + .driver = &pi3usb3x532_usb_mux_driver, + }, }, { - .usb_port = 1, - .i2c_port = I2C_PORT_SUB_USB_C1, - .i2c_addr_flags = PS8802_I2C_ADDR_FLAGS_CUSTOM, - .driver = &ps8802_usb_mux_driver, + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .i2c_port = I2C_PORT_SUB_USB_C1, + .i2c_addr_flags = PS8802_I2C_ADDR_FLAGS_CUSTOM, + .driver = &ps8802_usb_mux_driver, + }, } }; diff --git a/board/waddledoo2/board.h b/board/waddledoo2/board.h index fe43ad243b..93f0a0f108 100644 --- a/board/waddledoo2/board.h +++ b/board/waddledoo2/board.h @@ -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. */ diff --git a/board/waddledoo2/build.mk b/board/waddledoo2/build.mk index b012d8d502..eb422dae93 100644 --- a/board/waddledoo2/build.mk +++ b/board/waddledoo2/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/waddledoo2/cbi_ssfc.c b/board/waddledoo2/cbi_ssfc.c index 39fd4929a1..81f3ee0dad 100644 --- a/board/waddledoo2/cbi_ssfc.c +++ b/board/waddledoo2/cbi_ssfc.c @@ -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. */ diff --git a/board/waddledoo2/cbi_ssfc.h b/board/waddledoo2/cbi_ssfc.h index 942f0cf5f4..bf8853a43a 100644 --- a/board/waddledoo2/cbi_ssfc.h +++ b/board/waddledoo2/cbi_ssfc.h @@ -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. */ diff --git a/board/waddledoo2/ec.tasklist b/board/waddledoo2/ec.tasklist index d4fb416bce..29666dd959 100644 --- a/board/waddledoo2/ec.tasklist +++ b/board/waddledoo2/ec.tasklist @@ -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. */ diff --git a/board/waddledoo2/gpio.inc b/board/waddledoo2/gpio.inc index f0e345a81c..f2a95f9762 100644 --- a/board/waddledoo2/gpio.inc +++ b/board/waddledoo2/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/waddledoo2/led.c b/board/waddledoo2/led.c index 47fe2a9def..33e900f2ca 100644 --- a/board/waddledoo2/led.c +++ b/board/waddledoo2/led.c @@ -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. * diff --git a/board/waddledoo2/usb_pd_policy.c b/board/waddledoo2/usb_pd_policy.c index 98b770be8f..3410726e87 100644 --- a/board/waddledoo2/usb_pd_policy.c +++ b/board/waddledoo2/usb_pd_policy.c @@ -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. */ diff --git a/board/wheelie/battery.c b/board/wheelie/battery.c index 96d967abec..bc2c5bec4d 100644 --- a/board/wheelie/battery.c +++ b/board/wheelie/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/wheelie/board.c b/board/wheelie/board.c index bd738ad14b..9708dcca82 100644 --- a/board/wheelie/board.c +++ b/board/wheelie/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -135,27 +135,36 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }; /* USB Retimer */ -const struct usb_mux usbc1_retimer = { - .usb_port = 1, - .i2c_port = I2C_PORT_SUB_USB_C1, - .i2c_addr_flags = TUSB544_I2C_ADDR_FLAGS0, - .driver = &tusb544_drv, +const struct usb_mux_chain usbc1_retimer = { + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .i2c_port = I2C_PORT_SUB_USB_C1, + .i2c_addr_flags = TUSB544_I2C_ADDR_FLAGS0, + .driver = &tusb544_drv, + }, }; /* USB Muxes */ -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_C0, - .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, - .driver = &it5205_usb_mux_driver, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_C0, + .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, + .driver = &it5205_usb_mux_driver, + }, }, { - .usb_port = 1, - .i2c_port = I2C_PORT_SUB_USB_C1, - .i2c_addr_flags = AN7447_TCPC0_I2C_ADDR_FLAGS, - .driver = &anx7447_usb_mux_driver, - .next_mux = &usbc1_retimer, + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .i2c_port = I2C_PORT_SUB_USB_C1, + .i2c_addr_flags = AN7447_TCPC0_I2C_ADDR_FLAGS, + .driver = &anx7447_usb_mux_driver, + }, + .next = &usbc1_retimer, }, }; diff --git a/board/wheelie/board.h b/board/wheelie/board.h index 4bb8eb9afe..c53f22b512 100644 --- a/board/wheelie/board.h +++ b/board/wheelie/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/wheelie/build.mk b/board/wheelie/build.mk index 806168ea0d..9b862c7624 100644 --- a/board/wheelie/build.mk +++ b/board/wheelie/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/wheelie/cbi_ssfc.c b/board/wheelie/cbi_ssfc.c index 39fd4929a1..81f3ee0dad 100644 --- a/board/wheelie/cbi_ssfc.c +++ b/board/wheelie/cbi_ssfc.c @@ -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. */ diff --git a/board/wheelie/cbi_ssfc.h b/board/wheelie/cbi_ssfc.h index 942f0cf5f4..bf8853a43a 100644 --- a/board/wheelie/cbi_ssfc.h +++ b/board/wheelie/cbi_ssfc.h @@ -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. */ diff --git a/board/wheelie/ec.tasklist b/board/wheelie/ec.tasklist index 75181a4531..701c1fa099 100644 --- a/board/wheelie/ec.tasklist +++ b/board/wheelie/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/wheelie/gpio.inc b/board/wheelie/gpio.inc index 8979ca6ab9..eb96828e07 100644 --- a/board/wheelie/gpio.inc +++ b/board/wheelie/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/wheelie/led.c b/board/wheelie/led.c index 7d73bea2d0..59518dbe6c 100644 --- a/board/wheelie/led.c +++ b/board/wheelie/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/wheelie/usb_pd_policy.c b/board/wheelie/usb_pd_policy.c index ec6e91269a..3c7564fa12 100644 --- a/board/wheelie/usb_pd_policy.c +++ b/board/wheelie/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/willow/battery.c b/board/willow/battery.c index cc97838f48..a79785aaf8 100644 --- a/board/willow/battery.c +++ b/board/willow/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/willow/board.c b/board/willow/board.c index 355056e35b..826df6940c 100644 --- a/board/willow/board.c +++ b/board/willow/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -162,13 +162,16 @@ static void board_hpd_status(const struct usb_mux *me, mux_state_t mux_state, host_set_single_event(EC_HOST_EVENT_USB_MUX); } -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_MUX, - .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, - .driver = &it5205_usb_mux_driver, - .hpd_update = &board_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_MUX, + .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, + .driver = &it5205_usb_mux_driver, + .hpd_update = &board_hpd_status, + }, }, }; diff --git a/board/willow/board.h b/board/willow/board.h index 70b384c685..18745a07a4 100644 --- a/board/willow/board.h +++ b/board/willow/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/willow/build.mk b/board/willow/build.mk index a6e1c010d7..f583684804 100644 --- a/board/willow/build.mk +++ b/board/willow/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/willow/ec.tasklist b/board/willow/ec.tasklist index c1330b86f8..fb131b8eb4 100644 --- a/board/willow/ec.tasklist +++ b/board/willow/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/willow/gpio.inc b/board/willow/gpio.inc index 9c1bffe194..684e1997c9 100644 --- a/board/willow/gpio.inc +++ b/board/willow/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/willow/led.c b/board/willow/led.c index 527ecea72a..fc74d4ba8b 100644 --- a/board/willow/led.c +++ b/board/willow/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/woomax/battery.c b/board/woomax/battery.c index bd46c51cc7..0bed2f03f5 100644 --- a/board/woomax/battery.c +++ b/board/woomax/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/woomax/board.c b/board/woomax/board.c index 27274f63a9..92290d4582 100644 --- a/board/woomax/board.c +++ b/board/woomax/board.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -456,6 +456,9 @@ const struct usb_mux usbc1_woomax_ps8818 = { .board_set = &woomax_ps8818_mux_set, }; +/* Place holder for second mux in USBC1 chain */ +struct usb_mux_chain usbc1_mux1; + static void setup_mux(void) { if (ec_config_has_usbc1_retimer_ps8802()) { @@ -467,12 +470,11 @@ static void setup_mux(void) * Replace usb_muxes[USBC_PORT_C1] with the PS8802 * table entry. */ - memcpy(&usb_muxes[USBC_PORT_C1], &usbc1_ps8802, - sizeof(struct usb_mux)); + usb_muxes[USBC_PORT_C1].mux = &usbc1_ps8802; /* Set the AMD FP5 as the secondary MUX */ - usb_muxes[USBC_PORT_C1].next_mux = &usbc1_amd_fp5_usb_mux; - usb_muxes[USBC_PORT_C1].board_set = &woomax_ps8802_mux_set; + usbc1_mux1.mux = &usbc1_amd_fp5_usb_mux; + usbc1_ps8802.board_set = &woomax_ps8802_mux_set; /* Don't have the AMD FP5 flip */ usbc1_amd_fp5_usb_mux.flags = USB_MUX_FLAG_SET_WITHOUT_FLIP; @@ -486,11 +488,10 @@ static void setup_mux(void) * Replace usb_muxes[USBC_PORT_C1] with the AMD FP5 * table entry. */ - memcpy(&usb_muxes[USBC_PORT_C1], &usbc1_amd_fp5_usb_mux, - sizeof(struct usb_mux)); + usb_muxes[USBC_PORT_C1].mux = &usbc1_amd_fp5_usb_mux; /* Set the PS8818 as the secondary MUX */ - usb_muxes[USBC_PORT_C1].next_mux = &usbc1_woomax_ps8818; + usbc1_mux1.mux = &usbc1_woomax_ps8818; } } @@ -721,24 +722,30 @@ const struct pi3dpx1207_usb_control pi3dpx1207_controls[] = { }; BUILD_ASSERT(ARRAY_SIZE(pi3dpx1207_controls) == USBC_PORT_COUNT); -const struct usb_mux usbc0_pi3dpx1207_usb_retimer = { - .usb_port = USBC_PORT_C0, - .i2c_port = I2C_PORT_TCPC0, - .i2c_addr_flags = PI3DPX1207_I2C_ADDR_FLAGS, - .driver = &pi3dpx1207_usb_retimer, - .board_set = &board_pi3dpx1207_mux_set, +const struct usb_mux_chain usbc0_pi3dpx1207_usb_retimer = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C0, + .i2c_port = I2C_PORT_TCPC0, + .i2c_addr_flags = PI3DPX1207_I2C_ADDR_FLAGS, + .driver = &pi3dpx1207_usb_retimer, + .board_set = &board_pi3dpx1207_mux_set, + }, }; -struct usb_mux usb_muxes[] = { +struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .i2c_port = I2C_PORT_USB_AP_MUX, - .i2c_addr_flags = AMD_FP5_MUX_I2C_ADDR_FLAGS, - .driver = &amd_fp5_usb_mux_driver, - .next_mux = &usbc0_pi3dpx1207_usb_retimer, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .i2c_port = I2C_PORT_USB_AP_MUX, + .i2c_addr_flags = AMD_FP5_MUX_I2C_ADDR_FLAGS, + .driver = &amd_fp5_usb_mux_driver, + }, + .next = &usbc0_pi3dpx1207_usb_retimer, }, [USBC_PORT_C1] = { /* Filled in dynamically at startup */ + .next = &usbc1_mux1, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/board/woomax/board.h b/board/woomax/board.h index b1be1bcd1a..20bbb8417a 100644 --- a/board/woomax/board.h +++ b/board/woomax/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -187,9 +187,9 @@ static inline bool ec_config_has_mst_hub_rtd2141b(void) int board_usbc_port_to_hpd_gpio_or_ioex(int port); #define PORT_TO_HPD(port) board_usbc_port_to_hpd_gpio_or_ioex(port) -extern const struct usb_mux usbc0_pi3dpx1207_usb_retimer; -extern const struct usb_mux usbc1_ps8802; +extern const struct usb_mux_chain usbc0_pi3dpx1207_usb_retimer; extern const struct usb_mux usbc1_ps8818; +extern struct usb_mux usbc1_ps8802; extern struct usb_mux usbc1_amd_fp5_usb_mux; void hdmi_hpd_interrupt(enum gpio_signal signal); void motion_interrupt(enum gpio_signal signal); diff --git a/board/woomax/build.mk b/board/woomax/build.mk index a674573a4d..61be1882bf 100644 --- a/board/woomax/build.mk +++ b/board/woomax/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/woomax/ec.tasklist b/board/woomax/ec.tasklist index d9c1606eb2..abc796f74f 100644 --- a/board/woomax/ec.tasklist +++ b/board/woomax/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/woomax/gpio.inc b/board/woomax/gpio.inc index ade15d3d4a..f085134b2e 100644 --- a/board/woomax/gpio.inc +++ b/board/woomax/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/woomax/led.c b/board/woomax/led.c index 5eee8367bb..9a761bde38 100644 --- a/board/woomax/led.c +++ b/board/woomax/led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/woomax/thermal.c b/board/woomax/thermal.c index 7c35bdea7c..a2ab52cc74 100644 --- a/board/woomax/thermal.c +++ b/board/woomax/thermal.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/wormdingler/base_detect.c b/board/wormdingler/base_detect.c index 5982cdde1f..dca23b4d2e 100644 --- a/board/wormdingler/base_detect.c +++ b/board/wormdingler/base_detect.c @@ -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. */ diff --git a/board/wormdingler/battery.c b/board/wormdingler/battery.c index bb444e59ee..001cd0474b 100644 --- a/board/wormdingler/battery.c +++ b/board/wormdingler/battery.c @@ -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. * diff --git a/board/wormdingler/board.c b/board/wormdingler/board.c index 63e273b426..3c4dfe4b3c 100644 --- a/board/wormdingler/board.c +++ b/board/wormdingler/board.c @@ -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. */ @@ -223,16 +223,22 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { * to AP. But the TCPC chip is also needed to know the HPD status; otherwise, * the mux misbehaves. */ -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, }, { - .usb_port = 1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, } }; diff --git a/board/wormdingler/board.h b/board/wormdingler/board.h index 2ec6c5a67e..3c3ba6ead5 100644 --- a/board/wormdingler/board.h +++ b/board/wormdingler/board.h @@ -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. */ diff --git a/board/wormdingler/build.mk b/board/wormdingler/build.mk index 452abeb591..363ef59a16 100644 --- a/board/wormdingler/build.mk +++ b/board/wormdingler/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. # diff --git a/board/wormdingler/ec.tasklist b/board/wormdingler/ec.tasklist index ea2aaa97f5..8fc8115afc 100644 --- a/board/wormdingler/ec.tasklist +++ b/board/wormdingler/ec.tasklist @@ -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. */ diff --git a/board/wormdingler/gpio.inc b/board/wormdingler/gpio.inc index 77a69a5faa..37e71977ac 100644 --- a/board/wormdingler/gpio.inc +++ b/board/wormdingler/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/wormdingler/led.c b/board/wormdingler/led.c index 786934dca3..c314d584c3 100644 --- a/board/wormdingler/led.c +++ b/board/wormdingler/led.c @@ -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. * diff --git a/board/wormdingler/usbc_config.c b/board/wormdingler/usbc_config.c index 73666d087c..5d30adb6e2 100644 --- a/board/wormdingler/usbc_config.c +++ b/board/wormdingler/usbc_config.c @@ -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. */ diff --git a/board/yorp/battery.c b/board/yorp/battery.c index 1d8ec33d3d..d391942ab3 100644 --- a/board/yorp/battery.c +++ b/board/yorp/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/yorp/board.c b/board/yorp/board.c index fb04dc1e75..475ced087c 100644 --- a/board/yorp/board.c +++ b/board/yorp/board.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/yorp/board.h b/board/yorp/board.h index 25651a902f..8ffb6d2781 100644 --- a/board/yorp/board.h +++ b/board/yorp/board.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/yorp/build.mk b/board/yorp/build.mk index 3d04b75731..998a65a3de 100644 --- a/board/yorp/build.mk +++ b/board/yorp/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2018 The Chromium OS Authors. All rights reserved. +# Copyright 2018 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/yorp/ec.tasklist b/board/yorp/ec.tasklist index d98db145e7..977b8b01be 100644 --- a/board/yorp/ec.tasklist +++ b/board/yorp/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/yorp/gpio.inc b/board/yorp/gpio.inc index 9edd6107c6..b3dbf60ab8 100644 --- a/board/yorp/gpio.inc +++ b/board/yorp/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2018 The Chromium OS Authors. All rights reserved. + * Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/yorp/led.c b/board/yorp/led.c index b9cfc674ee..f8b9898046 100644 --- a/board/yorp/led.c +++ b/board/yorp/led.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/board/zinger/board.c b/board/zinger/board.c index 2be1e3e544..41d91ab438 100644 --- a/board/zinger/board.c +++ b/board/zinger/board.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/zinger/board.h b/board/zinger/board.h index 8d706af32f..1ca83354bc 100644 --- a/board/zinger/board.h +++ b/board/zinger/board.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/zinger/build.mk b/board/zinger/build.mk index c85eb9df4b..da1878efe9 100644 --- a/board/zinger/build.mk +++ b/board/zinger/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2014 The Chromium OS Authors. All rights reserved. +# Copyright 2014 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/board/zinger/ec.irqlist b/board/zinger/ec.irqlist index 690fa950fc..186c0f6338 100644 --- a/board/zinger/ec.irqlist +++ b/board/zinger/ec.irqlist @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/zinger/ec.tasklist b/board/zinger/ec.tasklist index 091eb90a22..89d9ffab76 100644 --- a/board/zinger/ec.tasklist +++ b/board/zinger/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/zinger/gpio.inc b/board/zinger/gpio.inc index 6b96e08645..65e3066695 100644 --- a/board/zinger/gpio.inc +++ b/board/zinger/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/board/zinger/hardware.c b/board/zinger/hardware.c index c5542750e8..0ad5b7ff94 100644 --- a/board/zinger/hardware.c +++ b/board/zinger/hardware.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/zinger/runtime.c b/board/zinger/runtime.c index b59dd81225..19c33c7f0f 100644 --- a/board/zinger/runtime.c +++ b/board/zinger/runtime.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/zinger/usb_pd_config.h b/board/zinger/usb_pd_config.h index 2bbc720108..c3d86e2c2b 100644 --- a/board/zinger/usb_pd_config.h +++ b/board/zinger/usb_pd_config.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/board/zinger/usb_pd_pdo.c b/board/zinger/usb_pd_pdo.c index 11e5bcb8d3..36be87bd78 100644 --- a/board/zinger/usb_pd_pdo.c +++ b/board/zinger/usb_pd_pdo.c @@ -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. */ diff --git a/board/zinger/usb_pd_pdo.h b/board/zinger/usb_pd_pdo.h index 07b7129202..45f6668077 100644 --- a/board/zinger/usb_pd_pdo.h +++ b/board/zinger/usb_pd_pdo.h @@ -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. */ diff --git a/board/zinger/usb_pd_policy.c b/board/zinger/usb_pd_policy.c index 084b7fc051..7f60ce8772 100644 --- a/board/zinger/usb_pd_policy.c +++ b/board/zinger/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/builtin/assert.h b/builtin/assert.h index 7008e24976..b667a0d2a2 100644 --- a/builtin/assert.h +++ b/builtin/assert.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/builtin/build.mk b/builtin/build.mk index c4ec975e6b..6613bfec05 100644 --- a/builtin/build.mk +++ b/builtin/build.mk @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/builtin/ctype.h b/builtin/ctype.h index 682cc05694..8844adca67 100644 --- a/builtin/ctype.h +++ b/builtin/ctype.h @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/builtin/endian.h b/builtin/endian.h index 88fd39d558..0220836dca 100644 --- a/builtin/endian.h +++ b/builtin/endian.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/builtin/inttypes.h b/builtin/inttypes.h index c442fbe499..1ef305548b 100644 --- a/builtin/inttypes.h +++ b/builtin/inttypes.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/builtin/limits.h b/builtin/limits.h index e5deb70291..0e185614ae 100644 --- a/builtin/limits.h +++ b/builtin/limits.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/builtin/math.h b/builtin/math.h index 9292ac8b34..c015d9d18d 100644 --- a/builtin/math.h +++ b/builtin/math.h @@ -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. */ diff --git a/builtin/stdarg.h b/builtin/stdarg.h index babd96887a..5bf0aa8aa2 100644 --- a/builtin/stdarg.h +++ b/builtin/stdarg.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/builtin/stdbool.h b/builtin/stdbool.h index fa6c896acb..72d4927484 100644 --- a/builtin/stdbool.h +++ b/builtin/stdbool.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/builtin/stddef.h b/builtin/stddef.h index d93a8c7f9f..9e69ba55ad 100644 --- a/builtin/stddef.h +++ b/builtin/stddef.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/builtin/stdint.h b/builtin/stdint.h index f47c9e6422..5a107e1730 100644 --- a/builtin/stdint.h +++ b/builtin/stdint.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/builtin/stdio.h b/builtin/stdio.h index b8b6949c45..7536499feb 100644 --- a/builtin/stdio.h +++ b/builtin/stdio.h @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/builtin/stdlib.c b/builtin/stdlib.c index b3229f4f63..0d654f0395 100644 --- a/builtin/stdlib.c +++ b/builtin/stdlib.c @@ -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. */ diff --git a/builtin/stdlib.h b/builtin/stdlib.h index fa62a18589..fcce72ee8d 100644 --- a/builtin/stdlib.h +++ b/builtin/stdlib.h @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/builtin/stdnoreturn.h b/builtin/stdnoreturn.h index a6fb13d3f4..078a0d6698 100644 --- a/builtin/stdnoreturn.h +++ b/builtin/stdnoreturn.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/builtin/string.h b/builtin/string.h index 1e4c45b082..742d75a478 100644 --- a/builtin/string.h +++ b/builtin/string.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/builtin/strings.h b/builtin/strings.h index 767706d579..cbcc858c36 100644 --- a/builtin/strings.h +++ b/builtin/strings.h @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/builtin/sys/types.h b/builtin/sys/types.h index 57dd4ac479..01fc1a7749 100644 --- a/builtin/sys/types.h +++ b/builtin/sys/types.h @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/builtin/time.h b/builtin/time.h index a069ae18c9..36b07b4721 100644 --- a/builtin/time.h +++ b/builtin/time.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/host/adc_chip.h b/chip/host/adc_chip.h index 8754be266e..cd55e1b5fb 100644 --- a/chip/host/adc_chip.h +++ b/chip/host/adc_chip.h @@ -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. */ diff --git a/chip/host/build.mk b/chip/host/build.mk index ce4fc8f704..b4a75cf3c6 100644 --- a/chip/host/build.mk +++ b/chip/host/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2013 The Chromium OS Authors. All rights reserved. +# Copyright 2013 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/chip/host/clock.c b/chip/host/clock.c index 2c3c48661e..4f90067f3a 100644 --- a/chip/host/clock.c +++ b/chip/host/clock.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/host/config_chip.h b/chip/host/config_chip.h index 7e45177401..323fb83d33 100644 --- a/chip/host/config_chip.h +++ b/chip/host/config_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/host/flash.c b/chip/host/flash.c index 7f20a80939..209489162c 100644 --- a/chip/host/flash.c +++ b/chip/host/flash.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/host/gpio.c b/chip/host/gpio.c index 5d1bd78e79..b74bec52a1 100644 --- a/chip/host/gpio.c +++ b/chip/host/gpio.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/host/host_test.h b/chip/host/host_test.h index 2a960714b9..39516f751e 100644 --- a/chip/host/host_test.h +++ b/chip/host/host_test.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/host/i2c.c b/chip/host/i2c.c index 32c138cf0f..3fddbbbac5 100644 --- a/chip/host/i2c.c +++ b/chip/host/i2c.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/host/keyboard_raw.c b/chip/host/keyboard_raw.c index 3e1f755f7f..47b9a7dda0 100644 --- a/chip/host/keyboard_raw.c +++ b/chip/host/keyboard_raw.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/host/lpc.c b/chip/host/lpc.c index dd64be9275..78619c5b75 100644 --- a/chip/host/lpc.c +++ b/chip/host/lpc.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/host/persistence.c b/chip/host/persistence.c index d4535e3512..4d8ef09df1 100644 --- a/chip/host/persistence.c +++ b/chip/host/persistence.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/host/persistence.h b/chip/host/persistence.h index a473f8dfb0..479788815f 100644 --- a/chip/host/persistence.h +++ b/chip/host/persistence.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/host/reboot.c b/chip/host/reboot.c index dcda65f455..24d90d943d 100644 --- a/chip/host/reboot.c +++ b/chip/host/reboot.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/host/reboot.h b/chip/host/reboot.h index 485e0b167b..1541e42334 100644 --- a/chip/host/reboot.h +++ b/chip/host/reboot.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/host/registers.h b/chip/host/registers.h index 7347ce04d3..3c75686b40 100644 --- a/chip/host/registers.h +++ b/chip/host/registers.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/host/spi_controller.c b/chip/host/spi_controller.c index c7afea5d39..a1df53d935 100644 --- a/chip/host/spi_controller.c +++ b/chip/host/spi_controller.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/host/system.c b/chip/host/system.c index 511c6d29de..4a480faf77 100644 --- a/chip/host/system.c +++ b/chip/host/system.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/host/trng.c b/chip/host/trng.c index e2c13d7d14..ef3df1ad5f 100644 --- a/chip/host/trng.c +++ b/chip/host/trng.c @@ -1,5 +1,5 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/host/uart.c b/chip/host/uart.c index cc40e516fa..9e70a6005c 100644 --- a/chip/host/uart.c +++ b/chip/host/uart.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/host/usb_pd_phy.c b/chip/host/usb_pd_phy.c index 1543418249..aa5f022f3e 100644 --- a/chip/host/usb_pd_phy.c +++ b/chip/host/usb_pd_phy.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/ish/aontaskfw/ipapg.S b/chip/ish/aontaskfw/ipapg.S index f0d3f8c554..305b9a0fb6 100755 --- a/chip/ish/aontaskfw/ipapg.S +++ b/chip/ish/aontaskfw/ipapg.S @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/ish/aontaskfw/ish_aon_defs.h b/chip/ish/aontaskfw/ish_aon_defs.h index 3cc3a491c0..0b3990100a 100644 --- a/chip/ish/aontaskfw/ish_aon_defs.h +++ b/chip/ish/aontaskfw/ish_aon_defs.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/ish/aontaskfw/ish_aon_share.h b/chip/ish/aontaskfw/ish_aon_share.h index 9fa4239128..b986150b73 100644 --- a/chip/ish/aontaskfw/ish_aon_share.h +++ b/chip/ish/aontaskfw/ish_aon_share.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/ish/aontaskfw/ish_aontask.c b/chip/ish/aontaskfw/ish_aontask.c index 0e5833eeba..d167f3f5df 100644 --- a/chip/ish/aontaskfw/ish_aontask.c +++ b/chip/ish/aontaskfw/ish_aontask.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/ish/aontaskfw/ish_aontask.lds.S b/chip/ish/aontaskfw/ish_aontask.lds.S index ca5f54f705..306beef5e9 100644 --- a/chip/ish/aontaskfw/ish_aontask.lds.S +++ b/chip/ish/aontaskfw/ish_aontask.lds.S @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/ish/build.mk b/chip/ish/build.mk index 8072a20791..3777f9f4ce 100644 --- a/chip/ish/build.mk +++ b/chip/ish/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2016 The Chromium OS Authors. All rights reserved. +# Copyright 2016 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/chip/ish/clock.c b/chip/ish/clock.c index f442da7370..e46c4278b7 100644 --- a/chip/ish/clock.c +++ b/chip/ish/clock.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/ish/config_chip.h b/chip/ish/config_chip.h index 19de517099..b76c302f4e 100644 --- a/chip/ish/config_chip.h +++ b/chip/ish/config_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/ish/config_flash_layout.h b/chip/ish/config_flash_layout.h index 100d009d8e..4e4b7ad90b 100644 --- a/chip/ish/config_flash_layout.h +++ b/chip/ish/config_flash_layout.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/ish/dma.c b/chip/ish/dma.c index e94909ea87..48a27a0463 100644 --- a/chip/ish/dma.c +++ b/chip/ish/dma.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/ish/flash.c b/chip/ish/flash.c index 384a813c56..c9c4a132d9 100644 --- a/chip/ish/flash.c +++ b/chip/ish/flash.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/ish/gpio.c b/chip/ish/gpio.c index 110630a01c..287e7a375b 100644 --- a/chip/ish/gpio.c +++ b/chip/ish/gpio.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/ish/hbm.h b/chip/ish/hbm.h index bce3c37c36..d666f748c8 100644 --- a/chip/ish/hbm.h +++ b/chip/ish/hbm.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/ish/heci.c b/chip/ish/heci.c index c0ba042512..6f99a486e7 100644 --- a/chip/ish/heci.c +++ b/chip/ish/heci.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/ish/heci_client.h b/chip/ish/heci_client.h index 97fbfb319f..951b82c6d9 100644 --- a/chip/ish/heci_client.h +++ b/chip/ish/heci_client.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/ish/hid_device.h b/chip/ish/hid_device.h index 76cd028eef..ba7722f5bb 100644 --- a/chip/ish/hid_device.h +++ b/chip/ish/hid_device.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/ish/hid_subsys.c b/chip/ish/hid_subsys.c index 7f4c780f1f..555af9046a 100644 --- a/chip/ish/hid_subsys.c +++ b/chip/ish/hid_subsys.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/ish/host_command_heci.c b/chip/ish/host_command_heci.c index cec72063b4..ede615804c 100644 --- a/chip/ish/host_command_heci.c +++ b/chip/ish/host_command_heci.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/ish/hpet.h b/chip/ish/hpet.h index 293c1fe6f2..7438f42949 100644 --- a/chip/ish/hpet.h +++ b/chip/ish/hpet.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/ish/hwtimer.c b/chip/ish/hwtimer.c index b4bb020d39..57049a63b3 100644 --- a/chip/ish/hwtimer.c +++ b/chip/ish/hwtimer.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/ish/i2c.c b/chip/ish/i2c.c index 7ed0b92cc2..e26bcd70e5 100644 --- a/chip/ish/i2c.c +++ b/chip/ish/i2c.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/ish/ipc_heci.c b/chip/ish/ipc_heci.c index bd9b170f29..1fd81e3d3f 100644 --- a/chip/ish/ipc_heci.c +++ b/chip/ish/ipc_heci.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/ish/ipc_heci.h b/chip/ish/ipc_heci.h index 23ca29f265..f9372aefa3 100644 --- a/chip/ish/ipc_heci.h +++ b/chip/ish/ipc_heci.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/ish/ish_dma.h b/chip/ish/ish_dma.h index 2c76c7d319..fb9c4f4f06 100644 --- a/chip/ish/ish_dma.h +++ b/chip/ish/ish_dma.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/ish/ish_fwst.h b/chip/ish/ish_fwst.h index 2782ac3af1..999546ca34 100644 --- a/chip/ish/ish_fwst.h +++ b/chip/ish/ish_fwst.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/ish/ish_i2c.h b/chip/ish/ish_i2c.h index 1c797399d0..c24f4e0cdc 100644 --- a/chip/ish/ish_i2c.h +++ b/chip/ish/ish_i2c.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/ish/ish_persistent_data.c b/chip/ish/ish_persistent_data.c index be74960cb0..149acaeade 100644 --- a/chip/ish/ish_persistent_data.c +++ b/chip/ish/ish_persistent_data.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/ish/ish_persistent_data.h b/chip/ish/ish_persistent_data.h index 0fd973e1bb..60aa6b94ae 100644 --- a/chip/ish/ish_persistent_data.h +++ b/chip/ish/ish_persistent_data.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/ish/power_mgt.c b/chip/ish/power_mgt.c index 3f416f2f65..83ef0fc91b 100644 --- a/chip/ish/power_mgt.c +++ b/chip/ish/power_mgt.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/ish/power_mgt.h b/chip/ish/power_mgt.h index 1b6131b321..851529ffb1 100644 --- a/chip/ish/power_mgt.h +++ b/chip/ish/power_mgt.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/ish/registers.h b/chip/ish/registers.h index d50987b5c3..bdd04a7cb2 100644 --- a/chip/ish/registers.h +++ b/chip/ish/registers.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/ish/system.c b/chip/ish/system.c index 0f76e17f5e..22af124cd9 100644 --- a/chip/ish/system.c +++ b/chip/ish/system.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/ish/system_state.h b/chip/ish/system_state.h index 66ccd80b58..bcffcf49ee 100644 --- a/chip/ish/system_state.h +++ b/chip/ish/system_state.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/ish/system_state_subsys.c b/chip/ish/system_state_subsys.c index 5c17ac3585..bfc120ff9b 100644 --- a/chip/ish/system_state_subsys.c +++ b/chip/ish/system_state_subsys.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/ish/uart.c b/chip/ish/uart.c index f292b34b2e..b1c9493869 100644 --- a/chip/ish/uart.c +++ b/chip/ish/uart.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/ish/uart_defs.h b/chip/ish/uart_defs.h index 2953f80b09..1fc36b7adc 100644 --- a/chip/ish/uart_defs.h +++ b/chip/ish/uart_defs.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/ish/util/pack_ec.py b/chip/ish/util/pack_ec.py index 3f55d61a1e..7f381005f0 100755 --- a/chip/ish/util/pack_ec.py +++ b/chip/ish/util/pack_ec.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*-" -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chip/ish/watchdog.c b/chip/ish/watchdog.c index 81ede92d07..7b32133619 100644 --- a/chip/ish/watchdog.c +++ b/chip/ish/watchdog.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/it83xx/adc.c b/chip/it83xx/adc.c index 991edafa90..9f9fa27f41 100644 --- a/chip/it83xx/adc.c +++ b/chip/it83xx/adc.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/it83xx/adc_chip.h b/chip/it83xx/adc_chip.h index 3656aec001..99e84624e0 100644 --- a/chip/it83xx/adc_chip.h +++ b/chip/it83xx/adc_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/it83xx/build.mk b/chip/it83xx/build.mk index 888bc92121..afa9b193f5 100644 --- a/chip/it83xx/build.mk +++ b/chip/it83xx/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2013 The Chromium OS Authors. All rights reserved. +# Copyright 2013 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/chip/it83xx/clock.c b/chip/it83xx/clock.c index 2889df7752..ab1da3b68a 100644 --- a/chip/it83xx/clock.c +++ b/chip/it83xx/clock.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/it83xx/config_chip.h b/chip/it83xx/config_chip.h index 4ed466f294..537069972f 100644 --- a/chip/it83xx/config_chip.h +++ b/chip/it83xx/config_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/it83xx/config_chip_it8320.h b/chip/it83xx/config_chip_it8320.h index 5dfcbce1a6..0e5c48c96a 100644 --- a/chip/it83xx/config_chip_it8320.h +++ b/chip/it83xx/config_chip_it8320.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/it83xx/config_chip_it8xxx2.h b/chip/it83xx/config_chip_it8xxx2.h index e754c5ff6e..cbbbd0bd55 100644 --- a/chip/it83xx/config_chip_it8xxx2.h +++ b/chip/it83xx/config_chip_it8xxx2.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/it83xx/dac.c b/chip/it83xx/dac.c index 9057376082..2e563f7557 100644 --- a/chip/it83xx/dac.c +++ b/chip/it83xx/dac.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/it83xx/dac_chip.h b/chip/it83xx/dac_chip.h index 12e16eea0a..07e44e2e79 100644 --- a/chip/it83xx/dac_chip.h +++ b/chip/it83xx/dac_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/it83xx/ec2i.c b/chip/it83xx/ec2i.c index d56eefc165..52f96b95d7 100644 --- a/chip/it83xx/ec2i.c +++ b/chip/it83xx/ec2i.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/it83xx/ec2i_chip.h b/chip/it83xx/ec2i_chip.h index 248b3bdcae..73eeaa31f7 100644 --- a/chip/it83xx/ec2i_chip.h +++ b/chip/it83xx/ec2i_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/it83xx/espi.c b/chip/it83xx/espi.c index a67b3096ea..bf52b87404 100644 --- a/chip/it83xx/espi.c +++ b/chip/it83xx/espi.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/it83xx/fan.c b/chip/it83xx/fan.c index 02acfbaf88..b8b805453e 100644 --- a/chip/it83xx/fan.c +++ b/chip/it83xx/fan.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/it83xx/flash.c b/chip/it83xx/flash.c index 5396a29e58..25aefa2f66 100644 --- a/chip/it83xx/flash.c +++ b/chip/it83xx/flash.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/it83xx/flash_chip.h b/chip/it83xx/flash_chip.h index c1262da116..c1cb44bdf2 100644 --- a/chip/it83xx/flash_chip.h +++ b/chip/it83xx/flash_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/it83xx/gpio.c b/chip/it83xx/gpio.c index 4b6bfaee57..2b1b8283be 100644 --- a/chip/it83xx/gpio.c +++ b/chip/it83xx/gpio.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/it83xx/hwtimer.c b/chip/it83xx/hwtimer.c index 8a49943559..b9add82b5a 100644 --- a/chip/it83xx/hwtimer.c +++ b/chip/it83xx/hwtimer.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/it83xx/hwtimer_chip.h b/chip/it83xx/hwtimer_chip.h index cced9a1490..675c49cc40 100644 --- a/chip/it83xx/hwtimer_chip.h +++ b/chip/it83xx/hwtimer_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/it83xx/i2c.c b/chip/it83xx/i2c.c index abc0ed1912..701f2a9576 100644 --- a/chip/it83xx/i2c.c +++ b/chip/it83xx/i2c.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/it83xx/i2c_peripheral.c b/chip/it83xx/i2c_peripheral.c index e12173c690..80fea907fd 100644 --- a/chip/it83xx/i2c_peripheral.c +++ b/chip/it83xx/i2c_peripheral.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/it83xx/intc.c b/chip/it83xx/intc.c index 45fff30c1e..89e5d70a01 100644 --- a/chip/it83xx/intc.c +++ b/chip/it83xx/intc.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/it83xx/intc.h b/chip/it83xx/intc.h index 843f64e2cb..43adb3784d 100644 --- a/chip/it83xx/intc.h +++ b/chip/it83xx/intc.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/it83xx/irq.c b/chip/it83xx/irq.c index 0ba31c6d0c..21e8070f06 100644 --- a/chip/it83xx/irq.c +++ b/chip/it83xx/irq.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/it83xx/it83xx_fpu.S b/chip/it83xx/it83xx_fpu.S index 5265eb7253..a75145c835 100644 --- a/chip/it83xx/it83xx_fpu.S +++ b/chip/it83xx/it83xx_fpu.S @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/it83xx/keyboard_raw.c b/chip/it83xx/keyboard_raw.c index a06856fd82..0d2f048deb 100644 --- a/chip/it83xx/keyboard_raw.c +++ b/chip/it83xx/keyboard_raw.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/it83xx/kmsc_chip.h b/chip/it83xx/kmsc_chip.h index cf4169a1c4..84f781c0a6 100644 --- a/chip/it83xx/kmsc_chip.h +++ b/chip/it83xx/kmsc_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/it83xx/lpc.c b/chip/it83xx/lpc.c index d9b869d571..03606c6085 100644 --- a/chip/it83xx/lpc.c +++ b/chip/it83xx/lpc.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -138,7 +138,7 @@ static void lpc_generate_smi(void) { #ifdef CONFIG_HOST_INTERFACE_ESPI espi_vw_set_wire(VW_SMI_L, 0); - udelay(CONFIG_ESPI_DEFAULT_VW_WIDTH_US); + udelay(CONFIG_HOST_INTERFACE_ESPI_DEFAULT_VW_WIDTH_US); espi_vw_set_wire(VW_SMI_L, 1); #else gpio_set_level(GPIO_PCH_SMI_L, 0); @@ -151,7 +151,7 @@ static void lpc_generate_sci(void) { #ifdef CONFIG_HOST_INTERFACE_ESPI espi_vw_set_wire(VW_SCI_L, 0); - udelay(CONFIG_ESPI_DEFAULT_VW_WIDTH_US); + udelay(CONFIG_HOST_INTERFACE_ESPI_DEFAULT_VW_WIDTH_US); espi_vw_set_wire(VW_SCI_L, 1); #else gpio_set_level(GPIO_PCH_SCI_L, 0); diff --git a/chip/it83xx/peci.c b/chip/it83xx/peci.c index 4eb97b3853..e5f172ce80 100644 --- a/chip/it83xx/peci.c +++ b/chip/it83xx/peci.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/it83xx/pwm.c b/chip/it83xx/pwm.c index 6c80c6bf2e..07165dea77 100644 --- a/chip/it83xx/pwm.c +++ b/chip/it83xx/pwm.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/it83xx/pwm_chip.h b/chip/it83xx/pwm_chip.h index 4e8aba1c62..03435d03f6 100644 --- a/chip/it83xx/pwm_chip.h +++ b/chip/it83xx/pwm_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/it83xx/registers.h b/chip/it83xx/registers.h index 1a33cfea32..025daeb61a 100644 --- a/chip/it83xx/registers.h +++ b/chip/it83xx/registers.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/it83xx/spi.c b/chip/it83xx/spi.c index c5b3c1c7cb..c172e9fca9 100644 --- a/chip/it83xx/spi.c +++ b/chip/it83xx/spi.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/it83xx/spi_controller.c b/chip/it83xx/spi_controller.c index 73fa2777e1..aaab27e138 100644 --- a/chip/it83xx/spi_controller.c +++ b/chip/it83xx/spi_controller.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/it83xx/system.c b/chip/it83xx/system.c index 28a2de1b56..09c5678cd4 100644 --- a/chip/it83xx/system.c +++ b/chip/it83xx/system.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/it83xx/uart.c b/chip/it83xx/uart.c index 661e0724b3..6635c5966e 100644 --- a/chip/it83xx/uart.c +++ b/chip/it83xx/uart.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/it83xx/watchdog.c b/chip/it83xx/watchdog.c index e88e2e46bc..b1e45127f0 100644 --- a/chip/it83xx/watchdog.c +++ b/chip/it83xx/watchdog.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/max32660/build.mk b/chip/max32660/build.mk index ea1ea6c330..e0db8bc646 100644 --- a/chip/max32660/build.mk +++ b/chip/max32660/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/chip/max32660/clock_chip.c b/chip/max32660/clock_chip.c index 3dcb4bee1b..93a5f862d8 100644 --- a/chip/max32660/clock_chip.c +++ b/chip/max32660/clock_chip.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/max32660/config_chip.h b/chip/max32660/config_chip.h index bdaa71beca..9fa939a918 100644 --- a/chip/max32660/config_chip.h +++ b/chip/max32660/config_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/max32660/flash_chip.c b/chip/max32660/flash_chip.c index 9a17d6bb3e..eb702799b0 100644 --- a/chip/max32660/flash_chip.c +++ b/chip/max32660/flash_chip.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/max32660/flc_regs.h b/chip/max32660/flc_regs.h index 5603d55d5a..fb7691e759 100644 --- a/chip/max32660/flc_regs.h +++ b/chip/max32660/flc_regs.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/max32660/gcr_regs.h b/chip/max32660/gcr_regs.h index 84fd694bdf..bed6cf4550 100644 --- a/chip/max32660/gcr_regs.h +++ b/chip/max32660/gcr_regs.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/max32660/gpio_chip.c b/chip/max32660/gpio_chip.c index e88069a5a6..cc54f9055f 100644 --- a/chip/max32660/gpio_chip.c +++ b/chip/max32660/gpio_chip.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/max32660/gpio_regs.h b/chip/max32660/gpio_regs.h index a6b7997d5f..70b706b2c0 100644 --- a/chip/max32660/gpio_regs.h +++ b/chip/max32660/gpio_regs.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/max32660/hwtimer_chip.c b/chip/max32660/hwtimer_chip.c index 36a997ca8e..a6469ae795 100644 --- a/chip/max32660/hwtimer_chip.c +++ b/chip/max32660/hwtimer_chip.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/max32660/i2c_chip.c b/chip/max32660/i2c_chip.c index 7120ff276d..bb116f4d8a 100644 --- a/chip/max32660/i2c_chip.c +++ b/chip/max32660/i2c_chip.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/max32660/i2c_regs.h b/chip/max32660/i2c_regs.h index e57f3b2fa3..4d8daf63c7 100644 --- a/chip/max32660/i2c_regs.h +++ b/chip/max32660/i2c_regs.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/max32660/icc_regs.h b/chip/max32660/icc_regs.h index ed62f74f3c..b2dbc75ec3 100644 --- a/chip/max32660/icc_regs.h +++ b/chip/max32660/icc_regs.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/max32660/pwrseq_regs.h b/chip/max32660/pwrseq_regs.h index 77971adabc..e42ab8fd9d 100644 --- a/chip/max32660/pwrseq_regs.h +++ b/chip/max32660/pwrseq_regs.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/max32660/registers.h b/chip/max32660/registers.h index 6df9b47dd8..72118bf744 100644 --- a/chip/max32660/registers.h +++ b/chip/max32660/registers.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/max32660/system_chip.c b/chip/max32660/system_chip.c index 07127dc8c5..8679881102 100644 --- a/chip/max32660/system_chip.c +++ b/chip/max32660/system_chip.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/max32660/tmr_regs.h b/chip/max32660/tmr_regs.h index e0e9b9965c..ab3ac5c5ed 100644 --- a/chip/max32660/tmr_regs.h +++ b/chip/max32660/tmr_regs.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/max32660/uart_chip.c b/chip/max32660/uart_chip.c index 4be5936e0c..87ba59e629 100644 --- a/chip/max32660/uart_chip.c +++ b/chip/max32660/uart_chip.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/max32660/uart_regs.h b/chip/max32660/uart_regs.h index dd3c3c3bb6..64d4ac5654 100644 --- a/chip/max32660/uart_regs.h +++ b/chip/max32660/uart_regs.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/max32660/wdt_chip.c b/chip/max32660/wdt_chip.c index 619fb6d25e..03cd2bd009 100644 --- a/chip/max32660/wdt_chip.c +++ b/chip/max32660/wdt_chip.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/max32660/wdt_regs.h b/chip/max32660/wdt_regs.h index 0ca8b0836c..440e8e8b0d 100644 --- a/chip/max32660/wdt_regs.h +++ b/chip/max32660/wdt_regs.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mchp/adc.c b/chip/mchp/adc.c index fb7b332d08..621fe1f3be 100644 --- a/chip/mchp/adc.c +++ b/chip/mchp/adc.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mchp/adc_chip.h b/chip/mchp/adc_chip.h index 0f14d5a459..fa60efa960 100644 --- a/chip/mchp/adc_chip.h +++ b/chip/mchp/adc_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mchp/build.mk b/chip/mchp/build.mk index 0ffb3a7c4a..87e37b91e5 100644 --- a/chip/mchp/build.mk +++ b/chip/mchp/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2013 The Chromium OS Authors. All rights reserved. +# Copyright 2013 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/chip/mchp/clock.c b/chip/mchp/clock.c index 336c9d1363..4701d43b1f 100644 --- a/chip/mchp/clock.c +++ b/chip/mchp/clock.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mchp/clock_chip.h b/chip/mchp/clock_chip.h index 25f05928ee..4b851aa2bd 100644 --- a/chip/mchp/clock_chip.h +++ b/chip/mchp/clock_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mchp/config_chip.h b/chip/mchp/config_chip.h index fed77a010c..4d5836ef42 100644 --- a/chip/mchp/config_chip.h +++ b/chip/mchp/config_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mchp/config_flash_layout.h b/chip/mchp/config_flash_layout.h index cd0d115473..f495f65465 100644 --- a/chip/mchp/config_flash_layout.h +++ b/chip/mchp/config_flash_layout.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mchp/dma.c b/chip/mchp/dma.c index 2a99be3b41..8a091286a7 100644 --- a/chip/mchp/dma.c +++ b/chip/mchp/dma.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mchp/dma_chip.h b/chip/mchp/dma_chip.h index 99f9fda90f..6f569a1dc7 100644 --- a/chip/mchp/dma_chip.h +++ b/chip/mchp/dma_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/mchp/espi.c b/chip/mchp/espi.c index 6d98eba913..371cf09c5e 100644 --- a/chip/mchp/espi.c +++ b/chip/mchp/espi.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -44,22 +44,22 @@ #endif /* Default config to use maximum frequency */ -#ifndef CONFIG_HOSTCMD_ESPI_EC_MAX_FREQ +#ifndef CONFIG_HOST_INTERFACE_ESPI_EC_MAX_FREQ #if defined(CHIP_FAMILY_MEC172X) -#define CONFIG_HOSTCMD_ESPI_EC_MAX_FREQ MCHP_ESPI_CAP1_MAX_FREQ_66M +#define CONFIG_HOST_INTERFACE_ESPI_EC_MAX_FREQ MCHP_ESPI_CAP1_MAX_FREQ_66M #else -#define CONFIG_HOSTCMD_ESPI_EC_MAX_FREQ MCHP_ESPI_CAP1_MAX_FREQ_50M +#define CONFIG_HOST_INTERFACE_ESPI_EC_MAX_FREQ MCHP_ESPI_CAP1_MAX_FREQ_50M #endif #endif /* Default config to support all modes */ -#ifndef CONFIG_HOSTCMD_ESPI_EC_MODE -#define CONFIG_HOSTCMD_ESPI_EC_MODE MCHP_ESPI_CAP1_ALL_MODE +#ifndef CONFIG_HOST_INTERFACE_ESPI_EC_MODE +#define CONFIG_HOST_INTERFACE_ESPI_EC_MODE MCHP_ESPI_CAP1_ALL_MODE #endif /* Default config to support all channels */ -#ifndef CONFIG_HOSTCMD_ESPI_EC_CHAN_BITMAP -#define CONFIG_HOSTCMD_ESPI_EC_CHAN_BITMAP MCHP_ESPI_CAP0_ALL_CHAN_SUPP +#ifndef CONFIG_HOST_INTERFACE_ESPI_EC_CHAN_BITMAP +#define CONFIG_HOST_INTERFACE_ESPI_EC_CHAN_BITMAP MCHP_ESPI_CAP0_ALL_CHAN_SUPP #endif /* * eSPI slave to master virtual wire pulse timeout. @@ -695,7 +695,7 @@ int espi_vw_pulse_wire(enum espi_vw_signal signal, int pulse_level) return rc; /* Ensure a minimum pulse width is met. */ - udelay(CONFIG_ESPI_DEFAULT_VW_WIDTH_US); + udelay(CONFIG_HOST_INTERFACE_ESPI_DEFAULT_VW_WIDTH_US); /* drive to requested active state */ rc = espi_vw_s2m_set_w4m(ridx, src_num, level); @@ -1335,14 +1335,15 @@ void espi_init(void) gpio_config_module(MODULE_LPC, 1); /* Set channel */ - MCHP_ESPI_IO_CAP0 = CONFIG_HOSTCMD_ESPI_EC_CHAN_BITMAP; + MCHP_ESPI_IO_CAP0 = CONFIG_HOST_INTERFACE_ESPI_EC_CHAN_BITMAP; /* Set eSPI frequency & mode */ MCHP_ESPI_IO_CAP1 = (MCHP_ESPI_IO_CAP1 & (~(MCHP_ESPI_CAP1_MAX_FREQ_MASK | MCHP_ESPI_CAP1_IO_MASK))) | - CONFIG_HOSTCMD_ESPI_EC_MAX_FREQ | - (CONFIG_HOSTCMD_ESPI_EC_MODE << MCHP_ESPI_CAP1_IO_BITPOS); + CONFIG_HOST_INTERFACE_ESPI_EC_MAX_FREQ | + (CONFIG_HOST_INTERFACE_ESPI_EC_MODE + << MCHP_ESPI_CAP1_IO_BITPOS); #ifdef CONFIG_HOST_INTERFACE_ESPI MCHP_ESPI_IO_PLTRST_SRC = MCHP_ESPI_PLTRST_SRC_VW; diff --git a/chip/mchp/fan.c b/chip/mchp/fan.c index b5023c13d3..3f61cb4d2f 100644 --- a/chip/mchp/fan.c +++ b/chip/mchp/fan.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mchp/flash.c b/chip/mchp/flash.c index fff94cc9ec..4b0e407fb2 100644 --- a/chip/mchp/flash.c +++ b/chip/mchp/flash.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mchp/gpio.c b/chip/mchp/gpio.c index 2bae778247..a3cab86fcc 100644 --- a/chip/mchp/gpio.c +++ b/chip/mchp/gpio.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mchp/gpio_chip.h b/chip/mchp/gpio_chip.h index 53723cfd80..e092669b60 100644 --- a/chip/mchp/gpio_chip.h +++ b/chip/mchp/gpio_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/mchp/gpio_cmds.c b/chip/mchp/gpio_cmds.c index 49756d89a8..927d6d0326 100644 --- a/chip/mchp/gpio_cmds.c +++ b/chip/mchp/gpio_cmds.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mchp/gpspi.c b/chip/mchp/gpspi.c index 963cb3507c..0142fe0e3c 100644 --- a/chip/mchp/gpspi.c +++ b/chip/mchp/gpspi.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mchp/gpspi_chip.h b/chip/mchp/gpspi_chip.h index a231bac806..7c1285b6cf 100644 --- a/chip/mchp/gpspi_chip.h +++ b/chip/mchp/gpspi_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/mchp/hwtimer.c b/chip/mchp/hwtimer.c index 8e6b3f1dda..2e9ff780fb 100644 --- a/chip/mchp/hwtimer.c +++ b/chip/mchp/hwtimer.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mchp/i2c.c b/chip/mchp/i2c.c index edb01a49de..2b21d17dc4 100644 --- a/chip/mchp/i2c.c +++ b/chip/mchp/i2c.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mchp/i2c_chip.h b/chip/mchp/i2c_chip.h index c8ceb98d04..b7109c4c69 100644 --- a/chip/mchp/i2c_chip.h +++ b/chip/mchp/i2c_chip.h @@ -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. */ diff --git a/chip/mchp/keyboard_raw.c b/chip/mchp/keyboard_raw.c index f10cac38b6..daa0c8e64f 100644 --- a/chip/mchp/keyboard_raw.c +++ b/chip/mchp/keyboard_raw.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/mchp/lfw/ec_lfw.c b/chip/mchp/lfw/ec_lfw.c index 6fd21b6c2a..dfd9814e6e 100644 --- a/chip/mchp/lfw/ec_lfw.c +++ b/chip/mchp/lfw/ec_lfw.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/mchp/lfw/ec_lfw.h b/chip/mchp/lfw/ec_lfw.h index 0815531927..2589638954 100644 --- a/chip/mchp/lfw/ec_lfw.h +++ b/chip/mchp/lfw/ec_lfw.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/mchp/lfw/ec_lfw.ld b/chip/mchp/lfw/ec_lfw.ld index 8e8601a5ee..f0071a55e9 100644 --- a/chip/mchp/lfw/ec_lfw.ld +++ b/chip/mchp/lfw/ec_lfw.ld @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/mchp/lfw/ec_lfw_416kb.ld b/chip/mchp/lfw/ec_lfw_416kb.ld index 97be2fe06a..f27d046e7d 100644 --- a/chip/mchp/lfw/ec_lfw_416kb.ld +++ b/chip/mchp/lfw/ec_lfw_416kb.ld @@ -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. * diff --git a/chip/mchp/lfw/gpio.inc b/chip/mchp/lfw/gpio.inc index 598a6044d7..76de618bf3 100644 --- a/chip/mchp/lfw/gpio.inc +++ b/chip/mchp/lfw/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. * diff --git a/chip/mchp/lpc.c b/chip/mchp/lpc.c index a6536bd7f4..4dc60098c0 100644 --- a/chip/mchp/lpc.c +++ b/chip/mchp/lpc.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -108,7 +108,7 @@ static void lpc_generate_sci(void) espi_vw_pulse_wire(VW_SCI_L, 0); #else MCHP_ACPI_PM_STS |= 1; - udelay(CONFIG_ESPI_DEFAULT_VW_WIDTH_US); + udelay(CONFIG_HOST_INTERFACE_ESPI_DEFAULT_VW_WIDTH_US); MCHP_ACPI_PM_STS &= ~1; #endif #endif diff --git a/chip/mchp/lpc_chip.h b/chip/mchp/lpc_chip.h index 96a9542d2b..7d9965f156 100644 --- a/chip/mchp/lpc_chip.h +++ b/chip/mchp/lpc_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mchp/port80.c b/chip/mchp/port80.c index cb36683065..57ceaac8fa 100644 --- a/chip/mchp/port80.c +++ b/chip/mchp/port80.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mchp/pwm.c b/chip/mchp/pwm.c index 0aa8a4701e..d0e88b5175 100644 --- a/chip/mchp/pwm.c +++ b/chip/mchp/pwm.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mchp/pwm_chip.h b/chip/mchp/pwm_chip.h index e17e8e52e9..848656bb03 100644 --- a/chip/mchp/pwm_chip.h +++ b/chip/mchp/pwm_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mchp/qmspi.c b/chip/mchp/qmspi.c index a054abc178..6979bdae6a 100644 --- a/chip/mchp/qmspi.c +++ b/chip/mchp/qmspi.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mchp/qmspi_chip.h b/chip/mchp/qmspi_chip.h index 1795e5e11f..5a66c34e62 100644 --- a/chip/mchp/qmspi_chip.h +++ b/chip/mchp/qmspi_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/mchp/registers-mec152x.h b/chip/mchp/registers-mec152x.h index ee8e7043d1..166ca63310 100644 --- a/chip/mchp/registers-mec152x.h +++ b/chip/mchp/registers-mec152x.h @@ -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. * diff --git a/chip/mchp/registers-mec1701.h b/chip/mchp/registers-mec1701.h index a44b210a34..6894dc4056 100644 --- a/chip/mchp/registers-mec1701.h +++ b/chip/mchp/registers-mec1701.h @@ -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. * diff --git a/chip/mchp/registers-mec172x.h b/chip/mchp/registers-mec172x.h index 20b7f6bdf5..0bd010ac05 100644 --- a/chip/mchp/registers-mec172x.h +++ b/chip/mchp/registers-mec172x.h @@ -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. * diff --git a/chip/mchp/registers.h b/chip/mchp/registers.h index 3272ab88bb..7b541b18da 100644 --- a/chip/mchp/registers.h +++ b/chip/mchp/registers.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/mchp/spi.c b/chip/mchp/spi.c index 34db702f56..195c10d8a6 100644 --- a/chip/mchp/spi.c +++ b/chip/mchp/spi.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mchp/spi_chip.h b/chip/mchp/spi_chip.h index 24ac524478..f8c4c1169c 100644 --- a/chip/mchp/spi_chip.h +++ b/chip/mchp/spi_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/mchp/system.c b/chip/mchp/system.c index 4528eeea06..bb5224c455 100644 --- a/chip/mchp/system.c +++ b/chip/mchp/system.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mchp/tfdp.c b/chip/mchp/tfdp.c index b8d84d8ed6..eb9b903cb5 100644 --- a/chip/mchp/tfdp.c +++ b/chip/mchp/tfdp.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mchp/tfdp_chip.h b/chip/mchp/tfdp_chip.h index e7ee42853e..894bfaf876 100644 --- a/chip/mchp/tfdp_chip.h +++ b/chip/mchp/tfdp_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mchp/uart.c b/chip/mchp/uart.c index 4f40886e24..00bfc77e14 100644 --- a/chip/mchp/uart.c +++ b/chip/mchp/uart.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mchp/util/pack_ec.py b/chip/mchp/util/pack_ec.py index b015db377a..1b0a2e9959 100755 --- a/chip/mchp/util/pack_ec.py +++ b/chip/mchp/util/pack_ec.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# Copyright 2013 The Chromium OS Authors. All rights reserved. +# Copyright 2013 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chip/mchp/util/pack_ec_mec152x.py b/chip/mchp/util/pack_ec_mec152x.py index 1d7df5e9b6..a463a43b6c 100755 --- a/chip/mchp/util/pack_ec_mec152x.py +++ b/chip/mchp/util/pack_ec_mec152x.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# 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. diff --git a/chip/mchp/util/pack_ec_mec172x.py b/chip/mchp/util/pack_ec_mec172x.py index ee14bdb2dc..6bd2db984b 100755 --- a/chip/mchp/util/pack_ec_mec172x.py +++ b/chip/mchp/util/pack_ec_mec172x.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# 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. diff --git a/chip/mchp/watchdog.c b/chip/mchp/watchdog.c index 91fc9f8029..0de4398fdb 100644 --- a/chip/mchp/watchdog.c +++ b/chip/mchp/watchdog.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mec1322/adc.c b/chip/mec1322/adc.c index d925178fe7..8f5df03ee1 100644 --- a/chip/mec1322/adc.c +++ b/chip/mec1322/adc.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mec1322/adc_chip.h b/chip/mec1322/adc_chip.h index a6425d6872..d8ade540a8 100644 --- a/chip/mec1322/adc_chip.h +++ b/chip/mec1322/adc_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mec1322/build.mk b/chip/mec1322/build.mk index 7dadf60c88..7fa324fea1 100644 --- a/chip/mec1322/build.mk +++ b/chip/mec1322/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2013 The Chromium OS Authors. All rights reserved. +# Copyright 2013 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/chip/mec1322/clock.c b/chip/mec1322/clock.c index bb5a295f63..c9fc68d58a 100644 --- a/chip/mec1322/clock.c +++ b/chip/mec1322/clock.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mec1322/config_chip.h b/chip/mec1322/config_chip.h index 4d61174e68..027109cded 100644 --- a/chip/mec1322/config_chip.h +++ b/chip/mec1322/config_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mec1322/config_flash_layout.h b/chip/mec1322/config_flash_layout.h index ae56b49226..3ab03325aa 100644 --- a/chip/mec1322/config_flash_layout.h +++ b/chip/mec1322/config_flash_layout.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mec1322/dma.c b/chip/mec1322/dma.c index 14a8b4173c..20ab3cf9ef 100644 --- a/chip/mec1322/dma.c +++ b/chip/mec1322/dma.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mec1322/fan.c b/chip/mec1322/fan.c index f7ad369a7e..543a9b8ca6 100644 --- a/chip/mec1322/fan.c +++ b/chip/mec1322/fan.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mec1322/flash.c b/chip/mec1322/flash.c index d1f28baca2..4b5b622389 100644 --- a/chip/mec1322/flash.c +++ b/chip/mec1322/flash.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mec1322/gpio.c b/chip/mec1322/gpio.c index ea68549ad1..09b0895376 100644 --- a/chip/mec1322/gpio.c +++ b/chip/mec1322/gpio.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mec1322/hwtimer.c b/chip/mec1322/hwtimer.c index 83390d6f6a..7f2d643d98 100644 --- a/chip/mec1322/hwtimer.c +++ b/chip/mec1322/hwtimer.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mec1322/i2c.c b/chip/mec1322/i2c.c index ab73483bd2..5068aff978 100644 --- a/chip/mec1322/i2c.c +++ b/chip/mec1322/i2c.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mec1322/keyboard_raw.c b/chip/mec1322/keyboard_raw.c index 0f3381d79e..67200b6c04 100644 --- a/chip/mec1322/keyboard_raw.c +++ b/chip/mec1322/keyboard_raw.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/mec1322/lfw/ec_lfw.c b/chip/mec1322/lfw/ec_lfw.c index ea36466606..92d3d2facc 100644 --- a/chip/mec1322/lfw/ec_lfw.c +++ b/chip/mec1322/lfw/ec_lfw.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/mec1322/lfw/ec_lfw.h b/chip/mec1322/lfw/ec_lfw.h index 861057d1a9..cdb0d1cc32 100644 --- a/chip/mec1322/lfw/ec_lfw.h +++ b/chip/mec1322/lfw/ec_lfw.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/mec1322/lfw/ec_lfw.ld b/chip/mec1322/lfw/ec_lfw.ld index 65e17e4941..be3d1dc768 100644 --- a/chip/mec1322/lfw/ec_lfw.ld +++ b/chip/mec1322/lfw/ec_lfw.ld @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/mec1322/lpc.c b/chip/mec1322/lpc.c index 58dc65461c..7dc1d621af 100644 --- a/chip/mec1322/lpc.c +++ b/chip/mec1322/lpc.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -83,7 +83,7 @@ static void lpc_generate_sci(void) gpio_set_level(CONFIG_SCI_GPIO, 1); #else MEC1322_ACPI_PM_STS |= 1; - udelay(CONFIG_ESPI_DEFAULT_VW_WIDTH_US); + udelay(CONFIG_HOST_INTERFACE_ESPI_DEFAULT_VW_WIDTH_US); MEC1322_ACPI_PM_STS &= ~1; #endif } diff --git a/chip/mec1322/port80.c b/chip/mec1322/port80.c index dc6f917ee3..cbc87d8a88 100644 --- a/chip/mec1322/port80.c +++ b/chip/mec1322/port80.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mec1322/pwm.c b/chip/mec1322/pwm.c index 1eea58d2a3..bcb9360638 100644 --- a/chip/mec1322/pwm.c +++ b/chip/mec1322/pwm.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mec1322/pwm_chip.h b/chip/mec1322/pwm_chip.h index 61a17379e0..69d8de094a 100644 --- a/chip/mec1322/pwm_chip.h +++ b/chip/mec1322/pwm_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mec1322/registers.h b/chip/mec1322/registers.h index 055eb74fff..1a758003c9 100644 --- a/chip/mec1322/registers.h +++ b/chip/mec1322/registers.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/mec1322/spi.c b/chip/mec1322/spi.c index 9ca43dbf69..bf3c7a9fb5 100644 --- a/chip/mec1322/spi.c +++ b/chip/mec1322/spi.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mec1322/system.c b/chip/mec1322/system.c index 095308a88b..13fc2d9f81 100644 --- a/chip/mec1322/system.c +++ b/chip/mec1322/system.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mec1322/uart.c b/chip/mec1322/uart.c index d9f94b07f7..a913cf36ab 100644 --- a/chip/mec1322/uart.c +++ b/chip/mec1322/uart.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mec1322/util/pack_ec.py b/chip/mec1322/util/pack_ec.py index 6898548feb..9062621c9a 100755 --- a/chip/mec1322/util/pack_ec.py +++ b/chip/mec1322/util/pack_ec.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# Copyright 2013 The Chromium OS Authors. All rights reserved. +# Copyright 2013 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chip/mec1322/watchdog.c b/chip/mec1322/watchdog.c index 16b2d38a2a..a072e86e76 100644 --- a/chip/mec1322/watchdog.c +++ b/chip/mec1322/watchdog.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mt_scp/build.mk b/chip/mt_scp/build.mk index 42f61d3ff1..3f4baab128 100644 --- a/chip/mt_scp/build.mk +++ b/chip/mt_scp/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2018 The Chromium OS Authors. All rights reserved. +# Copyright 2018 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/chip/mt_scp/config_chip.h b/chip/mt_scp/config_chip.h index e9707f92a4..65d529f8e9 100644 --- a/chip/mt_scp/config_chip.h +++ b/chip/mt_scp/config_chip.h @@ -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. */ diff --git a/chip/mt_scp/mt818x/audio_codec_wov.c b/chip/mt_scp/mt818x/audio_codec_wov.c index f0da97a1c0..466494b53f 100644 --- a/chip/mt_scp/mt818x/audio_codec_wov.c +++ b/chip/mt_scp/mt818x/audio_codec_wov.c @@ -1,5 +1,5 @@ /* - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mt_scp/mt818x/build.mk b/chip/mt_scp/mt818x/build.mk index e9f77a2833..39b1bce7dc 100644 --- a/chip/mt_scp/mt818x/build.mk +++ b/chip/mt_scp/mt818x/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. diff --git a/chip/mt_scp/mt818x/clock_chip.h b/chip/mt_scp/mt818x/clock_chip.h index ec12e42527..6568999176 100644 --- a/chip/mt_scp/mt818x/clock_chip.h +++ b/chip/mt_scp/mt818x/clock_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mt_scp/mt818x/clock_mt8183.c b/chip/mt_scp/mt818x/clock_mt8183.c index 3dba83bd31..fca89cd2a5 100644 --- a/chip/mt_scp/mt818x/clock_mt8183.c +++ b/chip/mt_scp/mt818x/clock_mt8183.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mt_scp/mt818x/clock_mt8186.c b/chip/mt_scp/mt818x/clock_mt8186.c index 7dcf9d42b0..cb0d339b5f 100644 --- a/chip/mt_scp/mt818x/clock_mt8186.c +++ b/chip/mt_scp/mt818x/clock_mt8186.c @@ -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. */ diff --git a/chip/mt_scp/mt818x/config_chip.h b/chip/mt_scp/mt818x/config_chip.h index 2fa858a46b..e0222e33fa 100644 --- a/chip/mt_scp/mt818x/config_chip.h +++ b/chip/mt_scp/mt818x/config_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mt_scp/mt818x/gpio.c b/chip/mt_scp/mt818x/gpio.c index e7e1f046b2..6d9a3b8418 100644 --- a/chip/mt_scp/mt818x/gpio.c +++ b/chip/mt_scp/mt818x/gpio.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mt_scp/mt818x/hrtimer.c b/chip/mt_scp/mt818x/hrtimer.c index 974a0d98ac..e68c3e48e7 100644 --- a/chip/mt_scp/mt818x/hrtimer.c +++ b/chip/mt_scp/mt818x/hrtimer.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mt_scp/mt818x/ipi.c b/chip/mt_scp/mt818x/ipi.c index 7fc1039b90..7ae4ed12a0 100644 --- a/chip/mt_scp/mt818x/ipi.c +++ b/chip/mt_scp/mt818x/ipi.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/mt_scp/mt818x/ipi_chip.h b/chip/mt_scp/mt818x/ipi_chip.h index 46f2d842a6..37be00dabb 100644 --- a/chip/mt_scp/mt818x/ipi_chip.h +++ b/chip/mt_scp/mt818x/ipi_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mt_scp/mt818x/ipi_table.c b/chip/mt_scp/mt818x/ipi_table.c index ef68e200b3..153b8b8dbc 100644 --- a/chip/mt_scp/mt818x/ipi_table.c +++ b/chip/mt_scp/mt818x/ipi_table.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/mt_scp/mt818x/memmap.c b/chip/mt_scp/mt818x/memmap.c index a6bcca6452..0ecb370cf3 100644 --- a/chip/mt_scp/mt818x/memmap.c +++ b/chip/mt_scp/mt818x/memmap.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/mt_scp/mt818x/memmap.h b/chip/mt_scp/mt818x/memmap.h index fbecb5e8cf..b89123d57f 100644 --- a/chip/mt_scp/mt818x/memmap.h +++ b/chip/mt_scp/mt818x/memmap.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/mt_scp/mt818x/registers.h b/chip/mt_scp/mt818x/registers.h index 517b3ff373..7bfcf184af 100644 --- a/chip/mt_scp/mt818x/registers.h +++ b/chip/mt_scp/mt818x/registers.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/mt_scp/mt818x/serial_reg.h b/chip/mt_scp/mt818x/serial_reg.h index 0c5e87546e..8dd2864a98 100644 --- a/chip/mt_scp/mt818x/serial_reg.h +++ b/chip/mt_scp/mt818x/serial_reg.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/mt_scp/mt818x/system.c b/chip/mt_scp/mt818x/system.c index 878e650dec..8bf523c0f7 100644 --- a/chip/mt_scp/mt818x/system.c +++ b/chip/mt_scp/mt818x/system.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mt_scp/mt818x/uart.c b/chip/mt_scp/mt818x/uart.c index e6bd361d8d..6bcfa89d9b 100644 --- a/chip/mt_scp/mt818x/uart.c +++ b/chip/mt_scp/mt818x/uart.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mt_scp/mt818x/watchdog.c b/chip/mt_scp/mt818x/watchdog.c index 74e2cad8e5..efadeab0fd 100644 --- a/chip/mt_scp/mt818x/watchdog.c +++ b/chip/mt_scp/mt818x/watchdog.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mt_scp/mt8192/build.mk b/chip/mt_scp/mt8192/build.mk index e61cdafb01..c188ea6d17 100644 --- a/chip/mt_scp/mt8192/build.mk +++ b/chip/mt_scp/mt8192/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. diff --git a/chip/mt_scp/mt8192/clock.c b/chip/mt_scp/mt8192/clock.c index 26e4f84f74..665695a7a2 100644 --- a/chip/mt_scp/mt8192/clock.c +++ b/chip/mt_scp/mt8192/clock.c @@ -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. */ diff --git a/chip/mt_scp/mt8192/clock_regs.h b/chip/mt_scp/mt8192/clock_regs.h index 02210d5e0f..7e1f77e92d 100644 --- a/chip/mt_scp/mt8192/clock_regs.h +++ b/chip/mt_scp/mt8192/clock_regs.h @@ -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. */ diff --git a/chip/mt_scp/mt8192/intc.h b/chip/mt_scp/mt8192/intc.h index c2b8698434..6c1d3c549c 100644 --- a/chip/mt_scp/mt8192/intc.h +++ b/chip/mt_scp/mt8192/intc.h @@ -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. */ diff --git a/chip/mt_scp/mt8192/uart.c b/chip/mt_scp/mt8192/uart.c index 9e2c097414..da17857edf 100644 --- a/chip/mt_scp/mt8192/uart.c +++ b/chip/mt_scp/mt8192/uart.c @@ -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. */ diff --git a/chip/mt_scp/mt8192/video.c b/chip/mt_scp/mt8192/video.c index 626a4da1fd..8cb4f9588e 100644 --- a/chip/mt_scp/mt8192/video.c +++ b/chip/mt_scp/mt8192/video.c @@ -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. */ diff --git a/chip/mt_scp/mt8195/build.mk b/chip/mt_scp/mt8195/build.mk index e61cdafb01..c188ea6d17 100644 --- a/chip/mt_scp/mt8195/build.mk +++ b/chip/mt_scp/mt8195/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# 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. diff --git a/chip/mt_scp/mt8195/clock.c b/chip/mt_scp/mt8195/clock.c index 5c0e651a1d..2ed3fab4a1 100644 --- a/chip/mt_scp/mt8195/clock.c +++ b/chip/mt_scp/mt8195/clock.c @@ -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. */ diff --git a/chip/mt_scp/mt8195/clock_regs.h b/chip/mt_scp/mt8195/clock_regs.h index 0c1b55dbe5..7744c3df54 100644 --- a/chip/mt_scp/mt8195/clock_regs.h +++ b/chip/mt_scp/mt8195/clock_regs.h @@ -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. */ diff --git a/chip/mt_scp/mt8195/intc.h b/chip/mt_scp/mt8195/intc.h index ea4ca5c9a8..dd3874718e 100644 --- a/chip/mt_scp/mt8195/intc.h +++ b/chip/mt_scp/mt8195/intc.h @@ -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. */ diff --git a/chip/mt_scp/mt8195/uart.c b/chip/mt_scp/mt8195/uart.c index dab25e7d19..faad1a41a4 100644 --- a/chip/mt_scp/mt8195/uart.c +++ b/chip/mt_scp/mt8195/uart.c @@ -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. */ diff --git a/chip/mt_scp/mt8195/video.c b/chip/mt_scp/mt8195/video.c index 0cde042891..f90a2c4764 100644 --- a/chip/mt_scp/mt8195/video.c +++ b/chip/mt_scp/mt8195/video.c @@ -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. */ diff --git a/chip/mt_scp/rv32i_common/build.mk b/chip/mt_scp/rv32i_common/build.mk index ac7e13db77..eff299f98d 100644 --- a/chip/mt_scp/rv32i_common/build.mk +++ b/chip/mt_scp/rv32i_common/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/chip/mt_scp/rv32i_common/cache.c b/chip/mt_scp/rv32i_common/cache.c index fe2081ae8b..b04f28ebae 100644 --- a/chip/mt_scp/rv32i_common/cache.c +++ b/chip/mt_scp/rv32i_common/cache.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mt_scp/rv32i_common/cache.h b/chip/mt_scp/rv32i_common/cache.h index 7c7cfec237..15572962ac 100644 --- a/chip/mt_scp/rv32i_common/cache.h +++ b/chip/mt_scp/rv32i_common/cache.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mt_scp/rv32i_common/config_chip.h b/chip/mt_scp/rv32i_common/config_chip.h index ea9dc3f61a..775dd02461 100644 --- a/chip/mt_scp/rv32i_common/config_chip.h +++ b/chip/mt_scp/rv32i_common/config_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mt_scp/rv32i_common/csr.h b/chip/mt_scp/rv32i_common/csr.h index 4b9834f6d6..88ea869cbd 100644 --- a/chip/mt_scp/rv32i_common/csr.h +++ b/chip/mt_scp/rv32i_common/csr.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mt_scp/rv32i_common/gpio.c b/chip/mt_scp/rv32i_common/gpio.c index 0ca3e3ac25..d56cff97fb 100644 --- a/chip/mt_scp/rv32i_common/gpio.c +++ b/chip/mt_scp/rv32i_common/gpio.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mt_scp/rv32i_common/hostcmd.c b/chip/mt_scp/rv32i_common/hostcmd.c index 3bbdf6b97c..fee1ce110a 100644 --- a/chip/mt_scp/rv32i_common/hostcmd.c +++ b/chip/mt_scp/rv32i_common/hostcmd.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mt_scp/rv32i_common/hostcmd.h b/chip/mt_scp/rv32i_common/hostcmd.h index b93f1e725d..067a4c14ab 100644 --- a/chip/mt_scp/rv32i_common/hostcmd.h +++ b/chip/mt_scp/rv32i_common/hostcmd.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mt_scp/rv32i_common/hrtimer.c b/chip/mt_scp/rv32i_common/hrtimer.c index 9744aecb4b..fff5fb6436 100644 --- a/chip/mt_scp/rv32i_common/hrtimer.c +++ b/chip/mt_scp/rv32i_common/hrtimer.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mt_scp/rv32i_common/intc.c b/chip/mt_scp/rv32i_common/intc.c index 06b0b4ca1c..641d0cf516 100644 --- a/chip/mt_scp/rv32i_common/intc.c +++ b/chip/mt_scp/rv32i_common/intc.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mt_scp/rv32i_common/ipi.c b/chip/mt_scp/rv32i_common/ipi.c index 2361774d58..b8db16b9ea 100644 --- a/chip/mt_scp/rv32i_common/ipi.c +++ b/chip/mt_scp/rv32i_common/ipi.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mt_scp/rv32i_common/ipi_chip.h b/chip/mt_scp/rv32i_common/ipi_chip.h index 80f70e5c3b..22ab85b39e 100644 --- a/chip/mt_scp/rv32i_common/ipi_chip.h +++ b/chip/mt_scp/rv32i_common/ipi_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mt_scp/rv32i_common/ipi_table.c b/chip/mt_scp/rv32i_common/ipi_table.c index b27f51c801..3a6411d4d2 100644 --- a/chip/mt_scp/rv32i_common/ipi_table.c +++ b/chip/mt_scp/rv32i_common/ipi_table.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/mt_scp/rv32i_common/memmap.c b/chip/mt_scp/rv32i_common/memmap.c index 1905431b88..8ae64cf585 100644 --- a/chip/mt_scp/rv32i_common/memmap.c +++ b/chip/mt_scp/rv32i_common/memmap.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mt_scp/rv32i_common/memmap.h b/chip/mt_scp/rv32i_common/memmap.h index 0857c9a89e..2c043fbe9c 100644 --- a/chip/mt_scp/rv32i_common/memmap.h +++ b/chip/mt_scp/rv32i_common/memmap.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mt_scp/rv32i_common/registers.h b/chip/mt_scp/rv32i_common/registers.h index 86cec4b887..8688bbc033 100644 --- a/chip/mt_scp/rv32i_common/registers.h +++ b/chip/mt_scp/rv32i_common/registers.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mt_scp/rv32i_common/scp_timer.h b/chip/mt_scp/rv32i_common/scp_timer.h index 5c0650f913..1eed1d7792 100644 --- a/chip/mt_scp/rv32i_common/scp_timer.h +++ b/chip/mt_scp/rv32i_common/scp_timer.h @@ -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. */ diff --git a/chip/mt_scp/rv32i_common/scp_watchdog.h b/chip/mt_scp/rv32i_common/scp_watchdog.h index 87309a2f82..2a8225c047 100644 --- a/chip/mt_scp/rv32i_common/scp_watchdog.h +++ b/chip/mt_scp/rv32i_common/scp_watchdog.h @@ -1,5 +1,5 @@ -/* 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. */ diff --git a/chip/mt_scp/rv32i_common/system.c b/chip/mt_scp/rv32i_common/system.c index 0e12154f6d..0eed2ae3ff 100644 --- a/chip/mt_scp/rv32i_common/system.c +++ b/chip/mt_scp/rv32i_common/system.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mt_scp/rv32i_common/uart.c b/chip/mt_scp/rv32i_common/uart.c index 07c56e3bc3..a67a0bb276 100644 --- a/chip/mt_scp/rv32i_common/uart.c +++ b/chip/mt_scp/rv32i_common/uart.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mt_scp/rv32i_common/uart_regs.h b/chip/mt_scp/rv32i_common/uart_regs.h index 44ad192f55..d0eeaa81c2 100644 --- a/chip/mt_scp/rv32i_common/uart_regs.h +++ b/chip/mt_scp/rv32i_common/uart_regs.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/mt_scp/rv32i_common/video.h b/chip/mt_scp/rv32i_common/video.h index 775413cb8d..d5bb49ceac 100644 --- a/chip/mt_scp/rv32i_common/video.h +++ b/chip/mt_scp/rv32i_common/video.h @@ -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. */ diff --git a/chip/mt_scp/rv32i_common/watchdog.c b/chip/mt_scp/rv32i_common/watchdog.c index f77a948da3..e8f5b5c3f9 100644 --- a/chip/mt_scp/rv32i_common/watchdog.c +++ b/chip/mt_scp/rv32i_common/watchdog.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/adc.c b/chip/npcx/adc.c index 35859898d8..f01419bf67 100644 --- a/chip/npcx/adc.c +++ b/chip/npcx/adc.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/adc_chip.h b/chip/npcx/adc_chip.h index 61423394b7..5f3862829a 100644 --- a/chip/npcx/adc_chip.h +++ b/chip/npcx/adc_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/apm.c b/chip/npcx/apm.c index 88a782cd97..b66a77a276 100644 --- a/chip/npcx/apm.c +++ b/chip/npcx/apm.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/apm_chip.h b/chip/npcx/apm_chip.h index 6de3a330b7..9b330321ea 100644 --- a/chip/npcx/apm_chip.h +++ b/chip/npcx/apm_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/audio_codec_dmic.c b/chip/npcx/audio_codec_dmic.c index e242a8b2d2..7e1bfa9bce 100644 --- a/chip/npcx/audio_codec_dmic.c +++ b/chip/npcx/audio_codec_dmic.c @@ -1,5 +1,5 @@ /* - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/audio_codec_i2s_rx.c b/chip/npcx/audio_codec_i2s_rx.c index fc44b35d5f..02224be437 100644 --- a/chip/npcx/audio_codec_i2s_rx.c +++ b/chip/npcx/audio_codec_i2s_rx.c @@ -1,5 +1,5 @@ /* - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/build.mk b/chip/npcx/build.mk index d7e61de4de..9e046be7ec 100644 --- a/chip/npcx/build.mk +++ b/chip/npcx/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2014 The Chromium OS Authors. All rights reserved. +# Copyright 2014 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/chip/npcx/cec.c b/chip/npcx/cec.c index 7807d4e359..39f353b0e3 100644 --- a/chip/npcx/cec.c +++ b/chip/npcx/cec.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/clock.c b/chip/npcx/clock.c index f119a620e2..1ab4d1063a 100644 --- a/chip/npcx/clock.c +++ b/chip/npcx/clock.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/clock_chip.h b/chip/npcx/clock_chip.h index 1f3193ef61..c105194fdf 100644 --- a/chip/npcx/clock_chip.h +++ b/chip/npcx/clock_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/config_chip-npcx5.h b/chip/npcx/config_chip-npcx5.h index e82a13a256..53713b2dfb 100644 --- a/chip/npcx/config_chip-npcx5.h +++ b/chip/npcx/config_chip-npcx5.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/config_chip-npcx7.h b/chip/npcx/config_chip-npcx7.h index 3acbd35135..e44aebe6cf 100644 --- a/chip/npcx/config_chip-npcx7.h +++ b/chip/npcx/config_chip-npcx7.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/config_chip-npcx9.h b/chip/npcx/config_chip-npcx9.h index aa47f4cc43..736aef8a1c 100644 --- a/chip/npcx/config_chip-npcx9.h +++ b/chip/npcx/config_chip-npcx9.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/config_chip.h b/chip/npcx/config_chip.h index dd999b40e0..d0bfe0a767 100644 --- a/chip/npcx/config_chip.h +++ b/chip/npcx/config_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/config_flash_layout.h b/chip/npcx/config_flash_layout.h index 168630f582..926a03bb3c 100644 --- a/chip/npcx/config_flash_layout.h +++ b/chip/npcx/config_flash_layout.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/espi.c b/chip/npcx/espi.c index dfd3befa5b..d64a22860d 100644 --- a/chip/npcx/espi.c +++ b/chip/npcx/espi.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -62,7 +62,7 @@ struct vw_event_t { /* Default settings of VWEVMS registers (Please refer Table.43/44) */ static const struct vwevms_config_t espi_in_list[] = { /* IDX EN ENPL ENESP IE/WE VW Event Bit 0 - 3 (M->S) */ -#ifdef CONFIG_HOSTCMD_ESPI_RESET_SLP_SX_VW_ON_ESPI_RST +#ifdef CONFIG_HOST_INTERFACE_ESPI_RESET_SLP_SX_VW_ON_ESPI_RST { 0x02, 1, 0, 1, 1 }, /* SLP_S3#, SLP_S4#, SLP_S5#, Reserve */ #else { 0x02, 1, 0, 0, 1 }, /* SLP_S3#, SLP_S4#, SLP_S5#, Reserve */ diff --git a/chip/npcx/fan.c b/chip/npcx/fan.c index 512705b74b..6a246f5c6a 100644 --- a/chip/npcx/fan.c +++ b/chip/npcx/fan.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/fan_chip.h b/chip/npcx/fan_chip.h index 6fc228ec84..36eb13f4cb 100644 --- a/chip/npcx/fan_chip.h +++ b/chip/npcx/fan_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/flash.c b/chip/npcx/flash.c index 0f7e034a84..390cb1fa64 100644 --- a/chip/npcx/flash.c +++ b/chip/npcx/flash.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/gpio-npcx5.c b/chip/npcx/gpio-npcx5.c index e2f3bb0b60..2201bb65c2 100644 --- a/chip/npcx/gpio-npcx5.c +++ b/chip/npcx/gpio-npcx5.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/gpio-npcx7.c b/chip/npcx/gpio-npcx7.c index e2f3bb0b60..2201bb65c2 100644 --- a/chip/npcx/gpio-npcx7.c +++ b/chip/npcx/gpio-npcx7.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/gpio-npcx9.c b/chip/npcx/gpio-npcx9.c index 795cf3b147..5de8ea3b0a 100644 --- a/chip/npcx/gpio-npcx9.c +++ b/chip/npcx/gpio-npcx9.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/gpio.c b/chip/npcx/gpio.c index db90583359..690615729d 100644 --- a/chip/npcx/gpio.c +++ b/chip/npcx/gpio.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/gpio_chip-npcx5.h b/chip/npcx/gpio_chip-npcx5.h index bd5baef718..81ef957236 100644 --- a/chip/npcx/gpio_chip-npcx5.h +++ b/chip/npcx/gpio_chip-npcx5.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/gpio_chip-npcx7.h b/chip/npcx/gpio_chip-npcx7.h index c6c610c294..39654bc09e 100644 --- a/chip/npcx/gpio_chip-npcx7.h +++ b/chip/npcx/gpio_chip-npcx7.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/gpio_chip-npcx9.h b/chip/npcx/gpio_chip-npcx9.h index fcc16695cc..aef2f4f044 100644 --- a/chip/npcx/gpio_chip-npcx9.h +++ b/chip/npcx/gpio_chip-npcx9.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/gpio_chip.h b/chip/npcx/gpio_chip.h index 52ab91585e..5f60cdfb40 100644 --- a/chip/npcx/gpio_chip.h +++ b/chip/npcx/gpio_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/header.c b/chip/npcx/header.c index 597678dc47..2db7d9094c 100644 --- a/chip/npcx/header.c +++ b/chip/npcx/header.c @@ -1,5 +1,5 @@ /* - * Copyright 2015 The Chromium OS Authors. All rights reserved. + * Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/hwtimer.c b/chip/npcx/hwtimer.c index 324fadcabb..dfa06f69b2 100644 --- a/chip/npcx/hwtimer.c +++ b/chip/npcx/hwtimer.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/hwtimer_chip.h b/chip/npcx/hwtimer_chip.h index 379d999973..7964d9619b 100644 --- a/chip/npcx/hwtimer_chip.h +++ b/chip/npcx/hwtimer_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/i2c-npcx5.c b/chip/npcx/i2c-npcx5.c index 09b5b51882..ef04b447c6 100644 --- a/chip/npcx/i2c-npcx5.c +++ b/chip/npcx/i2c-npcx5.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/i2c-npcx7.c b/chip/npcx/i2c-npcx7.c index 0193f124e8..427b9cae9f 100644 --- a/chip/npcx/i2c-npcx7.c +++ b/chip/npcx/i2c-npcx7.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/i2c-npcx9.c b/chip/npcx/i2c-npcx9.c index 0193f124e8..427b9cae9f 100644 --- a/chip/npcx/i2c-npcx9.c +++ b/chip/npcx/i2c-npcx9.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/i2c.c b/chip/npcx/i2c.c index 387a69b9d4..ebfba26c58 100644 --- a/chip/npcx/i2c.c +++ b/chip/npcx/i2c.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/i2c_chip.h b/chip/npcx/i2c_chip.h index 014e6cddf2..d1a7cf6851 100644 --- a/chip/npcx/i2c_chip.h +++ b/chip/npcx/i2c_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/keyboard_raw.c b/chip/npcx/keyboard_raw.c index d6270ed5de..cb2be7911e 100644 --- a/chip/npcx/keyboard_raw.c +++ b/chip/npcx/keyboard_raw.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/lct.c b/chip/npcx/lct.c index 15610f40ef..19568cac44 100644 --- a/chip/npcx/lct.c +++ b/chip/npcx/lct.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/lct_chip.h b/chip/npcx/lct_chip.h index 8915bdf047..8b4ee804cf 100644 --- a/chip/npcx/lct_chip.h +++ b/chip/npcx/lct_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/lfw/ec_lfw.h b/chip/npcx/lfw/ec_lfw.h index 88c0a9ed83..3b7e4da459 100644 --- a/chip/npcx/lfw/ec_lfw.h +++ b/chip/npcx/lfw/ec_lfw.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/npcx/lpc.c b/chip/npcx/lpc.c index 1227b4c53f..48e094f3fc 100644 --- a/chip/npcx/lpc.c +++ b/chip/npcx/lpc.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -152,7 +152,7 @@ static void lpc_generate_smi(void) /* Generate a falling edge */ espi_wait_vw_not_dirty(VW_SMI_L, ESPI_DIRTY_WAIT_TIME_US); NPCX_HIPMIC(PMC_ACPI) = NPCX_VW_SMI(0); - udelay(CONFIG_ESPI_DEFAULT_VW_WIDTH_US); + udelay(CONFIG_HOST_INTERFACE_ESPI_DEFAULT_VW_WIDTH_US); espi_wait_vw_not_dirty(VW_SMI_L, ESPI_DIRTY_WAIT_TIME_US); /* Set signal high */ @@ -160,10 +160,10 @@ static void lpc_generate_smi(void) #else /* SET SMIB bit to pull SMI_L to high.*/ SET_BIT(NPCX_HIPMIC(PMC_ACPI), NPCX_HIPMIC_SMIB); - udelay(CONFIG_ESPI_DEFAULT_VW_WIDTH_US); + udelay(CONFIG_HOST_INTERFACE_ESPI_DEFAULT_VW_WIDTH_US); /* Generate a falling edge */ CLEAR_BIT(NPCX_HIPMIC(PMC_ACPI), NPCX_HIPMIC_SMIB); - udelay(CONFIG_ESPI_DEFAULT_VW_WIDTH_US); + udelay(CONFIG_HOST_INTERFACE_ESPI_DEFAULT_VW_WIDTH_US); /* Set signal high */ SET_BIT(NPCX_HIPMIC(PMC_ACPI), NPCX_HIPMIC_SMIB); #endif @@ -199,7 +199,7 @@ static void lpc_generate_sci(void) /* Generate a falling edge */ espi_wait_vw_not_dirty(VW_SCI_L, ESPI_DIRTY_WAIT_TIME_US); NPCX_HIPMIC(PMC_ACPI) = NPCX_VW_SCI(0); - udelay(CONFIG_ESPI_DEFAULT_VW_WIDTH_US); + udelay(CONFIG_HOST_INTERFACE_ESPI_DEFAULT_VW_WIDTH_US); espi_wait_vw_not_dirty(VW_SCI_L, ESPI_DIRTY_WAIT_TIME_US); /* Set signal high */ @@ -207,10 +207,10 @@ static void lpc_generate_sci(void) #else /* Set SCIB bit to pull SCI_L to high.*/ SET_BIT(NPCX_HIPMIC(PMC_ACPI), NPCX_HIPMIC_SCIB); - udelay(CONFIG_ESPI_DEFAULT_VW_WIDTH_US); + udelay(CONFIG_HOST_INTERFACE_ESPI_DEFAULT_VW_WIDTH_US); /* Generate a falling edge */ CLEAR_BIT(NPCX_HIPMIC(PMC_ACPI), NPCX_HIPMIC_SCIB); - udelay(CONFIG_ESPI_DEFAULT_VW_WIDTH_US); + udelay(CONFIG_HOST_INTERFACE_ESPI_DEFAULT_VW_WIDTH_US); /* Set signal high */ SET_BIT(NPCX_HIPMIC(PMC_ACPI), NPCX_HIPMIC_SCIB); #endif diff --git a/chip/npcx/lpc_chip.h b/chip/npcx/lpc_chip.h index 607fdde5fa..872b20f915 100644 --- a/chip/npcx/lpc_chip.h +++ b/chip/npcx/lpc_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/peci.c b/chip/npcx/peci.c index cdcab6c5b9..7c213648f4 100644 --- a/chip/npcx/peci.c +++ b/chip/npcx/peci.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/ps2.c b/chip/npcx/ps2.c index f0c47c84a1..a8a65e63ea 100644 --- a/chip/npcx/ps2.c +++ b/chip/npcx/ps2.c @@ -1,5 +1,5 @@ /* - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/ps2_chip.h b/chip/npcx/ps2_chip.h index ebdbfca031..871b1ab6e5 100644 --- a/chip/npcx/ps2_chip.h +++ b/chip/npcx/ps2_chip.h @@ -1,5 +1,5 @@ /* - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/pwm.c b/chip/npcx/pwm.c index 905a7bcb25..53a278a0ba 100644 --- a/chip/npcx/pwm.c +++ b/chip/npcx/pwm.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/pwm_chip.h b/chip/npcx/pwm_chip.h index 7acfef81e5..714ecfb4a3 100644 --- a/chip/npcx/pwm_chip.h +++ b/chip/npcx/pwm_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/registers-npcx5.h b/chip/npcx/registers-npcx5.h index bdd72c1716..b7302bdd13 100644 --- a/chip/npcx/registers-npcx5.h +++ b/chip/npcx/registers-npcx5.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/registers-npcx7.h b/chip/npcx/registers-npcx7.h index 98545dee24..2a4334149f 100644 --- a/chip/npcx/registers-npcx7.h +++ b/chip/npcx/registers-npcx7.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/registers-npcx9.h b/chip/npcx/registers-npcx9.h index ac4609d40e..11cac561d7 100644 --- a/chip/npcx/registers-npcx9.h +++ b/chip/npcx/registers-npcx9.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/registers.h b/chip/npcx/registers.h index 5942ea46d0..922d787323 100644 --- a/chip/npcx/registers.h +++ b/chip/npcx/registers.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/npcx/rom_chip.h b/chip/npcx/rom_chip.h index fe6678971f..44c9c1a2a4 100644 --- a/chip/npcx/rom_chip.h +++ b/chip/npcx/rom_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/sha256_chip.c b/chip/npcx/sha256_chip.c index 4a92db4bb9..e2590cad65 100644 --- a/chip/npcx/sha256_chip.c +++ b/chip/npcx/sha256_chip.c @@ -1,5 +1,5 @@ /* - * Copyright 2020 The Chromium OS Authors. All rights reserved. + * Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/sha256_chip.h b/chip/npcx/sha256_chip.h index fba01a8dbf..3c7773d112 100644 --- a/chip/npcx/sha256_chip.h +++ b/chip/npcx/sha256_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/shi.c b/chip/npcx/shi.c index 5867a0b658..d5f19c9191 100644 --- a/chip/npcx/shi.c +++ b/chip/npcx/shi.c @@ -1,5 +1,5 @@ /* - * Copyright 2015 The Chromium OS Authors. All rights reserved. + * Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/shi_chip.h b/chip/npcx/shi_chip.h index 3fd73e8119..9d41a2dcab 100644 --- a/chip/npcx/shi_chip.h +++ b/chip/npcx/shi_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/sib.c b/chip/npcx/sib.c index a441a3db83..e8dbd5039d 100644 --- a/chip/npcx/sib.c +++ b/chip/npcx/sib.c @@ -1,5 +1,5 @@ /* - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/sib_chip.h b/chip/npcx/sib_chip.h index bbea199e72..570fe6b0ec 100644 --- a/chip/npcx/sib_chip.h +++ b/chip/npcx/sib_chip.h @@ -1,5 +1,5 @@ /* - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/spi.c b/chip/npcx/spi.c index b7cb3b7a8c..0161ce63ef 100644 --- a/chip/npcx/spi.c +++ b/chip/npcx/spi.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/spiflashfw/monitor_hdr.c b/chip/npcx/spiflashfw/monitor_hdr.c index 42d4720d97..09606c4c31 100644 --- a/chip/npcx/spiflashfw/monitor_hdr.c +++ b/chip/npcx/spiflashfw/monitor_hdr.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/npcx/spiflashfw/npcx_monitor.c b/chip/npcx/spiflashfw/npcx_monitor.c index 573c44190e..5b7a767992 100644 --- a/chip/npcx/spiflashfw/npcx_monitor.c +++ b/chip/npcx/spiflashfw/npcx_monitor.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/npcx/spiflashfw/npcx_monitor.h b/chip/npcx/spiflashfw/npcx_monitor.h index 5259fd205a..54303958d6 100644 --- a/chip/npcx/spiflashfw/npcx_monitor.h +++ b/chip/npcx/spiflashfw/npcx_monitor.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/spiflashfw/npcx_monitor.ld b/chip/npcx/spiflashfw/npcx_monitor.ld index ae7760c519..434945b04c 100644 --- a/chip/npcx/spiflashfw/npcx_monitor.ld +++ b/chip/npcx/spiflashfw/npcx_monitor.ld @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/npcx/system-npcx5.c b/chip/npcx/system-npcx5.c index b5e2582655..08aafe422d 100644 --- a/chip/npcx/system-npcx5.c +++ b/chip/npcx/system-npcx5.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/system-npcx7.c b/chip/npcx/system-npcx7.c index c0cc748e1c..5cacbec749 100644 --- a/chip/npcx/system-npcx7.c +++ b/chip/npcx/system-npcx7.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/system-npcx9.c b/chip/npcx/system-npcx9.c index c0cc748e1c..5cacbec749 100644 --- a/chip/npcx/system-npcx9.c +++ b/chip/npcx/system-npcx9.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/system.c b/chip/npcx/system.c index 59dd21341a..958d873401 100644 --- a/chip/npcx/system.c +++ b/chip/npcx/system.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/system_chip.h b/chip/npcx/system_chip.h index 6da21b3e53..2ee5f8aff0 100644 --- a/chip/npcx/system_chip.h +++ b/chip/npcx/system_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/uart.c b/chip/npcx/uart.c index 3961c282bb..bc87b5921e 100644 --- a/chip/npcx/uart.c +++ b/chip/npcx/uart.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/uartn.c b/chip/npcx/uartn.c index 4f486dcb56..9bcaccd94c 100644 --- a/chip/npcx/uartn.c +++ b/chip/npcx/uartn.c @@ -1,5 +1,5 @@ /* - * Copyright 2018 The Chromium OS Authors. All rights reserved. + * Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/uartn.h b/chip/npcx/uartn.h index a0868a3a78..ce111f11d9 100644 --- a/chip/npcx/uartn.h +++ b/chip/npcx/uartn.h @@ -1,5 +1,5 @@ /* - * Copyright 2018 The Chromium OS Authors. All rights reserved. + * Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/watchdog.c b/chip/npcx/watchdog.c index 87d1afda3c..8ae9ee0474 100644 --- a/chip/npcx/watchdog.c +++ b/chip/npcx/watchdog.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/wov.c b/chip/npcx/wov.c index fe493e9163..1ae1afe71d 100644 --- a/chip/npcx/wov.c +++ b/chip/npcx/wov.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/npcx/wov_chip.h b/chip/npcx/wov_chip.h index 0add348d95..b0da9128e1 100644 --- a/chip/npcx/wov_chip.h +++ b/chip/npcx/wov_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/adc-stm32f0.c b/chip/stm32/adc-stm32f0.c index e2069c8266..d1b1cc0e02 100644 --- a/chip/stm32/adc-stm32f0.c +++ b/chip/stm32/adc-stm32f0.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/adc-stm32f3.c b/chip/stm32/adc-stm32f3.c index 66a41a5965..605bb14b69 100644 --- a/chip/stm32/adc-stm32f3.c +++ b/chip/stm32/adc-stm32f3.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/adc-stm32f4.c b/chip/stm32/adc-stm32f4.c index 66a41a5965..605bb14b69 100644 --- a/chip/stm32/adc-stm32f4.c +++ b/chip/stm32/adc-stm32f4.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/adc-stm32l.c b/chip/stm32/adc-stm32l.c index 6d8a70d90c..636710f071 100644 --- a/chip/stm32/adc-stm32l.c +++ b/chip/stm32/adc-stm32l.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/adc-stm32l4.c b/chip/stm32/adc-stm32l4.c index f8d52f939e..e67ae4a8fd 100644 --- a/chip/stm32/adc-stm32l4.c +++ b/chip/stm32/adc-stm32l4.c @@ -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. */ diff --git a/chip/stm32/adc_chip.h b/chip/stm32/adc_chip.h index 6e5ca3d824..2c4e726ea5 100644 --- a/chip/stm32/adc_chip.h +++ b/chip/stm32/adc_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/bkpdata.c b/chip/stm32/bkpdata.c index 65fedae3f8..bde026facd 100644 --- a/chip/stm32/bkpdata.c +++ b/chip/stm32/bkpdata.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/bkpdata.h b/chip/stm32/bkpdata.h index f974769c86..14ef33483e 100644 --- a/chip/stm32/bkpdata.h +++ b/chip/stm32/bkpdata.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/build.mk b/chip/stm32/build.mk index 0d47a0131a..1fc14a15fa 100644 --- a/chip/stm32/build.mk +++ b/chip/stm32/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2013 The Chromium OS Authors. All rights reserved. +# Copyright 2013 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/chip/stm32/charger_detect.c b/chip/stm32/charger_detect.c index fa0d38474d..c404fc827a 100644 --- a/chip/stm32/charger_detect.c +++ b/chip/stm32/charger_detect.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/clock-f.c b/chip/stm32/clock-f.c index ada86f5ec8..d181397d86 100644 --- a/chip/stm32/clock-f.c +++ b/chip/stm32/clock-f.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/clock-f.h b/chip/stm32/clock-f.h index fa06e9c431..5ed302bf78 100644 --- a/chip/stm32/clock-f.h +++ b/chip/stm32/clock-f.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/clock-l4.h b/chip/stm32/clock-l4.h index 25416e3c7c..975d952b9f 100644 --- a/chip/stm32/clock-l4.h +++ b/chip/stm32/clock-l4.h @@ -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. */ diff --git a/chip/stm32/clock-stm32f0.c b/chip/stm32/clock-stm32f0.c index 20dada354e..3b56382fdb 100644 --- a/chip/stm32/clock-stm32f0.c +++ b/chip/stm32/clock-stm32f0.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/clock-stm32f3.c b/chip/stm32/clock-stm32f3.c index 953176b158..7d2b3de7f2 100644 --- a/chip/stm32/clock-stm32f3.c +++ b/chip/stm32/clock-stm32f3.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/clock-stm32f4.c b/chip/stm32/clock-stm32f4.c index d6930da815..479faac7da 100644 --- a/chip/stm32/clock-stm32f4.c +++ b/chip/stm32/clock-stm32f4.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/clock-stm32g4.c b/chip/stm32/clock-stm32g4.c index da8c0b063d..dbb8fd88cb 100644 --- a/chip/stm32/clock-stm32g4.c +++ b/chip/stm32/clock-stm32g4.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/clock-stm32h7.c b/chip/stm32/clock-stm32h7.c index 7812f5d2f9..67e17f4174 100644 --- a/chip/stm32/clock-stm32h7.c +++ b/chip/stm32/clock-stm32h7.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/clock-stm32l.c b/chip/stm32/clock-stm32l.c index 20b3730a99..1d0252302a 100644 --- a/chip/stm32/clock-stm32l.c +++ b/chip/stm32/clock-stm32l.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/clock-stm32l4.c b/chip/stm32/clock-stm32l4.c index b078ab472d..1c460c10fc 100644 --- a/chip/stm32/clock-stm32l4.c +++ b/chip/stm32/clock-stm32l4.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/clock-stm32l5.c b/chip/stm32/clock-stm32l5.c index 63f5b874bc..a4cf34f7b8 100644 --- a/chip/stm32/clock-stm32l5.c +++ b/chip/stm32/clock-stm32l5.c @@ -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. */ diff --git a/chip/stm32/config-stm32f03x.h b/chip/stm32/config-stm32f03x.h index 3e833101a8..695b16f0b3 100644 --- a/chip/stm32/config-stm32f03x.h +++ b/chip/stm32/config-stm32f03x.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/config-stm32f05x.h b/chip/stm32/config-stm32f05x.h index 918ae0f022..7f083b0eb2 100644 --- a/chip/stm32/config-stm32f05x.h +++ b/chip/stm32/config-stm32f05x.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/config-stm32f07x.h b/chip/stm32/config-stm32f07x.h index 05896cb9f9..31468f656e 100644 --- a/chip/stm32/config-stm32f07x.h +++ b/chip/stm32/config-stm32f07x.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/config-stm32f09x.h b/chip/stm32/config-stm32f09x.h index 20bcf1728b..405c63f3ec 100644 --- a/chip/stm32/config-stm32f09x.h +++ b/chip/stm32/config-stm32f09x.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/config-stm32f373.h b/chip/stm32/config-stm32f373.h index 7f8f812774..f57350a17c 100644 --- a/chip/stm32/config-stm32f373.h +++ b/chip/stm32/config-stm32f373.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/config-stm32f4.h b/chip/stm32/config-stm32f4.h index fbb53717a9..d7ef668886 100644 --- a/chip/stm32/config-stm32f4.h +++ b/chip/stm32/config-stm32f4.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/config-stm32f76x.h b/chip/stm32/config-stm32f76x.h index 627878f888..e7380118f0 100644 --- a/chip/stm32/config-stm32f76x.h +++ b/chip/stm32/config-stm32f76x.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/config-stm32g41xb.h b/chip/stm32/config-stm32g41xb.h index 5a4d403957..97e9d21d25 100644 --- a/chip/stm32/config-stm32g41xb.h +++ b/chip/stm32/config-stm32g41xb.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/config-stm32g473xc.h b/chip/stm32/config-stm32g473xc.h index 40658edd56..63f4c73ea0 100644 --- a/chip/stm32/config-stm32g473xc.h +++ b/chip/stm32/config-stm32g473xc.h @@ -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. */ diff --git a/chip/stm32/config-stm32h7x3.h b/chip/stm32/config-stm32h7x3.h index f08efbe17e..31f1d3c720 100644 --- a/chip/stm32/config-stm32h7x3.h +++ b/chip/stm32/config-stm32h7x3.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/config-stm32l100.h b/chip/stm32/config-stm32l100.h index 5ed085f225..ec28815525 100644 --- a/chip/stm32/config-stm32l100.h +++ b/chip/stm32/config-stm32l100.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/config-stm32l15x.h b/chip/stm32/config-stm32l15x.h index b13c4dd140..ae069ed005 100644 --- a/chip/stm32/config-stm32l15x.h +++ b/chip/stm32/config-stm32l15x.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/config-stm32l431.h b/chip/stm32/config-stm32l431.h index d14b7ade00..de3204945a 100644 --- a/chip/stm32/config-stm32l431.h +++ b/chip/stm32/config-stm32l431.h @@ -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. */ diff --git a/chip/stm32/config-stm32l442.h b/chip/stm32/config-stm32l442.h index d310f6dea8..b85e9b1454 100644 --- a/chip/stm32/config-stm32l442.h +++ b/chip/stm32/config-stm32l442.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/config-stm32l476.h b/chip/stm32/config-stm32l476.h index 618a40a0f7..00a02e0ff9 100644 --- a/chip/stm32/config-stm32l476.h +++ b/chip/stm32/config-stm32l476.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/config-stm32l552xe.h b/chip/stm32/config-stm32l552xe.h index 346da9320a..ba11b7f098 100644 --- a/chip/stm32/config-stm32l552xe.h +++ b/chip/stm32/config-stm32l552xe.h @@ -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. */ diff --git a/chip/stm32/config_chip.h b/chip/stm32/config_chip.h index 7554c5c03e..f85eef5c46 100644 --- a/chip/stm32/config_chip.h +++ b/chip/stm32/config_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/crc_hw.h b/chip/stm32/crc_hw.h index 7c58a7a00e..495af2fb98 100644 --- a/chip/stm32/crc_hw.h +++ b/chip/stm32/crc_hw.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/debug_printf.c b/chip/stm32/debug_printf.c index bdf548e9e1..3713d28d26 100644 --- a/chip/stm32/debug_printf.c +++ b/chip/stm32/debug_printf.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/debug_printf.h b/chip/stm32/debug_printf.h index 6986fb9e61..efd74d40b9 100644 --- a/chip/stm32/debug_printf.h +++ b/chip/stm32/debug_printf.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/dfu_bootmanager_main.c b/chip/stm32/dfu_bootmanager_main.c index 4524d5effc..452a7a6443 100644 --- a/chip/stm32/dfu_bootmanager_main.c +++ b/chip/stm32/dfu_bootmanager_main.c @@ -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. * diff --git a/chip/stm32/dfu_bootmanager_shared.c b/chip/stm32/dfu_bootmanager_shared.c index 212ee0a9e9..de8edcff5d 100644 --- a/chip/stm32/dfu_bootmanager_shared.c +++ b/chip/stm32/dfu_bootmanager_shared.c @@ -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. * diff --git a/chip/stm32/dfu_bootmanager_shared.h b/chip/stm32/dfu_bootmanager_shared.h index de35ac1ab1..df920f16a5 100644 --- a/chip/stm32/dfu_bootmanager_shared.h +++ b/chip/stm32/dfu_bootmanager_shared.h @@ -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. * diff --git a/chip/stm32/dma-stm32f4.c b/chip/stm32/dma-stm32f4.c index e817d6ad95..3121089437 100644 --- a/chip/stm32/dma-stm32f4.c +++ b/chip/stm32/dma-stm32f4.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/dma.c b/chip/stm32/dma.c index a7536fe29a..fbf0d59627 100644 --- a/chip/stm32/dma.c +++ b/chip/stm32/dma.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/flash-f.c b/chip/stm32/flash-f.c index caa2737099..9bfdb1b6b7 100644 --- a/chip/stm32/flash-f.c +++ b/chip/stm32/flash-f.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/flash-f.h b/chip/stm32/flash-f.h index 3f2b7174c1..507ded32f1 100644 --- a/chip/stm32/flash-f.h +++ b/chip/stm32/flash-f.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/flash-regs.h b/chip/stm32/flash-regs.h index b0a46667a1..9456c03963 100644 --- a/chip/stm32/flash-regs.h +++ b/chip/stm32/flash-regs.h @@ -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. */ diff --git a/chip/stm32/flash-stm32f0.c b/chip/stm32/flash-stm32f0.c index b0b2595e58..058a8afc46 100644 --- a/chip/stm32/flash-stm32f0.c +++ b/chip/stm32/flash-stm32f0.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/flash-stm32f3.c b/chip/stm32/flash-stm32f3.c index cfed457162..8705e4d657 100644 --- a/chip/stm32/flash-stm32f3.c +++ b/chip/stm32/flash-stm32f3.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/flash-stm32f4.c b/chip/stm32/flash-stm32f4.c index cfed457162..8705e4d657 100644 --- a/chip/stm32/flash-stm32f4.c +++ b/chip/stm32/flash-stm32f4.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/flash-stm32g4-l4.c b/chip/stm32/flash-stm32g4-l4.c index 5510a7875d..31dba5c887 100644 --- a/chip/stm32/flash-stm32g4-l4.c +++ b/chip/stm32/flash-stm32g4-l4.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/flash-stm32h7.c b/chip/stm32/flash-stm32h7.c index 841d8bf62a..445b354e57 100644 --- a/chip/stm32/flash-stm32h7.c +++ b/chip/stm32/flash-stm32h7.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/flash-stm32l.c b/chip/stm32/flash-stm32l.c index a36fb8e439..b83f8961af 100644 --- a/chip/stm32/flash-stm32l.c +++ b/chip/stm32/flash-stm32l.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/fpu.c b/chip/stm32/fpu.c index 34a6400baf..2bf0a0b803 100644 --- a/chip/stm32/fpu.c +++ b/chip/stm32/fpu.c @@ -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. */ diff --git a/chip/stm32/gpio-f0-l.c b/chip/stm32/gpio-f0-l.c index f583e66acc..87ba4baa9f 100644 --- a/chip/stm32/gpio-f0-l.c +++ b/chip/stm32/gpio-f0-l.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/gpio-stm32f0.c b/chip/stm32/gpio-stm32f0.c index d7e7aa4391..8fbc77a85c 100644 --- a/chip/stm32/gpio-stm32f0.c +++ b/chip/stm32/gpio-stm32f0.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/gpio-stm32f3.c b/chip/stm32/gpio-stm32f3.c index f3a1b0068b..113aadc1e6 100644 --- a/chip/stm32/gpio-stm32f3.c +++ b/chip/stm32/gpio-stm32f3.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/gpio-stm32f4.c b/chip/stm32/gpio-stm32f4.c index d95a96ae5b..8e8658b7f9 100644 --- a/chip/stm32/gpio-stm32f4.c +++ b/chip/stm32/gpio-stm32f4.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/gpio-stm32g4.c b/chip/stm32/gpio-stm32g4.c index 54f31ba468..8d1529a7ad 100644 --- a/chip/stm32/gpio-stm32g4.c +++ b/chip/stm32/gpio-stm32g4.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/gpio-stm32h7.c b/chip/stm32/gpio-stm32h7.c index 6c8378a4f0..66c696e836 100644 --- a/chip/stm32/gpio-stm32h7.c +++ b/chip/stm32/gpio-stm32h7.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/gpio-stm32l.c b/chip/stm32/gpio-stm32l.c index 607a1a391f..920cb382b0 100644 --- a/chip/stm32/gpio-stm32l.c +++ b/chip/stm32/gpio-stm32l.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/gpio-stm32l4.c b/chip/stm32/gpio-stm32l4.c index 2255e52363..1ef83a188a 100644 --- a/chip/stm32/gpio-stm32l4.c +++ b/chip/stm32/gpio-stm32l4.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/gpio-stm32l5.c b/chip/stm32/gpio-stm32l5.c index b1ab904dfc..e714164650 100644 --- a/chip/stm32/gpio-stm32l5.c +++ b/chip/stm32/gpio-stm32l5.c @@ -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. */ diff --git a/chip/stm32/gpio.c b/chip/stm32/gpio.c index 58a1f3581a..2ad9f99d79 100644 --- a/chip/stm32/gpio.c +++ b/chip/stm32/gpio.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/gpio_chip.h b/chip/stm32/gpio_chip.h index c15b3dfe42..0a52fe9191 100644 --- a/chip/stm32/gpio_chip.h +++ b/chip/stm32/gpio_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/host_command_common.c b/chip/stm32/host_command_common.c index faa866da25..10653a0711 100644 --- a/chip/stm32/host_command_common.c +++ b/chip/stm32/host_command_common.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/hwtimer.c b/chip/stm32/hwtimer.c index 2c96cd7b7f..3521347f3f 100644 --- a/chip/stm32/hwtimer.c +++ b/chip/stm32/hwtimer.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/hwtimer32.c b/chip/stm32/hwtimer32.c index 6d0fb86d18..0448d34e4b 100644 --- a/chip/stm32/hwtimer32.c +++ b/chip/stm32/hwtimer32.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/i2c-stm32f0.c b/chip/stm32/i2c-stm32f0.c index ade084d301..acd4d3aca6 100644 --- a/chip/stm32/i2c-stm32f0.c +++ b/chip/stm32/i2c-stm32f0.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/i2c-stm32f3.c b/chip/stm32/i2c-stm32f3.c index ade084d301..acd4d3aca6 100644 --- a/chip/stm32/i2c-stm32f3.c +++ b/chip/stm32/i2c-stm32f3.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/i2c-stm32f4.c b/chip/stm32/i2c-stm32f4.c index cdf4f3d1bd..9f4d799912 100644 --- a/chip/stm32/i2c-stm32f4.c +++ b/chip/stm32/i2c-stm32f4.c @@ -1,5 +1,5 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/i2c-stm32g4.c b/chip/stm32/i2c-stm32g4.c index 995cbdd7c5..66ec8173d8 100644 --- a/chip/stm32/i2c-stm32g4.c +++ b/chip/stm32/i2c-stm32g4.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/i2c-stm32l.c b/chip/stm32/i2c-stm32l.c index 4b4637deb8..f18374281a 100644 --- a/chip/stm32/i2c-stm32l.c +++ b/chip/stm32/i2c-stm32l.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/i2c-stm32l4.c b/chip/stm32/i2c-stm32l4.c index 99db878bd0..eeb87ec4e0 100644 --- a/chip/stm32/i2c-stm32l4.c +++ b/chip/stm32/i2c-stm32l4.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/i2c-stm32l5.c b/chip/stm32/i2c-stm32l5.c index 86cc1c6df2..3c7cb170bc 100644 --- a/chip/stm32/i2c-stm32l5.c +++ b/chip/stm32/i2c-stm32l5.c @@ -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. */ diff --git a/chip/stm32/i2c_ite_flash_support.c b/chip/stm32/i2c_ite_flash_support.c index fb916a64c2..8482065086 100644 --- a/chip/stm32/i2c_ite_flash_support.c +++ b/chip/stm32/i2c_ite_flash_support.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/keyboard_raw.c b/chip/stm32/keyboard_raw.c index 7da32a365b..c3244c19f7 100644 --- a/chip/stm32/keyboard_raw.c +++ b/chip/stm32/keyboard_raw.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/stm32/memory_regions.inc b/chip/stm32/memory_regions.inc index 2381c511f2..8c8e666f71 100644 --- a/chip/stm32/memory_regions.inc +++ b/chip/stm32/memory_regions.inc @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/otp-stm32f4.c b/chip/stm32/otp-stm32f4.c index b962a08cd8..ff6280ed20 100644 --- a/chip/stm32/otp-stm32f4.c +++ b/chip/stm32/otp-stm32f4.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/power_led.c b/chip/stm32/power_led.c index f2f38f21db..579925fff9 100644 --- a/chip/stm32/power_led.c +++ b/chip/stm32/power_led.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/pwm.c b/chip/stm32/pwm.c index 719d4af156..0f2e50c999 100644 --- a/chip/stm32/pwm.c +++ b/chip/stm32/pwm.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/pwm_chip.h b/chip/stm32/pwm_chip.h index 2ae5c152dd..7269072ac2 100644 --- a/chip/stm32/pwm_chip.h +++ b/chip/stm32/pwm_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/registers-stm32f0.h b/chip/stm32/registers-stm32f0.h index f81b663284..645ed5048e 100644 --- a/chip/stm32/registers-stm32f0.h +++ b/chip/stm32/registers-stm32f0.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/registers-stm32f3.h b/chip/stm32/registers-stm32f3.h index a96f98e38d..e88f5f7d52 100644 --- a/chip/stm32/registers-stm32f3.h +++ b/chip/stm32/registers-stm32f3.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/registers-stm32f4.h b/chip/stm32/registers-stm32f4.h index 37d9d88568..a415b80d5c 100644 --- a/chip/stm32/registers-stm32f4.h +++ b/chip/stm32/registers-stm32f4.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/registers-stm32f7.h b/chip/stm32/registers-stm32f7.h index f43b3b6828..a597cbfe68 100644 --- a/chip/stm32/registers-stm32f7.h +++ b/chip/stm32/registers-stm32f7.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/registers-stm32g4.h b/chip/stm32/registers-stm32g4.h index 20fc015d79..4610bb1e98 100644 --- a/chip/stm32/registers-stm32g4.h +++ b/chip/stm32/registers-stm32g4.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/registers-stm32h7.h b/chip/stm32/registers-stm32h7.h index 09081751c7..f4178d17f0 100644 --- a/chip/stm32/registers-stm32h7.h +++ b/chip/stm32/registers-stm32h7.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/registers-stm32l.h b/chip/stm32/registers-stm32l.h index 25f69487e4..07ead4411a 100644 --- a/chip/stm32/registers-stm32l.h +++ b/chip/stm32/registers-stm32l.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/registers-stm32l4.h b/chip/stm32/registers-stm32l4.h index c70a3bf862..b55204be5e 100644 --- a/chip/stm32/registers-stm32l4.h +++ b/chip/stm32/registers-stm32l4.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/registers-stm32l5.h b/chip/stm32/registers-stm32l5.h index 28b2a253d3..47f766e035 100644 --- a/chip/stm32/registers-stm32l5.h +++ b/chip/stm32/registers-stm32l5.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/registers.h b/chip/stm32/registers.h index 258c1b058e..2ec0ff28fc 100644 --- a/chip/stm32/registers.h +++ b/chip/stm32/registers.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/spi.c b/chip/stm32/spi.c index ca1f4ba6f1..e6be946113 100644 --- a/chip/stm32/spi.c +++ b/chip/stm32/spi.c @@ -1,5 +1,5 @@ /* - * Copyright 2013 The Chromium OS Authors. All rights reserved. + * Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/stm32/spi_controller-stm32h7.c b/chip/stm32/spi_controller-stm32h7.c index a1e7804217..705bf4e607 100644 --- a/chip/stm32/spi_controller-stm32h7.c +++ b/chip/stm32/spi_controller-stm32h7.c @@ -1,5 +1,5 @@ /* - * Copyright 2017 The Chromium OS Authors. All rights reserved. + * Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/stm32/spi_controller.c b/chip/stm32/spi_controller.c index 7d8ddd7e5c..70e0eb3cd7 100644 --- a/chip/stm32/spi_controller.c +++ b/chip/stm32/spi_controller.c @@ -1,5 +1,5 @@ /* - * Copyright 2014 The Chromium OS Authors. All rights reserved. + * Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/stm32/stm32-dma.h b/chip/stm32/stm32-dma.h index 06233b9c93..3bda9ec41d 100644 --- a/chip/stm32/stm32-dma.h +++ b/chip/stm32/stm32-dma.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/system.c b/chip/stm32/system.c index 95d26fa1ab..dc53022c8b 100644 --- a/chip/stm32/system.c +++ b/chip/stm32/system.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/trng.c b/chip/stm32/trng.c index 90e6651cb4..aafc0e89c1 100644 --- a/chip/stm32/trng.c +++ b/chip/stm32/trng.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/uart.c b/chip/stm32/uart.c index 121a5fce96..1bb961a935 100644 --- a/chip/stm32/uart.c +++ b/chip/stm32/uart.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/ucpd-stm32gx.c b/chip/stm32/ucpd-stm32gx.c index a00f6172a0..3fec860200 100644 --- a/chip/stm32/ucpd-stm32gx.c +++ b/chip/stm32/ucpd-stm32gx.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/ucpd-stm32gx.h b/chip/stm32/ucpd-stm32gx.h index c8c040b163..d41503f9ef 100644 --- a/chip/stm32/ucpd-stm32gx.h +++ b/chip/stm32/ucpd-stm32gx.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usart-stm32f0.c b/chip/stm32/usart-stm32f0.c index ca618608ee..56325cdc74 100644 --- a/chip/stm32/usart-stm32f0.c +++ b/chip/stm32/usart-stm32f0.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usart-stm32f0.h b/chip/stm32/usart-stm32f0.h index 1b7eee95a7..72c88fba9c 100644 --- a/chip/stm32/usart-stm32f0.h +++ b/chip/stm32/usart-stm32f0.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usart-stm32f3.c b/chip/stm32/usart-stm32f3.c index 7bc6a8c8f5..f5a138643c 100644 --- a/chip/stm32/usart-stm32f3.c +++ b/chip/stm32/usart-stm32f3.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usart-stm32f3.h b/chip/stm32/usart-stm32f3.h index 09f1ba608c..e1c391183d 100644 --- a/chip/stm32/usart-stm32f3.h +++ b/chip/stm32/usart-stm32f3.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usart-stm32f4.c b/chip/stm32/usart-stm32f4.c index 9df7a6322b..a710760e3a 100644 --- a/chip/stm32/usart-stm32f4.c +++ b/chip/stm32/usart-stm32f4.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usart-stm32f4.h b/chip/stm32/usart-stm32f4.h index 49af2af405..5ecb4d62e1 100644 --- a/chip/stm32/usart-stm32f4.h +++ b/chip/stm32/usart-stm32f4.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usart-stm32l.c b/chip/stm32/usart-stm32l.c index a1eb7becd0..dc300d598a 100644 --- a/chip/stm32/usart-stm32l.c +++ b/chip/stm32/usart-stm32l.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usart-stm32l.h b/chip/stm32/usart-stm32l.h index eb1ae9db1d..2bb92fe1c7 100644 --- a/chip/stm32/usart-stm32l.h +++ b/chip/stm32/usart-stm32l.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usart-stm32l5.c b/chip/stm32/usart-stm32l5.c index 73f0c3c3cb..30e0f009ff 100644 --- a/chip/stm32/usart-stm32l5.c +++ b/chip/stm32/usart-stm32l5.c @@ -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. */ diff --git a/chip/stm32/usart-stm32l5.h b/chip/stm32/usart-stm32l5.h index 5bac6e0291..ccc0985bda 100644 --- a/chip/stm32/usart-stm32l5.h +++ b/chip/stm32/usart-stm32l5.h @@ -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. */ diff --git a/chip/stm32/usart.c b/chip/stm32/usart.c index 423ef3904a..be9d0a4571 100644 --- a/chip/stm32/usart.c +++ b/chip/stm32/usart.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usart.h b/chip/stm32/usart.h index 6999df5ac0..9067fd4b6a 100644 --- a/chip/stm32/usart.h +++ b/chip/stm32/usart.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usart_host_command.c b/chip/stm32/usart_host_command.c index b410bb41ed..437975e609 100644 --- a/chip/stm32/usart_host_command.c +++ b/chip/stm32/usart_host_command.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usart_host_command.h b/chip/stm32/usart_host_command.h index d73930c902..ee4bdd88dc 100644 --- a/chip/stm32/usart_host_command.h +++ b/chip/stm32/usart_host_command.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usart_info_command.c b/chip/stm32/usart_info_command.c index 8098a27463..ca73b51210 100644 --- a/chip/stm32/usart_info_command.c +++ b/chip/stm32/usart_info_command.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/stm32/usart_rx_dma.c b/chip/stm32/usart_rx_dma.c index 043372f1a9..21c8313c73 100644 --- a/chip/stm32/usart_rx_dma.c +++ b/chip/stm32/usart_rx_dma.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usart_rx_dma.h b/chip/stm32/usart_rx_dma.h index 30c5d60d30..6d273d18b9 100644 --- a/chip/stm32/usart_rx_dma.h +++ b/chip/stm32/usart_rx_dma.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/stm32/usart_rx_interrupt-stm32f0.c b/chip/stm32/usart_rx_interrupt-stm32f0.c index 4d5060a26e..dfbe6ec3ff 100644 --- a/chip/stm32/usart_rx_interrupt-stm32f0.c +++ b/chip/stm32/usart_rx_interrupt-stm32f0.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usart_rx_interrupt-stm32f3.c b/chip/stm32/usart_rx_interrupt-stm32f3.c index 4d5060a26e..dfbe6ec3ff 100644 --- a/chip/stm32/usart_rx_interrupt-stm32f3.c +++ b/chip/stm32/usart_rx_interrupt-stm32f3.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usart_rx_interrupt-stm32f4.c b/chip/stm32/usart_rx_interrupt-stm32f4.c index 7035a21a4a..1d86c7d5b6 100644 --- a/chip/stm32/usart_rx_interrupt-stm32f4.c +++ b/chip/stm32/usart_rx_interrupt-stm32f4.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usart_rx_interrupt-stm32l.c b/chip/stm32/usart_rx_interrupt-stm32l.c index 3500fe6fab..750809307b 100644 --- a/chip/stm32/usart_rx_interrupt-stm32l.c +++ b/chip/stm32/usart_rx_interrupt-stm32l.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usart_rx_interrupt-stm32l5.c b/chip/stm32/usart_rx_interrupt-stm32l5.c index fa644b6baf..45c2ecca9f 100644 --- a/chip/stm32/usart_rx_interrupt-stm32l5.c +++ b/chip/stm32/usart_rx_interrupt-stm32l5.c @@ -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. */ diff --git a/chip/stm32/usart_rx_interrupt.c b/chip/stm32/usart_rx_interrupt.c index 4d5060a26e..dfbe6ec3ff 100644 --- a/chip/stm32/usart_rx_interrupt.c +++ b/chip/stm32/usart_rx_interrupt.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usart_tx_dma.c b/chip/stm32/usart_tx_dma.c index 895c8c0930..8128231ff7 100644 --- a/chip/stm32/usart_tx_dma.c +++ b/chip/stm32/usart_tx_dma.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usart_tx_dma.h b/chip/stm32/usart_tx_dma.h index 136df1584d..f1028e3a9e 100644 --- a/chip/stm32/usart_tx_dma.h +++ b/chip/stm32/usart_tx_dma.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/stm32/usart_tx_interrupt.c b/chip/stm32/usart_tx_interrupt.c index 32bf69b0c5..80d1d4df0f 100644 --- a/chip/stm32/usart_tx_interrupt.c +++ b/chip/stm32/usart_tx_interrupt.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usb-stm32f0.c b/chip/stm32/usb-stm32f0.c index 08c0a17455..227842f549 100644 --- a/chip/stm32/usb-stm32f0.c +++ b/chip/stm32/usb-stm32f0.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/stm32/usb-stm32f3.c b/chip/stm32/usb-stm32f3.c index 2376d00b41..eb48129e09 100644 --- a/chip/stm32/usb-stm32f3.c +++ b/chip/stm32/usb-stm32f3.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/stm32/usb-stm32f3.h b/chip/stm32/usb-stm32f3.h index 196c43a53a..62921fe491 100644 --- a/chip/stm32/usb-stm32f3.h +++ b/chip/stm32/usb-stm32f3.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/stm32/usb-stm32g4.c b/chip/stm32/usb-stm32g4.c index b4402f670d..acd758584b 100644 --- a/chip/stm32/usb-stm32g4.c +++ b/chip/stm32/usb-stm32g4.c @@ -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. * diff --git a/chip/stm32/usb-stm32l.c b/chip/stm32/usb-stm32l.c index bb9838531b..3780dfed10 100644 --- a/chip/stm32/usb-stm32l.c +++ b/chip/stm32/usb-stm32l.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/stm32/usb-stm32l5.c b/chip/stm32/usb-stm32l5.c index 9eaa622815..a286ab488e 100644 --- a/chip/stm32/usb-stm32l5.c +++ b/chip/stm32/usb-stm32l5.c @@ -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. */ diff --git a/chip/stm32/usb-stream.c b/chip/stm32/usb-stream.c index f762c466a1..76f7fbd340 100644 --- a/chip/stm32/usb-stream.c +++ b/chip/stm32/usb-stream.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usb-stream.h b/chip/stm32/usb-stream.h index 677ae462fd..b22ee56620 100644 --- a/chip/stm32/usb-stream.h +++ b/chip/stm32/usb-stream.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usb.c b/chip/stm32/usb.c index 297f2a3a74..1c621a32b3 100644 --- a/chip/stm32/usb.c +++ b/chip/stm32/usb.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usb_console.c b/chip/stm32/usb_console.c index 12b9c9a79d..fdadc243c1 100644 --- a/chip/stm32/usb_console.c +++ b/chip/stm32/usb_console.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usb_dfu_runtime.c b/chip/stm32/usb_dfu_runtime.c index fa26640732..92e152078b 100644 --- a/chip/stm32/usb_dfu_runtime.c +++ b/chip/stm32/usb_dfu_runtime.c @@ -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. */ diff --git a/chip/stm32/usb_dfu_runtime.h b/chip/stm32/usb_dfu_runtime.h index 9185dc9bbc..8b0bbbe219 100644 --- a/chip/stm32/usb_dfu_runtime.h +++ b/chip/stm32/usb_dfu_runtime.h @@ -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. */ diff --git a/chip/stm32/usb_dwc.c b/chip/stm32/usb_dwc.c index 1b8550a50b..67f89a5222 100644 --- a/chip/stm32/usb_dwc.c +++ b/chip/stm32/usb_dwc.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usb_dwc_console.c b/chip/stm32/usb_dwc_console.c index b979394033..fd66db7380 100644 --- a/chip/stm32/usb_dwc_console.c +++ b/chip/stm32/usb_dwc_console.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usb_dwc_console.h b/chip/stm32/usb_dwc_console.h index f8a25d3894..f0a0732c7d 100644 --- a/chip/stm32/usb_dwc_console.h +++ b/chip/stm32/usb_dwc_console.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usb_dwc_hw.h b/chip/stm32/usb_dwc_hw.h index 14dcda608e..ea87869257 100644 --- a/chip/stm32/usb_dwc_hw.h +++ b/chip/stm32/usb_dwc_hw.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usb_dwc_i2c.h b/chip/stm32/usb_dwc_i2c.h index e44002268a..6e6c72e22c 100644 --- a/chip/stm32/usb_dwc_i2c.h +++ b/chip/stm32/usb_dwc_i2c.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usb_dwc_registers.h b/chip/stm32/usb_dwc_registers.h index 74e18dfc34..b5ada2ce65 100644 --- a/chip/stm32/usb_dwc_registers.h +++ b/chip/stm32/usb_dwc_registers.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/stm32/usb_dwc_stream.c b/chip/stm32/usb_dwc_stream.c index 8d83069309..670c93b437 100644 --- a/chip/stm32/usb_dwc_stream.c +++ b/chip/stm32/usb_dwc_stream.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usb_dwc_stream.h b/chip/stm32/usb_dwc_stream.h index 979f0a7e72..7e5e938053 100644 --- a/chip/stm32/usb_dwc_stream.h +++ b/chip/stm32/usb_dwc_stream.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usb_dwc_update.h b/chip/stm32/usb_dwc_update.h index 6d79f3aca9..1d5027a01f 100644 --- a/chip/stm32/usb_dwc_update.h +++ b/chip/stm32/usb_dwc_update.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usb_endpoints.c b/chip/stm32/usb_endpoints.c index e08a69f759..b435a88846 100644 --- a/chip/stm32/usb_endpoints.c +++ b/chip/stm32/usb_endpoints.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/stm32/usb_gpio.c b/chip/stm32/usb_gpio.c index c5bbd4a97d..a0655fd045 100644 --- a/chip/stm32/usb_gpio.c +++ b/chip/stm32/usb_gpio.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usb_gpio.h b/chip/stm32/usb_gpio.h index f6fafeeb39..a54801048b 100644 --- a/chip/stm32/usb_gpio.h +++ b/chip/stm32/usb_gpio.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usb_hid.c b/chip/stm32/usb_hid.c index 2c52a7d61f..e9426b690d 100644 --- a/chip/stm32/usb_hid.c +++ b/chip/stm32/usb_hid.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usb_hid_hw.h b/chip/stm32/usb_hid_hw.h index d4df34073d..54bfca0808 100644 --- a/chip/stm32/usb_hid_hw.h +++ b/chip/stm32/usb_hid_hw.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/chip/stm32/usb_hid_keyboard.c b/chip/stm32/usb_hid_keyboard.c index 8e96b6587a..7f3caac960 100644 --- a/chip/stm32/usb_hid_keyboard.c +++ b/chip/stm32/usb_hid_keyboard.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usb_hid_touchpad.c b/chip/stm32/usb_hid_touchpad.c index d15a8fc86a..15dd38756f 100644 --- a/chip/stm32/usb_hid_touchpad.c +++ b/chip/stm32/usb_hid_touchpad.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usb_hw.h b/chip/stm32/usb_hw.h index 33f55f083e..511cd9c75a 100644 --- a/chip/stm32/usb_hw.h +++ b/chip/stm32/usb_hw.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usb_isochronous.c b/chip/stm32/usb_isochronous.c index 32ed1af3e3..ad20b6d1ca 100644 --- a/chip/stm32/usb_isochronous.c +++ b/chip/stm32/usb_isochronous.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usb_isochronous.h b/chip/stm32/usb_isochronous.h index f751eb0b22..a96b6db876 100644 --- a/chip/stm32/usb_isochronous.h +++ b/chip/stm32/usb_isochronous.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usb_pd_phy.c b/chip/stm32/usb_pd_phy.c index 6acbd09dcf..9536301863 100644 --- a/chip/stm32/usb_pd_phy.c +++ b/chip/stm32/usb_pd_phy.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usb_power.c b/chip/stm32/usb_power.c index 8024239d74..589767f15c 100644 --- a/chip/stm32/usb_power.c +++ b/chip/stm32/usb_power.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usb_power.h b/chip/stm32/usb_power.h index 2802148552..1445fcea0f 100644 --- a/chip/stm32/usb_power.h +++ b/chip/stm32/usb_power.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usb_spi.c b/chip/stm32/usb_spi.c index d5ea71f2ba..5ea813a86c 100644 --- a/chip/stm32/usb_spi.c +++ b/chip/stm32/usb_spi.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/usb_spi.h b/chip/stm32/usb_spi.h index 12be68c2b1..3ff582dd14 100644 --- a/chip/stm32/usb_spi.h +++ b/chip/stm32/usb_spi.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/chip/stm32/watchdog.c b/chip/stm32/watchdog.c index 0c7d017382..1a54d6f52d 100644 --- a/chip/stm32/watchdog.c +++ b/chip/stm32/watchdog.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/accel_cal.c b/common/accel_cal.c index ecb9fcfac3..0fe9fe7656 100644 --- a/common/accel_cal.c +++ b/common/accel_cal.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/acpi.c b/common/acpi.c index 0b81be329a..86217ab1ba 100644 --- a/common/acpi.c +++ b/common/acpi.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/adc.c b/common/adc.c index c244a9f380..89e0b1f645 100644 --- a/common/adc.c +++ b/common/adc.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/als.c b/common/als.c index bc2050d61f..832ed382f3 100644 --- a/common/als.c +++ b/common/als.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/ap_hang_detect.c b/common/ap_hang_detect.c index 7687296f4f..6e3d7177a7 100644 --- a/common/ap_hang_detect.c +++ b/common/ap_hang_detect.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/audio_codec.c b/common/audio_codec.c index 719adb5d08..aba1453ce3 100644 --- a/common/audio_codec.c +++ b/common/audio_codec.c @@ -1,5 +1,5 @@ /* - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/audio_codec_dmic.c b/common/audio_codec_dmic.c index d3a6adccd2..d85245791d 100644 --- a/common/audio_codec_dmic.c +++ b/common/audio_codec_dmic.c @@ -1,5 +1,5 @@ /* - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/audio_codec_i2s_rx.c b/common/audio_codec_i2s_rx.c index 9c5b3ba03a..ac6aa8ecce 100644 --- a/common/audio_codec_i2s_rx.c +++ b/common/audio_codec_i2s_rx.c @@ -1,5 +1,5 @@ /* - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/audio_codec_wov.c b/common/audio_codec_wov.c index fc45d5682c..7c7b43acae 100644 --- a/common/audio_codec_wov.c +++ b/common/audio_codec_wov.c @@ -1,5 +1,5 @@ /* - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/backlight_lid.c b/common/backlight_lid.c index 82bffaf383..f8fd8d637f 100644 --- a/common/backlight_lid.c +++ b/common/backlight_lid.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/base32.c b/common/base32.c index aaadad14ce..fc3fe3c8ae 100644 --- a/common/base32.c +++ b/common/base32.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/base_state.c b/common/base_state.c index 91a4e6d0ec..f90a5e7ce5 100644 --- a/common/base_state.c +++ b/common/base_state.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/battery.c b/common/battery.c index dbbe648360..00c9540a1f 100644 --- a/common/battery.c +++ b/common/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/common/battery_fuel_gauge.c b/common/battery_fuel_gauge.c index a89a6f22eb..0382abca26 100644 --- a/common/battery_fuel_gauge.c +++ b/common/battery_fuel_gauge.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/common/battery_v1.c b/common/battery_v1.c index b53e57df8a..e7507cf75d 100644 --- a/common/battery_v1.c +++ b/common/battery_v1.c @@ -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. * diff --git a/common/battery_v2.c b/common/battery_v2.c index 67bfedab4c..2bd274b465 100644 --- a/common/battery_v2.c +++ b/common/battery_v2.c @@ -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. * diff --git a/common/blink.c b/common/blink.c index 22523021dc..dcd6f0bdaa 100644 --- a/common/blink.c +++ b/common/blink.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/bluetooth_le.c b/common/bluetooth_le.c index d9a43a74da..3108553a8b 100644 --- a/common/bluetooth_le.c +++ b/common/bluetooth_le.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/body_detection.c b/common/body_detection.c index ebb1db59dc..848c4f08c1 100644 --- a/common/body_detection.c +++ b/common/body_detection.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/btle_hci_controller.c b/common/btle_hci_controller.c index 7df66d4a82..a4dcadaccf 100644 --- a/common/btle_hci_controller.c +++ b/common/btle_hci_controller.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/btle_ll.c b/common/btle_ll.c index d167541efc..71ca108565 100644 --- a/common/btle_ll.c +++ b/common/btle_ll.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/build.mk b/common/build.mk index 22139e5784..f784d57732 100644 --- a/common/build.mk +++ b/common/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2014 The Chromium OS Authors. All rights reserved. +# Copyright 2014 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/common/button.c b/common/button.c index 79d51bce99..53745adaef 100644 --- a/common/button.c +++ b/common/button.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/capsense.c b/common/capsense.c index ede5a05190..2c2bbd6db5 100644 --- a/common/capsense.c +++ b/common/capsense.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/cbi.c b/common/cbi.c index a3cb3c210f..26125c902e 100644 --- a/common/cbi.c +++ b/common/cbi.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/common/cbi_eeprom.c b/common/cbi_eeprom.c index 68998ab94f..da7d85f21b 100644 --- a/common/cbi_eeprom.c +++ b/common/cbi_eeprom.c @@ -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. */ diff --git a/common/cbi_gpio.c b/common/cbi_gpio.c index ea7e13c629..09e1dd3a18 100644 --- a/common/cbi_gpio.c +++ b/common/cbi_gpio.c @@ -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. */ diff --git a/common/cec.c b/common/cec.c index c487e51b16..4b15fc1799 100644 --- a/common/cec.c +++ b/common/cec.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/charge_manager.c b/common/charge_manager.c index 7da64395fe..3e8b937e53 100644 --- a/common/charge_manager.c +++ b/common/charge_manager.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/charge_ramp.c b/common/charge_ramp.c index 2db9dbb2f5..2c84087e21 100644 --- a/common/charge_ramp.c +++ b/common/charge_ramp.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/charge_ramp_sw.c b/common/charge_ramp_sw.c index 3d2aa88b76..4c09a94a8d 100644 --- a/common/charge_ramp_sw.c +++ b/common/charge_ramp_sw.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/charge_state_v2.c b/common/charge_state_v2.c index ec18930dcd..9b567ba2ff 100644 --- a/common/charge_state_v2.c +++ b/common/charge_state_v2.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/common/chargen.c b/common/chargen.c index 19f90cfe69..cfbf8bb2ca 100644 --- a/common/chargen.c +++ b/common/chargen.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/charger.c b/common/charger.c index 759071782c..81404ed275 100644 --- a/common/charger.c +++ b/common/charger.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/common/charger_profile_override.c b/common/charger_profile_override.c index 604da16b6f..00aaa2b5bd 100644 --- a/common/charger_profile_override.c +++ b/common/charger_profile_override.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/common/chargesplash.c b/common/chargesplash.c index bc99f9a68f..17da9a5c8c 100644 --- a/common/chargesplash.c +++ b/common/chargesplash.c @@ -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. */ diff --git a/common/chipset.c b/common/chipset.c index d4f5517238..55964e4ba9 100644 --- a/common/chipset.c +++ b/common/chipset.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/clz.c b/common/clz.c index b0b58e76a0..178c44d345 100644 --- a/common/clz.c +++ b/common/clz.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/common/console.c b/common/console.c index efb37f467d..9e7d6ad036 100644 --- a/common/console.c +++ b/common/console.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/console_output.c b/common/console_output.c index ed79525ae8..24bdb5aa3a 100644 --- a/common/console_output.c +++ b/common/console_output.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/crc.c b/common/crc.c index 8b45150b67..a53cf91d47 100644 --- a/common/crc.c +++ b/common/crc.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/crc8.c b/common/crc8.c index 8098fa74eb..0aba3e80a3 100644 --- a/common/crc8.c +++ b/common/crc8.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/ctz.c b/common/ctz.c index a2b083baa7..ad144225f0 100644 --- a/common/ctz.c +++ b/common/ctz.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/common/device_event.c b/common/device_event.c index 154801243f..b9e1bafc69 100644 --- a/common/device_event.c +++ b/common/device_event.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/device_state.c b/common/device_state.c index 16d0fb4f86..1739a9beb2 100644 --- a/common/device_state.c +++ b/common/device_state.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/dps.c b/common/dps.c index 96a3eb30d9..13f551a95d 100644 --- a/common/dps.c +++ b/common/dps.c @@ -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. * diff --git a/common/dptf.c b/common/dptf.c index 13191c8e2c..003ac9f32c 100644 --- a/common/dptf.c +++ b/common/dptf.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/ec.libsharedobjs.ld b/common/ec.libsharedobjs.ld index adf5081640..57b67daecc 100644 --- a/common/ec.libsharedobjs.ld +++ b/common/ec.libsharedobjs.ld @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/ec_ec_comm_client.c b/common/ec_ec_comm_client.c index 1f87ad96cf..193d121343 100644 --- a/common/ec_ec_comm_client.c +++ b/common/ec_ec_comm_client.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/common/ec_ec_comm_server.c b/common/ec_ec_comm_server.c index 3a2a884317..6f37004513 100644 --- a/common/ec_ec_comm_server.c +++ b/common/ec_ec_comm_server.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/common/ec_features.c b/common/ec_features.c index 5028b5b012..a45204b7a1 100644 --- a/common/ec_features.c +++ b/common/ec_features.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/espi.c b/common/espi.c index d4324c1b31..dfb1f90749 100644 --- a/common/espi.c +++ b/common/espi.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/event_log.c b/common/event_log.c index cc7bcdbec7..f748b3d9a7 100644 --- a/common/event_log.c +++ b/common/event_log.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/extpower_common.c b/common/extpower_common.c index 9021b77626..9f0947a529 100644 --- a/common/extpower_common.c +++ b/common/extpower_common.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/extpower_gpio.c b/common/extpower_gpio.c index 9bcda2e354..8b41ec2075 100644 --- a/common/extpower_gpio.c +++ b/common/extpower_gpio.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/fan.c b/common/fan.c index 6454204098..ddc15a4288 100644 --- a/common/fan.c +++ b/common/fan.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/firmware_image.S b/common/firmware_image.S index 193719608f..cc9034b89d 100644 --- a/common/firmware_image.S +++ b/common/firmware_image.S @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/common/firmware_image.lds.S b/common/firmware_image.lds.S index 04249367b8..5bcd6efb5f 100644 --- a/common/firmware_image.lds.S +++ b/common/firmware_image.lds.S @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/flash.c b/common/flash.c index d32bbb6614..0a027fd312 100644 --- a/common/flash.c +++ b/common/flash.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/fmap.c b/common/fmap.c index 56918c827a..469fac0ceb 100644 --- a/common/fmap.c +++ b/common/fmap.c @@ -1,5 +1,5 @@ /* - * Copyright 2012 The Chromium OS Authors. All rights reserved. + * Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/fpsensor/build.mk b/common/fpsensor/build.mk index b2bb248efc..2b476bfa51 100644 --- a/common/fpsensor/build.mk +++ b/common/fpsensor/build.mk @@ -1,4 +1,4 @@ -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/common/fpsensor/fpsensor.c b/common/fpsensor/fpsensor.c index 4ff77b6577..bd09ed5c3a 100644 --- a/common/fpsensor/fpsensor.c +++ b/common/fpsensor/fpsensor.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -481,7 +481,11 @@ static enum ec_status fp_command_frame(struct host_cmd_handler_args *args) FP_CONTEXT_ENCRYPTION_SALT_BYTES); trng_exit(); - if (fgr == template_newly_enrolled) { + /* + * TODO(http://b/244781166): Use consistent types so cast is + * not needed. + */ + if (fgr == (uint32_t)template_newly_enrolled) { /* * Newly enrolled templates need new positive match * salt, new positive match secret and new validation diff --git a/common/fpsensor/fpsensor_crypto.c b/common/fpsensor/fpsensor_crypto.c index d8f2f1daa6..257042197e 100644 --- a/common/fpsensor/fpsensor_crypto.c +++ b/common/fpsensor/fpsensor_crypto.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/fpsensor/fpsensor_detect_strings.c b/common/fpsensor/fpsensor_detect_strings.c index 352dc90ee5..af08219ced 100644 --- a/common/fpsensor/fpsensor_detect_strings.c +++ b/common/fpsensor/fpsensor_detect_strings.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/fpsensor/fpsensor_private.h b/common/fpsensor/fpsensor_private.h index 90ba358244..919c523273 100644 --- a/common/fpsensor/fpsensor_private.h +++ b/common/fpsensor/fpsensor_private.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/fpsensor/fpsensor_state.c b/common/fpsensor/fpsensor_state.c index d7bdced69b..8153df9883 100644 --- a/common/fpsensor/fpsensor_state.c +++ b/common/fpsensor/fpsensor_state.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/gesture.c b/common/gesture.c index 0ade256336..99d054783d 100644 --- a/common/gesture.c +++ b/common/gesture.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/gpio.c b/common/gpio.c index 90fb7d9445..2e76116e4c 100644 --- a/common/gpio.c +++ b/common/gpio.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/gpio_commands.c b/common/gpio_commands.c index 9524235773..d6257ea61d 100644 --- a/common/gpio_commands.c +++ b/common/gpio_commands.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/gyro_cal.c b/common/gyro_cal.c index 572e401b18..8996b85757 100644 --- a/common/gyro_cal.c +++ b/common/gyro_cal.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/gyro_still_det.c b/common/gyro_still_det.c index 4574e22e5f..303b73b15f 100644 --- a/common/gyro_still_det.c +++ b/common/gyro_still_det.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/hooks.c b/common/hooks.c index 33f377d134..3bd9689d64 100644 --- a/common/hooks.c +++ b/common/hooks.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/host_command.c b/common/host_command.c index 2399dcb236..89a835a1aa 100644 --- a/common/host_command.c +++ b/common/host_command.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/host_command_controller.c b/common/host_command_controller.c index 51f72e6aef..83d4ce0c86 100644 --- a/common/host_command_controller.c +++ b/common/host_command_controller.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/host_command_pd.c b/common/host_command_pd.c index c14c5b7a97..23e2710695 100644 --- a/common/host_command_pd.c +++ b/common/host_command_pd.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/host_event_commands.c b/common/host_event_commands.c index a29435066a..58bca7073e 100644 --- a/common/host_event_commands.c +++ b/common/host_event_commands.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/hotword_dsp_api.c b/common/hotword_dsp_api.c index dc53cd0055..24291df8c0 100644 --- a/common/hotword_dsp_api.c +++ b/common/hotword_dsp_api.c @@ -1,5 +1,5 @@ /* - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/i2c_bitbang.c b/common/i2c_bitbang.c index ab1dcfd968..01d4f5f31e 100644 --- a/common/i2c_bitbang.c +++ b/common/i2c_bitbang.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/i2c_controller.c b/common/i2c_controller.c index 6b7f218fda..146d582c0d 100644 --- a/common/i2c_controller.c +++ b/common/i2c_controller.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/i2c_hid_touchpad.c b/common/i2c_hid_touchpad.c index 1c467cd6f6..02261d8fa4 100644 --- a/common/i2c_hid_touchpad.c +++ b/common/i2c_hid_touchpad.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/i2c_peripheral.c b/common/i2c_peripheral.c index 545ad5b53c..3aa1951b91 100644 --- a/common/i2c_peripheral.c +++ b/common/i2c_peripheral.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/i2c_trace.c b/common/i2c_trace.c index 1351639c20..c7207698b7 100644 --- a/common/i2c_trace.c +++ b/common/i2c_trace.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/i2c_wedge.c b/common/i2c_wedge.c index 6e5e66a939..ff8c5d494f 100644 --- a/common/i2c_wedge.c +++ b/common/i2c_wedge.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/inductive_charging.c b/common/inductive_charging.c index 793f535afe..9700e37dcc 100644 --- a/common/inductive_charging.c +++ b/common/inductive_charging.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/init_rom.c b/common/init_rom.c index 2cee57f922..102c3a00ae 100644 --- a/common/init_rom.c +++ b/common/init_rom.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/ioexpander.c b/common/ioexpander.c index 7b753b2f05..0a08f37c46 100644 --- a/common/ioexpander.c +++ b/common/ioexpander.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/ioexpander_commands.c b/common/ioexpander_commands.c index c8b1cb0262..38ab82565a 100644 --- a/common/ioexpander_commands.c +++ b/common/ioexpander_commands.c @@ -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. */ diff --git a/common/irq_locking.c b/common/irq_locking.c index 3606b7aa15..1146145c5e 100644 --- a/common/irq_locking.c +++ b/common/irq_locking.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/kasa.c b/common/kasa.c index 79c75ad55b..6b974dc574 100644 --- a/common/kasa.c +++ b/common/kasa.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/keyboard_8042.c b/common/keyboard_8042.c index 013c230094..e0371ddd5c 100644 --- a/common/keyboard_8042.c +++ b/common/keyboard_8042.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/common/keyboard_8042_sharedlib.c b/common/keyboard_8042_sharedlib.c index 2eab9ae528..3e98c977b7 100644 --- a/common/keyboard_8042_sharedlib.c +++ b/common/keyboard_8042_sharedlib.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/common/keyboard_backlight.c b/common/keyboard_backlight.c index 80ff4d3132..3109062cf4 100644 --- a/common/keyboard_backlight.c +++ b/common/keyboard_backlight.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/keyboard_mkbp.c b/common/keyboard_mkbp.c index 9f9e15fce1..fa003c31a2 100644 --- a/common/keyboard_mkbp.c +++ b/common/keyboard_mkbp.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/common/keyboard_scan.c b/common/keyboard_scan.c index b57782ecc7..6c3756170b 100644 --- a/common/keyboard_scan.c +++ b/common/keyboard_scan.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -138,7 +138,7 @@ static volatile int kbd_polls; /* If true, we'll force a keyboard poll */ static volatile int force_poll; -static int keyboard_scan_is_enabled(void) +test_export_static int keyboard_scan_is_enabled(void) { /* NOTE: this is just an instantaneous glimpse of the variable. */ return !disable_scanning_mask; @@ -572,7 +572,7 @@ static int has_ghosting(const uint8_t *state) } /* Inform keyboard module if scanning is enabled */ -static void key_state_changed(int row, int col, uint8_t state) +test_mockable_static void key_state_changed(int row, int col, uint8_t state) { if (!keyboard_scan_is_enabled()) return; @@ -1237,3 +1237,15 @@ static int command_keyboard_press(int argc, const char **argv) DECLARE_CONSOLE_COMMAND(kbpress, command_keyboard_press, "[col row [0 | 1]]", "Simulate keypress"); #endif + +#ifdef TEST_BUILD +__test_only int keyboard_scan_get_print_state_changes(void) +{ + return print_state_changes; +} + +__test_only void keyboard_scan_set_print_state_changes(int val) +{ + print_state_changes = val; +} +#endif /* TEST_BUILD */ diff --git a/common/keyboard_test.c b/common/keyboard_test.c index 79345a1b4c..eb6fc11bdd 100644 --- a/common/keyboard_test.c +++ b/common/keyboard_test.c @@ -1,5 +1,5 @@ /* - * Copyright 2013 The Chromium OS Authors. All rights reserved. + * Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/keyboard_vivaldi.c b/common/keyboard_vivaldi.c index 9d0e4f9eee..11f5b708e6 100644 --- a/common/keyboard_vivaldi.c +++ b/common/keyboard_vivaldi.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/lb_common.c b/common/lb_common.c index 5d565bb77f..eca21bfb03 100644 --- a/common/lb_common.c +++ b/common/lb_common.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/common/led_common.c b/common/led_common.c index 69fb120fe9..2c73ba95e6 100644 --- a/common/led_common.c +++ b/common/led_common.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/common/led_onoff_states.c b/common/led_onoff_states.c index a021946fc3..244257cf1d 100644 --- a/common/led_onoff_states.c +++ b/common/led_onoff_states.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/common/led_policy_std.c b/common/led_policy_std.c index 9a34abd6eb..fe8570df87 100644 --- a/common/led_policy_std.c +++ b/common/led_policy_std.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/common/led_pwm.c b/common/led_pwm.c index 203d3f83f5..c088ba0b40 100644 --- a/common/led_pwm.c +++ b/common/led_pwm.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/lid_angle.c b/common/lid_angle.c index 6ad65976a3..86b6884058 100644 --- a/common/lid_angle.c +++ b/common/lid_angle.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/lid_switch.c b/common/lid_switch.c index 9b355b9cb4..f0231b1ee7 100644 --- a/common/lid_switch.c +++ b/common/lid_switch.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/lightbar.c b/common/lightbar.c index b3fe6dc032..8a6a874b34 100644 --- a/common/lightbar.c +++ b/common/lightbar.c @@ -1,5 +1,5 @@ /* - * Copyright 2012 The Chromium OS Authors. All rights reserved. + * Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/common/mag_cal.c b/common/mag_cal.c index 84e6e7f234..a9ce95798c 100644 --- a/common/mag_cal.c +++ b/common/mag_cal.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/main.c b/common/main.c index 52fb0823ee..ef5aef8acf 100644 --- a/common/main.c +++ b/common/main.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/common/mat33.c b/common/mat33.c index 2d806ef37a..844fd0b8cc 100644 --- a/common/mat33.c +++ b/common/mat33.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/mat44.c b/common/mat44.c index a4232bf8d4..d48ca4f596 100644 --- a/common/mat44.c +++ b/common/mat44.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/math_util.c b/common/math_util.c index 3640f15ed9..c0a279b825 100644 --- a/common/math_util.c +++ b/common/math_util.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/memory_commands.c b/common/memory_commands.c index 2dd181df04..cb53c4890a 100644 --- a/common/memory_commands.c +++ b/common/memory_commands.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/mkbp_event.c b/common/mkbp_event.c index 40c4f5f8bb..2eedbc9ff7 100644 --- a/common/mkbp_event.c +++ b/common/mkbp_event.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * @@ -201,7 +201,7 @@ static inline int host_is_sleeping(void) static void force_mkbp_if_events(void); DECLARE_DEFERRED(force_mkbp_if_events); -static void activate_mkbp_with_events(uint32_t events_to_add) +test_export_static void activate_mkbp_with_events(uint32_t events_to_add) { int interrupt_id = -1; int skip_interrupt = 0; @@ -576,3 +576,12 @@ DECLARE_CONSOLE_COMMAND(mkbpwakemask, command_mkbp_wake_mask, "[event | hostevent] [new_mask]", "Show or set MKBP event/hostevent wake mask"); #endif /* CONFIG_MKBP_(HOST)?EVENT_WAKEUP_MASK */ + +#ifdef TEST_BUILD +void mkbp_event_clear_all(void) +{ + mutex_lock(&state.lock); + state.events = 0; + mutex_unlock(&state.lock); +} +#endif diff --git a/common/mkbp_fifo.c b/common/mkbp_fifo.c index 90c519112f..dfcf87814e 100644 --- a/common/mkbp_fifo.c +++ b/common/mkbp_fifo.c @@ -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. * diff --git a/common/mkbp_info.c b/common/mkbp_info.c index 52d26f407b..17443b22b0 100644 --- a/common/mkbp_info.c +++ b/common/mkbp_info.c @@ -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. */ diff --git a/common/mkbp_input_devices.c b/common/mkbp_input_devices.c index d5dcbd9dc6..6cc277ab98 100644 --- a/common/mkbp_input_devices.c +++ b/common/mkbp_input_devices.c @@ -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. */ diff --git a/common/mock/README.md b/common/mock/README.md index c7695531b6..62f53f5416 100644 --- a/common/mock/README.md +++ b/common/mock/README.md @@ -38,7 +38,7 @@ one. Example `.mocklist`: ```c -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/mock/adc_mock.c b/common/mock/adc_mock.c index 9727c560d3..35cf4aadb5 100644 --- a/common/mock/adc_mock.c +++ b/common/mock/adc_mock.c @@ -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. */ diff --git a/common/mock/battery_mock.c b/common/mock/battery_mock.c index 45bd944fbd..0d6b4fdb22 100644 --- a/common/mock/battery_mock.c +++ b/common/mock/battery_mock.c @@ -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. */ diff --git a/common/mock/build.mk b/common/mock/build.mk index c34cb9efe4..a8b109429c 100644 --- a/common/mock/build.mk +++ b/common/mock/build.mk @@ -1,4 +1,4 @@ -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/common/mock/charge_manager_mock.c b/common/mock/charge_manager_mock.c index 3a459ef74c..b27e7de241 100644 --- a/common/mock/charge_manager_mock.c +++ b/common/mock/charge_manager_mock.c @@ -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. */ diff --git a/common/mock/dp_alt_mode_mock.c b/common/mock/dp_alt_mode_mock.c index e16de74675..e261415aaa 100644 --- a/common/mock/dp_alt_mode_mock.c +++ b/common/mock/dp_alt_mode_mock.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/mock/fp_sensor_mock.c b/common/mock/fp_sensor_mock.c index ef25e62afa..4db25a821c 100644 --- a/common/mock/fp_sensor_mock.c +++ b/common/mock/fp_sensor_mock.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/mock/fpsensor_crypto_mock.c b/common/mock/fpsensor_crypto_mock.c index 6d26d9c8dc..f2cc425c8f 100644 --- a/common/mock/fpsensor_crypto_mock.c +++ b/common/mock/fpsensor_crypto_mock.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/common/mock/fpsensor_detect_mock.c b/common/mock/fpsensor_detect_mock.c index 6e3ca839f1..50f27f92bf 100644 --- a/common/mock/fpsensor_detect_mock.c +++ b/common/mock/fpsensor_detect_mock.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/mock/fpsensor_state_mock.c b/common/mock/fpsensor_state_mock.c index c3092fe860..1c931bc24d 100644 --- a/common/mock/fpsensor_state_mock.c +++ b/common/mock/fpsensor_state_mock.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -21,6 +21,28 @@ const uint8_t default_fake_tpm_seed[] = { }; BUILD_ASSERT(sizeof(default_fake_tpm_seed) == FP_CONTEXT_TPM_BYTES); +const uint8_t default_fake_fp_positive_match_salt[] = { + 0x04, 0x1f, 0x5a, 0xac, 0x5f, 0x79, 0x10, 0xaf, 0x04, 0x1d, 0x46, 0x3a, + 0x5f, 0x08, 0xee, 0xcb, 0x04, 0x1f, 0x5a, 0xac, 0x5f, 0x79, 0x10, 0xaf, + 0x04, 0x1d, 0x46, 0x3a, 0x5f, 0x08, 0xee, 0xcb, 0x04, 0x1f, 0x5a, 0xac, + 0x5f, 0x79, 0x10, 0xaf, 0x04, 0x1d, 0x46, 0x3a, 0x5f, 0x08, 0xee, 0xcb, + 0x04, 0x1f, 0x5a, 0xac, 0x5f, 0x79, 0x10, 0xaf, 0x04, 0x1d, 0x46, 0x3a, + 0x5f, 0x08, 0xee, 0xcb, 0x04, 0x1f, 0x5a, 0xac, 0x5f, 0x79, 0x10, 0xaf, + 0x04, 0x1d, 0x46, 0x3a, 0x5f, 0x08, 0xee, 0xcb +}; +BUILD_ASSERT(sizeof(default_fake_fp_positive_match_salt) == 80); + +const uint8_t trivial_fp_positive_match_salt[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +}; +BUILD_ASSERT(sizeof(trivial_fp_positive_match_salt) == 80); + int fpsensor_state_mock_set_tpm_seed( const uint8_t tpm_seed[FP_CONTEXT_TPM_BYTES]) { diff --git a/common/mock/mkbp_events_mock.c b/common/mock/mkbp_events_mock.c index d42c06fdec..3f4d76b659 100644 --- a/common/mock/mkbp_events_mock.c +++ b/common/mock/mkbp_events_mock.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/mock/rollback_mock.c b/common/mock/rollback_mock.c index cf38f5f985..e68616df53 100644 --- a/common/mock/rollback_mock.c +++ b/common/mock/rollback_mock.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/mock/tcpc_mock.c b/common/mock/tcpc_mock.c index 9501d45051..31dda7eba1 100644 --- a/common/mock/tcpc_mock.c +++ b/common/mock/tcpc_mock.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/mock/tcpci_i2c_mock.c b/common/mock/tcpci_i2c_mock.c index 8c526ca692..a0e59ecc44 100644 --- a/common/mock/tcpci_i2c_mock.c +++ b/common/mock/tcpci_i2c_mock.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/mock/tcpm_mock.c b/common/mock/tcpm_mock.c index 80cff1d653..a54b31839b 100644 --- a/common/mock/tcpm_mock.c +++ b/common/mock/tcpm_mock.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/mock/timer_mock.c b/common/mock/timer_mock.c index dc83aa24d5..0504578412 100644 --- a/common/mock/timer_mock.c +++ b/common/mock/timer_mock.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/mock/usb_mux_mock.c b/common/mock/usb_mux_mock.c index f2db5cf8bd..815cdf777c 100644 --- a/common/mock/usb_mux_mock.c +++ b/common/mock/usb_mux_mock.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/mock/usb_pd_dpm_mock.c b/common/mock/usb_pd_dpm_mock.c index 7531ee49d6..158c53c650 100644 --- a/common/mock/usb_pd_dpm_mock.c +++ b/common/mock/usb_pd_dpm_mock.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/mock/usb_pe_sm_mock.c b/common/mock/usb_pe_sm_mock.c index 0488ff59b0..24861a73f9 100644 --- a/common/mock/usb_pe_sm_mock.c +++ b/common/mock/usb_pe_sm_mock.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/mock/usb_prl_mock.c b/common/mock/usb_prl_mock.c index d9c0d086a6..df61cfaf95 100644 --- a/common/mock/usb_prl_mock.c +++ b/common/mock/usb_prl_mock.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/common/mock/usb_tc_sm_mock.c b/common/mock/usb_tc_sm_mock.c index 20802db127..5badc6eba6 100644 --- a/common/mock/usb_tc_sm_mock.c +++ b/common/mock/usb_tc_sm_mock.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/motion_lid.c b/common/motion_lid.c index e96d186256..1a254e786d 100644 --- a/common/motion_lid.c +++ b/common/motion_lid.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/motion_orientation.c b/common/motion_orientation.c index a8a87294db..1c52fe847e 100644 --- a/common/motion_orientation.c +++ b/common/motion_orientation.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/motion_sense.c b/common/motion_sense.c index a28f23a72b..f326259497 100644 --- a/common/motion_sense.c +++ b/common/motion_sense.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/motion_sense_fifo.c b/common/motion_sense_fifo.c index 94bc3ebc2f..672b328420 100644 --- a/common/motion_sense_fifo.c +++ b/common/motion_sense_fifo.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/newton_fit.c b/common/newton_fit.c index aecc63f89f..5d217bc63d 100644 --- a/common/newton_fit.c +++ b/common/newton_fit.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/ocpc.c b/common/ocpc.c index 55b88eeedc..c27cf4efe5 100644 --- a/common/ocpc.c +++ b/common/ocpc.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/onewire.c b/common/onewire.c index 235a358257..0b109bbdcd 100644 --- a/common/onewire.c +++ b/common/onewire.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/online_calibration.c b/common/online_calibration.c index fec20030ca..2d79c6ae1d 100644 --- a/common/online_calibration.c +++ b/common/online_calibration.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/panic_output.c b/common/panic_output.c index 14c66204fc..e5a184be27 100644 --- a/common/panic_output.c +++ b/common/panic_output.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -308,6 +308,10 @@ DECLARE_HOOK(HOOK_CHIPSET_RESET, panic_init, HOOK_PRIO_LAST); #pragma clang diagnostic push #pragma clang diagnostic ignored "-Winfinite-recursion" #endif /* __clang__ */ +#if __GNUC__ >= 12 +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Winfinite-recursion" +#endif /* __GNUC__ >= 12 */ static void stack_overflow_recurse(int n) { ccprintf("+%d", n); @@ -326,6 +330,9 @@ static void stack_overflow_recurse(int n) */ ccprintf("-%d", n); } +#if __GNUC__ >= 12 +#pragma GCC diagnostic pop +#endif /* __GNUC__ >= 12 */ #ifdef __clang__ #pragma clang diagnostic pop #endif /* __clang__ */ diff --git a/common/pd_log.c b/common/pd_log.c index 9a9e21f420..477f8327eb 100644 --- a/common/pd_log.c +++ b/common/pd_log.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/peci.c b/common/peci.c index 333f35fa6d..b124d6b67b 100644 --- a/common/peci.c +++ b/common/peci.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/peripheral.c b/common/peripheral.c index 27156c4a88..557aa0ed6f 100644 --- a/common/peripheral.c +++ b/common/peripheral.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/peripheral_charger.c b/common/peripheral_charger.c index a61ab668af..ad7e069e69 100644 --- a/common/peripheral_charger.c +++ b/common/peripheral_charger.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/port80.c b/common/port80.c index 15819f4925..abead59cd9 100644 --- a/common/port80.c +++ b/common/port80.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/power_button.c b/common/power_button.c index 42b165ec8f..36d7e510d2 100644 --- a/common/power_button.c +++ b/common/power_button.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/power_button_x86.c b/common/power_button_x86.c index 3e2cb51ef2..efa51530e5 100644 --- a/common/power_button_x86.c +++ b/common/power_button_x86.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/printf.c b/common/printf.c index 6bfb58dbc3..d2cc78f5aa 100644 --- a/common/printf.c +++ b/common/printf.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/pstore_commands.c b/common/pstore_commands.c index 1d0ff596cb..89c996379c 100644 --- a/common/pstore_commands.c +++ b/common/pstore_commands.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/pwm.c b/common/pwm.c index c571851aae..9019a329b4 100644 --- a/common/pwm.c +++ b/common/pwm.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/pwm_kblight.c b/common/pwm_kblight.c index 3389023ea3..5748bef700 100644 --- a/common/pwm_kblight.c +++ b/common/pwm_kblight.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/queue.c b/common/queue.c index af83a72ae5..ebe9d8b63d 100644 --- a/common/queue.c +++ b/common/queue.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/common/queue_policies.c b/common/queue_policies.c index 370990887c..6646d49cf4 100644 --- a/common/queue_policies.c +++ b/common/queue_policies.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/common/regulator.c b/common/regulator.c index dd7c30a29a..5b8da2adc8 100644 --- a/common/regulator.c +++ b/common/regulator.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/rgb_keyboard.c b/common/rgb_keyboard.c index 092d5f0d3d..5b5b6c6cf3 100644 --- a/common/rgb_keyboard.c +++ b/common/rgb_keyboard.c @@ -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. */ diff --git a/common/rollback.c b/common/rollback.c index 518d48a2e0..7aaba72ebb 100644 --- a/common/rollback.c +++ b/common/rollback.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/rollback_private.h b/common/rollback_private.h index c757882f4f..1dbbd4f430 100644 --- a/common/rollback_private.h +++ b/common/rollback_private.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/rsa.c b/common/rsa.c index b88298fa77..4df6fc136a 100644 --- a/common/rsa.c +++ b/common/rsa.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/rtc.c b/common/rtc.c index 4c1e554f10..e4292e9762 100644 --- a/common/rtc.c +++ b/common/rtc.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/rwsig.c b/common/rwsig.c index b13a87e49c..1ea6d6923a 100644 --- a/common/rwsig.c +++ b/common/rwsig.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/shared_mem.c b/common/shared_mem.c index 5c8555a7bb..db1ad0ca32 100644 --- a/common/shared_mem.c +++ b/common/shared_mem.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/shmalloc.c b/common/shmalloc.c index a977d522de..6cbf213227 100644 --- a/common/shmalloc.c +++ b/common/shmalloc.c @@ -1,5 +1,5 @@ /* - * Copyright 2016 The Chromium OS Authors. All rights reserved. + * Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/spi_commands.c b/common/spi_commands.c index f30795c0d5..9810039ede 100644 --- a/common/spi_commands.c +++ b/common/spi_commands.c @@ -1,5 +1,5 @@ /* - * Copyright 2015 The Chromium OS Authors. All rights reserved. + * Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/common/spi_flash.c b/common/spi_flash.c index 878a3291d5..8eaf3e8406 100644 --- a/common/spi_flash.c +++ b/common/spi_flash.c @@ -1,5 +1,5 @@ /* - * Copyright 2014 The Chromium OS Authors. All rights reserved. + * Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/common/spi_flash_reg.c b/common/spi_flash_reg.c index abcc321251..fa71ab5eb6 100644 --- a/common/spi_flash_reg.c +++ b/common/spi_flash_reg.c @@ -1,5 +1,5 @@ /* - * Copyright 2015 The Chromium OS Authors. All rights reserved. + * Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/common/spi_nor.c b/common/spi_nor.c index e8a5417c32..015cb7077c 100644 --- a/common/spi_nor.c +++ b/common/spi_nor.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/stillness_detector.c b/common/stillness_detector.c index e95f262d11..c43e19873e 100644 --- a/common/stillness_detector.c +++ b/common/stillness_detector.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/switch.c b/common/switch.c index bf0701091d..f2a3266ed0 100644 --- a/common/switch.c +++ b/common/switch.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/system.c b/common/system.c index d19ffefe0a..b4387f5257 100644 --- a/common/system.c +++ b/common/system.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -1042,7 +1042,8 @@ static int handle_pending_reboot(enum ec_reboot_cmd cmd) } } -void system_enter_hibernate(uint32_t seconds, uint32_t microseconds) +test_mockable void system_enter_hibernate(uint32_t seconds, + uint32_t microseconds) { if (!IS_ENABLED(CONFIG_HIBERNATE)) return; @@ -1827,6 +1828,7 @@ __test_only void system_common_reset_state(void) jdata = 0; reset_flags = 0; jumped_to_image = 0; + system_info_flags = 0; } __test_only enum ec_reboot_cmd system_common_get_reset_reboot_at_shutdown(void) diff --git a/common/tablet_mode.c b/common/tablet_mode.c index a3971a0548..576e80c0ef 100644 --- a/common/tablet_mode.c +++ b/common/tablet_mode.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/temp_sensor.c b/common/temp_sensor.c index d28eac530f..f2a764c151 100644 --- a/common/temp_sensor.c +++ b/common/temp_sensor.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/test_util.c b/common/test_util.c index 2591465c8e..f15b99f302 100644 --- a/common/test_util.c +++ b/common/test_util.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/common/thermal.c b/common/thermal.c index f84d42f8fc..975afed3d1 100644 --- a/common/thermal.c +++ b/common/thermal.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/throttle_ap.c b/common/throttle_ap.c index 5ab889abe7..39223f9829 100644 --- a/common/throttle_ap.c +++ b/common/throttle_ap.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/timer.c b/common/timer.c index 29e79c1569..eea773619b 100644 --- a/common/timer.c +++ b/common/timer.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/typec_control.c b/common/typec_control.c index ff323b632b..94070d47df 100644 --- a/common/typec_control.c +++ b/common/typec_control.c @@ -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. */ diff --git a/common/uart_buffering.c b/common/uart_buffering.c index 7e942c7a39..1aa6e9ef35 100644 --- a/common/uart_buffering.c +++ b/common/uart_buffering.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/uart_hostcmd.c b/common/uart_hostcmd.c index 5cef2a8e24..7b4ff5b461 100644 --- a/common/uart_hostcmd.c +++ b/common/uart_hostcmd.c @@ -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. */ diff --git a/common/uart_printf.c b/common/uart_printf.c index 198d076971..6f8ebb5cbc 100644 --- a/common/uart_printf.c +++ b/common/uart_printf.c @@ -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. */ diff --git a/common/update_fw.c b/common/update_fw.c index 84fbe7cb9c..85b805191c 100644 --- a/common/update_fw.c +++ b/common/update_fw.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/uptime.c b/common/uptime.c index c8e914a6cc..3b2c68fd34 100644 --- a/common/uptime.c +++ b/common/uptime.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/usb_charger.c b/common/usb_charger.c index 70861e6c62..60deade0ef 100644 --- a/common/usb_charger.c +++ b/common/usb_charger.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/usb_common.c b/common/usb_common.c index f0a8ad52f6..a87ae1e688 100644 --- a/common/usb_common.c +++ b/common/usb_common.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/usb_console_stream.c b/common/usb_console_stream.c index 3a743fbdb2..629e7ba1f8 100644 --- a/common/usb_console_stream.c +++ b/common/usb_console_stream.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/usb_host_command.c b/common/usb_host_command.c index 8bb00147c3..83a6e24a7d 100644 --- a/common/usb_host_command.c +++ b/common/usb_host_command.c @@ -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. */ diff --git a/common/usb_i2c.c b/common/usb_i2c.c index 8bb8a227bd..8482ec0967 100644 --- a/common/usb_i2c.c +++ b/common/usb_i2c.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/usb_pd_alt_mode_dfp.c b/common/usb_pd_alt_mode_dfp.c index b37edb5b24..6c2917ff33 100644 --- a/common/usb_pd_alt_mode_dfp.c +++ b/common/usb_pd_alt_mode_dfp.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/common/usb_pd_alt_mode_ufp.c b/common/usb_pd_alt_mode_ufp.c index 3db60166d2..5585056b58 100644 --- a/common/usb_pd_alt_mode_ufp.c +++ b/common/usb_pd_alt_mode_ufp.c @@ -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. * diff --git a/common/usb_pd_console_cmd.c b/common/usb_pd_console_cmd.c index 96ae17b731..7a271c0492 100644 --- a/common/usb_pd_console_cmd.c +++ b/common/usb_pd_console_cmd.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/common/usb_pd_dual_role.c b/common/usb_pd_dual_role.c index 86cf0722ce..6498e0853f 100644 --- a/common/usb_pd_dual_role.c +++ b/common/usb_pd_dual_role.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/common/usb_pd_flags.c b/common/usb_pd_flags.c index a1a68d627f..89225f7730 100644 --- a/common/usb_pd_flags.c +++ b/common/usb_pd_flags.c @@ -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. */ diff --git a/common/usb_pd_host_cmd.c b/common/usb_pd_host_cmd.c index 851cc34d46..1d26213135 100644 --- a/common/usb_pd_host_cmd.c +++ b/common/usb_pd_host_cmd.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/common/usb_pd_pdo.c b/common/usb_pd_pdo.c index cfa355bf0e..3141af34a9 100644 --- a/common/usb_pd_pdo.c +++ b/common/usb_pd_pdo.c @@ -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. */ diff --git a/common/usb_pd_policy.c b/common/usb_pd_policy.c index e07e028fc2..dbea31bf6d 100644 --- a/common/usb_pd_policy.c +++ b/common/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/usb_pd_protocol.c b/common/usb_pd_protocol.c index 6d214729f8..ff78c55b13 100644 --- a/common/usb_pd_protocol.c +++ b/common/usb_pd_protocol.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/usb_pd_tcpc.c b/common/usb_pd_tcpc.c index 4ae6095f7b..c8010a5005 100644 --- a/common/usb_pd_tcpc.c +++ b/common/usb_pd_tcpc.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/usb_port_power_dumb.c b/common/usb_port_power_dumb.c index ae48ce3c85..10eca3ffb7 100644 --- a/common/usb_port_power_dumb.c +++ b/common/usb_port_power_dumb.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/usb_port_power_smart.c b/common/usb_port_power_smart.c index c67709ab07..42fbc7dd64 100644 --- a/common/usb_port_power_smart.c +++ b/common/usb_port_power_smart.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/usb_update.c b/common/usb_update.c index 7b463318b8..444a4d6949 100644 --- a/common/usb_update.c +++ b/common/usb_update.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/usbc/build.mk b/common/usbc/build.mk index 60e2347741..15c9f06001 100644 --- a/common/usbc/build.mk +++ b/common/usbc/build.mk @@ -1,4 +1,4 @@ -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/common/usbc/dp_alt_mode.c b/common/usbc/dp_alt_mode.c index 1a2ae5f2a5..0f2a42ec2a 100644 --- a/common/usbc/dp_alt_mode.c +++ b/common/usbc/dp_alt_mode.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/usbc/tbt_alt_mode.c b/common/usbc/tbt_alt_mode.c index bd14b7669d..7710f13f18 100644 --- a/common/usbc/tbt_alt_mode.c +++ b/common/usbc/tbt_alt_mode.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/usbc/usb_mode.c b/common/usbc/usb_mode.c index b087de9613..cf3155da08 100644 --- a/common/usbc/usb_mode.c +++ b/common/usbc/usb_mode.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/usbc/usb_pd_console.c b/common/usbc/usb_pd_console.c index 56901fe3c6..e7b2d69c65 100644 --- a/common/usbc/usb_pd_console.c +++ b/common/usbc/usb_pd_console.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/usbc/usb_pd_dp_ufp.c b/common/usbc/usb_pd_dp_ufp.c index e0a5d493fc..d88ee17aaf 100644 --- a/common/usbc/usb_pd_dp_ufp.c +++ b/common/usbc/usb_pd_dp_ufp.c @@ -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. */ diff --git a/common/usbc/usb_pd_dpm.c b/common/usbc/usb_pd_dpm.c index d3da5a89e5..d8fbccc522 100644 --- a/common/usbc/usb_pd_dpm.c +++ b/common/usbc/usb_pd_dpm.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/usbc/usb_pd_host.c b/common/usbc/usb_pd_host.c index 959995e12d..5d22e8ecd3 100644 --- a/common/usbc/usb_pd_host.c +++ b/common/usbc/usb_pd_host.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/common/usbc/usb_pd_timer.c b/common/usbc/usb_pd_timer.c index b99ea6540c..a6ec07125d 100644 --- a/common/usbc/usb_pd_timer.c +++ b/common/usbc/usb_pd_timer.c @@ -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. */ diff --git a/common/usbc/usb_pe_ctvpd_sm.c b/common/usbc/usb_pe_ctvpd_sm.c index 35e1af0fea..f3f3d8af9b 100644 --- a/common/usbc/usb_pe_ctvpd_sm.c +++ b/common/usbc/usb_pe_ctvpd_sm.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/usbc/usb_pe_drp_sm.c b/common/usbc/usb_pe_drp_sm.c index 0599692ba6..075fca6318 100644 --- a/common/usbc/usb_pe_drp_sm.c +++ b/common/usbc/usb_pe_drp_sm.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/usbc/usb_pe_private.h b/common/usbc/usb_pe_private.h index ca2e3ab32c..bfe534dcca 100644 --- a/common/usbc/usb_pe_private.h +++ b/common/usbc/usb_pe_private.h @@ -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. */ diff --git a/common/usbc/usb_prl_sm.c b/common/usbc/usb_prl_sm.c index 03afd86d2e..b1843da6eb 100644 --- a/common/usbc/usb_prl_sm.c +++ b/common/usbc/usb_prl_sm.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/usbc/usb_retimer_fw_update.c b/common/usbc/usb_retimer_fw_update.c index 157191d0a3..3f9b1b4c72 100644 --- a/common/usbc/usb_retimer_fw_update.c +++ b/common/usbc/usb_retimer_fw_update.c @@ -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. */ diff --git a/common/usbc/usb_sm.c b/common/usbc/usb_sm.c index 004a64321c..96b0b81e33 100644 --- a/common/usbc/usb_sm.c +++ b/common/usbc/usb_sm.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/usbc/usb_tc_ctvpd_sm.c b/common/usbc/usb_tc_ctvpd_sm.c index f674e75488..045cca55c4 100644 --- a/common/usbc/usb_tc_ctvpd_sm.c +++ b/common/usbc/usb_tc_ctvpd_sm.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/usbc/usb_tc_drp_acc_trysrc_sm.c b/common/usbc/usb_tc_drp_acc_trysrc_sm.c index 0acfabdc42..e68b0139db 100644 --- a/common/usbc/usb_tc_drp_acc_trysrc_sm.c +++ b/common/usbc/usb_tc_drp_acc_trysrc_sm.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/usbc/usb_tc_vpd_sm.c b/common/usbc/usb_tc_vpd_sm.c index e68e46e9dd..40b855db9b 100644 --- a/common/usbc/usb_tc_vpd_sm.c +++ b/common/usbc/usb_tc_vpd_sm.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/usbc/usbc_pd_policy.c b/common/usbc/usbc_pd_policy.c index 907447c029..6d82ed114c 100644 --- a/common/usbc/usbc_pd_policy.c +++ b/common/usbc/usbc_pd_policy.c @@ -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. */ diff --git a/common/usbc/usbc_task.c b/common/usbc/usbc_task.c index f6a2b5447d..56ea3d4d10 100644 --- a/common/usbc/usbc_task.c +++ b/common/usbc/usbc_task.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/usbc_intr_task.c b/common/usbc_intr_task.c index e283314151..56a96a78e4 100644 --- a/common/usbc_intr_task.c +++ b/common/usbc_intr_task.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/usbc_ocp.c b/common/usbc_ocp.c index 3f7be63039..673a0853d0 100644 --- a/common/usbc_ocp.c +++ b/common/usbc_ocp.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/usbc_ppc.c b/common/usbc_ppc.c index 419015c7c7..bc626097f7 100644 --- a/common/usbc_ppc.c +++ b/common/usbc_ppc.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/util.c b/common/util.c index 744b912645..7672dc1325 100644 --- a/common/util.c +++ b/common/util.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/vboot/common.c b/common/vboot/common.c index 1e45d7389c..a92652364b 100644 --- a/common/vboot/common.c +++ b/common/vboot/common.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/vboot/efs2.c b/common/vboot/efs2.c index 6df6b5b56e..885b7595c6 100644 --- a/common/vboot/efs2.c +++ b/common/vboot/efs2.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -223,10 +223,12 @@ void vboot_disable_pd(void) } #endif +/* LCOV_EXCL_START - This is just a stub intended to be overridden */ __overridable void show_critical_error(void) { CPRINTS("%s", __func__); } +/* LCOV_EXCL_STOP */ static void verify_and_jump(void) { @@ -251,14 +253,16 @@ static void verify_and_jump(void) } } +/* LCOV_EXCL_START - This is just a stub intended to be overridden */ __overridable void show_power_shortage(void) { CPRINTS("%s", __func__); } +/* LCOV_EXCL_STOP */ static bool is_battery_ready(void) { - /* TODO: Add battery check (https://crbug.com/1045216) */ + /* TODO(b/172210316): Add battery check */ return true; } @@ -300,12 +304,16 @@ void vboot_main(void) * If battery is drained or bad, we will boot in NO_BOOT mode to * inform the user of the problem. */ + /* LCOV_EXCL_START - TODO(b/172210316) implement + * is_battery_ready(), and remove this lcov excl. + */ if (!is_battery_ready()) { CPRINTS("Battery not ready or bad"); if (set_boot_mode(BOOT_MODE_NO_BOOT) == CR50_COMM_SUCCESS) enable_pd(); } + /* LCOV_EXCL_STOP */ /* We'll enter recovery mode immediately, later, or never. */ return; diff --git a/common/vboot/vb21_lib.c b/common/vboot/vb21_lib.c index 3f79b56258..ab7628371f 100644 --- a/common/vboot/vb21_lib.c +++ b/common/vboot/vb21_lib.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/vboot/vboot.c b/common/vboot/vboot.c index 2a528a57db..cf449da1b8 100644 --- a/common/vboot/vboot.c +++ b/common/vboot/vboot.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/vboot_hash.c b/common/vboot_hash.c index 34cb603f5e..ad41269794 100644 --- a/common/vboot_hash.c +++ b/common/vboot_hash.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/vec3.c b/common/vec3.c index 1679e8a7f5..67a6049dea 100644 --- a/common/vec3.c +++ b/common/vec3.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/version.c b/common/version.c index 781840d55e..8b1ac5e53d 100644 --- a/common/version.c +++ b/common/version.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/virtual_battery.c b/common/virtual_battery.c index 70e88a11ee..adb4e96d7f 100644 --- a/common/virtual_battery.c +++ b/common/virtual_battery.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/vstore.c b/common/vstore.c index 0cbf761eef..254a515b48 100644 --- a/common/vstore.c +++ b/common/vstore.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/webusb_desc.c b/common/webusb_desc.c index 41d39006e0..e2f51b4c0f 100644 --- a/common/webusb_desc.c +++ b/common/webusb_desc.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/common/wireless.c b/common/wireless.c index cf0e959d52..dfc2d4843e 100644 --- a/common/wireless.c +++ b/common/wireless.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/cortex-m/atomic.h b/core/cortex-m/atomic.h index d6aac70626..92ecdd96e5 100644 --- a/core/cortex-m/atomic.h +++ b/core/cortex-m/atomic.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/cortex-m/build.mk b/core/cortex-m/build.mk index 04f8e45479..1e2c47297b 100644 --- a/core/cortex-m/build.mk +++ b/core/cortex-m/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2012 The Chromium OS Authors. All rights reserved. +# Copyright 2012 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/core/cortex-m/cache.S b/core/cortex-m/cache.S index 0a3d3bb67d..d5089a920e 100644 --- a/core/cortex-m/cache.S +++ b/core/cortex-m/cache.S @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/core/cortex-m/config_core.h b/core/cortex-m/config_core.h index 0665b28852..949df7ee21 100644 --- a/core/cortex-m/config_core.h +++ b/core/cortex-m/config_core.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/cortex-m/cpu.c b/core/cortex-m/cpu.c index a9ded5c24d..ffb6b7780c 100644 --- a/core/cortex-m/cpu.c +++ b/core/cortex-m/cpu.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/core/cortex-m/cpu.h b/core/cortex-m/cpu.h index dd6c11d4f6..8c284d6132 100644 --- a/core/cortex-m/cpu.h +++ b/core/cortex-m/cpu.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/core/cortex-m/debug.c b/core/cortex-m/debug.c index db8891b5d8..214e8dd177 100644 --- a/core/cortex-m/debug.c +++ b/core/cortex-m/debug.c @@ -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. */ diff --git a/core/cortex-m/debug.h b/core/cortex-m/debug.h index ae5ef08d06..30643268cb 100644 --- a/core/cortex-m/debug.h +++ b/core/cortex-m/debug.h @@ -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. */ diff --git a/core/cortex-m/ec.lds.S b/core/cortex-m/ec.lds.S index ac3442cafe..8580e366b7 100644 --- a/core/cortex-m/ec.lds.S +++ b/core/cortex-m/ec.lds.S @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/cortex-m/fpu.c b/core/cortex-m/fpu.c index 03175b2045..6e897a5266 100644 --- a/core/cortex-m/fpu.c +++ b/core/cortex-m/fpu.c @@ -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. */ diff --git a/core/cortex-m/include/fpu.h b/core/cortex-m/include/fpu.h index d25e4ee552..74862d00ab 100644 --- a/core/cortex-m/include/fpu.h +++ b/core/cortex-m/include/fpu.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/cortex-m/include/mpu.h b/core/cortex-m/include/mpu.h index 177c74c6bd..75f95e7000 100644 --- a/core/cortex-m/include/mpu.h +++ b/core/cortex-m/include/mpu.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/cortex-m/include/mpu_private.h b/core/cortex-m/include/mpu_private.h index e6030114c2..eca474e14d 100644 --- a/core/cortex-m/include/mpu_private.h +++ b/core/cortex-m/include/mpu_private.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/cortex-m/init.S b/core/cortex-m/init.S index 9d4815ac79..5cde406a58 100644 --- a/core/cortex-m/init.S +++ b/core/cortex-m/init.S @@ -1,4 +1,4 @@ -/* Copyright 2011 The Chromium OS Authors. All rights reserved. +/* Copyright 2011 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/core/cortex-m/irq_handler.h b/core/cortex-m/irq_handler.h index e47b0f4d1e..eb23de7049 100644 --- a/core/cortex-m/irq_handler.h +++ b/core/cortex-m/irq_handler.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/cortex-m/llsr.c b/core/cortex-m/llsr.c index 3bbdd1370c..0ab920f628 100644 --- a/core/cortex-m/llsr.c +++ b/core/cortex-m/llsr.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/cortex-m/mpu.c b/core/cortex-m/mpu.c index e34dfb820e..c0793180dc 100644 --- a/core/cortex-m/mpu.c +++ b/core/cortex-m/mpu.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/cortex-m/panic-internal.h b/core/cortex-m/panic-internal.h index 8b81502a7f..6fa6440006 100644 --- a/core/cortex-m/panic-internal.h +++ b/core/cortex-m/panic-internal.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/cortex-m/panic.c b/core/cortex-m/panic.c index dba403d130..3a59fcf201 100644 --- a/core/cortex-m/panic.c +++ b/core/cortex-m/panic.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/cortex-m/switch.S b/core/cortex-m/switch.S index 6573e0ecaa..512b48036f 100644 --- a/core/cortex-m/switch.S +++ b/core/cortex-m/switch.S @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/core/cortex-m/task.c b/core/cortex-m/task.c index 55e97316ca..ce6c8c9615 100644 --- a/core/cortex-m/task.c +++ b/core/cortex-m/task.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/cortex-m/toolchain.mk b/core/cortex-m/toolchain.mk index 736d4c7562..55ca2d74cd 100644 --- a/core/cortex-m/toolchain.mk +++ b/core/cortex-m/toolchain.mk @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/core/cortex-m/vecttable.c b/core/cortex-m/vecttable.c index 6f57deb603..433898c00a 100644 --- a/core/cortex-m/vecttable.c +++ b/core/cortex-m/vecttable.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/core/cortex-m/watchdog.c b/core/cortex-m/watchdog.c index c9faf54b2b..a94c6a9c25 100644 --- a/core/cortex-m/watchdog.c +++ b/core/cortex-m/watchdog.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/cortex-m0/__builtin.c b/core/cortex-m0/__builtin.c index 4bf495a011..8e2bf984ff 100644 --- a/core/cortex-m0/__builtin.c +++ b/core/cortex-m0/__builtin.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/cortex-m0/atomic.h b/core/cortex-m0/atomic.h index 88b19bf534..9fd3ab849b 100644 --- a/core/cortex-m0/atomic.h +++ b/core/cortex-m0/atomic.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/cortex-m0/build.mk b/core/cortex-m0/build.mk index 37ff34873b..0bea9d09ab 100644 --- a/core/cortex-m0/build.mk +++ b/core/cortex-m0/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2014 The Chromium OS Authors. All rights reserved. +# Copyright 2014 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/core/cortex-m0/config_core.h b/core/cortex-m0/config_core.h index a40756fb49..e954e5e0af 100644 --- a/core/cortex-m0/config_core.h +++ b/core/cortex-m0/config_core.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/cortex-m0/cpu.c b/core/cortex-m0/cpu.c index b354cc03e2..e180570863 100644 --- a/core/cortex-m0/cpu.c +++ b/core/cortex-m0/cpu.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/core/cortex-m0/cpu.h b/core/cortex-m0/cpu.h index 0fc2e655d4..568b16eedb 100644 --- a/core/cortex-m0/cpu.h +++ b/core/cortex-m0/cpu.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/core/cortex-m0/ec.lds.S b/core/cortex-m0/ec.lds.S index 80c30b8d38..3c2076b9e4 100644 --- a/core/cortex-m0/ec.lds.S +++ b/core/cortex-m0/ec.lds.S @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/cortex-m0/include/fpu.h b/core/cortex-m0/include/fpu.h index ce496f2b30..1054f388b0 100644 --- a/core/cortex-m0/include/fpu.h +++ b/core/cortex-m0/include/fpu.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/cortex-m0/init.S b/core/cortex-m0/init.S index 6ccb75bbe8..58316e92d6 100644 --- a/core/cortex-m0/init.S +++ b/core/cortex-m0/init.S @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/core/cortex-m0/irq_handler.h b/core/cortex-m0/irq_handler.h index 29118800e3..f2f6a220e4 100644 --- a/core/cortex-m0/irq_handler.h +++ b/core/cortex-m0/irq_handler.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/cortex-m0/mula.S b/core/cortex-m0/mula.S index 02e617c328..7bb54263b4 100644 --- a/core/cortex-m0/mula.S +++ b/core/cortex-m0/mula.S @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/core/cortex-m0/panic-internal.h b/core/cortex-m0/panic-internal.h index 6ed70d7db0..9f831495ff 100644 --- a/core/cortex-m0/panic-internal.h +++ b/core/cortex-m0/panic-internal.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/cortex-m0/panic.c b/core/cortex-m0/panic.c index ce5a8b0b4d..f20908eb7c 100644 --- a/core/cortex-m0/panic.c +++ b/core/cortex-m0/panic.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/cortex-m0/switch.S b/core/cortex-m0/switch.S index a75daad939..4914788460 100644 --- a/core/cortex-m0/switch.S +++ b/core/cortex-m0/switch.S @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/core/cortex-m0/task.c b/core/cortex-m0/task.c index 2647126a52..b34e920e09 100644 --- a/core/cortex-m0/task.c +++ b/core/cortex-m0/task.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/cortex-m0/thumb_case.S b/core/cortex-m0/thumb_case.S index 5628361a94..9148a33427 100644 --- a/core/cortex-m0/thumb_case.S +++ b/core/cortex-m0/thumb_case.S @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/core/cortex-m0/toolchain.mk b/core/cortex-m0/toolchain.mk index 390dd6a7f2..6b5f07ccf6 100644 --- a/core/cortex-m0/toolchain.mk +++ b/core/cortex-m0/toolchain.mk @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/core/cortex-m0/vecttable.c b/core/cortex-m0/vecttable.c index 0f76ca401b..3871a30055 100644 --- a/core/cortex-m0/vecttable.c +++ b/core/cortex-m0/vecttable.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/core/cortex-m0/watchdog.c b/core/cortex-m0/watchdog.c index 9961922ee5..b4d5c086f0 100644 --- a/core/cortex-m0/watchdog.c +++ b/core/cortex-m0/watchdog.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/host/atomic.h b/core/host/atomic.h index 8e84406f1c..0d27e1bc6f 100644 --- a/core/host/atomic.h +++ b/core/host/atomic.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/host/build.mk b/core/host/build.mk index 503aa5538a..3995e7e4e4 100644 --- a/core/host/build.mk +++ b/core/host/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2013 The Chromium OS Authors. All rights reserved. +# Copyright 2013 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/core/host/cpu.h b/core/host/cpu.h index 95166aecb3..f63e0b9d23 100644 --- a/core/host/cpu.h +++ b/core/host/cpu.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/host/disabled.c b/core/host/disabled.c index 466f5629f9..8f05e5e1d6 100644 --- a/core/host/disabled.c +++ b/core/host/disabled.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/host/host_exe.lds b/core/host/host_exe.lds index 0261624d30..b4c94c12ff 100644 --- a/core/host/host_exe.lds +++ b/core/host/host_exe.lds @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/host/host_task.h b/core/host/host_task.h index c0e2534347..82b33f96c5 100644 --- a/core/host/host_task.h +++ b/core/host/host_task.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/host/irq_handler.h b/core/host/irq_handler.h index 883a8c1239..8bbf596a57 100644 --- a/core/host/irq_handler.h +++ b/core/host/irq_handler.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/host/main.c b/core/host/main.c index 8fdcde11c0..1af5fa928c 100644 --- a/core/host/main.c +++ b/core/host/main.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/host/panic.c b/core/host/panic.c index e62e49c05e..ed1994f82e 100644 --- a/core/host/panic.c +++ b/core/host/panic.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/host/stack_trace.c b/core/host/stack_trace.c index 41392e0e70..f8918b1c57 100644 --- a/core/host/stack_trace.c +++ b/core/host/stack_trace.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/host/task.c b/core/host/task.c index e896d6e45c..3ba241198b 100644 --- a/core/host/task.c +++ b/core/host/task.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/host/timer.c b/core/host/timer.c index 8a5d6442a4..66f047cd4d 100644 --- a/core/host/timer.c +++ b/core/host/timer.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/minute-ia/atomic.h b/core/minute-ia/atomic.h index 96f0e4b74e..e722d799c8 100644 --- a/core/minute-ia/atomic.h +++ b/core/minute-ia/atomic.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/minute-ia/build.mk b/core/minute-ia/build.mk index b32f8164ea..cd92c5618f 100644 --- a/core/minute-ia/build.mk +++ b/core/minute-ia/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2016 The Chromium OS Authors. All rights reserved. +# Copyright 2016 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/core/minute-ia/config_core.h b/core/minute-ia/config_core.h index b4bff97e0c..1dce51720d 100644 --- a/core/minute-ia/config_core.h +++ b/core/minute-ia/config_core.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/minute-ia/cpu.c b/core/minute-ia/cpu.c index d41d7f60c8..0157fec90b 100644 --- a/core/minute-ia/cpu.c +++ b/core/minute-ia/cpu.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/core/minute-ia/cpu.h b/core/minute-ia/cpu.h index 9853d45f31..bf5f3c5bbd 100644 --- a/core/minute-ia/cpu.h +++ b/core/minute-ia/cpu.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/core/minute-ia/ec.lds.S b/core/minute-ia/ec.lds.S index 253badd9b5..be3e0fbf2e 100644 --- a/core/minute-ia/ec.lds.S +++ b/core/minute-ia/ec.lds.S @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/minute-ia/ia_structs.h b/core/minute-ia/ia_structs.h index 14b65af1c3..83214e2c1b 100644 --- a/core/minute-ia/ia_structs.h +++ b/core/minute-ia/ia_structs.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/minute-ia/include/fpu.h b/core/minute-ia/include/fpu.h index 8b1915134d..9c0e818099 100644 --- a/core/minute-ia/include/fpu.h +++ b/core/minute-ia/include/fpu.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/minute-ia/init.S b/core/minute-ia/init.S index b8e51ccc91..4d3ac47da6 100644 --- a/core/minute-ia/init.S +++ b/core/minute-ia/init.S @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/core/minute-ia/interrupts.c b/core/minute-ia/interrupts.c index 872f9a73b3..34baa68fa8 100644 --- a/core/minute-ia/interrupts.c +++ b/core/minute-ia/interrupts.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/core/minute-ia/interrupts.h b/core/minute-ia/interrupts.h index ed8d406333..65b26c437e 100644 --- a/core/minute-ia/interrupts.h +++ b/core/minute-ia/interrupts.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/core/minute-ia/irq_handler.h b/core/minute-ia/irq_handler.h index 5640f8dbb4..deb8048e12 100644 --- a/core/minute-ia/irq_handler.h +++ b/core/minute-ia/irq_handler.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/minute-ia/irq_handler_common.S b/core/minute-ia/irq_handler_common.S index e07cf26ce1..2445f83730 100644 --- a/core/minute-ia/irq_handler_common.S +++ b/core/minute-ia/irq_handler_common.S @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/core/minute-ia/mia_panic_internal.h b/core/minute-ia/mia_panic_internal.h index a1c593ec05..d9d213ca85 100644 --- a/core/minute-ia/mia_panic_internal.h +++ b/core/minute-ia/mia_panic_internal.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/minute-ia/mpu.c b/core/minute-ia/mpu.c index 389668ea6f..d91d71f99c 100644 --- a/core/minute-ia/mpu.c +++ b/core/minute-ia/mpu.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/minute-ia/panic.c b/core/minute-ia/panic.c index 598e0e91bb..d02778891d 100644 --- a/core/minute-ia/panic.c +++ b/core/minute-ia/panic.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/minute-ia/switch.S b/core/minute-ia/switch.S index cec3f904f9..b014bb4c29 100644 --- a/core/minute-ia/switch.S +++ b/core/minute-ia/switch.S @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/core/minute-ia/task.c b/core/minute-ia/task.c index 5b8c0b7c05..79ce82fd89 100644 --- a/core/minute-ia/task.c +++ b/core/minute-ia/task.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/minute-ia/task_defs.h b/core/minute-ia/task_defs.h index d0bb35bfef..dac80e0eb9 100644 --- a/core/minute-ia/task_defs.h +++ b/core/minute-ia/task_defs.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/minute-ia/toolchain.mk b/core/minute-ia/toolchain.mk index 8fcfc28c78..ed7ebfb2c8 100644 --- a/core/minute-ia/toolchain.mk +++ b/core/minute-ia/toolchain.mk @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/core/nds32/__builtin.c b/core/nds32/__builtin.c index 7b1d5eea62..ae8aa4b053 100644 --- a/core/nds32/__builtin.c +++ b/core/nds32/__builtin.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/nds32/__divdi3.S b/core/nds32/__divdi3.S index d86e8f6273..36fe00a917 100644 --- a/core/nds32/__divdi3.S +++ b/core/nds32/__divdi3.S @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/core/nds32/__libsoftfpu.S b/core/nds32/__libsoftfpu.S index 672e6bbb3d..3f2e60767f 100644 --- a/core/nds32/__libsoftfpu.S +++ b/core/nds32/__libsoftfpu.S @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/nds32/__muldi3.S b/core/nds32/__muldi3.S index ef4a491183..0e766de3cb 100644 --- a/core/nds32/__muldi3.S +++ b/core/nds32/__muldi3.S @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/core/nds32/__udivdi3.S b/core/nds32/__udivdi3.S index 4cb3b058fe..624faff2c5 100644 --- a/core/nds32/__udivdi3.S +++ b/core/nds32/__udivdi3.S @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/core/nds32/atomic.h b/core/nds32/atomic.h index 4d640a1cdb..746093c919 100644 --- a/core/nds32/atomic.h +++ b/core/nds32/atomic.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/nds32/build.mk b/core/nds32/build.mk index e500846c44..7790b96009 100644 --- a/core/nds32/build.mk +++ b/core/nds32/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2013 The Chromium OS Authors. All rights reserved. +# Copyright 2013 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/core/nds32/config_core.h b/core/nds32/config_core.h index 7670e5cfad..096b244643 100644 --- a/core/nds32/config_core.h +++ b/core/nds32/config_core.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/nds32/cpu.c b/core/nds32/cpu.c index d94a90cf07..cfdddb334e 100644 --- a/core/nds32/cpu.c +++ b/core/nds32/cpu.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/core/nds32/cpu.h b/core/nds32/cpu.h index 3bc567d4ef..54d1a243ba 100644 --- a/core/nds32/cpu.h +++ b/core/nds32/cpu.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/core/nds32/ec.lds.S b/core/nds32/ec.lds.S index 87e87709de..87f6d2041a 100644 --- a/core/nds32/ec.lds.S +++ b/core/nds32/ec.lds.S @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/nds32/include/fpu.h b/core/nds32/include/fpu.h index 72be8a8d9b..80c3395d14 100644 --- a/core/nds32/include/fpu.h +++ b/core/nds32/include/fpu.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/nds32/init.S b/core/nds32/init.S index 159f3709d3..648e3d8183 100644 --- a/core/nds32/init.S +++ b/core/nds32/init.S @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/core/nds32/irq_chip.h b/core/nds32/irq_chip.h index ca517558b3..a339bb516c 100644 --- a/core/nds32/irq_chip.h +++ b/core/nds32/irq_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/core/nds32/irq_handler.h b/core/nds32/irq_handler.h index db0a932021..b1feaa44c3 100644 --- a/core/nds32/irq_handler.h +++ b/core/nds32/irq_handler.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/nds32/math.c b/core/nds32/math.c index c8f695804e..d0c8fc5c33 100644 --- a/core/nds32/math.c +++ b/core/nds32/math.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/nds32/panic.c b/core/nds32/panic.c index ea3022e0d0..a1eca1574f 100644 --- a/core/nds32/panic.c +++ b/core/nds32/panic.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/nds32/switch.S b/core/nds32/switch.S index 13d1b14345..e7a8584ce5 100644 --- a/core/nds32/switch.S +++ b/core/nds32/switch.S @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/core/nds32/task.c b/core/nds32/task.c index 1edd55f06f..d9ea6f191f 100644 --- a/core/nds32/task.c +++ b/core/nds32/task.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/nds32/toolchain.mk b/core/nds32/toolchain.mk index 3d685ef2b6..e2405d3054 100644 --- a/core/nds32/toolchain.mk +++ b/core/nds32/toolchain.mk @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/core/riscv-rv32i/__builtin.c b/core/riscv-rv32i/__builtin.c index 4bf495a011..8e2bf984ff 100644 --- a/core/riscv-rv32i/__builtin.c +++ b/core/riscv-rv32i/__builtin.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/riscv-rv32i/__it8xxx2_arithmetic.S b/core/riscv-rv32i/__it8xxx2_arithmetic.S index 8e477863fc..de6dd220ad 100644 --- a/core/riscv-rv32i/__it8xxx2_arithmetic.S +++ b/core/riscv-rv32i/__it8xxx2_arithmetic.S @@ -1,5 +1,5 @@ /* - * Copyright 2022 The ChromiumOS Authors. + * 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. * diff --git a/core/riscv-rv32i/atomic.h b/core/riscv-rv32i/atomic.h index 3eb66ca178..edd27f20e8 100644 --- a/core/riscv-rv32i/atomic.h +++ b/core/riscv-rv32i/atomic.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/riscv-rv32i/build.mk b/core/riscv-rv32i/build.mk index f558a91669..99171a422d 100644 --- a/core/riscv-rv32i/build.mk +++ b/core/riscv-rv32i/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/core/riscv-rv32i/config_core.h b/core/riscv-rv32i/config_core.h index fe6135683d..2adcd2783f 100644 --- a/core/riscv-rv32i/config_core.h +++ b/core/riscv-rv32i/config_core.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/riscv-rv32i/cpu.c b/core/riscv-rv32i/cpu.c index a0d7778cf4..911d170801 100644 --- a/core/riscv-rv32i/cpu.c +++ b/core/riscv-rv32i/cpu.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/core/riscv-rv32i/cpu.h b/core/riscv-rv32i/cpu.h index 7bc5c81b04..39ee3fe126 100644 --- a/core/riscv-rv32i/cpu.h +++ b/core/riscv-rv32i/cpu.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/core/riscv-rv32i/ec.lds.S b/core/riscv-rv32i/ec.lds.S index c42ec29df8..e62a7d1427 100644 --- a/core/riscv-rv32i/ec.lds.S +++ b/core/riscv-rv32i/ec.lds.S @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/riscv-rv32i/include/fpu.h b/core/riscv-rv32i/include/fpu.h index 6ead0a75a6..da48139d1c 100644 --- a/core/riscv-rv32i/include/fpu.h +++ b/core/riscv-rv32i/include/fpu.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/riscv-rv32i/init.S b/core/riscv-rv32i/init.S index 8ee5479e0e..6231ad94c0 100644 --- a/core/riscv-rv32i/init.S +++ b/core/riscv-rv32i/init.S @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/core/riscv-rv32i/irq_chip.h b/core/riscv-rv32i/irq_chip.h index 45cabf346e..b45a754f45 100644 --- a/core/riscv-rv32i/irq_chip.h +++ b/core/riscv-rv32i/irq_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/core/riscv-rv32i/irq_handler.h b/core/riscv-rv32i/irq_handler.h index 30d3b787b8..b980e8e0bc 100644 --- a/core/riscv-rv32i/irq_handler.h +++ b/core/riscv-rv32i/irq_handler.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/riscv-rv32i/math.c b/core/riscv-rv32i/math.c index 6630f36ba2..425814f185 100644 --- a/core/riscv-rv32i/math.c +++ b/core/riscv-rv32i/math.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/riscv-rv32i/panic.c b/core/riscv-rv32i/panic.c index 35e86c9fca..a2ce9213d9 100644 --- a/core/riscv-rv32i/panic.c +++ b/core/riscv-rv32i/panic.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/riscv-rv32i/switch.S b/core/riscv-rv32i/switch.S index f58ac26e63..f8b88f9235 100644 --- a/core/riscv-rv32i/switch.S +++ b/core/riscv-rv32i/switch.S @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/core/riscv-rv32i/task.c b/core/riscv-rv32i/task.c index 01e2ace31e..84415dcda9 100644 --- a/core/riscv-rv32i/task.c +++ b/core/riscv-rv32i/task.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/core/riscv-rv32i/toolchain.mk b/core/riscv-rv32i/toolchain.mk index dd45daf120..aa833d1ca3 100644 --- a/core/riscv-rv32i/toolchain.mk +++ b/core/riscv-rv32i/toolchain.mk @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/cts/build.mk b/cts/build.mk index 817b69b25c..44db306f40 100644 --- a/cts/build.mk +++ b/cts/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2016 The Chromium OS Authors. All rights reserved. +# Copyright 2016 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/cts/common/board.py b/cts/common/board.py index 19b39c07cb..3f92ff50ad 100644 --- a/cts/common/board.py +++ b/cts/common/board.py @@ -1,4 +1,4 @@ -# Copyright 2016 The Chromium OS Authors. All rights reserved. +# Copyright 2016 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/cts/common/cts.rc b/cts/common/cts.rc index 264b982655..fe27b2c308 100644 --- a/cts/common/cts.rc +++ b/cts/common/cts.rc @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/cts/common/cts_common.c b/cts/common/cts_common.c index d58ecc706e..4b56456a3c 100644 --- a/cts/common/cts_common.c +++ b/cts/common/cts_common.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/cts/common/cts_common.h b/cts/common/cts_common.h index ec65addf6c..8fd9073c62 100644 --- a/cts/common/cts_common.h +++ b/cts/common/cts_common.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/cts/common/cts_testlist.h b/cts/common/cts_testlist.h index 43a48f19e5..ee3ea58d39 100644 --- a/cts/common/cts_testlist.h +++ b/cts/common/cts_testlist.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/cts/common/dut_common.c b/cts/common/dut_common.c index c9644b66e8..aa68436d41 100644 --- a/cts/common/dut_common.c +++ b/cts/common/dut_common.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/cts/common/th_common.c b/cts/common/th_common.c index 1d692b7843..3084579b99 100644 --- a/cts/common/th_common.c +++ b/cts/common/th_common.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/cts/cts.py b/cts/cts.py index 27620dd894..f61de47398 100755 --- a/cts/cts.py +++ b/cts/cts.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright 2016 The Chromium OS Authors. All rights reserved. +# Copyright 2016 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/cts/cts.tasklist b/cts/cts.tasklist index 152b0d02b2..40dfb21e10 100644 --- a/cts/cts.tasklist +++ b/cts/cts.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/cts/gpio/cts.testlist b/cts/gpio/cts.testlist index 113d2b405f..a5b7482675 100644 --- a/cts/gpio/cts.testlist +++ b/cts/gpio/cts.testlist @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/cts/gpio/dut.c b/cts/gpio/dut.c index 33742e7472..92ae893a48 100644 --- a/cts/gpio/dut.c +++ b/cts/gpio/dut.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/cts/gpio/th.c b/cts/gpio/th.c index d553ae9df9..98fc232d1c 100644 --- a/cts/gpio/th.c +++ b/cts/gpio/th.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/cts/hook/cts.testlist b/cts/hook/cts.testlist index 97b25575d4..75e1a11324 100644 --- a/cts/hook/cts.testlist +++ b/cts/hook/cts.testlist @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/cts/hook/dut.c b/cts/hook/dut.c index 1d6b1e145e..fc6187cade 100644 --- a/cts/hook/dut.c +++ b/cts/hook/dut.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/cts/hook/th.c b/cts/hook/th.c index 1d6b1e145e..fc6187cade 100644 --- a/cts/hook/th.c +++ b/cts/hook/th.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/cts/i2c/cts.testlist b/cts/i2c/cts.testlist index 7b6461e84d..b52e247680 100644 --- a/cts/i2c/cts.testlist +++ b/cts/i2c/cts.testlist @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/cts/i2c/cts_i2c.h b/cts/i2c/cts_i2c.h index c2d5bb707c..ae4aab9878 100644 --- a/cts/i2c/cts_i2c.h +++ b/cts/i2c/cts_i2c.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/cts/i2c/dut.c b/cts/i2c/dut.c index 1b8e29b717..d2d721fdd6 100644 --- a/cts/i2c/dut.c +++ b/cts/i2c/dut.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/cts/i2c/th.c b/cts/i2c/th.c index 78035cb1b2..ef57f6300c 100644 --- a/cts/i2c/th.c +++ b/cts/i2c/th.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/cts/interrupt/cts.testlist b/cts/interrupt/cts.testlist index 0fdaf6fca2..e48208d900 100644 --- a/cts/interrupt/cts.testlist +++ b/cts/interrupt/cts.testlist @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/cts/interrupt/dut.c b/cts/interrupt/dut.c index a479918c5f..c2e0af0f81 100644 --- a/cts/interrupt/dut.c +++ b/cts/interrupt/dut.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/cts/interrupt/th.c b/cts/interrupt/th.c index 1639a1868c..ff9a3b303b 100644 --- a/cts/interrupt/th.c +++ b/cts/interrupt/th.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/cts/meta/cts.testlist b/cts/meta/cts.testlist index 28ac7e325f..2d41848737 100644 --- a/cts/meta/cts.testlist +++ b/cts/meta/cts.testlist @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/cts/meta/dut.c b/cts/meta/dut.c index c321676aec..8880c7ba13 100644 --- a/cts/meta/dut.c +++ b/cts/meta/dut.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/cts/meta/th.c b/cts/meta/th.c index 57b2f492bd..ec7f061793 100644 --- a/cts/meta/th.c +++ b/cts/meta/th.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/cts/mutex/cts.tasklist b/cts/mutex/cts.tasklist index 3387e1de09..ad0c75c601 100644 --- a/cts/mutex/cts.tasklist +++ b/cts/mutex/cts.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/cts/mutex/cts.testlist b/cts/mutex/cts.testlist index 5b1cdb1dae..5cea62c079 100644 --- a/cts/mutex/cts.testlist +++ b/cts/mutex/cts.testlist @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/cts/mutex/dut.c b/cts/mutex/dut.c index 3e9a8ca7c2..c48dfcaa64 100644 --- a/cts/mutex/dut.c +++ b/cts/mutex/dut.c @@ -1,7 +1,7 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. - * Copyright 2011 Google Inc. + * Copyright 2011 Google LLC * * Tasks for mutexes basic tests. */ diff --git a/cts/mutex/th.c b/cts/mutex/th.c index 3e9a8ca7c2..c48dfcaa64 100644 --- a/cts/mutex/th.c +++ b/cts/mutex/th.c @@ -1,7 +1,7 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. - * Copyright 2011 Google Inc. + * Copyright 2011 Google LLC * * Tasks for mutexes basic tests. */ diff --git a/cts/task/cts.tasklist b/cts/task/cts.tasklist index 6477d74c2c..1adbf211ec 100644 --- a/cts/task/cts.tasklist +++ b/cts/task/cts.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/cts/task/cts.testlist b/cts/task/cts.testlist index c4b7bc3231..3ad8e33928 100644 --- a/cts/task/cts.testlist +++ b/cts/task/cts.testlist @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/cts/task/dut.c b/cts/task/dut.c index d895301d61..257809b4b8 100644 --- a/cts/task/dut.c +++ b/cts/task/dut.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/cts/task/th.c b/cts/task/th.c index d895301d61..257809b4b8 100644 --- a/cts/task/th.c +++ b/cts/task/th.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/cts/timer/cts.testlist b/cts/timer/cts.testlist index 9b5da0d6c9..6567757ced 100644 --- a/cts/timer/cts.testlist +++ b/cts/timer/cts.testlist @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/cts/timer/dut.c b/cts/timer/dut.c index 96d7c5a3cf..9f94b9a398 100644 --- a/cts/timer/dut.c +++ b/cts/timer/dut.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/cts/timer/th.c b/cts/timer/th.c index e82cac71ab..e301ce0e38 100644 --- a/cts/timer/th.c +++ b/cts/timer/th.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/docs/code_coverage.md b/docs/code_coverage.md index e6e9b014c2..7f0c544692 100644 --- a/docs/code_coverage.md +++ b/docs/code_coverage.md @@ -23,6 +23,29 @@ data into a code coverage report using the `lcov` and `genhtml` tools. The coverage report top-level page is `build/coverage/coverage_rpt/index.html`. +To get a report for one specific board's coverage run these commands: + +``` +BOARD=eldrid +make -j$(nproc) build/coverage/initial-${BOARD}.info test-coverage +# Merge board coverage and test coverage +lcov -o build/coverage/${BOARD}_merged.info --rc lcov_branch_coverage=1 \ + -a build/coverage/initial-${BOARD}.info -a build/coverage/lcov.info +# Filter out some unhelpful paths +lcov -o build/coverage/${BOARD}_filtered.info --rc lcov_branch_coverage=1 \ + -r build/coverage/${BOARD}_merged.info ${PWD}'/third_party/**' \ + ${PWD}'/build/**' '/usr/include/**' '/usr/lib/**' '${PWD}/test/**' \ + ${PWD}'/private/fingerprint/google-fpalg/mcutest/**' +# Restrict to only files used by the board +grep "SF:" "build/coverage/initial-${BOARD}.info" | sort -u | \ + sed -e 's|^SF:||' | xargs lcov --rc lcov_branch_coverage=1 \ + -o build/coverage/${BOARD}_final.info \ + -e build/coverage/${BOARD}_filtered.info +# Generate HTML +genhtml --branch-coverage -q -o build/coverage/${BOARD}_rpt \ + -t "${BOARD} coverage" -s build/coverage/${BOARD}_final.info +``` + ### Noise in the build output When building for code coverage, you may see multiple warnings of the form diff --git a/docs/ide-support.md b/docs/ide-support.md index 55ce33117c..1a8abda422 100644 --- a/docs/ide-support.md +++ b/docs/ide-support.md @@ -70,6 +70,10 @@ ChromeOS source files. Support for `platform/ec` is not available out of the box (yet), but can be manually enabled following these steps. +### Prerequisites + +Install CrOS IDE following the [quickstart guide] + <!-- mdformat off(b/139308852) --> *** note NOTE: CrOS IDE uses the VSCode extension `clangd` for code completion and @@ -78,37 +82,40 @@ navigation. The installation of CrOS IDE disables the built-in *** <!-- mdformat on --> -### Prerequisites +### Configure EC Board -1. Install CrOS IDE following the [quickstart guide] -1. Install `bear`, a utility to generate the compilation database +1. Enter the EC repository: - ``` - (chroot) $ sudo emerge bear + ```bash + (chroot) $ cd ~/chromiumos/src/platform/ec ``` -[quickstart guide]: https://chromium.googlesource.com/chromiumos/chromite/+/main/ide_tooling/docs/quickstart.md +1. Create a `compile_commands.json` for the all EC boards: -### Configure EC Board + ```bash + (chroot) $ make all-ide-compile-cmds -j + ``` -1. Build the image and create new compile_commands.json using `bear` +1. Select a particular board: - ``` - (chroot) $ cd ~/chromiumos/src/platform/ec - export BOARD=bloonchipper - make clean BOARD=${BOARD} - bear make -j BOARD=${BOARD} - mv compile_commands.json compile_commands_inside_chroot.json + ```bash + (chroot) $ export BOARD=bloonchipper ``` -1. Generate the new compile_commands.json (use the absolute path outside chroot - as first argument) +1. Copy the new `compile_commands.json` in the root of the EC repository: ```bash - (chroot) $ cd ~/chromiumos/chromite/ide_tooling/scripts - python compdb_no_chroot.py ${EXTERNAL_TRUNK_PATH} \ - < ~/chromiumos/src/platform/ec/compile_commands_inside_chroot.json \ - > ~/chromiumos/src/platform/ec/compile_commands.json + cp build/${BOARD}/RW/compile_commands.json . ``` - The command will overwrite the file `compile_commands.json`, if it already - exists. + +Note: a single `compile_commands.json` can only cover one specific build +configuration. Only the `compile_commands.json`placed in the root of the EC +repository is considered active. When the build configuration changes (e.g. user +wants to use a different board), repeat steps 3 and 4 to replace the active +`compile_commands.json` file. + +To create a `compile_commands.json` for a specific EC board: + +```bash +(chroot) $ make BOARD=${BOARD} ide-compile-cmds +``` diff --git a/docs/zephyr/project_config.md b/docs/zephyr/project_config.md index 6e1346b0fa..f930908502 100644 --- a/docs/zephyr/project_config.md +++ b/docs/zephyr/project_config.md @@ -148,7 +148,7 @@ Below is an example of how programs may wish to structure this in `BUILD.py`: ``` python -# 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. diff --git a/driver/accel_bma2x2.c b/driver/accel_bma2x2.c index 12291297ae..08e818cb8d 100644 --- a/driver/accel_bma2x2.c +++ b/driver/accel_bma2x2.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/accel_bma422.h b/driver/accel_bma422.h index 9e8175ea7c..0b4f644101 100644 --- a/driver/accel_bma422.h +++ b/driver/accel_bma422.h @@ -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. */ diff --git a/driver/accel_bma4xx.c b/driver/accel_bma4xx.c index 80352459c3..a77b5ba589 100644 --- a/driver/accel_bma4xx.c +++ b/driver/accel_bma4xx.c @@ -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. */ diff --git a/driver/accel_bma4xx.h b/driver/accel_bma4xx.h index 49c6d1a8d0..ad3dd711e5 100644 --- a/driver/accel_bma4xx.h +++ b/driver/accel_bma4xx.h @@ -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. */ diff --git a/driver/accel_kionix.c b/driver/accel_kionix.c index e24034231c..cc12987f40 100644 --- a/driver/accel_kionix.c +++ b/driver/accel_kionix.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/accel_kionix.h b/driver/accel_kionix.h index b8f84e6f2a..8777396e01 100644 --- a/driver/accel_kionix.h +++ b/driver/accel_kionix.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/accel_kx022.h b/driver/accel_kx022.h index b1f1cdc658..089270aca4 100644 --- a/driver/accel_kx022.h +++ b/driver/accel_kx022.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/accel_kxcj9.h b/driver/accel_kxcj9.h index 9a3479ef32..e8d3c71929 100644 --- a/driver/accel_kxcj9.h +++ b/driver/accel_kxcj9.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/accel_lis2dh.c b/driver/accel_lis2dh.c index 1bdcfbdf34..eaedb216d7 100644 --- a/driver/accel_lis2dh.c +++ b/driver/accel_lis2dh.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/accel_lis2dh.h b/driver/accel_lis2dh.h index 28dafad74b..a645c3403c 100644 --- a/driver/accel_lis2dh.h +++ b/driver/accel_lis2dh.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/accel_lis2ds.c b/driver/accel_lis2ds.c index 29211488c0..2fea7524e5 100644 --- a/driver/accel_lis2ds.c +++ b/driver/accel_lis2ds.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/accel_lis2ds.h b/driver/accel_lis2ds.h index bc10a10849..3f821b3514 100644 --- a/driver/accel_lis2ds.h +++ b/driver/accel_lis2ds.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/accel_lis2dw12.c b/driver/accel_lis2dw12.c index d69a4bfbff..3cf3e4b64a 100644 --- a/driver/accel_lis2dw12.c +++ b/driver/accel_lis2dw12.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/accel_lis2dw12.h b/driver/accel_lis2dw12.h index e27d712a24..f0c7174123 100644 --- a/driver/accel_lis2dw12.h +++ b/driver/accel_lis2dw12.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/accelgyro_bmi160.c b/driver/accelgyro_bmi160.c index 2de7381399..0a736760d0 100644 --- a/driver/accelgyro_bmi160.c +++ b/driver/accelgyro_bmi160.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/accelgyro_bmi260.c b/driver/accelgyro_bmi260.c index cc19355d24..f0b16be4d5 100644 --- a/driver/accelgyro_bmi260.c +++ b/driver/accelgyro_bmi260.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/accelgyro_bmi323.h b/driver/accelgyro_bmi323.h index 5efa0a385f..9b014448bd 100644 --- a/driver/accelgyro_bmi323.h +++ b/driver/accelgyro_bmi323.h @@ -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. */ diff --git a/driver/accelgyro_bmi3xx.c b/driver/accelgyro_bmi3xx.c index 091cf5e2a8..cf2bd0b3a2 100644 --- a/driver/accelgyro_bmi3xx.c +++ b/driver/accelgyro_bmi3xx.c @@ -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. */ diff --git a/driver/accelgyro_bmi3xx.h b/driver/accelgyro_bmi3xx.h index b5395cbce3..e128b8381c 100644 --- a/driver/accelgyro_bmi3xx.h +++ b/driver/accelgyro_bmi3xx.h @@ -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. */ diff --git a/driver/accelgyro_bmi_common.c b/driver/accelgyro_bmi_common.c index 7fb5ff1e51..73131b0aae 100644 --- a/driver/accelgyro_bmi_common.c +++ b/driver/accelgyro_bmi_common.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/accelgyro_icm42607.c b/driver/accelgyro_icm42607.c index 8d9adaa054..28a131d33f 100644 --- a/driver/accelgyro_icm42607.c +++ b/driver/accelgyro_icm42607.c @@ -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. */ diff --git a/driver/accelgyro_icm42607.h b/driver/accelgyro_icm42607.h index aaba155474..53ae7a37df 100644 --- a/driver/accelgyro_icm42607.h +++ b/driver/accelgyro_icm42607.h @@ -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. */ diff --git a/driver/accelgyro_icm426xx.c b/driver/accelgyro_icm426xx.c index 3dfcb8a071..0311ed8187 100644 --- a/driver/accelgyro_icm426xx.c +++ b/driver/accelgyro_icm426xx.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/accelgyro_icm426xx.h b/driver/accelgyro_icm426xx.h index 6409f38932..704256cb68 100644 --- a/driver/accelgyro_icm426xx.h +++ b/driver/accelgyro_icm426xx.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/accelgyro_icm_common.c b/driver/accelgyro_icm_common.c index 7b810946b8..22a2b0820d 100644 --- a/driver/accelgyro_icm_common.c +++ b/driver/accelgyro_icm_common.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/accelgyro_icm_common.h b/driver/accelgyro_icm_common.h index 7845f68177..400c56ba6f 100644 --- a/driver/accelgyro_icm_common.h +++ b/driver/accelgyro_icm_common.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/accelgyro_lsm6ds0.c b/driver/accelgyro_lsm6ds0.c index c9d0dadbed..265d89e18c 100644 --- a/driver/accelgyro_lsm6ds0.c +++ b/driver/accelgyro_lsm6ds0.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/accelgyro_lsm6ds0.h b/driver/accelgyro_lsm6ds0.h index 425740421f..149a32ea7a 100644 --- a/driver/accelgyro_lsm6ds0.h +++ b/driver/accelgyro_lsm6ds0.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/accelgyro_lsm6dsm.c b/driver/accelgyro_lsm6dsm.c index 2663224658..2bf0215315 100644 --- a/driver/accelgyro_lsm6dsm.c +++ b/driver/accelgyro_lsm6dsm.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/accelgyro_lsm6dsm.h b/driver/accelgyro_lsm6dsm.h index 35ec27380b..a1d591bcc0 100644 --- a/driver/accelgyro_lsm6dsm.h +++ b/driver/accelgyro_lsm6dsm.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/accelgyro_lsm6dso.c b/driver/accelgyro_lsm6dso.c index 0bc7009060..3123d8f114 100644 --- a/driver/accelgyro_lsm6dso.c +++ b/driver/accelgyro_lsm6dso.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/accelgyro_lsm6dso.h b/driver/accelgyro_lsm6dso.h index f50b4b40d8..ccc1fa0e84 100644 --- a/driver/accelgyro_lsm6dso.h +++ b/driver/accelgyro_lsm6dso.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/als_al3010.c b/driver/als_al3010.c index fb3311df8b..b3afe31790 100644 --- a/driver/als_al3010.c +++ b/driver/als_al3010.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/als_al3010.h b/driver/als_al3010.h index f129f8a532..6d8db9e7d9 100644 --- a/driver/als_al3010.h +++ b/driver/als_al3010.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/als_bh1730.c b/driver/als_bh1730.c index d6ffe2bcae..3e0684dbdb 100644 --- a/driver/als_bh1730.c +++ b/driver/als_bh1730.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/als_bh1730.h b/driver/als_bh1730.h index e0161707bb..ab5a34b92b 100644 --- a/driver/als_bh1730.h +++ b/driver/als_bh1730.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/als_cm32183.c b/driver/als_cm32183.c index de6398491b..d97c179fe8 100644 --- a/driver/als_cm32183.c +++ b/driver/als_cm32183.c @@ -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. * diff --git a/driver/als_cm32183.h b/driver/als_cm32183.h index 9de6c15a79..f0dbaf3c03 100644 --- a/driver/als_cm32183.h +++ b/driver/als_cm32183.h @@ -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. * diff --git a/driver/als_isl29035.c b/driver/als_isl29035.c index be35389602..3391a25e01 100644 --- a/driver/als_isl29035.c +++ b/driver/als_isl29035.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/als_isl29035.h b/driver/als_isl29035.h index ad544e2590..db67837375 100644 --- a/driver/als_isl29035.h +++ b/driver/als_isl29035.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/als_opt3001.c b/driver/als_opt3001.c index 0e75fbfb4a..6939e330dd 100644 --- a/driver/als_opt3001.c +++ b/driver/als_opt3001.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/als_opt3001.h b/driver/als_opt3001.h index 69b18f8e9a..54885c74ae 100644 --- a/driver/als_opt3001.h +++ b/driver/als_opt3001.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/als_si114x.c b/driver/als_si114x.c index 1804dfb536..3355fd0bd1 100644 --- a/driver/als_si114x.c +++ b/driver/als_si114x.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/als_si114x.h b/driver/als_si114x.h index 52424035cc..57ef6f8021 100644 --- a/driver/als_si114x.h +++ b/driver/als_si114x.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/als_tcs3400.c b/driver/als_tcs3400.c index 363148dba8..002e269ada 100644 --- a/driver/als_tcs3400.c +++ b/driver/als_tcs3400.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/amd_stt.c b/driver/amd_stt.c index 50ebb9fb9d..93da8cecb5 100644 --- a/driver/amd_stt.c +++ b/driver/amd_stt.c @@ -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. */ diff --git a/driver/baro_bmp280.c b/driver/baro_bmp280.c index 4c995b742e..0175dc7e4a 100644 --- a/driver/baro_bmp280.c +++ b/driver/baro_bmp280.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/baro_bmp280.h b/driver/baro_bmp280.h index e727b3c297..605f3db4fa 100644 --- a/driver/baro_bmp280.h +++ b/driver/baro_bmp280.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/battery/bq20z453.c b/driver/battery/bq20z453.c index 2eea73742b..943dfe41b2 100644 --- a/driver/battery/bq20z453.c +++ b/driver/battery/bq20z453.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/battery/bq27541.c b/driver/battery/bq27541.c index a7af8071eb..f190c942ac 100644 --- a/driver/battery/bq27541.c +++ b/driver/battery/bq27541.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/battery/bq27621_g1.c b/driver/battery/bq27621_g1.c index 1995d93eb5..f29039f0c1 100644 --- a/driver/battery/bq27621_g1.c +++ b/driver/battery/bq27621_g1.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/battery/bq4050.c b/driver/battery/bq4050.c index 6893e2d4a6..9ba9a7304c 100644 --- a/driver/battery/bq4050.c +++ b/driver/battery/bq4050.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/battery/max17055.c b/driver/battery/max17055.c index 842075b94c..4610be64b6 100644 --- a/driver/battery/max17055.c +++ b/driver/battery/max17055.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/battery/max17055.h b/driver/battery/max17055.h index d59ccd660e..6828ed6502 100644 --- a/driver/battery/max17055.h +++ b/driver/battery/max17055.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/battery/mm8013.c b/driver/battery/mm8013.c index 01cb04c540..5d9f6e7a8d 100644 --- a/driver/battery/mm8013.c +++ b/driver/battery/mm8013.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/battery/mm8013.h b/driver/battery/mm8013.h index 82e17905e8..40cb31a355 100644 --- a/driver/battery/mm8013.h +++ b/driver/battery/mm8013.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/battery/smart.c b/driver/battery/smart.c index 8d3db27f0f..0a6cd145f3 100644 --- a/driver/battery/smart.c +++ b/driver/battery/smart.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/bc12/max14637.c b/driver/bc12/max14637.c index f819250d6a..09fa009c45 100644 --- a/driver/bc12/max14637.c +++ b/driver/bc12/max14637.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/bc12/max14637.h b/driver/bc12/max14637.h index 744b1f78bd..119437d9da 100644 --- a/driver/bc12/max14637.h +++ b/driver/bc12/max14637.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/bc12/mt6360.c b/driver/bc12/mt6360.c index e5226b7394..49ec031e09 100644 --- a/driver/bc12/mt6360.c +++ b/driver/bc12/mt6360.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/bc12/mt6360.h b/driver/bc12/mt6360.h index 781bed2f57..85dab2b6ad 100644 --- a/driver/bc12/mt6360.h +++ b/driver/bc12/mt6360.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/bc12/pi3usb9201.c b/driver/bc12/pi3usb9201.c index 7ef57c0f8e..e892c34e8c 100644 --- a/driver/bc12/pi3usb9201.c +++ b/driver/bc12/pi3usb9201.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/bc12/pi3usb9201.h b/driver/bc12/pi3usb9201.h index f50b8278d9..61728cce2a 100644 --- a/driver/bc12/pi3usb9201.h +++ b/driver/bc12/pi3usb9201.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/bc12/pi3usb9281.c b/driver/bc12/pi3usb9281.c index 426d7b4d38..9e92d0f273 100644 --- a/driver/bc12/pi3usb9281.c +++ b/driver/bc12/pi3usb9281.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/bc12/pi3usb9281.h b/driver/bc12/pi3usb9281.h index 95d09a0c58..7910502df8 100644 --- a/driver/bc12/pi3usb9281.h +++ b/driver/bc12/pi3usb9281.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/build.mk b/driver/build.mk index feef1ccc6c..622201e886 100644 --- a/driver/build.mk +++ b/driver/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2014 The Chromium OS Authors. All rights reserved. +# Copyright 2014 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/driver/charger/bd9995x.c b/driver/charger/bd9995x.c index a50f73e206..a6303d41b4 100644 --- a/driver/charger/bd9995x.c +++ b/driver/charger/bd9995x.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/charger/bd9995x.h b/driver/charger/bd9995x.h index 1b7e4b9ec7..f50712ead0 100644 --- a/driver/charger/bd9995x.h +++ b/driver/charger/bd9995x.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/charger/bq24715.c b/driver/charger/bq24715.c index 3420d33c3e..8e8e0efd50 100644 --- a/driver/charger/bq24715.c +++ b/driver/charger/bq24715.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/charger/bq24715.h b/driver/charger/bq24715.h index 62fc4f0f7f..905cdf47be 100644 --- a/driver/charger/bq24715.h +++ b/driver/charger/bq24715.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/charger/bq24773.c b/driver/charger/bq24773.c index 6b76b3dba9..bfa0aa36e7 100644 --- a/driver/charger/bq24773.c +++ b/driver/charger/bq24773.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/charger/bq24773.h b/driver/charger/bq24773.h index d0bc0e0953..ede480e9d0 100644 --- a/driver/charger/bq24773.h +++ b/driver/charger/bq24773.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/charger/bq25710.c b/driver/charger/bq25710.c index 470fa54b1a..831f7e110d 100644 --- a/driver/charger/bq25710.c +++ b/driver/charger/bq25710.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/charger/bq25710.h b/driver/charger/bq25710.h index c02cc3b3a0..078160e66e 100644 --- a/driver/charger/bq25710.h +++ b/driver/charger/bq25710.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/charger/bq257x0_regs.h b/driver/charger/bq257x0_regs.h index d02a303653..69b218436a 100644 --- a/driver/charger/bq257x0_regs.h +++ b/driver/charger/bq257x0_regs.h @@ -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. * diff --git a/driver/charger/isl923x.c b/driver/charger/isl923x.c index ff3a13a37a..84f833cc64 100644 --- a/driver/charger/isl923x.c +++ b/driver/charger/isl923x.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/charger/isl923x.h b/driver/charger/isl923x.h index 1bb1135a4b..e4ce34ee66 100644 --- a/driver/charger/isl923x.h +++ b/driver/charger/isl923x.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/charger/isl9241.c b/driver/charger/isl9241.c index e666aef802..9ca2e9f3e0 100644 --- a/driver/charger/isl9241.c +++ b/driver/charger/isl9241.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/charger/isl9241.h b/driver/charger/isl9241.h index f9387d7df1..e1b4d18b14 100644 --- a/driver/charger/isl9241.h +++ b/driver/charger/isl9241.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/charger/rt946x.c b/driver/charger/rt946x.c index 15c90721e2..acf5dc012d 100644 --- a/driver/charger/rt946x.c +++ b/driver/charger/rt946x.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/charger/rt946x.h b/driver/charger/rt946x.h index 3d5886b67b..9d0247ac5d 100644 --- a/driver/charger/rt946x.h +++ b/driver/charger/rt946x.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/charger/rt9490.c b/driver/charger/rt9490.c index e663b8ee79..a1c73c47d5 100644 --- a/driver/charger/rt9490.c +++ b/driver/charger/rt9490.c @@ -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. * diff --git a/driver/charger/rt9490.h b/driver/charger/rt9490.h index 1a7abc51d3..b814ecf842 100644 --- a/driver/charger/rt9490.h +++ b/driver/charger/rt9490.h @@ -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. * diff --git a/driver/charger/sm5803.c b/driver/charger/sm5803.c index 99a274c3d0..b8940cf8ff 100644 --- a/driver/charger/sm5803.c +++ b/driver/charger/sm5803.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/charger/sm5803.h b/driver/charger/sm5803.h index 174f0684ae..0343561f2f 100644 --- a/driver/charger/sm5803.h +++ b/driver/charger/sm5803.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/charger/sy21612.c b/driver/charger/sy21612.c index 427bc595e8..bded1474b6 100644 --- a/driver/charger/sy21612.c +++ b/driver/charger/sy21612.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/charger/sy21612.h b/driver/charger/sy21612.h index d3a3b8a1c3..bc6d45797b 100644 --- a/driver/charger/sy21612.h +++ b/driver/charger/sy21612.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/fingerprint/build.mk b/driver/fingerprint/build.mk index 6cb9dc7adb..d0d92cb011 100644 --- a/driver/fingerprint/build.mk +++ b/driver/fingerprint/build.mk @@ -1,4 +1,4 @@ -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/driver/fingerprint/elan/build.mk b/driver/fingerprint/elan/build.mk index 2e4ad2d46f..791cce9e73 100644 --- a/driver/fingerprint/elan/build.mk +++ b/driver/fingerprint/elan/build.mk @@ -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. diff --git a/driver/fingerprint/elan/elan_private.c b/driver/fingerprint/elan/elan_private.c index 555ad14ba0..fc95ceb685 100644 --- a/driver/fingerprint/elan/elan_private.c +++ b/driver/fingerprint/elan/elan_private.c @@ -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. */ diff --git a/driver/fingerprint/elan/elan_sensor.h b/driver/fingerprint/elan/elan_sensor.h index 490b1acf16..f294a00f4b 100644 --- a/driver/fingerprint/elan/elan_sensor.h +++ b/driver/fingerprint/elan/elan_sensor.h @@ -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. */ diff --git a/driver/fingerprint/elan/elan_sensor_pal.c b/driver/fingerprint/elan/elan_sensor_pal.c index b59368b835..4056c52f38 100644 --- a/driver/fingerprint/elan/elan_sensor_pal.c +++ b/driver/fingerprint/elan/elan_sensor_pal.c @@ -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. */ diff --git a/driver/fingerprint/elan/elan_sensor_pal.h b/driver/fingerprint/elan/elan_sensor_pal.h index 067b693245..235dcd5fa8 100644 --- a/driver/fingerprint/elan/elan_sensor_pal.h +++ b/driver/fingerprint/elan/elan_sensor_pal.h @@ -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. */ diff --git a/driver/fingerprint/elan/elan_setting.h b/driver/fingerprint/elan/elan_setting.h index feaf5e1550..7e62653b8f 100644 --- a/driver/fingerprint/elan/elan_setting.h +++ b/driver/fingerprint/elan/elan_setting.h @@ -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. */ diff --git a/driver/fingerprint/fpc/bep/build.mk b/driver/fingerprint/fpc/bep/build.mk index ac7f05fb60..ac5879a913 100644 --- a/driver/fingerprint/fpc/bep/build.mk +++ b/driver/fingerprint/fpc/bep/build.mk @@ -1,4 +1,4 @@ -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/driver/fingerprint/fpc/bep/fpc1025_private.h b/driver/fingerprint/fpc/bep/fpc1025_private.h index a25d789e37..35745c3119 100644 --- a/driver/fingerprint/fpc/bep/fpc1025_private.h +++ b/driver/fingerprint/fpc/bep/fpc1025_private.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/fingerprint/fpc/bep/fpc1035_private.h b/driver/fingerprint/fpc/bep/fpc1035_private.h index a876a840ab..41112b96c2 100644 --- a/driver/fingerprint/fpc/bep/fpc1035_private.h +++ b/driver/fingerprint/fpc/bep/fpc1035_private.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/fingerprint/fpc/bep/fpc_bio_algorithm.h b/driver/fingerprint/fpc/bep/fpc_bio_algorithm.h index 08a4d7c7e1..1da01d0a08 100644 --- a/driver/fingerprint/fpc/bep/fpc_bio_algorithm.h +++ b/driver/fingerprint/fpc/bep/fpc_bio_algorithm.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/fingerprint/fpc/bep/fpc_misc.c b/driver/fingerprint/fpc/bep/fpc_misc.c index c4c779b702..4eed7c603b 100644 --- a/driver/fingerprint/fpc/bep/fpc_misc.c +++ b/driver/fingerprint/fpc/bep/fpc_misc.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/fingerprint/fpc/bep/fpc_private.c b/driver/fingerprint/fpc/bep/fpc_private.c index 9b83abf309..ac20e10758 100644 --- a/driver/fingerprint/fpc/bep/fpc_private.c +++ b/driver/fingerprint/fpc/bep/fpc_private.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/fingerprint/fpc/bep/fpc_private.h b/driver/fingerprint/fpc/bep/fpc_private.h index 48c9f5b092..ca5b98fa8e 100644 --- a/driver/fingerprint/fpc/bep/fpc_private.h +++ b/driver/fingerprint/fpc/bep/fpc_private.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/fingerprint/fpc/bep/fpc_sensor_spi.c b/driver/fingerprint/fpc/bep/fpc_sensor_spi.c index 9e03ef7dce..752b9909bc 100644 --- a/driver/fingerprint/fpc/bep/fpc_sensor_spi.c +++ b/driver/fingerprint/fpc/bep/fpc_sensor_spi.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/fingerprint/fpc/bep/fpc_sensor_spi.h b/driver/fingerprint/fpc/bep/fpc_sensor_spi.h index 25d29d77a3..ad7e5411d8 100644 --- a/driver/fingerprint/fpc/bep/fpc_sensor_spi.h +++ b/driver/fingerprint/fpc/bep/fpc_sensor_spi.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/fingerprint/fpc/bep/fpc_timebase.c b/driver/fingerprint/fpc/bep/fpc_timebase.c index 113e150ed9..a63a4c3d6d 100644 --- a/driver/fingerprint/fpc/bep/fpc_timebase.c +++ b/driver/fingerprint/fpc/bep/fpc_timebase.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/fingerprint/fpc/bep/fpc_timebase.h b/driver/fingerprint/fpc/bep/fpc_timebase.h index 388d13293e..ce9018461b 100644 --- a/driver/fingerprint/fpc/bep/fpc_timebase.h +++ b/driver/fingerprint/fpc/bep/fpc_timebase.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/fingerprint/fpc/build.mk b/driver/fingerprint/fpc/build.mk index 5c18a1f096..f17af5e496 100644 --- a/driver/fingerprint/fpc/build.mk +++ b/driver/fingerprint/fpc/build.mk @@ -1,4 +1,4 @@ -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/driver/fingerprint/fpc/fpc_sensor.c b/driver/fingerprint/fpc/fpc_sensor.c index a15502521f..bbab729b12 100644 --- a/driver/fingerprint/fpc/fpc_sensor.c +++ b/driver/fingerprint/fpc/fpc_sensor.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/fingerprint/fpc/fpc_sensor.h b/driver/fingerprint/fpc/fpc_sensor.h index 2ab9248eeb..22e670afd0 100644 --- a/driver/fingerprint/fpc/fpc_sensor.h +++ b/driver/fingerprint/fpc/fpc_sensor.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/fingerprint/fpc/libfp/build.mk b/driver/fingerprint/fpc/libfp/build.mk index 3fabab38e9..f22700f309 100644 --- a/driver/fingerprint/fpc/libfp/build.mk +++ b/driver/fingerprint/fpc/libfp/build.mk @@ -1,4 +1,4 @@ -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/driver/fingerprint/fpc/libfp/fpc1145_private.h b/driver/fingerprint/fpc/libfp/fpc1145_private.h index e5cf9f57ca..993d1e1ea9 100644 --- a/driver/fingerprint/fpc/libfp/fpc1145_private.h +++ b/driver/fingerprint/fpc/libfp/fpc1145_private.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/fingerprint/fpc/libfp/fpc_bio_algorithm.h b/driver/fingerprint/fpc/libfp/fpc_bio_algorithm.h index 3b9db033da..7dda6d46de 100644 --- a/driver/fingerprint/fpc/libfp/fpc_bio_algorithm.h +++ b/driver/fingerprint/fpc/libfp/fpc_bio_algorithm.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/fingerprint/fpc/libfp/fpc_private.c b/driver/fingerprint/fpc/libfp/fpc_private.c index 0af7297119..fcc0180784 100644 --- a/driver/fingerprint/fpc/libfp/fpc_private.c +++ b/driver/fingerprint/fpc/libfp/fpc_private.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/fingerprint/fpc/libfp/fpc_private.h b/driver/fingerprint/fpc/libfp/fpc_private.h index adb0e7c0ea..19ac3b7a13 100644 --- a/driver/fingerprint/fpc/libfp/fpc_private.h +++ b/driver/fingerprint/fpc/libfp/fpc_private.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/fingerprint/fpc/libfp/fpc_sensor_pal.c b/driver/fingerprint/fpc/libfp/fpc_sensor_pal.c index 2ac4d9d7a6..c0578bc09b 100644 --- a/driver/fingerprint/fpc/libfp/fpc_sensor_pal.c +++ b/driver/fingerprint/fpc/libfp/fpc_sensor_pal.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/fingerprint/fpc/libfp/fpc_sensor_pal.h b/driver/fingerprint/fpc/libfp/fpc_sensor_pal.h index 173de4045a..844f1d7498 100644 --- a/driver/fingerprint/fpc/libfp/fpc_sensor_pal.h +++ b/driver/fingerprint/fpc/libfp/fpc_sensor_pal.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/fingerprint/fpsensor.h b/driver/fingerprint/fpsensor.h index ac7e31fb6a..83e3143a55 100644 --- a/driver/fingerprint/fpsensor.h +++ b/driver/fingerprint/fpsensor.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/gl3590.c b/driver/gl3590.c index 27650c6204..da374fbc88 100644 --- a/driver/gl3590.c +++ b/driver/gl3590.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/gl3590.h b/driver/gl3590.h index 1d24785491..ef429c04f1 100644 --- a/driver/gl3590.h +++ b/driver/gl3590.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/gyro_l3gd20h.c b/driver/gyro_l3gd20h.c index fd480d1f99..9e47b86893 100644 --- a/driver/gyro_l3gd20h.c +++ b/driver/gyro_l3gd20h.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/gyro_l3gd20h.h b/driver/gyro_l3gd20h.h index 13679ba2da..26e4e55d10 100644 --- a/driver/gyro_l3gd20h.h +++ b/driver/gyro_l3gd20h.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/ina2xx.c b/driver/ina2xx.c index 3691e62503..e09c141f50 100644 --- a/driver/ina2xx.c +++ b/driver/ina2xx.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/ina2xx.h b/driver/ina2xx.h index 1fa3668114..654283578c 100644 --- a/driver/ina2xx.h +++ b/driver/ina2xx.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/ina3221.c b/driver/ina3221.c index 67f0c5710a..4659552497 100644 --- a/driver/ina3221.c +++ b/driver/ina3221.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/ina3221.h b/driver/ina3221.h index 7d978df6c8..5d642bba3b 100644 --- a/driver/ina3221.h +++ b/driver/ina3221.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/ioexpander/ccgxxf.c b/driver/ioexpander/ccgxxf.c index d4dfbf4da3..a95d17ada3 100644 --- a/driver/ioexpander/ccgxxf.c +++ b/driver/ioexpander/ccgxxf.c @@ -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. * diff --git a/driver/ioexpander/ioexpander_nct38xx.c b/driver/ioexpander/ioexpander_nct38xx.c index e691f62c83..a97bf06908 100644 --- a/driver/ioexpander/ioexpander_nct38xx.c +++ b/driver/ioexpander/ioexpander_nct38xx.c @@ -1,5 +1,5 @@ /* - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/ioexpander/it8300.h b/driver/ioexpander/it8300.h index fa4a251fcd..ce1dfc91a8 100644 --- a/driver/ioexpander/it8300.h +++ b/driver/ioexpander/it8300.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/ioexpander/it8801.c b/driver/ioexpander/it8801.c index eddd20b56d..256b4c9654 100644 --- a/driver/ioexpander/it8801.c +++ b/driver/ioexpander/it8801.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/ioexpander/it8801.h b/driver/ioexpander/it8801.h index a1bb327e65..605c88789b 100644 --- a/driver/ioexpander/it8801.h +++ b/driver/ioexpander/it8801.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/ioexpander/pca9534.c b/driver/ioexpander/pca9534.c index 206b501e1a..cd7fc0acf5 100644 --- a/driver/ioexpander/pca9534.c +++ b/driver/ioexpander/pca9534.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/ioexpander/pca9534.h b/driver/ioexpander/pca9534.h index 96aa7c0bcb..67e48191e1 100644 --- a/driver/ioexpander/pca9534.h +++ b/driver/ioexpander/pca9534.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/ioexpander/pca9555.h b/driver/ioexpander/pca9555.h index 061a6c6d81..ea29c91656 100644 --- a/driver/ioexpander/pca9555.h +++ b/driver/ioexpander/pca9555.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/ioexpander/pca9675.c b/driver/ioexpander/pca9675.c index a2a13110b9..74faab8722 100644 --- a/driver/ioexpander/pca9675.c +++ b/driver/ioexpander/pca9675.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/ioexpander/pca9675.h b/driver/ioexpander/pca9675.h index 59f36918a4..6b71ffa023 100644 --- a/driver/ioexpander/pca9675.h +++ b/driver/ioexpander/pca9675.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/ioexpander/pcal6408.c b/driver/ioexpander/pcal6408.c index 6ef0a9fe4d..1b746bffc3 100644 --- a/driver/ioexpander/pcal6408.c +++ b/driver/ioexpander/pcal6408.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/ioexpander/pcal6408.h b/driver/ioexpander/pcal6408.h index a9eac4bfaf..3bedf5bdc4 100644 --- a/driver/ioexpander/pcal6408.h +++ b/driver/ioexpander/pcal6408.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/ioexpander/tca64xxa.c b/driver/ioexpander/tca64xxa.c index 57b964257f..b1b0d2dd09 100644 --- a/driver/ioexpander/tca64xxa.c +++ b/driver/ioexpander/tca64xxa.c @@ -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. */ diff --git a/driver/ioexpander/tca64xxa.h b/driver/ioexpander/tca64xxa.h index c736c5bc2d..af095d7ea9 100644 --- a/driver/ioexpander/tca64xxa.h +++ b/driver/ioexpander/tca64xxa.h @@ -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. */ diff --git a/driver/led/aw20198.c b/driver/led/aw20198.c index 56611bce17..e2eea69481 100644 --- a/driver/led/aw20198.c +++ b/driver/led/aw20198.c @@ -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. */ diff --git a/driver/led/aw20198.h b/driver/led/aw20198.h index 84aacfc7db..85ef8c4b9e 100644 --- a/driver/led/aw20198.h +++ b/driver/led/aw20198.h @@ -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. */ diff --git a/driver/led/ds2413.c b/driver/led/ds2413.c index 202fddb1ce..5268e52ac0 100644 --- a/driver/led/ds2413.c +++ b/driver/led/ds2413.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/led/is31fl3733b.c b/driver/led/is31fl3733b.c index 64e76f672f..33004d1cec 100644 --- a/driver/led/is31fl3733b.c +++ b/driver/led/is31fl3733b.c @@ -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. */ diff --git a/driver/led/is31fl3743b.c b/driver/led/is31fl3743b.c index f9c86284d1..5eef21c388 100644 --- a/driver/led/is31fl3743b.c +++ b/driver/led/is31fl3743b.c @@ -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. */ diff --git a/driver/led/lm3509.c b/driver/led/lm3509.c index 46b520184d..5df604bac6 100644 --- a/driver/led/lm3509.c +++ b/driver/led/lm3509.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/led/lm3509.h b/driver/led/lm3509.h index d18d22aaed..1f2ace46f0 100644 --- a/driver/led/lm3509.h +++ b/driver/led/lm3509.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/led/lm3630a.c b/driver/led/lm3630a.c index 005912724b..e3194ede45 100644 --- a/driver/led/lm3630a.c +++ b/driver/led/lm3630a.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/led/lm3630a.h b/driver/led/lm3630a.h index 9c9cdaf442..34a268c370 100644 --- a/driver/led/lm3630a.h +++ b/driver/led/lm3630a.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/led/lp5562.c b/driver/led/lp5562.c index 8e8716213c..e1766fd776 100644 --- a/driver/led/lp5562.c +++ b/driver/led/lp5562.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/led/lp5562.h b/driver/led/lp5562.h index 8dd4dc64d4..81031ee084 100644 --- a/driver/led/lp5562.h +++ b/driver/led/lp5562.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/led/max695x.c b/driver/led/max695x.c index e48ae4482a..31e0799b11 100644 --- a/driver/led/max695x.c +++ b/driver/led/max695x.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/led/max695x.h b/driver/led/max695x.h index 6b89dd9ad0..b792237d57 100644 --- a/driver/led/max695x.h +++ b/driver/led/max695x.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/led/mp3385.c b/driver/led/mp3385.c index babe17f849..50ce31341a 100644 --- a/driver/led/mp3385.c +++ b/driver/led/mp3385.c @@ -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. * diff --git a/driver/led/mp3385.h b/driver/led/mp3385.h index 68d408217a..733a8f76cd 100644 --- a/driver/led/mp3385.h +++ b/driver/led/mp3385.h @@ -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. * diff --git a/driver/led/oz554.c b/driver/led/oz554.c index 9f898b9daf..b2cbff08ba 100644 --- a/driver/led/oz554.c +++ b/driver/led/oz554.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/led/oz554.h b/driver/led/oz554.h index 1893900b22..c735f9f3b9 100644 --- a/driver/led/oz554.h +++ b/driver/led/oz554.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/led/tlc59116f.c b/driver/led/tlc59116f.c index dc40bfe7c9..3debdb3cfb 100644 --- a/driver/led/tlc59116f.c +++ b/driver/led/tlc59116f.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/driver/led/tlc59116f.h b/driver/led/tlc59116f.h index 7960761c12..2a0347f568 100644 --- a/driver/led/tlc59116f.h +++ b/driver/led/tlc59116f.h @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/driver/ln9310.c b/driver/ln9310.c index 23410723dc..4a56568eb9 100644 --- a/driver/ln9310.c +++ b/driver/ln9310.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/mag_bmm150.c b/driver/mag_bmm150.c index 47a89f3246..5088e51c14 100644 --- a/driver/mag_bmm150.c +++ b/driver/mag_bmm150.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/mag_lis2mdl.c b/driver/mag_lis2mdl.c index 64bb413b16..e8a8cb82ca 100644 --- a/driver/mag_lis2mdl.c +++ b/driver/mag_lis2mdl.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/mag_lis2mdl.h b/driver/mag_lis2mdl.h index 9ca433a507..ea28137beb 100644 --- a/driver/mag_lis2mdl.h +++ b/driver/mag_lis2mdl.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/mcdp28x0.c b/driver/mcdp28x0.c index 4fd8289398..1b56e6d53f 100644 --- a/driver/mcdp28x0.c +++ b/driver/mcdp28x0.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/mcdp28x0.h b/driver/mcdp28x0.h index e3e4685b90..a35184600f 100644 --- a/driver/mcdp28x0.h +++ b/driver/mcdp28x0.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/mp2964.c b/driver/mp2964.c index e5a94fecc2..7e08d4f5ba 100644 --- a/driver/mp2964.c +++ b/driver/mp2964.c @@ -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. */ diff --git a/driver/mp2964.h b/driver/mp2964.h index 5d4dbca4a2..228cae8d5b 100644 --- a/driver/mp2964.h +++ b/driver/mp2964.h @@ -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. */ diff --git a/driver/mp4245.c b/driver/mp4245.c index 216fac120d..a78cfbd068 100644 --- a/driver/mp4245.c +++ b/driver/mp4245.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/mp4245.h b/driver/mp4245.h index b234827809..64fc3e9bc1 100644 --- a/driver/mp4245.h +++ b/driver/mp4245.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/nfc/ctn730.c b/driver/nfc/ctn730.c index 5beaf5f489..090c140864 100644 --- a/driver/nfc/ctn730.c +++ b/driver/nfc/ctn730.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/nfc/ctn730.h b/driver/nfc/ctn730.h index 3ecb869129..6911d4fa5e 100644 --- a/driver/nfc/ctn730.h +++ b/driver/nfc/ctn730.h @@ -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. */ diff --git a/driver/nvidia_gpu.c b/driver/nvidia_gpu.c index 764a488ac8..e9fbd156ac 100644 --- a/driver/nvidia_gpu.c +++ b/driver/nvidia_gpu.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. * diff --git a/driver/nvidia_gpu.h b/driver/nvidia_gpu.h index 5b2e7e1b1d..bfd1bba287 100644 --- a/driver/nvidia_gpu.h +++ b/driver/nvidia_gpu.h @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. * diff --git a/driver/pmic_bd99992gw.h b/driver/pmic_bd99992gw.h index 205e15fa13..9229b62f48 100644 --- a/driver/pmic_bd99992gw.h +++ b/driver/pmic_bd99992gw.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/pmic_tps650x30.h b/driver/pmic_tps650x30.h index 198b58edc1..f346fba380 100644 --- a/driver/pmic_tps650x30.h +++ b/driver/pmic_tps650x30.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/ppc/aoz1380.c b/driver/ppc/aoz1380.c index 3d0c60dbb3..27d55cab51 100644 --- a/driver/ppc/aoz1380.c +++ b/driver/ppc/aoz1380.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/ppc/ktu1125.c b/driver/ppc/ktu1125.c index aebb3ad86b..047d011aac 100644 --- a/driver/ppc/ktu1125.c +++ b/driver/ppc/ktu1125.c @@ -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. */ diff --git a/driver/ppc/ktu1125.h b/driver/ppc/ktu1125.h index ca57677984..229c894b8c 100644 --- a/driver/ppc/ktu1125.h +++ b/driver/ppc/ktu1125.h @@ -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. */ diff --git a/driver/ppc/nx20p348x.c b/driver/ppc/nx20p348x.c index 88903d3587..d202898a85 100644 --- a/driver/ppc/nx20p348x.c +++ b/driver/ppc/nx20p348x.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/ppc/nx20p348x.h b/driver/ppc/nx20p348x.h index 5188ea3f76..94e7a8d06e 100644 --- a/driver/ppc/nx20p348x.h +++ b/driver/ppc/nx20p348x.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/ppc/rt1718s.c b/driver/ppc/rt1718s.c index 1864bd3c47..3accf5d0fa 100644 --- a/driver/ppc/rt1718s.c +++ b/driver/ppc/rt1718s.c @@ -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. */ diff --git a/driver/ppc/rt1718s.h b/driver/ppc/rt1718s.h index 192063d3fc..e3fd8ac74e 100644 --- a/driver/ppc/rt1718s.h +++ b/driver/ppc/rt1718s.h @@ -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. */ diff --git a/driver/ppc/rt1739.c b/driver/ppc/rt1739.c index 4c8effa483..d89599a7ae 100644 --- a/driver/ppc/rt1739.c +++ b/driver/ppc/rt1739.c @@ -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. */ diff --git a/driver/ppc/rt1739.h b/driver/ppc/rt1739.h index 951b69a350..d93369094f 100644 --- a/driver/ppc/rt1739.h +++ b/driver/ppc/rt1739.h @@ -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. */ diff --git a/driver/ppc/sn5s330.c b/driver/ppc/sn5s330.c index 75258e1925..385f27fe52 100644 --- a/driver/ppc/sn5s330.c +++ b/driver/ppc/sn5s330.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/ppc/sn5s330.h b/driver/ppc/sn5s330.h index ebcb46ce45..70a46920ee 100644 --- a/driver/ppc/sn5s330.h +++ b/driver/ppc/sn5s330.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/ppc/syv682x.c b/driver/ppc/syv682x.c index d7539d7a81..88c6443ad0 100644 --- a/driver/ppc/syv682x.c +++ b/driver/ppc/syv682x.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/ppc/syv682x.h b/driver/ppc/syv682x.h index 9bb3e24556..f4fa616725 100644 --- a/driver/ppc/syv682x.h +++ b/driver/ppc/syv682x.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/regulator_ir357x.c b/driver/regulator_ir357x.c index 94c42d37f9..24e4e26bbe 100644 --- a/driver/regulator_ir357x.c +++ b/driver/regulator_ir357x.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/retimer/anx7483.c b/driver/retimer/anx7483.c index 302d12c701..f3f6c351d4 100644 --- a/driver/retimer/anx7483.c +++ b/driver/retimer/anx7483.c @@ -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. * diff --git a/driver/retimer/anx7483.h b/driver/retimer/anx7483.h index 2346df571d..d489b3d8e6 100644 --- a/driver/retimer/anx7483.h +++ b/driver/retimer/anx7483.h @@ -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. * diff --git a/driver/retimer/anx7491.h b/driver/retimer/anx7491.h index da2461564b..9bf9594ea7 100644 --- a/driver/retimer/anx7491.h +++ b/driver/retimer/anx7491.h @@ -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. * diff --git a/driver/retimer/bb_retimer.c b/driver/retimer/bb_retimer.c index 4123e76c23..897541bfc2 100644 --- a/driver/retimer/bb_retimer.c +++ b/driver/retimer/bb_retimer.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * @@ -597,8 +597,16 @@ static int retimer_init(const struct usb_mux *me) return rv; rv = bb_retimer_read(me, BB_RETIMER_REG_VENDOR_ID, &data); + /* + * After reset, i2c controller may not be ready, if this fails, + * retry one more time. + * TODO: revisit the delay time after retimer reset. + */ + if (rv != EC_SUCCESS) + rv = bb_retimer_read(me, BB_RETIMER_REG_VENDOR_ID, &data); if (rv != EC_SUCCESS) return rv; + CPRINTS("C%d: retimer power enable success", me->usb_port); #ifdef CONFIG_USBC_RETIMER_INTEL_HB if (data != BB_RETIMER_DEVICE_ID) return EC_ERROR_INVAL; @@ -630,6 +638,7 @@ static int console_command_bb_retimer(int argc, const char **argv) int port, reg, data, val = 0; int rv = EC_SUCCESS; const struct usb_mux *mux; + const struct usb_mux_chain *mux_chain; if (argc < 4) return EC_ERROR_PARAM_COUNT; @@ -639,14 +648,15 @@ static int console_command_bb_retimer(int argc, const char **argv) if (*e || !board_is_usb_pd_port_present(port)) return EC_ERROR_PARAM1; - mux = &usb_muxes[port]; - while (mux) { + mux_chain = &usb_muxes[port]; + while (mux_chain) { + mux = mux_chain->mux; if (mux->driver == &bb_usb_retimer) break; - mux = mux->next_mux; + mux_chain = mux_chain->next; } - if (!mux) + if (!mux_chain) return EC_ERROR_PARAM1; /* Validate r/w selection */ @@ -666,7 +676,8 @@ static int console_command_bb_retimer(int argc, const char **argv) return EC_ERROR_PARAM4; } - for (; mux != NULL; mux = mux->next_mux) { + for (; mux_chain != NULL; mux_chain = mux_chain->next) { + mux = mux_chain->mux; if (mux->driver == &bb_usb_retimer) { if (rw == 'r') rv = bb_retimer_read(mux, reg, &data); diff --git a/driver/retimer/kb800x.c b/driver/retimer/kb800x.c index 0581b813c9..35ab5b183d 100644 --- a/driver/retimer/kb800x.c +++ b/driver/retimer/kb800x.c @@ -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. * @@ -479,6 +479,7 @@ static int console_command_kb800x_xfer(int argc, const char **argv) char rw, *e; int rv, port, reg, val; uint8_t data; + const struct usb_mux_chain *mux_chain; const struct usb_mux *mux; if (argc < 4) @@ -489,16 +490,18 @@ static int console_command_kb800x_xfer(int argc, const char **argv) if (*e || !board_is_usb_pd_port_present(port)) return EC_ERROR_PARAM1; - mux = &usb_muxes[port]; - while (mux) { - if (mux->driver == &kb800x_usb_mux_driver) + mux_chain = &usb_muxes[port]; + while (mux_chain) { + if (mux_chain->mux->driver == &kb800x_usb_mux_driver) break; - mux = mux->next_mux; + mux_chain = mux_chain->next; } - if (!mux) + if (!mux_chain) return EC_ERROR_PARAM1; + mux = mux_chain->mux; + /* Validate r/w selection */ rw = argv[2][0]; if (rw != 'w' && rw != 'r') diff --git a/driver/retimer/kb800x.h b/driver/retimer/kb800x.h index dd8c969e2b..1d041f3e29 100644 --- a/driver/retimer/kb800x.h +++ b/driver/retimer/kb800x.h @@ -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. * diff --git a/driver/retimer/nb7v904m.c b/driver/retimer/nb7v904m.c index 4e73c5d3ee..c7b2cb5311 100644 --- a/driver/retimer/nb7v904m.c +++ b/driver/retimer/nb7v904m.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/retimer/nb7v904m.h b/driver/retimer/nb7v904m.h index ed7bcc36ce..07c3b4d51f 100644 --- a/driver/retimer/nb7v904m.h +++ b/driver/retimer/nb7v904m.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/retimer/pi3dpx1207.c b/driver/retimer/pi3dpx1207.c index b75e88b25f..5fac18e049 100644 --- a/driver/retimer/pi3dpx1207.c +++ b/driver/retimer/pi3dpx1207.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/retimer/pi3dpx1207.h b/driver/retimer/pi3dpx1207.h index 4a66273f4c..b246052f2c 100644 --- a/driver/retimer/pi3dpx1207.h +++ b/driver/retimer/pi3dpx1207.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/retimer/pi3hdx1204.c b/driver/retimer/pi3hdx1204.c index 770b2f47f5..7cf963c7f9 100644 --- a/driver/retimer/pi3hdx1204.c +++ b/driver/retimer/pi3hdx1204.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/retimer/pi3hdx1204.h b/driver/retimer/pi3hdx1204.h index 817115fc32..637accaf56 100644 --- a/driver/retimer/pi3hdx1204.h +++ b/driver/retimer/pi3hdx1204.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/retimer/ps8802.c b/driver/retimer/ps8802.c index 7a2dfde0ba..53c8831f33 100644 --- a/driver/retimer/ps8802.c +++ b/driver/retimer/ps8802.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/retimer/ps8802.h b/driver/retimer/ps8802.h index 552f1995a8..b8a51de62d 100644 --- a/driver/retimer/ps8802.h +++ b/driver/retimer/ps8802.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/retimer/ps8811.c b/driver/retimer/ps8811.c index 2485592d18..aadcbc9f6c 100644 --- a/driver/retimer/ps8811.c +++ b/driver/retimer/ps8811.c @@ -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. * diff --git a/driver/retimer/ps8811.h b/driver/retimer/ps8811.h index d802d82d03..b834635215 100644 --- a/driver/retimer/ps8811.h +++ b/driver/retimer/ps8811.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/retimer/ps8818.c b/driver/retimer/ps8818.c index 26945a3874..18dc455e0b 100644 --- a/driver/retimer/ps8818.c +++ b/driver/retimer/ps8818.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/retimer/ps8818.h b/driver/retimer/ps8818.h index ee1713f3ec..3f0aba963b 100644 --- a/driver/retimer/ps8818.h +++ b/driver/retimer/ps8818.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/retimer/tdp142.c b/driver/retimer/tdp142.c index 5368c70b59..fb5149da63 100644 --- a/driver/retimer/tdp142.c +++ b/driver/retimer/tdp142.c @@ -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. * diff --git a/driver/retimer/tdp142.h b/driver/retimer/tdp142.h index ba4031b7e3..abf0e3588c 100644 --- a/driver/retimer/tdp142.h +++ b/driver/retimer/tdp142.h @@ -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. * diff --git a/driver/retimer/tusb544.c b/driver/retimer/tusb544.c index 661f08cec2..cc272186b6 100644 --- a/driver/retimer/tusb544.c +++ b/driver/retimer/tusb544.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/retimer/tusb544.h b/driver/retimer/tusb544.h index 2a5f50f051..9fe74c5299 100644 --- a/driver/retimer/tusb544.h +++ b/driver/retimer/tusb544.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/sb_rmi.c b/driver/sb_rmi.c index 4dc8e1684c..420ef672ad 100644 --- a/driver/sb_rmi.c +++ b/driver/sb_rmi.c @@ -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. */ diff --git a/driver/sb_rmi.h b/driver/sb_rmi.h index 132af0e70a..d406562f79 100644 --- a/driver/sb_rmi.h +++ b/driver/sb_rmi.h @@ -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. */ diff --git a/driver/sensorhub_lsm6dsm.c b/driver/sensorhub_lsm6dsm.c index e4f9c28b74..d801eb85f3 100644 --- a/driver/sensorhub_lsm6dsm.c +++ b/driver/sensorhub_lsm6dsm.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/sensorhub_lsm6dsm.h b/driver/sensorhub_lsm6dsm.h index f453565810..9f1b7671ac 100644 --- a/driver/sensorhub_lsm6dsm.h +++ b/driver/sensorhub_lsm6dsm.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/stm_mems_common.c b/driver/stm_mems_common.c index c5fa9a2cca..93a0b4dc2f 100644 --- a/driver/stm_mems_common.c +++ b/driver/stm_mems_common.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/stm_mems_common.h b/driver/stm_mems_common.h index 7191b368ac..370ce10d9c 100644 --- a/driver/stm_mems_common.h +++ b/driver/stm_mems_common.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/sync.c b/driver/sync.c index 1fdb8d2589..6c48096a18 100644 --- a/driver/sync.c +++ b/driver/sync.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/sync.h b/driver/sync.h index 76542b3f46..76aa225cc1 100644 --- a/driver/sync.h +++ b/driver/sync.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/tcpm/anx7447.c b/driver/tcpm/anx7447.c index 954e2a82d7..c21b4cdf2f 100644 --- a/driver/tcpm/anx7447.c +++ b/driver/tcpm/anx7447.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -286,7 +286,7 @@ DECLARE_CONSOLE_COMMAND(anx_ocm, command_anx_ocm, "port [erase]", static int anx7447_init(int port) { int rv, reg, i; - const struct usb_mux *me = &usb_muxes[port]; + const struct usb_mux_chain *me = &usb_muxes[port]; bool unused; ASSERT(port < CONFIG_USB_PD_PORT_MAX_COUNT); @@ -384,15 +384,15 @@ static int anx7447_init(int port) * Run mux_set() here for considering CCD(Case-Closed Debugging) case * If this TCPC is not also the MUX then don't initialize to NONE */ - while ((me != NULL) && (me->driver != &anx7447_usb_mux_driver)) - me = me->next_mux; + while ((me != NULL) && (me->mux->driver != &anx7447_usb_mux_driver)) + me = me->next; /* * Note that bypassing the usb_mux API is okay for internal driver calls * since the task calling init already holds this port's mux lock. */ - if (me != NULL && !(me->flags & USB_MUX_FLAG_NOT_TCPC)) - rv = anx7447_mux_set(me, USB_PD_MUX_NONE, &unused); + if (me != NULL && !(me->mux->flags & USB_MUX_FLAG_NOT_TCPC)) + rv = anx7447_mux_set(me->mux, USB_PD_MUX_NONE, &unused); #endif /* CONFIG_USB_PD_TCPM_MUX */ return rv; @@ -631,7 +631,7 @@ static int anx7447_mux_init(const struct usb_mux *me) const uint16_t tcpc_i2c_addr = I2C_STRIP_FLAGS(tcpc_config[me->usb_port].i2c_info.addr_flags); const uint16_t mux_i2c_addr = - I2C_STRIP_FLAGS(usb_muxes[port].i2c_addr_flags); + I2C_STRIP_FLAGS(usb_muxes[port].mux->i2c_addr_flags); /* * find corresponding anx7447 SPI address according to @@ -650,7 +650,7 @@ static int anx7447_mux_init(const struct usb_mux *me) } if (!I2C_STRIP_FLAGS(anx[port].i2c_addr_flags)) { ccprintf("TCPC I2C addr 0x%x is invalid for ANX7447\n", - I2C_STRIP_FLAGS(usb_muxes[port].i2c_addr_flags)); + I2C_STRIP_FLAGS(usb_muxes[port].mux->i2c_addr_flags)); return EC_ERROR_UNKNOWN; } diff --git a/driver/tcpm/anx7447.h b/driver/tcpm/anx7447.h index 761c0e7cbf..42de7502f1 100644 --- a/driver/tcpm/anx7447.h +++ b/driver/tcpm/anx7447.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/tcpm/anx74xx.c b/driver/tcpm/anx74xx.c index e9fd9f0ba6..ed43061c62 100644 --- a/driver/tcpm/anx74xx.c +++ b/driver/tcpm/anx74xx.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * @@ -292,7 +292,7 @@ static int anx74xx_tcpm_mux_init(const struct usb_mux *me) static int anx74xx_tcpm_mux_enter_safe_mode(int port) { int reg; - const struct usb_mux *me = &usb_muxes[port]; + const struct usb_mux *me = usb_muxes[port].mux; if (mux_read(me, ANX74XX_REG_ANALOG_CTRL_2, ®)) return EC_ERROR_UNKNOWN; @@ -306,7 +306,7 @@ static int anx74xx_tcpm_mux_enter_safe_mode(int port) static int anx74xx_tcpm_mux_exit_safe_mode(int port) { int reg; - const struct usb_mux *me = &usb_muxes[port]; + const struct usb_mux *me = usb_muxes[port].mux; if (mux_read(me, ANX74XX_REG_ANALOG_CTRL_2, ®)) return EC_ERROR_UNKNOWN; @@ -320,7 +320,7 @@ static int anx74xx_tcpm_mux_exit_safe_mode(int port) static int anx74xx_tcpm_mux_exit(int port) { int reg; - const struct usb_mux *me = &usb_muxes[port]; + const struct usb_mux *me = usb_muxes[port].mux; /* * Safe mode must be entered before any changes are made to the mux @@ -360,7 +360,7 @@ static int anx74xx_mux_aux_to_sbu(int port, int polarity, int enabled) int reg; const int aux_mask = ANX74XX_REG_AUX_SWAP_SET_CC2 | ANX74XX_REG_AUX_SWAP_SET_CC1; - const struct usb_mux *me = &usb_muxes[port]; + const struct usb_mux *me = usb_muxes[port].mux; /* * Get the current value of analog_ctrl_2 register. Note, that safe mode @@ -777,7 +777,7 @@ static int anx74xx_tcpm_set_cc(int port, int pull) static int anx74xx_tcpm_set_polarity(int port, enum tcpc_cc_polarity polarity) { int reg, mux_state, rv = EC_SUCCESS; - const struct usb_mux *me = &usb_muxes[port]; + const struct usb_mux *me = usb_muxes[port].mux; bool unused; rv |= tcpc_read(port, ANX74XX_REG_CC_SOFTWARE_CTRL, ®); diff --git a/driver/tcpm/anx74xx.h b/driver/tcpm/anx74xx.h index 7cd979bbbf..e814d85371 100644 --- a/driver/tcpm/anx74xx.h +++ b/driver/tcpm/anx74xx.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/tcpm/anx7688.c b/driver/tcpm/anx7688.c index 70f5440e93..764998d7ef 100644 --- a/driver/tcpm/anx7688.c +++ b/driver/tcpm/anx7688.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/tcpm/anx7688.h b/driver/tcpm/anx7688.h index 534e4155b1..8a7d2e1d03 100644 --- a/driver/tcpm/anx7688.h +++ b/driver/tcpm/anx7688.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/tcpm/ccgxxf.c b/driver/tcpm/ccgxxf.c index 085367b35f..34670e12ef 100644 --- a/driver/tcpm/ccgxxf.c +++ b/driver/tcpm/ccgxxf.c @@ -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. * diff --git a/driver/tcpm/ccgxxf.h b/driver/tcpm/ccgxxf.h index 51cc7819a0..9342dc9a98 100644 --- a/driver/tcpm/ccgxxf.h +++ b/driver/tcpm/ccgxxf.h @@ -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. */ diff --git a/driver/tcpm/fusb302.c b/driver/tcpm/fusb302.c index 4c4a035469..780e5b2cfe 100644 --- a/driver/tcpm/fusb302.c +++ b/driver/tcpm/fusb302.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/tcpm/fusb302.h b/driver/tcpm/fusb302.h index 875bfa2292..ac4fb96e19 100644 --- a/driver/tcpm/fusb302.h +++ b/driver/tcpm/fusb302.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/tcpm/fusb307.c b/driver/tcpm/fusb307.c index cb4e630044..2573e81fb3 100644 --- a/driver/tcpm/fusb307.c +++ b/driver/tcpm/fusb307.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/tcpm/fusb307.h b/driver/tcpm/fusb307.h index 61e42a08d5..38114c8caa 100644 --- a/driver/tcpm/fusb307.h +++ b/driver/tcpm/fusb307.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/tcpm/it83xx.c b/driver/tcpm/it83xx.c index 33214d3373..0b636e2e89 100644 --- a/driver/tcpm/it83xx.c +++ b/driver/tcpm/it83xx.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/tcpm/it83xx_pd.h b/driver/tcpm/it83xx_pd.h index c532c10cfa..1ab76e2b79 100644 --- a/driver/tcpm/it83xx_pd.h +++ b/driver/tcpm/it83xx_pd.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/tcpm/it8xxx2.c b/driver/tcpm/it8xxx2.c index f7be071bf1..6782b528e5 100644 --- a/driver/tcpm/it8xxx2.c +++ b/driver/tcpm/it8xxx2.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/tcpm/ite_pd_intc.c b/driver/tcpm/ite_pd_intc.c index d271d0cf87..1b5e090d2f 100644 --- a/driver/tcpm/ite_pd_intc.c +++ b/driver/tcpm/ite_pd_intc.c @@ -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. */ diff --git a/driver/tcpm/ite_pd_intc.h b/driver/tcpm/ite_pd_intc.h index 8123e1a233..55768da446 100644 --- a/driver/tcpm/ite_pd_intc.h +++ b/driver/tcpm/ite_pd_intc.h @@ -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. */ diff --git a/driver/tcpm/mt6370.c b/driver/tcpm/mt6370.c index b98580f950..881b184fad 100644 --- a/driver/tcpm/mt6370.c +++ b/driver/tcpm/mt6370.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/tcpm/mt6370.h b/driver/tcpm/mt6370.h index c0bc3ceecc..cc8e14a378 100644 --- a/driver/tcpm/mt6370.h +++ b/driver/tcpm/mt6370.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/tcpm/nct38xx.c b/driver/tcpm/nct38xx.c index 09de615eb4..f6184b21e4 100644 --- a/driver/tcpm/nct38xx.c +++ b/driver/tcpm/nct38xx.c @@ -1,5 +1,5 @@ /* - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/tcpm/nct38xx.h b/driver/tcpm/nct38xx.h index 531ab3252c..af0747a0bd 100644 --- a/driver/tcpm/nct38xx.h +++ b/driver/tcpm/nct38xx.h @@ -1,5 +1,5 @@ /* - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/tcpm/ps8xxx.c b/driver/tcpm/ps8xxx.c index 59b365ee77..7ef28686eb 100644 --- a/driver/tcpm/ps8xxx.c +++ b/driver/tcpm/ps8xxx.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/tcpm/ps8xxx.h b/driver/tcpm/ps8xxx.h index 82772e4a5e..7d873abc85 100644 --- a/driver/tcpm/ps8xxx.h +++ b/driver/tcpm/ps8xxx.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/tcpm/raa489000.c b/driver/tcpm/raa489000.c index 3a22b0e208..810ca29550 100644 --- a/driver/tcpm/raa489000.c +++ b/driver/tcpm/raa489000.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/tcpm/raa489000.h b/driver/tcpm/raa489000.h index 4e5ef82cd5..41a37f94e7 100644 --- a/driver/tcpm/raa489000.h +++ b/driver/tcpm/raa489000.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/tcpm/rt1715.c b/driver/tcpm/rt1715.c index 875c8368a1..60bb3da068 100644 --- a/driver/tcpm/rt1715.c +++ b/driver/tcpm/rt1715.c @@ -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. */ diff --git a/driver/tcpm/rt1715.h b/driver/tcpm/rt1715.h index b2d7029b92..d489dc73fd 100644 --- a/driver/tcpm/rt1715.h +++ b/driver/tcpm/rt1715.h @@ -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. */ diff --git a/driver/tcpm/rt1718s.c b/driver/tcpm/rt1718s.c index ff6b70075b..a009e33323 100644 --- a/driver/tcpm/rt1718s.c +++ b/driver/tcpm/rt1718s.c @@ -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. */ diff --git a/driver/tcpm/rt1718s.h b/driver/tcpm/rt1718s.h index 26acb41934..f7c821ba53 100644 --- a/driver/tcpm/rt1718s.h +++ b/driver/tcpm/rt1718s.h @@ -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. */ diff --git a/driver/tcpm/stm32gx.c b/driver/tcpm/stm32gx.c index 8f53fbd0ab..77a436b2ac 100644 --- a/driver/tcpm/stm32gx.c +++ b/driver/tcpm/stm32gx.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/tcpm/stm32gx.h b/driver/tcpm/stm32gx.h index d93abe3891..a8a1e1a1be 100644 --- a/driver/tcpm/stm32gx.h +++ b/driver/tcpm/stm32gx.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/tcpm/stub.c b/driver/tcpm/stub.c index 2b98cc826a..b28d436b51 100644 --- a/driver/tcpm/stub.c +++ b/driver/tcpm/stub.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/tcpm/tcpci.c b/driver/tcpm/tcpci.c index 98eb7c7e12..788d06a3bc 100644 --- a/driver/tcpm/tcpci.c +++ b/driver/tcpm/tcpci.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/tcpm/tusb422.c b/driver/tcpm/tusb422.c index 398ea78fea..6d12d1758b 100644 --- a/driver/tcpm/tusb422.c +++ b/driver/tcpm/tusb422.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/tcpm/tusb422.h b/driver/tcpm/tusb422.h index f39939b184..2ce601c866 100644 --- a/driver/tcpm/tusb422.h +++ b/driver/tcpm/tusb422.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/temp_sensor/adt7481.c b/driver/temp_sensor/adt7481.c index 4f4e2ff358..0157d64b2d 100644 --- a/driver/temp_sensor/adt7481.c +++ b/driver/temp_sensor/adt7481.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/temp_sensor/adt7481.h b/driver/temp_sensor/adt7481.h index 8c63b679fb..af2b676f0d 100644 --- a/driver/temp_sensor/adt7481.h +++ b/driver/temp_sensor/adt7481.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/temp_sensor/amd_r19me4070.c b/driver/temp_sensor/amd_r19me4070.c index afe8741e77..97868b6945 100644 --- a/driver/temp_sensor/amd_r19me4070.c +++ b/driver/temp_sensor/amd_r19me4070.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/temp_sensor/amd_r19me4070.h b/driver/temp_sensor/amd_r19me4070.h index 0ced7ecaf9..5460dcb1cc 100644 --- a/driver/temp_sensor/amd_r19me4070.h +++ b/driver/temp_sensor/amd_r19me4070.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/temp_sensor/bd99992gw.c b/driver/temp_sensor/bd99992gw.c index 6de760cbcf..bd152c0441 100644 --- a/driver/temp_sensor/bd99992gw.c +++ b/driver/temp_sensor/bd99992gw.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/temp_sensor/bd99992gw.h b/driver/temp_sensor/bd99992gw.h index 7bd3f547df..8ee2c2774c 100644 --- a/driver/temp_sensor/bd99992gw.h +++ b/driver/temp_sensor/bd99992gw.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/temp_sensor/ec_adc.c b/driver/temp_sensor/ec_adc.c index 6561b1a007..ca03cd6c6d 100644 --- a/driver/temp_sensor/ec_adc.c +++ b/driver/temp_sensor/ec_adc.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/temp_sensor/ec_adc.h b/driver/temp_sensor/ec_adc.h index b14d5be4aa..3bea83ffe8 100644 --- a/driver/temp_sensor/ec_adc.h +++ b/driver/temp_sensor/ec_adc.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/temp_sensor/f75303.c b/driver/temp_sensor/f75303.c index 51c56686a4..e686537c31 100644 --- a/driver/temp_sensor/f75303.c +++ b/driver/temp_sensor/f75303.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/temp_sensor/f75303.h b/driver/temp_sensor/f75303.h index a782f3aeb2..f8c85231da 100644 --- a/driver/temp_sensor/f75303.h +++ b/driver/temp_sensor/f75303.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/temp_sensor/g753.c b/driver/temp_sensor/g753.c index 65968cd021..8d94cac4f8 100644 --- a/driver/temp_sensor/g753.c +++ b/driver/temp_sensor/g753.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/temp_sensor/g753.h b/driver/temp_sensor/g753.h index 41a4b817cf..00f7fec8ac 100644 --- a/driver/temp_sensor/g753.h +++ b/driver/temp_sensor/g753.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/temp_sensor/g78x.c b/driver/temp_sensor/g78x.c index 7530c56c16..82cb2d26e9 100644 --- a/driver/temp_sensor/g78x.c +++ b/driver/temp_sensor/g78x.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/temp_sensor/g78x.h b/driver/temp_sensor/g78x.h index f80da3b708..70abc82a3f 100644 --- a/driver/temp_sensor/g78x.h +++ b/driver/temp_sensor/g78x.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/temp_sensor/oti502.c b/driver/temp_sensor/oti502.c index f517a41073..2051df89f6 100644 --- a/driver/temp_sensor/oti502.c +++ b/driver/temp_sensor/oti502.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/temp_sensor/oti502.h b/driver/temp_sensor/oti502.h index 97e9ef93c4..fd09362589 100644 --- a/driver/temp_sensor/oti502.h +++ b/driver/temp_sensor/oti502.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/temp_sensor/pct2075.c b/driver/temp_sensor/pct2075.c index e74a554186..9c7b7190e9 100644 --- a/driver/temp_sensor/pct2075.c +++ b/driver/temp_sensor/pct2075.c @@ -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. */ diff --git a/driver/temp_sensor/sb_tsi.c b/driver/temp_sensor/sb_tsi.c index 8b4a1a91fc..0c58fb88dc 100644 --- a/driver/temp_sensor/sb_tsi.c +++ b/driver/temp_sensor/sb_tsi.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/temp_sensor/thermistor.c b/driver/temp_sensor/thermistor.c index 194ee98923..25fe0f56e8 100644 --- a/driver/temp_sensor/thermistor.c +++ b/driver/temp_sensor/thermistor.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/temp_sensor/thermistor_ncp15wb.c b/driver/temp_sensor/thermistor_ncp15wb.c index 3cc05790d9..93896cfcc2 100644 --- a/driver/temp_sensor/thermistor_ncp15wb.c +++ b/driver/temp_sensor/thermistor_ncp15wb.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/temp_sensor/tmp006.c b/driver/temp_sensor/tmp006.c index 334979e826..e3cb62276a 100644 --- a/driver/temp_sensor/tmp006.c +++ b/driver/temp_sensor/tmp006.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/temp_sensor/tmp006.h b/driver/temp_sensor/tmp006.h index 6d1b13def3..c3409dde59 100644 --- a/driver/temp_sensor/tmp006.h +++ b/driver/temp_sensor/tmp006.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/temp_sensor/tmp112.c b/driver/temp_sensor/tmp112.c index a2e067fda4..f7f28159aa 100644 --- a/driver/temp_sensor/tmp112.c +++ b/driver/temp_sensor/tmp112.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/temp_sensor/tmp411.c b/driver/temp_sensor/tmp411.c index 6fcc65c5b4..8a14440671 100644 --- a/driver/temp_sensor/tmp411.c +++ b/driver/temp_sensor/tmp411.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/temp_sensor/tmp411.h b/driver/temp_sensor/tmp411.h index 5295e275c2..0716a2846d 100644 --- a/driver/temp_sensor/tmp411.h +++ b/driver/temp_sensor/tmp411.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/temp_sensor/tmp432.c b/driver/temp_sensor/tmp432.c index 6afb81b6c6..fde6536536 100644 --- a/driver/temp_sensor/tmp432.c +++ b/driver/temp_sensor/tmp432.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/temp_sensor/tmp432.h b/driver/temp_sensor/tmp432.h index a04a6dc75f..d4c99f1129 100644 --- a/driver/temp_sensor/tmp432.h +++ b/driver/temp_sensor/tmp432.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/temp_sensor/tmp468.c b/driver/temp_sensor/tmp468.c index a14296768e..87eb040460 100644 --- a/driver/temp_sensor/tmp468.c +++ b/driver/temp_sensor/tmp468.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/temp_sensor/tmp468.h b/driver/temp_sensor/tmp468.h index fd8a271ec3..3a2c154066 100644 --- a/driver/temp_sensor/tmp468.h +++ b/driver/temp_sensor/tmp468.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/touchpad_elan.c b/driver/touchpad_elan.c index 13c7cdf805..05c081a84a 100644 --- a/driver/touchpad_elan.c +++ b/driver/touchpad_elan.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/touchpad_gt7288.c b/driver/touchpad_gt7288.c index 1dcfdbfb61..9d9b31a22b 100644 --- a/driver/touchpad_gt7288.c +++ b/driver/touchpad_gt7288.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/touchpad_gt7288.h b/driver/touchpad_gt7288.h index c89c586784..ad8d43636e 100644 --- a/driver/touchpad_gt7288.h +++ b/driver/touchpad_gt7288.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/touchpad_st.c b/driver/touchpad_st.c index 87b1a30bc5..ad10470ed9 100644 --- a/driver/touchpad_st.c +++ b/driver/touchpad_st.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/touchpad_st.h b/driver/touchpad_st.h index a34e6f1c8c..6ea3f6aeb0 100644 --- a/driver/touchpad_st.h +++ b/driver/touchpad_st.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/driver/usb_mux/amd_fp5.c b/driver/usb_mux/amd_fp5.c index 53f81aaf7c..fc41a9c17e 100644 --- a/driver/usb_mux/amd_fp5.c +++ b/driver/usb_mux/amd_fp5.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/usb_mux/amd_fp5.h b/driver/usb_mux/amd_fp5.h index 8fc6506447..9a23cf57b0 100644 --- a/driver/usb_mux/amd_fp5.h +++ b/driver/usb_mux/amd_fp5.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/usb_mux/amd_fp6.c b/driver/usb_mux/amd_fp6.c index 0c0d52e599..1fcbacb19d 100644 --- a/driver/usb_mux/amd_fp6.c +++ b/driver/usb_mux/amd_fp6.c @@ -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. * diff --git a/driver/usb_mux/amd_fp6.h b/driver/usb_mux/amd_fp6.h index 51988ab4f6..ba2b791ba5 100644 --- a/driver/usb_mux/amd_fp6.h +++ b/driver/usb_mux/amd_fp6.h @@ -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. * diff --git a/driver/usb_mux/anx3443.c b/driver/usb_mux/anx3443.c index 1a350de54c..c0a7ff498c 100644 --- a/driver/usb_mux/anx3443.c +++ b/driver/usb_mux/anx3443.c @@ -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. * @@ -194,7 +194,7 @@ static bool anx3443_port_is_usb2_only(const struct usb_mux *me) static void anx3443_suspend(void) { for (int i = 0; i < CONFIG_USB_PD_PORT_MAX_COUNT; i++) { - const struct usb_mux *mux = &usb_muxes[i]; + const struct usb_mux *mux = usb_muxes[i].mux; if (mux->driver != &anx3443_usb_mux_driver) continue; @@ -208,14 +208,14 @@ DECLARE_HOOK(HOOK_CHIPSET_SUSPEND, anx3443_suspend, HOOK_PRIO_DEFAULT); static void anx3443_resume(void) { for (int i = 0; i < CONFIG_USB_PD_PORT_MAX_COUNT; i++) { - int port = usb_muxes[i].usb_port; + int port = usb_muxes[i].mux->usb_port; bool ack_required; - if (usb_muxes[i].driver != &anx3443_usb_mux_driver) + if (usb_muxes[i].mux->driver != &anx3443_usb_mux_driver) continue; - anx3443_set_mux(&usb_muxes[i], saved_mux_state[port].mux_state, - &ack_required); + anx3443_set_mux(usb_muxes[i].mux, + saved_mux_state[port].mux_state, &ack_required); } } DECLARE_HOOK(HOOK_CHIPSET_RESUME, anx3443_resume, HOOK_PRIO_DEFAULT); diff --git a/driver/usb_mux/anx3443.h b/driver/usb_mux/anx3443.h index 41a4eb2c20..bd2dc2bf45 100644 --- a/driver/usb_mux/anx3443.h +++ b/driver/usb_mux/anx3443.h @@ -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. * diff --git a/driver/usb_mux/anx7440.c b/driver/usb_mux/anx7440.c index 2915d4bd3c..83d17fab4b 100644 --- a/driver/usb_mux/anx7440.c +++ b/driver/usb_mux/anx7440.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/usb_mux/anx7440.h b/driver/usb_mux/anx7440.h index 0e790dc9da..3849837cd2 100644 --- a/driver/usb_mux/anx7440.h +++ b/driver/usb_mux/anx7440.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/usb_mux/anx7451.c b/driver/usb_mux/anx7451.c index f72b2c93d2..ea3cc5cb58 100644 --- a/driver/usb_mux/anx7451.c +++ b/driver/usb_mux/anx7451.c @@ -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. * diff --git a/driver/usb_mux/anx7451.h b/driver/usb_mux/anx7451.h index b2dc58c66a..4b63d513fd 100644 --- a/driver/usb_mux/anx7451.h +++ b/driver/usb_mux/anx7451.h @@ -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. * diff --git a/driver/usb_mux/it5205.c b/driver/usb_mux/it5205.c index 26073268c3..7330582b03 100644 --- a/driver/usb_mux/it5205.c +++ b/driver/usb_mux/it5205.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/usb_mux/it5205.h b/driver/usb_mux/it5205.h index 46094d2bf8..6a8fc2bb24 100644 --- a/driver/usb_mux/it5205.h +++ b/driver/usb_mux/it5205.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/usb_mux/pi3usb3x532.c b/driver/usb_mux/pi3usb3x532.c index c67e0b0ed4..55063ed6d0 100644 --- a/driver/usb_mux/pi3usb3x532.c +++ b/driver/usb_mux/pi3usb3x532.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/usb_mux/pi3usb3x532.h b/driver/usb_mux/pi3usb3x532.h index 13537e52f3..9214d349f0 100644 --- a/driver/usb_mux/pi3usb3x532.h +++ b/driver/usb_mux/pi3usb3x532.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/usb_mux/ps8740.c b/driver/usb_mux/ps8740.c index df9fe09051..0c129cc9a8 100644 --- a/driver/usb_mux/ps8740.c +++ b/driver/usb_mux/ps8740.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/usb_mux/ps8740.h b/driver/usb_mux/ps8740.h index ad4a271cd5..0b29a80cf1 100644 --- a/driver/usb_mux/ps8740.h +++ b/driver/usb_mux/ps8740.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/usb_mux/ps8743.c b/driver/usb_mux/ps8743.c index 3673a10b9d..bebcf53248 100644 --- a/driver/usb_mux/ps8743.c +++ b/driver/usb_mux/ps8743.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * @@ -210,7 +210,7 @@ static enum usb_conn_status ps8743_get_usb_conn_status(const struct usb_mux *me) static void ps8743_suspend(void) { for (int i = 0; i < board_get_usb_pd_port_count(); i++) { - const struct usb_mux *mux = &usb_muxes[i]; + const struct usb_mux *mux = usb_muxes[i].mux; if (mux->driver != &ps8743_usb_mux_driver) continue; @@ -229,7 +229,7 @@ DECLARE_HOOK(HOOK_CHIPSET_SUSPEND, ps8743_suspend, HOOK_PRIO_DEFAULT); static void ps8743_resume(void) { for (int i = 0; i < board_get_usb_pd_port_count(); i++) { - const struct usb_mux *mux = &usb_muxes[i]; + const struct usb_mux *mux = usb_muxes[i].mux; if (mux->driver != &ps8743_usb_mux_driver) continue; diff --git a/driver/usb_mux/ps8743.h b/driver/usb_mux/ps8743.h index daa33111ff..e34d4f93e4 100644 --- a/driver/usb_mux/ps8743.h +++ b/driver/usb_mux/ps8743.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/usb_mux/ps8822.c b/driver/usb_mux/ps8822.c index a2b433848a..1e931fd340 100644 --- a/driver/usb_mux/ps8822.c +++ b/driver/usb_mux/ps8822.c @@ -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. * diff --git a/driver/usb_mux/ps8822.h b/driver/usb_mux/ps8822.h index 282a30e642..4f7503b21b 100644 --- a/driver/usb_mux/ps8822.h +++ b/driver/usb_mux/ps8822.h @@ -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. * diff --git a/driver/usb_mux/tusb1064.c b/driver/usb_mux/tusb1064.c index 6b3c86397b..e4f54402c7 100644 --- a/driver/usb_mux/tusb1064.c +++ b/driver/usb_mux/tusb1064.c @@ -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. */ diff --git a/driver/usb_mux/tusb1064.h b/driver/usb_mux/tusb1064.h index 3c6a7cd000..1a38290174 100644 --- a/driver/usb_mux/tusb1064.h +++ b/driver/usb_mux/tusb1064.h @@ -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. */ diff --git a/driver/usb_mux/usb_mux.c b/driver/usb_mux/usb_mux.c index 970d06a63d..a3cd6e2c99 100644 --- a/driver/usb_mux/usb_mux.c +++ b/driver/usb_mux/usb_mux.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -256,7 +256,7 @@ static int configure_mux(int port, int index, enum mux_config_type config, mux_state_t *mux_state) { int rv = EC_SUCCESS; - const struct usb_mux *mux_ptr; + const struct usb_mux_chain *mux_chain; int chip = 0; if (config == USB_MUX_SET_MODE || config == USB_MUX_GET_MODE) { @@ -272,9 +272,11 @@ static int configure_mux(int port, int index, enum mux_config_type config, * MUXes. So when we change one, we traverse the whole list * to make sure they are all updated appropriately. */ - for (mux_ptr = &usb_muxes[port]; rv == EC_SUCCESS && mux_ptr != NULL; - mux_ptr = mux_ptr->next_mux, chip++) { + for (mux_chain = &usb_muxes[port]; + rv == EC_SUCCESS && mux_chain != NULL; + mux_chain = mux_chain->next, chip++) { mux_state_t lcl_state; + const struct usb_mux *mux_ptr = mux_chain->mux; const struct usb_mux_driver *drv = mux_ptr->driver; bool ack_required = false; @@ -661,15 +663,17 @@ int usb_mux_retimer_fw_update_port_info(void) int i; int port_info = 0; const struct usb_mux *mux_ptr; + const struct usb_mux_chain *mux_chain; for (i = 0; i < CONFIG_USB_PD_PORT_MAX_COUNT; i++) { - mux_ptr = &usb_muxes[i]; - while (mux_ptr) { + mux_chain = &usb_muxes[i]; + while (mux_chain) { + mux_ptr = mux_chain->mux; if (mux_ptr->driver && mux_ptr->driver->is_retimer_fw_update_capable && mux_ptr->driver->is_retimer_fw_update_capable()) port_info |= BIT(i); - mux_ptr = mux_ptr->next_mux; + mux_chain = mux_chain->next; } } return port_info; @@ -693,17 +697,19 @@ static void usb_mux_reset_in_g3(void) { int port; const struct usb_mux *mux_ptr; + const struct usb_mux_chain *mux_chain; for (port = 0; port < board_get_usb_pd_port_count(); port++) { - mux_ptr = &usb_muxes[port]; + mux_chain = &usb_muxes[port]; - while (mux_ptr) { + while (mux_chain) { + mux_ptr = mux_chain->mux; if (mux_ptr->flags & USB_MUX_FLAG_RESETS_IN_G3) { atomic_clear_bits(&flags[port], USB_MUX_FLAG_INIT | USB_MUX_FLAG_IN_LPM); } - mux_ptr = mux_ptr->next_mux; + mux_chain = mux_chain->next; } } } diff --git a/driver/usb_mux/virtual.c b/driver/usb_mux/virtual.c index 96d06c051d..417a48c577 100644 --- a/driver/usb_mux/virtual.c +++ b/driver/usb_mux/virtual.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/driver/wpc/cps8100.c b/driver/wpc/cps8100.c index 4fef177fff..51dba7c004 100644 --- a/driver/wpc/cps8100.c +++ b/driver/wpc/cps8100.c @@ -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. */ diff --git a/driver/wpc/p9221.h b/driver/wpc/p9221.h index 674d458b90..53dcc57aa7 100644 --- a/driver/wpc/p9221.h +++ b/driver/wpc/p9221.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/extra/cr50_rma_open/cr50_rma_open.py b/extra/cr50_rma_open/cr50_rma_open.py index b2600a6454..dc9c144158 100755 --- a/extra/cr50_rma_open/cr50_rma_open.py +++ b/extra/cr50_rma_open/cr50_rma_open.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright 2018 The Chromium OS Authors. All rights reserved. +# Copyright 2018 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/extra/ftdi_hostcmd/Makefile b/extra/ftdi_hostcmd/Makefile index d46b4b1c72..10f0e2d390 100644 --- a/extra/ftdi_hostcmd/Makefile +++ b/extra/ftdi_hostcmd/Makefile @@ -1,4 +1,4 @@ -# Copyright 2015 The Chromium OS Authors. All rights reserved. +# Copyright 2015 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/extra/ftdi_hostcmd/test_cmds.c b/extra/ftdi_hostcmd/test_cmds.c index 5acac192d7..7bd3413032 100644 --- a/extra/ftdi_hostcmd/test_cmds.c +++ b/extra/ftdi_hostcmd/test_cmds.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/extra/i2c_pseudo/Makefile b/extra/i2c_pseudo/Makefile index f7fda6e2de..b53085a970 100644 --- a/extra/i2c_pseudo/Makefile +++ b/extra/i2c_pseudo/Makefile @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/extra/i2c_pseudo/check_stream_open.sh b/extra/i2c_pseudo/check_stream_open.sh index da802cb282..70cffd7c73 100755 --- a/extra/i2c_pseudo/check_stream_open.sh +++ b/extra/i2c_pseudo/check_stream_open.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/extra/lightbar/Makefile b/extra/lightbar/Makefile index ce84428869..628f19ab81 100644 --- a/extra/lightbar/Makefile +++ b/extra/lightbar/Makefile @@ -1,4 +1,4 @@ -# Copyright 2014 The Chromium OS Authors. All rights reserved. +# Copyright 2014 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/extra/lightbar/input.c b/extra/lightbar/input.c index 48a97563a4..5b605600ea 100644 --- a/extra/lightbar/input.c +++ b/extra/lightbar/input.c @@ -1,5 +1,5 @@ /* - * Copyright 2014 The Chromium OS Authors. All rights reserved. + * Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/extra/lightbar/main.c b/extra/lightbar/main.c index dc4c3d59d8..321c0c73d2 100644 --- a/extra/lightbar/main.c +++ b/extra/lightbar/main.c @@ -1,5 +1,5 @@ /* - * Copyright 2014 The Chromium OS Authors. All rights reserved. + * Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/extra/lightbar/simulation.h b/extra/lightbar/simulation.h index c9263c8e54..c77583e6c9 100644 --- a/extra/lightbar/simulation.h +++ b/extra/lightbar/simulation.h @@ -1,5 +1,5 @@ /* - * Copyright 2014 The Chromium OS Authors. All rights reserved. + * Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/extra/lightbar/windows.c b/extra/lightbar/windows.c index cd12a8ffd0..e0b14fae42 100644 --- a/extra/lightbar/windows.c +++ b/extra/lightbar/windows.c @@ -1,5 +1,5 @@ /* - * Copyright 2014 The Chromium OS Authors. All rights reserved. + * Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/extra/rma_reset/Makefile b/extra/rma_reset/Makefile index 4e401b8d5d..d4644e91c8 100644 --- a/extra/rma_reset/Makefile +++ b/extra/rma_reset/Makefile @@ -1,4 +1,4 @@ -# Copyright 2017 The Chromium OS Authors. All rights reserved. +# Copyright 2017 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/extra/rma_reset/board.h b/extra/rma_reset/board.h index f969ad0c56..38e3e7b382 100644 --- a/extra/rma_reset/board.h +++ b/extra/rma_reset/board.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/extra/rma_reset/rma_reset.c b/extra/rma_reset/rma_reset.c index c5a4b4f647..d437b63f1a 100644 --- a/extra/rma_reset/rma_reset.c +++ b/extra/rma_reset/rma_reset.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/extra/sps_errs/Makefile b/extra/sps_errs/Makefile index 12224ad803..b25eecbdab 100644 --- a/extra/sps_errs/Makefile +++ b/extra/sps_errs/Makefile @@ -1,4 +1,4 @@ -# Copyright 2015 The Chromium OS Authors. All rights reserved. +# Copyright 2015 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/extra/sps_errs/prog.c b/extra/sps_errs/prog.c index d80b4418d2..bf44dd182c 100644 --- a/extra/sps_errs/prog.c +++ b/extra/sps_errs/prog.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/extra/stack_analyzer/run_tests.sh b/extra/stack_analyzer/run_tests.sh index 5662f60b8b..d5e65045c3 100755 --- a/extra/stack_analyzer/run_tests.sh +++ b/extra/stack_analyzer/run_tests.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright 2017 The Chromium OS Authors. All rights reserved. +# Copyright 2017 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/extra/stack_analyzer/stack_analyzer.py b/extra/stack_analyzer/stack_analyzer.py index cd5ca29011..2431545c6a 100755 --- a/extra/stack_analyzer/stack_analyzer.py +++ b/extra/stack_analyzer/stack_analyzer.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright 2017 The Chromium OS Authors. All rights reserved. +# Copyright 2017 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/extra/stack_analyzer/stack_analyzer_unittest.py b/extra/stack_analyzer/stack_analyzer_unittest.py index a40edaa5d8..23a8fb93ea 100755 --- a/extra/stack_analyzer/stack_analyzer_unittest.py +++ b/extra/stack_analyzer/stack_analyzer_unittest.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright 2017 The Chromium OS Authors. All rights reserved. +# Copyright 2017 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/extra/tigertool/ecusb/__init__.py b/extra/tigertool/ecusb/__init__.py index 7228f2b911..9451551f37 100644 --- a/extra/tigertool/ecusb/__init__.py +++ b/extra/tigertool/ecusb/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2017 The Chromium OS Authors. All rights reserved. +# Copyright 2017 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/extra/tigertool/ecusb/pty_driver.py b/extra/tigertool/ecusb/pty_driver.py index ec38e7dd0a..723bf41b57 100644 --- a/extra/tigertool/ecusb/pty_driver.py +++ b/extra/tigertool/ecusb/pty_driver.py @@ -1,4 +1,4 @@ -# Copyright 2017 The Chromium OS Authors. All rights reserved. +# Copyright 2017 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/extra/tigertool/ecusb/stm32uart.py b/extra/tigertool/ecusb/stm32uart.py index 917ae8d7fd..64d0234f06 100644 --- a/extra/tigertool/ecusb/stm32uart.py +++ b/extra/tigertool/ecusb/stm32uart.py @@ -1,4 +1,4 @@ -# Copyright 2017 The Chromium OS Authors. All rights reserved. +# Copyright 2017 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/extra/tigertool/ecusb/stm32usb.py b/extra/tigertool/ecusb/stm32usb.py index b36fd5b3d7..f9c700466a 100644 --- a/extra/tigertool/ecusb/stm32usb.py +++ b/extra/tigertool/ecusb/stm32usb.py @@ -1,4 +1,4 @@ -# Copyright 2017 The Chromium OS Authors. All rights reserved. +# Copyright 2017 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/extra/tigertool/ecusb/tiny_servo_common.py b/extra/tigertool/ecusb/tiny_servo_common.py index 3f0a8ff46c..fc028104ed 100644 --- a/extra/tigertool/ecusb/tiny_servo_common.py +++ b/extra/tigertool/ecusb/tiny_servo_common.py @@ -1,4 +1,4 @@ -# Copyright 2017 The Chromium OS Authors. All rights reserved. +# Copyright 2017 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/extra/tigertool/ecusb/tiny_servod.py b/extra/tigertool/ecusb/tiny_servod.py index d5d092c996..f8d61b5305 100644 --- a/extra/tigertool/ecusb/tiny_servod.py +++ b/extra/tigertool/ecusb/tiny_servod.py @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/extra/tigertool/flash_dfu.sh b/extra/tigertool/flash_dfu.sh index 7aa6c24f09..9578ef626e 100755 --- a/extra/tigertool/flash_dfu.sh +++ b/extra/tigertool/flash_dfu.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2017 The Chromium OS Authors. All rights reserved. +# Copyright 2017 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/extra/tigertool/make_pkg.sh b/extra/tigertool/make_pkg.sh index 12db65afbd..ae0ae95cfe 100755 --- a/extra/tigertool/make_pkg.sh +++ b/extra/tigertool/make_pkg.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2017 The Chromium OS Authors. All rights reserved. +# Copyright 2017 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/extra/tigertool/tigertest.py b/extra/tigertool/tigertest.py index bd748f9b34..b1186cca77 100755 --- a/extra/tigertool/tigertest.py +++ b/extra/tigertool/tigertest.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# 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. diff --git a/extra/tigertool/tigertool.py b/extra/tigertool/tigertool.py index 45dfec8286..69303aa02a 100755 --- a/extra/tigertool/tigertool.py +++ b/extra/tigertool/tigertool.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright 2017 The Chromium OS Authors. All rights reserved. +# Copyright 2017 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/extra/touchpad_updater/Makefile b/extra/touchpad_updater/Makefile index ebf9c3212d..df824e8757 100644 --- a/extra/touchpad_updater/Makefile +++ b/extra/touchpad_updater/Makefile @@ -1,4 +1,4 @@ -# Copyright 2017 The Chromium OS Authors. All rights reserved. +# Copyright 2017 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/extra/touchpad_updater/touchpad_updater.c b/extra/touchpad_updater/touchpad_updater.c index 561e4252b2..fee898ca06 100644 --- a/extra/touchpad_updater/touchpad_updater.c +++ b/extra/touchpad_updater/touchpad_updater.c @@ -1,5 +1,5 @@ /* - * Copyright 2017 The Chromium OS Authors. All rights reserved. + * Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/extra/usb_console/Makefile b/extra/usb_console/Makefile index bddca1d0a2..bc4c5909a2 100644 --- a/extra/usb_console/Makefile +++ b/extra/usb_console/Makefile @@ -1,4 +1,4 @@ -# Copyright 2015 The Chromium OS Authors. All rights reserved. +# Copyright 2015 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/extra/usb_console/usb_console.c b/extra/usb_console/usb_console.c index d0136bf8a1..aea9eb8293 100644 --- a/extra/usb_console/usb_console.c +++ b/extra/usb_console/usb_console.c @@ -1,5 +1,5 @@ /* - * Copyright 2015 The Chromium OS Authors. All rights reserved. + * Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/extra/usb_gpio/Makefile b/extra/usb_gpio/Makefile index 644e3ee70f..84a27ccc12 100644 --- a/extra/usb_gpio/Makefile +++ b/extra/usb_gpio/Makefile @@ -1,4 +1,4 @@ -# Copyright 2014 The Chromium OS Authors. All rights reserved. +# Copyright 2014 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/extra/usb_gpio/usb_gpio.c b/extra/usb_gpio/usb_gpio.c index 40db84dd10..7f2121d2b0 100644 --- a/extra/usb_gpio/usb_gpio.c +++ b/extra/usb_gpio/usb_gpio.c @@ -1,5 +1,5 @@ /* - * Copyright 2014 The Chromium OS Authors. All rights reserved. + * Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/extra/usb_power/convert_power_log_board.py b/extra/usb_power/convert_power_log_board.py index a555ee30ea..f5fb7e925d 100644 --- a/extra/usb_power/convert_power_log_board.py +++ b/extra/usb_power/convert_power_log_board.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2018 The Chromium OS Authors. All rights reserved. +# Copyright 2018 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/extra/usb_power/convert_servo_ina.py b/extra/usb_power/convert_servo_ina.py index f3840ddc7c..1deb75cda4 100755 --- a/extra/usb_power/convert_servo_ina.py +++ b/extra/usb_power/convert_servo_ina.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2017 The Chromium OS Authors. All rights reserved. +# Copyright 2017 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/extra/usb_power/powerlog.py b/extra/usb_power/powerlog.py index 3649c9f411..13e41bd23a 100755 --- a/extra/usb_power/powerlog.py +++ b/extra/usb_power/powerlog.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2016 The Chromium OS Authors. All rights reserved. +# Copyright 2016 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/extra/usb_power/powerlog_unittest.py b/extra/usb_power/powerlog_unittest.py index 220ff350d2..62667e35b8 100644 --- a/extra/usb_power/powerlog_unittest.py +++ b/extra/usb_power/powerlog_unittest.py @@ -1,4 +1,4 @@ -# Copyright 2018 The Chromium OS Authors. All rights reserved. +# Copyright 2018 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/extra/usb_power/stats_manager.py b/extra/usb_power/stats_manager.py index d200d66af7..2035138731 100644 --- a/extra/usb_power/stats_manager.py +++ b/extra/usb_power/stats_manager.py @@ -1,4 +1,4 @@ -# Copyright 2017 The Chromium OS Authors. All rights reserved. +# Copyright 2017 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/extra/usb_power/stats_manager_unittest.py b/extra/usb_power/stats_manager_unittest.py index 6c2d4be771..2bfaa5c83d 100644 --- a/extra/usb_power/stats_manager_unittest.py +++ b/extra/usb_power/stats_manager_unittest.py @@ -1,4 +1,4 @@ -# Copyright 2017 The Chromium OS Authors. All rights reserved. +# Copyright 2017 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/extra/usb_serial/add_usb_serial_id b/extra/usb_serial/add_usb_serial_id index ef8336afdc..12e0055e0b 100755 --- a/extra/usb_serial/add_usb_serial_id +++ b/extra/usb_serial/add_usb_serial_id @@ -1,6 +1,6 @@ #!/bin/sh -e # -# Copyright 2016 The Chromium OS Authors. All rights reserved. +# Copyright 2016 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/extra/usb_serial/console.py b/extra/usb_serial/console.py index 49b731ad42..cc81547671 100755 --- a/extra/usb_serial/console.py +++ b/extra/usb_serial/console.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright 2016 The Chromium OS Authors. All rights reserved. +# Copyright 2016 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/extra/usb_serial/install b/extra/usb_serial/install index eba1d2ac83..b49ad990e1 100755 --- a/extra/usb_serial/install +++ b/extra/usb_serial/install @@ -1,6 +1,6 @@ #!/bin/sh -e # -# Copyright 2016 The Chromium OS Authors. All rights reserved. +# Copyright 2016 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/extra/usb_serial/raiden.c b/extra/usb_serial/raiden.c index 5461f00bb5..131cddb00f 100644 --- a/extra/usb_serial/raiden.c +++ b/extra/usb_serial/raiden.c @@ -2,7 +2,7 @@ * USB Serial module for Raiden USB debug serial console forwarding. * SubClass and Protocol allocated in go/usb-ids * - * Copyright 2014 The Chromium OS Authors <chromium-os-dev@chromium.org> + * Copyright 2014 The ChromiumOS Authors <chromium-os-dev@chromium.org> * Author: Anton Staaf <robotboy@chromium.org> * * This program is free software; you can redistribute it and/or modify diff --git a/extra/usb_updater/Makefile b/extra/usb_updater/Makefile index 8fc1c1b07a..5a8dc82c28 100644 --- a/extra/usb_updater/Makefile +++ b/extra/usb_updater/Makefile @@ -1,4 +1,4 @@ -# Copyright 2015 The Chromium OS Authors. All rights reserved. +# Copyright 2015 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/extra/usb_updater/desc_parser.c b/extra/usb_updater/desc_parser.c index c0afe835ac..7e9f583902 100644 --- a/extra/usb_updater/desc_parser.c +++ b/extra/usb_updater/desc_parser.c @@ -1,5 +1,5 @@ /* - * Copyright 2018 The Chromium OS Authors. All rights reserved. + * Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/extra/usb_updater/desc_parser.h b/extra/usb_updater/desc_parser.h index faa80d1a63..e459927b57 100644 --- a/extra/usb_updater/desc_parser.h +++ b/extra/usb_updater/desc_parser.h @@ -1,5 +1,5 @@ /* - * Copyright 2018 The Chromium OS Authors. All rights reserved. + * Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/extra/usb_updater/fw_update.py b/extra/usb_updater/fw_update.py index ca4e0e2e94..a77de94a7c 100755 --- a/extra/usb_updater/fw_update.py +++ b/extra/usb_updater/fw_update.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2016 The Chromium OS Authors. All rights reserved. +# Copyright 2016 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/extra/usb_updater/sample_descriptor b/extra/usb_updater/sample_descriptor index 1566e9e2e1..3be408b642 100644 --- a/extra/usb_updater/sample_descriptor +++ b/extra/usb_updater/sample_descriptor @@ -1,4 +1,4 @@ -# Copyright 2018 The Chromium OS Authors. All rights reserved. +# Copyright 2018 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/extra/usb_updater/servo_updater.py b/extra/usb_updater/servo_updater.py index b5c23a9ad1..c0be11fdde 100755 --- a/extra/usb_updater/servo_updater.py +++ b/extra/usb_updater/servo_updater.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2016 The Chromium OS Authors. All rights reserved. +# Copyright 2016 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/extra/usb_updater/usb_updater2.c b/extra/usb_updater/usb_updater2.c index e1407abe67..d591811a2b 100644 --- a/extra/usb_updater/usb_updater2.c +++ b/extra/usb_updater/usb_updater2.c @@ -1,5 +1,5 @@ /* - * Copyright 2017 The Chromium OS Authors. All rights reserved. + * Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/firmware_builder.py b/firmware_builder.py index 980486df6a..afd3d815c5 100755 --- a/firmware_builder.py +++ b/firmware_builder.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. """Build, bundle, or test all of the EC boards. diff --git a/fuzz/build.mk b/fuzz/build.mk index ebb5a3a839..bc79df71e6 100644 --- a/fuzz/build.mk +++ b/fuzz/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2018 The Chromium OS Authors. All rights reserved. +# Copyright 2018 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/fuzz/fuzz_config.h b/fuzz/fuzz_config.h index f5fb4f66e1..006919d314 100644 --- a/fuzz/fuzz_config.h +++ b/fuzz/fuzz_config.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/fuzz/host_command_fuzz.c b/fuzz/host_command_fuzz.c index fac8fdedbe..0a648f602c 100644 --- a/fuzz/host_command_fuzz.c +++ b/fuzz/host_command_fuzz.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/fuzz/host_command_fuzz.mocklist b/fuzz/host_command_fuzz.mocklist index 4ffc786b32..3b7d03ee0e 100644 --- a/fuzz/host_command_fuzz.mocklist +++ b/fuzz/host_command_fuzz.mocklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/fuzz/host_command_fuzz.tasklist b/fuzz/host_command_fuzz.tasklist index 2ff8a94d98..1edc0ce0cb 100644 --- a/fuzz/host_command_fuzz.tasklist +++ b/fuzz/host_command_fuzz.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/fuzz/pchg_fuzz.c b/fuzz/pchg_fuzz.c index b19569e02e..4ef5f28b74 100644 --- a/fuzz/pchg_fuzz.c +++ b/fuzz/pchg_fuzz.c @@ -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. * diff --git a/fuzz/pchg_fuzz.tasklist b/fuzz/pchg_fuzz.tasklist index 5b30e09245..7c57f19854 100644 --- a/fuzz/pchg_fuzz.tasklist +++ b/fuzz/pchg_fuzz.tasklist @@ -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. */ diff --git a/fuzz/span.h b/fuzz/span.h index f4ed0ff7ed..9cb08f9461 100644 --- a/fuzz/span.h +++ b/fuzz/span.h @@ -1,4 +1,4 @@ -// Copyright 2018 The Chromium OS Authors. All rights reserved. +// Copyright 2018 The ChromiumOS Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/fuzz/usb_pd_fuzz.c b/fuzz/usb_pd_fuzz.c index 5d3a9ef9a6..bb462b9e61 100644 --- a/fuzz/usb_pd_fuzz.c +++ b/fuzz/usb_pd_fuzz.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/fuzz/usb_pd_fuzz.tasklist b/fuzz/usb_pd_fuzz.tasklist index 6edeac2f98..c006f00784 100644 --- a/fuzz/usb_pd_fuzz.tasklist +++ b/fuzz/usb_pd_fuzz.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/fuzz/usb_tcpm_v2_rev20_fuzz.c b/fuzz/usb_tcpm_v2_rev20_fuzz.c index 8c2f6c7eff..c4f57432ad 100644 --- a/fuzz/usb_tcpm_v2_rev20_fuzz.c +++ b/fuzz/usb_tcpm_v2_rev20_fuzz.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * @@ -16,12 +16,18 @@ const struct svdm_response svdm_rsp = { }; /* USB mux configuration */ -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .driver = &mock_usb_mux_driver, + .mux = + &(const struct usb_mux){ + .driver = &mock_usb_mux_driver, + }, }, { - .driver = &mock_usb_mux_driver, + .mux = + &(const struct usb_mux){ + .driver = &mock_usb_mux_driver, + }, } }; diff --git a/fuzz/usb_tcpm_v2_rev20_fuzz.mocklist b/fuzz/usb_tcpm_v2_rev20_fuzz.mocklist index 1b2c615371..fe2a3f8f38 100644 --- a/fuzz/usb_tcpm_v2_rev20_fuzz.mocklist +++ b/fuzz/usb_tcpm_v2_rev20_fuzz.mocklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/fuzz/usb_tcpm_v2_rev20_fuzz.tasklist b/fuzz/usb_tcpm_v2_rev20_fuzz.tasklist index e3ad19e719..d20bba1365 100644 --- a/fuzz/usb_tcpm_v2_rev20_fuzz.tasklist +++ b/fuzz/usb_tcpm_v2_rev20_fuzz.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/2id.h b/include/2id.h index 4f871b63cd..8d05f96e56 100644 --- a/include/2id.h +++ b/include/2id.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/accel_cal.h b/include/accel_cal.h index 80f0161a04..2f7b5d6bbf 100644 --- a/include/accel_cal.h +++ b/include/accel_cal.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/accelgyro.h b/include/accelgyro.h index 3ea250ac58..74824b2611 100644 --- a/include/accelgyro.h +++ b/include/accelgyro.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/acpi.h b/include/acpi.h index d51abd4ed6..b99fe9a235 100644 --- a/include/acpi.h +++ b/include/acpi.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/adc.h b/include/adc.h index a2e7ccc882..ddb6c8246e 100644 --- a/include/adc.h +++ b/include/adc.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/als.h b/include/als.h index dedc1a12f9..21c373c9b6 100644 --- a/include/als.h +++ b/include/als.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/ap_hang_detect.h b/include/ap_hang_detect.h index c26a9d9166..8dfcce6d74 100644 --- a/include/ap_hang_detect.h +++ b/include/ap_hang_detect.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/atkbd_protocol.h b/include/atkbd_protocol.h index d8bab5aab6..a33e6e455e 100644 --- a/include/atkbd_protocol.h +++ b/include/atkbd_protocol.h @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. * diff --git a/include/atomic_bit.h b/include/atomic_bit.h index 3aeaa6c5b6..34416a2f89 100644 --- a/include/atomic_bit.h +++ b/include/atomic_bit.h @@ -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. */ diff --git a/include/atomic_t.h b/include/atomic_t.h index a1235c5f62..7f95665f46 100644 --- a/include/atomic_t.h +++ b/include/atomic_t.h @@ -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. */ diff --git a/include/audio_codec.h b/include/audio_codec.h index 44b9050bfa..431f776247 100644 --- a/include/audio_codec.h +++ b/include/audio_codec.h @@ -1,5 +1,5 @@ /* - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/backlight.h b/include/backlight.h index 3492da1984..4d37af01c0 100644 --- a/include/backlight.h +++ b/include/backlight.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/base32.h b/include/base32.h index efe52a587b..a1816afb60 100644 --- a/include/base32.h +++ b/include/base32.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/base_state.h b/include/base_state.h index d8c72e5663..60b499ecd0 100644 --- a/include/base_state.h +++ b/include/base_state.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/battery.h b/include/battery.h index 8a99c9b7e6..5eb81c20ad 100644 --- a/include/battery.h +++ b/include/battery.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/battery_bq27621_g1.h b/include/battery_bq27621_g1.h index ff7e546f3a..019a9d2fe4 100644 --- a/include/battery_bq27621_g1.h +++ b/include/battery_bq27621_g1.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/battery_fuel_gauge.h b/include/battery_fuel_gauge.h index ed3d2d70b4..b3fbb035e7 100644 --- a/include/battery_fuel_gauge.h +++ b/include/battery_fuel_gauge.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/battery_smart.h b/include/battery_smart.h index 40737750ba..f07b967861 100644 --- a/include/battery_smart.h +++ b/include/battery_smart.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/bluetooth_le.h b/include/bluetooth_le.h index 04d5be8bf6..e65b3d448b 100644 --- a/include/bluetooth_le.h +++ b/include/bluetooth_le.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/bluetooth_le_ll.h b/include/bluetooth_le_ll.h index 018a7d3fe0..d17aec8a57 100644 --- a/include/bluetooth_le_ll.h +++ b/include/bluetooth_le_ll.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/board_config.h b/include/board_config.h index 5b21be8236..b20f1fe46c 100644 --- a/include/board_config.h +++ b/include/board_config.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/body_detection.h b/include/body_detection.h index 87c6d91b18..8fea5d84e1 100644 --- a/include/body_detection.h +++ b/include/body_detection.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/btle_hci2.h b/include/btle_hci2.h index afcc1669c4..dc59b72277 100644 --- a/include/btle_hci2.h +++ b/include/btle_hci2.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/btle_hci_int.h b/include/btle_hci_int.h index 4271b4b57e..ce3fd6ef41 100644 --- a/include/btle_hci_int.h +++ b/include/btle_hci_int.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/button.h b/include/button.h index 105dcff12a..937b280876 100644 --- a/include/button.h +++ b/include/button.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/byteorder.h b/include/byteorder.h index b385dbd20c..7a47cbde65 100644 --- a/include/byteorder.h +++ b/include/byteorder.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/capsense.h b/include/capsense.h index 87fac926c3..cb967c595e 100644 --- a/include/capsense.h +++ b/include/capsense.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/case_closed_debug.h b/include/case_closed_debug.h index 53c8b1ed17..ebca79fdc0 100644 --- a/include/case_closed_debug.h +++ b/include/case_closed_debug.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/cec.h b/include/cec.h index b1ac6dbbb0..006eeffe6a 100644 --- a/include/cec.h +++ b/include/cec.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/charge_manager.h b/include/charge_manager.h index a7eb373089..ccef9d8814 100644 --- a/include/charge_manager.h +++ b/include/charge_manager.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/charge_ramp.h b/include/charge_ramp.h index 8dbe9823d2..be456a64ec 100644 --- a/include/charge_ramp.h +++ b/include/charge_ramp.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/charge_state.h b/include/charge_state.h index b29135aa45..c2d2bce948 100644 --- a/include/charge_state.h +++ b/include/charge_state.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -99,7 +99,7 @@ int charge_get_percent(void); #else static inline int charge_get_percent(void) { - return 100; + return 0; } #endif diff --git a/include/charge_state_v1.h b/include/charge_state_v1.h index fbf2ff4c09..302fc0acf8 100644 --- a/include/charge_state_v1.h +++ b/include/charge_state_v1.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/charge_state_v2.h b/include/charge_state_v2.h index e94a31c242..0817204774 100644 --- a/include/charge_state_v2.h +++ b/include/charge_state_v2.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/charger.h b/include/charger.h index 3cda0c0083..b6b3be3426 100644 --- a/include/charger.h +++ b/include/charger.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/charger_detect.h b/include/charger_detect.h index ae2001e418..7371583cd8 100644 --- a/include/charger_detect.h +++ b/include/charger_detect.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/charger_profile_override.h b/include/charger_profile_override.h index a948638c40..24606d3c3d 100644 --- a/include/charger_profile_override.h +++ b/include/charger_profile_override.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/chipset.h b/include/chipset.h index 874bf59548..1a5c5a0d2f 100644 --- a/include/chipset.h +++ b/include/chipset.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/clock.h b/include/clock.h index fc21a45ac6..600649f891 100644 --- a/include/clock.h +++ b/include/clock.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/common.h b/include/common.h index 49f5a4c15b..7334fe3aed 100644 --- a/include/common.h +++ b/include/common.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/compile_time_macros.h b/include/compile_time_macros.h index a227fb1f9a..8330ea5840 100644 --- a/include/compile_time_macros.h +++ b/include/compile_time_macros.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/compiler.h b/include/compiler.h index 904073263c..d684308c95 100644 --- a/include/compiler.h +++ b/include/compiler.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/config.h b/include/config.h index 7530a9d853..8ca7973093 100644 --- a/include/config.h +++ b/include/config.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -3277,15 +3277,15 @@ * SLP signals (SLP_S3, SLP_S4, and SLP_S5) use virtual wires instead of * physical pins with eSPI interface. */ -#undef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 -#undef CONFIG_HOSTCMD_ESPI_VW_SLP_S4 -#undef CONFIG_HOSTCMD_ESPI_VW_SLP_S5 +#undef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 +#undef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 +#undef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S5 /* MCHP next two items are EC eSPI slave configuration */ /* Maximum clock frequence eSPI EC slave advertises * Values in MHz are 20, 25, 33, 50, and 66 */ -#undef CONFIG_HOSTCMD_ESPI_EC_MAX_FREQ +#undef CONFIG_HOST_INTERFACE_ESPI_EC_MAX_FREQ /* EC eSPI slave advertises IO lanes * 0 = Single @@ -3293,7 +3293,7 @@ * 2 = Single and Quad * 3 = Single, Dual, and Quad */ -#undef CONFIG_HOSTCMD_ESPI_EC_MODE +#undef CONFIG_HOST_INTERFACE_ESPI_EC_MODE /* Bit map of eSPI channels EC advertises * bit[0] = 1 Peripheral channel @@ -3301,7 +3301,7 @@ * bit[2] = 1 OOB channel * bit[3] = 1 Flash channel */ -#undef CONFIG_HOSTCMD_ESPI_EC_CHAN_BITMAP +#undef CONFIG_HOST_INTERFACE_ESPI_EC_CHAN_BITMAP /* * Background information (from Intel eSPI Compatibility Specification): @@ -3332,7 +3332,7 @@ * Don't enable this config if the platform implements the Deep-Sx entry as EC * needs to maintain these pins' states per request. */ -#undef CONFIG_HOSTCMD_ESPI_RESET_SLP_SX_VW_ON_ESPI_RST +#undef CONFIG_HOST_INTERFACE_ESPI_RESET_SLP_SX_VW_ON_ESPI_RST /* Base address of low power RAM. */ #undef CONFIG_LPRAM_BASE @@ -5727,7 +5727,7 @@ * The historical default SCI pulse width to the host is 65 microseconds, but * some chipsets may require different widths. */ -#define CONFIG_ESPI_DEFAULT_VW_WIDTH_US 65 +#define CONFIG_HOST_INTERFACE_ESPI_DEFAULT_VW_WIDTH_US 65 /*****************************************************************************/ /* @@ -5753,9 +5753,9 @@ * Define CONFIG_HOST_ESPI_VW_POWER_SIGNAL if any power signals from the host * are configured as virtual wires. */ -#if defined(CONFIG_HOSTCMD_ESPI_VW_SLP_S3) || \ - defined(CONFIG_HOSTCMD_ESPI_VW_SLP_S4) || \ - defined(CONFIG_HOSTCMD_ESPI_VW_SLP_S5) +#if defined(CONFIG_HOSTCMD_ESPI_VW_SLP_S3) || \ + defined(CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4) || \ + defined(CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S5) #define CONFIG_HOST_ESPI_VW_POWER_SIGNAL #endif @@ -5767,7 +5767,7 @@ * with Key Locker support (TGL+). */ #if defined(CONFIG_POWER_S4_RESIDENCY) && \ - !defined(CONFIG_HOSTCMD_ESPI_VW_SLP_S5) + !defined(CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S5) #error "S4_RESIDENCY needs eSPI support or SLP_S5 routed" #endif @@ -6423,7 +6423,7 @@ #define CONFIG_CHIPSET_X86_RSMRST_DELAY #endif -#if defined(CONFIG_HOSTCMD_ESPI_VW_SLP_S3) && \ +#if defined(CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3) && \ defined(CONFIG_CHIPSET_SLP_S3_L_OVERRIDE) #error "Cannot use CONFIG_CHIPSET_SLP_S3_L_OVERRIDE if SLP_S3 is a virtual wire" #endif diff --git a/include/config_std_internal_flash.h b/include/config_std_internal_flash.h index f2d0156d35..5da01a4d16 100644 --- a/include/config_std_internal_flash.h +++ b/include/config_std_internal_flash.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/console.h b/include/console.h index cd3f9cb113..4e40eddac8 100644 --- a/include/console.h +++ b/include/console.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/console_channel.inc b/include/console_channel.inc index 705a8209df..47f065e268 100644 --- a/include/console_channel.inc +++ b/include/console_channel.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2016 The Chromium OS Authors. All rights reserved. + * Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/consumer.h b/include/consumer.h index f6d164649e..a331e83a93 100644 --- a/include/consumer.h +++ b/include/consumer.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/crc.h b/include/crc.h index 04a82313d8..85d389e506 100644 --- a/include/crc.h +++ b/include/crc.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/crc8.h b/include/crc8.h index 45b2322b44..c20314311e 100644 --- a/include/crc8.h +++ b/include/crc8.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/cros_board_info.h b/include/cros_board_info.h index a1f4485619..992192e910 100644 --- a/include/cros_board_info.h +++ b/include/cros_board_info.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/cros_version.h b/include/cros_version.h index ecaaebc8a1..8e3429773a 100644 --- a/include/cros_version.h +++ b/include/cros_version.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/crypto_api.h b/include/crypto_api.h index 95bf0cedec..c6374ebee4 100644 --- a/include/crypto_api.h +++ b/include/crypto_api.h @@ -1,5 +1,5 @@ /* - * Copyright 2017 The Chromium OS Authors. All rights reserved. + * Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/device_event.h b/include/device_event.h index 6b688f80e6..7a9992b0df 100644 --- a/include/device_event.h +++ b/include/device_event.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/device_state.h b/include/device_state.h index 4ef0fa4c25..7df80b374d 100644 --- a/include/device_state.h +++ b/include/device_state.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/display_7seg.h b/include/display_7seg.h index 7b35bf3a65..976d496ccb 100644 --- a/include/display_7seg.h +++ b/include/display_7seg.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/dma.h b/include/dma.h index 8b8da9dc76..f35826a132 100644 --- a/include/dma.h +++ b/include/dma.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/dps.h b/include/dps.h index e9d1daa11b..0cb2a9455b 100644 --- a/include/dps.h +++ b/include/dps.h @@ -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. */ diff --git a/include/dptf.h b/include/dptf.h index 82fe5f6768..b71b4cf5c0 100644 --- a/include/dptf.h +++ b/include/dptf.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/driver/accel_bma2x2.h b/include/driver/accel_bma2x2.h index 606d0f9b7a..c6be3b0c87 100644 --- a/include/driver/accel_bma2x2.h +++ b/include/driver/accel_bma2x2.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/driver/accel_bma2x2_public.h b/include/driver/accel_bma2x2_public.h index a7b99d88ba..04d7a33e4c 100644 --- a/include/driver/accel_bma2x2_public.h +++ b/include/driver/accel_bma2x2_public.h @@ -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. */ diff --git a/include/driver/accel_lis2dw12_public.h b/include/driver/accel_lis2dw12_public.h index 5f705590b4..5596e6ba6a 100644 --- a/include/driver/accel_lis2dw12_public.h +++ b/include/driver/accel_lis2dw12_public.h @@ -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. */ diff --git a/include/driver/accelgyro_bmi160.h b/include/driver/accelgyro_bmi160.h index 6bb676fde3..8c6310e65b 100644 --- a/include/driver/accelgyro_bmi160.h +++ b/include/driver/accelgyro_bmi160.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/driver/accelgyro_bmi160_public.h b/include/driver/accelgyro_bmi160_public.h index 57d1bc56cc..551e351fea 100644 --- a/include/driver/accelgyro_bmi160_public.h +++ b/include/driver/accelgyro_bmi160_public.h @@ -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. */ diff --git a/include/driver/accelgyro_bmi260.h b/include/driver/accelgyro_bmi260.h index a063539fb7..5d55a85acc 100644 --- a/include/driver/accelgyro_bmi260.h +++ b/include/driver/accelgyro_bmi260.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/driver/accelgyro_bmi260_public.h b/include/driver/accelgyro_bmi260_public.h index e8d165275a..33fc55300d 100644 --- a/include/driver/accelgyro_bmi260_public.h +++ b/include/driver/accelgyro_bmi260_public.h @@ -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. */ diff --git a/include/driver/accelgyro_bmi_common.h b/include/driver/accelgyro_bmi_common.h index bc82e8aba2..371d3d97ce 100644 --- a/include/driver/accelgyro_bmi_common.h +++ b/include/driver/accelgyro_bmi_common.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/driver/accelgyro_bmi_common_public.h b/include/driver/accelgyro_bmi_common_public.h index c31168e75c..b3965d4dc5 100644 --- a/include/driver/accelgyro_bmi_common_public.h +++ b/include/driver/accelgyro_bmi_common_public.h @@ -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. */ diff --git a/include/driver/accelgyro_lsm6dso_public.h b/include/driver/accelgyro_lsm6dso_public.h index 6b5f54e74b..f2c1b2bc4e 100644 --- a/include/driver/accelgyro_lsm6dso_public.h +++ b/include/driver/accelgyro_lsm6dso_public.h @@ -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. */ diff --git a/include/driver/als_tcs3400.h b/include/driver/als_tcs3400.h index 12608af279..ab28d7e7d5 100644 --- a/include/driver/als_tcs3400.h +++ b/include/driver/als_tcs3400.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/driver/als_tcs3400_public.h b/include/driver/als_tcs3400_public.h index ed3b5e5f63..2cf9aed45f 100644 --- a/include/driver/als_tcs3400_public.h +++ b/include/driver/als_tcs3400_public.h @@ -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. * diff --git a/include/driver/amd_stt.h b/include/driver/amd_stt.h index 3d382a6c0a..124b13fb00 100644 --- a/include/driver/amd_stt.h +++ b/include/driver/amd_stt.h @@ -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. */ diff --git a/include/driver/bc12/mt6360_public.h b/include/driver/bc12/mt6360_public.h index d2b8499e1f..fbceb74dd6 100644 --- a/include/driver/bc12/mt6360_public.h +++ b/include/driver/bc12/mt6360_public.h @@ -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. */ diff --git a/include/driver/bc12/pi3usb9201_public.h b/include/driver/bc12/pi3usb9201_public.h index 643952ab4a..20788aa5e3 100644 --- a/include/driver/bc12/pi3usb9201_public.h +++ b/include/driver/bc12/pi3usb9201_public.h @@ -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. */ diff --git a/include/driver/charger/isl923x_public.h b/include/driver/charger/isl923x_public.h index 2e57ec7d33..c5d38f75c7 100644 --- a/include/driver/charger/isl923x_public.h +++ b/include/driver/charger/isl923x_public.h @@ -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. * diff --git a/include/driver/charger/isl9241_public.h b/include/driver/charger/isl9241_public.h index 3815826172..be586f39c3 100644 --- a/include/driver/charger/isl9241_public.h +++ b/include/driver/charger/isl9241_public.h @@ -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. * diff --git a/include/driver/ln9310.h b/include/driver/ln9310.h index 6e79f20e05..dacdf95a91 100644 --- a/include/driver/ln9310.h +++ b/include/driver/ln9310.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/driver/mag_bmm150.h b/include/driver/mag_bmm150.h index a9136da1e5..0325e6c5fc 100644 --- a/include/driver/mag_bmm150.h +++ b/include/driver/mag_bmm150.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/driver/ppc/aoz1380_public.h b/include/driver/ppc/aoz1380_public.h index 3ac92e862a..aa617054fe 100644 --- a/include/driver/ppc/aoz1380_public.h +++ b/include/driver/ppc/aoz1380_public.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/driver/ppc/ktu1125_public.h b/include/driver/ppc/ktu1125_public.h index 276f8c9a99..28ecfc7c23 100644 --- a/include/driver/ppc/ktu1125_public.h +++ b/include/driver/ppc/ktu1125_public.h @@ -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. */ diff --git a/include/driver/ppc/nx20p348x_public.h b/include/driver/ppc/nx20p348x_public.h index 382dceb949..145896aca1 100644 --- a/include/driver/ppc/nx20p348x_public.h +++ b/include/driver/ppc/nx20p348x_public.h @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/include/driver/ppc/sn5s330_public.h b/include/driver/ppc/sn5s330_public.h index fdd60e54cb..62652d99b2 100644 --- a/include/driver/ppc/sn5s330_public.h +++ b/include/driver/ppc/sn5s330_public.h @@ -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. */ diff --git a/include/driver/ppc/syv682x_public.h b/include/driver/ppc/syv682x_public.h index 63ad89be8b..a97d412478 100644 --- a/include/driver/ppc/syv682x_public.h +++ b/include/driver/ppc/syv682x_public.h @@ -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. */ diff --git a/include/driver/retimer/anx7483_public.h b/include/driver/retimer/anx7483_public.h index 07596ff5a5..83ad32508e 100644 --- a/include/driver/retimer/anx7483_public.h +++ b/include/driver/retimer/anx7483_public.h @@ -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. * diff --git a/include/driver/retimer/bb_retimer.h b/include/driver/retimer/bb_retimer.h index 8ee5aec518..f96274aa79 100644 --- a/include/driver/retimer/bb_retimer.h +++ b/include/driver/retimer/bb_retimer.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/driver/retimer/bb_retimer_public.h b/include/driver/retimer/bb_retimer_public.h index 133c733330..2d2893fb49 100644 --- a/include/driver/retimer/bb_retimer_public.h +++ b/include/driver/retimer/bb_retimer_public.h @@ -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. * diff --git a/include/driver/tcpm/anx7447_public.h b/include/driver/tcpm/anx7447_public.h index f8ac990d42..5ea1eebd35 100644 --- a/include/driver/tcpm/anx7447_public.h +++ b/include/driver/tcpm/anx7447_public.h @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/include/driver/tcpm/it8xxx2_pd_public.h b/include/driver/tcpm/it8xxx2_pd_public.h index 6ad11a9555..0c28127cdb 100644 --- a/include/driver/tcpm/it8xxx2_pd_public.h +++ b/include/driver/tcpm/it8xxx2_pd_public.h @@ -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. */ diff --git a/include/driver/tcpm/ps8xxx_public.h b/include/driver/tcpm/ps8xxx_public.h index 05823a7b42..d327dee2a3 100644 --- a/include/driver/tcpm/ps8xxx_public.h +++ b/include/driver/tcpm/ps8xxx_public.h @@ -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. */ diff --git a/include/driver/tcpm/rt1715_public.h b/include/driver/tcpm/rt1715_public.h index 14fa9495e8..2f3af95443 100644 --- a/include/driver/tcpm/rt1715_public.h +++ b/include/driver/tcpm/rt1715_public.h @@ -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. */ diff --git a/include/driver/tcpm/rt1718s_public.h b/include/driver/tcpm/rt1718s_public.h index e30f6ddeba..62bade6ab9 100644 --- a/include/driver/tcpm/rt1718s_public.h +++ b/include/driver/tcpm/rt1718s_public.h @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/include/driver/tcpm/tcpci.h b/include/driver/tcpm/tcpci.h index 7f1b63e22a..4879f7dad1 100644 --- a/include/driver/tcpm/tcpci.h +++ b/include/driver/tcpm/tcpci.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/driver/tcpm/tcpm.h b/include/driver/tcpm/tcpm.h index 3b17a5d5fa..8352423d9d 100644 --- a/include/driver/tcpm/tcpm.h +++ b/include/driver/tcpm/tcpm.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/driver/tcpm/tusb422_public.h b/include/driver/tcpm/tusb422_public.h index 8756d9b362..004abdd5c9 100644 --- a/include/driver/tcpm/tusb422_public.h +++ b/include/driver/tcpm/tusb422_public.h @@ -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. */ diff --git a/include/driver/temp_sensor/pct2075.h b/include/driver/temp_sensor/pct2075.h index 5493e9e55c..e79ac0e97a 100644 --- a/include/driver/temp_sensor/pct2075.h +++ b/include/driver/temp_sensor/pct2075.h @@ -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. */ diff --git a/include/driver/temp_sensor/sb_tsi.h b/include/driver/temp_sensor/sb_tsi.h index ba045affa9..d8b015d200 100644 --- a/include/driver/temp_sensor/sb_tsi.h +++ b/include/driver/temp_sensor/sb_tsi.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/driver/temp_sensor/thermistor.h b/include/driver/temp_sensor/thermistor.h index 84e19b90c9..46b7763747 100644 --- a/include/driver/temp_sensor/thermistor.h +++ b/include/driver/temp_sensor/thermistor.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/driver/temp_sensor/tmp112.h b/include/driver/temp_sensor/tmp112.h index 60950660a1..56d55d9133 100644 --- a/include/driver/temp_sensor/tmp112.h +++ b/include/driver/temp_sensor/tmp112.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/driver/usb_mux/it5205_public.h b/include/driver/usb_mux/it5205_public.h index 81dc326049..40590194c4 100644 --- a/include/driver/usb_mux/it5205_public.h +++ b/include/driver/usb_mux/it5205_public.h @@ -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. * diff --git a/include/driver/usb_mux/ps8743_public.h b/include/driver/usb_mux/ps8743_public.h index 8b9f323d5f..64ba2d0cd7 100644 --- a/include/driver/usb_mux/ps8743_public.h +++ b/include/driver/usb_mux/ps8743_public.h @@ -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. * diff --git a/include/ec_commands.h b/include/ec_commands.h index f971387e00..667212f12e 100644 --- a/include/ec_commands.h +++ b/include/ec_commands.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/ec_ec_comm_client.h b/include/ec_ec_comm_client.h index 3dea3112dd..9b506dd402 100644 --- a/include/ec_ec_comm_client.h +++ b/include/ec_ec_comm_client.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/ec_ec_comm_server.h b/include/ec_ec_comm_server.h index 1ed5588666..0eb094fea3 100644 --- a/include/ec_ec_comm_server.h +++ b/include/ec_ec_comm_server.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/eeprom.h b/include/eeprom.h index 384530559f..41e464c1f5 100644 --- a/include/eeprom.h +++ b/include/eeprom.h @@ -1,4 +1,4 @@ -/* Copyright 2011 The Chromium OS Authors. All rights reserved. +/* Copyright 2011 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/espi.h b/include/espi.h index f5f23001fe..4768d8f12f 100644 --- a/include/espi.h +++ b/include/espi.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/event_log.h b/include/event_log.h index f7e7244a54..bd3b88510b 100644 --- a/include/event_log.h +++ b/include/event_log.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/extpower.h b/include/extpower.h index aa15d1f605..08bec3f0bc 100644 --- a/include/extpower.h +++ b/include/extpower.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/fan.h b/include/fan.h index 2a7791712f..946d0607c9 100644 --- a/include/fan.h +++ b/include/fan.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/flash.h b/include/flash.h index 214e5b43d8..5df6afdb09 100644 --- a/include/flash.h +++ b/include/flash.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/flash_log.h b/include/flash_log.h index 41287f88c7..7141a8b67a 100644 --- a/include/flash_log.h +++ b/include/flash_log.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/fpsensor.h b/include/fpsensor.h index a8742b1f7f..3963df86a7 100644 --- a/include/fpsensor.h +++ b/include/fpsensor.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/fpsensor_crypto.h b/include/fpsensor_crypto.h index 4744d6e4aa..7dff9238fa 100644 --- a/include/fpsensor_crypto.h +++ b/include/fpsensor_crypto.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/fpsensor_detect.h b/include/fpsensor_detect.h index 56e04d4ae6..e542223954 100644 --- a/include/fpsensor_detect.h +++ b/include/fpsensor_detect.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/fpsensor_state.h b/include/fpsensor_state.h index d15a7cf3e7..ce454233fa 100644 --- a/include/fpsensor_state.h +++ b/include/fpsensor_state.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/gesture.h b/include/gesture.h index bc0186887c..8744f3efcd 100644 --- a/include/gesture.h +++ b/include/gesture.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/gpio.h b/include/gpio.h index 2f22a1b4e7..54464d1bfb 100644 --- a/include/gpio.h +++ b/include/gpio.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/gpio.wrap b/include/gpio.wrap index d03f8a9588..84055d3ba3 100644 --- a/include/gpio.wrap +++ b/include/gpio.wrap @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * Copyright 2014 The Chromium OS Authors. All rights reserved. + * Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/gpio_list.h b/include/gpio_list.h index 7ff6c09617..17fc0d3b09 100644 --- a/include/gpio_list.h +++ b/include/gpio_list.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/gpio_signal.h b/include/gpio_signal.h index a1176906c2..a499108b40 100644 --- a/include/gpio_signal.h +++ b/include/gpio_signal.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/gyro_cal.h b/include/gyro_cal.h index fb69464aec..fe48d71360 100644 --- a/include/gyro_cal.h +++ b/include/gyro_cal.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/gyro_still_det.h b/include/gyro_still_det.h index a776da7ae7..a0332d598a 100644 --- a/include/gyro_still_det.h +++ b/include/gyro_still_det.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/hooks.h b/include/hooks.h index 6ff72bebf2..1002c7c93d 100644 --- a/include/hooks.h +++ b/include/hooks.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/host_command.h b/include/host_command.h index 4861e77a35..59389107c7 100644 --- a/include/host_command.h +++ b/include/host_command.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/host_command_heci.h b/include/host_command_heci.h index 1dcb054ff6..5595724b59 100644 --- a/include/host_command_heci.h +++ b/include/host_command_heci.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/hotword_dsp_api.h b/include/hotword_dsp_api.h index f7a21f5020..311add6675 100644 --- a/include/hotword_dsp_api.h +++ b/include/hotword_dsp_api.h @@ -1,5 +1,5 @@ /* - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/hwtimer.h b/include/hwtimer.h index f93537f935..093a44cad1 100644 --- a/include/hwtimer.h +++ b/include/hwtimer.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/i2c.h b/include/i2c.h index 99651d04c1..4da9306abb 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/i2c_bitbang.h b/include/i2c_bitbang.h index 12486b7ee6..cc9b5cbc11 100644 --- a/include/i2c_bitbang.h +++ b/include/i2c_bitbang.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/i2c_hid.h b/include/i2c_hid.h index 1a53be4d49..03b216d3c5 100644 --- a/include/i2c_hid.h +++ b/include/i2c_hid.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/i2c_hid_touchpad.h b/include/i2c_hid_touchpad.h index b72c2cd588..d425650c40 100644 --- a/include/i2c_hid_touchpad.h +++ b/include/i2c_hid_touchpad.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/i2c_ite_flash_support.h b/include/i2c_ite_flash_support.h index f70bec877a..241524f4b9 100644 --- a/include/i2c_ite_flash_support.h +++ b/include/i2c_ite_flash_support.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/i2c_peripheral.h b/include/i2c_peripheral.h index 2894a39a1a..dd4e4b0c7b 100644 --- a/include/i2c_peripheral.h +++ b/include/i2c_peripheral.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/i2c_private.h b/include/i2c_private.h index 083956e05d..269b6810bd 100644 --- a/include/i2c_private.h +++ b/include/i2c_private.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/i8042_protocol.h b/include/i8042_protocol.h index 5176cad95f..23f500da17 100644 --- a/include/i8042_protocol.h +++ b/include/i8042_protocol.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/inductive_charging.h b/include/inductive_charging.h index 5c44e410aa..d4d1dd4d71 100644 --- a/include/inductive_charging.h +++ b/include/inductive_charging.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/init_rom.h b/include/init_rom.h index 84fe53d4ff..79a683752b 100644 --- a/include/init_rom.h +++ b/include/init_rom.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/ioexpander.h b/include/ioexpander.h index 323ba65330..9aff67dfaf 100644 --- a/include/ioexpander.h +++ b/include/ioexpander.h @@ -1,5 +1,5 @@ /* - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/kasa.h b/include/kasa.h index 6157b5632d..06e5c29dbe 100644 --- a/include/kasa.h +++ b/include/kasa.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/keyboard_8042.h b/include/keyboard_8042.h index a2dcaf1ee5..34c98c2a38 100644 --- a/include/keyboard_8042.h +++ b/include/keyboard_8042.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/keyboard_8042_sharedlib.h b/include/keyboard_8042_sharedlib.h index 91249888b8..bd7a7b5ec7 100644 --- a/include/keyboard_8042_sharedlib.h +++ b/include/keyboard_8042_sharedlib.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/keyboard_backlight.h b/include/keyboard_backlight.h index 194bec66f4..a898300dc3 100644 --- a/include/keyboard_backlight.h +++ b/include/keyboard_backlight.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/keyboard_config.h b/include/keyboard_config.h index d25a74232c..afb69bf141 100644 --- a/include/keyboard_config.h +++ b/include/keyboard_config.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/keyboard_mkbp.h b/include/keyboard_mkbp.h index 0ea55813be..ff2344937b 100644 --- a/include/keyboard_mkbp.h +++ b/include/keyboard_mkbp.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/keyboard_protocol.h b/include/keyboard_protocol.h index d9a3d60d00..7b9006fcc0 100644 --- a/include/keyboard_protocol.h +++ b/include/keyboard_protocol.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/keyboard_raw.h b/include/keyboard_raw.h index 1619c2a621..dca7b3c79a 100644 --- a/include/keyboard_raw.h +++ b/include/keyboard_raw.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/keyboard_scan.h b/include/keyboard_scan.h index 3ce1f74745..e235a47c1c 100644 --- a/include/keyboard_scan.h +++ b/include/keyboard_scan.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -183,4 +183,27 @@ struct keyboard_type { extern struct keyboard_type key_typ; #endif +#ifdef TEST_BUILD +/** + * @brief Get the value of print_state_changes + * + * @return non-zero if state change printing is enabled, zero if not. + */ +__test_only int keyboard_scan_get_print_state_changes(void); + +/** + * @brief Forcibly set the value of print_state_changes + * + * @param val Value to set + */ +__test_only void keyboard_scan_set_print_state_changes(int val); + +/** + * @brief Checks if keyboard scanning is currently enabled. + * + * @return int non-zero if enabled, zero otherwise. + */ +int keyboard_scan_is_enabled(void); +#endif /* TEST_BUILD */ + #endif /* __CROS_EC_KEYBOARD_SCAN_H */ diff --git a/include/keyboard_test.h b/include/keyboard_test.h index 13065a2cc1..be12f08372 100644 --- a/include/keyboard_test.h +++ b/include/keyboard_test.h @@ -1,5 +1,5 @@ /* - * Copyright 2013 The Chromium OS Authors. All rights reserved. + * Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/lb_common.h b/include/lb_common.h index 1cf6caa35a..29f666d33b 100644 --- a/include/lb_common.h +++ b/include/lb_common.h @@ -1,5 +1,5 @@ /* - * Copyright 2014 The Chromium OS Authors. All rights reserved. + * Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/led_common.h b/include/led_common.h index 87cd10f766..71c8211fec 100644 --- a/include/led_common.h +++ b/include/led_common.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/led_onoff_states.h b/include/led_onoff_states.h index 47756da106..bfad06aabc 100644 --- a/include/led_onoff_states.h +++ b/include/led_onoff_states.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/led_pwm.h b/include/led_pwm.h index d60ae01d19..1c8cec9ff4 100644 --- a/include/led_pwm.h +++ b/include/led_pwm.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/libsharedobjs.h b/include/libsharedobjs.h index c0017e5171..ee767ff127 100644 --- a/include/libsharedobjs.h +++ b/include/libsharedobjs.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/lid_angle.h b/include/lid_angle.h index eca6d99b03..8836c91238 100644 --- a/include/lid_angle.h +++ b/include/lid_angle.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/lid_switch.h b/include/lid_switch.h index d127e3feb1..3d639b5782 100644 --- a/include/lid_switch.h +++ b/include/lid_switch.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/lightbar.h b/include/lightbar.h index 84700eaf2a..aff5e6fc68 100644 --- a/include/lightbar.h +++ b/include/lightbar.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/lightbar_msg_list.h b/include/lightbar_msg_list.h index 5694e9d6b6..be87913c83 100644 --- a/include/lightbar_msg_list.h +++ b/include/lightbar_msg_list.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/lightbar_opcode_list.h b/include/lightbar_opcode_list.h index 340b740b3f..c8feae682f 100644 --- a/include/lightbar_opcode_list.h +++ b/include/lightbar_opcode_list.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/link_defs.h b/include/link_defs.h index 4c0c29b589..ed7e9d1cfe 100644 --- a/include/link_defs.h +++ b/include/link_defs.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/lpc.h b/include/lpc.h index eba3924b87..2e0a2eea74 100644 --- a/include/lpc.h +++ b/include/lpc.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/mag_cal.h b/include/mag_cal.h index 3d256a0777..66281bba4e 100644 --- a/include/mag_cal.h +++ b/include/mag_cal.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/mat33.h b/include/mat33.h index 1a9a02f71f..43826af1b1 100644 --- a/include/mat33.h +++ b/include/mat33.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/mat44.h b/include/mat44.h index 37df6ba2a1..909c6e0ee7 100644 --- a/include/mat44.h +++ b/include/mat44.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/math_util.h b/include/math_util.h index 7f8c8f217e..51065d2bce 100644 --- a/include/math_util.h +++ b/include/math_util.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/memory_commands.h b/include/memory_commands.h index 590bb9331f..666a6ef508 100644 --- a/include/memory_commands.h +++ b/include/memory_commands.h @@ -1,4 +1,4 @@ -/* Copyright 2011 The Chromium OS Authors. All rights reserved. +/* Copyright 2011 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/mkbp_event.h b/include/mkbp_event.h index 8173242497..d31bd82cb2 100644 --- a/include/mkbp_event.h +++ b/include/mkbp_event.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * @@ -57,4 +57,16 @@ struct mkbp_event_source { __attribute__((section(".rodata.evtsrcs"))) = { type, func } #endif +#ifdef TEST_BUILD +/* Allow directly raising events in unit tests */ +void activate_mkbp_with_events(uint32_t events_to_add); + +/** + * @brief Force the event bits to zero, causing the event handling code to + * believe there are no pending events to service. This has no effect on + * any event sources' internal queues or logic. + */ +__test_only void mkbp_event_clear_all(void); +#endif /* TEST_BUILD */ + #endif /* __CROS_EC_MKBP_EVENT_H */ diff --git a/include/mkbp_fifo.h b/include/mkbp_fifo.h index 7afb016614..408980a10b 100644 --- a/include/mkbp_fifo.h +++ b/include/mkbp_fifo.h @@ -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. */ diff --git a/include/mkbp_info.h b/include/mkbp_info.h index 64daa52dce..2fbb639300 100644 --- a/include/mkbp_info.h +++ b/include/mkbp_info.h @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/include/mkbp_input_devices.h b/include/mkbp_input_devices.h index 2557aab3f2..920f944fdf 100644 --- a/include/mkbp_input_devices.h +++ b/include/mkbp_input_devices.h @@ -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. */ diff --git a/include/mock/charge_manager_mock.h b/include/mock/charge_manager_mock.h index 23377f6716..afae5a19a2 100644 --- a/include/mock/charge_manager_mock.h +++ b/include/mock/charge_manager_mock.h @@ -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. */ diff --git a/include/mock/dp_alt_mode_mock.h b/include/mock/dp_alt_mode_mock.h index 27811140c7..152d5d8b37 100644 --- a/include/mock/dp_alt_mode_mock.h +++ b/include/mock/dp_alt_mode_mock.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/mock/fp_sensor_mock.h b/include/mock/fp_sensor_mock.h index 3de4bcadb9..338a03b7e9 100644 --- a/include/mock/fp_sensor_mock.h +++ b/include/mock/fp_sensor_mock.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/mock/fpsensor_crypto_mock.h b/include/mock/fpsensor_crypto_mock.h index f3ca84734e..8462dc1baf 100644 --- a/include/mock/fpsensor_crypto_mock.h +++ b/include/mock/fpsensor_crypto_mock.h @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/include/mock/fpsensor_detect_mock.h b/include/mock/fpsensor_detect_mock.h index da23dded96..b8594ebdd9 100644 --- a/include/mock/fpsensor_detect_mock.h +++ b/include/mock/fpsensor_detect_mock.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/mock/fpsensor_state_mock.h b/include/mock/fpsensor_state_mock.h index 4571a1e987..34d6a8d3c7 100644 --- a/include/mock/fpsensor_state_mock.h +++ b/include/mock/fpsensor_state_mock.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -11,6 +11,12 @@ #include "ec_commands.h" extern const uint8_t default_fake_tpm_seed[FP_CONTEXT_TPM_BYTES]; +extern const uint8_t + default_fake_fp_positive_match_salt[FP_MAX_FINGER_COUNT] + [FP_POSITIVE_MATCH_SALT_BYTES]; +extern const uint8_t + trivial_fp_positive_match_salt[FP_MAX_FINGER_COUNT] + [FP_POSITIVE_MATCH_SALT_BYTES]; int fpsensor_state_mock_set_tpm_seed( const uint8_t tpm_seed[FP_CONTEXT_TPM_BYTES]); diff --git a/include/mock/mkbp_events_mock.h b/include/mock/mkbp_events_mock.h index d8eea40cdd..22600e4f96 100644 --- a/include/mock/mkbp_events_mock.h +++ b/include/mock/mkbp_events_mock.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/mock/rollback_mock.h b/include/mock/rollback_mock.h index e712881eb7..890e2539a7 100644 --- a/include/mock/rollback_mock.h +++ b/include/mock/rollback_mock.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/mock/tcpc_mock.h b/include/mock/tcpc_mock.h index 861ce03434..2f3a78c69a 100644 --- a/include/mock/tcpc_mock.h +++ b/include/mock/tcpc_mock.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/mock/tcpci_i2c_mock.h b/include/mock/tcpci_i2c_mock.h index 85f90c19b0..ae86a8c50b 100644 --- a/include/mock/tcpci_i2c_mock.h +++ b/include/mock/tcpci_i2c_mock.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/mock/tcpm_mock.h b/include/mock/tcpm_mock.h index e5b67f2249..2733863b62 100644 --- a/include/mock/tcpm_mock.h +++ b/include/mock/tcpm_mock.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/mock/timer_mock.h b/include/mock/timer_mock.h index 74644f6544..cc294521cc 100644 --- a/include/mock/timer_mock.h +++ b/include/mock/timer_mock.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/mock/usb_mux_mock.h b/include/mock/usb_mux_mock.h index 128286796b..c2d154ad72 100644 --- a/include/mock/usb_mux_mock.h +++ b/include/mock/usb_mux_mock.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/mock/usb_pd_dpm_mock.h b/include/mock/usb_pd_dpm_mock.h index c61594fd2b..8f91cfb390 100644 --- a/include/mock/usb_pd_dpm_mock.h +++ b/include/mock/usb_pd_dpm_mock.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/mock/usb_pe_sm_mock.h b/include/mock/usb_pe_sm_mock.h index fcd6e268a0..819f086c5a 100644 --- a/include/mock/usb_pe_sm_mock.h +++ b/include/mock/usb_pe_sm_mock.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/mock/usb_prl_mock.h b/include/mock/usb_prl_mock.h index 40cd95543f..eef1d8de63 100644 --- a/include/mock/usb_prl_mock.h +++ b/include/mock/usb_prl_mock.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/mock/usb_tc_sm_mock.h b/include/mock/usb_tc_sm_mock.h index ca16fb4d98..532f2bfb54 100644 --- a/include/mock/usb_tc_sm_mock.h +++ b/include/mock/usb_tc_sm_mock.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/mock_filter.h b/include/mock_filter.h index c86f7fd61d..83beead6c7 100644 --- a/include/mock_filter.h +++ b/include/mock_filter.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/module_id.h b/include/module_id.h index 8872bdd45c..bfc780e70f 100644 --- a/include/module_id.h +++ b/include/module_id.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/motion_lid.h b/include/motion_lid.h index 04ef687fc0..917a545ab6 100644 --- a/include/motion_lid.h +++ b/include/motion_lid.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/motion_orientation.h b/include/motion_orientation.h index 7e78337573..4b1daaa58c 100644 --- a/include/motion_orientation.h +++ b/include/motion_orientation.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/motion_sense.h b/include/motion_sense.h index b128dd600e..6033d52ff9 100644 --- a/include/motion_sense.h +++ b/include/motion_sense.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/motion_sense_fifo.h b/include/motion_sense_fifo.h index c45538977e..e4012e2372 100644 --- a/include/motion_sense_fifo.h +++ b/include/motion_sense_fifo.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/newton_fit.h b/include/newton_fit.h index b4db64c814..2fb1994083 100644 --- a/include/newton_fit.h +++ b/include/newton_fit.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/ocpc.h b/include/ocpc.h index b4041022bf..da1c6907d4 100644 --- a/include/ocpc.h +++ b/include/ocpc.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/onewire.h b/include/onewire.h index 67537b167b..0b328ceedc 100644 --- a/include/onewire.h +++ b/include/onewire.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/online_calibration.h b/include/online_calibration.h index 4094c0a85e..abeb192b75 100644 --- a/include/online_calibration.h +++ b/include/online_calibration.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/otp.h b/include/otp.h index a95bf28426..2047a2e19f 100644 --- a/include/otp.h +++ b/include/otp.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/overflow.h b/include/overflow.h index b2202121ee..884eec884a 100644 --- a/include/overflow.h +++ b/include/overflow.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/panic.h b/include/panic.h index 6553b6feb0..9a1a78844e 100644 --- a/include/panic.h +++ b/include/panic.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/peci.h b/include/peci.h index dccf32100a..401e3f999f 100644 --- a/include/peci.h +++ b/include/peci.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/peripheral_charger.h b/include/peripheral_charger.h index e06ae96e57..5b9abdc169 100644 --- a/include/peripheral_charger.h +++ b/include/peripheral_charger.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/physical_presence.h b/include/physical_presence.h index 0acbc65691..4f93eaea62 100644 --- a/include/physical_presence.h +++ b/include/physical_presence.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/port80.h b/include/port80.h index 3d3a906a18..7521788ea1 100644 --- a/include/port80.h +++ b/include/port80.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/power.h b/include/power.h index f826f178e4..c32b2714e5 100644 --- a/include/power.h +++ b/include/power.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/power/alderlake_slg4bd44540.h b/include/power/alderlake_slg4bd44540.h index eb72df5a39..20a85053fd 100644 --- a/include/power/alderlake_slg4bd44540.h +++ b/include/power/alderlake_slg4bd44540.h @@ -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. */ diff --git a/include/power/amd_x86.h b/include/power/amd_x86.h index 58d73d6c3c..57011d97df 100644 --- a/include/power/amd_x86.h +++ b/include/power/amd_x86.h @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/include/power/apollolake.h b/include/power/apollolake.h index 42bf15c67c..d0931a6b84 100644 --- a/include/power/apollolake.h +++ b/include/power/apollolake.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/power/cannonlake.h b/include/power/cannonlake.h index 20f282f398..53e9ba2325 100644 --- a/include/power/cannonlake.h +++ b/include/power/cannonlake.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/power/cometlake-discrete.h b/include/power/cometlake-discrete.h index ae1d51c32b..430cb02dce 100644 --- a/include/power/cometlake-discrete.h +++ b/include/power/cometlake-discrete.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/power/cometlake.h b/include/power/cometlake.h index 9c1a3a7a93..405fe7f0d7 100644 --- a/include/power/cometlake.h +++ b/include/power/cometlake.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/power/falconlite.h b/include/power/falconlite.h index 3c0baeff66..6afbbfbb94 100644 --- a/include/power/falconlite.h +++ b/include/power/falconlite.h @@ -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. */ diff --git a/include/power/icelake.h b/include/power/icelake.h index 25f90dc078..6a08efbb42 100644 --- a/include/power/icelake.h +++ b/include/power/icelake.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/power/intel_x86.h b/include/power/intel_x86.h index 4091e18a0a..9001cf8d49 100644 --- a/include/power/intel_x86.h +++ b/include/power/intel_x86.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -32,12 +32,12 @@ #endif /* GPIO for power signal */ -#ifdef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 +#ifdef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 #define SLP_S3_SIGNAL_L VW_SLP_S3_L #else #define SLP_S3_SIGNAL_L GPIO_PCH_SLP_S3_L #endif -#ifdef CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#ifdef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 #define SLP_S4_SIGNAL_L VW_SLP_S4_L #else #define SLP_S4_SIGNAL_L GPIO_PCH_SLP_S4_L @@ -48,7 +48,7 @@ * use SLP_S4's GPIO as a proxy for SLP_S5. This matches old behavior and * effectively prevents S4 residency. */ -#ifdef CONFIG_HOSTCMD_ESPI_VW_SLP_S5 +#ifdef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S5 #define SLP_S5_SIGNAL_L VW_SLP_S5_L #else #define SLP_S5_SIGNAL_L SLP_S4_SIGNAL_L diff --git a/include/power/meteorlake.h b/include/power/meteorlake.h index 1d4b59a701..aedf9824fc 100644 --- a/include/power/meteorlake.h +++ b/include/power/meteorlake.h @@ -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. */ diff --git a/include/power/mt8186.h b/include/power/mt8186.h index a2ad5648ed..92eb42eff2 100644 --- a/include/power/mt8186.h +++ b/include/power/mt8186.h @@ -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. */ diff --git a/include/power/mt8192.h b/include/power/mt8192.h index 7a992001ab..19f5ce081d 100644 --- a/include/power/mt8192.h +++ b/include/power/mt8192.h @@ -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. */ diff --git a/include/power/qcom.h b/include/power/qcom.h index 5f5247fa87..ccf61ab4a5 100644 --- a/include/power/qcom.h +++ b/include/power/qcom.h @@ -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. */ diff --git a/include/power/skylake.h b/include/power/skylake.h index 9d9186afd4..4da8ae9ea3 100644 --- a/include/power/skylake.h +++ b/include/power/skylake.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/power_button.h b/include/power_button.h index eecc65e948..9ff85abe7f 100644 --- a/include/power_button.h +++ b/include/power_button.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/power_led.h b/include/power_led.h index 2966dbfe27..d488406cac 100644 --- a/include/power_led.h +++ b/include/power_led.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/printf.h b/include/printf.h index f6330ff9c3..f797ca593e 100644 --- a/include/printf.h +++ b/include/printf.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/producer.h b/include/producer.h index b6a04883d6..81ef93ecf9 100644 --- a/include/producer.h +++ b/include/producer.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/pwm.h b/include/pwm.h index cda2b19014..2ac46b3812 100644 --- a/include/pwm.h +++ b/include/pwm.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/pwr_defs.h b/include/pwr_defs.h index c01e602397..499a5b00e4 100644 --- a/include/pwr_defs.h +++ b/include/pwr_defs.h @@ -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. */ diff --git a/include/queue.h b/include/queue.h index 0645046f93..6e7d4abbf8 100644 --- a/include/queue.h +++ b/include/queue.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/queue_policies.h b/include/queue_policies.h index 4e01cfc23a..aceb477ef6 100644 --- a/include/queue_policies.h +++ b/include/queue_policies.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/regulator.h b/include/regulator.h index 9dae7233c1..680239593e 100644 --- a/include/regulator.h +++ b/include/regulator.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/reset_flag_desc.inc b/include/reset_flag_desc.inc index ed3ce69a0d..a29f8d8d83 100644 --- a/include/reset_flag_desc.inc +++ b/include/reset_flag_desc.inc @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/rgb_keyboard.h b/include/rgb_keyboard.h index 9fd50d5ecf..56a3e09a91 100644 --- a/include/rgb_keyboard.h +++ b/include/rgb_keyboard.h @@ -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. */ diff --git a/include/rma_auth.h b/include/rma_auth.h index 8ccad7f5e4..2ad9299fed 100644 --- a/include/rma_auth.h +++ b/include/rma_auth.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/rollback.h b/include/rollback.h index b5e4867ed9..55cff3a534 100644 --- a/include/rollback.h +++ b/include/rollback.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/rsa.h b/include/rsa.h index 3c5a534578..bbc3795c68 100644 --- a/include/rsa.h +++ b/include/rsa.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/rtc.h b/include/rtc.h index 1c75085840..0225801e71 100644 --- a/include/rtc.h +++ b/include/rtc.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/rwsig.h b/include/rwsig.h index a1a231366d..4abecfddd0 100644 --- a/include/rwsig.h +++ b/include/rwsig.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/sfdp.h b/include/sfdp.h index 643e4e42a1..e1cd6372f2 100644 --- a/include/sfdp.h +++ b/include/sfdp.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/sha1.h b/include/sha1.h index 89fbbf0cd8..12d277d1ac 100644 --- a/include/sha1.h +++ b/include/sha1.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/sha256.h b/include/sha256.h index 28ed988ebe..d1193c2661 100644 --- a/include/sha256.h +++ b/include/sha256.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/shared_mem.h b/include/shared_mem.h index e896f64e04..307ce9f5e5 100644 --- a/include/shared_mem.h +++ b/include/shared_mem.h @@ -1,4 +1,4 @@ -/* Copyright 2011 The Chromium OS Authors. All rights reserved. +/* Copyright 2011 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/software_panic.h b/include/software_panic.h index 6ac8701e78..d5eb8685b3 100644 --- a/include/software_panic.h +++ b/include/software_panic.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/spi.h b/include/spi.h index b5ad375f59..965f941fa3 100644 --- a/include/spi.h +++ b/include/spi.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/spi_flash.h b/include/spi_flash.h index 59f0f418b4..05fe8c098b 100644 --- a/include/spi_flash.h +++ b/include/spi_flash.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/spi_flash_reg.h b/include/spi_flash_reg.h index 46e8ee20d6..0d70d6982d 100644 --- a/include/spi_flash_reg.h +++ b/include/spi_flash_reg.h @@ -1,5 +1,5 @@ /* - * Copyright 2015 The Chromium OS Authors. All rights reserved. + * Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/spi_nor.h b/include/spi_nor.h index 8f1caeded6..9ffe3ebac9 100644 --- a/include/spi_nor.h +++ b/include/spi_nor.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/stack_trace.h b/include/stack_trace.h index 5364fc7249..90d20519b9 100644 --- a/include/stack_trace.h +++ b/include/stack_trace.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/stillness_detector.h b/include/stillness_detector.h index 65598d4d5c..79de2de79f 100644 --- a/include/stillness_detector.h +++ b/include/stillness_detector.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/switch.h b/include/switch.h index 243c1b9a57..97d428e356 100644 --- a/include/switch.h +++ b/include/switch.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/sysjump.h b/include/sysjump.h index 5e094e8ca8..7d86df2e61 100644 --- a/include/sysjump.h +++ b/include/sysjump.h @@ -1,5 +1,5 @@ /* - * Copyright 2019 The Chromium OS Authors. All rights reserved. + * Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/system.h b/include/system.h index ab9f6b6677..5bc3b1918c 100644 --- a/include/system.h +++ b/include/system.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/tablet_mode.h b/include/tablet_mode.h index 660a563069..e257fedc04 100644 --- a/include/tablet_mode.h +++ b/include/tablet_mode.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/task.h b/include/task.h index 1b5d83796c..5010900e59 100644 --- a/include/task.h +++ b/include/task.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/task_filter.h b/include/task_filter.h index 7bd224a577..50fc46ce7f 100644 --- a/include/task_filter.h +++ b/include/task_filter.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/task_id.h b/include/task_id.h index 431a1a9974..e617d820b5 100644 --- a/include/task_id.h +++ b/include/task_id.h @@ -1,4 +1,4 @@ -/* Copyright 2011 The Chromium OS Authors. All rights reserved. +/* Copyright 2011 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/temp_sensor.h b/include/temp_sensor.h index dc2ac17f35..088160d1c9 100644 --- a/include/temp_sensor.h +++ b/include/temp_sensor.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/temp_sensor_chip.h b/include/temp_sensor_chip.h index 4f9ddf0bc0..de9cb45452 100644 --- a/include/temp_sensor_chip.h +++ b/include/temp_sensor_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/test_util.h b/include/test_util.h index 7a2e7e59e1..8a7f29643d 100644 --- a/include/test_util.h +++ b/include/test_util.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/tests/enum_strings.h b/include/tests/enum_strings.h index ece2df362f..2ad0725f8f 100644 --- a/include/tests/enum_strings.h +++ b/include/tests/enum_strings.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/thermal.h b/include/thermal.h index 671d826805..33d0e27f51 100644 --- a/include/thermal.h +++ b/include/thermal.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/throttle_ap.h b/include/throttle_ap.h index a5e1a91a96..43a5f48e2c 100644 --- a/include/throttle_ap.h +++ b/include/throttle_ap.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/timer.h b/include/timer.h index 42da647dc9..7170a35056 100644 --- a/include/timer.h +++ b/include/timer.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/touchpad.h b/include/touchpad.h index 4e746d8dc1..8ae985318e 100644 --- a/include/touchpad.h +++ b/include/touchpad.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/trng.h b/include/trng.h index 969366ae8e..cf8326e5bf 100644 --- a/include/trng.h +++ b/include/trng.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/typec_control.h b/include/typec_control.h index 7705b75214..849a661490 100644 --- a/include/typec_control.h +++ b/include/typec_control.h @@ -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. */ diff --git a/include/uart.h b/include/uart.h index 786e551fc0..851b331fd2 100644 --- a/include/uart.h +++ b/include/uart.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/update_fw.h b/include/update_fw.h index 35c911911b..dc520c2eb9 100644 --- a/include/update_fw.h +++ b/include/update_fw.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/usb_api.h b/include/usb_api.h index 057475fe87..85e82d11e0 100644 --- a/include/usb_api.h +++ b/include/usb_api.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/usb_bb.h b/include/usb_bb.h index c73c6339e1..d28d4be441 100644 --- a/include/usb_bb.h +++ b/include/usb_bb.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/usb_charge.h b/include/usb_charge.h index 79496aa1d2..cd022d5f51 100644 --- a/include/usb_charge.h +++ b/include/usb_charge.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/usb_common.h b/include/usb_common.h index 4d770e1559..1e1d210f8c 100644 --- a/include/usb_common.h +++ b/include/usb_common.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/usb_console.h b/include/usb_console.h index 031ed9ce0e..cbc322ce6c 100644 --- a/include/usb_console.h +++ b/include/usb_console.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/usb_descriptor.h b/include/usb_descriptor.h index a3e9de3c6b..a40b858876 100644 --- a/include/usb_descriptor.h +++ b/include/usb_descriptor.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * @@ -185,7 +185,7 @@ struct usb_endpoint_descriptor { #define USB_CLASS_APP_SPEC 0xfe #define USB_CLASS_VENDOR_SPEC 0xff -/* USB Vendor ID assigned to Google Inc. */ +/* USB Vendor ID assigned to Google LLC */ #define USB_VID_GOOGLE 0x18d1 /* Google specific SubClass/Protocol assignments */ diff --git a/include/usb_dp_alt_mode.h b/include/usb_dp_alt_mode.h index c42a0377c6..83dc35b085 100644 --- a/include/usb_dp_alt_mode.h +++ b/include/usb_dp_alt_mode.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/usb_emsg.h b/include/usb_emsg.h index 7b418cefdc..181065156c 100644 --- a/include/usb_emsg.h +++ b/include/usb_emsg.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/usb_hid.h b/include/usb_hid.h index 6432b8ba05..0d49a9b38e 100644 --- a/include/usb_hid.h +++ b/include/usb_hid.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/usb_hid_touchpad.h b/include/usb_hid_touchpad.h index 67922cc8ff..23c16a0201 100644 --- a/include/usb_hid_touchpad.h +++ b/include/usb_hid_touchpad.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/usb_i2c.h b/include/usb_i2c.h index 6f7e7379ac..5c8bf8c874 100644 --- a/include/usb_i2c.h +++ b/include/usb_i2c.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/usb_mode.h b/include/usb_mode.h index 4333cc851e..4cf7710960 100644 --- a/include/usb_mode.h +++ b/include/usb_mode.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/usb_mux.h b/include/usb_mux.h index d5683cc847..d510a347d4 100644 --- a/include/usb_mux.h +++ b/include/usb_mux.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -128,9 +128,6 @@ struct usb_mux { /* Mux driver */ const struct usb_mux_driver *driver; - /* Linked list chain of secondary MUXes. NULL terminated */ - const struct usb_mux *next_mux; - /** * Optional method for tuning for USB mux during mux->driver->init(). * @@ -162,6 +159,15 @@ struct usb_mux { bool *ack_required); }; +/* Linked list chain of secondary MUXes. NULL terminated */ +struct usb_mux_chain { + /* Structure describing USB mux */ + const struct usb_mux *mux; + + /* Pointer to next mux */ + const struct usb_mux_chain *next; +}; + /* Supported USB mux drivers */ extern const struct usb_mux_driver amd_fp5_usb_mux_driver; extern const struct usb_mux_driver amd_fp6_usb_mux_driver; @@ -177,9 +183,9 @@ extern const struct usb_mux_driver virtual_usb_mux_driver; /* USB muxes present in system, ordered by PD port #, defined at board-level */ #ifdef CONFIG_USB_MUX_RUNTIME_CONFIG -extern struct usb_mux usb_muxes[]; +extern struct usb_mux_chain usb_muxes[]; #else -extern const struct usb_mux usb_muxes[]; +extern const struct usb_mux_chain usb_muxes[]; #endif /* Supported hpd_update functions */ diff --git a/include/usb_pd.h b/include/usb_pd.h index 65357a47f8..6e7a14bc31 100644 --- a/include/usb_pd.h +++ b/include/usb_pd.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -828,7 +828,7 @@ struct pd_cable { #define USB_SID_DISPLAYPORT 0xff01 #define USB_GOOGLE_TYPEC_URL "http://www.google.com/chrome/devices/typec" -/* USB Vendor ID assigned to Google Inc. */ +/* USB Vendor ID assigned to Google LLC */ #define USB_VID_GOOGLE 0x18d1 /* Other Vendor IDs */ diff --git a/include/usb_pd_dp_ufp.h b/include/usb_pd_dp_ufp.h index d4b89e1951..663f4f1d83 100644 --- a/include/usb_pd_dp_ufp.h +++ b/include/usb_pd_dp_ufp.h @@ -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. */ diff --git a/include/usb_pd_dpm.h b/include/usb_pd_dpm.h index c874f41e80..083ef216b6 100644 --- a/include/usb_pd_dpm.h +++ b/include/usb_pd_dpm.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/usb_pd_flags.h b/include/usb_pd_flags.h index 8e029bcb35..70e80379a6 100644 --- a/include/usb_pd_flags.h +++ b/include/usb_pd_flags.h @@ -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. */ diff --git a/include/usb_pd_pdo.h b/include/usb_pd_pdo.h index 4219c05183..9e75555b63 100644 --- a/include/usb_pd_pdo.h +++ b/include/usb_pd_pdo.h @@ -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. */ diff --git a/include/usb_pd_policy.h b/include/usb_pd_policy.h index bd8af9d5f0..a5675ded4e 100644 --- a/include/usb_pd_policy.h +++ b/include/usb_pd_policy.h @@ -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. */ diff --git a/include/usb_pd_tbt.h b/include/usb_pd_tbt.h index d44a76d59f..315fccb619 100644 --- a/include/usb_pd_tbt.h +++ b/include/usb_pd_tbt.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/usb_pd_tcpc.h b/include/usb_pd_tcpc.h index fa1e39b84c..a89030cdb7 100644 --- a/include/usb_pd_tcpc.h +++ b/include/usb_pd_tcpc.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/usb_pd_tcpm.h b/include/usb_pd_tcpm.h index 1de8c5121b..9a78754a0d 100644 --- a/include/usb_pd_tcpm.h +++ b/include/usb_pd_tcpm.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/usb_pd_timer.h b/include/usb_pd_timer.h index 1f3fabc237..439b30513d 100644 --- a/include/usb_pd_timer.h +++ b/include/usb_pd_timer.h @@ -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. */ diff --git a/include/usb_pd_vdo.h b/include/usb_pd_vdo.h index 94ab321361..ed1bc490f1 100644 --- a/include/usb_pd_vdo.h +++ b/include/usb_pd_vdo.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/usb_pe_sm.h b/include/usb_pe_sm.h index 4018f16322..a2e2a0f951 100644 --- a/include/usb_pe_sm.h +++ b/include/usb_pe_sm.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/usb_prl_sm.h b/include/usb_prl_sm.h index 5539287702..99b69f156f 100644 --- a/include/usb_prl_sm.h +++ b/include/usb_prl_sm.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/usb_sm.h b/include/usb_sm.h index 0688193453..d945ebd0ac 100644 --- a/include/usb_sm.h +++ b/include/usb_sm.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/usb_tbt_alt_mode.h b/include/usb_tbt_alt_mode.h index c445c013fb..378cd0ccce 100644 --- a/include/usb_tbt_alt_mode.h +++ b/include/usb_tbt_alt_mode.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/usb_tc_sm.h b/include/usb_tc_sm.h index 64676a79c0..ec6473edfd 100644 --- a/include/usb_tc_sm.h +++ b/include/usb_tc_sm.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/usbc_ocp.h b/include/usbc_ocp.h index d31ce57724..49da3651fb 100644 --- a/include/usbc_ocp.h +++ b/include/usbc_ocp.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/usbc_ppc.h b/include/usbc_ppc.h index 5377f922ed..09d7107faf 100644 --- a/include/usbc_ppc.h +++ b/include/usbc_ppc.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/util.h b/include/util.h index 45accfcf56..dc2e038705 100644 --- a/include/util.h +++ b/include/util.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/vb21_struct.h b/include/vb21_struct.h index b1e6bedd7f..c8b49ac05e 100644 --- a/include/vb21_struct.h +++ b/include/vb21_struct.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/include/vboot.h b/include/vboot.h index ce6a2388c0..55359e8044 100644 --- a/include/vboot.h +++ b/include/vboot.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/vboot_hash.h b/include/vboot_hash.h index 46ef3b3e9d..980a07df0b 100644 --- a/include/vboot_hash.h +++ b/include/vboot_hash.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/vec3.h b/include/vec3.h index 50d15943bd..ebdb358cc1 100644 --- a/include/vec3.h +++ b/include/vec3.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/vec4.h b/include/vec4.h index 0a75981c4d..e951c0542f 100644 --- a/include/vec4.h +++ b/include/vec4.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/virtual_battery.h b/include/virtual_battery.h index 689f54365b..2bd171f43c 100644 --- a/include/virtual_battery.h +++ b/include/virtual_battery.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/vstore.h b/include/vstore.h index 00b268652d..692d0e3012 100644 --- a/include/vstore.h +++ b/include/vstore.h @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/include/watchdog.h b/include/watchdog.h index fe17fbef6f..9bfed9c192 100644 --- a/include/watchdog.h +++ b/include/watchdog.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/wireless.h b/include/wireless.h index 95836d6da9..7232f92763 100644 --- a/include/wireless.h +++ b/include/wireless.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/include/write_protect.h b/include/write_protect.h index 019243dd61..8e09111974 100644 --- a/include/write_protect.h +++ b/include/write_protect.h @@ -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. */ diff --git a/power/alderlake_slg4bd44540.c b/power/alderlake_slg4bd44540.c index 0f2bd18d60..d55ef61531 100644 --- a/power/alderlake_slg4bd44540.c +++ b/power/alderlake_slg4bd44540.c @@ -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. */ diff --git a/power/amd_x86.c b/power/amd_x86.c index 3a407dfdf5..e5b44a313f 100644 --- a/power/amd_x86.c +++ b/power/amd_x86.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/power/apollolake.c b/power/apollolake.c index d6a9f75e89..20244abee9 100644 --- a/power/apollolake.c +++ b/power/apollolake.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/power/build.mk b/power/build.mk index ad1b3593cb..8ef237c154 100644 --- a/power/build.mk +++ b/power/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2013 The Chromium OS Authors. All rights reserved. +# Copyright 2013 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/power/cannonlake.c b/power/cannonlake.c index b4ffa94f41..b6f8d91e69 100644 --- a/power/cannonlake.c +++ b/power/cannonlake.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/power/cometlake-discrete.c b/power/cometlake-discrete.c index b731f56bda..85a08da2d2 100644 --- a/power/cometlake-discrete.c +++ b/power/cometlake-discrete.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/power/cometlake.c b/power/cometlake.c index 481e7dc51a..508ad22df4 100644 --- a/power/cometlake.c +++ b/power/cometlake.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/power/common.c b/power/common.c index 284e8cd933..24b9f314f4 100644 --- a/power/common.c +++ b/power/common.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/power/ec_driven.c b/power/ec_driven.c index ea0c4420ae..f0aee46c60 100644 --- a/power/ec_driven.c +++ b/power/ec_driven.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/power/falconlite.c b/power/falconlite.c index 0ddd310898..04c428f5be 100644 --- a/power/falconlite.c +++ b/power/falconlite.c @@ -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. */ diff --git a/power/host_sleep.c b/power/host_sleep.c index bba21706ee..b6f0de498e 100644 --- a/power/host_sleep.c +++ b/power/host_sleep.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/power/icelake.c b/power/icelake.c index b06c5c51a7..2fae215ab1 100644 --- a/power/icelake.c +++ b/power/icelake.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/power/intel_x86.c b/power/intel_x86.c index 4b489116d5..1c9f2ef8c8 100644 --- a/power/intel_x86.c +++ b/power/intel_x86.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/power/meteorlake.c b/power/meteorlake.c index 9a92768ad3..c13ed1694d 100644 --- a/power/meteorlake.c +++ b/power/meteorlake.c @@ -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. */ diff --git a/power/mt817x.c b/power/mt817x.c index 99f83d0808..a50e66b156 100644 --- a/power/mt817x.c +++ b/power/mt817x.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/power/mt8183.c b/power/mt8183.c index c0b6140ce1..eec8796427 100644 --- a/power/mt8183.c +++ b/power/mt8183.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/power/mt8186.c b/power/mt8186.c index 7cf3309f7c..b05700b599 100644 --- a/power/mt8186.c +++ b/power/mt8186.c @@ -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. */ diff --git a/power/mt8192.c b/power/mt8192.c index a942153a95..67dcc2fec6 100644 --- a/power/mt8192.c +++ b/power/mt8192.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/power/qcom.c b/power/qcom.c index 6a98350814..418f2b3136 100644 --- a/power/qcom.c +++ b/power/qcom.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -887,7 +887,7 @@ static void check_for_warm_reset_event(void) } } -void chipset_reset(enum chipset_shutdown_reason reason) +test_mockable void chipset_reset(enum chipset_shutdown_reason reason) { CPRINTS("%s(%d)", __func__, reason); report_ap_reset(reason); diff --git a/power/rk3288.c b/power/rk3288.c index ad56ef585e..e4e4ac9d69 100644 --- a/power/rk3288.c +++ b/power/rk3288.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/power/rk3399.c b/power/rk3399.c index 1c1172c8bf..ef4c0407b8 100644 --- a/power/rk3399.c +++ b/power/rk3399.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/power/sdm845.c b/power/sdm845.c index 42d082dbd6..aeed0d13d2 100644 --- a/power/sdm845.c +++ b/power/sdm845.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/power/skylake.c b/power/skylake.c index 883b6d0012..24adb56f86 100644 --- a/power/skylake.c +++ b/power/skylake.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -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. @@ -1,4 +1,4 @@ -# Copyright 2015 The Chromium OS Authors. All rights reserved. +# Copyright 2015 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/test/accel_cal.c b/test/accel_cal.c index 5c18ff0a91..840bed00c6 100644 --- a/test/accel_cal.c +++ b/test/accel_cal.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/accel_cal.tasklist b/test/accel_cal.tasklist index 0e3696c3f0..d3fcf83121 100644 --- a/test/accel_cal.tasklist +++ b/test/accel_cal.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/aes.c b/test/aes.c index 51acf51bd3..0fc220d997 100644 --- a/test/aes.c +++ b/test/aes.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/aes.tasklist b/test/aes.tasklist index 24870f2abb..86bc8aa2d5 100644 --- a/test/aes.tasklist +++ b/test/aes.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/base32.c b/test/base32.c index 27e8d8d059..3559d0dc84 100644 --- a/test/base32.c +++ b/test/base32.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/base32.tasklist b/test/base32.tasklist index 7150f17cbd..6373a70ab1 100644 --- a/test/base32.tasklist +++ b/test/base32.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/battery_get_params_smart.c b/test/battery_get_params_smart.c index 087a0b8d5c..42582df363 100644 --- a/test/battery_get_params_smart.c +++ b/test/battery_get_params_smart.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/battery_get_params_smart.tasklist b/test/battery_get_params_smart.tasklist index c2eb8159a9..efcc6883a5 100644 --- a/test/battery_get_params_smart.tasklist +++ b/test/battery_get_params_smart.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/bklight_lid.c b/test/bklight_lid.c index 992182f50d..52fc91f677 100644 --- a/test/bklight_lid.c +++ b/test/bklight_lid.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/bklight_lid.tasklist b/test/bklight_lid.tasklist index da0ab6211a..100cb6b5bd 100644 --- a/test/bklight_lid.tasklist +++ b/test/bklight_lid.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/bklight_passthru.c b/test/bklight_passthru.c index fbddc002ba..2bba2fe713 100644 --- a/test/bklight_passthru.c +++ b/test/bklight_passthru.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/bklight_passthru.tasklist b/test/bklight_passthru.tasklist index da0ab6211a..100cb6b5bd 100644 --- a/test/bklight_passthru.tasklist +++ b/test/bklight_passthru.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/body_detection.c b/test/body_detection.c index 489f79ea0f..dac2202eac 100644 --- a/test/body_detection.c +++ b/test/body_detection.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/body_detection.tasklist b/test/body_detection.tasklist index 95a30e9973..7926640d53 100644 --- a/test/body_detection.tasklist +++ b/test/body_detection.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/body_detection_data_literals.c b/test/body_detection_data_literals.c index c24430bdb0..cafe1d6ade 100644 --- a/test/body_detection_data_literals.c +++ b/test/body_detection_data_literals.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/body_detection_test_data.h b/test/body_detection_test_data.h index 4c22c3236f..913701455b 100644 --- a/test/body_detection_test_data.h +++ b/test/body_detection_test_data.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/build.mk b/test/build.mk index 1a29f8111c..9ab2cf0f7a 100644 --- a/test/build.mk +++ b/test/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2013 The Chromium OS Authors. All rights reserved. +# Copyright 2013 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/test/button.c b/test/button.c index 66aa491a61..c1acba7048 100644 --- a/test/button.c +++ b/test/button.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/button.tasklist b/test/button.tasklist index 5a8fb1bfbe..e2f8671c60 100644 --- a/test/button.tasklist +++ b/test/button.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/cbi.c b/test/cbi.c index a99774a913..ce01545644 100644 --- a/test/cbi.c +++ b/test/cbi.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/cbi.tasklist b/test/cbi.tasklist index 52c0d390ef..08d31e0102 100644 --- a/test/cbi.tasklist +++ b/test/cbi.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/cbi_wp.c b/test/cbi_wp.c index 3082b3bf54..625447dcb3 100644 --- a/test/cbi_wp.c +++ b/test/cbi_wp.c @@ -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. * diff --git a/test/cbi_wp.tasklist b/test/cbi_wp.tasklist index e54ea001bd..cd866d90e1 100644 --- a/test/cbi_wp.tasklist +++ b/test/cbi_wp.tasklist @@ -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. */ diff --git a/test/cec.c b/test/cec.c index d03131a4fe..7718b7b705 100644 --- a/test/cec.c +++ b/test/cec.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/cec.tasklist b/test/cec.tasklist index e7634958a9..df71bfc0f9 100644 --- a/test/cec.tasklist +++ b/test/cec.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/charge_manager.c b/test/charge_manager.c index fcf00a5f10..9a27a419d0 100644 --- a/test/charge_manager.c +++ b/test/charge_manager.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/charge_manager.tasklist b/test/charge_manager.tasklist index 1f6f139a63..8c05d700ee 100644 --- a/test/charge_manager.tasklist +++ b/test/charge_manager.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/charge_manager_drp_charging.tasklist b/test/charge_manager_drp_charging.tasklist index e39c934e44..7b9e5153c4 100644 --- a/test/charge_manager_drp_charging.tasklist +++ b/test/charge_manager_drp_charging.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/charge_ramp.c b/test/charge_ramp.c index 1cc0a90e42..a4d53b31d6 100644 --- a/test/charge_ramp.c +++ b/test/charge_ramp.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/charge_ramp.tasklist b/test/charge_ramp.tasklist index 1e18846c75..ff0b0b7fd0 100644 --- a/test/charge_ramp.tasklist +++ b/test/charge_ramp.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/chipset.c b/test/chipset.c index c2e915b941..6c9031e3f0 100644 --- a/test/chipset.c +++ b/test/chipset.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. * diff --git a/test/chipset.tasklist b/test/chipset.tasklist index ea773a46ce..45964224fe 100644 --- a/test/chipset.tasklist +++ b/test/chipset.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/test/compile_time_macros.c b/test/compile_time_macros.c index 326a5cd3bf..544da9e0d8 100644 --- a/test/compile_time_macros.c +++ b/test/compile_time_macros.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/compile_time_macros.tasklist b/test/compile_time_macros.tasklist index 5ffe662d01..2d4595f76a 100644 --- a/test/compile_time_macros.tasklist +++ b/test/compile_time_macros.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/console_edit.c b/test/console_edit.c index 7133d58c3a..3ffb79609a 100644 --- a/test/console_edit.c +++ b/test/console_edit.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/console_edit.tasklist b/test/console_edit.tasklist index da0ab6211a..100cb6b5bd 100644 --- a/test/console_edit.tasklist +++ b/test/console_edit.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/cortexm_fpu.c b/test/cortexm_fpu.c index 153fe3b789..c27edbaf40 100644 --- a/test/cortexm_fpu.c +++ b/test/cortexm_fpu.c @@ -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. */ diff --git a/test/cortexm_fpu.tasklist b/test/cortexm_fpu.tasklist index 7f9fb4dd8a..16313e9055 100644 --- a/test/cortexm_fpu.tasklist +++ b/test/cortexm_fpu.tasklist @@ -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. */ diff --git a/test/crc.c b/test/crc.c index c025dc3e9d..9943a7ac0c 100644 --- a/test/crc.c +++ b/test/crc.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/crc.tasklist b/test/crc.tasklist index f46a2eaa1d..bf2309064a 100644 --- a/test/crc.tasklist +++ b/test/crc.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/debug.c b/test/debug.c index 604eefa557..2c637ab725 100644 --- a/test/debug.c +++ b/test/debug.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/test/debug.tasklist b/test/debug.tasklist index 026dc51e90..959f62ef79 100644 --- a/test/debug.tasklist +++ b/test/debug.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/test/entropy.c b/test/entropy.c index ecd0ff9a30..8fbdb9147f 100644 --- a/test/entropy.c +++ b/test/entropy.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/entropy.tasklist b/test/entropy.tasklist index 80072bb620..329f9a3d28 100644 --- a/test/entropy.tasklist +++ b/test/entropy.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/extpwr_gpio.c b/test/extpwr_gpio.c index ec25eaf5ed..8a17a9580c 100644 --- a/test/extpwr_gpio.c +++ b/test/extpwr_gpio.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/extpwr_gpio.tasklist b/test/extpwr_gpio.tasklist index da0ab6211a..100cb6b5bd 100644 --- a/test/extpwr_gpio.tasklist +++ b/test/extpwr_gpio.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/fake_battery.c b/test/fake_battery.c index 4442300572..9dabbb31d9 100644 --- a/test/fake_battery.c +++ b/test/fake_battery.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/fake_usbc.c b/test/fake_usbc.c index e30afadd46..1d9c42a97a 100644 --- a/test/fake_usbc.c +++ b/test/fake_usbc.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/fan.c b/test/fan.c index a781c348d6..76c3208cc6 100644 --- a/test/fan.c +++ b/test/fan.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/fan.tasklist b/test/fan.tasklist index 25dcf124db..836bdd08ed 100644 --- a/test/fan.tasklist +++ b/test/fan.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/flash.c b/test/flash.c index c6bc6f711b..bd1b646f1f 100644 --- a/test/flash.c +++ b/test/flash.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/flash.tasklist b/test/flash.tasklist index dae84c1635..dbebe0dabb 100644 --- a/test/flash.tasklist +++ b/test/flash.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/flash_physical.c b/test/flash_physical.c index f59c709e86..8136f6b5e3 100644 --- a/test/flash_physical.c +++ b/test/flash_physical.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/flash_physical.tasklist b/test/flash_physical.tasklist index 51734f058d..a1f1a94e2d 100644 --- a/test/flash_physical.tasklist +++ b/test/flash_physical.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/flash_write_protect.c b/test/flash_write_protect.c index 8361338186..138aab24ff 100644 --- a/test/flash_write_protect.c +++ b/test/flash_write_protect.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/flash_write_protect.tasklist b/test/flash_write_protect.tasklist index 21619decc3..974106d6c2 100644 --- a/test/flash_write_protect.tasklist +++ b/test/flash_write_protect.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/float.tasklist b/test/float.tasklist index 9ad0114d8a..5216cd488c 100644 --- a/test/float.tasklist +++ b/test/float.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/fp.tasklist b/test/fp.tasklist index 9ad0114d8a..5216cd488c 100644 --- a/test/fp.tasklist +++ b/test/fp.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/fpsensor.c b/test/fpsensor.c index b7f3ee2c5a..588374d4db 100644 --- a/test/fpsensor.c +++ b/test/fpsensor.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/fpsensor.mocklist b/test/fpsensor.mocklist index 6052c108c2..3f2c60c583 100644 --- a/test/fpsensor.mocklist +++ b/test/fpsensor.mocklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/fpsensor.tasklist b/test/fpsensor.tasklist index ba137b7613..6c3ec6d65e 100644 --- a/test/fpsensor.tasklist +++ b/test/fpsensor.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/fpsensor_crypto.c b/test/fpsensor_crypto.c index df1806e108..9265a608b4 100644 --- a/test/fpsensor_crypto.c +++ b/test/fpsensor_crypto.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/fpsensor_hw.c b/test/fpsensor_hw.c index a0eb297b77..ff5b78ace2 100644 --- a/test/fpsensor_hw.c +++ b/test/fpsensor_hw.c @@ -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. */ diff --git a/test/fpsensor_hw.tasklist b/test/fpsensor_hw.tasklist index 299cf25390..35fa6f24bd 100644 --- a/test/fpsensor_hw.tasklist +++ b/test/fpsensor_hw.tasklist @@ -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. */ diff --git a/test/fpsensor_state.c b/test/fpsensor_state.c index 66936af7ca..0b61e1c2d4 100644 --- a/test/fpsensor_state.c +++ b/test/fpsensor_state.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -186,6 +186,197 @@ test_static int test_fp_set_maintenance_mode(void) return EC_SUCCESS; } +test_static int test_fp_command_read_match_secret_fail_fgr_less_than_zero(void) +{ + /* Create invalid param with fgr < 0 */ + struct ec_params_fp_read_match_secret test_match_secret = { + .fgr = -1, + }; + + TEST_ASSERT(test_send_host_command(EC_CMD_FP_READ_MATCH_SECRET, 0, + &test_match_secret, + sizeof(test_match_secret), NULL, + 0) == EC_RES_INVALID_PARAM); + + return EC_SUCCESS; +} + +test_static int test_fp_command_read_match_secret_fail_fgr_large_than_max(void) +{ + /* Create invalid param with fgr = FP_MAX_FINGER_COUNT */ + struct ec_params_fp_read_match_secret test_match_secret = { + .fgr = FP_MAX_FINGER_COUNT, + }; + + TEST_ASSERT(test_send_host_command(EC_CMD_FP_READ_MATCH_SECRET, 0, + &test_match_secret, + sizeof(test_match_secret), NULL, + 0) == EC_RES_INVALID_PARAM); + return EC_SUCCESS; +} + +test_static int test_fp_command_read_match_secret_fail_timeout(void) +{ + /* Create valid param with 0 <= fgr < 5 */ + struct ec_params_fp_read_match_secret test_match_secret_1 = { + .fgr = 1, + }; + + /* Disable positive secret match to create 0 deadline val */ + fp_disable_positive_match_secret(&positive_match_secret_state); + + TEST_ASSERT(positive_match_secret_state.deadline.val == 0); + + TEST_ASSERT(test_send_host_command(EC_CMD_FP_READ_MATCH_SECRET, 0, + &test_match_secret_1, + sizeof(test_match_secret_1), NULL, + 0) == EC_RES_TIMEOUT); + + return EC_SUCCESS; +} + +test_static int test_fp_command_read_match_secret_unmatched_fgr(void) +{ + /* Create valid param with 0 <= fgr < 5 */ + uint16_t matched_fgr = 1; + uint16_t unmatched_fgr = 2; + struct ec_params_fp_read_match_secret test_match_secret_1 = { + .fgr = matched_fgr, + }; + /* Create positive secret match state with valid deadline value, + * readable state, and wrong template matched + */ + struct positive_match_secret_state test_state = { + .deadline.val = 5000000, + .readable = true, + .template_matched = unmatched_fgr, + }; + + /* Test for the wrong matched finger state */ + positive_match_secret_state = test_state; + + TEST_ASSERT(test_send_host_command(EC_CMD_FP_READ_MATCH_SECRET, 0, + &test_match_secret_1, + sizeof(test_match_secret_1), NULL, + 0) == EC_RES_ACCESS_DENIED); + + return EC_SUCCESS; +} + +test_static int test_fp_command_read_match_secret_unreadable_state(void) +{ + /* Create valid param with 0 <= fgr < 5 */ + uint16_t matched_fgr = 1; + struct ec_params_fp_read_match_secret test_match_secret_1 = { + .fgr = matched_fgr, + }; + /* + * Create positive secret match state with valid deadline value , + * unreadable state, and correct matched template + */ + struct positive_match_secret_state test_state = { + .deadline.val = 5000000, + .readable = false, + .template_matched = matched_fgr, + }; + + /* Test for the unreadable state */ + positive_match_secret_state = test_state; + + TEST_ASSERT(test_send_host_command(EC_CMD_FP_READ_MATCH_SECRET, 0, + &test_match_secret_1, + sizeof(test_match_secret_1), NULL, + 0) == EC_RES_ACCESS_DENIED); + + return EC_SUCCESS; +} + +test_static int test_fp_command_read_match_secret_derive_fail(void) +{ + struct ec_response_fp_read_match_secret response = { 0 }; + /* Create valid param with 0 <= fgr < 5 */ + uint16_t matched_fgr = 1; + struct ec_params_fp_read_match_secret test_match_secret_1 = { + .fgr = matched_fgr, + }; + /* Create positive secret match state with valid deadline value, + * readable state, and correct template matched + */ + struct positive_match_secret_state test_state_1 = { + .deadline.val = 5000000, + .readable = true, + .template_matched = matched_fgr, + }; + positive_match_secret_state = test_state_1; + /* Set fp_positive_match_salt to the trivial value */ + memcpy(fp_positive_match_salt, trivial_fp_positive_match_salt, + sizeof(trivial_fp_positive_match_salt)); + + /* Test with the correct matched finger state and a trivial + * fp_positive_match_salt + */ + TEST_ASSERT(test_send_host_command( + EC_CMD_FP_READ_MATCH_SECRET, 0, + &test_match_secret_1, sizeof(test_match_secret_1), + &response, sizeof(response)) == EC_RES_ERROR); + return EC_SUCCESS; +} + +test_static int test_fp_command_read_match_secret_derive_succeed(void) +{ + struct ec_response_fp_read_match_secret response = { 0 }; + /* Create valid param with 0 <= fgr < 5 */ + uint16_t matched_fgr = 1; + struct ec_params_fp_read_match_secret test_match_secret_1 = { + .fgr = matched_fgr, + }; + + /* Expected positive_match_secret same as in test/fpsensor_crypto.c*/ + static const uint8_t + expected_positive_match_secret_for_empty_user_id[] = { + 0x8d, 0xc4, 0x5b, 0xdf, 0x55, 0x1e, 0xa8, 0x72, + 0xd6, 0xdd, 0xa1, 0x4c, 0xb8, 0xa1, 0x76, 0x2b, + 0xde, 0x38, 0xd5, 0x03, 0xce, 0xe4, 0x74, 0x51, + 0x63, 0x6c, 0x6a, 0x26, 0xa9, 0xb7, 0xfa, 0x68, + }; + /* Create positive secret match state with valid deadline value, + * readable state, and correct template matched + */ + struct positive_match_secret_state test_state_1 = { + .deadline.val = 5000000, + .readable = true, + .template_matched = matched_fgr, + }; + positive_match_secret_state = test_state_1; + /* Set fp_positive_match_salt to the trivial value */ + memcpy(fp_positive_match_salt, default_fake_fp_positive_match_salt, + sizeof(default_fake_fp_positive_match_salt)); + + TEST_ASSERT_ARRAY_EQ( + (uint8_t const *)fp_positive_match_salt, + (uint8_t const *)default_fake_fp_positive_match_salt, + sizeof(default_fake_fp_positive_match_salt)); + + /* Initialize an empty user_id to compare positive_match_secret */ + memset(user_id, 0, sizeof(user_id)); + + TEST_ASSERT(fp_tpm_seed_is_set()); + /* Test with the correct matched finger state and the default fake + * fp_positive_match_salt + */ + TEST_ASSERT(test_send_host_command( + EC_CMD_FP_READ_MATCH_SECRET, 0, + &test_match_secret_1, sizeof(test_match_secret_1), + &response, sizeof(response)) == EC_SUCCESS); + + TEST_ASSERT_ARRAY_EQ( + response.positive_match_secret, + expected_positive_match_secret_for_empty_user_id, + sizeof(expected_positive_match_secret_for_empty_user_id)); + + return EC_SUCCESS; +} + void run_test(int argc, const char **argv) { RUN_TEST(test_fp_enc_status_valid_flags); @@ -194,5 +385,12 @@ void run_test(int argc, const char **argv) RUN_TEST(test_set_fp_tpm_seed_again); RUN_TEST(test_fp_set_sensor_mode); RUN_TEST(test_fp_set_maintenance_mode); + RUN_TEST(test_fp_command_read_match_secret_fail_fgr_less_than_zero); + RUN_TEST(test_fp_command_read_match_secret_fail_fgr_large_than_max); + RUN_TEST(test_fp_command_read_match_secret_fail_timeout); + RUN_TEST(test_fp_command_read_match_secret_unmatched_fgr); + RUN_TEST(test_fp_command_read_match_secret_unreadable_state); + RUN_TEST(test_fp_command_read_match_secret_derive_fail); + RUN_TEST(test_fp_command_read_match_secret_derive_succeed); test_print_result(); } diff --git a/test/genvif/Makefile b/test/genvif/Makefile index 566b6bb042..a41e8308cc 100644 --- a/test/genvif/Makefile +++ b/test/genvif/Makefile @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/test/genvif/genvif.sh b/test/genvif/genvif.sh index 4a275ed2c1..b54d1de9eb 100755 --- a/test/genvif/genvif.sh +++ b/test/genvif/genvif.sh @@ -1,5 +1,5 @@ #!/bin/bash -e -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/test/genvif/src/atomic.h b/test/genvif/src/atomic.h index f2fa112e81..d58e57a1c2 100644 --- a/test/genvif/src/atomic.h +++ b/test/genvif/src/atomic.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/genvif/src/board.h b/test/genvif/src/board.h index f4037f761c..c596b833e0 100644 --- a/test/genvif/src/board.h +++ b/test/genvif/src/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/genvif/src/config_chip.h b/test/genvif/src/config_chip.h index f2fa112e81..d58e57a1c2 100644 --- a/test/genvif/src/config_chip.h +++ b/test/genvif/src/config_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/genvif/src/fuzz_config.h b/test/genvif/src/fuzz_config.h index f2fa112e81..d58e57a1c2 100644 --- a/test/genvif/src/fuzz_config.h +++ b/test/genvif/src/fuzz_config.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/genvif/src/gpio.inc b/test/genvif/src/gpio.inc index 6b96e08645..65e3066695 100644 --- a/test/genvif/src/gpio.inc +++ b/test/genvif/src/gpio.inc @@ -1,6 +1,6 @@ /* -*- mode:c -*- * - * 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. */ diff --git a/test/genvif/src/helper.c b/test/genvif/src/helper.c index 61360ea210..f3b5d97317 100644 --- a/test/genvif/src/helper.c +++ b/test/genvif/src/helper.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/genvif/src/test_config.h b/test/genvif/src/test_config.h index f2fa112e81..d58e57a1c2 100644 --- a/test/genvif/src/test_config.h +++ b/test/genvif/src/test_config.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/genvif/src/timer.h b/test/genvif/src/timer.h index f2fa112e81..d58e57a1c2 100644 --- a/test/genvif/src/timer.h +++ b/test/genvif/src/timer.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/gyro_cal.c b/test/gyro_cal.c index 64233086f0..c8e8d30589 100644 --- a/test/gyro_cal.c +++ b/test/gyro_cal.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/gyro_cal.tasklist b/test/gyro_cal.tasklist index 7d28eb5b64..7209a7441e 100644 --- a/test/gyro_cal.tasklist +++ b/test/gyro_cal.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/gyro_cal_init_for_test.c b/test/gyro_cal_init_for_test.c index 3963e5a207..0ba1a65e6b 100644 --- a/test/gyro_cal_init_for_test.c +++ b/test/gyro_cal_init_for_test.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/gyro_cal_init_for_test.h b/test/gyro_cal_init_for_test.h index e32040bab9..8af51b8e10 100644 --- a/test/gyro_cal_init_for_test.h +++ b/test/gyro_cal_init_for_test.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/hooks.c b/test/hooks.c index 00731772b0..0913f257b3 100644 --- a/test/hooks.c +++ b/test/hooks.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/hooks.tasklist b/test/hooks.tasklist index da0ab6211a..100cb6b5bd 100644 --- a/test/hooks.tasklist +++ b/test/hooks.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/host_command.c b/test/host_command.c index b50c405aab..e88ddc852c 100644 --- a/test/host_command.c +++ b/test/host_command.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/host_command.tasklist b/test/host_command.tasklist index da0ab6211a..100cb6b5bd 100644 --- a/test/host_command.tasklist +++ b/test/host_command.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/i2c_bitbang.c b/test/i2c_bitbang.c index e77bc3a6fb..6916110b5c 100644 --- a/test/i2c_bitbang.c +++ b/test/i2c_bitbang.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/i2c_bitbang.tasklist b/test/i2c_bitbang.tasklist index 9fc1a80f4d..844ddb6c10 100644 --- a/test/i2c_bitbang.tasklist +++ b/test/i2c_bitbang.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/inductive_charging.c b/test/inductive_charging.c index f5a81be4f1..a5b23d1d8c 100644 --- a/test/inductive_charging.c +++ b/test/inductive_charging.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/inductive_charging.tasklist b/test/inductive_charging.tasklist index f5c894ccaf..dbe560d4aa 100644 --- a/test/inductive_charging.tasklist +++ b/test/inductive_charging.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/interrupt.c b/test/interrupt.c index 1e51770189..efd8b47a34 100644 --- a/test/interrupt.c +++ b/test/interrupt.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/interrupt.tasklist b/test/interrupt.tasklist index da0ab6211a..100cb6b5bd 100644 --- a/test/interrupt.tasklist +++ b/test/interrupt.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/irq_locking.c b/test/irq_locking.c index 96a615b560..c46b94e8c5 100644 --- a/test/irq_locking.c +++ b/test/irq_locking.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/irq_locking.tasklist b/test/irq_locking.tasklist index 2d7fbb0541..5659b9033d 100644 --- a/test/irq_locking.tasklist +++ b/test/irq_locking.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/is_enabled.c b/test/is_enabled.c index 943f6bc7fc..d54f709bf9 100644 --- a/test/is_enabled.c +++ b/test/is_enabled.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/is_enabled.tasklist b/test/is_enabled.tasklist index 5ffe662d01..2d4595f76a 100644 --- a/test/is_enabled.tasklist +++ b/test/is_enabled.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/is_enabled_error.c b/test/is_enabled_error.c index 413f19308b..b5d6994c4d 100644 --- a/test/is_enabled_error.c +++ b/test/is_enabled_error.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/is_enabled_error.sh b/test/is_enabled_error.sh index 1e5407f31f..c99c4f0e26 100644 --- a/test/is_enabled_error.sh +++ b/test/is_enabled_error.sh @@ -1,5 +1,5 @@ #!/bin/bash -e -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/test/is_enabled_error.tasklist b/test/is_enabled_error.tasklist index 5ffe662d01..2d4595f76a 100644 --- a/test/is_enabled_error.tasklist +++ b/test/is_enabled_error.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/kasa.c b/test/kasa.c index a10717be7d..23968faf7c 100644 --- a/test/kasa.c +++ b/test/kasa.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/kasa.tasklist b/test/kasa.tasklist index 0e3696c3f0..d3fcf83121 100644 --- a/test/kasa.tasklist +++ b/test/kasa.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/kb_8042.c b/test/kb_8042.c index e660d3753c..e7d7690cff 100644 --- a/test/kb_8042.c +++ b/test/kb_8042.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/kb_8042.tasklist b/test/kb_8042.tasklist index 8cd35e6145..4d74e3c269 100644 --- a/test/kb_8042.tasklist +++ b/test/kb_8042.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/kb_mkbp.c b/test/kb_mkbp.c index 3e11559cf5..0bfd1e5a15 100644 --- a/test/kb_mkbp.c +++ b/test/kb_mkbp.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/kb_mkbp.tasklist b/test/kb_mkbp.tasklist index d84996c71c..a255779878 100644 --- a/test/kb_mkbp.tasklist +++ b/test/kb_mkbp.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/kb_scan.c b/test/kb_scan.c index 99361c6c8e..82693ff525 100644 --- a/test/kb_scan.c +++ b/test/kb_scan.c @@ -1,7 +1,7 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. - * Copyright 2013 Google Inc. + * Copyright 2013 Google LLC * * Tests for keyboard scan deghosting and debouncing. */ diff --git a/test/kb_scan.tasklist b/test/kb_scan.tasklist index ded03b1112..3cac36bb23 100644 --- a/test/kb_scan.tasklist +++ b/test/kb_scan.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/legacy_nvmem_dump.h b/test/legacy_nvmem_dump.h index 25e69fe716..401694d9d6 100644 --- a/test/legacy_nvmem_dump.h +++ b/test/legacy_nvmem_dump.h @@ -1,5 +1,5 @@ /* - * Copyright 2016 The Chromium OS Authors. All rights reserved. + * Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/lid_sw.c b/test/lid_sw.c index 320e63fabb..123676a1fa 100644 --- a/test/lid_sw.c +++ b/test/lid_sw.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/lid_sw.tasklist b/test/lid_sw.tasklist index da0ab6211a..100cb6b5bd 100644 --- a/test/lid_sw.tasklist +++ b/test/lid_sw.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/lightbar.c b/test/lightbar.c index ba0fb1b2c4..90400d1cf5 100644 --- a/test/lightbar.c +++ b/test/lightbar.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/lightbar.tasklist b/test/lightbar.tasklist index b5e714765d..78c08cc652 100644 --- a/test/lightbar.tasklist +++ b/test/lightbar.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/mag_cal.c b/test/mag_cal.c index 7255e7d062..245bad786c 100644 --- a/test/mag_cal.c +++ b/test/mag_cal.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/mag_cal.tasklist b/test/mag_cal.tasklist index ff715f69cd..a8b04538aa 100644 --- a/test/mag_cal.tasklist +++ b/test/mag_cal.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/math_util.c b/test/math_util.c index 558cb3e40a..1ee9b1484b 100644 --- a/test/math_util.c +++ b/test/math_util.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/math_util.tasklist b/test/math_util.tasklist index f5c894ccaf..dbe560d4aa 100644 --- a/test/math_util.tasklist +++ b/test/math_util.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/motion_angle.c b/test/motion_angle.c index efd00d7226..3f206de078 100644 --- a/test/motion_angle.c +++ b/test/motion_angle.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/motion_angle.tasklist b/test/motion_angle.tasklist index 0b774ebb4a..6c99c23eea 100644 --- a/test/motion_angle.tasklist +++ b/test/motion_angle.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/motion_angle_data_literals.c b/test/motion_angle_data_literals.c index c6ec979a7f..d22a8230a2 100644 --- a/test/motion_angle_data_literals.c +++ b/test/motion_angle_data_literals.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/motion_angle_data_literals_tablet.c b/test/motion_angle_data_literals_tablet.c index 76ed6186c4..f5b00f5fba 100644 --- a/test/motion_angle_data_literals_tablet.c +++ b/test/motion_angle_data_literals_tablet.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/motion_angle_tablet.c b/test/motion_angle_tablet.c index 9ec68eb82c..2c0c15c828 100644 --- a/test/motion_angle_tablet.c +++ b/test/motion_angle_tablet.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/motion_angle_tablet.tasklist b/test/motion_angle_tablet.tasklist index 0b774ebb4a..6c99c23eea 100644 --- a/test/motion_angle_tablet.tasklist +++ b/test/motion_angle_tablet.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/motion_common.c b/test/motion_common.c index a63683ce29..e274b206a9 100644 --- a/test/motion_common.c +++ b/test/motion_common.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/motion_common.h b/test/motion_common.h index 313c95bfae..71e23cd9da 100644 --- a/test/motion_common.h +++ b/test/motion_common.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/motion_lid.c b/test/motion_lid.c index 2c386b0a91..39b83ce6fc 100644 --- a/test/motion_lid.c +++ b/test/motion_lid.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/motion_lid.tasklist b/test/motion_lid.tasklist index 0b774ebb4a..6c99c23eea 100644 --- a/test/motion_lid.tasklist +++ b/test/motion_lid.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/motion_sense_fifo.c b/test/motion_sense_fifo.c index 647c255ba1..c93e67951b 100644 --- a/test/motion_sense_fifo.c +++ b/test/motion_sense_fifo.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/motion_sense_fifo.tasklist b/test/motion_sense_fifo.tasklist index 9fc1a80f4d..844ddb6c10 100644 --- a/test/motion_sense_fifo.tasklist +++ b/test/motion_sense_fifo.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/mpu.c b/test/mpu.c index bac6af09c5..2193c0c617 100644 --- a/test/mpu.c +++ b/test/mpu.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/mpu.tasklist b/test/mpu.tasklist index 51734f058d..a1f1a94e2d 100644 --- a/test/mpu.tasklist +++ b/test/mpu.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/mutex.c b/test/mutex.c index 0ea8563e2e..a03e504a0a 100644 --- a/test/mutex.c +++ b/test/mutex.c @@ -1,7 +1,7 @@ -/* Copyright 2011 The Chromium OS Authors. All rights reserved. +/* Copyright 2011 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. - * Copyright 2011 Google Inc. + * Copyright 2011 Google LLC * * Tasks for mutexes basic tests. */ diff --git a/test/mutex.tasklist b/test/mutex.tasklist index 8e3d08ddc2..46cdad7fa1 100644 --- a/test/mutex.tasklist +++ b/test/mutex.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/newton_fit.c b/test/newton_fit.c index 3a82c56085..07c35aad2a 100644 --- a/test/newton_fit.c +++ b/test/newton_fit.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/newton_fit.tasklist b/test/newton_fit.tasklist index 5ffe662d01..2d4595f76a 100644 --- a/test/newton_fit.tasklist +++ b/test/newton_fit.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/nvidia_gpu.c b/test/nvidia_gpu.c index 22f31be8d0..d6086cc8c4 100644 --- a/test/nvidia_gpu.c +++ b/test/nvidia_gpu.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. * diff --git a/test/nvidia_gpu.tasklist b/test/nvidia_gpu.tasklist index b16ca2ffc0..8918b4ee2f 100644 --- a/test/nvidia_gpu.tasklist +++ b/test/nvidia_gpu.tasklist @@ -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. */ diff --git a/test/online_calibration.c b/test/online_calibration.c index 1923210117..cecb543eef 100644 --- a/test/online_calibration.c +++ b/test/online_calibration.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/online_calibration.tasklist b/test/online_calibration.tasklist index 5b67239ff8..a9ba96907d 100644 --- a/test/online_calibration.tasklist +++ b/test/online_calibration.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/online_calibration_spoof.c b/test/online_calibration_spoof.c index 64741d0f04..44a3b812d9 100644 --- a/test/online_calibration_spoof.c +++ b/test/online_calibration_spoof.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/online_calibration_spoof.tasklist b/test/online_calibration_spoof.tasklist index 7d28eb5b64..7209a7441e 100644 --- a/test/online_calibration_spoof.tasklist +++ b/test/online_calibration_spoof.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/panic_data.c b/test/panic_data.c index ef902e9141..334b766dfc 100644 --- a/test/panic_data.c +++ b/test/panic_data.c @@ -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. */ diff --git a/test/panic_data.tasklist b/test/panic_data.tasklist index 6a2f1834ca..273a9664c0 100644 --- a/test/panic_data.tasklist +++ b/test/panic_data.tasklist @@ -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. */ diff --git a/test/pingpong.c b/test/pingpong.c index 9150d23755..cb8c5af8c9 100644 --- a/test/pingpong.c +++ b/test/pingpong.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/pingpong.tasklist b/test/pingpong.tasklist index 760d204b67..7db2ce33a6 100644 --- a/test/pingpong.tasklist +++ b/test/pingpong.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/power_button.c b/test/power_button.c index 536ea6d595..dc64e607fa 100644 --- a/test/power_button.c +++ b/test/power_button.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/power_button.tasklist b/test/power_button.tasklist index da0ab6211a..100cb6b5bd 100644 --- a/test/power_button.tasklist +++ b/test/power_button.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/powerdemo.c b/test/powerdemo.c index a3aa052e8f..7a4f0c5ccb 100644 --- a/test/powerdemo.c +++ b/test/powerdemo.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/powerdemo.h b/test/powerdemo.h index 0b77cc0a0a..a8ee854acb 100644 --- a/test/powerdemo.h +++ b/test/powerdemo.h @@ -1,4 +1,4 @@ -/* Copyright 2011 The Chromium OS Authors. All rights reserved. +/* Copyright 2011 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/powerdemo.tasklist b/test/powerdemo.tasklist index a4fff562e3..3824306072 100644 --- a/test/powerdemo.tasklist +++ b/test/powerdemo.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/printf.c b/test/printf.c index ef9229688c..728aa9b4a8 100644 --- a/test/printf.c +++ b/test/printf.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/printf.tasklist b/test/printf.tasklist index 9fc1a80f4d..844ddb6c10 100644 --- a/test/printf.tasklist +++ b/test/printf.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/queue.c b/test/queue.c index ecbfa9dec4..c21e00a050 100644 --- a/test/queue.c +++ b/test/queue.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/queue.tasklist b/test/queue.tasklist index da0ab6211a..100cb6b5bd 100644 --- a/test/queue.tasklist +++ b/test/queue.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/rgb_keyboard.c b/test/rgb_keyboard.c index 9d5d8e6c82..d32215e649 100644 --- a/test/rgb_keyboard.c +++ b/test/rgb_keyboard.c @@ -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. * diff --git a/test/rgb_keyboard.tasklist b/test/rgb_keyboard.tasklist index fb85751609..9b25deacfb 100644 --- a/test/rgb_keyboard.tasklist +++ b/test/rgb_keyboard.tasklist @@ -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. */ diff --git a/test/rollback.c b/test/rollback.c index da2e194202..e2c1070ef4 100644 --- a/test/rollback.c +++ b/test/rollback.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/rollback.tasklist b/test/rollback.tasklist index 51734f058d..a1f1a94e2d 100644 --- a/test/rollback.tasklist +++ b/test/rollback.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/rollback_entropy.c b/test/rollback_entropy.c index 88626e16c2..50a8cb4701 100644 --- a/test/rollback_entropy.c +++ b/test/rollback_entropy.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/rollback_entropy.tasklist b/test/rollback_entropy.tasklist index 51734f058d..a1f1a94e2d 100644 --- a/test/rollback_entropy.tasklist +++ b/test/rollback_entropy.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/rsa.c b/test/rsa.c index 85a616d2ba..2774e9edb4 100644 --- a/test/rsa.c +++ b/test/rsa.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/rsa.tasklist b/test/rsa.tasklist index f46a2eaa1d..bf2309064a 100644 --- a/test/rsa.tasklist +++ b/test/rsa.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/rsa2048-3.h b/test/rsa2048-3.h index a09f94ab87..17b3c8989a 100644 --- a/test/rsa2048-3.h +++ b/test/rsa2048-3.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/rsa2048-F4.h b/test/rsa2048-F4.h index 4e698500bf..08b8f70155 100644 --- a/test/rsa2048-F4.h +++ b/test/rsa2048-F4.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/rsa3072-3.h b/test/rsa3072-3.h index c407a4ed2b..3ad93fafe8 100644 --- a/test/rsa3072-3.h +++ b/test/rsa3072-3.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/rtc.c b/test/rtc.c index c9c5ed2811..7c38c4fa6d 100644 --- a/test/rtc.c +++ b/test/rtc.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/rtc.tasklist b/test/rtc.tasklist index 80072bb620..329f9a3d28 100644 --- a/test/rtc.tasklist +++ b/test/rtc.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/run_device_tests.py b/test/run_device_tests.py index 69605632fc..9b762fc1d6 100755 --- a/test/run_device_tests.py +++ b/test/run_device_tests.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/test/sbs_charging_v2.c b/test/sbs_charging_v2.c index 20d06368d0..1144a93368 100644 --- a/test/sbs_charging_v2.c +++ b/test/sbs_charging_v2.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/sbs_charging_v2.tasklist b/test/sbs_charging_v2.tasklist index 3895762986..202541188f 100644 --- a/test/sbs_charging_v2.tasklist +++ b/test/sbs_charging_v2.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/scratchpad.c b/test/scratchpad.c index 8bc68de91b..c023f1dc72 100644 --- a/test/scratchpad.c +++ b/test/scratchpad.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/scratchpad.tasklist b/test/scratchpad.tasklist index 51734f058d..a1f1a94e2d 100644 --- a/test/scratchpad.tasklist +++ b/test/scratchpad.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/sha256.c b/test/sha256.c index 14557bd97d..4b5326d189 100644 --- a/test/sha256.c +++ b/test/sha256.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/sha256.tasklist b/test/sha256.tasklist index 80072bb620..329f9a3d28 100644 --- a/test/sha256.tasklist +++ b/test/sha256.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/shmalloc.c b/test/shmalloc.c index 340ca70ce6..899876ab43 100644 --- a/test/shmalloc.c +++ b/test/shmalloc.c @@ -1,5 +1,5 @@ /* - * Copyright 2016 The Chromium OS Authors. All rights reserved. + * Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/shmalloc.tasklist b/test/shmalloc.tasklist index a8ef01a489..1413e373b1 100644 --- a/test/shmalloc.tasklist +++ b/test/shmalloc.tasklist @@ -1,5 +1,5 @@ /* - * Copyright 2016 The Chromium OS Authors. All rights reserved. + * Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/static_if.c b/test/static_if.c index 63b26bdf25..9e8b9db465 100644 --- a/test/static_if.c +++ b/test/static_if.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/static_if.tasklist b/test/static_if.tasklist index 5ffe662d01..2d4595f76a 100644 --- a/test/static_if.tasklist +++ b/test/static_if.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/static_if_error.c b/test/static_if_error.c index e4f2df6eec..99765ece99 100644 --- a/test/static_if_error.c +++ b/test/static_if_error.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/static_if_error.sh b/test/static_if_error.sh index efc7cd3e1e..ef17780f4c 100644 --- a/test/static_if_error.sh +++ b/test/static_if_error.sh @@ -1,5 +1,5 @@ #!/bin/bash -e -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/test/static_if_error.tasklist b/test/static_if_error.tasklist index 5ffe662d01..2d4595f76a 100644 --- a/test/static_if_error.tasklist +++ b/test/static_if_error.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/stdlib.c b/test/stdlib.c index 189581d797..efff64829d 100644 --- a/test/stdlib.c +++ b/test/stdlib.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. * diff --git a/test/stdlib.tasklist b/test/stdlib.tasklist index 8131fdd3a2..1154b1ae8b 100644 --- a/test/stdlib.tasklist +++ b/test/stdlib.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/test/stillness_detector.c b/test/stillness_detector.c index c1c0c23a58..8858d751d7 100644 --- a/test/stillness_detector.c +++ b/test/stillness_detector.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/stillness_detector.tasklist b/test/stillness_detector.tasklist index 5ffe662d01..2d4595f76a 100644 --- a/test/stillness_detector.tasklist +++ b/test/stillness_detector.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/stm32f_rtc.c b/test/stm32f_rtc.c index d820662526..b055398b28 100644 --- a/test/stm32f_rtc.c +++ b/test/stm32f_rtc.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/stm32f_rtc.tasklist b/test/stm32f_rtc.tasklist index 51734f058d..a1f1a94e2d 100644 --- a/test/stm32f_rtc.tasklist +++ b/test/stm32f_rtc.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/stress.c b/test/stress.c index becfffe9cb..f497644602 100644 --- a/test/stress.c +++ b/test/stress.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/stress.tasklist b/test/stress.tasklist index da0ab6211a..100cb6b5bd 100644 --- a/test/stress.tasklist +++ b/test/stress.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/system.c b/test/system.c index 0fed44900a..d123bd5cee 100644 --- a/test/system.c +++ b/test/system.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/system.tasklist b/test/system.tasklist index 4e455a7ea3..6967ec1095 100644 --- a/test/system.tasklist +++ b/test/system.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/system_is_locked.c b/test/system_is_locked.c index 9c35e206be..47a7977601 100644 --- a/test/system_is_locked.c +++ b/test/system_is_locked.c @@ -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. */ diff --git a/test/system_is_locked.tasklist b/test/system_is_locked.tasklist index 6a2f1834ca..273a9664c0 100644 --- a/test/system_is_locked.tasklist +++ b/test/system_is_locked.tasklist @@ -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. */ diff --git a/test/test_config.h b/test/test_config.h index 004cfe315d..d72a078434 100644 --- a/test/test_config.h +++ b/test/test_config.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/thermal.c b/test/thermal.c index 6971eea2aa..a70137238d 100644 --- a/test/thermal.c +++ b/test/thermal.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/thermal.tasklist b/test/thermal.tasklist index d22719d1fb..7494e757cf 100644 --- a/test/thermal.tasklist +++ b/test/thermal.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/timer_calib.c b/test/timer_calib.c index 87eeeb0bb0..9a58237e2f 100644 --- a/test/timer_calib.c +++ b/test/timer_calib.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/timer_calib.py b/test/timer_calib.py index 0de0d6b4e7..2b7c33060e 100644 --- a/test/timer_calib.py +++ b/test/timer_calib.py @@ -1,4 +1,4 @@ -# Copyright 2011 The Chromium OS Authors. All rights reserved. +# Copyright 2011 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/test/timer_calib.tasklist b/test/timer_calib.tasklist index 51f5beb6c1..22a63c247e 100644 --- a/test/timer_calib.tasklist +++ b/test/timer_calib.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/timer_dos.c b/test/timer_dos.c index 69b7888c46..ef9cc3ef0c 100644 --- a/test/timer_dos.c +++ b/test/timer_dos.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/timer_dos.tasklist b/test/timer_dos.tasklist index 4da3419f77..5bd77b0580 100644 --- a/test/timer_dos.tasklist +++ b/test/timer_dos.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/timer_jump.py b/test/timer_jump.py index 2801c3b3fa..a4350cecdf 100644 --- a/test/timer_jump.py +++ b/test/timer_jump.py @@ -1,4 +1,4 @@ -# Copyright 2012 The Chromium OS Authors. All rights reserved. +# Copyright 2012 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/test/timer_jump.tasklist b/test/timer_jump.tasklist index da0ab6211a..100cb6b5bd 100644 --- a/test/timer_jump.tasklist +++ b/test/timer_jump.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/uptime.c b/test/uptime.c index d1edc34f5d..0b6c9b56e6 100644 --- a/test/uptime.c +++ b/test/uptime.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/uptime.tasklist b/test/uptime.tasklist index 9bf1c80c20..b5c09fb4c3 100644 --- a/test/uptime.tasklist +++ b/test/uptime.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/usb_common.tasklist b/test/usb_common.tasklist index 9bf1c80c20..b5c09fb4c3 100644 --- a/test/usb_common.tasklist +++ b/test/usb_common.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/usb_common_test.c b/test/usb_common_test.c index d09ffb9f27..e385b57c16 100644 --- a/test/usb_common_test.c +++ b/test/usb_common_test.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/usb_pd.c b/test/usb_pd.c index 5183acb991..505b80e830 100644 --- a/test/usb_pd.c +++ b/test/usb_pd.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/usb_pd.tasklist b/test/usb_pd.tasklist index fbd319148e..6ba85de1aa 100644 --- a/test/usb_pd.tasklist +++ b/test/usb_pd.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/usb_pd_console.c b/test/usb_pd_console.c index 80b9978ea3..597852dffe 100644 --- a/test/usb_pd_console.c +++ b/test/usb_pd_console.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/usb_pd_console.tasklist b/test/usb_pd_console.tasklist index 8889009b0a..959f62ef79 100644 --- a/test/usb_pd_console.tasklist +++ b/test/usb_pd_console.tasklist @@ -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. */ diff --git a/test/usb_pd_int.c b/test/usb_pd_int.c index d61d45a73f..44cc280ed1 100644 --- a/test/usb_pd_int.c +++ b/test/usb_pd_int.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * @@ -19,8 +19,11 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }, }; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .driver = &mock_usb_mux_driver, +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { + .mux = + &(const struct usb_mux){ + .driver = &mock_usb_mux_driver, + }, } }; void board_reset_pd_mcu(void) diff --git a/test/usb_pd_int.mocklist b/test/usb_pd_int.mocklist index 71c2e2cee9..cbff5e73eb 100644 --- a/test/usb_pd_int.mocklist +++ b/test/usb_pd_int.mocklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/usb_pd_int.tasklist b/test/usb_pd_int.tasklist index 3487d55dc7..1888d3fa8c 100644 --- a/test/usb_pd_int.tasklist +++ b/test/usb_pd_int.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/usb_pd_pdo_fixed.tasklist b/test/usb_pd_pdo_fixed.tasklist index 9a1e6b3e08..1d7b3e08c1 100644 --- a/test/usb_pd_pdo_fixed.tasklist +++ b/test/usb_pd_pdo_fixed.tasklist @@ -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. */ diff --git a/test/usb_pd_pdo_fixed_test.c b/test/usb_pd_pdo_fixed_test.c index 6bc537ab84..530f90843a 100644 --- a/test/usb_pd_pdo_fixed_test.c +++ b/test/usb_pd_pdo_fixed_test.c @@ -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. * diff --git a/test/usb_pd_test_util.h b/test/usb_pd_test_util.h index bb4446cbe4..c25d07db5d 100644 --- a/test/usb_pd_test_util.h +++ b/test/usb_pd_test_util.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/usb_pd_timer.c b/test/usb_pd_timer.c index 705da03f96..d469e67c48 100644 --- a/test/usb_pd_timer.c +++ b/test/usb_pd_timer.c @@ -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. * diff --git a/test/usb_pd_timer.tasklist b/test/usb_pd_timer.tasklist index 9a1e6b3e08..1d7b3e08c1 100644 --- a/test/usb_pd_timer.tasklist +++ b/test/usb_pd_timer.tasklist @@ -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. */ diff --git a/test/usb_pe.h b/test/usb_pe.h index f0c7f603ee..41891af557 100644 --- a/test/usb_pe.h +++ b/test/usb_pe.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/usb_pe_drp.c b/test/usb_pe_drp.c index a224a0fddd..8d75454c6a 100644 --- a/test/usb_pe_drp.c +++ b/test/usb_pe_drp.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * @@ -28,8 +28,11 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }, }; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .driver = &mock_usb_mux_driver, +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { + .mux = + &(const struct usb_mux){ + .driver = &mock_usb_mux_driver, + }, } }; void before_test(void) diff --git a/test/usb_pe_drp.mocklist b/test/usb_pe_drp.mocklist index b8879415d8..633b43d48d 100644 --- a/test/usb_pe_drp.mocklist +++ b/test/usb_pe_drp.mocklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/usb_pe_drp.tasklist b/test/usb_pe_drp.tasklist index eb41326e3e..5c7f804157 100644 --- a/test/usb_pe_drp.tasklist +++ b/test/usb_pe_drp.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/usb_pe_drp_noextended.c b/test/usb_pe_drp_noextended.c index 38920fdf98..6108458c9c 100644 --- a/test/usb_pe_drp_noextended.c +++ b/test/usb_pe_drp_noextended.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * @@ -24,8 +24,11 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }, }; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .driver = &mock_usb_mux_driver, +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { + .mux = + &(const struct usb_mux){ + .driver = &mock_usb_mux_driver, + }, } }; void before_test(void) diff --git a/test/usb_pe_drp_noextended.tasklist b/test/usb_pe_drp_noextended.tasklist index eb41326e3e..5c7f804157 100644 --- a/test/usb_pe_drp_noextended.tasklist +++ b/test/usb_pe_drp_noextended.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/usb_pe_drp_old.c b/test/usb_pe_drp_old.c index a74d8c5d06..0985a4cae9 100644 --- a/test/usb_pe_drp_old.c +++ b/test/usb_pe_drp_old.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * @@ -35,7 +35,7 @@ const struct svdm_response svdm_rsp = { }; const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT]; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT]; +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT]; static bool prl_is_busy_flag; diff --git a/test/usb_pe_drp_old.mocklist b/test/usb_pe_drp_old.mocklist index 0582e5cbb3..118cec69a0 100644 --- a/test/usb_pe_drp_old.mocklist +++ b/test/usb_pe_drp_old.mocklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/usb_pe_drp_old.tasklist b/test/usb_pe_drp_old.tasklist index eb41326e3e..5c7f804157 100644 --- a/test/usb_pe_drp_old.tasklist +++ b/test/usb_pe_drp_old.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/usb_pe_drp_old_noextended.c b/test/usb_pe_drp_old_noextended.c index f0ec34c7d0..43df6375b0 100644 --- a/test/usb_pe_drp_old_noextended.c +++ b/test/usb_pe_drp_old_noextended.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * @@ -27,7 +27,7 @@ const struct svdm_response svdm_rsp = { }; const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT]; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT]; +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT]; int board_vbus_source_enabled(int port) { diff --git a/test/usb_pe_drp_old_noextended.mocklist b/test/usb_pe_drp_old_noextended.mocklist index 0582e5cbb3..118cec69a0 100644 --- a/test/usb_pe_drp_old_noextended.mocklist +++ b/test/usb_pe_drp_old_noextended.mocklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/usb_pe_drp_old_noextended.tasklist b/test/usb_pe_drp_old_noextended.tasklist index eb41326e3e..5c7f804157 100644 --- a/test/usb_pe_drp_old_noextended.tasklist +++ b/test/usb_pe_drp_old_noextended.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/usb_ppc.c b/test/usb_ppc.c index a50498a443..d08ae47946 100644 --- a/test/usb_ppc.c +++ b/test/usb_ppc.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/usb_ppc.tasklist b/test/usb_ppc.tasklist index 9fc1a80f4d..844ddb6c10 100644 --- a/test/usb_ppc.tasklist +++ b/test/usb_ppc.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/usb_prl.c b/test/usb_prl.c index d6f144bab1..9b4c956649 100644 --- a/test/usb_prl.c +++ b/test/usb_prl.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/usb_prl.mocklist b/test/usb_prl.mocklist index bf5357334a..7a5af3392e 100644 --- a/test/usb_prl.mocklist +++ b/test/usb_prl.mocklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/usb_prl.tasklist b/test/usb_prl.tasklist index eb41326e3e..5c7f804157 100644 --- a/test/usb_prl.tasklist +++ b/test/usb_prl.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/usb_prl_noextended.c b/test/usb_prl_noextended.c index 3450c012af..956c0027f5 100644 --- a/test/usb_prl_noextended.c +++ b/test/usb_prl_noextended.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/usb_prl_old.c b/test/usb_prl_old.c index 3450c012af..956c0027f5 100644 --- a/test/usb_prl_old.c +++ b/test/usb_prl_old.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/usb_prl_old.tasklist b/test/usb_prl_old.tasklist index eb41326e3e..5c7f804157 100644 --- a/test/usb_prl_old.tasklist +++ b/test/usb_prl_old.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/usb_sm_checks.c b/test/usb_sm_checks.c index d9b62148d5..a8dbdad872 100644 --- a/test/usb_sm_checks.c +++ b/test/usb_sm_checks.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/usb_sm_checks.h b/test/usb_sm_checks.h index 93d5896632..1041afbaa4 100644 --- a/test/usb_sm_checks.h +++ b/test/usb_sm_checks.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/usb_sm_framework_h3.c b/test/usb_sm_framework_h3.c index 1afb822516..20f9b706c6 100644 --- a/test/usb_sm_framework_h3.c +++ b/test/usb_sm_framework_h3.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/usb_sm_framework_h3.tasklist b/test/usb_sm_framework_h3.tasklist index 998998fd6c..9db4e49e5e 100644 --- a/test/usb_sm_framework_h3.tasklist +++ b/test/usb_sm_framework_h3.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/usb_tcpmv2_compliance.c b/test/usb_tcpmv2_compliance.c index 249d62d38b..2acd2c1660 100644 --- a/test/usb_tcpmv2_compliance.c +++ b/test/usb_tcpmv2_compliance.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/usb_tcpmv2_compliance.h b/test/usb_tcpmv2_compliance.h index 7ed39bcb38..0ca4717173 100644 --- a/test/usb_tcpmv2_compliance.h +++ b/test/usb_tcpmv2_compliance.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -26,7 +26,7 @@ extern uint32_t rdo; extern uint32_t pdo; extern const struct tcpc_config_t tcpc_config[]; -extern const struct usb_mux usb_muxes[]; +extern const struct usb_mux_chain usb_muxes[]; void mock_set_cc(enum mock_connect_result cr, enum mock_cc_state cc1, enum mock_cc_state cc2); diff --git a/test/usb_tcpmv2_compliance.mocklist b/test/usb_tcpmv2_compliance.mocklist index f364fb1050..311397fe43 100644 --- a/test/usb_tcpmv2_compliance.mocklist +++ b/test/usb_tcpmv2_compliance.mocklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/usb_tcpmv2_compliance.tasklist b/test/usb_tcpmv2_compliance.tasklist index 654e4eca2b..794669adbe 100644 --- a/test/usb_tcpmv2_compliance.tasklist +++ b/test/usb_tcpmv2_compliance.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/usb_tcpmv2_compliance_common.c b/test/usb_tcpmv2_compliance_common.c index 8127172065..9f839ecf1c 100644 --- a/test/usb_tcpmv2_compliance_common.c +++ b/test/usb_tcpmv2_compliance_common.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -30,8 +30,11 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }, }; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .driver = &mock_usb_mux_driver, +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { + .mux = + &(const struct usb_mux){ + .driver = &mock_usb_mux_driver, + }, } }; void mock_set_cc(enum mock_connect_result cr, enum mock_cc_state cc1, diff --git a/test/usb_tcpmv2_td_pd_ll_e3.c b/test/usb_tcpmv2_td_pd_ll_e3.c index 893a12cb71..f239c87885 100644 --- a/test/usb_tcpmv2_td_pd_ll_e3.c +++ b/test/usb_tcpmv2_td_pd_ll_e3.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/usb_tcpmv2_td_pd_ll_e4.c b/test/usb_tcpmv2_td_pd_ll_e4.c index 6908eff649..f315fc2a63 100644 --- a/test/usb_tcpmv2_td_pd_ll_e4.c +++ b/test/usb_tcpmv2_td_pd_ll_e4.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/usb_tcpmv2_td_pd_ll_e5.c b/test/usb_tcpmv2_td_pd_ll_e5.c index 5796f91ce0..7c7446a7b3 100644 --- a/test/usb_tcpmv2_td_pd_ll_e5.c +++ b/test/usb_tcpmv2_td_pd_ll_e5.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/usb_tcpmv2_td_pd_other.c b/test/usb_tcpmv2_td_pd_other.c index 24eca5fccb..18477ac825 100644 --- a/test/usb_tcpmv2_td_pd_other.c +++ b/test/usb_tcpmv2_td_pd_other.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/usb_tcpmv2_td_pd_snk3_e12.c b/test/usb_tcpmv2_td_pd_snk3_e12.c index 28f157456d..11aa51016e 100644 --- a/test/usb_tcpmv2_td_pd_snk3_e12.c +++ b/test/usb_tcpmv2_td_pd_snk3_e12.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/usb_tcpmv2_td_pd_src3_e1.c b/test/usb_tcpmv2_td_pd_src3_e1.c index 41c839fa87..4f5637ccd2 100644 --- a/test/usb_tcpmv2_td_pd_src3_e1.c +++ b/test/usb_tcpmv2_td_pd_src3_e1.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/usb_tcpmv2_td_pd_src3_e26.c b/test/usb_tcpmv2_td_pd_src3_e26.c index ba9bab464c..aef472884b 100644 --- a/test/usb_tcpmv2_td_pd_src3_e26.c +++ b/test/usb_tcpmv2_td_pd_src3_e26.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/usb_tcpmv2_td_pd_src3_e32.c b/test/usb_tcpmv2_td_pd_src3_e32.c index d80c17dd9b..395a251b22 100644 --- a/test/usb_tcpmv2_td_pd_src3_e32.c +++ b/test/usb_tcpmv2_td_pd_src3_e32.c @@ -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. */ diff --git a/test/usb_tcpmv2_td_pd_src3_e7.c b/test/usb_tcpmv2_td_pd_src3_e7.c index d15a848e51..40f65f2b9a 100644 --- a/test/usb_tcpmv2_td_pd_src3_e7.c +++ b/test/usb_tcpmv2_td_pd_src3_e7.c @@ -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. */ diff --git a/test/usb_tcpmv2_td_pd_src3_e8.c b/test/usb_tcpmv2_td_pd_src3_e8.c index 92fe80375c..8686226a50 100644 --- a/test/usb_tcpmv2_td_pd_src3_e8.c +++ b/test/usb_tcpmv2_td_pd_src3_e8.c @@ -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. */ diff --git a/test/usb_tcpmv2_td_pd_src3_e9.c b/test/usb_tcpmv2_td_pd_src3_e9.c index e328b3a4b7..59b7a22d74 100644 --- a/test/usb_tcpmv2_td_pd_src3_e9.c +++ b/test/usb_tcpmv2_td_pd_src3_e9.c @@ -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. */ diff --git a/test/usb_tcpmv2_td_pd_src_e1.c b/test/usb_tcpmv2_td_pd_src_e1.c index 3e1f56e33c..cfb62764b2 100644 --- a/test/usb_tcpmv2_td_pd_src_e1.c +++ b/test/usb_tcpmv2_td_pd_src_e1.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/usb_tcpmv2_td_pd_src_e2.c b/test/usb_tcpmv2_td_pd_src_e2.c index 653c82dea5..cabba40bb9 100644 --- a/test/usb_tcpmv2_td_pd_src_e2.c +++ b/test/usb_tcpmv2_td_pd_src_e2.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/usb_tcpmv2_td_pd_src_e5.c b/test/usb_tcpmv2_td_pd_src_e5.c index 0b6846ec22..ef40ee75cf 100644 --- a/test/usb_tcpmv2_td_pd_src_e5.c +++ b/test/usb_tcpmv2_td_pd_src_e5.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/usb_tcpmv2_td_pd_vndi3_e3.c b/test/usb_tcpmv2_td_pd_vndi3_e3.c index acea194963..8157835328 100644 --- a/test/usb_tcpmv2_td_pd_vndi3_e3.c +++ b/test/usb_tcpmv2_td_pd_vndi3_e3.c @@ -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. */ diff --git a/test/usb_test/Makefile b/test/usb_test/Makefile index e18e4a7c3b..df21c7d331 100644 --- a/test/usb_test/Makefile +++ b/test/usb_test/Makefile @@ -1,4 +1,4 @@ -# Copyright 2015 The Chromium OS Authors. All rights reserved. +# Copyright 2015 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/test/usb_test/device_configuration.c b/test/usb_test/device_configuration.c index 2edb124b9f..06c71fefd9 100644 --- a/test/usb_test/device_configuration.c +++ b/test/usb_test/device_configuration.c @@ -1,5 +1,5 @@ /* - * Copyright 2016 The Chromium OS Authors. All rights reserved. + * Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/usb_typec_ctvpd.c b/test/usb_typec_ctvpd.c index 23cc39d3c8..71d543cec0 100644 --- a/test/usb_typec_ctvpd.c +++ b/test/usb_typec_ctvpd.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/usb_typec_ctvpd.tasklist b/test/usb_typec_ctvpd.tasklist index eb41326e3e..5c7f804157 100644 --- a/test/usb_typec_ctvpd.tasklist +++ b/test/usb_typec_ctvpd.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/usb_typec_drp_acc_trysrc.c b/test/usb_typec_drp_acc_trysrc.c index 0b36fa9e8a..28da84e228 100644 --- a/test/usb_typec_drp_acc_trysrc.c +++ b/test/usb_typec_drp_acc_trysrc.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * @@ -34,8 +34,11 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { }, }; -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .driver = &mock_usb_mux_driver, +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { + .mux = + &(const struct usb_mux){ + .driver = &mock_usb_mux_driver, + }, } }; void charge_manager_set_ceil(int port, enum ceil_requestor requestor, int ceil) diff --git a/test/usb_typec_drp_acc_trysrc.mocklist b/test/usb_typec_drp_acc_trysrc.mocklist index 71c2e2cee9..cbff5e73eb 100644 --- a/test/usb_typec_drp_acc_trysrc.mocklist +++ b/test/usb_typec_drp_acc_trysrc.mocklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/usb_typec_drp_acc_trysrc.tasklist b/test/usb_typec_drp_acc_trysrc.tasklist index eb41326e3e..5c7f804157 100644 --- a/test/usb_typec_drp_acc_trysrc.tasklist +++ b/test/usb_typec_drp_acc_trysrc.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/utils.c b/test/utils.c index 58899fe7c2..fccfee0923 100644 --- a/test/utils.c +++ b/test/utils.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/utils.tasklist b/test/utils.tasklist index da0ab6211a..100cb6b5bd 100644 --- a/test/utils.tasklist +++ b/test/utils.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/utils_str.c b/test/utils_str.c index 16fcfc4484..36ad63989e 100644 --- a/test/utils_str.c +++ b/test/utils_str.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/utils_str.tasklist b/test/utils_str.tasklist index 7150f17cbd..6373a70ab1 100644 --- a/test/utils_str.tasklist +++ b/test/utils_str.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/vboot.c b/test/vboot.c index f11f8fabaf..f75208de90 100644 --- a/test/vboot.c +++ b/test/vboot.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/test/vboot.tasklist b/test/vboot.tasklist index 7150f17cbd..6373a70ab1 100644 --- a/test/vboot.tasklist +++ b/test/vboot.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/version.c b/test/version.c index a44029f459..9731863f29 100644 --- a/test/version.c +++ b/test/version.c @@ -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. * diff --git a/test/version.tasklist b/test/version.tasklist index e54ea001bd..cd866d90e1 100644 --- a/test/version.tasklist +++ b/test/version.tasklist @@ -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. */ diff --git a/test/vpd_api.c b/test/vpd_api.c index 5eb61cd5d2..51a2e76cd6 100644 --- a/test/vpd_api.c +++ b/test/vpd_api.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/vpd_api.h b/test/vpd_api.h index 83675bd242..62dab34377 100644 --- a/test/vpd_api.h +++ b/test/vpd_api.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/test/x25519.tasklist b/test/x25519.tasklist index 80072bb620..329f9a3d28 100644 --- a/test/x25519.tasklist +++ b/test/x25519.tasklist @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/third_party/boringssl/LICENSE b/third_party/boringssl/LICENSE index 49c41fa7af..e9667cb9c2 100644 --- a/third_party/boringssl/LICENSE +++ b/third_party/boringssl/LICENSE @@ -142,7 +142,7 @@ record keeping.) ISC license used for completely new code in BoringSSL: -/* Copyright (c) 2015, Google Inc. +/* Copyright 2015 Google LLC * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -200,7 +200,7 @@ notice, this list of conditions and the following disclaimer. copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of Google Inc. nor the names of its + * Neither the name of Google LLC nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -222,7 +222,7 @@ trybots etc. The scripts which manage this, and the script for generating build metadata, are under the Chromium license. Distributing code linked against BoringSSL does not trigger this license. -Copyright 2015 The Chromium Authors. All rights reserved. +Copyright 2015 The Chromium Authors Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -234,7 +234,7 @@ notice, this list of conditions and the following disclaimer. copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of Google Inc. nor the names of its + * Neither the name of Google LLC nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/third_party/boringssl/common/curve25519-generic.c b/third_party/boringssl/common/curve25519-generic.c index e0d09b2acb..16e0668071 100644 --- a/third_party/boringssl/common/curve25519-generic.c +++ b/third_party/boringssl/common/curve25519-generic.c @@ -1,4 +1,4 @@ -/* Copyright 2015, Google Inc. +/* Copyright 2015 Google LLC * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/third_party/boringssl/common/curve25519.c b/third_party/boringssl/common/curve25519.c index b74d3c7d97..1c902e424c 100644 --- a/third_party/boringssl/common/curve25519.c +++ b/third_party/boringssl/common/curve25519.c @@ -1,4 +1,4 @@ -/* Copyright 2015, Google Inc. +/* Copyright 2015 Google LLC * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/third_party/boringssl/include/curve25519.h b/third_party/boringssl/include/curve25519.h index 8287c94466..05cebeed99 100644 --- a/third_party/boringssl/include/curve25519.h +++ b/third_party/boringssl/include/curve25519.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/third_party/boringssl/test/x25519.c b/third_party/boringssl/test/x25519.c index 4ab7578768..cd773653e5 100644 --- a/third_party/boringssl/test/x25519.c +++ b/third_party/boringssl/test/x25519.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Google Inc. +/* Copyright 2015 Google LLC * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/third_party/rules.mk b/third_party/rules.mk index 3aae430565..eb4391b70c 100644 --- a/third_party/rules.mk +++ b/third_party/rules.mk @@ -1,6 +1,6 @@ # -*- makefile -*- # vim: set filetype=make : -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/util/battery_temp b/util/battery_temp index c69e3d4778..01f4002b99 100755 --- a/util/battery_temp +++ b/util/battery_temp @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 The Chromium OS Authors. All rights reserved. +# Copyright 2018 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/util/bin2h.sh b/util/bin2h.sh index 1507bc4004..276d89f0cf 100755 --- a/util/bin2h.sh +++ b/util/bin2h.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright 2018 The Chromium OS Authors. All rights reserved. +# Copyright 2018 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/util/build.mk b/util/build.mk index 2948bd9d91..8f047dd1d2 100644 --- a/util/build.mk +++ b/util/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2014 The Chromium OS Authors. All rights reserved. +# Copyright 2014 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/util/build_with_clang.py b/util/build_with_clang.py index 3606e53657..e73f765e1e 100755 --- a/util/build_with_clang.py +++ b/util/build_with_clang.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# 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. diff --git a/util/cbi-util.c b/util/cbi-util.c index 219412ae2c..5bea9a04b9 100644 --- a/util/cbi-util.c +++ b/util/cbi-util.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/util/chargen b/util/chargen index a1f7947a14..fd9e73cbda 100644 --- a/util/chargen +++ b/util/chargen @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/util/check_clang_format.py b/util/check_clang_format.py index 5b813c130f..3be63774f7 100755 --- a/util/check_clang_format.py +++ b/util/check_clang_format.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/util/comm-dev.c b/util/comm-dev.c index e8bc97d7ff..f6467492f9 100644 --- a/util/comm-dev.c +++ b/util/comm-dev.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/util/comm-host.c b/util/comm-host.c index d7911f1d87..914e6d27e8 100644 --- a/util/comm-host.c +++ b/util/comm-host.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/util/comm-host.h b/util/comm-host.h index 85661ec981..907df3df96 100644 --- a/util/comm-host.h +++ b/util/comm-host.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/util/comm-i2c.c b/util/comm-i2c.c index 1f2bb24e83..1548beaaa2 100644 --- a/util/comm-i2c.c +++ b/util/comm-i2c.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/util/comm-lpc.c b/util/comm-lpc.c index 41a9a11e84..8e2042f0cc 100644 --- a/util/comm-lpc.c +++ b/util/comm-lpc.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/util/comm-servo-spi.c b/util/comm-servo-spi.c index 55bd2eb3fd..170b1e4e40 100644 --- a/util/comm-servo-spi.c +++ b/util/comm-servo-spi.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/util/comm-usb.c b/util/comm-usb.c index 232d39fe9e..ac0c1675fd 100644 --- a/util/comm-usb.c +++ b/util/comm-usb.c @@ -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. */ diff --git a/util/comm-usb.h b/util/comm-usb.h index e4961af800..b43d1bf66f 100644 --- a/util/comm-usb.h +++ b/util/comm-usb.h @@ -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. * diff --git a/util/compare_build.sh b/util/compare_build.sh index 8cab0529f7..e70dcdbed2 100755 --- a/util/compare_build.sh +++ b/util/compare_build.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/util/config_allowed.txt b/util/config_allowed.txt index 92c914579c..53bed47dcc 100644 --- a/util/config_allowed.txt +++ b/util/config_allowed.txt @@ -479,13 +479,6 @@ CONFIG_HOSTCMD_ALIGNED CONFIG_HOSTCMD_AP_SET_SKUID CONFIG_HOSTCMD_BUTTON CONFIG_HOSTCMD_DEBUG_MODE -CONFIG_HOSTCMD_ESPI_EC_CHAN_BITMAP -CONFIG_HOSTCMD_ESPI_EC_MAX_FREQ -CONFIG_HOSTCMD_ESPI_EC_MODE -CONFIG_HOSTCMD_ESPI_RESET_SLP_SX_VW_ON_ESPI_RST -CONFIG_HOSTCMD_ESPI_VW_SLP_S3 -CONFIG_HOSTCMD_ESPI_VW_SLP_S4 -CONFIG_HOSTCMD_ESPI_VW_SLP_S5 CONFIG_HOSTCMD_EVENTS CONFIG_HOSTCMD_FLASHPD CONFIG_HOSTCMD_FLASH_SPI_INFO @@ -506,6 +499,10 @@ CONFIG_HOST_ESPI_VW_POWER_SIGNAL CONFIG_HOST_EVENT64 CONFIG_HOST_EVENT64_REPORT_MASK CONFIG_HOST_EVENT_REPORT_MASK +CONFIG_HOST_INTERFACE_ESPI_EC_CHAN_BITMAP +CONFIG_HOST_INTERFACE_ESPI_EC_MAX_FREQ +CONFIG_HOST_INTERFACE_ESPI_EC_MODE +CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S5RFACE_ESPI_ CONFIG_HOSYCMD_BATTERY_V2 CONFIG_HWTIMER_64BIT CONFIG_HW_CRC diff --git a/util/config_option_check.py b/util/config_option_check.py index c1e57dfc82..25c026afe5 100755 --- a/util/config_option_check.py +++ b/util/config_option_check.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright 2015 The Chromium OS Authors. All rights reserved. +# Copyright 2015 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/util/cros_ec_dev.h b/util/cros_ec_dev.h index 7bf12befda..3ffed56632 100644 --- a/util/cros_ec_dev.h +++ b/util/cros_ec_dev.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/util/dt-gpionames/dt.go b/util/dt-gpionames/dt.go index 547d69708f..9e95aeb946 100644 --- a/util/dt-gpionames/dt.go +++ b/util/dt-gpionames/dt.go @@ -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. diff --git a/util/dt-gpionames/gpionames.sh b/util/dt-gpionames/gpionames.sh index 92b2bd4580..972dbbacd9 100755 --- a/util/dt-gpionames/gpionames.sh +++ b/util/dt-gpionames/gpionames.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# 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. diff --git a/util/ec3po/__init__.py b/util/ec3po/__init__.py index 376ffdba04..b3534114ac 100644 --- a/util/ec3po/__init__.py +++ b/util/ec3po/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2015 The Chromium OS Authors. All rights reserved. +# Copyright 2015 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/util/ec3po/console.py b/util/ec3po/console.py index 289c40f825..12b31baa60 100755 --- a/util/ec3po/console.py +++ b/util/ec3po/console.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2015 The Chromium OS Authors. All rights reserved. +# Copyright 2015 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/util/ec3po/console_unittest.py b/util/ec3po/console_unittest.py index dcf66810e0..e2a3d588fd 100755 --- a/util/ec3po/console_unittest.py +++ b/util/ec3po/console_unittest.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2015 The Chromium OS Authors. All rights reserved. +# Copyright 2015 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/util/ec3po/interpreter.py b/util/ec3po/interpreter.py index bfe7d1ed8d..8d21af247a 100644 --- a/util/ec3po/interpreter.py +++ b/util/ec3po/interpreter.py @@ -1,4 +1,4 @@ -# Copyright 2015 The Chromium OS Authors. All rights reserved. +# Copyright 2015 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/util/ec3po/interpreter_unittest.py b/util/ec3po/interpreter_unittest.py index b7a29baa57..e8f19e2e46 100755 --- a/util/ec3po/interpreter_unittest.py +++ b/util/ec3po/interpreter_unittest.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2015 The Chromium OS Authors. All rights reserved. +# Copyright 2015 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/util/ec3po/run_tests.sh b/util/ec3po/run_tests.sh index ba513abe30..d61b2b428e 100755 --- a/util/ec3po/run_tests.sh +++ b/util/ec3po/run_tests.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright 2015 The Chromium OS Authors. All rights reserved. +# Copyright 2015 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/util/ec3po/threadproc_shim.py b/util/ec3po/threadproc_shim.py index c0b3ce0bf4..f76841dbf7 100644 --- a/util/ec3po/threadproc_shim.py +++ b/util/ec3po/threadproc_shim.py @@ -1,4 +1,4 @@ -# Copyright 2018 The Chromium OS Authors. All rights reserved. +# Copyright 2018 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/util/ec_flash.c b/util/ec_flash.c index 5025b79b9e..ba18bb8d4c 100644 --- a/util/ec_flash.c +++ b/util/ec_flash.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/util/ec_flash.h b/util/ec_flash.h index f4aea3b7a3..179df1979b 100644 --- a/util/ec_flash.h +++ b/util/ec_flash.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/util/ec_openocd.py b/util/ec_openocd.py index 83894e58fc..e0a15bd08b 100755 --- a/util/ec_openocd.py +++ b/util/ec_openocd.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# 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. diff --git a/util/ec_panicinfo.c b/util/ec_panicinfo.c index 4ad24ff0f3..0aa412bfe1 100644 --- a/util/ec_panicinfo.c +++ b/util/ec_panicinfo.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/util/ec_panicinfo.h b/util/ec_panicinfo.h index c61cf797e6..0d7dba79f5 100644 --- a/util/ec_panicinfo.h +++ b/util/ec_panicinfo.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/util/ec_parse_panicinfo.c b/util/ec_parse_panicinfo.c index 1865757b79..33c904b512 100644 --- a/util/ec_parse_panicinfo.c +++ b/util/ec_parse_panicinfo.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/util/ec_sb_firmware_update.c b/util/ec_sb_firmware_update.c index c8172a3691..a2fb70d2a3 100644 --- a/util/ec_sb_firmware_update.c +++ b/util/ec_sb_firmware_update.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/util/ec_sb_firmware_update.h b/util/ec_sb_firmware_update.h index 720968ef10..2757dca9a5 100644 --- a/util/ec_sb_firmware_update.h +++ b/util/ec_sb_firmware_update.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/util/ecst.c b/util/ecst.c index 3395f644a3..2c3150c34a 100644 --- a/util/ecst.c +++ b/util/ecst.c @@ -1,5 +1,5 @@ /* - * Copyright 2015 The Chromium OS Authors. All rights reserved. + * Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/util/ecst.h b/util/ecst.h index 9361418d97..7d3dbbe153 100644 --- a/util/ecst.h +++ b/util/ecst.h @@ -1,5 +1,5 @@ /* - * Copyright 2015 The Chromium OS Authors. All rights reserved. + * Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/util/ectool.c b/util/ectool.c index 5aaf692477..49a59ee712 100644 --- a/util/ectool.c +++ b/util/ectool.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/util/ectool.h b/util/ectool.h index c76e1652cc..3b398af273 100644 --- a/util/ectool.h +++ b/util/ectool.h @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/util/ectool_i2c.c b/util/ectool_i2c.c index 30c57047ba..efe2b723a2 100644 --- a/util/ectool_i2c.c +++ b/util/ectool_i2c.c @@ -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. */ diff --git a/util/ectool_keyscan.c b/util/ectool_keyscan.c index 4975493615..796e197a9a 100644 --- a/util/ectool_keyscan.c +++ b/util/ectool_keyscan.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/util/env_changed.sh b/util/env_changed.sh index 5bab64760d..eadc94ae01 100755 --- a/util/env_changed.sh +++ b/util/env_changed.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/util/export_taskinfo.c b/util/export_taskinfo.c index 0e2dac7837..af40ef8de6 100644 --- a/util/export_taskinfo.c +++ b/util/export_taskinfo.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/util/flash_ec b/util/flash_ec index a19779a33e..8557b637e5 100755 --- a/util/flash_ec +++ b/util/flash_ec @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2014 The Chromium OS Authors. All rights reserved. +# Copyright 2014 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -383,7 +383,7 @@ esac case "${CHIP}" in "stm32"|"npcx_spi"|"npcx_int_spi"|"it83xx"|"npcx_uut"|"ite_spi"| \ - "ite_spi_ccd_i2c") + "ite_spi_ccd_i2c"|"it8xxx2") ;; *) if [[ -n "${FLAGS_read}" ]]; then @@ -972,10 +972,13 @@ function flash_flashrom() { fi fi + # Eventually remove ite_spi_ccd_i2c once all references are removed if ! on_raiden || [[ "${SERVO_TYPE}" =~ "servo_micro" ]] ; then if in_array "${BOARDS_SPI_1800MV[@]}" "${BOARD}"; then SPI_VOLTAGE="pp1800" - elif [[ "${CHIP}" == "ite_spi" || "${CHIP}" == "ite_spi_ccd_i2c" ]]; then + elif [[ "${CHIP}" == "ite_spi" || + "${CHIP}" == "ite_spi_ccd_i2c" || + "${CHIP}" == "it8xxx2" ]]; then SPI_VOLTAGE="pp1800" else SPI_VOLTAGE="pp3300" @@ -994,7 +997,9 @@ function flash_flashrom() { fi # Enable SPI programming mode. - if [[ "${CHIP}" == "ite_spi" || "${CHIP}" == "ite_spi_ccd_i2c" ]]; then + if [[ "${CHIP}" == "ite_spi" || + "${CHIP}" == "ite_spi_ccd_i2c" || + "${CHIP}" == "it8xxx2" ]]; then # Set hardware strap pin (GPG6) of SPI programming as low then start ec dut_control fw_up:on sleep 0.1 @@ -1060,6 +1065,7 @@ function flash_flashrom() { if [[ "${CHIP}" =~ ^npcx(|_int)_spi$ ]] || \ [[ "${CHIP}" =~ "ite_spi_ccd_i2c" ]] || + [[ "${CHIP}" =~ "it8xxx2" ]] || [[ "${CHIP}" =~ "ite_spi" ]] ; then { # Patch temp image up to SPI_SIZE cat "${IMG}" @@ -1403,6 +1409,10 @@ function flash_ite_spi_ccd_i2c() { fi } +function flash_it8xxx2() { + flash_ite_spi_ccd_i2c +} + function flash_npcx_jtag() { IMG_PATH="${EC_DIR}/build/${BOARD}" OCD_CHIP_CFG="npcx_chip.cfg" diff --git a/util/flash_fp_mcu b/util/flash_fp_mcu index cb83660d03..a823174c94 100644 --- a/util/flash_fp_mcu +++ b/util/flash_fp_mcu @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/util/flash_jlink.py b/util/flash_jlink.py index eef29b98f4..dc462e354b 100755 --- a/util/flash_jlink.py +++ b/util/flash_jlink.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/util/fptool.py b/util/fptool.py index 6b33a0b1f0..ba00c0020a 100755 --- a/util/fptool.py +++ b/util/fptool.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# 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. diff --git a/util/gdbinit b/util/gdbinit index ff71e4c39c..1854b4bdc0 100644 --- a/util/gdbinit +++ b/util/gdbinit @@ -1,4 +1,4 @@ -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/util/gen_emmc_transfer_data.c b/util/gen_emmc_transfer_data.c index 65620f6c6a..3c80724594 100644 --- a/util/gen_emmc_transfer_data.c +++ b/util/gen_emmc_transfer_data.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/util/gen_ipi_table.c b/util/gen_ipi_table.c index 07a616a290..6c1407973c 100644 --- a/util/gen_ipi_table.c +++ b/util/gen_ipi_table.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/util/gen_touchpad_hash.c b/util/gen_touchpad_hash.c index 3b2eb4cb07..98370038b7 100644 --- a/util/gen_touchpad_hash.c +++ b/util/gen_touchpad_hash.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/util/genvif.c b/util/genvif.c index 4ae02e47a8..543577cb11 100644 --- a/util/genvif.c +++ b/util/genvif.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/util/genvif.h b/util/genvif.h index 2fb856beb4..448d8bfb43 100644 --- a/util/genvif.h +++ b/util/genvif.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/util/getversion.sh b/util/getversion.sh index d9df8a8c58..fbc279457e 100755 --- a/util/getversion.sh +++ b/util/getversion.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright 2012 The Chromium OS Authors. All rights reserved. +# Copyright 2012 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/util/gpios_to_zephyr_dts.c b/util/gpios_to_zephyr_dts.c index 166c16dde7..d0e51b3e46 100644 --- a/util/gpios_to_zephyr_dts.c +++ b/util/gpios_to_zephyr_dts.c @@ -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. */ diff --git a/util/host_command_check.sh b/util/host_command_check.sh index f699803b2e..8dc8280cbd 100755 --- a/util/host_command_check.sh +++ b/util/host_command_check.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright 2017 The Chromium OS Authors. All rights reserved. +# Copyright 2017 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/util/ide-config.sh b/util/ide-config.sh index 25edca2407..a172cf5767 100755 --- a/util/ide-config.sh +++ b/util/ide-config.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/util/inject-keys.py b/util/inject-keys.py index 292dd4f492..7ff72ea134 100755 --- a/util/inject-keys.py +++ b/util/inject-keys.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# Copyright 2016 The Chromium OS Authors. All rights reserved. +# Copyright 2016 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/util/iteflash.c b/util/iteflash.c index 6cec35306b..9085365135 100644 --- a/util/iteflash.c +++ b/util/iteflash.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/util/kconfig_check.py b/util/kconfig_check.py index ed832b26a1..e745b3aeca 100755 --- a/util/kconfig_check.py +++ b/util/kconfig_check.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# 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. """Kconfig checker diff --git a/util/lbcc.c b/util/lbcc.c index 7b405c191b..2429400cad 100644 --- a/util/lbcc.c +++ b/util/lbcc.c @@ -1,5 +1,5 @@ /* - * Copyright 2014 The Chromium OS Authors. All rights reserved. + * Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/util/lbplay.c b/util/lbplay.c index 8739c8b040..8c02903175 100644 --- a/util/lbplay.c +++ b/util/lbplay.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/util/linux_ec_commands_h_check.sh b/util/linux_ec_commands_h_check.sh index 4c55faca0a..d24beb9b54 100755 --- a/util/linux_ec_commands_h_check.sh +++ b/util/linux_ec_commands_h_check.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/util/llvm-gcov.sh b/util/llvm-gcov.sh index 7c1c97a7d5..826a901134 100755 --- a/util/llvm-gcov.sh +++ b/util/llvm-gcov.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# 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. diff --git a/util/lock/android.c b/util/lock/android.c index 8472b6db68..857d6a9473 100644 --- a/util/lock/android.c +++ b/util/lock/android.c @@ -1,6 +1,5 @@ /* - * Copyright 2016, Google Inc. - * All rights reserved. + * Copyright 2016 Google LLC * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -12,7 +11,7 @@ * copyright notice, this list of conditions and the following * disclaimer in the documentation and/or other materials provided * with the distribution. - * * Neither the name of Google Inc. nor the names of its + * * Neither the name of Google LLC nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * diff --git a/util/lock/android.h b/util/lock/android.h index bb08486919..dfdd16ce97 100644 --- a/util/lock/android.h +++ b/util/lock/android.h @@ -1,6 +1,5 @@ /* - * Copyright 2016, Google Inc. - * All rights reserved. + * Copyright 2016 Google LLC * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -12,7 +11,7 @@ * copyright notice, this list of conditions and the following * disclaimer in the documentation and/or other materials provided * with the distribution. - * * Neither the name of Google Inc. nor the names of its + * * Neither the name of Google LLC nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * diff --git a/util/lock/build.mk b/util/lock/build.mk index 65a63ab9db..ea9bf9bf04 100644 --- a/util/lock/build.mk +++ b/util/lock/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2012 The Chromium OS Authors. All rights reserved. +# Copyright 2012 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/util/lock/file_lock.c b/util/lock/file_lock.c index a3244f5237..c0ed8bd88c 100644 --- a/util/lock/file_lock.c +++ b/util/lock/file_lock.c @@ -1,5 +1,4 @@ -/* Copyright 2016, Google Inc. - * All rights reserved. +/* Copyright 2016 Google LLC * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -11,7 +10,7 @@ * copyright notice, this list of conditions and the following * disclaimer in the documentation and/or other materials provided * with the distribution. - * * Neither the name of Google Inc. nor the names of its + * * Neither the name of Google LLC nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * diff --git a/util/lock/gec_lock.c b/util/lock/gec_lock.c index d354ea08f3..64aad0f353 100644 --- a/util/lock/gec_lock.c +++ b/util/lock/gec_lock.c @@ -1,5 +1,4 @@ -/* Copyright 2012, Google Inc. - * All rights reserved. +/* Copyright 2012 Google LLC * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -11,7 +10,7 @@ * copyright notice, this list of conditions and the following * disclaimer in the documentation and/or other materials provided * with the distribution. - * * Neither the name of Google Inc. nor the names of its + * * Neither the name of Google LLC nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * diff --git a/util/lock/gec_lock.h b/util/lock/gec_lock.h index 8480700ddd..2e0d8018bc 100644 --- a/util/lock/gec_lock.h +++ b/util/lock/gec_lock.h @@ -1,5 +1,4 @@ -/* Copyright 2012, Google Inc. - * All rights reserved. +/* Copyright 2012 Google LLC * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -11,7 +10,7 @@ * copyright notice, this list of conditions and the following * disclaimer in the documentation and/or other materials provided * with the distribution. - * * Neither the name of Google Inc. nor the names of its + * * Neither the name of Google LLC nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * diff --git a/util/lock/ipc_lock.h b/util/lock/ipc_lock.h index 93b5f19d19..aaa4217ae8 100644 --- a/util/lock/ipc_lock.h +++ b/util/lock/ipc_lock.h @@ -1,5 +1,4 @@ -/* Copyright 2012, Google Inc. - * All rights reserved. +/* Copyright 2012 Google LLC * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -11,7 +10,7 @@ * copyright notice, this list of conditions and the following * disclaimer in the documentation and/or other materials provided * with the distribution. - * * Neither the name of Google Inc. nor the names of its + * * Neither the name of Google LLC nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * diff --git a/util/lock/locks.h b/util/lock/locks.h index 7584378d3a..9e470b5f7e 100644 --- a/util/lock/locks.h +++ b/util/lock/locks.h @@ -1,5 +1,4 @@ -/* Copyright 2012, Google Inc. - * All rights reserved. +/* Copyright 2012 Google LLC * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -11,7 +10,7 @@ * copyright notice, this list of conditions and the following * disclaimer in the documentation and/or other materials provided * with the distribution. - * * Neither the name of Google Inc. nor the names of its + * * Neither the name of Google LLC nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * diff --git a/util/make_linux_ec_commands_h.sh b/util/make_linux_ec_commands_h.sh index 3afb7c2f41..141a5086de 100755 --- a/util/make_linux_ec_commands_h.sh +++ b/util/make_linux_ec_commands_h.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -47,14 +47,14 @@ trap cleanup EXIT # Replace license patch "${tmp}" << EOF @@ -1,6 +1,11 @@ --/* Copyright 2014 The Chromium OS Authors. All rights reserved. +-/* Copyright 2014 The ChromiumOS Authors - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Host communication command constants for ChromeOS EC + * -+ * Copyright (C) 2012 Google, Inc ++ * Copyright 2012 Google, Inc + * + * NOTE: This file is auto-generated from ChromeOS EC Open Source code from + * https://chromium.googlesource.com/chromiumos/platform/ec/+/HEAD/include/ec_commands.h diff --git a/util/migrated_files.sh b/util/migrated_files.sh index 2093a2ed2a..cec86b565b 100755 --- a/util/migrated_files.sh +++ b/util/migrated_files.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# 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. diff --git a/util/misc_util.c b/util/misc_util.c index 1eb6577dbb..29b346f534 100644 --- a/util/misc_util.c +++ b/util/misc_util.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/util/misc_util.h b/util/misc_util.h index 52c5842105..d514a2516e 100644 --- a/util/misc_util.h +++ b/util/misc_util.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/util/openocd/board/skyrim.cfg b/util/openocd/board/skyrim.cfg index a8047ade22..11f31c22ef 100644 --- a/util/openocd/board/skyrim.cfg +++ b/util/openocd/board/skyrim.cfg @@ -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. diff --git a/util/openocd/npcx.cfg b/util/openocd/npcx.cfg index 0ab2b42888..888ebafcec 100644 --- a/util/openocd/npcx.cfg +++ b/util/openocd/npcx.cfg @@ -1,4 +1,4 @@ -# Copyright 2014 The Chromium OS Authors. All rights reserved. +# Copyright 2014 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/util/openocd/npcx_cmds.tcl b/util/openocd/npcx_cmds.tcl index 759e897131..fb7f634bff 100644 --- a/util/openocd/npcx_cmds.tcl +++ b/util/openocd/npcx_cmds.tcl @@ -1,4 +1,4 @@ -# Copyright 2014 The Chromium OS Authors. All rights reserved. +# Copyright 2014 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/util/openocd/target/npcx993f.cfg b/util/openocd/target/npcx993f.cfg index 690bee489d..b9c7c4e43d 100644 --- a/util/openocd/target/npcx993f.cfg +++ b/util/openocd/target/npcx993f.cfg @@ -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. diff --git a/util/openocd/target/npcx99nf.cfg b/util/openocd/target/npcx99nf.cfg index 14dbac9f13..8d0828c4c1 100644 --- a/util/openocd/target/npcx99nf.cfg +++ b/util/openocd/target/npcx99nf.cfg @@ -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. diff --git a/util/pinmap/chips/it81302.go b/util/pinmap/chips/it81302.go index 6e593a2c5e..058ac9a03b 100644 --- a/util/pinmap/chips/it81302.go +++ b/util/pinmap/chips/it81302.go @@ -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. diff --git a/util/pinmap/chips/npcx993.go b/util/pinmap/chips/npcx993.go index 7a865c115d..720cd99fb6 100644 --- a/util/pinmap/chips/npcx993.go +++ b/util/pinmap/chips/npcx993.go @@ -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. diff --git a/util/pinmap/chips/npcx993_test.go b/util/pinmap/chips/npcx993_test.go index 6ed4bf2357..a3910416a2 100644 --- a/util/pinmap/chips/npcx993_test.go +++ b/util/pinmap/chips/npcx993_test.go @@ -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. diff --git a/util/pinmap/chips/register.go b/util/pinmap/chips/register.go index 96b655814e..ff6d047140 100644 --- a/util/pinmap/chips/register.go +++ b/util/pinmap/chips/register.go @@ -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. diff --git a/util/pinmap/pinmap/main.go b/util/pinmap/pinmap/main.go index 8b1f1f38f6..1576bac0dd 100644 --- a/util/pinmap/pinmap/main.go +++ b/util/pinmap/pinmap/main.go @@ -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. diff --git a/util/pinmap/pm/chip.go b/util/pinmap/pm/chip.go index a940e7c5fe..9175647c9c 100644 --- a/util/pinmap/pm/chip.go +++ b/util/pinmap/pm/chip.go @@ -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. diff --git a/util/pinmap/pm/chip_test.go b/util/pinmap/pm/chip_test.go index 0bfe601093..1606646588 100644 --- a/util/pinmap/pm/chip_test.go +++ b/util/pinmap/pm/chip_test.go @@ -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. diff --git a/util/pinmap/pm/generate.go b/util/pinmap/pm/generate.go index d3ac5518fa..629aeaee15 100644 --- a/util/pinmap/pm/generate.go +++ b/util/pinmap/pm/generate.go @@ -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. @@ -17,7 +17,7 @@ type lineName struct { name string // Pin name } -const header = `/* Copyright %d The Chromium OS Authors. All rights reserved. +const header = `/* Copyright %d The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/util/pinmap/pm/generate_test.go b/util/pinmap/pm/generate_test.go index 5cf7fd9f5c..3ecdb7d1c2 100644 --- a/util/pinmap/pm/generate_test.go +++ b/util/pinmap/pm/generate_test.go @@ -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. @@ -72,7 +72,7 @@ func TestGenerate(t *testing.T) { * However this would considerably complicate this test. */ expFmt := - `/* Copyright %d The Chromium OS Authors. All rights reserved. + `/* Copyright %d The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/util/pinmap/pm/pins.go b/util/pinmap/pm/pins.go index cb749eb166..61cd7cc043 100644 --- a/util/pinmap/pm/pins.go +++ b/util/pinmap/pm/pins.go @@ -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. diff --git a/util/pinmap/pm/reader.go b/util/pinmap/pm/reader.go index 08dbb9e3af..4af8e29ed9 100644 --- a/util/pinmap/pm/reader.go +++ b/util/pinmap/pm/reader.go @@ -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. diff --git a/util/pinmap/pm/reader_test.go b/util/pinmap/pm/reader_test.go index 5eabf67490..ca004eab6a 100644 --- a/util/pinmap/pm/reader_test.go +++ b/util/pinmap/pm/reader_test.go @@ -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. diff --git a/util/pinmap/readers/csv/csv.go b/util/pinmap/readers/csv/csv.go index 562b5c6383..df763561bb 100644 --- a/util/pinmap/readers/csv/csv.go +++ b/util/pinmap/readers/csv/csv.go @@ -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. diff --git a/util/pinmap/readers/csv/csv_test.go b/util/pinmap/readers/csv/csv_test.go index c0a79ba784..e1140ccb75 100644 --- a/util/pinmap/readers/csv/csv_test.go +++ b/util/pinmap/readers/csv/csv_test.go @@ -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. diff --git a/util/pinmap/readers/csv/register.go b/util/pinmap/readers/csv/register.go index b2f2529061..7ccb18e78a 100644 --- a/util/pinmap/readers/csv/register.go +++ b/util/pinmap/readers/csv/register.go @@ -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. diff --git a/util/powerd_lock.c b/util/powerd_lock.c index 524b456df2..4fdc799203 100644 --- a/util/powerd_lock.c +++ b/util/powerd_lock.c @@ -1,7 +1,7 @@ /* * This file is ported from the flashrom project. * - * Copyright 2015 The Chromium OS Authors. All rights reserved. + * Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/util/powerd_lock.h b/util/powerd_lock.h index b75564ed42..1487f28bb7 100644 --- a/util/powerd_lock.h +++ b/util/powerd_lock.h @@ -1,7 +1,7 @@ /* * This file is ported from the flashrom project. * - * Copyright 2015 The Chromium OS Authors. All rights reserved. + * Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/util/presubmit_check.sh b/util/presubmit_check.sh index 7d46f38a0f..5cec68ddd4 100755 --- a/util/presubmit_check.sh +++ b/util/presubmit_check.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright 2014 The Chromium OS Authors. All rights reserved. +# Copyright 2014 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/util/run_ects.py b/util/run_ects.py index 6d89b39f23..a3bf4d295c 100644 --- a/util/run_ects.py +++ b/util/run_ects.py @@ -1,4 +1,4 @@ -# Copyright 2017 The Chromium OS Authors. All rights reserved. +# Copyright 2017 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/util/run_host_test b/util/run_host_test index cee969dd8c..3108da1852 100755 --- a/util/run_host_test +++ b/util/run_host_test @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/util/run_tests.sh b/util/run_tests.sh index 9ec2523e89..f8af2dc681 100755 --- a/util/run_tests.sh +++ b/util/run_tests.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/util/shuffle_test.sh b/util/shuffle_test.sh index 6605d35e12..dfbc1b7a15 100755 --- a/util/shuffle_test.sh +++ b/util/shuffle_test.sh @@ -1,6 +1,6 @@ #!/bin/bash -# 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. diff --git a/util/sort_by_unconvered.py b/util/sort_by_unconvered.py index 1f4e0808ae..217c613aaa 100755 --- a/util/sort_by_unconvered.py +++ b/util/sort_by_unconvered.py @@ -1,5 +1,5 @@ #!/usr/bin/python3 -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/util/stm32mon.c b/util/stm32mon.c index bda5e919e1..352158ae73 100644 --- a/util/stm32mon.c +++ b/util/stm32mon.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/util/tagbranch.sh b/util/tagbranch.sh index e925ddf33a..850886e08c 100755 --- a/util/tagbranch.sh +++ b/util/tagbranch.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright 2017 The Chromium OS Authors. All rights reserved. +# Copyright 2017 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/util/temp_metrics.conf b/util/temp_metrics.conf index ccd3254beb..174571f72a 100644 --- a/util/temp_metrics.conf +++ b/util/temp_metrics.conf @@ -1,4 +1,4 @@ -# Copyright 2012 The Chromium OS Authors. All rights reserved. +# Copyright 2012 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/util/test-inject-keys.sh b/util/test-inject-keys.sh index 031452150e..44ba3324d3 100755 --- a/util/test-inject-keys.sh +++ b/util/test-inject-keys.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright 2016 The Chromium OS Authors. All rights reserved. +# Copyright 2016 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/util/test_kconfig_check.py b/util/test_kconfig_check.py index 41c95e951c..3e459006b1 100644 --- a/util/test_kconfig_check.py +++ b/util/test_kconfig_check.py @@ -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. """Test for Kconfig checker""" diff --git a/util/twister_launcher.py b/util/twister_launcher.py index 820a0b4898..4dd520fa0f 100755 --- a/util/twister_launcher.py +++ b/util/twister_launcher.py @@ -149,12 +149,14 @@ def main(): # Prepare environment variables for export to Twister. Inherit the parent # process's environment, but set some default values if not already set. twister_env = dict(os.environ) + is_in_chroot = os.environ.get("CROS_WORKON_SRCROOT") is not None extra_env_vars = { "TOOLCHAIN_ROOT": os.environ.get( - "TOOLCHAIN_ROOT", str(ec_base / "zephyr") + "TOOLCHAIN_ROOT", + str(ec_base / "zephyr") if is_in_chroot else zephyr_base, ), "ZEPHYR_TOOLCHAIN_VARIANT": os.environ.get( - "ZEPHYR_TOOLCHAIN_VARIANT", "llvm" + "ZEPHYR_TOOLCHAIN_VARIANT", "llvm" if is_in_chroot else "host" ), } twister_env.update(extra_env_vars) diff --git a/util/uart_stress_tester.py b/util/uart_stress_tester.py index 6417376a08..d7b2341e93 100755 --- a/util/uart_stress_tester.py +++ b/util/uart_stress_tester.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Copyright 2019 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/util/unpack_ftb.py b/util/unpack_ftb.py index 04ba0ed538..4873190fb3 100755 --- a/util/unpack_ftb.py +++ b/util/unpack_ftb.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2018 The Chromium OS Authors. All rights reserved. +# Copyright 2018 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/util/update_release_branch.py b/util/update_release_branch.py index 358e30f8df..f03fc91253 100755 --- a/util/update_release_branch.py +++ b/util/update_release_branch.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# 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. """Release branch updater tool. @@ -22,7 +22,7 @@ import textwrap BUG_NONE_PATTERN = re.compile("none", flags=re.IGNORECASE) -def git_commit_msg(branch, head, merge_head, rel_paths, cmd): +def git_commit_msg(cros_main, branch, head, merge_head, rel_paths, cmd): """Generates a merge commit message based off of relevant changes. This function obtains the relevant commits from the given relative paths in @@ -30,6 +30,7 @@ def git_commit_msg(branch, head, merge_head, rel_paths, cmd): showing the command used to find the relevant commits. Args: + cros_main: String indicating the origin branch name branch: String indicating the release branch name head: String indicating the HEAD refspec merge_head: String indicating the merge branch refspec. @@ -59,8 +60,8 @@ def git_commit_msg(branch, head, merge_head, rel_paths, cmd): # TODO(b/179509333): remove Cq-Include-Trybots line when regular CQ and # firmware CQ do not behave differently. - COMMIT_MSG_TEMPLATE = """ -Merge remote-tracking branch cros/main into {BRANCH} + commit_msg_template = """ +Merge remote-tracking branch {CROS_MAIN} into {BRANCH} Generated by: {COMMAND_LINE} @@ -87,7 +88,8 @@ Cq-Include-Trybots: chromeos/cq:cq-orchestrator # Remove the final newline since the template adds it for us. bug_field = bug_field[:-1] - return COMMIT_MSG_TEMPLATE.format( + return commit_msg_template.format( + CROS_MAIN=cros_main, BRANCH=branch, RELEVANT_COMMITS_CMD=relevant_commits_cmd, RELEVANT_COMMITS=relevant_commits, @@ -187,6 +189,14 @@ def main(argv): "release_branch", help=("The name of the target release" " branch") ) parser.add_argument( + "--remote_prefix", + help=( + "The name of the remote branch prefix (default cros). " + "Private repos typically use cros-internal instead." + ), + default="cros", + ) + parser.add_argument( "--relevant_paths_file", help=( "A path to a text file which includes other " @@ -228,13 +238,13 @@ def main(argv): board_dir = os.path.relpath(os.path.realpath(board_dir)) boards = [opts.board] else: - parser.error("You must specify a board OR a baseboard") + boards = [] print("Gathering relevant paths...") relevant_paths = [] if opts.baseboard: relevant_paths.append(baseboard_dir) - else: + elif opts.board: relevant_paths.append(board_dir) for board in boards: @@ -246,7 +256,8 @@ def main(argv): for line in relevant_paths_file: if not line.startswith("#"): relevant_paths.append(line.rstrip()) - relevant_paths.append("util/getversion.sh") + if os.path.exists("util/getversion.sh"): + relevant_paths.append("util/getversion.sh") relevant_paths = " ".join(relevant_paths) # Check if we are already in merge process @@ -290,7 +301,7 @@ def main(argv): "checkout", "-B", opts.release_branch, - "cros/" + opts.release_branch, + opts.remote_prefix + "/" + opts.release_branch, ], check=True, ) @@ -305,12 +316,13 @@ def main(argv): else "" ), ) + cros_main = opts.remote_prefix + "/" + "main" arglist = [ "git", "merge", "--no-ff", "--no-commit", - "cros/main", + cros_main, "-s", opts.merge_strategy, ] @@ -337,7 +349,7 @@ def main(argv): # Prune OWNERS files for file in unmerged: if file in prunelist: - subprocess.run(["git", "rm", file]) + subprocess.run(["git", "rm", file], check=False) unmerged.remove(file) print("Removed non-root OWNERS files.") @@ -377,7 +389,9 @@ def main(argv): cmd = " ".join(argv) print("Typing as fast as I can...") - commit_msg = git_commit_msg(branch, head, merge_head, relevant_paths, cmd) + commit_msg = git_commit_msg( + cros_main, branch, head, merge_head, relevant_paths, cmd + ) subprocess.run(["git", "commit", "--signoff", "-m", commit_msg], check=True) subprocess.run(["git", "commit", "--amend"], check=True) print( diff --git a/util/usb_if.c b/util/usb_if.c index 034524e27f..0cd642834a 100644 --- a/util/usb_if.c +++ b/util/usb_if.c @@ -1,5 +1,5 @@ /* - * Copyright 2018 The Chromium OS Authors. All rights reserved. + * Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/util/usb_if.h b/util/usb_if.h index 587880f483..37a33f6287 100644 --- a/util/usb_if.h +++ b/util/usb_if.h @@ -1,5 +1,5 @@ /* - * Copyright 2018 The Chromium OS Authors. All rights reserved. + * Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/util/uut/cmd.c b/util/uut/cmd.c index 576b596c5c..02810b686a 100644 --- a/util/uut/cmd.c +++ b/util/uut/cmd.c @@ -1,5 +1,5 @@ /* - * Copyright 2018 The Chromium OS Authors. All rights reserved. + * Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/util/uut/cmd.h b/util/uut/cmd.h index 2ca1e825c7..cf8457000b 100644 --- a/util/uut/cmd.h +++ b/util/uut/cmd.h @@ -1,5 +1,5 @@ /* - * Copyright 2018 The Chromium OS Authors. All rights reserved. + * Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/util/uut/com_port.h b/util/uut/com_port.h index 9f2ec41f2c..ca52bdd234 100644 --- a/util/uut/com_port.h +++ b/util/uut/com_port.h @@ -1,5 +1,5 @@ /* - * Copyright 2018 The Chromium OS Authors. All rights reserved. + * Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/util/uut/l_com_port.c b/util/uut/l_com_port.c index 231d47cc04..e774743160 100644 --- a/util/uut/l_com_port.c +++ b/util/uut/l_com_port.c @@ -1,5 +1,5 @@ /* - * Copyright 2018 The Chromium OS Authors. All rights reserved. + * Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/util/uut/lib_crc.c b/util/uut/lib_crc.c index 61ce3c9420..ae83581063 100644 --- a/util/uut/lib_crc.c +++ b/util/uut/lib_crc.c @@ -1,5 +1,5 @@ /* - * Copyright 2018 The Chromium OS Authors. All rights reserved. + * Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/util/uut/lib_crc.h b/util/uut/lib_crc.h index 58db81c4e5..7d75c9b501 100644 --- a/util/uut/lib_crc.h +++ b/util/uut/lib_crc.h @@ -1,5 +1,5 @@ /* - * Copyright 2018 The Chromium OS Authors. All rights reserved. + * Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/util/uut/main.c b/util/uut/main.c index dddb77629b..915bff34d6 100644 --- a/util/uut/main.c +++ b/util/uut/main.c @@ -1,5 +1,5 @@ /* - * Copyright 2018 The Chromium OS Authors. All rights reserved. + * Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/util/uut/main.h b/util/uut/main.h index aa70eaa7ac..43c80dddae 100644 --- a/util/uut/main.h +++ b/util/uut/main.h @@ -1,5 +1,5 @@ /* - * Copyright 2018 The Chromium OS Authors. All rights reserved. + * Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/util/uut/opr.c b/util/uut/opr.c index 6e8edfe863..8ad60bd3d4 100644 --- a/util/uut/opr.c +++ b/util/uut/opr.c @@ -1,5 +1,5 @@ /* - * Copyright 2018 The Chromium OS Authors. All rights reserved. + * Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/util/uut/opr.h b/util/uut/opr.h index a9c0336ed0..820639d6a1 100644 --- a/util/uut/opr.h +++ b/util/uut/opr.h @@ -1,5 +1,5 @@ /* - * Copyright 2018 The Chromium OS Authors. All rights reserved. + * Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/util/zephyr_to_resultdb.py b/util/zephyr_to_resultdb.py index 69855a591d..48bfe151e4 100755 --- a/util/zephyr_to_resultdb.py +++ b/util/zephyr_to_resultdb.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright 2022 The ChromiumOS Authors. +# 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. """ Upload twister results to ResultDB diff --git a/util/zephyr_to_resultdb.py.vpython3 b/util/zephyr_to_resultdb.py.vpython3 index 76666ae879..9a086bffdf 100644 --- a/util/zephyr_to_resultdb.py.vpython3 +++ b/util/zephyr_to_resultdb.py.vpython3 @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. # diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt index 92e488ab16..0aabe7d4f2 100644 --- a/zephyr/CMakeLists.txt +++ b/zephyr/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -563,6 +563,7 @@ add_subdirectory(linker) add_subdirectory("app") add_subdirectory("drivers") add_subdirectory("emul") +add_subdirectory("fake") add_subdirectory("mock") add_subdirectory_ifdef(CONFIG_PLATFORM_EC "shim") diff --git a/zephyr/Kconfig b/zephyr/Kconfig index 7678869f97..62b9fac62c 100644 --- a/zephyr/Kconfig +++ b/zephyr/Kconfig @@ -1,10 +1,11 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. rsource "app/Kconfig" rsource "drivers/Kconfig" rsource "emul/Kconfig" +rsource "fake/Kconfig" rsource "mock/Kconfig" rsource "subsys/Kconfig" diff --git a/zephyr/Kconfig.accelgyro_bmi b/zephyr/Kconfig.accelgyro_bmi index bb8239f6d8..e08ba08838 100644 --- a/zephyr/Kconfig.accelgyro_bmi +++ b/zephyr/Kconfig.accelgyro_bmi @@ -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. diff --git a/zephyr/Kconfig.accelgyro_icm b/zephyr/Kconfig.accelgyro_icm index 2bee9184b5..a8b52c0d38 100644 --- a/zephyr/Kconfig.accelgyro_icm +++ b/zephyr/Kconfig.accelgyro_icm @@ -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. diff --git a/zephyr/Kconfig.adc b/zephyr/Kconfig.adc index 8d4ae2e507..40ec1e4e89 100644 --- a/zephyr/Kconfig.adc +++ b/zephyr/Kconfig.adc @@ -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. diff --git a/zephyr/Kconfig.ap_power b/zephyr/Kconfig.ap_power index 03c92759f0..4e3b4139aa 100644 --- a/zephyr/Kconfig.ap_power +++ b/zephyr/Kconfig.ap_power @@ -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. diff --git a/zephyr/Kconfig.battery b/zephyr/Kconfig.battery index 123c5eba58..92bce6b618 100644 --- a/zephyr/Kconfig.battery +++ b/zephyr/Kconfig.battery @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/Kconfig.board_version b/zephyr/Kconfig.board_version index e24957764d..7b7581d90a 100644 --- a/zephyr/Kconfig.board_version +++ b/zephyr/Kconfig.board_version @@ -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. diff --git a/zephyr/Kconfig.cbi b/zephyr/Kconfig.cbi index 962392e56c..a2be51375e 100644 --- a/zephyr/Kconfig.cbi +++ b/zephyr/Kconfig.cbi @@ -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. diff --git a/zephyr/Kconfig.charger b/zephyr/Kconfig.charger index fe2dd9f408..baa751f138 100644 --- a/zephyr/Kconfig.charger +++ b/zephyr/Kconfig.charger @@ -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. diff --git a/zephyr/Kconfig.chargesplash b/zephyr/Kconfig.chargesplash index 83a914e497..c23b51f2a7 100644 --- a/zephyr/Kconfig.chargesplash +++ b/zephyr/Kconfig.chargesplash @@ -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. diff --git a/zephyr/Kconfig.console b/zephyr/Kconfig.console index 8f0241a4d9..75a4ca7879 100644 --- a/zephyr/Kconfig.console +++ b/zephyr/Kconfig.console @@ -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. diff --git a/zephyr/Kconfig.console_cmd_mem b/zephyr/Kconfig.console_cmd_mem index 4b69cc1778..9be465b488 100644 --- a/zephyr/Kconfig.console_cmd_mem +++ b/zephyr/Kconfig.console_cmd_mem @@ -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. diff --git a/zephyr/Kconfig.debug_assert b/zephyr/Kconfig.debug_assert index ad94f525f6..c05dceae02 100644 --- a/zephyr/Kconfig.debug_assert +++ b/zephyr/Kconfig.debug_assert @@ -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. diff --git a/zephyr/Kconfig.defaults b/zephyr/Kconfig.defaults index 1560bf068a..f7e1f710a2 100644 --- a/zephyr/Kconfig.defaults +++ b/zephyr/Kconfig.defaults @@ -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. diff --git a/zephyr/Kconfig.defaults-arm b/zephyr/Kconfig.defaults-arm index 4dddf87304..2d55aaf7d4 100644 --- a/zephyr/Kconfig.defaults-arm +++ b/zephyr/Kconfig.defaults-arm @@ -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. diff --git a/zephyr/Kconfig.espi b/zephyr/Kconfig.espi index d608a164ef..3e7210362c 100644 --- a/zephyr/Kconfig.espi +++ b/zephyr/Kconfig.espi @@ -1,28 +1,28 @@ -# 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. if PLATFORM_EC_HOST_INTERFACE_ESPI -config PLATFORM_EC_ESPI_VW_SLP_S3 +config PLATFORM_EC_HOST_INTERFACE_ESPI_VW_SLP_S3 bool "SLP_S3 is an eSPI virtual wire instead of a GPIO" help For power sequencing, use an eSPI virtual wire instead of defining GPIO_PCH_SLP_S3 in the GPIO device tree. -config PLATFORM_EC_ESPI_VW_SLP_S4 +config PLATFORM_EC_HOST_INTERFACE_ESPI_VW_SLP_S4 bool "SLP_S4 is an eSPI virtual wire instead of a GPIO" help For power sequencing, use an eSPI virtual wire instead of defining GPIO_PCH_SLP_S4 in the GPIO device tree. -config PLATFORM_EC_ESPI_VW_SLP_S5 +config PLATFORM_EC_HOST_INTERFACE_ESPI_VW_SLP_S5 bool "SLP_S5 is an eSPI virtual wire instead of an alias for SLP_S4" help For power sequencing, use an eSPI virtual wire to read the SLP_S5 line, as opposed to merging it into the same net as SLP_S4. -config PLATFORM_EC_ESPI_RESET_SLP_SX_VW_ON_ESPI_RST +config PLATFORM_EC_HOST_INTERFACE_ESPI_RESET_SLP_SX_VW_ON_ESPI_RST bool "Reset SLP VW signals on eSPI reset" help Enable this config to reset SLP* VW when eSPI_RST is asserted @@ -31,7 +31,7 @@ config PLATFORM_EC_ESPI_RESET_SLP_SX_VW_ON_ESPI_RST maintain these pins' states per request. Note that this is currently unimplemented for Zephyr. Please see b/183148073. -config PLATFORM_EC_ESPI_DEFAULT_VW_WIDTH_US +config PLATFORM_EC_HOST_INTERFACE_ESPI_DEFAULT_VW_WIDTH_US int "Virtual wire pulse width (microseconds)" default 65 help diff --git a/zephyr/Kconfig.flash b/zephyr/Kconfig.flash index 8611c8731b..e632b71e94 100644 --- a/zephyr/Kconfig.flash +++ b/zephyr/Kconfig.flash @@ -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. diff --git a/zephyr/Kconfig.header b/zephyr/Kconfig.header index 931d7dbaf1..02f9ecc1a7 100644 --- a/zephyr/Kconfig.header +++ b/zephyr/Kconfig.header @@ -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. diff --git a/zephyr/Kconfig.host_interface b/zephyr/Kconfig.host_interface index 95fe6a0543..41ff23970f 100644 --- a/zephyr/Kconfig.host_interface +++ b/zephyr/Kconfig.host_interface @@ -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. diff --git a/zephyr/Kconfig.i2c b/zephyr/Kconfig.i2c index 23ccf88bd0..0187409b31 100644 --- a/zephyr/Kconfig.i2c +++ b/zephyr/Kconfig.i2c @@ -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. diff --git a/zephyr/Kconfig.init_priority b/zephyr/Kconfig.init_priority index c974bb4d8f..42d03e8794 100644 --- a/zephyr/Kconfig.init_priority +++ b/zephyr/Kconfig.init_priority @@ -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. diff --git a/zephyr/Kconfig.ioex b/zephyr/Kconfig.ioex index 24a946777d..e9bb8065e1 100644 --- a/zephyr/Kconfig.ioex +++ b/zephyr/Kconfig.ioex @@ -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. diff --git a/zephyr/Kconfig.keyboard b/zephyr/Kconfig.keyboard index ac71b56106..b34b89a059 100644 --- a/zephyr/Kconfig.keyboard +++ b/zephyr/Kconfig.keyboard @@ -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. diff --git a/zephyr/Kconfig.led b/zephyr/Kconfig.led index 03f2ebed56..d3d50ccc56 100644 --- a/zephyr/Kconfig.led +++ b/zephyr/Kconfig.led @@ -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. diff --git a/zephyr/Kconfig.led_dt b/zephyr/Kconfig.led_dt index 16b5842c06..25993802a3 100644 --- a/zephyr/Kconfig.led_dt +++ b/zephyr/Kconfig.led_dt @@ -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. diff --git a/zephyr/Kconfig.mkbp_event b/zephyr/Kconfig.mkbp_event index 66dc2e0690..28d791bbdc 100644 --- a/zephyr/Kconfig.mkbp_event +++ b/zephyr/Kconfig.mkbp_event @@ -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. diff --git a/zephyr/Kconfig.motionsense b/zephyr/Kconfig.motionsense index abfdacc5be..7cf991918b 100644 --- a/zephyr/Kconfig.motionsense +++ b/zephyr/Kconfig.motionsense @@ -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. diff --git a/zephyr/Kconfig.panic b/zephyr/Kconfig.panic index f6e16f5002..c402fc1e70 100644 --- a/zephyr/Kconfig.panic +++ b/zephyr/Kconfig.panic @@ -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. diff --git a/zephyr/Kconfig.pd b/zephyr/Kconfig.pd index d20f92cf15..57d348007d 100644 --- a/zephyr/Kconfig.pd +++ b/zephyr/Kconfig.pd @@ -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. diff --git a/zephyr/Kconfig.pd_console_cmd b/zephyr/Kconfig.pd_console_cmd index bc654f3274..bba130718f 100644 --- a/zephyr/Kconfig.pd_console_cmd +++ b/zephyr/Kconfig.pd_console_cmd @@ -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. diff --git a/zephyr/Kconfig.pd_discharge b/zephyr/Kconfig.pd_discharge index 3631beffa7..6d2bd58b82 100644 --- a/zephyr/Kconfig.pd_discharge +++ b/zephyr/Kconfig.pd_discharge @@ -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. diff --git a/zephyr/Kconfig.pd_frs b/zephyr/Kconfig.pd_frs index 8883542c56..5faf16b05c 100644 --- a/zephyr/Kconfig.pd_frs +++ b/zephyr/Kconfig.pd_frs @@ -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. diff --git a/zephyr/Kconfig.pd_int_shared b/zephyr/Kconfig.pd_int_shared index 6f90d2e3e9..8385496b62 100644 --- a/zephyr/Kconfig.pd_int_shared +++ b/zephyr/Kconfig.pd_int_shared @@ -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. diff --git a/zephyr/Kconfig.pd_meas_vbus b/zephyr/Kconfig.pd_meas_vbus index cffe35985c..1484ad6979 100644 --- a/zephyr/Kconfig.pd_meas_vbus +++ b/zephyr/Kconfig.pd_meas_vbus @@ -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. diff --git a/zephyr/Kconfig.pd_usbc_device_type b/zephyr/Kconfig.pd_usbc_device_type index 4bf1a2d442..62797128cd 100644 --- a/zephyr/Kconfig.pd_usbc_device_type +++ b/zephyr/Kconfig.pd_usbc_device_type @@ -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. diff --git a/zephyr/Kconfig.pd_vbus_detection b/zephyr/Kconfig.pd_vbus_detection index 019eca654a..8e25d973eb 100644 --- a/zephyr/Kconfig.pd_vbus_detection +++ b/zephyr/Kconfig.pd_vbus_detection @@ -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. diff --git a/zephyr/Kconfig.pmic b/zephyr/Kconfig.pmic index dc79305439..831767c546 100644 --- a/zephyr/Kconfig.pmic +++ b/zephyr/Kconfig.pmic @@ -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. diff --git a/zephyr/Kconfig.port80 b/zephyr/Kconfig.port80 index 649f4ae7ea..a03d8295f7 100644 --- a/zephyr/Kconfig.port80 +++ b/zephyr/Kconfig.port80 @@ -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. diff --git a/zephyr/Kconfig.powerseq b/zephyr/Kconfig.powerseq index dbc8187830..e7c0891ab4 100644 --- a/zephyr/Kconfig.powerseq +++ b/zephyr/Kconfig.powerseq @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -131,7 +131,7 @@ config PLATFORM_EC_POWERSEQ_RTC_RESET config PLATFORM_EC_POWERSEQ_S4 bool "Advertise S4 residency" - depends on PLATFORM_EC_ESPI_VW_SLP_S5 + depends on PLATFORM_HOST_INTERFACE_EC_HOST_INTERFACE_ESPI_VW_SLP_S5 default y if AP_X86_INTEL_TGL default y if AP_X86_INTEL_ADL default y if AP_X86_INTEL_MTL diff --git a/zephyr/Kconfig.ppc b/zephyr/Kconfig.ppc index bc782b3282..06f78dcf01 100644 --- a/zephyr/Kconfig.ppc +++ b/zephyr/Kconfig.ppc @@ -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. diff --git a/zephyr/Kconfig.retimer b/zephyr/Kconfig.retimer index f328ffea17..8a460715cb 100644 --- a/zephyr/Kconfig.retimer +++ b/zephyr/Kconfig.retimer @@ -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. diff --git a/zephyr/Kconfig.rtc b/zephyr/Kconfig.rtc index 5f36893122..a157ffdc77 100644 --- a/zephyr/Kconfig.rtc +++ b/zephyr/Kconfig.rtc @@ -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. diff --git a/zephyr/Kconfig.sensor_devices b/zephyr/Kconfig.sensor_devices index 1c8e38ac6f..21851f1a5c 100644 --- a/zephyr/Kconfig.sensor_devices +++ b/zephyr/Kconfig.sensor_devices @@ -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. diff --git a/zephyr/Kconfig.stacks b/zephyr/Kconfig.stacks index 519a827b7c..6d983a3d05 100644 --- a/zephyr/Kconfig.stacks +++ b/zephyr/Kconfig.stacks @@ -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. diff --git a/zephyr/Kconfig.system b/zephyr/Kconfig.system index 65241ca78b..5467bc7422 100644 --- a/zephyr/Kconfig.system +++ b/zephyr/Kconfig.system @@ -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. diff --git a/zephyr/Kconfig.tasks b/zephyr/Kconfig.tasks index d329150e22..0a3c24f1fa 100644 --- a/zephyr/Kconfig.tasks +++ b/zephyr/Kconfig.tasks @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/Kconfig.tcpm b/zephyr/Kconfig.tcpm index 57e0767e73..4078f3f9be 100644 --- a/zephyr/Kconfig.tcpm +++ b/zephyr/Kconfig.tcpm @@ -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. diff --git a/zephyr/Kconfig.temperature b/zephyr/Kconfig.temperature index d648caaf59..09756663bc 100644 --- a/zephyr/Kconfig.temperature +++ b/zephyr/Kconfig.temperature @@ -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. diff --git a/zephyr/Kconfig.throttle_ap b/zephyr/Kconfig.throttle_ap index 74498a4e9f..e4dba3f2b4 100644 --- a/zephyr/Kconfig.throttle_ap +++ b/zephyr/Kconfig.throttle_ap @@ -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. diff --git a/zephyr/Kconfig.timer b/zephyr/Kconfig.timer index 5b615961eb..0e19f2d551 100644 --- a/zephyr/Kconfig.timer +++ b/zephyr/Kconfig.timer @@ -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. diff --git a/zephyr/Kconfig.usb_charger b/zephyr/Kconfig.usb_charger index d224fe2d4f..1c58753412 100644 --- a/zephyr/Kconfig.usb_charger +++ b/zephyr/Kconfig.usb_charger @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/Kconfig.usb_mux b/zephyr/Kconfig.usb_mux index a0db4f666d..6f4e31a2cf 100644 --- a/zephyr/Kconfig.usb_mux +++ b/zephyr/Kconfig.usb_mux @@ -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. diff --git a/zephyr/Kconfig.usba b/zephyr/Kconfig.usba index eba0eb1e37..8abbe839f6 100644 --- a/zephyr/Kconfig.usba +++ b/zephyr/Kconfig.usba @@ -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. diff --git a/zephyr/Kconfig.usbc b/zephyr/Kconfig.usbc index c23de7c79c..37c57bcdd2 100644 --- a/zephyr/Kconfig.usbc +++ b/zephyr/Kconfig.usbc @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/Kconfig.usbc_ss_mux b/zephyr/Kconfig.usbc_ss_mux index 5578deaa6b..5d09bb3b02 100644 --- a/zephyr/Kconfig.usbc_ss_mux +++ b/zephyr/Kconfig.usbc_ss_mux @@ -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. diff --git a/zephyr/Kconfig.watchdog b/zephyr/Kconfig.watchdog index 57d93d7c39..f6c9002233 100644 --- a/zephyr/Kconfig.watchdog +++ b/zephyr/Kconfig.watchdog @@ -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. diff --git a/zephyr/Kconfig.wireless_charger b/zephyr/Kconfig.wireless_charger index e0608d0b57..c53bd6f7cc 100644 --- a/zephyr/Kconfig.wireless_charger +++ b/zephyr/Kconfig.wireless_charger @@ -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. diff --git a/zephyr/app/CMakeLists.txt b/zephyr/app/CMakeLists.txt index dfc45f19f9..0365782963 100644 --- a/zephyr/app/CMakeLists.txt +++ b/zephyr/app/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/app/Kconfig b/zephyr/app/Kconfig index 3cac46afa7..7fb8c917ed 100644 --- a/zephyr/app/Kconfig +++ b/zephyr/app/Kconfig @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/app/ec/CMakeLists.txt b/zephyr/app/ec/CMakeLists.txt index 6ddac15080..ac3d3fe3d2 100644 --- a/zephyr/app/ec/CMakeLists.txt +++ b/zephyr/app/ec/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/app/ec/Kconfig b/zephyr/app/ec/Kconfig index ebdeebfdf2..ddaab418c2 100644 --- a/zephyr/app/ec/Kconfig +++ b/zephyr/app/ec/Kconfig @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/app/ec/chip/arm/microchip_xec/Kconfig.xec b/zephyr/app/ec/chip/arm/microchip_xec/Kconfig.xec index 6a78792733..3baca08d04 100644 --- a/zephyr/app/ec/chip/arm/microchip_xec/Kconfig.xec +++ b/zephyr/app/ec/chip/arm/microchip_xec/Kconfig.xec @@ -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. diff --git a/zephyr/app/ec/chip/arm/microchip_xec/Kconfig.xec_mec172x b/zephyr/app/ec/chip/arm/microchip_xec/Kconfig.xec_mec172x index 9e37b6a534..bfcfeb8235 100644 --- a/zephyr/app/ec/chip/arm/microchip_xec/Kconfig.xec_mec172x +++ b/zephyr/app/ec/chip/arm/microchip_xec/Kconfig.xec_mec172x @@ -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. diff --git a/zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx b/zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx index 2e3d3c95a0..17936ab05d 100644 --- a/zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx +++ b/zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx @@ -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. diff --git a/zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx7 b/zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx7 index 37561f4dad..cb00db3345 100644 --- a/zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx7 +++ b/zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx7 @@ -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. diff --git a/zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx9 b/zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx9 index aceec4f3ca..9c807a732c 100644 --- a/zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx9 +++ b/zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx9 @@ -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. diff --git a/zephyr/app/ec/chip/riscv/riscv-ite/Kconfig.it8xxx2 b/zephyr/app/ec/chip/riscv/riscv-ite/Kconfig.it8xxx2 index 809b9a6401..e0ea15c5b7 100644 --- a/zephyr/app/ec/chip/riscv/riscv-ite/Kconfig.it8xxx2 +++ b/zephyr/app/ec/chip/riscv/riscv-ite/Kconfig.it8xxx2 @@ -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. diff --git a/zephyr/app/ec/chip/riscv/riscv-ite/it8xxx2-espi.c b/zephyr/app/ec/chip/riscv/riscv-ite/it8xxx2-espi.c index 88fd96c9d2..6109964cb9 100644 --- a/zephyr/app/ec/chip/riscv/riscv-ite/it8xxx2-espi.c +++ b/zephyr/app/ec/chip/riscv/riscv-ite/it8xxx2-espi.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/app/ec/ec_app_main.c b/zephyr/app/ec/ec_app_main.c index 414ed65e9c..9b13c8ab86 100644 --- a/zephyr/app/ec/ec_app_main.c +++ b/zephyr/app/ec/ec_app_main.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -6,7 +6,6 @@ #include <zephyr/kernel.h> #include <zephyr/sys/printk.h> #include <zephyr/shell/shell_uart.h> -#include <zephyr/zephyr.h> #include "ap_power/ap_pwrseq.h" #include "button.h" diff --git a/zephyr/app/ec/include/ec_app_main.h b/zephyr/app/ec/include/ec_app_main.h index a5043be84a..472e0b5c0e 100644 --- a/zephyr/app/ec/include/ec_app_main.h +++ b/zephyr/app/ec/include/ec_app_main.h @@ -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. */ diff --git a/zephyr/app/ec/main_shim.c b/zephyr/app/ec/main_shim.c index 7e54c83295..a14cff2dcb 100644 --- a/zephyr/app/ec/main_shim.c +++ b/zephyr/app/ec/main_shim.c @@ -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. */ diff --git a/zephyr/app/ec/soc/Kconfig b/zephyr/app/ec/soc/Kconfig index 9d3c851a36..3dccfa3a2a 100644 --- a/zephyr/app/ec/soc/Kconfig +++ b/zephyr/app/ec/soc/Kconfig @@ -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. diff --git a/zephyr/boards/arm/mec1727/Kconfig.board b/zephyr/boards/arm/mec1727/Kconfig.board index 66a3993185..7b11c1a0e9 100644 --- a/zephyr/boards/arm/mec1727/Kconfig.board +++ b/zephyr/boards/arm/mec1727/Kconfig.board @@ -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. diff --git a/zephyr/boards/arm/mec1727/Kconfig.defconfig b/zephyr/boards/arm/mec1727/Kconfig.defconfig index 0708bda48c..8afdc63abf 100644 --- a/zephyr/boards/arm/mec1727/Kconfig.defconfig +++ b/zephyr/boards/arm/mec1727/Kconfig.defconfig @@ -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. diff --git a/zephyr/boards/arm/mec1727/board.cmake b/zephyr/boards/arm/mec1727/board.cmake index b67f47c819..d28d9c55e2 100644 --- a/zephyr/boards/arm/mec1727/board.cmake +++ b/zephyr/boards/arm/mec1727/board.cmake @@ -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. diff --git a/zephyr/boards/arm/mec1727/mec1727_defconfig b/zephyr/boards/arm/mec1727/mec1727_defconfig index f60fcb7865..b6aa0dd1e9 100644 --- a/zephyr/boards/arm/mec1727/mec1727_defconfig +++ b/zephyr/boards/arm/mec1727/mec1727_defconfig @@ -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. diff --git a/zephyr/boards/arm/npcx7/Kconfig.board b/zephyr/boards/arm/npcx7/Kconfig.board index 706f03a577..b5c0134b75 100644 --- a/zephyr/boards/arm/npcx7/Kconfig.board +++ b/zephyr/boards/arm/npcx7/Kconfig.board @@ -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. diff --git a/zephyr/boards/arm/npcx7/Kconfig.defconfig b/zephyr/boards/arm/npcx7/Kconfig.defconfig index fcea4f964e..afa9640b5a 100644 --- a/zephyr/boards/arm/npcx7/Kconfig.defconfig +++ b/zephyr/boards/arm/npcx7/Kconfig.defconfig @@ -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. diff --git a/zephyr/boards/arm/npcx7/board.cmake b/zephyr/boards/arm/npcx7/board.cmake index f2117625b3..e1d12397eb 100644 --- a/zephyr/boards/arm/npcx7/board.cmake +++ b/zephyr/boards/arm/npcx7/board.cmake @@ -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. diff --git a/zephyr/boards/arm/npcx7/npcx7.dts b/zephyr/boards/arm/npcx7/npcx7.dts index c59622c354..99e152c260 100644 --- a/zephyr/boards/arm/npcx7/npcx7.dts +++ b/zephyr/boards/arm/npcx7/npcx7.dts @@ -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. */ diff --git a/zephyr/boards/arm/npcx7/npcx7_defconfig b/zephyr/boards/arm/npcx7/npcx7_defconfig index d091dfef40..c6c8f6c3f4 100644 --- a/zephyr/boards/arm/npcx7/npcx7_defconfig +++ b/zephyr/boards/arm/npcx7/npcx7_defconfig @@ -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. diff --git a/zephyr/boards/arm/npcx9/Kconfig.board b/zephyr/boards/arm/npcx9/Kconfig.board index c469ada39e..64e02d2c92 100644 --- a/zephyr/boards/arm/npcx9/Kconfig.board +++ b/zephyr/boards/arm/npcx9/Kconfig.board @@ -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. diff --git a/zephyr/boards/arm/npcx9/Kconfig.defconfig b/zephyr/boards/arm/npcx9/Kconfig.defconfig index a8e2fbc0fd..f764ad0454 100644 --- a/zephyr/boards/arm/npcx9/Kconfig.defconfig +++ b/zephyr/boards/arm/npcx9/Kconfig.defconfig @@ -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. diff --git a/zephyr/boards/arm/npcx9/board.cmake b/zephyr/boards/arm/npcx9/board.cmake index a204305534..e5e2fedd4f 100644 --- a/zephyr/boards/arm/npcx9/board.cmake +++ b/zephyr/boards/arm/npcx9/board.cmake @@ -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. diff --git a/zephyr/boards/arm/npcx9/npcx9.dtsi b/zephyr/boards/arm/npcx9/npcx9.dtsi index 48b2d20db4..d253928dea 100644 --- a/zephyr/boards/arm/npcx9/npcx9.dtsi +++ b/zephyr/boards/arm/npcx9/npcx9.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. */ diff --git a/zephyr/boards/arm/npcx9/npcx9m3f.dts b/zephyr/boards/arm/npcx9/npcx9m3f.dts index 1b009dfa0b..a51aeccae1 100644 --- a/zephyr/boards/arm/npcx9/npcx9m3f.dts +++ b/zephyr/boards/arm/npcx9/npcx9m3f.dts @@ -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. */ diff --git a/zephyr/boards/arm/npcx9/npcx9m3f_defconfig b/zephyr/boards/arm/npcx9/npcx9m3f_defconfig index 4c94dbaa46..d3b4bcc3a2 100644 --- a/zephyr/boards/arm/npcx9/npcx9m3f_defconfig +++ b/zephyr/boards/arm/npcx9/npcx9m3f_defconfig @@ -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. diff --git a/zephyr/boards/arm/npcx9/npcx9m7f.dts b/zephyr/boards/arm/npcx9/npcx9m7f.dts index ebb355c877..5f936173e1 100644 --- a/zephyr/boards/arm/npcx9/npcx9m7f.dts +++ b/zephyr/boards/arm/npcx9/npcx9m7f.dts @@ -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. */ diff --git a/zephyr/boards/arm/npcx9/npcx9m7f_defconfig b/zephyr/boards/arm/npcx9/npcx9m7f_defconfig index 031b3ab886..e742904aed 100644 --- a/zephyr/boards/arm/npcx9/npcx9m7f_defconfig +++ b/zephyr/boards/arm/npcx9/npcx9m7f_defconfig @@ -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. diff --git a/zephyr/boards/arm/npcx_evb/Kconfig.board b/zephyr/boards/arm/npcx_evb/Kconfig.board index 0a64548887..00b6b75f72 100644 --- a/zephyr/boards/arm/npcx_evb/Kconfig.board +++ b/zephyr/boards/arm/npcx_evb/Kconfig.board @@ -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. diff --git a/zephyr/boards/arm/npcx_evb/Kconfig.defconfig b/zephyr/boards/arm/npcx_evb/Kconfig.defconfig index c0c874ad26..512a8403e7 100644 --- a/zephyr/boards/arm/npcx_evb/Kconfig.defconfig +++ b/zephyr/boards/arm/npcx_evb/Kconfig.defconfig @@ -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. diff --git a/zephyr/boards/arm/npcx_evb/npcx7_evb.dts b/zephyr/boards/arm/npcx_evb/npcx7_evb.dts index 7d6eee1359..75ad9e33a6 100644 --- a/zephyr/boards/arm/npcx_evb/npcx7_evb.dts +++ b/zephyr/boards/arm/npcx_evb/npcx7_evb.dts @@ -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. */ diff --git a/zephyr/boards/arm/npcx_evb/npcx7_evb_defconfig b/zephyr/boards/arm/npcx_evb/npcx7_evb_defconfig index 02162e0537..faee09f492 100644 --- a/zephyr/boards/arm/npcx_evb/npcx7_evb_defconfig +++ b/zephyr/boards/arm/npcx_evb/npcx7_evb_defconfig @@ -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. diff --git a/zephyr/boards/arm/npcx_evb/npcx9_evb.dts b/zephyr/boards/arm/npcx_evb/npcx9_evb.dts index e9e010833b..1def8dc48f 100644 --- a/zephyr/boards/arm/npcx_evb/npcx9_evb.dts +++ b/zephyr/boards/arm/npcx_evb/npcx9_evb.dts @@ -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. */ diff --git a/zephyr/boards/arm/npcx_evb/npcx9_evb_defconfig b/zephyr/boards/arm/npcx_evb/npcx9_evb_defconfig index 157283c89e..da75b3d113 100644 --- a/zephyr/boards/arm/npcx_evb/npcx9_evb_defconfig +++ b/zephyr/boards/arm/npcx_evb/npcx9_evb_defconfig @@ -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. diff --git a/zephyr/boards/arm/npcx_evb/npcx_evb.dtsi b/zephyr/boards/arm/npcx_evb/npcx_evb.dtsi index 074090e203..615df09a64 100644 --- a/zephyr/boards/arm/npcx_evb/npcx_evb.dtsi +++ b/zephyr/boards/arm/npcx_evb/npcx_evb.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. */ diff --git a/zephyr/boards/riscv/it8xxx2/Kconfig.board b/zephyr/boards/riscv/it8xxx2/Kconfig.board index 0e58c236f8..157d269c77 100644 --- a/zephyr/boards/riscv/it8xxx2/Kconfig.board +++ b/zephyr/boards/riscv/it8xxx2/Kconfig.board @@ -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. diff --git a/zephyr/boards/riscv/it8xxx2/Kconfig.defconfig b/zephyr/boards/riscv/it8xxx2/Kconfig.defconfig index b21d0f2d7f..6b38f9395b 100644 --- a/zephyr/boards/riscv/it8xxx2/Kconfig.defconfig +++ b/zephyr/boards/riscv/it8xxx2/Kconfig.defconfig @@ -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. diff --git a/zephyr/boards/riscv/it8xxx2/it81202bx.dts b/zephyr/boards/riscv/it8xxx2/it81202bx.dts index 76080c0a80..d2c892f735 100644 --- a/zephyr/boards/riscv/it8xxx2/it81202bx.dts +++ b/zephyr/boards/riscv/it8xxx2/it81202bx.dts @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/boards/riscv/it8xxx2/it81202bx_defconfig b/zephyr/boards/riscv/it8xxx2/it81202bx_defconfig index 2b8cf5f783..a024ab5824 100644 --- a/zephyr/boards/riscv/it8xxx2/it81202bx_defconfig +++ b/zephyr/boards/riscv/it8xxx2/it81202bx_defconfig @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/zephyr/boards/riscv/it8xxx2/it81302bx.dts b/zephyr/boards/riscv/it8xxx2/it81302bx.dts index 76080c0a80..d2c892f735 100644 --- a/zephyr/boards/riscv/it8xxx2/it81302bx.dts +++ b/zephyr/boards/riscv/it8xxx2/it81302bx.dts @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/boards/riscv/it8xxx2/it81302bx_defconfig b/zephyr/boards/riscv/it8xxx2/it81302bx_defconfig index e72e25700a..2841b9663c 100644 --- a/zephyr/boards/riscv/it8xxx2/it81302bx_defconfig +++ b/zephyr/boards/riscv/it8xxx2/it81302bx_defconfig @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/zephyr/boards/riscv/it8xxx2/it8xxx2.dts b/zephyr/boards/riscv/it8xxx2/it8xxx2.dts index 405d8f7a3e..640efd1433 100644 --- a/zephyr/boards/riscv/it8xxx2/it8xxx2.dts +++ b/zephyr/boards/riscv/it8xxx2/it8xxx2.dts @@ -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. */ diff --git a/zephyr/cmake/bintools/gnu/target.cmake b/zephyr/cmake/bintools/gnu/target.cmake index 2ec9d075dc..13e81ed4a0 100644 --- a/zephyr/cmake/bintools/gnu/target.cmake +++ b/zephyr/cmake/bintools/gnu/target.cmake @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/cmake/bintools/llvm/generic.cmake b/zephyr/cmake/bintools/llvm/generic.cmake index 94b35ed51d..f85236d39c 100644 --- a/zephyr/cmake/bintools/llvm/generic.cmake +++ b/zephyr/cmake/bintools/llvm/generic.cmake @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/cmake/bintools/llvm/target.cmake b/zephyr/cmake/bintools/llvm/target.cmake index a77d459288..9e747483ae 100644 --- a/zephyr/cmake/bintools/llvm/target.cmake +++ b/zephyr/cmake/bintools/llvm/target.cmake @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/cmake/compiler/clang/compiler_flags.cmake b/zephyr/cmake/compiler/clang/compiler_flags.cmake index 6b86a8705a..3423f1c36c 100644 --- a/zephyr/cmake/compiler/clang/compiler_flags.cmake +++ b/zephyr/cmake/compiler/clang/compiler_flags.cmake @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/cmake/compiler/clang/generic.cmake b/zephyr/cmake/compiler/clang/generic.cmake index aa3665ad39..b848c8bd03 100644 --- a/zephyr/cmake/compiler/clang/generic.cmake +++ b/zephyr/cmake/compiler/clang/generic.cmake @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/cmake/compiler/clang/target.cmake b/zephyr/cmake/compiler/clang/target.cmake index 6702087df5..bda3efdeae 100644 --- a/zephyr/cmake/compiler/clang/target.cmake +++ b/zephyr/cmake/compiler/clang/target.cmake @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/cmake/compiler/gcc/compiler_flags.cmake b/zephyr/cmake/compiler/gcc/compiler_flags.cmake index b5a6d01d5f..adc111835e 100644 --- a/zephyr/cmake/compiler/gcc/compiler_flags.cmake +++ b/zephyr/cmake/compiler/gcc/compiler_flags.cmake @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/cmake/compiler/gcc/target.cmake b/zephyr/cmake/compiler/gcc/target.cmake index 5bdb6fc5f6..943ea167ca 100644 --- a/zephyr/cmake/compiler/gcc/target.cmake +++ b/zephyr/cmake/compiler/gcc/target.cmake @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/cmake/linker/ld/gcc/linker_flags.cmake b/zephyr/cmake/linker/ld/gcc/linker_flags.cmake new file mode 100644 index 0000000000..f71793c431 --- /dev/null +++ b/zephyr/cmake/linker/ld/gcc/linker_flags.cmake @@ -0,0 +1,7 @@ +# 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. + +# GCC 11 by default emits DWARF version 5 which cannot be parsed by +# pyelftools. Can be removed once pyelftools supports v5. +add_link_options(-gdwarf-4) diff --git a/zephyr/cmake/linker/ld/linker_flags.cmake b/zephyr/cmake/linker/ld/linker_flags.cmake index c80d1d2452..d6045ba6ed 100644 --- a/zephyr/cmake/linker/ld/linker_flags.cmake +++ b/zephyr/cmake/linker/ld/linker_flags.cmake @@ -1,7 +1,11 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # Zephyr cmake system looks into ${TOOLCHAIN_ROOT}, but we just send # this out to the copy in ${ZEPHYR_BASE}. include("${ZEPHYR_BASE}/cmake/linker/ld/linker_flags.cmake") + +# There can also be compiler specific linker options, so try to include +# our version of that also. +include("${TOOLCHAIN_ROOT}/cmake/linker/${LINKER}/${COMPILER}/linker_flags.cmake" OPTIONAL) diff --git a/zephyr/cmake/linker/ld/target.cmake b/zephyr/cmake/linker/ld/target.cmake index 0e2ad1f4d7..02dd95b236 100644 --- a/zephyr/cmake/linker/ld/target.cmake +++ b/zephyr/cmake/linker/ld/target.cmake @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/cmake/linker/lld/linker_flags.cmake b/zephyr/cmake/linker/lld/linker_flags.cmake index 5055e4c5a4..d382bd5b60 100644 --- a/zephyr/cmake/linker/lld/linker_flags.cmake +++ b/zephyr/cmake/linker/lld/linker_flags.cmake @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/cmake/linker/lld/target.cmake b/zephyr/cmake/linker/lld/target.cmake index 3f1356440e..10774909a2 100644 --- a/zephyr/cmake/linker/lld/target.cmake +++ b/zephyr/cmake/linker/lld/target.cmake @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/cmake/toolchain/coreboot-sdk/generic.cmake b/zephyr/cmake/toolchain/coreboot-sdk/generic.cmake index 1b86948bcd..d20f19528d 100644 --- a/zephyr/cmake/toolchain/coreboot-sdk/generic.cmake +++ b/zephyr/cmake/toolchain/coreboot-sdk/generic.cmake @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/cmake/toolchain/coreboot-sdk/target.cmake b/zephyr/cmake/toolchain/coreboot-sdk/target.cmake index 5f3d86459b..82804e6b32 100644 --- a/zephyr/cmake/toolchain/coreboot-sdk/target.cmake +++ b/zephyr/cmake/toolchain/coreboot-sdk/target.cmake @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/cmake/toolchain/llvm/generic.cmake b/zephyr/cmake/toolchain/llvm/generic.cmake index 6a248a13cf..933162d9bb 100644 --- a/zephyr/cmake/toolchain/llvm/generic.cmake +++ b/zephyr/cmake/toolchain/llvm/generic.cmake @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/cmake/toolchain/llvm/target.cmake b/zephyr/cmake/toolchain/llvm/target.cmake index d79d73d1ae..e6960dade5 100644 --- a/zephyr/cmake/toolchain/llvm/target.cmake +++ b/zephyr/cmake/toolchain/llvm/target.cmake @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/drivers/CMakeLists.txt b/zephyr/drivers/CMakeLists.txt index ae74955a44..38d8b3f7bb 100644 --- a/zephyr/drivers/CMakeLists.txt +++ b/zephyr/drivers/CMakeLists.txt @@ -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. diff --git a/zephyr/drivers/Kconfig b/zephyr/drivers/Kconfig index 041a6cf212..0848d83939 100644 --- a/zephyr/drivers/Kconfig +++ b/zephyr/drivers/Kconfig @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/drivers/cros_displight/CMakeLists.txt b/zephyr/drivers/cros_displight/CMakeLists.txt index 9f6d99ee34..5e43d5fedd 100644 --- a/zephyr/drivers/cros_displight/CMakeLists.txt +++ b/zephyr/drivers/cros_displight/CMakeLists.txt @@ -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. diff --git a/zephyr/drivers/cros_displight/cros_displight.c b/zephyr/drivers/cros_displight/cros_displight.c index 6f4697e36c..98d1dd0823 100644 --- a/zephyr/drivers/cros_displight/cros_displight.c +++ b/zephyr/drivers/cros_displight/cros_displight.c @@ -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. */ diff --git a/zephyr/drivers/cros_flash/CMakeLists.txt b/zephyr/drivers/cros_flash/CMakeLists.txt index 1846d10576..fdd60a2f44 100644 --- a/zephyr/drivers/cros_flash/CMakeLists.txt +++ b/zephyr/drivers/cros_flash/CMakeLists.txt @@ -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. diff --git a/zephyr/drivers/cros_flash/Kconfig b/zephyr/drivers/cros_flash/Kconfig index 68ed451f27..247f261cc5 100644 --- a/zephyr/drivers/cros_flash/Kconfig +++ b/zephyr/drivers/cros_flash/Kconfig @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/drivers/cros_flash/cros_flash_it8xxx2.c b/zephyr/drivers/cros_flash/cros_flash_it8xxx2.c index 1b2dd723c7..4838c5d583 100644 --- a/zephyr/drivers/cros_flash/cros_flash_it8xxx2.c +++ b/zephyr/drivers/cros_flash/cros_flash_it8xxx2.c @@ -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. */ diff --git a/zephyr/drivers/cros_flash/cros_flash_npcx.c b/zephyr/drivers/cros_flash/cros_flash_npcx.c index e0ffe9f348..032bb5906c 100644 --- a/zephyr/drivers/cros_flash/cros_flash_npcx.c +++ b/zephyr/drivers/cros_flash/cros_flash_npcx.c @@ -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. */ diff --git a/zephyr/drivers/cros_flash/cros_flash_xec.c b/zephyr/drivers/cros_flash/cros_flash_xec.c index 53ab4c57a7..2b92eae25b 100644 --- a/zephyr/drivers/cros_flash/cros_flash_xec.c +++ b/zephyr/drivers/cros_flash/cros_flash_xec.c @@ -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. */ diff --git a/zephyr/drivers/cros_kb_raw/CMakeLists.txt b/zephyr/drivers/cros_kb_raw/CMakeLists.txt index 0b51057dbf..680b15342e 100644 --- a/zephyr/drivers/cros_kb_raw/CMakeLists.txt +++ b/zephyr/drivers/cros_kb_raw/CMakeLists.txt @@ -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. diff --git a/zephyr/drivers/cros_kb_raw/Kconfig b/zephyr/drivers/cros_kb_raw/Kconfig index 682c7843b9..1055c8a4b2 100644 --- a/zephyr/drivers/cros_kb_raw/Kconfig +++ b/zephyr/drivers/cros_kb_raw/Kconfig @@ -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. diff --git a/zephyr/drivers/cros_kb_raw/cros_kb_raw_ite.c b/zephyr/drivers/cros_kb_raw/cros_kb_raw_ite.c index 9e2df93c74..fdbc8ee30d 100644 --- a/zephyr/drivers/cros_kb_raw/cros_kb_raw_ite.c +++ b/zephyr/drivers/cros_kb_raw/cros_kb_raw_ite.c @@ -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. */ diff --git a/zephyr/drivers/cros_kb_raw/cros_kb_raw_npcx.c b/zephyr/drivers/cros_kb_raw/cros_kb_raw_npcx.c index cc60794d24..c720f4b431 100644 --- a/zephyr/drivers/cros_kb_raw/cros_kb_raw_npcx.c +++ b/zephyr/drivers/cros_kb_raw/cros_kb_raw_npcx.c @@ -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. */ diff --git a/zephyr/drivers/cros_kb_raw/cros_kb_raw_xec.c b/zephyr/drivers/cros_kb_raw/cros_kb_raw_xec.c index 75e7a42634..797377f84f 100644 --- a/zephyr/drivers/cros_kb_raw/cros_kb_raw_xec.c +++ b/zephyr/drivers/cros_kb_raw/cros_kb_raw_xec.c @@ -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. */ diff --git a/zephyr/drivers/cros_kblight/CMakeLists.txt b/zephyr/drivers/cros_kblight/CMakeLists.txt index a9e8516f85..6371370b65 100644 --- a/zephyr/drivers/cros_kblight/CMakeLists.txt +++ b/zephyr/drivers/cros_kblight/CMakeLists.txt @@ -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. diff --git a/zephyr/drivers/cros_kblight/pwm_kblight.c b/zephyr/drivers/cros_kblight/pwm_kblight.c index 3d56ec1dc1..59b4ef20ef 100644 --- a/zephyr/drivers/cros_kblight/pwm_kblight.c +++ b/zephyr/drivers/cros_kblight/pwm_kblight.c @@ -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. */ diff --git a/zephyr/drivers/cros_rtc/CMakeLists.txt b/zephyr/drivers/cros_rtc/CMakeLists.txt index bfec8b9ad5..d9ae577254 100644 --- a/zephyr/drivers/cros_rtc/CMakeLists.txt +++ b/zephyr/drivers/cros_rtc/CMakeLists.txt @@ -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. diff --git a/zephyr/drivers/cros_rtc/Kconfig b/zephyr/drivers/cros_rtc/Kconfig index 50a4d00022..2839b03c62 100644 --- a/zephyr/drivers/cros_rtc/Kconfig +++ b/zephyr/drivers/cros_rtc/Kconfig @@ -1,8 +1,8 @@ -# 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. -if PLATFORM_EC_RTC +if PLATFORM_EC_RTC && !ARCH_POSIX choice CROS_RTC_TYPE prompt "Select the RTC to use" diff --git a/zephyr/drivers/cros_rtc/cros_rtc_xec.c b/zephyr/drivers/cros_rtc/cros_rtc_xec.c index 3229105fd7..c543aab6af 100644 --- a/zephyr/drivers/cros_rtc/cros_rtc_xec.c +++ b/zephyr/drivers/cros_rtc/cros_rtc_xec.c @@ -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. */ diff --git a/zephyr/drivers/cros_rtc/nxp_rtc_pcf85063a.c b/zephyr/drivers/cros_rtc/nxp_rtc_pcf85063a.c index 046fe9c7e1..c5580eaeef 100644 --- a/zephyr/drivers/cros_rtc/nxp_rtc_pcf85063a.c +++ b/zephyr/drivers/cros_rtc/nxp_rtc_pcf85063a.c @@ -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. */ diff --git a/zephyr/drivers/cros_rtc/nxp_rtc_pcf85063a.h b/zephyr/drivers/cros_rtc/nxp_rtc_pcf85063a.h index 433f2a355a..54b1fbd2ea 100644 --- a/zephyr/drivers/cros_rtc/nxp_rtc_pcf85063a.h +++ b/zephyr/drivers/cros_rtc/nxp_rtc_pcf85063a.h @@ -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. */ diff --git a/zephyr/drivers/cros_rtc/renesas_rtc_idt1337ag.c b/zephyr/drivers/cros_rtc/renesas_rtc_idt1337ag.c index 2880801d72..7a9a11fd41 100644 --- a/zephyr/drivers/cros_rtc/renesas_rtc_idt1337ag.c +++ b/zephyr/drivers/cros_rtc/renesas_rtc_idt1337ag.c @@ -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. */ diff --git a/zephyr/drivers/cros_rtc/renesas_rtc_idt1337ag.h b/zephyr/drivers/cros_rtc/renesas_rtc_idt1337ag.h index 3b18cf4282..9dd195e8c3 100644 --- a/zephyr/drivers/cros_rtc/renesas_rtc_idt1337ag.h +++ b/zephyr/drivers/cros_rtc/renesas_rtc_idt1337ag.h @@ -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. */ diff --git a/zephyr/drivers/cros_shi/CMakeLists.txt b/zephyr/drivers/cros_shi/CMakeLists.txt index f0b3c8bb5a..c4708f3551 100644 --- a/zephyr/drivers/cros_shi/CMakeLists.txt +++ b/zephyr/drivers/cros_shi/CMakeLists.txt @@ -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. diff --git a/zephyr/drivers/cros_shi/Kconfig b/zephyr/drivers/cros_shi/Kconfig index 8ca08b6b19..ebcd937c7d 100644 --- a/zephyr/drivers/cros_shi/Kconfig +++ b/zephyr/drivers/cros_shi/Kconfig @@ -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. diff --git a/zephyr/drivers/cros_shi/cros_shi_it8xxx2.c b/zephyr/drivers/cros_shi/cros_shi_it8xxx2.c index ba7419640c..ee6ce3f7a4 100644 --- a/zephyr/drivers/cros_shi/cros_shi_it8xxx2.c +++ b/zephyr/drivers/cros_shi/cros_shi_it8xxx2.c @@ -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. */ diff --git a/zephyr/drivers/cros_shi/cros_shi_npcx.c b/zephyr/drivers/cros_shi/cros_shi_npcx.c index 33f20155cb..ce3279288b 100644 --- a/zephyr/drivers/cros_shi/cros_shi_npcx.c +++ b/zephyr/drivers/cros_shi/cros_shi_npcx.c @@ -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. */ diff --git a/zephyr/drivers/cros_system/CMakeLists.txt b/zephyr/drivers/cros_system/CMakeLists.txt index b0d3730cbc..0838dca1ae 100644 --- a/zephyr/drivers/cros_system/CMakeLists.txt +++ b/zephyr/drivers/cros_system/CMakeLists.txt @@ -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. diff --git a/zephyr/drivers/cros_system/Kconfig b/zephyr/drivers/cros_system/Kconfig index 3f58f0eb21..80fc701285 100644 --- a/zephyr/drivers/cros_system/Kconfig +++ b/zephyr/drivers/cros_system/Kconfig @@ -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. diff --git a/zephyr/drivers/cros_system/cros_system_it8xxx2.c b/zephyr/drivers/cros_system/cros_system_it8xxx2.c index 39fde98175..8c63886808 100644 --- a/zephyr/drivers/cros_system/cros_system_it8xxx2.c +++ b/zephyr/drivers/cros_system/cros_system_it8xxx2.c @@ -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. */ diff --git a/zephyr/drivers/cros_system/cros_system_npcx.c b/zephyr/drivers/cros_system/cros_system_npcx.c index a4885ed9da..4ab21ca549 100644 --- a/zephyr/drivers/cros_system/cros_system_npcx.c +++ b/zephyr/drivers/cros_system/cros_system_npcx.c @@ -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. */ diff --git a/zephyr/drivers/cros_system/cros_system_xec.c b/zephyr/drivers/cros_system/cros_system_xec.c index d2ea3c9a22..9ed658d251 100644 --- a/zephyr/drivers/cros_system/cros_system_xec.c +++ b/zephyr/drivers/cros_system/cros_system_xec.c @@ -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. */ diff --git a/zephyr/dts/bindings/adc/named-adc-channels.yaml b/zephyr/dts/bindings/adc/named-adc-channels.yaml index f67588c0d5..f1b6f19790 100644 --- a/zephyr/dts/bindings/adc/named-adc-channels.yaml +++ b/zephyr/dts/bindings/adc/named-adc-channels.yaml @@ -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. diff --git a/zephyr/dts/bindings/battery/aec,5477109.yaml b/zephyr/dts/bindings/battery/aec,5477109.yaml index ca0ce51eb1..3cb8e44135 100644 --- a/zephyr/dts/bindings/battery/aec,5477109.yaml +++ b/zephyr/dts/bindings/battery/aec,5477109.yaml @@ -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. diff --git a/zephyr/dts/bindings/battery/battery-fuel-gauge.yaml b/zephyr/dts/bindings/battery/battery-fuel-gauge.yaml index b2601840a5..d2fed4bfa6 100644 --- a/zephyr/dts/bindings/battery/battery-fuel-gauge.yaml +++ b/zephyr/dts/bindings/battery/battery-fuel-gauge.yaml @@ -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. diff --git a/zephyr/dts/bindings/battery/battery-info.yaml b/zephyr/dts/bindings/battery/battery-info.yaml index 3a4cb875e7..54e81cedeb 100644 --- a/zephyr/dts/bindings/battery/battery-info.yaml +++ b/zephyr/dts/bindings/battery/battery-info.yaml @@ -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. diff --git a/zephyr/dts/bindings/battery/battery-smart.yaml b/zephyr/dts/bindings/battery/battery-smart.yaml index db934bb7d1..b30a565e51 100644 --- a/zephyr/dts/bindings/battery/battery-smart.yaml +++ b/zephyr/dts/bindings/battery/battery-smart.yaml @@ -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. diff --git a/zephyr/dts/bindings/battery/byd,l22b3pg0.yaml b/zephyr/dts/bindings/battery/byd,l22b3pg0.yaml index 2b827dcbf7..dbe82d5aaa 100644 --- a/zephyr/dts/bindings/battery/byd,l22b3pg0.yaml +++ b/zephyr/dts/bindings/battery/byd,l22b3pg0.yaml @@ -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. diff --git a/zephyr/dts/bindings/battery/celxpert,l22c3pg0.yaml b/zephyr/dts/bindings/battery/celxpert,l22c3pg0.yaml index 3354866154..2e99336c06 100644 --- a/zephyr/dts/bindings/battery/celxpert,l22c3pg0.yaml +++ b/zephyr/dts/bindings/battery/celxpert,l22c3pg0.yaml @@ -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. diff --git a/zephyr/dts/bindings/battery/cosmx,gh02047xl.yaml b/zephyr/dts/bindings/battery/cosmx,gh02047xl.yaml index 8c14fda127..aa44980621 100644 --- a/zephyr/dts/bindings/battery/cosmx,gh02047xl.yaml +++ b/zephyr/dts/bindings/battery/cosmx,gh02047xl.yaml @@ -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. diff --git a/zephyr/dts/bindings/battery/cosmx,l22x3pg0.yaml b/zephyr/dts/bindings/battery/cosmx,l22x3pg0.yaml index ddcc67c3a0..b8e199d6cb 100644 --- a/zephyr/dts/bindings/battery/cosmx,l22x3pg0.yaml +++ b/zephyr/dts/bindings/battery/cosmx,l22x3pg0.yaml @@ -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. diff --git a/zephyr/dts/bindings/battery/dynapack,atl_gh02047xl.yaml b/zephyr/dts/bindings/battery/dynapack,atl_gh02047xl.yaml index 141241ba05..3bc3eccb4c 100644 --- a/zephyr/dts/bindings/battery/dynapack,atl_gh02047xl.yaml +++ b/zephyr/dts/bindings/battery/dynapack,atl_gh02047xl.yaml @@ -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. diff --git a/zephyr/dts/bindings/battery/dynapack,cosmx_gh02047xl.yaml b/zephyr/dts/bindings/battery/dynapack,cosmx_gh02047xl.yaml index be3222c743..8fb6315914 100644 --- a/zephyr/dts/bindings/battery/dynapack,cosmx_gh02047xl.yaml +++ b/zephyr/dts/bindings/battery/dynapack,cosmx_gh02047xl.yaml @@ -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. diff --git a/zephyr/dts/bindings/battery/getac,bq40z50-R3-S2.yaml b/zephyr/dts/bindings/battery/getac,bq40z50-R3-S2.yaml index b144c30be3..e59f6c1e37 100644 --- a/zephyr/dts/bindings/battery/getac,bq40z50-R3-S2.yaml +++ b/zephyr/dts/bindings/battery/getac,bq40z50-R3-S2.yaml @@ -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. diff --git a/zephyr/dts/bindings/battery/getac,bq40z50-R3-S3.yaml b/zephyr/dts/bindings/battery/getac,bq40z50-R3-S3.yaml index 57d220abbb..aed466ad11 100644 --- a/zephyr/dts/bindings/battery/getac,bq40z50-R3-S3.yaml +++ b/zephyr/dts/bindings/battery/getac,bq40z50-R3-S3.yaml @@ -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. diff --git a/zephyr/dts/bindings/battery/lgc,ac17a8m.yaml b/zephyr/dts/bindings/battery/lgc,ac17a8m.yaml index 53eeedc8a4..939713bbe5 100644 --- a/zephyr/dts/bindings/battery/lgc,ac17a8m.yaml +++ b/zephyr/dts/bindings/battery/lgc,ac17a8m.yaml @@ -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. diff --git a/zephyr/dts/bindings/battery/lgc,l20l3pg2.yaml b/zephyr/dts/bindings/battery/lgc,l20l3pg2.yaml index bf2b62bc44..73d2ca5ec6 100644 --- a/zephyr/dts/bindings/battery/lgc,l20l3pg2.yaml +++ b/zephyr/dts/bindings/battery/lgc,l20l3pg2.yaml @@ -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. diff --git a/zephyr/dts/bindings/battery/lgc,xphx8.yaml b/zephyr/dts/bindings/battery/lgc,xphx8.yaml index d944a68c09..98b27fbe5b 100644 --- a/zephyr/dts/bindings/battery/lgc,xphx8.yaml +++ b/zephyr/dts/bindings/battery/lgc,xphx8.yaml @@ -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. diff --git a/zephyr/dts/bindings/battery/powertech,batgqa05l22.yaml b/zephyr/dts/bindings/battery/powertech,batgqa05l22.yaml index a12ef741e6..45b067ee4d 100644 --- a/zephyr/dts/bindings/battery/powertech,batgqa05l22.yaml +++ b/zephyr/dts/bindings/battery/powertech,batgqa05l22.yaml @@ -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. diff --git a/zephyr/dts/bindings/battery/smp,coslight_gh02047xl.yaml b/zephyr/dts/bindings/battery/smp,coslight_gh02047xl.yaml index 519461e6e7..19f8751998 100644 --- a/zephyr/dts/bindings/battery/smp,coslight_gh02047xl.yaml +++ b/zephyr/dts/bindings/battery/smp,coslight_gh02047xl.yaml @@ -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. diff --git a/zephyr/dts/bindings/battery/smp,highpower_gh02047xl.yaml b/zephyr/dts/bindings/battery/smp,highpower_gh02047xl.yaml index 41273a85fc..f3d039dfdf 100644 --- a/zephyr/dts/bindings/battery/smp,highpower_gh02047xl.yaml +++ b/zephyr/dts/bindings/battery/smp,highpower_gh02047xl.yaml @@ -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. diff --git a/zephyr/dts/bindings/battery/smp,l20m3pg0.yaml b/zephyr/dts/bindings/battery/smp,l20m3pg0.yaml index ecb0678dc7..437a3ca140 100644 --- a/zephyr/dts/bindings/battery/smp,l20m3pg0.yaml +++ b/zephyr/dts/bindings/battery/smp,l20m3pg0.yaml @@ -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. diff --git a/zephyr/dts/bindings/battery/smp,l20m3pg1.yaml b/zephyr/dts/bindings/battery/smp,l20m3pg1.yaml index f462f8b388..00a6b99a84 100644 --- a/zephyr/dts/bindings/battery/smp,l20m3pg1.yaml +++ b/zephyr/dts/bindings/battery/smp,l20m3pg1.yaml @@ -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. diff --git a/zephyr/dts/bindings/battery/smp,l20m3pg2.yaml b/zephyr/dts/bindings/battery/smp,l20m3pg2.yaml index 874e1f8d0c..37a5cb2052 100644 --- a/zephyr/dts/bindings/battery/smp,l20m3pg2.yaml +++ b/zephyr/dts/bindings/battery/smp,l20m3pg2.yaml @@ -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. diff --git a/zephyr/dts/bindings/battery/smp,l22m3pg0.yaml b/zephyr/dts/bindings/battery/smp,l22m3pg0.yaml index 6060e75f50..991734c9bc 100644 --- a/zephyr/dts/bindings/battery/smp,l22m3pg0.yaml +++ b/zephyr/dts/bindings/battery/smp,l22m3pg0.yaml @@ -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. diff --git a/zephyr/dts/bindings/battery/smp,l22m3pg1.yaml b/zephyr/dts/bindings/battery/smp,l22m3pg1.yaml index 42a248fe34..48152e0722 100644 --- a/zephyr/dts/bindings/battery/smp,l22m3pg1.yaml +++ b/zephyr/dts/bindings/battery/smp,l22m3pg1.yaml @@ -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. diff --git a/zephyr/dts/bindings/battery/sunwoda,l22d3pg0.yaml b/zephyr/dts/bindings/battery/sunwoda,l22d3pg0.yaml index e07d02cf9b..a0ff640c6b 100644 --- a/zephyr/dts/bindings/battery/sunwoda,l22d3pg0.yaml +++ b/zephyr/dts/bindings/battery/sunwoda,l22d3pg0.yaml @@ -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. diff --git a/zephyr/dts/bindings/battery/sunwoda,l22d3pg1.yaml b/zephyr/dts/bindings/battery/sunwoda,l22d3pg1.yaml index c17e287443..84505cffeb 100644 --- a/zephyr/dts/bindings/battery/sunwoda,l22d3pg1.yaml +++ b/zephyr/dts/bindings/battery/sunwoda,l22d3pg1.yaml @@ -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. diff --git a/zephyr/dts/bindings/cbi/cros-ec,cbi-fw-config-value.yaml b/zephyr/dts/bindings/cbi/cros-ec,cbi-fw-config-value.yaml index facbb086f1..6c45ffbf0b 100644 --- a/zephyr/dts/bindings/cbi/cros-ec,cbi-fw-config-value.yaml +++ b/zephyr/dts/bindings/cbi/cros-ec,cbi-fw-config-value.yaml @@ -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. diff --git a/zephyr/dts/bindings/cbi/cros-ec,cbi-fw-config.yaml b/zephyr/dts/bindings/cbi/cros-ec,cbi-fw-config.yaml index b19c9632be..b47c511d5e 100644 --- a/zephyr/dts/bindings/cbi/cros-ec,cbi-fw-config.yaml +++ b/zephyr/dts/bindings/cbi/cros-ec,cbi-fw-config.yaml @@ -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. diff --git a/zephyr/dts/bindings/cbi/named-cbi-ssfc-value.yaml b/zephyr/dts/bindings/cbi/named-cbi-ssfc-value.yaml index f97d688727..7e04afed87 100644 --- a/zephyr/dts/bindings/cbi/named-cbi-ssfc-value.yaml +++ b/zephyr/dts/bindings/cbi/named-cbi-ssfc-value.yaml @@ -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. diff --git a/zephyr/dts/bindings/cbi/named-cbi-ssfc.yaml b/zephyr/dts/bindings/cbi/named-cbi-ssfc.yaml index 054522068b..2db330079d 100644 --- a/zephyr/dts/bindings/cbi/named-cbi-ssfc.yaml +++ b/zephyr/dts/bindings/cbi/named-cbi-ssfc.yaml @@ -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. diff --git a/zephyr/dts/bindings/charger/chg-chip.yaml b/zephyr/dts/bindings/charger/chg-chip.yaml index c28efacddf..58cc487b1b 100644 --- a/zephyr/dts/bindings/charger/chg-chip.yaml +++ b/zephyr/dts/bindings/charger/chg-chip.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2022 The Chromium OS Authors +# Copyright 2022 The ChromiumOS Authors # SPDX-License-Identifier: Apache-2.0 description: Charger chip diff --git a/zephyr/dts/bindings/charger/intersil,isl923x.yaml b/zephyr/dts/bindings/charger/intersil,isl923x.yaml index 2da947fea8..a9c2e8f814 100644 --- a/zephyr/dts/bindings/charger/intersil,isl923x.yaml +++ b/zephyr/dts/bindings/charger/intersil,isl923x.yaml @@ -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. diff --git a/zephyr/dts/bindings/charger/intersil,isl9241.yaml b/zephyr/dts/bindings/charger/intersil,isl9241.yaml index 567c2077a6..7423e46a23 100644 --- a/zephyr/dts/bindings/charger/intersil,isl9241.yaml +++ b/zephyr/dts/bindings/charger/intersil,isl9241.yaml @@ -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. diff --git a/zephyr/dts/bindings/charger/richtek,rt9490.yaml b/zephyr/dts/bindings/charger/richtek,rt9490.yaml index 96d8b81fa0..8335083277 100644 --- a/zephyr/dts/bindings/charger/richtek,rt9490.yaml +++ b/zephyr/dts/bindings/charger/richtek,rt9490.yaml @@ -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. diff --git a/zephyr/dts/bindings/charger/siliconmitus,sm5803.yaml b/zephyr/dts/bindings/charger/siliconmitus,sm5803.yaml index 9aac5f3d8b..20d88d1659 100644 --- a/zephyr/dts/bindings/charger/siliconmitus,sm5803.yaml +++ b/zephyr/dts/bindings/charger/siliconmitus,sm5803.yaml @@ -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. diff --git a/zephyr/dts/bindings/charger/ti,bq25710.yaml b/zephyr/dts/bindings/charger/ti,bq25710.yaml index 2ebf194b77..d0bc20a015 100644 --- a/zephyr/dts/bindings/charger/ti,bq25710.yaml +++ b/zephyr/dts/bindings/charger/ti,bq25710.yaml @@ -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. diff --git a/zephyr/dts/bindings/console/ec-console.yaml b/zephyr/dts/bindings/console/ec-console.yaml index f79ddd67b0..0f46524a39 100644 --- a/zephyr/dts/bindings/console/ec-console.yaml +++ b/zephyr/dts/bindings/console/ec-console.yaml @@ -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. diff --git a/zephyr/dts/bindings/cros_bbram/named-bbram-regions.yaml b/zephyr/dts/bindings/cros_bbram/named-bbram-regions.yaml index 8b12473d0a..a8824c3fb1 100644 --- a/zephyr/dts/bindings/cros_bbram/named-bbram-regions.yaml +++ b/zephyr/dts/bindings/cros_bbram/named-bbram-regions.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Google Inc. +# Copyright 2021 Google LLC # SPDX-License-Identifier: Apache-2.0 description: Named battery-backed RAM parent node diff --git a/zephyr/dts/bindings/cros_dbg/nuvoton,npcx-cros-dbg.yaml b/zephyr/dts/bindings/cros_dbg/nuvoton,npcx-cros-dbg.yaml index c3a9937d45..0cdfd41e31 100644 --- a/zephyr/dts/bindings/cros_dbg/nuvoton,npcx-cros-dbg.yaml +++ b/zephyr/dts/bindings/cros_dbg/nuvoton,npcx-cros-dbg.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Google Inc. +# Copyright 2021 Google LLC # SPDX-License-Identifier: Apache-2.0 description: Nuvoton, NPCX Debug Interface diff --git a/zephyr/dts/bindings/cros_displight/cros-ec,displight.yaml b/zephyr/dts/bindings/cros_displight/cros-ec,displight.yaml index 4c174c14cd..1ce1892fd2 100644 --- a/zephyr/dts/bindings/cros_displight/cros-ec,displight.yaml +++ b/zephyr/dts/bindings/cros_displight/cros-ec,displight.yaml @@ -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. diff --git a/zephyr/dts/bindings/cros_flash/cros-ec,flash-layout.yaml b/zephyr/dts/bindings/cros_flash/cros-ec,flash-layout.yaml index 991f3c71cf..0ec9bdfbb0 100644 --- a/zephyr/dts/bindings/cros_flash/cros-ec,flash-layout.yaml +++ b/zephyr/dts/bindings/cros_flash/cros-ec,flash-layout.yaml @@ -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. diff --git a/zephyr/dts/bindings/cros_flash/microchip,xec-cros-flash.yaml b/zephyr/dts/bindings/cros_flash/microchip,xec-cros-flash.yaml index 2b9aea1554..a5c1155b9e 100644 --- a/zephyr/dts/bindings/cros_flash/microchip,xec-cros-flash.yaml +++ b/zephyr/dts/bindings/cros_flash/microchip,xec-cros-flash.yaml @@ -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. diff --git a/zephyr/dts/bindings/cros_kb_raw/microchip,xec-cros-kb-raw.yaml b/zephyr/dts/bindings/cros_kb_raw/microchip,xec-cros-kb-raw.yaml index 47744d7daf..9ad5a50bfd 100644 --- a/zephyr/dts/bindings/cros_kb_raw/microchip,xec-cros-kb-raw.yaml +++ b/zephyr/dts/bindings/cros_kb_raw/microchip,xec-cros-kb-raw.yaml @@ -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. diff --git a/zephyr/dts/bindings/cros_mkbp_event/ec-wake-mask-event.yaml b/zephyr/dts/bindings/cros_mkbp_event/ec-wake-mask-event.yaml index d3ec3c8ff5..04e95ea829 100644 --- a/zephyr/dts/bindings/cros_mkbp_event/ec-wake-mask-event.yaml +++ b/zephyr/dts/bindings/cros_mkbp_event/ec-wake-mask-event.yaml @@ -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. diff --git a/zephyr/dts/bindings/cros_rtc/microchip,xec-cros-rtc.yaml b/zephyr/dts/bindings/cros_rtc/microchip,xec-cros-rtc.yaml index 6b22559d01..f22b26c2ec 100644 --- a/zephyr/dts/bindings/cros_rtc/microchip,xec-cros-rtc.yaml +++ b/zephyr/dts/bindings/cros_rtc/microchip,xec-cros-rtc.yaml @@ -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. diff --git a/zephyr/dts/bindings/cros_shi/ite,it8xxx2-cros-shi.yaml b/zephyr/dts/bindings/cros_shi/ite,it8xxx2-cros-shi.yaml index 0ad49f1487..2e2c6b74a5 100644 --- a/zephyr/dts/bindings/cros_shi/ite,it8xxx2-cros-shi.yaml +++ b/zephyr/dts/bindings/cros_shi/ite,it8xxx2-cros-shi.yaml @@ -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. diff --git a/zephyr/dts/bindings/cros_shi/nuvoton,npcx-cros-shi.yaml b/zephyr/dts/bindings/cros_shi/nuvoton,npcx-cros-shi.yaml index 0761ba3526..9a5596bd4c 100644 --- a/zephyr/dts/bindings/cros_shi/nuvoton,npcx-cros-shi.yaml +++ b/zephyr/dts/bindings/cros_shi/nuvoton,npcx-cros-shi.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Google Inc. +# Copyright 2021 Google LLC # SPDX-License-Identifier: Apache-2.0 description: Nuvoton, NPCX Serial Host Interface (SHI) node diff --git a/zephyr/dts/bindings/emul/cros,bb-retimer-emul.yaml b/zephyr/dts/bindings/emul/cros,bb-retimer-emul.yaml index 007a73b17b..11dd5f5218 100644 --- a/zephyr/dts/bindings/emul/cros,bb-retimer-emul.yaml +++ b/zephyr/dts/bindings/emul/cros,bb-retimer-emul.yaml @@ -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. diff --git a/zephyr/dts/bindings/emul/cros,clock-control-emul.yaml b/zephyr/dts/bindings/emul/cros,clock-control-emul.yaml index fa632ea2d4..746c883942 100644 --- a/zephyr/dts/bindings/emul/cros,clock-control-emul.yaml +++ b/zephyr/dts/bindings/emul/cros,clock-control-emul.yaml @@ -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. diff --git a/zephyr/dts/bindings/emul/cros,i2c-mock.yaml b/zephyr/dts/bindings/emul/cros,i2c-mock.yaml index f3813af3f6..11dbb62b45 100644 --- a/zephyr/dts/bindings/emul/cros,i2c-mock.yaml +++ b/zephyr/dts/bindings/emul/cros,i2c-mock.yaml @@ -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. diff --git a/zephyr/dts/bindings/emul/cros,isl923x-emul.yaml b/zephyr/dts/bindings/emul/cros,isl923x-emul.yaml index 72e82a7208..10ad8d1ba9 100644 --- a/zephyr/dts/bindings/emul/cros,isl923x-emul.yaml +++ b/zephyr/dts/bindings/emul/cros,isl923x-emul.yaml @@ -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. diff --git a/zephyr/dts/bindings/emul/cros,lis2dw12-emul.yaml b/zephyr/dts/bindings/emul/cros,lis2dw12-emul.yaml index 5fb94ed925..f0a8632c18 100644 --- a/zephyr/dts/bindings/emul/cros,lis2dw12-emul.yaml +++ b/zephyr/dts/bindings/emul/cros,lis2dw12-emul.yaml @@ -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. diff --git a/zephyr/dts/bindings/emul/cros,ln9310-emul.yaml b/zephyr/dts/bindings/emul/cros,ln9310-emul.yaml index 2665dd4207..7f086cd5f2 100644 --- a/zephyr/dts/bindings/emul/cros,ln9310-emul.yaml +++ b/zephyr/dts/bindings/emul/cros,ln9310-emul.yaml @@ -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. diff --git a/zephyr/dts/bindings/emul/cros,ps8xxx-emul.yaml b/zephyr/dts/bindings/emul/cros,ps8xxx-emul.yaml index 85828b6e37..31e53903d2 100644 --- a/zephyr/dts/bindings/emul/cros,ps8xxx-emul.yaml +++ b/zephyr/dts/bindings/emul/cros,ps8xxx-emul.yaml @@ -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. diff --git a/zephyr/dts/bindings/emul/cros,pwm-mock.yaml b/zephyr/dts/bindings/emul/cros,pwm-mock.yaml index f5ede0ae2c..55b6d4b61d 100644 --- a/zephyr/dts/bindings/emul/cros,pwm-mock.yaml +++ b/zephyr/dts/bindings/emul/cros,pwm-mock.yaml @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/zephyr/dts/bindings/emul/cros,sn5s330-emul.yaml b/zephyr/dts/bindings/emul/cros,sn5s330-emul.yaml index 0cfe3ebe9c..cbdf320bc1 100644 --- a/zephyr/dts/bindings/emul/cros,sn5s330-emul.yaml +++ b/zephyr/dts/bindings/emul/cros,sn5s330-emul.yaml @@ -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. diff --git a/zephyr/dts/bindings/emul/cros,tcpci-generic-emul.yaml b/zephyr/dts/bindings/emul/cros,tcpci-generic-emul.yaml index 8e09020a98..73d115f5ed 100644 --- a/zephyr/dts/bindings/emul/cros,tcpci-generic-emul.yaml +++ b/zephyr/dts/bindings/emul/cros,tcpci-generic-emul.yaml @@ -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. diff --git a/zephyr/dts/bindings/emul/cros-ec,flash-emul.yaml b/zephyr/dts/bindings/emul/cros-ec,flash-emul.yaml index 490258e8a9..c6a20f9991 100644 --- a/zephyr/dts/bindings/emul/cros-ec,flash-emul.yaml +++ b/zephyr/dts/bindings/emul/cros-ec,flash-emul.yaml @@ -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. diff --git a/zephyr/dts/bindings/emul/cros-ec,kb-raw-emul.yaml b/zephyr/dts/bindings/emul/cros-ec,kb-raw-emul.yaml index b8540248e3..f6821dbc2b 100644 --- a/zephyr/dts/bindings/emul/cros-ec,kb-raw-emul.yaml +++ b/zephyr/dts/bindings/emul/cros-ec,kb-raw-emul.yaml @@ -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. diff --git a/zephyr/dts/bindings/emul/cros-ec,rtc-emul.yaml b/zephyr/dts/bindings/emul/cros-ec,rtc-emul.yaml new file mode 100644 index 0000000000..d3efd6835f --- /dev/null +++ b/zephyr/dts/bindings/emul/cros-ec,rtc-emul.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: Emulator for Chromiumos EC flash driver. + +compatible: "cros-ec,rtc-emul" + +include: base.yaml diff --git a/zephyr/dts/bindings/emul/tcpci.yaml b/zephyr/dts/bindings/emul/tcpci.yaml index 8d62989fe7..9f825c5dda 100644 --- a/zephyr/dts/bindings/emul/tcpci.yaml +++ b/zephyr/dts/bindings/emul/tcpci.yaml @@ -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. diff --git a/zephyr/dts/bindings/emul/zephyr,bma255.yaml b/zephyr/dts/bindings/emul/zephyr,bma255.yaml index 40750196c1..3f504e05a5 100644 --- a/zephyr/dts/bindings/emul/zephyr,bma255.yaml +++ b/zephyr/dts/bindings/emul/zephyr,bma255.yaml @@ -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. diff --git a/zephyr/dts/bindings/emul/zephyr,bmi.yaml b/zephyr/dts/bindings/emul/zephyr,bmi.yaml index a754287bcc..6280d5cc39 100644 --- a/zephyr/dts/bindings/emul/zephyr,bmi.yaml +++ b/zephyr/dts/bindings/emul/zephyr,bmi.yaml @@ -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. diff --git a/zephyr/dts/bindings/emul/zephyr,pi3usb9201-emul.yaml b/zephyr/dts/bindings/emul/zephyr,pi3usb9201-emul.yaml index 856703e9d7..1f26a62f73 100644 --- a/zephyr/dts/bindings/emul/zephyr,pi3usb9201-emul.yaml +++ b/zephyr/dts/bindings/emul/zephyr,pi3usb9201-emul.yaml @@ -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. diff --git a/zephyr/dts/bindings/emul/zephyr,smart-battery.yaml b/zephyr/dts/bindings/emul/zephyr,smart-battery.yaml index cc1d2f368d..82bad83db1 100644 --- a/zephyr/dts/bindings/emul/zephyr,smart-battery.yaml +++ b/zephyr/dts/bindings/emul/zephyr,smart-battery.yaml @@ -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. diff --git a/zephyr/dts/bindings/emul/zephyr,syv682x-emul.yaml b/zephyr/dts/bindings/emul/zephyr,syv682x-emul.yaml index 8652b42b82..2ad9241f96 100644 --- a/zephyr/dts/bindings/emul/zephyr,syv682x-emul.yaml +++ b/zephyr/dts/bindings/emul/zephyr,syv682x-emul.yaml @@ -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. diff --git a/zephyr/dts/bindings/emul/zephyr,tcs3400.yaml b/zephyr/dts/bindings/emul/zephyr,tcs3400.yaml index a4474ec279..f214a21064 100644 --- a/zephyr/dts/bindings/emul/zephyr,tcs3400.yaml +++ b/zephyr/dts/bindings/emul/zephyr,tcs3400.yaml @@ -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. diff --git a/zephyr/dts/bindings/fan/cros-ec,fans.yaml b/zephyr/dts/bindings/fan/cros-ec,fans.yaml index 5ca8071818..9aa6317f61 100644 --- a/zephyr/dts/bindings/fan/cros-ec,fans.yaml +++ b/zephyr/dts/bindings/fan/cros-ec,fans.yaml @@ -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. diff --git a/zephyr/dts/bindings/gpio/cros-ec,gpio-interrupts.yaml b/zephyr/dts/bindings/gpio/cros-ec,gpio-interrupts.yaml index 56cf17a5a1..bb6b4001f4 100644 --- a/zephyr/dts/bindings/gpio/cros-ec,gpio-interrupts.yaml +++ b/zephyr/dts/bindings/gpio/cros-ec,gpio-interrupts.yaml @@ -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. # diff --git a/zephyr/dts/bindings/gpio/cros-ec,hibernate-wake-pins.yaml b/zephyr/dts/bindings/gpio/cros-ec,hibernate-wake-pins.yaml index 0d79efa79d..a6cb488c48 100644 --- a/zephyr/dts/bindings/gpio/cros-ec,hibernate-wake-pins.yaml +++ b/zephyr/dts/bindings/gpio/cros-ec,hibernate-wake-pins.yaml @@ -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. diff --git a/zephyr/dts/bindings/gpio/cros-ec,usba-port-enable-pins.yaml b/zephyr/dts/bindings/gpio/cros-ec,usba-port-enable-pins.yaml index 8ee2a380f3..92532c1893 100644 --- a/zephyr/dts/bindings/gpio/cros-ec,usba-port-enable-pins.yaml +++ b/zephyr/dts/bindings/gpio/cros-ec,usba-port-enable-pins.yaml @@ -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. diff --git a/zephyr/dts/bindings/i2c/cros-ec-i2c-port-base.yaml b/zephyr/dts/bindings/i2c/cros-ec-i2c-port-base.yaml index 4deef23c79..7d3aad07f7 100644 --- a/zephyr/dts/bindings/i2c/cros-ec-i2c-port-base.yaml +++ b/zephyr/dts/bindings/i2c/cros-ec-i2c-port-base.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2021 The Chromium OS Authors +# Copyright 2021 The ChromiumOS Authors # SPDX-License-Identifier: Apache-2.0 description: I2C port base properties diff --git a/zephyr/dts/bindings/i2c/named-i2c-ports.yaml b/zephyr/dts/bindings/i2c/named-i2c-ports.yaml index 4fce9c3229..5aa95e5f65 100644 --- a/zephyr/dts/bindings/i2c/named-i2c-ports.yaml +++ b/zephyr/dts/bindings/i2c/named-i2c-ports.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2020 The Chromium OS Authors +# Copyright 2020 The ChromiumOS Authors # SPDX-License-Identifier: Apache-2.0 description: Named I2C ports parent node diff --git a/zephyr/dts/bindings/intel/intel,rvp-board-id.yaml b/zephyr/dts/bindings/intel/intel,rvp-board-id.yaml index 6ef25aa6bd..9b4fed524e 100644 --- a/zephyr/dts/bindings/intel/intel,rvp-board-id.yaml +++ b/zephyr/dts/bindings/intel/intel,rvp-board-id.yaml @@ -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. diff --git a/zephyr/dts/bindings/kb_discrete/ite,it8801.yaml b/zephyr/dts/bindings/kb_discrete/ite,it8801.yaml index 90a682920c..036d3d0e69 100644 --- a/zephyr/dts/bindings/kb_discrete/ite,it8801.yaml +++ b/zephyr/dts/bindings/kb_discrete/ite,it8801.yaml @@ -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. diff --git a/zephyr/dts/bindings/keyboard/cros-ec,kblight-pwm.yaml b/zephyr/dts/bindings/keyboard/cros-ec,kblight-pwm.yaml index 9a57e74cba..9cf862a555 100644 --- a/zephyr/dts/bindings/keyboard/cros-ec,kblight-pwm.yaml +++ b/zephyr/dts/bindings/keyboard/cros-ec,kblight-pwm.yaml @@ -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. diff --git a/zephyr/dts/bindings/keyboard/cros-keyscan.yaml b/zephyr/dts/bindings/keyboard/cros-keyscan.yaml index 11caf7fd11..a2ec2afc46 100644 --- a/zephyr/dts/bindings/keyboard/cros-keyscan.yaml +++ b/zephyr/dts/bindings/keyboard/cros-keyscan.yaml @@ -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. diff --git a/zephyr/dts/bindings/led/cros-ec,pwm-leds.yaml b/zephyr/dts/bindings/led/cros-ec,pwm-leds.yaml index 0417dc20e6..1d94ec1b6f 100644 --- a/zephyr/dts/bindings/led/cros-ec,pwm-leds.yaml +++ b/zephyr/dts/bindings/led/cros-ec,pwm-leds.yaml @@ -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. diff --git a/zephyr/dts/bindings/led/maxim,seven-seg-display.yaml b/zephyr/dts/bindings/led/maxim,seven-seg-display.yaml index 9307edad34..d66a0cdca2 100644 --- a/zephyr/dts/bindings/led/maxim,seven-seg-display.yaml +++ b/zephyr/dts/bindings/led/maxim,seven-seg-display.yaml @@ -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. 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 59bf450c73..2e5fe7cff0 100644 --- a/zephyr/dts/bindings/leds/cros-ec,gpio-led-pins.yaml +++ b/zephyr/dts/bindings/leds/cros-ec,gpio-led-pins.yaml @@ -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. diff --git a/zephyr/dts/bindings/leds/cros-ec,led-policy.yaml b/zephyr/dts/bindings/leds/cros-ec,led-policy.yaml index 5c46750a37..7bdcbd863e 100644 --- a/zephyr/dts/bindings/leds/cros-ec,led-policy.yaml +++ b/zephyr/dts/bindings/leds/cros-ec,led-policy.yaml @@ -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. 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 0f6b7ae7c9..19fee69be4 100644 --- a/zephyr/dts/bindings/leds/cros-ec,pwm-led-pins.yaml +++ b/zephyr/dts/bindings/leds/cros-ec,pwm-led-pins.yaml @@ -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. diff --git a/zephyr/dts/bindings/leds/cros-ec,pwm-pin-config.yaml b/zephyr/dts/bindings/leds/cros-ec,pwm-pin-config.yaml index 0813847bba..bdef6b6144 100644 --- a/zephyr/dts/bindings/leds/cros-ec,pwm-pin-config.yaml +++ b/zephyr/dts/bindings/leds/cros-ec,pwm-pin-config.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/cros-ec,motionsense-mutex.yaml b/zephyr/dts/bindings/motionsense/cros-ec,motionsense-mutex.yaml index 71413ffd26..17c60744c8 100644 --- a/zephyr/dts/bindings/motionsense/cros-ec,motionsense-mutex.yaml +++ b/zephyr/dts/bindings/motionsense/cros-ec,motionsense-mutex.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2021 The Chromium OS Authors +# Copyright 2021 The ChromiumOS Authors # SPDX-License-Identifier: Apache-2.0 description: Motion sense mutex parent node diff --git a/zephyr/dts/bindings/motionsense/cros-ec,motionsense-rotation-ref.yaml b/zephyr/dts/bindings/motionsense/cros-ec,motionsense-rotation-ref.yaml index 7de86ec8db..da2b99e928 100644 --- a/zephyr/dts/bindings/motionsense/cros-ec,motionsense-rotation-ref.yaml +++ b/zephyr/dts/bindings/motionsense/cros-ec,motionsense-rotation-ref.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/cros-ec,motionsense-sensor-config.yaml b/zephyr/dts/bindings/motionsense/cros-ec,motionsense-sensor-config.yaml index 35e0242348..cb0fd96d95 100644 --- a/zephyr/dts/bindings/motionsense/cros-ec,motionsense-sensor-config.yaml +++ b/zephyr/dts/bindings/motionsense/cros-ec,motionsense-sensor-config.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/cros-ec,motionsense-sensor-info.yaml b/zephyr/dts/bindings/motionsense/cros-ec,motionsense-sensor-info.yaml index 2f508777e1..b0e960e559 100644 --- a/zephyr/dts/bindings/motionsense/cros-ec,motionsense-sensor-info.yaml +++ b/zephyr/dts/bindings/motionsense/cros-ec,motionsense-sensor-info.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/driver/bmi160.yaml b/zephyr/dts/bindings/motionsense/driver/bmi160.yaml index 6ca096d87a..e2c4bd6ac7 100644 --- a/zephyr/dts/bindings/motionsense/driver/bmi160.yaml +++ b/zephyr/dts/bindings/motionsense/driver/bmi160.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/driver/bmi260.yaml b/zephyr/dts/bindings/motionsense/driver/bmi260.yaml index f308472ec3..33fd4356b8 100644 --- a/zephyr/dts/bindings/motionsense/driver/bmi260.yaml +++ b/zephyr/dts/bindings/motionsense/driver/bmi260.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/driver/bmi3xx.yaml b/zephyr/dts/bindings/motionsense/driver/bmi3xx.yaml index bd99738afe..e9e603fc96 100644 --- a/zephyr/dts/bindings/motionsense/driver/bmi3xx.yaml +++ b/zephyr/dts/bindings/motionsense/driver/bmi3xx.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/driver/cros-ec,bma255.yaml b/zephyr/dts/bindings/motionsense/driver/cros-ec,bma255.yaml index cbd9e82f2d..12a5be2d44 100644 --- a/zephyr/dts/bindings/motionsense/driver/cros-ec,bma255.yaml +++ b/zephyr/dts/bindings/motionsense/driver/cros-ec,bma255.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/driver/cros-ec,bma4xx.yaml b/zephyr/dts/bindings/motionsense/driver/cros-ec,bma4xx.yaml index 6c912c96d4..b17b372af1 100644 --- a/zephyr/dts/bindings/motionsense/driver/cros-ec,bma4xx.yaml +++ b/zephyr/dts/bindings/motionsense/driver/cros-ec,bma4xx.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/driver/cros-ec,bmi160-accel.yaml b/zephyr/dts/bindings/motionsense/driver/cros-ec,bmi160-accel.yaml index 4eabf12cd5..cb574c6c0c 100644 --- a/zephyr/dts/bindings/motionsense/driver/cros-ec,bmi160-accel.yaml +++ b/zephyr/dts/bindings/motionsense/driver/cros-ec,bmi160-accel.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/driver/cros-ec,bmi160-gyro.yaml b/zephyr/dts/bindings/motionsense/driver/cros-ec,bmi160-gyro.yaml index b7a0b38290..8064549e4a 100644 --- a/zephyr/dts/bindings/motionsense/driver/cros-ec,bmi160-gyro.yaml +++ b/zephyr/dts/bindings/motionsense/driver/cros-ec,bmi160-gyro.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/driver/cros-ec,bmi260-accel.yaml b/zephyr/dts/bindings/motionsense/driver/cros-ec,bmi260-accel.yaml index 130600cca2..d18feaa813 100644 --- a/zephyr/dts/bindings/motionsense/driver/cros-ec,bmi260-accel.yaml +++ b/zephyr/dts/bindings/motionsense/driver/cros-ec,bmi260-accel.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/driver/cros-ec,bmi260-gyro.yaml b/zephyr/dts/bindings/motionsense/driver/cros-ec,bmi260-gyro.yaml index 00226d0304..29e87e89ee 100644 --- a/zephyr/dts/bindings/motionsense/driver/cros-ec,bmi260-gyro.yaml +++ b/zephyr/dts/bindings/motionsense/driver/cros-ec,bmi260-gyro.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/driver/cros-ec,bmi3xx-accel.yaml b/zephyr/dts/bindings/motionsense/driver/cros-ec,bmi3xx-accel.yaml index 24d28645ee..7d0f077226 100644 --- a/zephyr/dts/bindings/motionsense/driver/cros-ec,bmi3xx-accel.yaml +++ b/zephyr/dts/bindings/motionsense/driver/cros-ec,bmi3xx-accel.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/driver/cros-ec,bmi3xx-gyro.yaml b/zephyr/dts/bindings/motionsense/driver/cros-ec,bmi3xx-gyro.yaml index e8792492ef..0085dc5648 100644 --- a/zephyr/dts/bindings/motionsense/driver/cros-ec,bmi3xx-gyro.yaml +++ b/zephyr/dts/bindings/motionsense/driver/cros-ec,bmi3xx-gyro.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/driver/cros-ec,icm42607-accel.yaml b/zephyr/dts/bindings/motionsense/driver/cros-ec,icm42607-accel.yaml index ba7fbb3878..7812870aee 100644 --- a/zephyr/dts/bindings/motionsense/driver/cros-ec,icm42607-accel.yaml +++ b/zephyr/dts/bindings/motionsense/driver/cros-ec,icm42607-accel.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/driver/cros-ec,icm42607-gyro.yaml b/zephyr/dts/bindings/motionsense/driver/cros-ec,icm42607-gyro.yaml index 4707f33d6d..fb4739242f 100644 --- a/zephyr/dts/bindings/motionsense/driver/cros-ec,icm42607-gyro.yaml +++ b/zephyr/dts/bindings/motionsense/driver/cros-ec,icm42607-gyro.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/driver/cros-ec,icm426xx-accel.yaml b/zephyr/dts/bindings/motionsense/driver/cros-ec,icm426xx-accel.yaml index fbc9f44051..d41275cdd8 100644 --- a/zephyr/dts/bindings/motionsense/driver/cros-ec,icm426xx-accel.yaml +++ b/zephyr/dts/bindings/motionsense/driver/cros-ec,icm426xx-accel.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/driver/cros-ec,icm426xx-gyro.yaml b/zephyr/dts/bindings/motionsense/driver/cros-ec,icm426xx-gyro.yaml index 1f0ae26ced..bcad871fc7 100644 --- a/zephyr/dts/bindings/motionsense/driver/cros-ec,icm426xx-gyro.yaml +++ b/zephyr/dts/bindings/motionsense/driver/cros-ec,icm426xx-gyro.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/driver/cros-ec,kx022.yaml b/zephyr/dts/bindings/motionsense/driver/cros-ec,kx022.yaml index 8aecc32077..e66988502a 100644 --- a/zephyr/dts/bindings/motionsense/driver/cros-ec,kx022.yaml +++ b/zephyr/dts/bindings/motionsense/driver/cros-ec,kx022.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/driver/cros-ec,lis2dw12.yaml b/zephyr/dts/bindings/motionsense/driver/cros-ec,lis2dw12.yaml index bacf8f2c75..9dd07a7b78 100644 --- a/zephyr/dts/bindings/motionsense/driver/cros-ec,lis2dw12.yaml +++ b/zephyr/dts/bindings/motionsense/driver/cros-ec,lis2dw12.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/driver/cros-ec,lsm6dso-accel.yaml b/zephyr/dts/bindings/motionsense/driver/cros-ec,lsm6dso-accel.yaml index 5c3c6172f0..044c187c50 100644 --- a/zephyr/dts/bindings/motionsense/driver/cros-ec,lsm6dso-accel.yaml +++ b/zephyr/dts/bindings/motionsense/driver/cros-ec,lsm6dso-accel.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/driver/cros-ec,lsm6dso-gyro.yaml b/zephyr/dts/bindings/motionsense/driver/cros-ec,lsm6dso-gyro.yaml index a10a98d97f..1a946eab98 100644 --- a/zephyr/dts/bindings/motionsense/driver/cros-ec,lsm6dso-gyro.yaml +++ b/zephyr/dts/bindings/motionsense/driver/cros-ec,lsm6dso-gyro.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/driver/cros-ec,tcs3400-clear.yaml b/zephyr/dts/bindings/motionsense/driver/cros-ec,tcs3400-clear.yaml index 323286c462..05033de35e 100644 --- a/zephyr/dts/bindings/motionsense/driver/cros-ec,tcs3400-clear.yaml +++ b/zephyr/dts/bindings/motionsense/driver/cros-ec,tcs3400-clear.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/driver/cros-ec,tcs3400-rgb.yaml b/zephyr/dts/bindings/motionsense/driver/cros-ec,tcs3400-rgb.yaml index e2987cf44b..903574a7f3 100644 --- a/zephyr/dts/bindings/motionsense/driver/cros-ec,tcs3400-rgb.yaml +++ b/zephyr/dts/bindings/motionsense/driver/cros-ec,tcs3400-rgb.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/driver/icm42607.yaml b/zephyr/dts/bindings/motionsense/driver/icm42607.yaml index f47e7a2f97..4052f12fd9 100644 --- a/zephyr/dts/bindings/motionsense/driver/icm42607.yaml +++ b/zephyr/dts/bindings/motionsense/driver/icm42607.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/driver/icm426xx.yaml b/zephyr/dts/bindings/motionsense/driver/icm426xx.yaml index 5c33931706..7f5e8e164c 100644 --- a/zephyr/dts/bindings/motionsense/driver/icm426xx.yaml +++ b/zephyr/dts/bindings/motionsense/driver/icm426xx.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/driver/lsm6dso.yaml b/zephyr/dts/bindings/motionsense/driver/lsm6dso.yaml index dd345854be..565c64b1c8 100644 --- a/zephyr/dts/bindings/motionsense/driver/lsm6dso.yaml +++ b/zephyr/dts/bindings/motionsense/driver/lsm6dso.yaml @@ -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. # diff --git a/zephyr/dts/bindings/motionsense/driver/tcs3400.yaml b/zephyr/dts/bindings/motionsense/driver/tcs3400.yaml index ecad7ec1a7..1c2fbeccbc 100644 --- a/zephyr/dts/bindings/motionsense/driver/tcs3400.yaml +++ b/zephyr/dts/bindings/motionsense/driver/tcs3400.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,accelgyro-als-channel-scale.yaml b/zephyr/dts/bindings/motionsense/drvdata/cros-ec,accelgyro-als-channel-scale.yaml index 89648945e8..39f92c7a50 100644 --- a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,accelgyro-als-channel-scale.yaml +++ b/zephyr/dts/bindings/motionsense/drvdata/cros-ec,accelgyro-als-channel-scale.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,accelgyro-als-drv-data.yaml b/zephyr/dts/bindings/motionsense/drvdata/cros-ec,accelgyro-als-drv-data.yaml index 7d64689cf2..13a64bafb0 100644 --- a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,accelgyro-als-drv-data.yaml +++ b/zephyr/dts/bindings/motionsense/drvdata/cros-ec,accelgyro-als-drv-data.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,accelgyro-rgb-calibration.yaml b/zephyr/dts/bindings/motionsense/drvdata/cros-ec,accelgyro-rgb-calibration.yaml index 4204a63cff..e0ef479ffd 100644 --- a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,accelgyro-rgb-calibration.yaml +++ b/zephyr/dts/bindings/motionsense/drvdata/cros-ec,accelgyro-rgb-calibration.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-bma255.yaml b/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-bma255.yaml index 4cabd620da..8749d96de6 100644 --- a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-bma255.yaml +++ b/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-bma255.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-bma4xx.yaml b/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-bma4xx.yaml index 2f00d771b3..5504b3642c 100644 --- a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-bma4xx.yaml +++ b/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-bma4xx.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-bmi160.yaml b/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-bmi160.yaml index 52f5c346fc..c4aea99ea1 100644 --- a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-bmi160.yaml +++ b/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-bmi160.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-bmi260.yaml b/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-bmi260.yaml index 4d414121d1..a6247c6cd4 100644 --- a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-bmi260.yaml +++ b/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-bmi260.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-bmi3xx.yaml b/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-bmi3xx.yaml index d3fa8cc009..5ca2059b3d 100644 --- a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-bmi3xx.yaml +++ b/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-bmi3xx.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-icm426xx.yaml b/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-icm426xx.yaml index b88ad7eacd..04ba419d69 100644 --- a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-icm426xx.yaml +++ b/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-icm426xx.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-kionix.yaml b/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-kionix.yaml index 3151412b79..0f86616ae2 100644 --- a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-kionix.yaml +++ b/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-kionix.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-lis2dw12.yaml b/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-lis2dw12.yaml index ecb182a4fd..25f47c7e96 100644 --- a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-lis2dw12.yaml +++ b/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-lis2dw12.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-lsm6dso.yaml b/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-lsm6dso.yaml index 00e0702a48..57f2eedf01 100644 --- a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-lsm6dso.yaml +++ b/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-lsm6dso.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-tcs3400-clear.yaml b/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-tcs3400-clear.yaml index c1059d40be..6b234d4460 100644 --- a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-tcs3400-clear.yaml +++ b/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-tcs3400-clear.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-tcs3400-rgb.yaml b/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-tcs3400-rgb.yaml index 7ae7bc5983..b81a4d6d49 100644 --- a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-tcs3400-rgb.yaml +++ b/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-tcs3400-rgb.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/drvdata/drvdata-base.yaml b/zephyr/dts/bindings/motionsense/drvdata/drvdata-base.yaml index dc32d69d21..b278f26ba3 100644 --- a/zephyr/dts/bindings/motionsense/drvdata/drvdata-base.yaml +++ b/zephyr/dts/bindings/motionsense/drvdata/drvdata-base.yaml @@ -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. diff --git a/zephyr/dts/bindings/motionsense/motionsense-sensor-base.yaml b/zephyr/dts/bindings/motionsense/motionsense-sensor-base.yaml index d5e7a2eca0..c5ef4ba192 100644 --- a/zephyr/dts/bindings/motionsense/motionsense-sensor-base.yaml +++ b/zephyr/dts/bindings/motionsense/motionsense-sensor-base.yaml @@ -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. diff --git a/zephyr/dts/bindings/pmic/mps,mp2964.yaml b/zephyr/dts/bindings/pmic/mps,mp2964.yaml index db35aa07b2..57017992a7 100644 --- a/zephyr/dts/bindings/pmic/mps,mp2964.yaml +++ b/zephyr/dts/bindings/pmic/mps,mp2964.yaml @@ -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. diff --git a/zephyr/dts/bindings/power/intel,ap-pwr-signal-base.yaml b/zephyr/dts/bindings/power/intel,ap-pwr-signal-base.yaml index 256320f85b..375d51227d 100644 --- a/zephyr/dts/bindings/power/intel,ap-pwr-signal-base.yaml +++ b/zephyr/dts/bindings/power/intel,ap-pwr-signal-base.yaml @@ -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. diff --git a/zephyr/dts/bindings/power/intel,ap-pwrseq-adc.yaml b/zephyr/dts/bindings/power/intel,ap-pwrseq-adc.yaml index c3a267a19a..3dd6fabf1c 100644 --- a/zephyr/dts/bindings/power/intel,ap-pwrseq-adc.yaml +++ b/zephyr/dts/bindings/power/intel,ap-pwrseq-adc.yaml @@ -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. diff --git a/zephyr/dts/bindings/power/intel,ap-pwrseq-external.yaml b/zephyr/dts/bindings/power/intel,ap-pwrseq-external.yaml index 2aaf05bf23..e0258b0f7c 100644 --- a/zephyr/dts/bindings/power/intel,ap-pwrseq-external.yaml +++ b/zephyr/dts/bindings/power/intel,ap-pwrseq-external.yaml @@ -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. diff --git a/zephyr/dts/bindings/power/intel,ap-pwrseq-gpio.yaml b/zephyr/dts/bindings/power/intel,ap-pwrseq-gpio.yaml index bd550eff5e..c72b36f5d2 100644 --- a/zephyr/dts/bindings/power/intel,ap-pwrseq-gpio.yaml +++ b/zephyr/dts/bindings/power/intel,ap-pwrseq-gpio.yaml @@ -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. diff --git a/zephyr/dts/bindings/power/intel,ap-pwrseq-vw.yaml b/zephyr/dts/bindings/power/intel,ap-pwrseq-vw.yaml index 12b310e383..606dd6c2b4 100644 --- a/zephyr/dts/bindings/power/intel,ap-pwrseq-vw.yaml +++ b/zephyr/dts/bindings/power/intel,ap-pwrseq-vw.yaml @@ -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. diff --git a/zephyr/dts/bindings/power/intel,ap-pwrseq.yaml b/zephyr/dts/bindings/power/intel,ap-pwrseq.yaml index 64c1fc7d30..b0a0426435 100644 --- a/zephyr/dts/bindings/power/intel,ap-pwrseq.yaml +++ b/zephyr/dts/bindings/power/intel,ap-pwrseq.yaml @@ -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. diff --git a/zephyr/dts/bindings/temp/cros-ec,temp-sensor-pct2075.yaml b/zephyr/dts/bindings/temp/cros-ec,temp-sensor-pct2075.yaml index cbf74e8193..dba35d36bc 100644 --- a/zephyr/dts/bindings/temp/cros-ec,temp-sensor-pct2075.yaml +++ b/zephyr/dts/bindings/temp/cros-ec,temp-sensor-pct2075.yaml @@ -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. diff --git a/zephyr/dts/bindings/temp/cros-ec,temp-sensor-rt9490.yaml b/zephyr/dts/bindings/temp/cros-ec,temp-sensor-rt9490.yaml index 260dcbf0c7..9e5af0dde3 100644 --- a/zephyr/dts/bindings/temp/cros-ec,temp-sensor-rt9490.yaml +++ b/zephyr/dts/bindings/temp/cros-ec,temp-sensor-rt9490.yaml @@ -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. diff --git a/zephyr/dts/bindings/temp/cros-ec,temp-sensor-sb-tsi.yaml b/zephyr/dts/bindings/temp/cros-ec,temp-sensor-sb-tsi.yaml index 1991e4656f..6e73d95e7b 100644 --- a/zephyr/dts/bindings/temp/cros-ec,temp-sensor-sb-tsi.yaml +++ b/zephyr/dts/bindings/temp/cros-ec,temp-sensor-sb-tsi.yaml @@ -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. diff --git a/zephyr/dts/bindings/temp/cros-ec,temp-sensor-thermistor.yaml b/zephyr/dts/bindings/temp/cros-ec,temp-sensor-thermistor.yaml index ec89441c8d..eb2abe4eef 100644 --- a/zephyr/dts/bindings/temp/cros-ec,temp-sensor-thermistor.yaml +++ b/zephyr/dts/bindings/temp/cros-ec,temp-sensor-thermistor.yaml @@ -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. diff --git a/zephyr/dts/bindings/temp/cros-ec,temp-sensor-tmp112.yaml b/zephyr/dts/bindings/temp/cros-ec,temp-sensor-tmp112.yaml index 121090c5a5..25771bc7c6 100644 --- a/zephyr/dts/bindings/temp/cros-ec,temp-sensor-tmp112.yaml +++ b/zephyr/dts/bindings/temp/cros-ec,temp-sensor-tmp112.yaml @@ -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. diff --git a/zephyr/dts/bindings/temp/cros-ec,temp-sensor.yaml b/zephyr/dts/bindings/temp/cros-ec,temp-sensor.yaml index dcf58ec571..598ea1f87c 100644 --- a/zephyr/dts/bindings/temp/cros-ec,temp-sensor.yaml +++ b/zephyr/dts/bindings/temp/cros-ec,temp-sensor.yaml @@ -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. diff --git a/zephyr/dts/bindings/temp/cros-ec,thermistor.yaml b/zephyr/dts/bindings/temp/cros-ec,thermistor.yaml index 0fd6353ec4..3121f8a95f 100644 --- a/zephyr/dts/bindings/temp/cros-ec,thermistor.yaml +++ b/zephyr/dts/bindings/temp/cros-ec,thermistor.yaml @@ -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. diff --git a/zephyr/dts/bindings/usbc/bc12/richtek,rt1718s-bc12.yaml b/zephyr/dts/bindings/usbc/bc12/richtek,rt1718s-bc12.yaml index c7e9a418fb..6a93e78496 100644 --- a/zephyr/dts/bindings/usbc/bc12/richtek,rt1718s-bc12.yaml +++ b/zephyr/dts/bindings/usbc/bc12/richtek,rt1718s-bc12.yaml @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/zephyr/dts/bindings/usbc/bc12/richtek,rt1739-bc12.yaml b/zephyr/dts/bindings/usbc/bc12/richtek,rt1739-bc12.yaml index b840e325c1..aef959bea8 100644 --- a/zephyr/dts/bindings/usbc/bc12/richtek,rt1739-bc12.yaml +++ b/zephyr/dts/bindings/usbc/bc12/richtek,rt1739-bc12.yaml @@ -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. diff --git a/zephyr/dts/bindings/usbc/bc12/richtek,rt9490-bc12.yaml b/zephyr/dts/bindings/usbc/bc12/richtek,rt9490-bc12.yaml index c740211141..38791d65bf 100644 --- a/zephyr/dts/bindings/usbc/bc12/richtek,rt9490-bc12.yaml +++ b/zephyr/dts/bindings/usbc/bc12/richtek,rt9490-bc12.yaml @@ -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. diff --git a/zephyr/dts/bindings/usbc/cros-ec,usb-mux-chain.yaml b/zephyr/dts/bindings/usbc/cros-ec,usb-mux-chain.yaml new file mode 100644 index 0000000000..398d7255ac --- /dev/null +++ b/zephyr/dts/bindings/usbc/cros-ec,usb-mux-chain.yaml @@ -0,0 +1,47 @@ +# 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: USB-C muxes chain + +compatible: "cros-ec,usb-mux-chain" + +properties: + usb-muxes: + type: phandles + required: true + description: | + List of USB-C muxes and retimers for the USB-C port. The USB-C subsystem + traverses this list in the order specified. The phandles are references to + cros-ec,usbc-mux nodes. Link this mux chain with a specific USB-C port by + adding the "cros-ec,usb-mux-chain" as a child of the "named-usbc-port" + node. + + alternative-chain: + type: boolean + description: | + Set if this is alternative USB-C muxes chain. It can be selected in + runtime using USB_MUX_ENABLE_ALTERNATIVE macro. + +# Example DTS defining USB-C port 0 with main and alternative usb mux chains. +# The main chain has two muxes: BB retimer and virtual mux. +# The alternative chain has three muxes: BB retimer, SOC side BB retimer and +# virtual mux. +# +# usbc_port0: port0@0 { +# compatible = "named-usbc-port"; +# reg = <0>; +# ... +# usb-mux-chain-0 { +# compatible = "cros-ec,usb-mux-chain"; +# usb-muxes = <&usb_c0_bb_retimer +# &virtual_mux_c0>; +# }; +# usb-mux-chain-0 { +# compatible = "cros-ec,usb-mux-chain"; +# alternative-chain; +# usb-muxes = <&usb_c0_bb_retimer +# &usb_c0_soc_side_bb_retimer +# &virtual_mux_c0>; +# }; +# }; diff --git a/zephyr/dts/bindings/usbc/mux/analogix,anx7483.yaml b/zephyr/dts/bindings/usbc/mux/analogix,anx7483.yaml index c1e6317d19..c4ac7782f0 100644 --- a/zephyr/dts/bindings/usbc/mux/analogix,anx7483.yaml +++ b/zephyr/dts/bindings/usbc/mux/analogix,anx7483.yaml @@ -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. diff --git a/zephyr/dts/bindings/usbc/mux/analogix,usbc-mux-anx7447.yaml b/zephyr/dts/bindings/usbc/mux/analogix,usbc-mux-anx7447.yaml index 497e535370..25b042e28c 100644 --- a/zephyr/dts/bindings/usbc/mux/analogix,usbc-mux-anx7447.yaml +++ b/zephyr/dts/bindings/usbc/mux/analogix,usbc-mux-anx7447.yaml @@ -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. diff --git a/zephyr/dts/bindings/usbc/mux/cros-ec,usbc-mux-tcpci.yaml b/zephyr/dts/bindings/usbc/mux/cros-ec,usbc-mux-tcpci.yaml index 8656fee567..548d510630 100644 --- a/zephyr/dts/bindings/usbc/mux/cros-ec,usbc-mux-tcpci.yaml +++ b/zephyr/dts/bindings/usbc/mux/cros-ec,usbc-mux-tcpci.yaml @@ -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. diff --git a/zephyr/dts/bindings/usbc/mux/cros-ec,usbc-mux-virtual.yaml b/zephyr/dts/bindings/usbc/mux/cros-ec,usbc-mux-virtual.yaml index cadeb6d35b..7231bc9e2c 100644 --- a/zephyr/dts/bindings/usbc/mux/cros-ec,usbc-mux-virtual.yaml +++ b/zephyr/dts/bindings/usbc/mux/cros-ec,usbc-mux-virtual.yaml @@ -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. diff --git a/zephyr/dts/bindings/usbc/mux/cros-ec,usbc-mux.yaml b/zephyr/dts/bindings/usbc/mux/cros-ec,usbc-mux.yaml index 21cb8e0a3f..0e76f548a9 100644 --- a/zephyr/dts/bindings/usbc/mux/cros-ec,usbc-mux.yaml +++ b/zephyr/dts/bindings/usbc/mux/cros-ec,usbc-mux.yaml @@ -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. diff --git a/zephyr/dts/bindings/usbc/mux/intel,jhl8040r.yaml b/zephyr/dts/bindings/usbc/mux/intel,jhl8040r.yaml index ebfeeea6c9..6289d440f1 100644 --- a/zephyr/dts/bindings/usbc/mux/intel,jhl8040r.yaml +++ b/zephyr/dts/bindings/usbc/mux/intel,jhl8040r.yaml @@ -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. diff --git a/zephyr/dts/bindings/usbc/mux/ite,it5205.yaml b/zephyr/dts/bindings/usbc/mux/ite,it5205.yaml index 4176eb3801..3c9381aee1 100644 --- a/zephyr/dts/bindings/usbc/mux/ite,it5205.yaml +++ b/zephyr/dts/bindings/usbc/mux/ite,it5205.yaml @@ -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. diff --git a/zephyr/dts/bindings/usbc/mux/parade,ps8743.yaml b/zephyr/dts/bindings/usbc/mux/parade,ps8743.yaml index 5f5c0d278b..1ee0bbaf74 100644 --- a/zephyr/dts/bindings/usbc/mux/parade,ps8743.yaml +++ b/zephyr/dts/bindings/usbc/mux/parade,ps8743.yaml @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/zephyr/dts/bindings/usbc/mux/parade,usbc-mux-ps8xxx.yaml b/zephyr/dts/bindings/usbc/mux/parade,usbc-mux-ps8xxx.yaml index 53a0d03738..4df0b35d76 100644 --- a/zephyr/dts/bindings/usbc/mux/parade,usbc-mux-ps8xxx.yaml +++ b/zephyr/dts/bindings/usbc/mux/parade,usbc-mux-ps8xxx.yaml @@ -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. diff --git a/zephyr/dts/bindings/usbc/mux/ti,tusb1064.yaml b/zephyr/dts/bindings/usbc/mux/ti,tusb1064.yaml index 7ee9a2c0cd..d5a0b34e6c 100644 --- a/zephyr/dts/bindings/usbc/mux/ti,tusb1064.yaml +++ b/zephyr/dts/bindings/usbc/mux/ti,tusb1064.yaml @@ -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. diff --git a/zephyr/dts/bindings/usbc/named-usbc-port.yaml b/zephyr/dts/bindings/usbc/named-usbc-port.yaml index 7717a2e4d3..1cdcb878b2 100644 --- a/zephyr/dts/bindings/usbc/named-usbc-port.yaml +++ b/zephyr/dts/bindings/usbc/named-usbc-port.yaml @@ -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. @@ -39,13 +39,6 @@ properties: required: false description: | Alternate PPC for the USB-C port. - usb-muxes: - type: phandles - required: false - description: | - List of USB-C muxes and retimers for the USB-C port. The USB-C subsystem - traverses this list in the order specified. The phandles are references to - cros-ec,usbc-mux nodes. # Example: diff --git a/zephyr/dts/bindings/usbc/ppc-chip.yaml b/zephyr/dts/bindings/usbc/ppc-chip.yaml index f000ca5802..7fe944fe4c 100644 --- a/zephyr/dts/bindings/usbc/ppc-chip.yaml +++ b/zephyr/dts/bindings/usbc/ppc-chip.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2021 The Chromium OS Authors +# Copyright 2021 The ChromiumOS Authors # SPDX-License-Identifier: Apache-2.0 description: Power path chip diff --git a/zephyr/dts/bindings/usbc/ppc/aoz,aoz1380.yaml b/zephyr/dts/bindings/usbc/ppc/aoz,aoz1380.yaml index def8450903..52144ffc78 100644 --- a/zephyr/dts/bindings/usbc/ppc/aoz,aoz1380.yaml +++ b/zephyr/dts/bindings/usbc/ppc/aoz,aoz1380.yaml @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/zephyr/dts/bindings/usbc/ppc/nxp,nx20p348x.yaml b/zephyr/dts/bindings/usbc/ppc/nxp,nx20p348x.yaml index fc16ee95ee..b297702356 100644 --- a/zephyr/dts/bindings/usbc/ppc/nxp,nx20p348x.yaml +++ b/zephyr/dts/bindings/usbc/ppc/nxp,nx20p348x.yaml @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/zephyr/dts/bindings/usbc/ppc/richtek,rt1739-ppc.yaml b/zephyr/dts/bindings/usbc/ppc/richtek,rt1739-ppc.yaml index 76f0d268f4..e15322883c 100644 --- a/zephyr/dts/bindings/usbc/ppc/richtek,rt1739-ppc.yaml +++ b/zephyr/dts/bindings/usbc/ppc/richtek,rt1739-ppc.yaml @@ -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. diff --git a/zephyr/dts/bindings/usbc/tcpc/cypress,ccgxxf.yaml b/zephyr/dts/bindings/usbc/tcpc/cypress,ccgxxf.yaml index 54455eace7..f6ad3c3ba6 100644 --- a/zephyr/dts/bindings/usbc/tcpc/cypress,ccgxxf.yaml +++ b/zephyr/dts/bindings/usbc/tcpc/cypress,ccgxxf.yaml @@ -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. diff --git a/zephyr/dts/bindings/usbc/tcpc/nuvoton,nct38xx.yaml b/zephyr/dts/bindings/usbc/tcpc/nuvoton,nct38xx.yaml index 5131991aee..51a69846e0 100644 --- a/zephyr/dts/bindings/usbc/tcpc/nuvoton,nct38xx.yaml +++ b/zephyr/dts/bindings/usbc/tcpc/nuvoton,nct38xx.yaml @@ -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. diff --git a/zephyr/dts/bindings/usbc/tcpc/richtek,rt1718s-tcpc.yaml b/zephyr/dts/bindings/usbc/tcpc/richtek,rt1718s-tcpc.yaml index edc815bba4..fb7dc8a4aa 100644 --- a/zephyr/dts/bindings/usbc/tcpc/richtek,rt1718s-tcpc.yaml +++ b/zephyr/dts/bindings/usbc/tcpc/richtek,rt1718s-tcpc.yaml @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/zephyr/dts/bindings/vendor-prefixes.txt b/zephyr/dts/bindings/vendor-prefixes.txt index d0c5669dd2..53dd2d4cfc 100644 --- a/zephyr/dts/bindings/vendor-prefixes.txt +++ b/zephyr/dts/bindings/vendor-prefixes.txt @@ -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. diff --git a/zephyr/dts/board-overlays/native_posix.dts b/zephyr/dts/board-overlays/native_posix.dts index 45712f57b5..44a034d73b 100644 --- a/zephyr/dts/board-overlays/native_posix.dts +++ b/zephyr/dts/board-overlays/native_posix.dts @@ -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. */ diff --git a/zephyr/dts/it8xxx2_emul.dts b/zephyr/dts/it8xxx2_emul.dts new file mode 100644 index 0000000000..dcb44aebd2 --- /dev/null +++ b/zephyr/dts/it8xxx2_emul.dts @@ -0,0 +1,177 @@ +/* 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. + */ + +/* Contains emulators for devices normally found on IT8xxx2 chips. + * To use, include this file, then the board's gpio definitions. + */ + +#include <dt-bindings/gpio_defines.h> + +/ { + gpioa: gpio@f01601 { + status = "okay"; + compatible = "zephyr,gpio-emul"; + reg = <0xf01601 0x4>; + rising-edge; + falling-edge; + high-level; + low-level; + gpio-controller; + #gpio-cells = <2>; + ngpios = <8>; + }; + gpiob: gpio@f01602 { + status = "okay"; + compatible = "zephyr,gpio-emul"; + reg = <0xf01602 0x4>; + rising-edge; + falling-edge; + high-level; + low-level; + gpio-controller; + #gpio-cells = <2>; + ngpios = <8>; + }; + gpioc: gpio@f01603 { + status = "okay"; + compatible = "zephyr,gpio-emul"; + reg = <0xf01603 0x4>; + rising-edge; + falling-edge; + high-level; + low-level; + gpio-controller; + #gpio-cells = <2>; + ngpios = <8>; + }; + gpiod: gpio@f01604 { + status = "okay"; + compatible = "zephyr,gpio-emul"; + reg = <0xf01604 0x4>; + rising-edge; + falling-edge; + high-level; + low-level; + gpio-controller; + #gpio-cells = <2>; + ngpios = <8>; + }; + gpioe: gpio@f01605 { + status = "okay"; + compatible = "zephyr,gpio-emul"; + reg = <0xf01605 0x4>; + rising-edge; + falling-edge; + high-level; + low-level; + gpio-controller; + #gpio-cells = <2>; + ngpios = <8>; + }; + gpiof: gpio@f01606 { + status = "okay"; + compatible = "zephyr,gpio-emul"; + reg = <0xf01606 0x4>; + rising-edge; + falling-edge; + high-level; + low-level; + gpio-controller; + #gpio-cells = <2>; + ngpios = <8>; + }; + gpiog: gpio@f01607 { + status = "okay"; + compatible = "zephyr,gpio-emul"; + reg = <0xf01607 0x4>; + rising-edge; + falling-edge; + high-level; + low-level; + gpio-controller; + #gpio-cells = <2>; + ngpios = <8>; + }; + gpioh: gpio@f01608 { + status = "okay"; + compatible = "zephyr,gpio-emul"; + reg = <0xf01608 0x4>; + rising-edge; + falling-edge; + high-level; + low-level; + gpio-controller; + #gpio-cells = <2>; + ngpios = <8>; + }; + gpioi: gpio@f01609 { + status = "okay"; + compatible = "zephyr,gpio-emul"; + reg = <0xf01609 0x4>; + rising-edge; + falling-edge; + high-level; + low-level; + gpio-controller; + #gpio-cells = <2>; + ngpios = <8>; + }; + gpioj: gpio@f0160a { + status = "okay"; + compatible = "zephyr,gpio-emul"; + reg = <0xf0160a 0x4>; + rising-edge; + falling-edge; + high-level; + low-level; + gpio-controller; + #gpio-cells = <2>; + ngpios = <8>; + }; + gpiok: gpio@f0160b { + status = "okay"; + compatible = "zephyr,gpio-emul"; + reg = <0xf0160b 0x4>; + rising-edge; + falling-edge; + high-level; + low-level; + gpio-controller; + #gpio-cells = <2>; + ngpios = <8>; + }; + gpiol: gpio@f0160c { + status = "okay"; + compatible = "zephyr,gpio-emul"; + reg = <0xf0160c 0x4>; + rising-edge; + falling-edge; + high-level; + low-level; + gpio-controller; + #gpio-cells = <2>; + ngpios = <8>; + }; + gpiom: gpio@f0160d { + status = "okay"; + compatible = "zephyr,gpio-emul"; + reg = <0xf0160d 0x4>; + rising-edge; + falling-edge; + high-level; + low-level; + gpio-controller; + #gpio-cells = <2>; + ngpios = <8>; + }; + + i2c_ctrl0: i2c@f01c40 { + compatible = "zephyr,i2c-emul-controller"; + clock-frequency = <I2C_BITRATE_STANDARD>; + #address-cells = <1>; + #size-cells = <0>; + reg = <0xf01c40 0x1000>; + }; +}; diff --git a/zephyr/dts/npcx_emul.dts b/zephyr/dts/npcx_emul.dts index a0357d7a88..20b1a02eeb 100644 --- a/zephyr/dts/npcx_emul.dts +++ b/zephyr/dts/npcx_emul.dts @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/emul/CMakeLists.txt b/zephyr/emul/CMakeLists.txt index 70a8591c73..f8e4bae15b 100644 --- a/zephyr/emul/CMakeLists.txt +++ b/zephyr/emul/CMakeLists.txt @@ -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. @@ -22,6 +22,7 @@ zephyr_library_sources_ifdef(CONFIG_EMUL_CLOCK_CONTROL emul_clock_control.c) zephyr_library_sources_ifdef(CONFIG_EMUL_SN5S330 emul_sn5s330.c) zephyr_library_sources_ifdef(CONFIG_EMUL_KB_RAW emul_kb_raw.c) zephyr_library_sources_ifdef(CONFIG_EMUL_CROS_FLASH emul_flash.c) +zephyr_library_sources_ifdef(CONFIG_EMUL_RTC emul_rtc.c) zephyr_library_sources_ifdef(CONFIG_EMUL_RT9490 emul_rt9490.c) zephyr_library_sources_ifdef(CONFIG_PWM_MOCK pwm_mock.c) diff --git a/zephyr/emul/Kconfig b/zephyr/emul/Kconfig index f2740632d3..3cabd96b6f 100644 --- a/zephyr/emul/Kconfig +++ b/zephyr/emul/Kconfig @@ -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,9 +77,15 @@ config EMUL_KB_RAW config EMUL_CROS_FLASH bool "Emulated flash driver for the Zephyr shim" select PLATFORM_EC_FLASH_CROS + imply SYSTEM_FAKE help This option enables the flash emulator for testing. +config EMUL_RTC + bool "Emulated RTC driver for Zephyr shim" + help + This options enables the RTC emulator for testing. + config EMUL_RT9490 bool "Rt9490 charger emulator" select EMUL_COMMON_I2C diff --git a/zephyr/emul/Kconfig.clock_control b/zephyr/emul/Kconfig.clock_control index 5d385f4e0b..29b38333c9 100644 --- a/zephyr/emul/Kconfig.clock_control +++ b/zephyr/emul/Kconfig.clock_control @@ -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. diff --git a/zephyr/emul/Kconfig.i2c_mock b/zephyr/emul/Kconfig.i2c_mock index a94147bb63..9bc75d961c 100644 --- a/zephyr/emul/Kconfig.i2c_mock +++ b/zephyr/emul/Kconfig.i2c_mock @@ -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. diff --git a/zephyr/emul/Kconfig.isl923x b/zephyr/emul/Kconfig.isl923x index 762d0f5ca2..d1ad526979 100644 --- a/zephyr/emul/Kconfig.isl923x +++ b/zephyr/emul/Kconfig.isl923x @@ -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. diff --git a/zephyr/emul/Kconfig.lis2dw12 b/zephyr/emul/Kconfig.lis2dw12 index ee223a4891..e74f1f8cf4 100644 --- a/zephyr/emul/Kconfig.lis2dw12 +++ b/zephyr/emul/Kconfig.lis2dw12 @@ -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. diff --git a/zephyr/emul/Kconfig.ln9310 b/zephyr/emul/Kconfig.ln9310 index 193c83093c..9cacfbd670 100644 --- a/zephyr/emul/Kconfig.ln9310 +++ b/zephyr/emul/Kconfig.ln9310 @@ -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. diff --git a/zephyr/emul/Kconfig.sn5s330 b/zephyr/emul/Kconfig.sn5s330 index 3ae2eb29e3..283bf1fbd7 100644 --- a/zephyr/emul/Kconfig.sn5s330 +++ b/zephyr/emul/Kconfig.sn5s330 @@ -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. diff --git a/zephyr/emul/emul_bb_retimer.c b/zephyr/emul/emul_bb_retimer.c index 0a43e45749..266fd1a340 100644 --- a/zephyr/emul/emul_bb_retimer.c +++ b/zephyr/emul/emul_bb_retimer.c @@ -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. */ diff --git a/zephyr/emul/emul_bma255.c b/zephyr/emul/emul_bma255.c index 37b700a649..a57c8fbdbb 100644 --- a/zephyr/emul/emul_bma255.c +++ b/zephyr/emul/emul_bma255.c @@ -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. */ diff --git a/zephyr/emul/emul_bmi.c b/zephyr/emul/emul_bmi.c index f409b0f967..fe46428f01 100644 --- a/zephyr/emul/emul_bmi.c +++ b/zephyr/emul/emul_bmi.c @@ -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. */ diff --git a/zephyr/emul/emul_bmi160.c b/zephyr/emul/emul_bmi160.c index 0fdb3ffa94..c1d6b58a8f 100644 --- a/zephyr/emul/emul_bmi160.c +++ b/zephyr/emul/emul_bmi160.c @@ -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. */ diff --git a/zephyr/emul/emul_bmi260.c b/zephyr/emul/emul_bmi260.c index 9f1158edf6..5892a9ae96 100644 --- a/zephyr/emul/emul_bmi260.c +++ b/zephyr/emul/emul_bmi260.c @@ -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. */ diff --git a/zephyr/emul/emul_clock_control.c b/zephyr/emul/emul_clock_control.c index 397c4af32e..561298a705 100644 --- a/zephyr/emul/emul_clock_control.c +++ b/zephyr/emul/emul_clock_control.c @@ -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. */ diff --git a/zephyr/emul/emul_common_i2c.c b/zephyr/emul/emul_common_i2c.c index 55fc7fb436..70bc962c5f 100644 --- a/zephyr/emul/emul_common_i2c.c +++ b/zephyr/emul/emul_common_i2c.c @@ -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. */ diff --git a/zephyr/emul/emul_flash.c b/zephyr/emul/emul_flash.c index 25a3f78018..0efc690fd4 100644 --- a/zephyr/emul/emul_flash.c +++ b/zephyr/emul/emul_flash.c @@ -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. */ @@ -32,31 +32,6 @@ struct flash_emul_cfg { /* Variables to emulate the protection */ bool ro_protected, all_protected; -static enum ec_image shrspi_image_copy = EC_IMAGE_RO; - -void system_jump_to_booter(void) -{ -} - -uint32_t system_get_lfw_address(void) -{ - uint32_t jump_addr = (uint32_t)system_jump_to_booter; - return jump_addr; -} - -enum ec_image system_get_shrspi_image_copy(void) -{ - return shrspi_image_copy; -} - -void system_set_shrspi_image_copy(enum ec_image new_image_copy) -{ - shrspi_image_copy = new_image_copy; -} - -void system_set_image_copy(enum ec_image copy) -{ -} static int cros_flash_emul_init(const struct device *dev) { diff --git a/zephyr/emul/emul_isl923x.c b/zephyr/emul/emul_isl923x.c index 61dbf30cc2..1ecb9e79f9 100644 --- a/zephyr/emul/emul_isl923x.c +++ b/zephyr/emul/emul_isl923x.c @@ -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. */ diff --git a/zephyr/emul/emul_kb_raw.c b/zephyr/emul/emul_kb_raw.c index 0a418f2c31..1fdd93d1a0 100644 --- a/zephyr/emul/emul_kb_raw.c +++ b/zephyr/emul/emul_kb_raw.c @@ -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. */ diff --git a/zephyr/emul/emul_lis2dw12.c b/zephyr/emul/emul_lis2dw12.c index 8fbdd18afc..bdc4b50358 100644 --- a/zephyr/emul/emul_lis2dw12.c +++ b/zephyr/emul/emul_lis2dw12.c @@ -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. */ diff --git a/zephyr/emul/emul_ln9310.c b/zephyr/emul/emul_ln9310.c index f6ffbf2b33..bd6d41bce3 100644 --- a/zephyr/emul/emul_ln9310.c +++ b/zephyr/emul/emul_ln9310.c @@ -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. */ diff --git a/zephyr/emul/emul_pi3usb9201.c b/zephyr/emul/emul_pi3usb9201.c index ffcaa5e220..3b1193d9b1 100644 --- a/zephyr/emul/emul_pi3usb9201.c +++ b/zephyr/emul/emul_pi3usb9201.c @@ -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. */ diff --git a/zephyr/emul/emul_rt9490.c b/zephyr/emul/emul_rt9490.c index 7c13cbe9e4..5c0e7bf8b9 100644 --- a/zephyr/emul/emul_rt9490.c +++ b/zephyr/emul/emul_rt9490.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/emul/emul_rtc.c b/zephyr/emul/emul_rtc.c new file mode 100644 index 0000000000..45741a5277 --- /dev/null +++ b/zephyr/emul/emul_rtc.c @@ -0,0 +1,139 @@ +/* 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. + */ + +#define DT_DRV_COMPAT cros_ec_rtc_emul + +#include <zephyr/logging/log.h> +LOG_MODULE_REGISTER(emul_rtc); + +#include <zephyr/device.h> +#include <zephyr/drivers/emul.h> +#include <ec_commands.h> +#include <drivers/cros_rtc.h> +#include <zephyr/sys/__assert.h> + +#include "flash.h" + +struct cros_rtc_emul_data { + const struct device *rtc_dev; + uint32_t alarm_time; + cros_rtc_alarm_callback_t alarm_callback; + uint32_t value; +}; + +struct rtc_emul_cfg { + /** Pointer to run-time data */ + struct cros_rtc_emul_data *data; +}; + +#define RTC_DEV DT_CHOSEN(zephyr_rtc_controller) + +#define DRV_DATA(dev) ((struct cros_rtc_emul_data *)(dev)->data) + +static int cros_rtc_emul_configure(const struct device *dev, + cros_rtc_alarm_callback_t callback) +{ + struct cros_rtc_emul_data *data = DRV_DATA(dev); + + if (callback == NULL) { + return -EINVAL; + } + + data->alarm_callback = callback; + + return EC_SUCCESS; +} + +static int cros_rtc_emul_get_value(const struct device *dev, uint32_t *value) +{ + struct cros_rtc_emul_data *data = DRV_DATA(dev); + + *value = data->value; + + return EC_SUCCESS; +} + +static int cros_rtc_emul_set_value(const struct device *dev, uint32_t value) +{ + struct cros_rtc_emul_data *data = DRV_DATA(dev); + + data->value = value; + + return EC_SUCCESS; +} + +static int cros_rtc_emul_get_alarm(const struct device *dev, uint32_t *seconds, + uint32_t *microseconds) +{ + struct cros_rtc_emul_data *data = DRV_DATA(dev); + + *seconds = data->alarm_time; + *microseconds = 0; + + return EC_SUCCESS; +} + +static int cros_rtc_emul_reset_alarm(const struct device *dev) +{ + struct cros_rtc_emul_data *data = DRV_DATA(dev); + + data->alarm_time = 0; + + return EC_SUCCESS; +} + +static int cros_rtc_emul_set_alarm(const struct device *dev, uint32_t seconds, + uint32_t microseconds) +{ + struct cros_rtc_emul_data *data = DRV_DATA(dev); + int ret; + + ARG_UNUSED(microseconds); + + ret = cros_rtc_emul_reset_alarm(dev); + + if (ret < 0) { + return ret; + } + + data->alarm_time = seconds; + + if (ret < 0) { + return ret; + } + + return EC_SUCCESS; +} + +static const struct cros_rtc_driver_api emul_cros_rtc_driver_api = { + .configure = cros_rtc_emul_configure, + .get_value = cros_rtc_emul_get_value, + .set_value = cros_rtc_emul_set_value, + .get_alarm = cros_rtc_emul_get_alarm, + .set_alarm = cros_rtc_emul_set_alarm, + .reset_alarm = cros_rtc_emul_reset_alarm, +}; + +static int rtc_emul_init(const struct device *dev) +{ + struct cros_rtc_emul_data *data = DRV_DATA(dev); + + data->alarm_callback = NULL; + data->alarm_time = 0; + data->value = 0; + + return EC_SUCCESS; +} + +#define RTC_EMUL(n) \ + static struct cros_rtc_emul_data cros_rtc_emul_data_##n = {}; \ + static const struct rtc_emul_cfg rtc_emul_cfg_##n = { \ + .data = &cros_rtc_emul_data_##n, \ + }; \ + DEVICE_DT_INST_DEFINE(n, rtc_emul_init, NULL, &cros_rtc_emul_data_##n, \ + &rtc_emul_cfg_##n, PRE_KERNEL_1, \ + CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, \ + &emul_cros_rtc_driver_api) +DT_INST_FOREACH_STATUS_OKAY(RTC_EMUL); diff --git a/zephyr/emul/emul_smart_battery.c b/zephyr/emul/emul_smart_battery.c index bd27952a6d..cd2e9a09ed 100644 --- a/zephyr/emul/emul_smart_battery.c +++ b/zephyr/emul/emul_smart_battery.c @@ -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. */ diff --git a/zephyr/emul/emul_sn5s330.c b/zephyr/emul/emul_sn5s330.c index 64798ea5e4..f957cd9e05 100644 --- a/zephyr/emul/emul_sn5s330.c +++ b/zephyr/emul/emul_sn5s330.c @@ -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. */ diff --git a/zephyr/emul/emul_syv682x.c b/zephyr/emul/emul_syv682x.c index 00c7fbf1e2..8fb4bfc928 100644 --- a/zephyr/emul/emul_syv682x.c +++ b/zephyr/emul/emul_syv682x.c @@ -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. */ diff --git a/zephyr/emul/emul_tcs3400.c b/zephyr/emul/emul_tcs3400.c index cffda07074..e87deebc35 100644 --- a/zephyr/emul/emul_tcs3400.c +++ b/zephyr/emul/emul_tcs3400.c @@ -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. */ diff --git a/zephyr/emul/i2c_mock.c b/zephyr/emul/i2c_mock.c index 2d9b939317..8601c87ee7 100644 --- a/zephyr/emul/i2c_mock.c +++ b/zephyr/emul/i2c_mock.c @@ -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. */ diff --git a/zephyr/emul/include/flash_chip.h b/zephyr/emul/include/flash_chip.h index e99767f9ab..947246867b 100644 --- a/zephyr/emul/include/flash_chip.h +++ b/zephyr/emul/include/flash_chip.h @@ -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. */ diff --git a/zephyr/emul/include/pwm_mock.h b/zephyr/emul/include/pwm_mock.h index 67bd5ad41c..33bda3deeb 100644 --- a/zephyr/emul/include/pwm_mock.h +++ b/zephyr/emul/include/pwm_mock.h @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/emul/pwm_mock.c b/zephyr/emul/pwm_mock.c index a98f1d9f11..0d68a60b30 100644 --- a/zephyr/emul/pwm_mock.c +++ b/zephyr/emul/pwm_mock.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/emul/tcpc/CMakeLists.txt b/zephyr/emul/tcpc/CMakeLists.txt index f266661c82..b43d73ead3 100644 --- a/zephyr/emul/tcpc/CMakeLists.txt +++ b/zephyr/emul/tcpc/CMakeLists.txt @@ -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. diff --git a/zephyr/emul/tcpc/Kconfig b/zephyr/emul/tcpc/Kconfig index fb039b5af0..6866e7bab5 100644 --- a/zephyr/emul/tcpc/Kconfig +++ b/zephyr/emul/tcpc/Kconfig @@ -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. diff --git a/zephyr/emul/tcpc/emul_ps8xxx.c b/zephyr/emul/tcpc/emul_ps8xxx.c index d01c12a4af..467a487802 100644 --- a/zephyr/emul/tcpc/emul_ps8xxx.c +++ b/zephyr/emul/tcpc/emul_ps8xxx.c @@ -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. */ diff --git a/zephyr/emul/tcpc/emul_tcpci.c b/zephyr/emul/tcpc/emul_tcpci.c index 432005bf3a..e19f7a2726 100644 --- a/zephyr/emul/tcpc/emul_tcpci.c +++ b/zephyr/emul/tcpc/emul_tcpci.c @@ -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. */ diff --git a/zephyr/emul/tcpc/emul_tcpci_generic.c b/zephyr/emul/tcpc/emul_tcpci_generic.c index 50cf0e7eee..204e040ede 100644 --- a/zephyr/emul/tcpc/emul_tcpci_generic.c +++ b/zephyr/emul/tcpc/emul_tcpci_generic.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS 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. */ diff --git a/zephyr/emul/tcpc/emul_tcpci_partner_common.c b/zephyr/emul/tcpc/emul_tcpci_partner_common.c index d2bba0dfec..4d6467378e 100644 --- a/zephyr/emul/tcpc/emul_tcpci_partner_common.c +++ b/zephyr/emul/tcpc/emul_tcpci_partner_common.c @@ -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. */ @@ -8,7 +8,7 @@ LOG_MODULE_REGISTER(tcpci_partner, CONFIG_TCPCI_EMUL_LOG_LEVEL); #include <stdlib.h> #include <zephyr/sys/byteorder.h> -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/ztest.h> #include "common.h" diff --git a/zephyr/emul/tcpc/emul_tcpci_partner_drp.c b/zephyr/emul/tcpc/emul_tcpci_partner_drp.c index 9718cf91c3..277957282d 100644 --- a/zephyr/emul/tcpc/emul_tcpci_partner_drp.c +++ b/zephyr/emul/tcpc/emul_tcpci_partner_drp.c @@ -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. */ @@ -7,7 +7,7 @@ LOG_MODULE_REGISTER(tcpci_drp_emul, CONFIG_TCPCI_EMUL_LOG_LEVEL); #include <zephyr/sys/byteorder.h> -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include "common.h" #include "emul/tcpc/emul_tcpci.h" diff --git a/zephyr/emul/tcpc/emul_tcpci_partner_faulty_ext.c b/zephyr/emul/tcpc/emul_tcpci_partner_faulty_ext.c index ba7483f157..fc4cd06b82 100644 --- a/zephyr/emul/tcpc/emul_tcpci_partner_faulty_ext.c +++ b/zephyr/emul/tcpc/emul_tcpci_partner_faulty_ext.c @@ -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. */ @@ -7,7 +7,7 @@ LOG_MODULE_REGISTER(tcpci_faulty_ext, CONFIG_TCPCI_EMUL_LOG_LEVEL); #include <zephyr/sys/byteorder.h> -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include "common.h" #include "emul/tcpc/emul_tcpci.h" diff --git a/zephyr/emul/tcpc/emul_tcpci_partner_snk.c b/zephyr/emul/tcpc/emul_tcpci_partner_snk.c index 650759c416..8d0fe1fa1e 100644 --- a/zephyr/emul/tcpc/emul_tcpci_partner_snk.c +++ b/zephyr/emul/tcpc/emul_tcpci_partner_snk.c @@ -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 @@ LOG_MODULE_REGISTER(tcpci_snk_emul, CONFIG_TCPCI_EMUL_LOG_LEVEL); #include <zephyr/sys/byteorder.h> -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include "common.h" #include "emul/tcpc/emul_tcpci.h" diff --git a/zephyr/emul/tcpc/emul_tcpci_partner_src.c b/zephyr/emul/tcpc/emul_tcpci_partner_src.c index 00af0764c8..c81d69c25f 100644 --- a/zephyr/emul/tcpc/emul_tcpci_partner_src.c +++ b/zephyr/emul/tcpc/emul_tcpci_partner_src.c @@ -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 @@ LOG_MODULE_REGISTER(tcpci_src_emul, CONFIG_TCPCI_EMUL_LOG_LEVEL); #include <zephyr/sys/byteorder.h> -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include "common.h" #include "emul/tcpc/emul_tcpci_partner_common.h" diff --git a/zephyr/fake/CMakeLists.txt b/zephyr/fake/CMakeLists.txt new file mode 100644 index 0000000000..6b9f16bc20 --- /dev/null +++ b/zephyr/fake/CMakeLists.txt @@ -0,0 +1,7 @@ +# 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. + +zephyr_library_sources_ifdef(CONFIG_SYSTEM_FAKE system_fake.c) + +cros_ec_library_include_directories(include) diff --git a/zephyr/fake/Kconfig b/zephyr/fake/Kconfig new file mode 100644 index 0000000000..c5f6fef669 --- /dev/null +++ b/zephyr/fake/Kconfig @@ -0,0 +1,11 @@ +# 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. + +config SYSTEM_FAKE + bool "Use a fake system module" + help + This provides a fake implementation of some of the hooks used by + common/system.c so that EC reboots can be faked. + + It should only be included in tests. diff --git a/zephyr/fake/include/system_fake.h b/zephyr/fake/include/system_fake.h new file mode 100644 index 0000000000..42fcc5d596 --- /dev/null +++ b/zephyr/fake/include/system_fake.h @@ -0,0 +1,18 @@ +/* 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. + */ + +#ifndef ZEPHYR_FAKE_SYSTEM_FAKE_H +#define ZEPHYR_FAKE_SYSTEM_FAKE_H + +#include <setjmp.h> + +#include "ec_commands.h" + +/** + * @brief Set the current image copy. + */ +void system_set_shrspi_image_copy(enum ec_image new_image_copy); + +#endif /* ZEPHYR_FAKE_SYSTEM_FAKE_H */ diff --git a/zephyr/fake/system_fake.c b/zephyr/fake/system_fake.c new file mode 100644 index 0000000000..75beb62b23 --- /dev/null +++ b/zephyr/fake/system_fake.c @@ -0,0 +1,46 @@ +/* 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. + */ + +#include <setjmp.h> + +#include "system.h" +#include "system_fake.h" + +static enum ec_image shrspi_image_copy = EC_IMAGE_RO; + +/* setjmp environment to use for reboot (NULL if none) */ +static jmp_buf *jump_env; + +void system_fake_setenv(jmp_buf *env) +{ + jump_env = env; +} + +void system_jump_to_booter(void) +{ + if (jump_env) + longjmp(*jump_env, 1); +} + +uint32_t system_get_lfw_address(void) +{ + uint32_t jump_addr = (uint32_t)system_jump_to_booter; + + return jump_addr; +} + +enum ec_image system_get_shrspi_image_copy(void) +{ + return shrspi_image_copy; +} + +void system_set_shrspi_image_copy(enum ec_image new_image_copy) +{ + shrspi_image_copy = new_image_copy; +} + +void system_set_image_copy(enum ec_image copy) +{ +} diff --git a/zephyr/firmware_builder.py b/zephyr/firmware_builder.py index 76a21c9c2a..2bb5f95c41 100755 --- a/zephyr/firmware_builder.py +++ b/zephyr/firmware_builder.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# 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. """Build and test all of the Zephyr boards. diff --git a/zephyr/fpu.cmake b/zephyr/fpu.cmake index 5f1c698b15..4cda364572 100644 --- a/zephyr/fpu.cmake +++ b/zephyr/fpu.cmake @@ -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. diff --git a/zephyr/gcov.tmpl.sh b/zephyr/gcov.tmpl.sh index 96bd82ab51..b9dd0e7865 100755 --- a/zephyr/gcov.tmpl.sh +++ b/zephyr/gcov.tmpl.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# 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. diff --git a/zephyr/hayato_get_cfg.sh b/zephyr/hayato_get_cfg.sh index 5ebe3dc364..1ab1be7a4f 100755 --- a/zephyr/hayato_get_cfg.sh +++ b/zephyr/hayato_get_cfg.sh @@ -1,5 +1,5 @@ #!/bin/bash -# 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. diff --git a/zephyr/include/ap_power/ap_power.h b/zephyr/include/ap_power/ap_power.h index 6c4d6c2347..05387d8431 100644 --- a/zephyr/include/ap_power/ap_power.h +++ b/zephyr/include/ap_power/ap_power.h @@ -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. */ diff --git a/zephyr/include/ap_power/ap_power_espi.h b/zephyr/include/ap_power/ap_power_espi.h index 53bd3811eb..2c295054f3 100644 --- a/zephyr/include/ap_power/ap_power_espi.h +++ b/zephyr/include/ap_power/ap_power_espi.h @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/include/ap_power/ap_power_events.h b/zephyr/include/ap_power/ap_power_events.h index 6181deb2bd..8a6a9764de 100644 --- a/zephyr/include/ap_power/ap_power_events.h +++ b/zephyr/include/ap_power/ap_power_events.h @@ -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. */ diff --git a/zephyr/include/ap_power/ap_power_interface.h b/zephyr/include/ap_power/ap_power_interface.h index d3d31f6ecb..d2808f6075 100644 --- a/zephyr/include/ap_power/ap_power_interface.h +++ b/zephyr/include/ap_power/ap_power_interface.h @@ -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. */ diff --git a/zephyr/include/ap_power/ap_pwrseq.h b/zephyr/include/ap_power/ap_pwrseq.h index 8b91775771..9e1ffd27e8 100644 --- a/zephyr/include/ap_power/ap_pwrseq.h +++ b/zephyr/include/ap_power/ap_pwrseq.h @@ -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. */ diff --git a/zephyr/include/cros/binman.dtsi b/zephyr/include/cros/binman.dtsi index 78003204de..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. */ diff --git a/zephyr/include/cros/ite/it8xxx2.dtsi b/zephyr/include/cros/ite/it8xxx2.dtsi index 19253cb82d..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. */ diff --git a/zephyr/include/cros/microchip/mec1727.dtsi b/zephyr/include/cros/microchip/mec1727.dtsi index f436709daa..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. */ diff --git a/zephyr/include/cros/microchip/mec172x.dtsi b/zephyr/include/cros/microchip/mec172x.dtsi index 6dcc563f34..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. */ diff --git a/zephyr/include/cros/nuvoton/npcx.dtsi b/zephyr/include/cros/nuvoton/npcx.dtsi index 0b8381a0df..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 */ 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/drivers/cros_displight.h b/zephyr/include/drivers/cros_displight.h index 83c8577c7e..340d51f60d 100644 --- a/zephyr/include/drivers/cros_displight.h +++ b/zephyr/include/drivers/cros_displight.h @@ -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. */ diff --git a/zephyr/include/drivers/cros_flash.h b/zephyr/include/drivers/cros_flash.h index caef62528d..267649476b 100644 --- a/zephyr/include/drivers/cros_flash.h +++ b/zephyr/include/drivers/cros_flash.h @@ -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. */ diff --git a/zephyr/include/drivers/cros_kb_raw.h b/zephyr/include/drivers/cros_kb_raw.h index db2d00bf76..d370a3bbde 100644 --- a/zephyr/include/drivers/cros_kb_raw.h +++ b/zephyr/include/drivers/cros_kb_raw.h @@ -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. */ diff --git a/zephyr/include/drivers/cros_rtc.h b/zephyr/include/drivers/cros_rtc.h index 343cf0405e..3a0f332b98 100644 --- a/zephyr/include/drivers/cros_rtc.h +++ b/zephyr/include/drivers/cros_rtc.h @@ -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. */ diff --git a/zephyr/include/drivers/cros_shi.h b/zephyr/include/drivers/cros_shi.h index 3d14e2c34f..3eb3038a45 100644 --- a/zephyr/include/drivers/cros_shi.h +++ b/zephyr/include/drivers/cros_shi.h @@ -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. */ diff --git a/zephyr/include/drivers/cros_system.h b/zephyr/include/drivers/cros_system.h index 5b3d12ea58..5105d97cc9 100644 --- a/zephyr/include/drivers/cros_system.h +++ b/zephyr/include/drivers/cros_system.h @@ -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. */ diff --git a/zephyr/include/dt-bindings/battery.h b/zephyr/include/dt-bindings/battery.h index a8c6fc0a95..e6465e2a9b 100644 --- a/zephyr/include/dt-bindings/battery.h +++ b/zephyr/include/dt-bindings/battery.h @@ -1,5 +1,5 @@ /* - * Copyright 2022 The ChromiumOS Authors. + * 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. */ diff --git a/zephyr/include/dt-bindings/charger/intersil_isl9241.h b/zephyr/include/dt-bindings/charger/intersil_isl9241.h index c383fe8ce1..cbb550a5dd 100644 --- a/zephyr/include/dt-bindings/charger/intersil_isl9241.h +++ b/zephyr/include/dt-bindings/charger/intersil_isl9241.h @@ -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. */ diff --git a/zephyr/include/dt-bindings/cros-kb-raw/ite_cros_kb_raw.h b/zephyr/include/dt-bindings/cros-kb-raw/ite_cros_kb_raw.h index f88efed949..53769f5dbf 100644 --- a/zephyr/include/dt-bindings/cros-kb-raw/ite_cros_kb_raw.h +++ b/zephyr/include/dt-bindings/cros-kb-raw/ite_cros_kb_raw.h @@ -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. */ diff --git a/zephyr/include/dt-bindings/cros-kb-raw/mchp_cros_kb_raw.h b/zephyr/include/dt-bindings/cros-kb-raw/mchp_cros_kb_raw.h index 41b6c6b3b6..b520e154da 100644 --- a/zephyr/include/dt-bindings/cros-kb-raw/mchp_cros_kb_raw.h +++ b/zephyr/include/dt-bindings/cros-kb-raw/mchp_cros_kb_raw.h @@ -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. */ diff --git a/zephyr/include/dt-bindings/gpio_defines.h b/zephyr/include/dt-bindings/gpio_defines.h index 3e61546b27..16da598363 100644 --- a/zephyr/include/dt-bindings/gpio_defines.h +++ b/zephyr/include/dt-bindings/gpio_defines.h @@ -1,5 +1,5 @@ /* - * 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. */ diff --git a/zephyr/include/dt-bindings/usb_pd_tcpm.h b/zephyr/include/dt-bindings/usb_pd_tcpm.h index 6a5d0beb89..93e5165140 100644 --- a/zephyr/include/dt-bindings/usb_pd_tcpm.h +++ b/zephyr/include/dt-bindings/usb_pd_tcpm.h @@ -1,5 +1,5 @@ /* - * 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. */ diff --git a/zephyr/include/dt-bindings/usbc_mux.h b/zephyr/include/dt-bindings/usbc_mux.h index 61d528221c..1d91542814 100644 --- a/zephyr/include/dt-bindings/usbc_mux.h +++ b/zephyr/include/dt-bindings/usbc_mux.h @@ -1,5 +1,5 @@ /* - * 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. */ diff --git a/zephyr/include/dt-bindings/wake_mask_event_defines.h b/zephyr/include/dt-bindings/wake_mask_event_defines.h index b399410639..f9df35701e 100644 --- a/zephyr/include/dt-bindings/wake_mask_event_defines.h +++ b/zephyr/include/dt-bindings/wake_mask_event_defines.h @@ -1,5 +1,5 @@ /* - * 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. */ diff --git a/zephyr/include/emul/emul_bb_retimer.h b/zephyr/include/emul/emul_bb_retimer.h index 488489f652..9db2dd565e 100644 --- a/zephyr/include/emul/emul_bb_retimer.h +++ b/zephyr/include/emul/emul_bb_retimer.h @@ -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. */ diff --git a/zephyr/include/emul/emul_bma255.h b/zephyr/include/emul/emul_bma255.h index 8a7ebdd847..44a56a86f7 100644 --- a/zephyr/include/emul/emul_bma255.h +++ b/zephyr/include/emul/emul_bma255.h @@ -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. */ diff --git a/zephyr/include/emul/emul_bmi.h b/zephyr/include/emul/emul_bmi.h index d1f69bac7e..c7a07ba4bf 100644 --- a/zephyr/include/emul/emul_bmi.h +++ b/zephyr/include/emul/emul_bmi.h @@ -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. */ diff --git a/zephyr/include/emul/emul_clock_control.h b/zephyr/include/emul/emul_clock_control.h index 1b3846b0f1..716bec5655 100644 --- a/zephyr/include/emul/emul_clock_control.h +++ b/zephyr/include/emul/emul_clock_control.h @@ -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. */ diff --git a/zephyr/include/emul/emul_common_i2c.h b/zephyr/include/emul/emul_common_i2c.h index 6b4fd10b9f..1388e9bbcb 100644 --- a/zephyr/include/emul/emul_common_i2c.h +++ b/zephyr/include/emul/emul_common_i2c.h @@ -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. */ diff --git a/zephyr/include/emul/emul_flash.h b/zephyr/include/emul/emul_flash.h index e5d8ef1d5a..8148d4df96 100644 --- a/zephyr/include/emul/emul_flash.h +++ b/zephyr/include/emul/emul_flash.h @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ @@ -19,9 +19,4 @@ */ void cros_flash_emul_protect_reset(void); -/** - * @brief Set the current image copy. - */ -void system_set_shrspi_image_copy(enum ec_image new_image_copy); - #endif /* ZEPHYR_INCLUDE_EMUL_EMUL_FLASH_H_ */ diff --git a/zephyr/include/emul/emul_isl923x.h b/zephyr/include/emul/emul_isl923x.h index 754cc1670c..e41cf26f87 100644 --- a/zephyr/include/emul/emul_isl923x.h +++ b/zephyr/include/emul/emul_isl923x.h @@ -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. */ diff --git a/zephyr/include/emul/emul_kb_raw.h b/zephyr/include/emul/emul_kb_raw.h index cc591a63aa..db012d7db6 100644 --- a/zephyr/include/emul/emul_kb_raw.h +++ b/zephyr/include/emul/emul_kb_raw.h @@ -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. */ diff --git a/zephyr/include/emul/emul_lis2dw12.h b/zephyr/include/emul/emul_lis2dw12.h index d40edbb426..5410a54cdd 100644 --- a/zephyr/include/emul/emul_lis2dw12.h +++ b/zephyr/include/emul/emul_lis2dw12.h @@ -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. */ diff --git a/zephyr/include/emul/emul_ln9310.h b/zephyr/include/emul/emul_ln9310.h index 6c62a308fc..0c0e61003e 100644 --- a/zephyr/include/emul/emul_ln9310.h +++ b/zephyr/include/emul/emul_ln9310.h @@ -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. */ diff --git a/zephyr/include/emul/emul_pi3usb9201.h b/zephyr/include/emul/emul_pi3usb9201.h index 708dcfee4d..05feff567f 100644 --- a/zephyr/include/emul/emul_pi3usb9201.h +++ b/zephyr/include/emul/emul_pi3usb9201.h @@ -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. */ diff --git a/zephyr/include/emul/emul_rt9490.h b/zephyr/include/emul/emul_rt9490.h index 66c545223c..0cb4f7b076 100644 --- a/zephyr/include/emul/emul_rt9490.h +++ b/zephyr/include/emul/emul_rt9490.h @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/include/emul/emul_smart_battery.h b/zephyr/include/emul/emul_smart_battery.h index c46b9d171a..ed6c10000b 100644 --- a/zephyr/include/emul/emul_smart_battery.h +++ b/zephyr/include/emul/emul_smart_battery.h @@ -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. */ diff --git a/zephyr/include/emul/emul_sn5s330.h b/zephyr/include/emul/emul_sn5s330.h index d1cb949254..77141e679b 100644 --- a/zephyr/include/emul/emul_sn5s330.h +++ b/zephyr/include/emul/emul_sn5s330.h @@ -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. */ diff --git a/zephyr/include/emul/emul_stub_device.h b/zephyr/include/emul/emul_stub_device.h index b7be376dda..8eb8a60a28 100644 --- a/zephyr/include/emul/emul_stub_device.h +++ b/zephyr/include/emul/emul_stub_device.h @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/include/emul/emul_syv682x.h b/zephyr/include/emul/emul_syv682x.h index fe090a7833..78ee2406eb 100644 --- a/zephyr/include/emul/emul_syv682x.h +++ b/zephyr/include/emul/emul_syv682x.h @@ -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. */ diff --git a/zephyr/include/emul/emul_tcs3400.h b/zephyr/include/emul/emul_tcs3400.h index ddbb5b3eb1..9daf8bce16 100644 --- a/zephyr/include/emul/emul_tcs3400.h +++ b/zephyr/include/emul/emul_tcs3400.h @@ -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. */ diff --git a/zephyr/include/emul/i2c_mock.h b/zephyr/include/emul/i2c_mock.h index 0a7f14639b..e5c359a3fd 100644 --- a/zephyr/include/emul/i2c_mock.h +++ b/zephyr/include/emul/i2c_mock.h @@ -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. */ diff --git a/zephyr/include/emul/tcpc/emul_ps8xxx.h b/zephyr/include/emul/tcpc/emul_ps8xxx.h index 7f88c8d243..6e96af571b 100644 --- a/zephyr/include/emul/tcpc/emul_ps8xxx.h +++ b/zephyr/include/emul/tcpc/emul_ps8xxx.h @@ -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. */ diff --git a/zephyr/include/emul/tcpc/emul_tcpci.h b/zephyr/include/emul/tcpc/emul_tcpci.h index 1c683880a8..8175b9ce96 100644 --- a/zephyr/include/emul/tcpc/emul_tcpci.h +++ b/zephyr/include/emul/tcpc/emul_tcpci.h @@ -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. */ diff --git a/zephyr/include/emul/tcpc/emul_tcpci_partner_common.h b/zephyr/include/emul/tcpc/emul_tcpci_partner_common.h index fda7215842..fb715a47dc 100644 --- a/zephyr/include/emul/tcpc/emul_tcpci_partner_common.h +++ b/zephyr/include/emul/tcpc/emul_tcpci_partner_common.h @@ -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. */ diff --git a/zephyr/include/emul/tcpc/emul_tcpci_partner_drp.h b/zephyr/include/emul/tcpc/emul_tcpci_partner_drp.h index dd98c5131f..e4f58fcd37 100644 --- a/zephyr/include/emul/tcpc/emul_tcpci_partner_drp.h +++ b/zephyr/include/emul/tcpc/emul_tcpci_partner_drp.h @@ -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. */ diff --git a/zephyr/include/emul/tcpc/emul_tcpci_partner_faulty_ext.h b/zephyr/include/emul/tcpc/emul_tcpci_partner_faulty_ext.h index 18f29e60cb..f0627c95bd 100644 --- a/zephyr/include/emul/tcpc/emul_tcpci_partner_faulty_ext.h +++ b/zephyr/include/emul/tcpc/emul_tcpci_partner_faulty_ext.h @@ -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. */ diff --git a/zephyr/include/emul/tcpc/emul_tcpci_partner_snk.h b/zephyr/include/emul/tcpc/emul_tcpci_partner_snk.h index 5d2084858b..584458942b 100644 --- a/zephyr/include/emul/tcpc/emul_tcpci_partner_snk.h +++ b/zephyr/include/emul/tcpc/emul_tcpci_partner_snk.h @@ -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. */ diff --git a/zephyr/include/emul/tcpc/emul_tcpci_partner_src.h b/zephyr/include/emul/tcpc/emul_tcpci_partner_src.h index 15c6a22141..e72d0e4135 100644 --- a/zephyr/include/emul/tcpc/emul_tcpci_partner_src.h +++ b/zephyr/include/emul/tcpc/emul_tcpci_partner_src.h @@ -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. */ diff --git a/zephyr/include/soc/ite_it8xxx2/reg_def_cros.h b/zephyr/include/soc/ite_it8xxx2/reg_def_cros.h index f26d3ac69f..418ae39d3a 100644 --- a/zephyr/include/soc/ite_it8xxx2/reg_def_cros.h +++ b/zephyr/include/soc/ite_it8xxx2/reg_def_cros.h @@ -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. */ diff --git a/zephyr/include/soc/microchip_xec/reg_def_cros.h b/zephyr/include/soc/microchip_xec/reg_def_cros.h index 55be15b6f6..b4b849a90d 100644 --- a/zephyr/include/soc/microchip_xec/reg_def_cros.h +++ b/zephyr/include/soc/microchip_xec/reg_def_cros.h @@ -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. */ diff --git a/zephyr/linker/CMakeLists.txt b/zephyr/linker/CMakeLists.txt index 982e2b0218..94544d454b 100644 --- a/zephyr/linker/CMakeLists.txt +++ b/zephyr/linker/CMakeLists.txt @@ -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. diff --git a/zephyr/linker/fixed-sections.ld b/zephyr/linker/fixed-sections.ld index 5046823713..d4dcadcf0d 100644 --- a/zephyr/linker/fixed-sections.ld +++ b/zephyr/linker/fixed-sections.ld @@ -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. */ diff --git a/zephyr/linker/image_size.ld b/zephyr/linker/image_size.ld index b1e401ae7f..4a0c854f05 100644 --- a/zephyr/linker/image_size.ld +++ b/zephyr/linker/image_size.ld @@ -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. */ diff --git a/zephyr/linker/iram_text.ld b/zephyr/linker/iram_text.ld index 9ad484459a..f01c3509da 100644 --- a/zephyr/linker/iram_text.ld +++ b/zephyr/linker/iram_text.ld @@ -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. */ diff --git a/zephyr/linker/mchp-xec-lfw.ld b/zephyr/linker/mchp-xec-lfw.ld index 4c28f16bdf..6774c956a5 100644 --- a/zephyr/linker/mchp-xec-lfw.ld +++ b/zephyr/linker/mchp-xec-lfw.ld @@ -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. */ diff --git a/zephyr/linker/npcx-lfw.ld b/zephyr/linker/npcx-lfw.ld index a6de1df65a..e69c4c2aa5 100644 --- a/zephyr/linker/npcx-lfw.ld +++ b/zephyr/linker/npcx-lfw.ld @@ -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. */ diff --git a/zephyr/mock/CMakeLists.txt b/zephyr/mock/CMakeLists.txt index 8dd75d036e..69add3ae3e 100644 --- a/zephyr/mock/CMakeLists.txt +++ b/zephyr/mock/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2022 The Chromium OS Authors. +# 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. diff --git a/zephyr/mock/Kconfig b/zephyr/mock/Kconfig index fd04fd773d..3d6e3f98dd 100644 --- a/zephyr/mock/Kconfig +++ b/zephyr/mock/Kconfig @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/zephyr/mock/include/mock/power.h b/zephyr/mock/include/mock/power.h index c1549e18cd..9f04053241 100644 --- a/zephyr/mock/include/mock/power.h +++ b/zephyr/mock/include/mock/power.h @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/mock/power.c b/zephyr/mock/power.c index 8e5ae2b120..fc82cc7250 100644 --- a/zephyr/mock/power.c +++ b/zephyr/mock/power.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/module.yml b/zephyr/module.yml index 66bfcd8d9f..7988a425e5 100644 --- a/zephyr/module.yml +++ b/zephyr/module.yml @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/projects/brya/BUILD.py b/zephyr/projects/brya/BUILD.py index 02f9de6a90..9991335ca7 100644 --- a/zephyr/projects/brya/BUILD.py +++ b/zephyr/projects/brya/BUILD.py @@ -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. diff --git a/zephyr/projects/brya/CMakeLists.txt b/zephyr/projects/brya/CMakeLists.txt index a35978fc63..11c1a8386f 100644 --- a/zephyr/projects/brya/CMakeLists.txt +++ b/zephyr/projects/brya/CMakeLists.txt @@ -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. diff --git a/zephyr/projects/brya/Kconfig b/zephyr/projects/brya/Kconfig index 111476eb42..4dd8e23443 100644 --- a/zephyr/projects/brya/Kconfig +++ b/zephyr/projects/brya/Kconfig @@ -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. diff --git a/zephyr/projects/brya/adc.dts b/zephyr/projects/brya/adc.dts index c12c95df60..f3f0d1e064 100644 --- a/zephyr/projects/brya/adc.dts +++ b/zephyr/projects/brya/adc.dts @@ -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. */ diff --git a/zephyr/projects/brya/battery.dts b/zephyr/projects/brya/battery.dts index 1de6b3aa4a..4844d88d92 100644 --- a/zephyr/projects/brya/battery.dts +++ b/zephyr/projects/brya/battery.dts @@ -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. */ diff --git a/zephyr/projects/brya/battery_present.c b/zephyr/projects/brya/battery_present.c index 5dc587293c..c487a01f36 100644 --- a/zephyr/projects/brya/battery_present.c +++ b/zephyr/projects/brya/battery_present.c @@ -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. */ diff --git a/zephyr/projects/brya/brya.dts b/zephyr/projects/brya/brya.dts index 4182da6c32..4b0490afa9 100644 --- a/zephyr/projects/brya/brya.dts +++ b/zephyr/projects/brya/brya.dts @@ -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. */ diff --git a/zephyr/projects/brya/fan.dts b/zephyr/projects/brya/fan.dts index cc4e1fd6f8..aa6dcfde7d 100644 --- a/zephyr/projects/brya/fan.dts +++ b/zephyr/projects/brya/fan.dts @@ -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. */ diff --git a/zephyr/projects/brya/gpio.dts b/zephyr/projects/brya/gpio.dts index 2a560adfd1..5568a23849 100644 --- a/zephyr/projects/brya/gpio.dts +++ b/zephyr/projects/brya/gpio.dts @@ -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. */ diff --git a/zephyr/projects/brya/i2c.dts b/zephyr/projects/brya/i2c.dts index 85c49883d4..de533ad2f1 100644 --- a/zephyr/projects/brya/i2c.dts +++ b/zephyr/projects/brya/i2c.dts @@ -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. */ diff --git a/zephyr/projects/brya/interrupts.dts b/zephyr/projects/brya/interrupts.dts index 7132c12f77..1adca3e035 100644 --- a/zephyr/projects/brya/interrupts.dts +++ b/zephyr/projects/brya/interrupts.dts @@ -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. */ diff --git a/zephyr/projects/brya/kblight_hooks.c b/zephyr/projects/brya/kblight_hooks.c index e00d8953db..d6d795f28e 100644 --- a/zephyr/projects/brya/kblight_hooks.c +++ b/zephyr/projects/brya/kblight_hooks.c @@ -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. */ diff --git a/zephyr/projects/brya/keyboard.dts b/zephyr/projects/brya/keyboard.dts index 3a4bcf3c86..91fad2db92 100644 --- a/zephyr/projects/brya/keyboard.dts +++ b/zephyr/projects/brya/keyboard.dts @@ -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. */ diff --git a/zephyr/projects/brya/motionsense.dts b/zephyr/projects/brya/motionsense.dts index 6875f6e9e5..78b5d2387e 100644 --- a/zephyr/projects/brya/motionsense.dts +++ b/zephyr/projects/brya/motionsense.dts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 The Chromium OS Authors + * Copyright 2022 The ChromiumOS Authors * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/zephyr/projects/brya/prj.conf b/zephyr/projects/brya/prj.conf index fc2b87e1c5..19b523261b 100644 --- a/zephyr/projects/brya/prj.conf +++ b/zephyr/projects/brya/prj.conf @@ -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. @@ -35,9 +35,9 @@ CONFIG_PLATFORM_EC_BOARD_VERSION_CBI=y # eSPI CONFIG_ESPI=y -CONFIG_PLATFORM_EC_ESPI_VW_SLP_S4=y -CONFIG_PLATFORM_EC_ESPI_VW_SLP_S5=y -CONFIG_PLATFORM_EC_ESPI_DEFAULT_VW_WIDTH_US=150 +CONFIG_PLATFORM_EC_HOST_INTERFACE_ESPI_VW_SLP_S4=y +CONFIG_PLATFORM_EC_HOST_INTERFACE_ESPI_VW_SLP_S5=y +CONFIG_PLATFORM_EC_HOST_INTERFACE_ESPI_DEFAULT_VW_WIDTH_US=150 # I2C CONFIG_I2C=y diff --git a/zephyr/projects/brya/prj_brya.conf b/zephyr/projects/brya/prj_brya.conf index 48f98f479d..5aaf86a8c9 100644 --- a/zephyr/projects/brya/prj_brya.conf +++ b/zephyr/projects/brya/prj_brya.conf @@ -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. diff --git a/zephyr/projects/brya/pwm_leds.dts b/zephyr/projects/brya/pwm_leds.dts index 8afb9d71c9..4321b4bd34 100644 --- a/zephyr/projects/brya/pwm_leds.dts +++ b/zephyr/projects/brya/pwm_leds.dts @@ -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. */ diff --git a/zephyr/projects/brya/temp_sensors.dts b/zephyr/projects/brya/temp_sensors.dts index 559a741d43..53025785d4 100644 --- a/zephyr/projects/brya/temp_sensors.dts +++ b/zephyr/projects/brya/temp_sensors.dts @@ -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. */ diff --git a/zephyr/projects/brya/usbc.dts b/zephyr/projects/brya/usbc.dts index c4721d5ef7..84c1560542 100644 --- a/zephyr/projects/brya/usbc.dts +++ b/zephyr/projects/brya/usbc.dts @@ -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. */ @@ -14,7 +14,11 @@ bc12 = <&bc12_port0>; tcpc = <&tcpc_port0>; chg = <&charger>; - usb-muxes = <&usb_c0_bb_retimer &virtual_mux_c0>; + usb-mux-chain-0 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&usb_c0_bb_retimer + &virtual_mux_c0>; + }; }; port0-muxes { virtual_mux_c0: virtual-mux-c0 { @@ -27,7 +31,10 @@ reg = <1>; bc12 = <&bc12_port1>; tcpc = <&tcpc_port1>; - usb-muxes = <&virtual_mux_c1 &tcpci_mux_c1>; + usb-mux-chain-1 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&virtual_mux_c1 &tcpci_mux_c1>; + }; }; port1-muxes { tcpci_mux_c1: tcpci-mux-c1 { @@ -44,7 +51,11 @@ reg = <2>; bc12 = <&bc12_port2>; tcpc = <&tcpc_port2>; - usb-muxes = <&usb_c2_bb_retimer &virtual_mux_c2>; + usb-mux-chain-2 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&usb_c2_bb_retimer + &virtual_mux_c2>; + }; }; port2-muxes { virtual_mux_c2: virtual-mux-c2 { diff --git a/zephyr/projects/corsola/BUILD.py b/zephyr/projects/corsola/BUILD.py index 134c01bfe9..32ccd9ebf1 100644 --- a/zephyr/projects/corsola/BUILD.py +++ b/zephyr/projects/corsola/BUILD.py @@ -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. diff --git a/zephyr/projects/corsola/CMakeLists.txt b/zephyr/projects/corsola/CMakeLists.txt index 496eecf452..c50c84e879 100644 --- a/zephyr/projects/corsola/CMakeLists.txt +++ b/zephyr/projects/corsola/CMakeLists.txt @@ -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. @@ -60,7 +60,7 @@ elseif(DEFINED CONFIG_BOARD_TENTACRUEL) zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "src/krabby/usb_pd_policy.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC - "src/krabby/usbc_config_tentacruel.c") + "src/krabby/usbc_config.c") elseif(DEFINED CONFIG_BOARD_MAGIKARP) project(magikarp) @@ -70,7 +70,7 @@ elseif(DEFINED CONFIG_BOARD_MAGIKARP) zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "src/krabby/usb_pd_policy.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC - "src/krabby/usbc_config_magikarp.c") + "src/krabby/usbc_config.c") endif() diff --git a/zephyr/projects/corsola/Kconfig b/zephyr/projects/corsola/Kconfig index 3afd9e89cf..4f66601c20 100644 --- a/zephyr/projects/corsola/Kconfig +++ b/zephyr/projects/corsola/Kconfig @@ -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. diff --git a/zephyr/projects/corsola/adc_kingler.dts b/zephyr/projects/corsola/adc_kingler.dts index eed01c0512..7b69abe48a 100644 --- a/zephyr/projects/corsola/adc_kingler.dts +++ b/zephyr/projects/corsola/adc_kingler.dts @@ -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. */ diff --git a/zephyr/projects/corsola/adc_krabby.dts b/zephyr/projects/corsola/adc_krabby.dts index 677091d54a..be65e9eea7 100644 --- a/zephyr/projects/corsola/adc_krabby.dts +++ b/zephyr/projects/corsola/adc_krabby.dts @@ -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. */ diff --git a/zephyr/projects/corsola/adc_magikarp.dts b/zephyr/projects/corsola/adc_magikarp.dts index d09ccc3a30..668f6a8068 100644 --- a/zephyr/projects/corsola/adc_magikarp.dts +++ b/zephyr/projects/corsola/adc_magikarp.dts @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/corsola/adc_tentacruel.dts b/zephyr/projects/corsola/adc_tentacruel.dts index 86acd14399..7e1dcbaf5c 100644 --- a/zephyr/projects/corsola/adc_tentacruel.dts +++ b/zephyr/projects/corsola/adc_tentacruel.dts @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/corsola/battery_kingler.dts b/zephyr/projects/corsola/battery_kingler.dts index 63d3b7ea21..b01fb8a46d 100644 --- a/zephyr/projects/corsola/battery_kingler.dts +++ b/zephyr/projects/corsola/battery_kingler.dts @@ -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. */ diff --git a/zephyr/projects/corsola/battery_krabby.dts b/zephyr/projects/corsola/battery_krabby.dts index f9311b2dcd..ce41859182 100644 --- a/zephyr/projects/corsola/battery_krabby.dts +++ b/zephyr/projects/corsola/battery_krabby.dts @@ -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. */ diff --git a/zephyr/projects/corsola/battery_magikarp.dts b/zephyr/projects/corsola/battery_magikarp.dts index 0816a3201f..f116c20a51 100644 --- a/zephyr/projects/corsola/battery_magikarp.dts +++ b/zephyr/projects/corsola/battery_magikarp.dts @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/corsola/battery_steelix.dts b/zephyr/projects/corsola/battery_steelix.dts index aad956ba71..594c83478c 100644 --- a/zephyr/projects/corsola/battery_steelix.dts +++ b/zephyr/projects/corsola/battery_steelix.dts @@ -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. */ diff --git a/zephyr/projects/corsola/battery_tentacruel.dts b/zephyr/projects/corsola/battery_tentacruel.dts index 5a0b6d9cf0..f116c20a51 100644 --- a/zephyr/projects/corsola/battery_tentacruel.dts +++ b/zephyr/projects/corsola/battery_tentacruel.dts @@ -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. */ diff --git a/zephyr/projects/corsola/cbi_magikarp.dts b/zephyr/projects/corsola/cbi_magikarp.dts index ffe2baaf63..3fbda686a8 100644 --- a/zephyr/projects/corsola/cbi_magikarp.dts +++ b/zephyr/projects/corsola/cbi_magikarp.dts @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/corsola/cbi_steelix.dts b/zephyr/projects/corsola/cbi_steelix.dts index 9af96b8ecb..e282eb25ab 100644 --- a/zephyr/projects/corsola/cbi_steelix.dts +++ b/zephyr/projects/corsola/cbi_steelix.dts @@ -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. */ diff --git a/zephyr/projects/corsola/cbi_tentacruel.dts b/zephyr/projects/corsola/cbi_tentacruel.dts index 30c6ba183c..2cd4594417 100644 --- a/zephyr/projects/corsola/cbi_tentacruel.dts +++ b/zephyr/projects/corsola/cbi_tentacruel.dts @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/corsola/common.dts b/zephyr/projects/corsola/common.dts index 52c8eeddf2..001dcc7ce3 100644 --- a/zephyr/projects/corsola/common.dts +++ b/zephyr/projects/corsola/common.dts @@ -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. */ diff --git a/zephyr/projects/corsola/default_gpio_pinctrl_kingler.dts b/zephyr/projects/corsola/default_gpio_pinctrl_kingler.dts index a6f61cb3ed..604658a145 100644 --- a/zephyr/projects/corsola/default_gpio_pinctrl_kingler.dts +++ b/zephyr/projects/corsola/default_gpio_pinctrl_kingler.dts @@ -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. */ diff --git a/zephyr/projects/corsola/gpio_kingler.dts b/zephyr/projects/corsola/gpio_kingler.dts index 65c6c7aff3..d3a4c1be90 100644 --- a/zephyr/projects/corsola/gpio_kingler.dts +++ b/zephyr/projects/corsola/gpio_kingler.dts @@ -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. */ diff --git a/zephyr/projects/corsola/gpio_krabby.dts b/zephyr/projects/corsola/gpio_krabby.dts index 169e9061fd..32498ab606 100644 --- a/zephyr/projects/corsola/gpio_krabby.dts +++ b/zephyr/projects/corsola/gpio_krabby.dts @@ -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. */ diff --git a/zephyr/projects/corsola/gpio_magikarp.dts b/zephyr/projects/corsola/gpio_magikarp.dts index 5fd69da494..6113718b0d 100644 --- a/zephyr/projects/corsola/gpio_magikarp.dts +++ b/zephyr/projects/corsola/gpio_magikarp.dts @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/corsola/gpio_steelix.dts b/zephyr/projects/corsola/gpio_steelix.dts index 5c715767a2..299d809583 100644 --- a/zephyr/projects/corsola/gpio_steelix.dts +++ b/zephyr/projects/corsola/gpio_steelix.dts @@ -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. */ diff --git a/zephyr/projects/corsola/gpio_tentacruel.dts b/zephyr/projects/corsola/gpio_tentacruel.dts index fa30265c6e..6113718b0d 100644 --- a/zephyr/projects/corsola/gpio_tentacruel.dts +++ b/zephyr/projects/corsola/gpio_tentacruel.dts @@ -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. */ diff --git a/zephyr/projects/corsola/host_interface_npcx.dts b/zephyr/projects/corsola/host_interface_npcx.dts index 9c6a498940..14efa3c6b2 100644 --- a/zephyr/projects/corsola/host_interface_npcx.dts +++ b/zephyr/projects/corsola/host_interface_npcx.dts @@ -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. */ diff --git a/zephyr/projects/corsola/i2c_kingler.dts b/zephyr/projects/corsola/i2c_kingler.dts index 67fbab5272..4bcbeb6950 100644 --- a/zephyr/projects/corsola/i2c_kingler.dts +++ b/zephyr/projects/corsola/i2c_kingler.dts @@ -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. */ diff --git a/zephyr/projects/corsola/i2c_krabby.dts b/zephyr/projects/corsola/i2c_krabby.dts index aa9a845bbe..60ed7e9bd7 100644 --- a/zephyr/projects/corsola/i2c_krabby.dts +++ b/zephyr/projects/corsola/i2c_krabby.dts @@ -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. */ diff --git a/zephyr/projects/corsola/i2c_krabby_tentacruel.dtsi b/zephyr/projects/corsola/i2c_krabby_tentacruel.dtsi index 0265e0354f..ebc83482ff 100644 --- a/zephyr/projects/corsola/i2c_krabby_tentacruel.dtsi +++ b/zephyr/projects/corsola/i2c_krabby_tentacruel.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. */ diff --git a/zephyr/projects/corsola/i2c_magikarp.dts b/zephyr/projects/corsola/i2c_magikarp.dts index ef187a88f0..84e2363f68 100644 --- a/zephyr/projects/corsola/i2c_magikarp.dts +++ b/zephyr/projects/corsola/i2c_magikarp.dts @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/corsola/i2c_tentacruel.dts b/zephyr/projects/corsola/i2c_tentacruel.dts index 91e88493ec..84e2363f68 100644 --- a/zephyr/projects/corsola/i2c_tentacruel.dts +++ b/zephyr/projects/corsola/i2c_tentacruel.dts @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS 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. */ diff --git a/zephyr/projects/corsola/include/baseboard_usbc_config.h b/zephyr/projects/corsola/include/baseboard_usbc_config.h index d0b3954242..a29fd93f54 100644 --- a/zephyr/projects/corsola/include/baseboard_usbc_config.h +++ b/zephyr/projects/corsola/include/baseboard_usbc_config.h @@ -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. */ diff --git a/zephyr/projects/corsola/include/variant_db_detection.h b/zephyr/projects/corsola/include/variant_db_detection.h index 5a6f6de32a..285ff327f2 100644 --- a/zephyr/projects/corsola/include/variant_db_detection.h +++ b/zephyr/projects/corsola/include/variant_db_detection.h @@ -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. */ diff --git a/zephyr/projects/corsola/interrupts_kingler.dts b/zephyr/projects/corsola/interrupts_kingler.dts index b33251624d..38b8c2e24d 100644 --- a/zephyr/projects/corsola/interrupts_kingler.dts +++ b/zephyr/projects/corsola/interrupts_kingler.dts @@ -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. */ diff --git a/zephyr/projects/corsola/interrupts_krabby.dts b/zephyr/projects/corsola/interrupts_krabby.dts index 900ce1611e..7f2df00937 100644 --- a/zephyr/projects/corsola/interrupts_krabby.dts +++ b/zephyr/projects/corsola/interrupts_krabby.dts @@ -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. */ diff --git a/zephyr/projects/corsola/interrupts_magikarp.dts b/zephyr/projects/corsola/interrupts_magikarp.dts index ba826e1876..06458e1063 100644 --- a/zephyr/projects/corsola/interrupts_magikarp.dts +++ b/zephyr/projects/corsola/interrupts_magikarp.dts @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/corsola/interrupts_tentacruel.dts b/zephyr/projects/corsola/interrupts_tentacruel.dts index ba826e1876..06458e1063 100644 --- a/zephyr/projects/corsola/interrupts_tentacruel.dts +++ b/zephyr/projects/corsola/interrupts_tentacruel.dts @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/corsola/keyboard_steelix.dts b/zephyr/projects/corsola/keyboard_steelix.dts index 8e9b5cf619..9a0dca3e05 100644 --- a/zephyr/projects/corsola/keyboard_steelix.dts +++ b/zephyr/projects/corsola/keyboard_steelix.dts @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/corsola/led_it81202_base.dtsi b/zephyr/projects/corsola/led_it81202_base.dtsi index 28d38a3dc1..dce7bb4f95 100644 --- a/zephyr/projects/corsola/led_it81202_base.dtsi +++ b/zephyr/projects/corsola/led_it81202_base.dtsi @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/corsola/led_kingler.dts b/zephyr/projects/corsola/led_kingler.dts index c7b3b402f4..92f6c4d4fe 100644 --- a/zephyr/projects/corsola/led_kingler.dts +++ b/zephyr/projects/corsola/led_kingler.dts @@ -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. */ diff --git a/zephyr/projects/corsola/led_krabby.dts b/zephyr/projects/corsola/led_krabby.dts index aa7e3a5f7d..b16bff3cac 100644 --- a/zephyr/projects/corsola/led_krabby.dts +++ b/zephyr/projects/corsola/led_krabby.dts @@ -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. */ diff --git a/zephyr/projects/corsola/led_magikarp.dts b/zephyr/projects/corsola/led_magikarp.dts index 39628a7d7f..e2287e9306 100644 --- a/zephyr/projects/corsola/led_magikarp.dts +++ b/zephyr/projects/corsola/led_magikarp.dts @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/corsola/led_steelix.dts b/zephyr/projects/corsola/led_steelix.dts index 31d17958d4..6a25929327 100644 --- a/zephyr/projects/corsola/led_steelix.dts +++ b/zephyr/projects/corsola/led_steelix.dts @@ -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. */ diff --git a/zephyr/projects/corsola/led_tentacruel.dts b/zephyr/projects/corsola/led_tentacruel.dts index f65836e2a0..5569a956f6 100644 --- a/zephyr/projects/corsola/led_tentacruel.dts +++ b/zephyr/projects/corsola/led_tentacruel.dts @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/corsola/motionsense_kingler.dts b/zephyr/projects/corsola/motionsense_kingler.dts index 354eb88c6b..a7f674e01f 100644 --- a/zephyr/projects/corsola/motionsense_kingler.dts +++ b/zephyr/projects/corsola/motionsense_kingler.dts @@ -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. */ diff --git a/zephyr/projects/corsola/motionsense_krabby.dts b/zephyr/projects/corsola/motionsense_krabby.dts index 1a09b5ae40..1c7d5b2df4 100644 --- a/zephyr/projects/corsola/motionsense_krabby.dts +++ b/zephyr/projects/corsola/motionsense_krabby.dts @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/zephyr/projects/corsola/motionsense_magikarp.dts b/zephyr/projects/corsola/motionsense_magikarp.dts index 75f75d53bc..68b2c023df 100644 --- a/zephyr/projects/corsola/motionsense_magikarp.dts +++ b/zephyr/projects/corsola/motionsense_magikarp.dts @@ -1,4 +1,4 @@ -/* Copyright 2020 The ChromiumOS Authors. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/zephyr/projects/corsola/motionsense_steelix.dts b/zephyr/projects/corsola/motionsense_steelix.dts index 70aa3679fb..c8cbc95e48 100644 --- a/zephyr/projects/corsola/motionsense_steelix.dts +++ b/zephyr/projects/corsola/motionsense_steelix.dts @@ -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. */ diff --git a/zephyr/projects/corsola/motionsense_tentacruel.dts b/zephyr/projects/corsola/motionsense_tentacruel.dts index 75f75d53bc..68b2c023df 100644 --- a/zephyr/projects/corsola/motionsense_tentacruel.dts +++ b/zephyr/projects/corsola/motionsense_tentacruel.dts @@ -1,4 +1,4 @@ -/* Copyright 2020 The ChromiumOS Authors. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/zephyr/projects/corsola/npcx_keyboard.dts b/zephyr/projects/corsola/npcx_keyboard.dts index d3fd354b8f..f9e46de1f2 100644 --- a/zephyr/projects/corsola/npcx_keyboard.dts +++ b/zephyr/projects/corsola/npcx_keyboard.dts @@ -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. */ diff --git a/zephyr/projects/corsola/power_signal.dts b/zephyr/projects/corsola/power_signal.dts index 2603a53bb4..181d7cf96e 100644 --- a/zephyr/projects/corsola/power_signal.dts +++ b/zephyr/projects/corsola/power_signal.dts @@ -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. */ diff --git a/zephyr/projects/corsola/prj.conf b/zephyr/projects/corsola/prj.conf index 8b0af4abfa..110b91bbbb 100644 --- a/zephyr/projects/corsola/prj.conf +++ b/zephyr/projects/corsola/prj.conf @@ -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. # @@ -86,6 +86,7 @@ CONFIG_PLATFORM_EC_BATTERY_CUT_OFF=y CONFIG_PLATFORM_EC_BATTERY_FUEL_GAUGE=y CONFIG_PLATFORM_EC_BATTERY_PRESENT_GPIO=y CONFIG_PLATFORM_EC_BATTERY_SMART=y +CONFIG_PLATFORM_EC_BATT_FULL_CHIPSET_OFF_INPUT_LIMIT_MV=9000 CONFIG_PLATFORM_EC_I2C_PASSTHRU_RESTRICTED=y CONFIG_PLATFORM_EC_I2C_VIRTUAL_BATTERY=y diff --git a/zephyr/projects/corsola/prj_it81202_base.conf b/zephyr/projects/corsola/prj_it81202_base.conf index 8c486428b1..38e0acd7a8 100644 --- a/zephyr/projects/corsola/prj_it81202_base.conf +++ b/zephyr/projects/corsola/prj_it81202_base.conf @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. @@ -13,9 +13,6 @@ CONFIG_PLATFORM_EC_CHIPSET_RESET_HOOK=y # Lid Switch CONFIG_PLATFORM_EC_LID_SWITCH=y -# Battery -CONFIG_PLATFORM_EC_BATT_FULL_CHIPSET_OFF_INPUT_LIMIT_MV=9000 - # Charger CONFIG_PLATFORM_EC_CHARGE_RAMP_HW=y CONFIG_PLATFORM_EC_CHARGER_DISCHARGE_ON_AC=y @@ -54,6 +51,7 @@ CONFIG_PLATFORM_EC_LID_ANGLE_UPDATE=y CONFIG_PLATFORM_EC_SENSOR_TIGHT_TIMESTAMPS=y CONFIG_PLATFORM_EC_TABLET_MODE=y CONFIG_PLATFORM_EC_TABLET_MODE_SWITCH=y +CONFIG_PLATFORM_EC_MAX_SENSOR_FREQ_MILLIHZ=100000 # Sensor Drivers CONFIG_PLATFORM_EC_ACCEL_LIS2DW12=y diff --git a/zephyr/projects/corsola/prj_kingler.conf b/zephyr/projects/corsola/prj_kingler.conf index 4f7829ba38..d7de991e93 100644 --- a/zephyr/projects/corsola/prj_kingler.conf +++ b/zephyr/projects/corsola/prj_kingler.conf @@ -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. diff --git a/zephyr/projects/corsola/prj_krabby.conf b/zephyr/projects/corsola/prj_krabby.conf index 1a4da939cb..c4cde05c16 100644 --- a/zephyr/projects/corsola/prj_krabby.conf +++ b/zephyr/projects/corsola/prj_krabby.conf @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium OS Authors. +# 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. diff --git a/zephyr/projects/corsola/prj_magikarp.conf b/zephyr/projects/corsola/prj_magikarp.conf index 53cd20a861..72d7ea59f7 100644 --- a/zephyr/projects/corsola/prj_magikarp.conf +++ b/zephyr/projects/corsola/prj_magikarp.conf @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/zephyr/projects/corsola/prj_npcx993_base.conf b/zephyr/projects/corsola/prj_npcx993_base.conf index 68dd80d9d3..2d7cb009f2 100644 --- a/zephyr/projects/corsola/prj_npcx993_base.conf +++ b/zephyr/projects/corsola/prj_npcx993_base.conf @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/zephyr/projects/corsola/prj_steelix.conf b/zephyr/projects/corsola/prj_steelix.conf index 694e35a7ce..265a1a4cc4 100644 --- a/zephyr/projects/corsola/prj_steelix.conf +++ b/zephyr/projects/corsola/prj_steelix.conf @@ -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. diff --git a/zephyr/projects/corsola/prj_tentacruel.conf b/zephyr/projects/corsola/prj_tentacruel.conf index 729a1094ab..bbf442c8a1 100644 --- a/zephyr/projects/corsola/prj_tentacruel.conf +++ b/zephyr/projects/corsola/prj_tentacruel.conf @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/zephyr/projects/corsola/src/board_chipset.c b/zephyr/projects/corsola/src/board_chipset.c index ca8f3b0507..54e96bc631 100644 --- a/zephyr/projects/corsola/src/board_chipset.c +++ b/zephyr/projects/corsola/src/board_chipset.c @@ -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. */ diff --git a/zephyr/projects/corsola/src/hibernate.c b/zephyr/projects/corsola/src/hibernate.c index afd22fd3e7..56c085e077 100644 --- a/zephyr/projects/corsola/src/hibernate.c +++ b/zephyr/projects/corsola/src/hibernate.c @@ -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. */ diff --git a/zephyr/projects/corsola/src/kingler/board_steelix.c b/zephyr/projects/corsola/src/kingler/board_steelix.c index e85fe887ad..c8ba0e7e74 100644 --- a/zephyr/projects/corsola/src/kingler/board_steelix.c +++ b/zephyr/projects/corsola/src/kingler/board_steelix.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/corsola/src/kingler/button.c b/zephyr/projects/corsola/src/kingler/button.c index d10d771950..920069bef6 100644 --- a/zephyr/projects/corsola/src/kingler/button.c +++ b/zephyr/projects/corsola/src/kingler/button.c @@ -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. */ diff --git a/zephyr/projects/corsola/src/kingler/i2c.c b/zephyr/projects/corsola/src/kingler/i2c.c index 9153fc3d36..f2bbff3749 100644 --- a/zephyr/projects/corsola/src/kingler/i2c.c +++ b/zephyr/projects/corsola/src/kingler/i2c.c @@ -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. */ diff --git a/zephyr/projects/corsola/src/kingler/led.c b/zephyr/projects/corsola/src/kingler/led.c index 340028e92f..4e2c5b12fb 100644 --- a/zephyr/projects/corsola/src/kingler/led.c +++ b/zephyr/projects/corsola/src/kingler/led.c @@ -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. * diff --git a/zephyr/projects/corsola/src/kingler/led_steelix.c b/zephyr/projects/corsola/src/kingler/led_steelix.c index 986203eaa9..87b76128e8 100644 --- a/zephyr/projects/corsola/src/kingler/led_steelix.c +++ b/zephyr/projects/corsola/src/kingler/led_steelix.c @@ -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. * diff --git a/zephyr/projects/corsola/src/kingler/usb_pd_policy.c b/zephyr/projects/corsola/src/kingler/usb_pd_policy.c index 821b7475d5..3de2857ad1 100644 --- a/zephyr/projects/corsola/src/kingler/usb_pd_policy.c +++ b/zephyr/projects/corsola/src/kingler/usb_pd_policy.c @@ -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. */ diff --git a/zephyr/projects/corsola/src/kingler/usbc_config.c b/zephyr/projects/corsola/src/kingler/usbc_config.c index de6f25d205..8c0ca86454 100644 --- a/zephyr/projects/corsola/src/kingler/usbc_config.c +++ b/zephyr/projects/corsola/src/kingler/usbc_config.c @@ -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. */ @@ -49,7 +49,7 @@ void board_usb_mux_init(void) { if (corsola_get_db_type() == CORSOLA_DB_TYPEC) { /* Disable DCI function. This is not needed for ARM. */ - ps8743_field_update(&usb_muxes[1], PS8743_REG_DCI_CONFIG_2, + ps8743_field_update(usb_muxes[1].mux, PS8743_REG_DCI_CONFIG_2, PS8743_AUTO_DCI_MODE_MASK, PS8743_AUTO_DCI_MODE_FORCE_USB); } diff --git a/zephyr/projects/corsola/src/krabby/charger_workaround.c b/zephyr/projects/corsola/src/krabby/charger_workaround.c index 07a4379737..dda91fccb5 100644 --- a/zephyr/projects/corsola/src/krabby/charger_workaround.c +++ b/zephyr/projects/corsola/src/krabby/charger_workaround.c @@ -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. */ @@ -17,7 +17,7 @@ * Newer project should have all of these fixed. */ BUILD_ASSERT(IS_ENABLED(CONFIG_BOARD_KRABBY) || - IS_ENABLED(CONFIG_BOARD_TENTACRUEL)); + IS_ENABLED(CONFIG_BOARD_TENTACRUEL) || IS_ENABLED(CONFIG_TEST)); static void enter_hidden_mode(void) { diff --git a/zephyr/projects/corsola/src/krabby/hooks.c b/zephyr/projects/corsola/src/krabby/hooks.c index f921518a82..1eb4f600f2 100644 --- a/zephyr/projects/corsola/src/krabby/hooks.c +++ b/zephyr/projects/corsola/src/krabby/hooks.c @@ -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. */ diff --git a/zephyr/projects/corsola/src/krabby/i2c.c b/zephyr/projects/corsola/src/krabby/i2c.c index ac6daeadb0..a83af77dbd 100644 --- a/zephyr/projects/corsola/src/krabby/i2c.c +++ b/zephyr/projects/corsola/src/krabby/i2c.c @@ -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. */ diff --git a/zephyr/projects/corsola/src/krabby/sensor_magikarp.c b/zephyr/projects/corsola/src/krabby/sensor_magikarp.c index f27a3a953e..269bc26fae 100644 --- a/zephyr/projects/corsola/src/krabby/sensor_magikarp.c +++ b/zephyr/projects/corsola/src/krabby/sensor_magikarp.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/corsola/src/krabby/sensor_tentacruel.c b/zephyr/projects/corsola/src/krabby/sensor_tentacruel.c index f27a3a953e..269bc26fae 100644 --- a/zephyr/projects/corsola/src/krabby/sensor_tentacruel.c +++ b/zephyr/projects/corsola/src/krabby/sensor_tentacruel.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/corsola/src/krabby/temp_tentacruel.c b/zephyr/projects/corsola/src/krabby/temp_tentacruel.c index 5abe2302bd..de7aa78d98 100644 --- a/zephyr/projects/corsola/src/krabby/temp_tentacruel.c +++ b/zephyr/projects/corsola/src/krabby/temp_tentacruel.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/corsola/src/krabby/usb_pd_policy.c b/zephyr/projects/corsola/src/krabby/usb_pd_policy.c index 5f9ae83a19..8f2a2c3515 100644 --- a/zephyr/projects/corsola/src/krabby/usb_pd_policy.c +++ b/zephyr/projects/corsola/src/krabby/usb_pd_policy.c @@ -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. */ diff --git a/zephyr/projects/corsola/src/krabby/usbc_config.c b/zephyr/projects/corsola/src/krabby/usbc_config.c index 9540407258..01686119cc 100644 --- a/zephyr/projects/corsola/src/krabby/usbc_config.c +++ b/zephyr/projects/corsola/src/krabby/usbc_config.c @@ -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. */ diff --git a/zephyr/projects/corsola/src/krabby/usbc_config_magikarp.c b/zephyr/projects/corsola/src/krabby/usbc_config_magikarp.c deleted file mode 100644 index 03bc3e336f..0000000000 --- a/zephyr/projects/corsola/src/krabby/usbc_config_magikarp.c +++ /dev/null @@ -1,174 +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. - */ - -/* Krabby board-specific USB-C configuration */ - -#include "adc.h" -#include "baseboard_usbc_config.h" -#include "bc12/pi3usb9201_public.h" -#include "charge_manager.h" -#include "charger.h" -#include "console.h" -#include "driver/charger/rt9490.h" -#include "driver/ppc/rt1739.h" -#include "driver/tcpm/it83xx_pd.h" -#include "driver/usb_mux/ps8743.h" -#include "gpio/gpio_int.h" -#include "hooks.h" -#include "ppc/syv682x_public.h" -#include "usb_mux/it5205_public.h" -#include "usbc_ppc.h" - -#include "variant_db_detection.h" - -#define CPRINTSUSB(format, args...) cprints(CC_USBCHARGE, format, ##args) -#define CPRINTS(format, args...) cprints(CC_SYSTEM, format, ##args) -#define CPRINTF(format, args...) cprintf(CC_SYSTEM, format, ##args) - -void c0_bc12_interrupt(enum gpio_signal signal) -{ - rt1739_interrupt(0); -} - -static void board_usbc_init(void) -{ - gpio_enable_dt_interrupt(GPIO_INT_FROM_NODELABEL(int_usb_c0_ppc_bc12)); -} -DECLARE_HOOK(HOOK_INIT, board_usbc_init, HOOK_PRIO_POST_DEFAULT); - -void ppc_interrupt(enum gpio_signal signal) -{ - if (signal == GPIO_SIGNAL(DT_ALIAS(gpio_usb_c1_ppc_int_odl))) { - syv682x_interrupt(1); - } -} - -int ppc_get_alert_status(int port) -{ - if (port == 0) { - return gpio_pin_get_dt(GPIO_DT_FROM_NODELABEL( - usb_c0_ppc_bc12_int_odl)) == 0; - } - if (port == 1 && corsola_get_db_type() == CORSOLA_DB_TYPEC) { - return gpio_pin_get_dt(GPIO_DT_FROM_ALIAS( - gpio_usb_c1_ppc_int_odl)) == 0; - } - - return 0; -} - -const struct cc_para_t *board_get_cc_tuning_parameter(enum usbpd_port port) -{ - const static struct cc_para_t - cc_parameter[CONFIG_USB_PD_ITE_ACTIVE_PORT_COUNT] = { - { - .rising_time = - IT83XX_TX_PRE_DRIVING_TIME_1_UNIT, - .falling_time = - IT83XX_TX_PRE_DRIVING_TIME_2_UNIT, - }, - { - .rising_time = - IT83XX_TX_PRE_DRIVING_TIME_1_UNIT, - .falling_time = - IT83XX_TX_PRE_DRIVING_TIME_2_UNIT, - }, - }; - - return &cc_parameter[port]; -} - -void board_overcurrent_event(int port, int is_overcurrented) -{ - /* TODO: check correct operation for Corsola */ -} - -uint16_t tcpc_get_alert_status(void) -{ - /* - * C0 & C1: TCPC is embedded in the EC and processes interrupts in the - * chip code (it83xx/intc.c) - */ - return 0; -} - -void board_reset_pd_mcu(void) -{ - /* - * C0 & C1: TCPC is embedded in the EC and processes interrupts in the - * chip code (it83xx/intc.c) - */ -} - -int board_set_active_charge_port(int port) -{ - int i; - int is_valid_port = (port >= 0 && port < board_get_usb_pd_port_count()); - - if (!is_valid_port && port != CHARGE_PORT_NONE) { - return EC_ERROR_INVAL; - } - - if (port == CHARGE_PORT_NONE) { - CPRINTS("Disabling all charger ports"); - - /* Disable all ports. */ - for (i = 0; i < ppc_cnt; i++) { - /* - * Do not return early if one fails otherwise we can - * get into a boot loop assertion failure. - */ - if (ppc_vbus_sink_enable(i, 0)) { - CPRINTS("Disabling C%d as sink failed.", i); - } - } - - return EC_SUCCESS; - } - - /* Check if the port is sourcing VBUS. */ - if (ppc_is_sourcing_vbus(port)) { - CPRINTS("Skip enable C%d", port); - return EC_ERROR_INVAL; - } - - CPRINTS("New charge port: C%d", port); - - /* - * Turn off the other ports' sink path FETs, before enabling the - * requested charge port. - */ - for (i = 0; i < ppc_cnt; i++) { - if (i == port) { - continue; - } - - if (ppc_vbus_sink_enable(i, 0)) { - CPRINTS("C%d: sink path disable failed.", i); - } - } - - /* Enable requested charge port. */ - if (ppc_vbus_sink_enable(port, 1)) { - CPRINTS("C%d: sink path enable failed.", port); - return EC_ERROR_UNKNOWN; - } - - return EC_SUCCESS; -} - -#ifdef CONFIG_USB_PD_VBUS_MEASURE_ADC_EACH_PORT -enum adc_channel board_get_vbus_adc(int port) -{ - if (port == 0) { - return ADC_VBUS_C0; - } - if (port == 1) { - return ADC_VBUS_C1; - } - CPRINTSUSB("Unknown vbus adc port id: %d", port); - return ADC_VBUS_C0; -} -#endif /* CONFIG_USB_PD_VBUS_MEASURE_ADC_EACH_PORT */ diff --git a/zephyr/projects/corsola/src/krabby/usbc_config_tentacruel.c b/zephyr/projects/corsola/src/krabby/usbc_config_tentacruel.c deleted file mode 100644 index 03bc3e336f..0000000000 --- a/zephyr/projects/corsola/src/krabby/usbc_config_tentacruel.c +++ /dev/null @@ -1,174 +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. - */ - -/* Krabby board-specific USB-C configuration */ - -#include "adc.h" -#include "baseboard_usbc_config.h" -#include "bc12/pi3usb9201_public.h" -#include "charge_manager.h" -#include "charger.h" -#include "console.h" -#include "driver/charger/rt9490.h" -#include "driver/ppc/rt1739.h" -#include "driver/tcpm/it83xx_pd.h" -#include "driver/usb_mux/ps8743.h" -#include "gpio/gpio_int.h" -#include "hooks.h" -#include "ppc/syv682x_public.h" -#include "usb_mux/it5205_public.h" -#include "usbc_ppc.h" - -#include "variant_db_detection.h" - -#define CPRINTSUSB(format, args...) cprints(CC_USBCHARGE, format, ##args) -#define CPRINTS(format, args...) cprints(CC_SYSTEM, format, ##args) -#define CPRINTF(format, args...) cprintf(CC_SYSTEM, format, ##args) - -void c0_bc12_interrupt(enum gpio_signal signal) -{ - rt1739_interrupt(0); -} - -static void board_usbc_init(void) -{ - gpio_enable_dt_interrupt(GPIO_INT_FROM_NODELABEL(int_usb_c0_ppc_bc12)); -} -DECLARE_HOOK(HOOK_INIT, board_usbc_init, HOOK_PRIO_POST_DEFAULT); - -void ppc_interrupt(enum gpio_signal signal) -{ - if (signal == GPIO_SIGNAL(DT_ALIAS(gpio_usb_c1_ppc_int_odl))) { - syv682x_interrupt(1); - } -} - -int ppc_get_alert_status(int port) -{ - if (port == 0) { - return gpio_pin_get_dt(GPIO_DT_FROM_NODELABEL( - usb_c0_ppc_bc12_int_odl)) == 0; - } - if (port == 1 && corsola_get_db_type() == CORSOLA_DB_TYPEC) { - return gpio_pin_get_dt(GPIO_DT_FROM_ALIAS( - gpio_usb_c1_ppc_int_odl)) == 0; - } - - return 0; -} - -const struct cc_para_t *board_get_cc_tuning_parameter(enum usbpd_port port) -{ - const static struct cc_para_t - cc_parameter[CONFIG_USB_PD_ITE_ACTIVE_PORT_COUNT] = { - { - .rising_time = - IT83XX_TX_PRE_DRIVING_TIME_1_UNIT, - .falling_time = - IT83XX_TX_PRE_DRIVING_TIME_2_UNIT, - }, - { - .rising_time = - IT83XX_TX_PRE_DRIVING_TIME_1_UNIT, - .falling_time = - IT83XX_TX_PRE_DRIVING_TIME_2_UNIT, - }, - }; - - return &cc_parameter[port]; -} - -void board_overcurrent_event(int port, int is_overcurrented) -{ - /* TODO: check correct operation for Corsola */ -} - -uint16_t tcpc_get_alert_status(void) -{ - /* - * C0 & C1: TCPC is embedded in the EC and processes interrupts in the - * chip code (it83xx/intc.c) - */ - return 0; -} - -void board_reset_pd_mcu(void) -{ - /* - * C0 & C1: TCPC is embedded in the EC and processes interrupts in the - * chip code (it83xx/intc.c) - */ -} - -int board_set_active_charge_port(int port) -{ - int i; - int is_valid_port = (port >= 0 && port < board_get_usb_pd_port_count()); - - if (!is_valid_port && port != CHARGE_PORT_NONE) { - return EC_ERROR_INVAL; - } - - if (port == CHARGE_PORT_NONE) { - CPRINTS("Disabling all charger ports"); - - /* Disable all ports. */ - for (i = 0; i < ppc_cnt; i++) { - /* - * Do not return early if one fails otherwise we can - * get into a boot loop assertion failure. - */ - if (ppc_vbus_sink_enable(i, 0)) { - CPRINTS("Disabling C%d as sink failed.", i); - } - } - - return EC_SUCCESS; - } - - /* Check if the port is sourcing VBUS. */ - if (ppc_is_sourcing_vbus(port)) { - CPRINTS("Skip enable C%d", port); - return EC_ERROR_INVAL; - } - - CPRINTS("New charge port: C%d", port); - - /* - * Turn off the other ports' sink path FETs, before enabling the - * requested charge port. - */ - for (i = 0; i < ppc_cnt; i++) { - if (i == port) { - continue; - } - - if (ppc_vbus_sink_enable(i, 0)) { - CPRINTS("C%d: sink path disable failed.", i); - } - } - - /* Enable requested charge port. */ - if (ppc_vbus_sink_enable(port, 1)) { - CPRINTS("C%d: sink path enable failed.", port); - return EC_ERROR_UNKNOWN; - } - - return EC_SUCCESS; -} - -#ifdef CONFIG_USB_PD_VBUS_MEASURE_ADC_EACH_PORT -enum adc_channel board_get_vbus_adc(int port) -{ - if (port == 0) { - return ADC_VBUS_C0; - } - if (port == 1) { - return ADC_VBUS_C1; - } - CPRINTSUSB("Unknown vbus adc port id: %d", port); - return ADC_VBUS_C0; -} -#endif /* CONFIG_USB_PD_VBUS_MEASURE_ADC_EACH_PORT */ diff --git a/zephyr/projects/corsola/src/usb_pd_policy.c b/zephyr/projects/corsola/src/usb_pd_policy.c index 9643aefa23..6aa1381c1d 100644 --- a/zephyr/projects/corsola/src/usb_pd_policy.c +++ b/zephyr/projects/corsola/src/usb_pd_policy.c @@ -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. */ diff --git a/zephyr/projects/corsola/src/usbc_config.c b/zephyr/projects/corsola/src/usbc_config.c index 52bc81e8f4..daf3e5a5cc 100644 --- a/zephyr/projects/corsola/src/usbc_config.c +++ b/zephyr/projects/corsola/src/usbc_config.c @@ -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. */ @@ -32,6 +32,7 @@ #include "usb_mux.h" #include "usb_pd_tcpm.h" #include "usb_tc_sm.h" +#include "usbc/usb_muxes.h" #include "usbc_ppc.h" #include "variant_db_detection.h" @@ -286,11 +287,7 @@ static void baseboard_x_ec_gpio2_init(void) bc12_ports[USBC_PORT_C1] = (const struct bc12_config){ .drv = &virtual_bc12_drv }; /* Use virtual mux to notify AP the mainlink direction. */ - usb_muxes[USBC_PORT_C1] = (struct usb_mux){ - .usb_port = USBC_PORT_C1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, - }; + USB_MUX_ENABLE_ALTERNATIVE(usb_mux_chain_1_hdmi_db); /* * If a HDMI DB is attached, C1 port tasks will be exiting in that diff --git a/zephyr/projects/corsola/src/variant_db_detection.c b/zephyr/projects/corsola/src/variant_db_detection.c index a7d9b6af95..6099d86bdd 100644 --- a/zephyr/projects/corsola/src/variant_db_detection.c +++ b/zephyr/projects/corsola/src/variant_db_detection.c @@ -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. */ diff --git a/zephyr/projects/corsola/thermistor_tentacruel.dts b/zephyr/projects/corsola/thermistor_tentacruel.dts index 9ac1b5cf58..f9e5306f24 100644 --- a/zephyr/projects/corsola/thermistor_tentacruel.dts +++ b/zephyr/projects/corsola/thermistor_tentacruel.dts @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/corsola/usba.dts b/zephyr/projects/corsola/usba.dts index 13c900b1b6..2ecb3b7d5a 100644 --- a/zephyr/projects/corsola/usba.dts +++ b/zephyr/projects/corsola/usba.dts @@ -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. */ diff --git a/zephyr/projects/corsola/usba_steelix.dts b/zephyr/projects/corsola/usba_steelix.dts index 0671457fe9..0ddd67f664 100644 --- a/zephyr/projects/corsola/usba_steelix.dts +++ b/zephyr/projects/corsola/usba_steelix.dts @@ -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. */ diff --git a/zephyr/projects/corsola/usbc_kingler.dts b/zephyr/projects/corsola/usbc_kingler.dts index 9701a8b068..18bc6ce303 100644 --- a/zephyr/projects/corsola/usbc_kingler.dts +++ b/zephyr/projects/corsola/usbc_kingler.dts @@ -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. */ @@ -14,8 +14,11 @@ bc12 = <&bc12_port0>; tcpc = <&tcpc_port0>; ppc = <&ppc_port0>; - usb-muxes = <&anx7447_mux_0 &virtual_mux_0>; chg = <&charger>; + usb-mux-chain-0 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&anx7447_mux_0 &virtual_mux_0>; + }; }; port0-muxes { @@ -33,7 +36,15 @@ bc12 = <&bc12_port1>; tcpc = <&tcpc_port1>; ppc = <&ppc_port1>; - usb-muxes = <&ps8743_mux_1 &virtual_mux_1>; + usb-mux-chain-0 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&ps8743_mux_1 &virtual_mux_1>; + }; + usb_mux_chain_1_hdmi_db: usb-mux-chain-1-hdmi-db { + compatible = "cros-ec,usb-mux-chain"; + alternative-chain; + usb-muxes = <&virtual_mux_1>; + }; }; port1-muxes { diff --git a/zephyr/projects/corsola/usbc_krabby.dts b/zephyr/projects/corsola/usbc_krabby.dts index ac0ba7bdf2..a72864da35 100644 --- a/zephyr/projects/corsola/usbc_krabby.dts +++ b/zephyr/projects/corsola/usbc_krabby.dts @@ -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. */ @@ -15,7 +15,10 @@ ppc = <&bc12_ppc_port0>; tcpc = <&usbpd0>; chg = <&charger>; - usb-muxes = <&it5205_mux_0 &virtual_mux_0>; + usb-mux-chain-0 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&it5205_mux_0 &virtual_mux_0>; + }; }; port0-muxes { virtual_mux_0: virtual-mux-0 { @@ -29,7 +32,15 @@ bc12 = <&bc12_port1>; ppc = <&ppc_port1>; tcpc = <&usbpd1>; - usb-muxes = <&tusb1064_mux_1 &virtual_mux_1>; + usb-mux-chain-1 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&tusb1064_mux_1 &virtual_mux_1>; + }; + usb_mux_chain_1_hdmi_db: usb-mux-chain-1-hdmi-db { + compatible = "cros-ec,usb-mux-chain"; + alternative-chain; + usb-muxes = <&virtual_mux_1>; + }; }; port1-muxes { virtual_mux_1: virtual-mux-1 { diff --git a/zephyr/projects/corsola/usbc_magikarp.dts b/zephyr/projects/corsola/usbc_magikarp.dts index 671423180c..0e0473cd86 100644 --- a/zephyr/projects/corsola/usbc_magikarp.dts +++ b/zephyr/projects/corsola/usbc_magikarp.dts @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ @@ -15,7 +15,10 @@ ppc = <&bc12_ppc_port0>; tcpc = <&usbpd0>; chg = <&charger>; - usb-muxes = <&it5205_mux_0 &virtual_mux_0>; + usb-mux-chain-0 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&it5205_mux_0 &virtual_mux_0>; + }; }; port0-muxes { virtual_mux_0: virtual-mux-0 { @@ -29,7 +32,15 @@ bc12 = <&bc12_port1>; ppc = <&ppc_port1>; tcpc = <&usbpd1>; - usb-muxes = <&ps8743_mux_1 &virtual_mux_1>; + usb-mux-chain-1 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&ps8743_mux_1 &virtual_mux_1>; + }; + usb_mux_chain_1_hdmi_db: usb-mux-chain-1-hdmi-db { + compatible = "cros-ec,usb-mux-chain"; + alternative-chain; + usb-muxes = <&virtual_mux_1>; + }; }; port1-muxes { virtual_mux_1: virtual-mux-1 { diff --git a/zephyr/projects/corsola/usbc_tentacruel.dts b/zephyr/projects/corsola/usbc_tentacruel.dts index 671423180c..0e0473cd86 100644 --- a/zephyr/projects/corsola/usbc_tentacruel.dts +++ b/zephyr/projects/corsola/usbc_tentacruel.dts @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ @@ -15,7 +15,10 @@ ppc = <&bc12_ppc_port0>; tcpc = <&usbpd0>; chg = <&charger>; - usb-muxes = <&it5205_mux_0 &virtual_mux_0>; + usb-mux-chain-0 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&it5205_mux_0 &virtual_mux_0>; + }; }; port0-muxes { virtual_mux_0: virtual-mux-0 { @@ -29,7 +32,15 @@ bc12 = <&bc12_port1>; ppc = <&ppc_port1>; tcpc = <&usbpd1>; - usb-muxes = <&ps8743_mux_1 &virtual_mux_1>; + usb-mux-chain-1 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&ps8743_mux_1 &virtual_mux_1>; + }; + usb_mux_chain_1_hdmi_db: usb-mux-chain-1-hdmi-db { + compatible = "cros-ec,usb-mux-chain"; + alternative-chain; + usb-muxes = <&virtual_mux_1>; + }; }; port1-muxes { virtual_mux_1: virtual-mux-1 { diff --git a/zephyr/projects/herobrine/BUILD.py b/zephyr/projects/herobrine/BUILD.py index fb49223cdb..01f51bd73c 100644 --- a/zephyr/projects/herobrine/BUILD.py +++ b/zephyr/projects/herobrine/BUILD.py @@ -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. diff --git a/zephyr/projects/herobrine/CMakeLists.txt b/zephyr/projects/herobrine/CMakeLists.txt index 3e11b75d17..39472f424b 100644 --- a/zephyr/projects/herobrine/CMakeLists.txt +++ b/zephyr/projects/herobrine/CMakeLists.txt @@ -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. diff --git a/zephyr/projects/herobrine/Kconfig b/zephyr/projects/herobrine/Kconfig index 98137a596e..383d5a08ee 100644 --- a/zephyr/projects/herobrine/Kconfig +++ b/zephyr/projects/herobrine/Kconfig @@ -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. diff --git a/zephyr/projects/herobrine/adc.dts b/zephyr/projects/herobrine/adc.dts index e18ec88741..16a5434e9d 100644 --- a/zephyr/projects/herobrine/adc.dts +++ b/zephyr/projects/herobrine/adc.dts @@ -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. */ diff --git a/zephyr/projects/herobrine/battery_evoker.dts b/zephyr/projects/herobrine/battery_evoker.dts index 898390f721..2522c769d2 100644 --- a/zephyr/projects/herobrine/battery_evoker.dts +++ b/zephyr/projects/herobrine/battery_evoker.dts @@ -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. */ diff --git a/zephyr/projects/herobrine/battery_herobrine.dts b/zephyr/projects/herobrine/battery_herobrine.dts index 764c3fb5ed..b347ec4c3c 100644 --- a/zephyr/projects/herobrine/battery_herobrine.dts +++ b/zephyr/projects/herobrine/battery_herobrine.dts @@ -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. */ diff --git a/zephyr/projects/herobrine/battery_hoglin.dts b/zephyr/projects/herobrine/battery_hoglin.dts index 79fc6ca296..11180c3988 100644 --- a/zephyr/projects/herobrine/battery_hoglin.dts +++ b/zephyr/projects/herobrine/battery_hoglin.dts @@ -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. */ diff --git a/zephyr/projects/herobrine/battery_villager.dts b/zephyr/projects/herobrine/battery_villager.dts index 2fe9a93774..dafd473a6e 100644 --- a/zephyr/projects/herobrine/battery_villager.dts +++ b/zephyr/projects/herobrine/battery_villager.dts @@ -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. */ diff --git a/zephyr/projects/herobrine/common.dts b/zephyr/projects/herobrine/common.dts index aeb99c5377..a722f1dfa2 100644 --- a/zephyr/projects/herobrine/common.dts +++ b/zephyr/projects/herobrine/common.dts @@ -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. */ diff --git a/zephyr/projects/herobrine/default_gpio_pinctrl.dts b/zephyr/projects/herobrine/default_gpio_pinctrl.dts index a6f61cb3ed..604658a145 100644 --- a/zephyr/projects/herobrine/default_gpio_pinctrl.dts +++ b/zephyr/projects/herobrine/default_gpio_pinctrl.dts @@ -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. */ diff --git a/zephyr/projects/herobrine/display.dts b/zephyr/projects/herobrine/display.dts index 94a95193e2..65d3a2d91b 100644 --- a/zephyr/projects/herobrine/display.dts +++ b/zephyr/projects/herobrine/display.dts @@ -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. */ diff --git a/zephyr/projects/herobrine/gpio.dts b/zephyr/projects/herobrine/gpio.dts index ddcd2a2d07..a355aaf099 100644 --- a/zephyr/projects/herobrine/gpio.dts +++ b/zephyr/projects/herobrine/gpio.dts @@ -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. */ diff --git a/zephyr/projects/herobrine/gpio_evoker.dts b/zephyr/projects/herobrine/gpio_evoker.dts index c955811c87..806ff928a3 100644 --- a/zephyr/projects/herobrine/gpio_evoker.dts +++ b/zephyr/projects/herobrine/gpio_evoker.dts @@ -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. */ diff --git a/zephyr/projects/herobrine/gpio_hoglin.dts b/zephyr/projects/herobrine/gpio_hoglin.dts index 5c57abda5e..cb7babc9cf 100644 --- a/zephyr/projects/herobrine/gpio_hoglin.dts +++ b/zephyr/projects/herobrine/gpio_hoglin.dts @@ -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. */ diff --git a/zephyr/projects/herobrine/gpio_villager.dts b/zephyr/projects/herobrine/gpio_villager.dts index 8be10f1c19..1e7625ff6a 100644 --- a/zephyr/projects/herobrine/gpio_villager.dts +++ b/zephyr/projects/herobrine/gpio_villager.dts @@ -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. */ diff --git a/zephyr/projects/herobrine/i2c_common.dtsi b/zephyr/projects/herobrine/i2c_common.dtsi index 7a553b995c..b1ed0242c0 100644 --- a/zephyr/projects/herobrine/i2c_common.dtsi +++ b/zephyr/projects/herobrine/i2c_common.dtsi @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS 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. */ diff --git a/zephyr/projects/herobrine/i2c_evoker.dts b/zephyr/projects/herobrine/i2c_evoker.dts index 1598a3c216..7023d08c8d 100644 --- a/zephyr/projects/herobrine/i2c_evoker.dts +++ b/zephyr/projects/herobrine/i2c_evoker.dts @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS 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. */ diff --git a/zephyr/projects/herobrine/i2c_herobrine.dts b/zephyr/projects/herobrine/i2c_herobrine.dts index cab6620394..92c68f4215 100644 --- a/zephyr/projects/herobrine/i2c_herobrine.dts +++ b/zephyr/projects/herobrine/i2c_herobrine.dts @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS 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. */ diff --git a/zephyr/projects/herobrine/i2c_hoglin.dts b/zephyr/projects/herobrine/i2c_hoglin.dts index 0b97048929..504dbb9248 100644 --- a/zephyr/projects/herobrine/i2c_hoglin.dts +++ b/zephyr/projects/herobrine/i2c_hoglin.dts @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS 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. */ diff --git a/zephyr/projects/herobrine/i2c_villager.dts b/zephyr/projects/herobrine/i2c_villager.dts index a56bd740ac..efdf88ac38 100644 --- a/zephyr/projects/herobrine/i2c_villager.dts +++ b/zephyr/projects/herobrine/i2c_villager.dts @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS 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. */ diff --git a/zephyr/projects/herobrine/interrupts.dts b/zephyr/projects/herobrine/interrupts.dts index 23902a7d05..82650bfc51 100644 --- a/zephyr/projects/herobrine/interrupts.dts +++ b/zephyr/projects/herobrine/interrupts.dts @@ -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. */ diff --git a/zephyr/projects/herobrine/keyboard.dts b/zephyr/projects/herobrine/keyboard.dts index 810763629c..3b7e830f2f 100644 --- a/zephyr/projects/herobrine/keyboard.dts +++ b/zephyr/projects/herobrine/keyboard.dts @@ -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. */ diff --git a/zephyr/projects/herobrine/led_pins_evoker.dts b/zephyr/projects/herobrine/led_pins_evoker.dts index cdc5f03904..c509ab1a64 100644 --- a/zephyr/projects/herobrine/led_pins_evoker.dts +++ b/zephyr/projects/herobrine/led_pins_evoker.dts @@ -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. */ diff --git a/zephyr/projects/herobrine/led_pins_herobrine.dts b/zephyr/projects/herobrine/led_pins_herobrine.dts index cdc5f03904..c509ab1a64 100644 --- a/zephyr/projects/herobrine/led_pins_herobrine.dts +++ b/zephyr/projects/herobrine/led_pins_herobrine.dts @@ -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. */ diff --git a/zephyr/projects/herobrine/led_pins_hoglin.dts b/zephyr/projects/herobrine/led_pins_hoglin.dts index 8603b4e61d..7b125c5cac 100644 --- a/zephyr/projects/herobrine/led_pins_hoglin.dts +++ b/zephyr/projects/herobrine/led_pins_hoglin.dts @@ -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. */ diff --git a/zephyr/projects/herobrine/led_pins_villager.dts b/zephyr/projects/herobrine/led_pins_villager.dts index 67a1d1926c..b0913cdbce 100644 --- a/zephyr/projects/herobrine/led_pins_villager.dts +++ b/zephyr/projects/herobrine/led_pins_villager.dts @@ -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. */ diff --git a/zephyr/projects/herobrine/led_policy_hoglin.dts b/zephyr/projects/herobrine/led_policy_hoglin.dts index 4ce0a6e5f6..043dfbcaa5 100644 --- a/zephyr/projects/herobrine/led_policy_hoglin.dts +++ b/zephyr/projects/herobrine/led_policy_hoglin.dts @@ -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. */ diff --git a/zephyr/projects/herobrine/led_policy_villager.dts b/zephyr/projects/herobrine/led_policy_villager.dts index 93ee0fe15f..f8996a3f4b 100644 --- a/zephyr/projects/herobrine/led_policy_villager.dts +++ b/zephyr/projects/herobrine/led_policy_villager.dts @@ -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. */ diff --git a/zephyr/projects/herobrine/motionsense.dts b/zephyr/projects/herobrine/motionsense.dts index 8f9940cecf..1955f43284 100644 --- a/zephyr/projects/herobrine/motionsense.dts +++ b/zephyr/projects/herobrine/motionsense.dts @@ -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. */ diff --git a/zephyr/projects/herobrine/motionsense_hoglin.dts b/zephyr/projects/herobrine/motionsense_hoglin.dts index 17a0f0f37f..c3935178ff 100644 --- a/zephyr/projects/herobrine/motionsense_hoglin.dts +++ b/zephyr/projects/herobrine/motionsense_hoglin.dts @@ -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. */ diff --git a/zephyr/projects/herobrine/motionsense_villager.dts b/zephyr/projects/herobrine/motionsense_villager.dts index 1c2541c902..31d00e04a5 100644 --- a/zephyr/projects/herobrine/motionsense_villager.dts +++ b/zephyr/projects/herobrine/motionsense_villager.dts @@ -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. */ diff --git a/zephyr/projects/herobrine/prj.conf b/zephyr/projects/herobrine/prj.conf index 112d75a9cd..2b13023f2d 100644 --- a/zephyr/projects/herobrine/prj.conf +++ b/zephyr/projects/herobrine/prj.conf @@ -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. diff --git a/zephyr/projects/herobrine/prj_evoker.conf b/zephyr/projects/herobrine/prj_evoker.conf index 1f63df235b..85c2f21af0 100644 --- a/zephyr/projects/herobrine/prj_evoker.conf +++ b/zephyr/projects/herobrine/prj_evoker.conf @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/zephyr/projects/herobrine/prj_herobrine.conf b/zephyr/projects/herobrine/prj_herobrine.conf index 3c7eddbae6..bf39f65692 100644 --- a/zephyr/projects/herobrine/prj_herobrine.conf +++ b/zephyr/projects/herobrine/prj_herobrine.conf @@ -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. diff --git a/zephyr/projects/herobrine/prj_hoglin.conf b/zephyr/projects/herobrine/prj_hoglin.conf index 370e942f45..c6e20937c0 100644 --- a/zephyr/projects/herobrine/prj_hoglin.conf +++ b/zephyr/projects/herobrine/prj_hoglin.conf @@ -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. diff --git a/zephyr/projects/herobrine/prj_villager.conf b/zephyr/projects/herobrine/prj_villager.conf index 34c366a36f..35eebe6d99 100644 --- a/zephyr/projects/herobrine/prj_villager.conf +++ b/zephyr/projects/herobrine/prj_villager.conf @@ -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. diff --git a/zephyr/projects/herobrine/prj_zoglin.conf b/zephyr/projects/herobrine/prj_zoglin.conf index 2c50614dc1..7f96cf6c79 100644 --- a/zephyr/projects/herobrine/prj_zoglin.conf +++ b/zephyr/projects/herobrine/prj_zoglin.conf @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/zephyr/projects/herobrine/src/herobrine/alt_dev_replacement.c b/zephyr/projects/herobrine/src/herobrine/alt_dev_replacement.c index 00cf3092d8..00acd509f4 100644 --- a/zephyr/projects/herobrine/src/herobrine/alt_dev_replacement.c +++ b/zephyr/projects/herobrine/src/herobrine/alt_dev_replacement.c @@ -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. */ diff --git a/zephyr/projects/herobrine/src/i2c.c b/zephyr/projects/herobrine/src/i2c.c index 3f9abe4674..88b722c42d 100644 --- a/zephyr/projects/herobrine/src/i2c.c +++ b/zephyr/projects/herobrine/src/i2c.c @@ -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. */ diff --git a/zephyr/projects/herobrine/src/usb_pd_policy.c b/zephyr/projects/herobrine/src/usb_pd_policy.c index 23eeb7034d..adc517d3cb 100644 --- a/zephyr/projects/herobrine/src/usb_pd_policy.c +++ b/zephyr/projects/herobrine/src/usb_pd_policy.c @@ -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. */ diff --git a/zephyr/projects/herobrine/src/usbc_config.c b/zephyr/projects/herobrine/src/usbc_config.c index 148c7b6eb5..f040ab12cb 100644 --- a/zephyr/projects/herobrine/src/usbc_config.c +++ b/zephyr/projects/herobrine/src/usbc_config.c @@ -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. */ diff --git a/zephyr/projects/herobrine/switchcap.dts b/zephyr/projects/herobrine/switchcap.dts index b246274a7a..ed200a0c6f 100644 --- a/zephyr/projects/herobrine/switchcap.dts +++ b/zephyr/projects/herobrine/switchcap.dts @@ -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. */ diff --git a/zephyr/projects/herobrine/switchcap_hoglin.dts b/zephyr/projects/herobrine/switchcap_hoglin.dts index 555be373e5..7c083667a1 100644 --- a/zephyr/projects/herobrine/switchcap_hoglin.dts +++ b/zephyr/projects/herobrine/switchcap_hoglin.dts @@ -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. */ diff --git a/zephyr/projects/herobrine/usbc_evoker.dts b/zephyr/projects/herobrine/usbc_evoker.dts index 4ef66084fc..20bd48382f 100644 --- a/zephyr/projects/herobrine/usbc_evoker.dts +++ b/zephyr/projects/herobrine/usbc_evoker.dts @@ -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. */ @@ -15,7 +15,10 @@ ppc = <&ppc_port0>; tcpc = <&tcpc_port0>; chg = <&charger>; - usb-muxes = <&usb_mux_0>; + usb-mux-chain-0 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&usb_mux_0>; + }; }; usb_mux_0: usb-mux-0 { compatible = "parade,usbc-mux-ps8xxx"; @@ -27,7 +30,10 @@ bc12 = <&bc12_port1>; ppc = <&ppc_port1>; tcpc = <&tcpc_port1>; - usb-muxes = <&usb_mux_1>; + usb-mux-chain-1 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&usb_mux_1>; + }; }; usb_mux_1: usb-mux-1 { compatible = "parade,usbc-mux-ps8xxx"; diff --git a/zephyr/projects/herobrine/usbc_herobrine.dts b/zephyr/projects/herobrine/usbc_herobrine.dts index 5537a606ce..675286ecd7 100644 --- a/zephyr/projects/herobrine/usbc_herobrine.dts +++ b/zephyr/projects/herobrine/usbc_herobrine.dts @@ -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. */ @@ -16,7 +16,10 @@ ppc_alt = <&ppc_port0_alt>; tcpc = <&tcpc_port0>; chg = <&charger>; - usb-muxes = <&usb_mux_0>; + usb-mux-chain-0 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&usb_mux_0>; + }; }; usb_mux_0: usb-mux-0 { compatible = "parade,usbc-mux-ps8xxx"; @@ -28,7 +31,10 @@ bc12 = <&bc12_port1>; ppc = <&ppc_port1>; tcpc = <&tcpc_port1>; - usb-muxes = <&usb_mux_1>; + usb-mux-chain-1 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&usb_mux_1>; + }; }; usb_mux_1: usb-mux-1 { compatible = "parade,usbc-mux-ps8xxx"; diff --git a/zephyr/projects/herobrine/usbc_hoglin.dts b/zephyr/projects/herobrine/usbc_hoglin.dts index 4ef66084fc..20bd48382f 100644 --- a/zephyr/projects/herobrine/usbc_hoglin.dts +++ b/zephyr/projects/herobrine/usbc_hoglin.dts @@ -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. */ @@ -15,7 +15,10 @@ ppc = <&ppc_port0>; tcpc = <&tcpc_port0>; chg = <&charger>; - usb-muxes = <&usb_mux_0>; + usb-mux-chain-0 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&usb_mux_0>; + }; }; usb_mux_0: usb-mux-0 { compatible = "parade,usbc-mux-ps8xxx"; @@ -27,7 +30,10 @@ bc12 = <&bc12_port1>; ppc = <&ppc_port1>; tcpc = <&tcpc_port1>; - usb-muxes = <&usb_mux_1>; + usb-mux-chain-1 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&usb_mux_1>; + }; }; usb_mux_1: usb-mux-1 { compatible = "parade,usbc-mux-ps8xxx"; diff --git a/zephyr/projects/herobrine/usbc_villager.dts b/zephyr/projects/herobrine/usbc_villager.dts index 4ef66084fc..20bd48382f 100644 --- a/zephyr/projects/herobrine/usbc_villager.dts +++ b/zephyr/projects/herobrine/usbc_villager.dts @@ -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. */ @@ -15,7 +15,10 @@ ppc = <&ppc_port0>; tcpc = <&tcpc_port0>; chg = <&charger>; - usb-muxes = <&usb_mux_0>; + usb-mux-chain-0 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&usb_mux_0>; + }; }; usb_mux_0: usb-mux-0 { compatible = "parade,usbc-mux-ps8xxx"; @@ -27,7 +30,10 @@ bc12 = <&bc12_port1>; ppc = <&ppc_port1>; tcpc = <&tcpc_port1>; - usb-muxes = <&usb_mux_1>; + usb-mux-chain-1 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&usb_mux_1>; + }; }; usb_mux_1: usb-mux-1 { compatible = "parade,usbc-mux-ps8xxx"; diff --git a/zephyr/projects/intelrvp/BUILD.py b/zephyr/projects/intelrvp/BUILD.py index 9690f6db23..e6e617ea23 100644 --- a/zephyr/projects/intelrvp/BUILD.py +++ b/zephyr/projects/intelrvp/BUILD.py @@ -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. diff --git a/zephyr/projects/intelrvp/CMakeLists.txt b/zephyr/projects/intelrvp/CMakeLists.txt index 1a8a39d9ae..25b3af3931 100644 --- a/zephyr/projects/intelrvp/CMakeLists.txt +++ b/zephyr/projects/intelrvp/CMakeLists.txt @@ -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. diff --git a/zephyr/projects/intelrvp/Kconfig b/zephyr/projects/intelrvp/Kconfig index 1c8ec22073..c51c54847b 100644 --- a/zephyr/projects/intelrvp/Kconfig +++ b/zephyr/projects/intelrvp/Kconfig @@ -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. diff --git a/zephyr/projects/intelrvp/adlrvp/CMakeLists.txt b/zephyr/projects/intelrvp/adlrvp/CMakeLists.txt index bd961ff89d..71dee29552 100644 --- a/zephyr/projects/intelrvp/adlrvp/CMakeLists.txt +++ b/zephyr/projects/intelrvp/adlrvp/CMakeLists.txt @@ -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. diff --git a/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/adlrvp_npcx.dts b/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/adlrvp_npcx.dts index c58c1b4120..79723beabd 100644 --- a/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/adlrvp_npcx.dts +++ b/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/adlrvp_npcx.dts @@ -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. */ @@ -150,6 +150,13 @@ reg = <0x22>; }; + usb_c0_soc_side_bb_retimer: jhl8040r-c0-soc-side@54 { + compatible = "intel,jhl8040r"; + reg = <0x54>; + reset-pin = <&usb_c0_bb_retimer_rst>; + ls-en-pin = <&usb_c0_bb_retimer_ls_en>; + }; + usb_c0_bb_retimer: jhl8040r-c0@56 { compatible = "intel,jhl8040r"; reg = <0x56>; @@ -174,6 +181,13 @@ reg = <0x22>; }; + usb_c1_soc_side_bb_retimer: jhl8040r-c1-soc-side@55 { + compatible = "intel,jhl8040r"; + reg = <0x55>; + reset-pin = <&usb_c1_bb_retimer_rst>; + ls-en-pin = <&usb_c1_bb_retimer_ls_en>; + }; + usb_c1_bb_retimer: jhl8040r-c1@57 { compatible = "intel,jhl8040r"; reg = <0x57>; diff --git a/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/fan.dts b/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/fan.dts index 87b83c0fd9..8babe53903 100644 --- a/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/fan.dts +++ b/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/fan.dts @@ -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. */ diff --git a/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/gpio.dts b/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/gpio.dts index 8b2adef564..1d38fc877c 100644 --- a/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/gpio.dts +++ b/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/gpio.dts @@ -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. */ diff --git a/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/interrupts.dts b/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/interrupts.dts index e0992ef3b3..d7bb40fad2 100644 --- a/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/interrupts.dts +++ b/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/interrupts.dts @@ -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. */ diff --git a/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/keyboard.dts b/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/keyboard.dts index e735234128..81d6e82f48 100644 --- a/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/keyboard.dts +++ b/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/keyboard.dts @@ -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. */ diff --git a/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/prj.conf b/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/prj.conf index 32919ea399..2c98fd9330 100644 --- a/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/prj.conf +++ b/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/prj.conf @@ -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. diff --git a/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/pwm_leds.dts b/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/pwm_leds.dts index 49cfb5747a..eb1576dbff 100644 --- a/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/pwm_leds.dts +++ b/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/pwm_leds.dts @@ -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. */ diff --git a/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/temp_sensor.dts b/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/temp_sensor.dts index e6a194b362..95d462bd75 100644 --- a/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/temp_sensor.dts +++ b/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/temp_sensor.dts @@ -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. */ diff --git a/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/usbc.dts b/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/usbc.dts index a694ecbb44..471a1f52e9 100644 --- a/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/usbc.dts +++ b/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/usbc.dts @@ -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. */ @@ -12,7 +12,18 @@ reg = <0>; tcpc = <&tcpc_port0>; chg = <&charger>; - usb-muxes = <&usb_c0_bb_retimer &virtual_mux_c0>; + usb_mux_chain_0: usb-mux-chain-0 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&usb_c0_bb_retimer + &virtual_mux_c0>; + }; + usb_mux_alt_chain_0: usb-mux-alt-chain-0 { + compatible = "cros-ec,usb-mux-chain"; + alternative-chain; + usb-muxes = <&usb_c0_bb_retimer + &usb_c0_soc_side_bb_retimer + &virtual_mux_c0>; + }; }; port0-muxes { virtual_mux_c0: virtual-mux-c0 { @@ -24,7 +35,18 @@ compatible = "named-usbc-port"; reg = <1>; tcpc = <&tcpc_port1>; - usb-muxes = <&usb_c1_bb_retimer &virtual_mux_c1>; + usb_mux_chain_1: usb-mux-chain-1 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&usb_c1_bb_retimer + &virtual_mux_c1>; + }; + usb_mux_alt_chain_1: usb-mux-alt-chain-1 { + compatible = "cros-ec,usb-mux-chain"; + alternative-chain; + usb-muxes = <&usb_c1_bb_retimer + &usb_c1_soc_side_bb_retimer + &virtual_mux_c1>; + }; }; port1-muxes { virtual_mux_c1: virtual-mux-c1 { @@ -36,7 +58,11 @@ compatible = "named-usbc-port"; reg = <2>; tcpc = <&tcpc_port2>; - usb-muxes = <&usb_c2_bb_retimer &virtual_mux_c2>; + usb_mux_chain_2: usb-mux-chain-2 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&usb_c2_bb_retimer + &virtual_mux_c2>; + }; }; port2-muxes { virtual_mux_c2: virtual-mux-c2 { @@ -48,7 +74,11 @@ compatible = "named-usbc-port"; reg = <3>; tcpc = <&tcpc_port3>; - usb-muxes = <&usb_c3_bb_retimer &virtual_mux_c3>; + usb_mux_chain_3: usb-mux-chain-3 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&usb_c3_bb_retimer + &virtual_mux_c3>; + }; }; port3-muxes { virtual_mux_c3: virtual-mux-c3 { diff --git a/zephyr/projects/intelrvp/adlrvp/battery.dts b/zephyr/projects/intelrvp/adlrvp/battery.dts index 10b43d6baa..1de4111791 100644 --- a/zephyr/projects/intelrvp/adlrvp/battery.dts +++ b/zephyr/projects/intelrvp/adlrvp/battery.dts @@ -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. */ diff --git a/zephyr/projects/intelrvp/adlrvp/include/adlrvp_zephyr.h b/zephyr/projects/intelrvp/adlrvp/include/adlrvp_zephyr.h index 2b0b3993ce..135fd4ef4f 100644 --- a/zephyr/projects/intelrvp/adlrvp/include/adlrvp_zephyr.h +++ b/zephyr/projects/intelrvp/adlrvp/include/adlrvp_zephyr.h @@ -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. */ diff --git a/zephyr/projects/intelrvp/adlrvp/ioex.dts b/zephyr/projects/intelrvp/adlrvp/ioex.dts index 93117de943..3e2227dacb 100644 --- a/zephyr/projects/intelrvp/adlrvp/ioex.dts +++ b/zephyr/projects/intelrvp/adlrvp/ioex.dts @@ -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. */ diff --git a/zephyr/projects/intelrvp/adlrvp/prj.conf b/zephyr/projects/intelrvp/adlrvp/prj.conf index 357b0bee66..1314277bc8 100644 --- a/zephyr/projects/intelrvp/adlrvp/prj.conf +++ b/zephyr/projects/intelrvp/adlrvp/prj.conf @@ -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. @@ -71,4 +71,4 @@ CONFIG_GPIO_PCA95XX=y CONFIG_PLATFORM_EC_MAX695X_SEVEN_SEGMENT_DISPLAY=y # eSPI -CONFIG_PLATFORM_EC_ESPI_DEFAULT_VW_WIDTH_US=150 +CONFIG_PLATFORM_EC_HOST_INTERFACE_ESPI_DEFAULT_VW_WIDTH_US=150 diff --git a/zephyr/projects/intelrvp/adlrvp/src/adlrvp.c b/zephyr/projects/intelrvp/adlrvp/src/adlrvp.c index 960e149a38..ce5196c60d 100644 --- a/zephyr/projects/intelrvp/adlrvp/src/adlrvp.c +++ b/zephyr/projects/intelrvp/adlrvp/src/adlrvp.c @@ -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. */ @@ -95,27 +95,6 @@ struct ppc_config_t ppc_chips[] = { BUILD_ASSERT(ARRAY_SIZE(ppc_chips) == CONFIG_USB_PD_PORT_MAX_COUNT); unsigned int ppc_cnt = ARRAY_SIZE(ppc_chips); -/* USB Mux Configuration for Soc side BB-Retimers for Dual retimer config */ -static struct usb_mux soc_side_bb_retimer0_usb_mux = { - .usb_port = TYPE_C_PORT_0, - .next_mux = USB_MUX_NEXT_POINTER(DT_NODELABEL(usbc_port0), 0), - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_TYPEC_0, - .i2c_addr_flags = I2C_PORT0_BB_RETIMER_SOC_ADDR, -}; - -#if defined(HAS_TASK_PD_C1) -static struct usb_mux soc_side_bb_retimer1_usb_mux = { - .usb_port = TYPE_C_PORT_1, - .next_mux = USB_MUX_NEXT_POINTER(DT_NODELABEL(usbc_port1), 0), - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_TYPEC_1, - .i2c_addr_flags = I2C_PORT1_BB_RETIMER_SOC_ADDR, -}; -#endif - /* Cache BB retimer power state */ static bool cache_bb_enable[CONFIG_USB_PD_PORT_MAX_COUNT]; @@ -244,25 +223,29 @@ static void configure_charger(void) static void configure_retimer_usbmux(void) { + struct usb_mux *mux; + switch (ADL_RVP_BOARD_ID(board_get_version())) { case ADLN_LP5_ERB_SKU_BOARD_ID: case ADLN_LP5_RVP_SKU_BOARD_ID: /* enable TUSB1044RNQR redriver on Port0 */ - usb_muxes[TYPE_C_PORT_0].i2c_addr_flags = - TUSB1064_I2C_ADDR14_FLAGS; - usb_muxes[TYPE_C_PORT_0].driver = &tusb1064_usb_mux_driver; - usb_muxes[TYPE_C_PORT_0].hpd_update = tusb1044_hpd_update; + mux = USB_MUX_POINTER(DT_NODELABEL(usb_mux_chain_0), 0); + mux->i2c_addr_flags = TUSB1064_I2C_ADDR14_FLAGS; + mux->driver = &tusb1064_usb_mux_driver; + mux->hpd_update = tusb1044_hpd_update; #if defined(HAS_TASK_PD_C1) - usb_muxes[TYPE_C_PORT_1].driver = NULL; - usb_muxes[TYPE_C_PORT_1].hpd_update = NULL; + mux = USB_MUX_POINTER(DT_NODELABEL(usb_mux_chain_1), 0); + mux->driver = NULL; + mux->hpd_update = NULL; #endif break; case ADLP_LP5_T4_RVP_SKU_BOARD_ID: /* No retimer on Port-2 */ #if defined(HAS_TASK_PD_C2) - usb_muxes[TYPE_C_PORT_2].driver = NULL; + mux = USB_MUX_POINTER(DT_NODELABEL(usb_mux_chain_2), 0); + mux->driver = NULL; #endif break; @@ -272,11 +255,9 @@ static void configure_retimer_usbmux(void) * Change the default usb mux config on runtime to support * dual retimer topology. */ - usb_muxes[TYPE_C_PORT_0].next_mux = - &soc_side_bb_retimer0_usb_mux; + USB_MUX_ENABLE_ALTERNATIVE(usb_mux_alt_chain_0); #if defined(HAS_TASK_PD_C1) - usb_muxes[TYPE_C_PORT_1].next_mux = - &soc_side_bb_retimer1_usb_mux; + USB_MUX_ENABLE_ALTERNATIVE(usb_mux_alt_chain_1); #endif break; diff --git a/zephyr/projects/intelrvp/include/intel_rvp_board_id.h b/zephyr/projects/intelrvp/include/intel_rvp_board_id.h index a527b19364..7825b272e3 100644 --- a/zephyr/projects/intelrvp/include/intel_rvp_board_id.h +++ b/zephyr/projects/intelrvp/include/intel_rvp_board_id.h @@ -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. */ diff --git a/zephyr/projects/intelrvp/include/intelrvp.h b/zephyr/projects/intelrvp/include/intelrvp.h index 4f25ae336d..9b6dc98485 100644 --- a/zephyr/projects/intelrvp/include/intelrvp.h +++ b/zephyr/projects/intelrvp/include/intelrvp.h @@ -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. */ diff --git a/zephyr/projects/intelrvp/legacy_ec_pwrseq.conf b/zephyr/projects/intelrvp/legacy_ec_pwrseq.conf index 3fa6d2aadb..331afb637d 100644 --- a/zephyr/projects/intelrvp/legacy_ec_pwrseq.conf +++ b/zephyr/projects/intelrvp/legacy_ec_pwrseq.conf @@ -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. diff --git a/zephyr/projects/intelrvp/mtlrvp/CMakeLists.txt b/zephyr/projects/intelrvp/mtlrvp/CMakeLists.txt index d47b23c77f..c6729af776 100644 --- a/zephyr/projects/intelrvp/mtlrvp/CMakeLists.txt +++ b/zephyr/projects/intelrvp/mtlrvp/CMakeLists.txt @@ -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. diff --git a/zephyr/projects/intelrvp/mtlrvp/ioex.dts b/zephyr/projects/intelrvp/mtlrvp/ioex.dts index 7744e856e7..7d2f4b5820 100644 --- a/zephyr/projects/intelrvp/mtlrvp/ioex.dts +++ b/zephyr/projects/intelrvp/mtlrvp/ioex.dts @@ -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. */ diff --git a/zephyr/projects/intelrvp/mtlrvp/mtlrvpp_npcx/fan.dts b/zephyr/projects/intelrvp/mtlrvp/mtlrvpp_npcx/fan.dts index 179091a343..cf85dd3413 100644 --- a/zephyr/projects/intelrvp/mtlrvp/mtlrvpp_npcx/fan.dts +++ b/zephyr/projects/intelrvp/mtlrvp/mtlrvpp_npcx/fan.dts @@ -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. */ diff --git a/zephyr/projects/intelrvp/mtlrvp/mtlrvpp_npcx/gpio.dts b/zephyr/projects/intelrvp/mtlrvp/mtlrvpp_npcx/gpio.dts index fc571ec043..77b4cf0573 100644 --- a/zephyr/projects/intelrvp/mtlrvp/mtlrvpp_npcx/gpio.dts +++ b/zephyr/projects/intelrvp/mtlrvp/mtlrvpp_npcx/gpio.dts @@ -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. */ diff --git a/zephyr/projects/intelrvp/mtlrvp/mtlrvpp_npcx/interrupts.dts b/zephyr/projects/intelrvp/mtlrvp/mtlrvpp_npcx/interrupts.dts index dcbfa9e93e..b120f6c05e 100644 --- a/zephyr/projects/intelrvp/mtlrvp/mtlrvpp_npcx/interrupts.dts +++ b/zephyr/projects/intelrvp/mtlrvp/mtlrvpp_npcx/interrupts.dts @@ -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. */ diff --git a/zephyr/projects/intelrvp/mtlrvp/mtlrvpp_npcx/keyboard.dts b/zephyr/projects/intelrvp/mtlrvp/mtlrvpp_npcx/keyboard.dts index e735234128..81d6e82f48 100644 --- a/zephyr/projects/intelrvp/mtlrvp/mtlrvpp_npcx/keyboard.dts +++ b/zephyr/projects/intelrvp/mtlrvp/mtlrvpp_npcx/keyboard.dts @@ -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. */ diff --git a/zephyr/projects/intelrvp/mtlrvp/mtlrvpp_npcx/mtlrvp_npcx.dts b/zephyr/projects/intelrvp/mtlrvp/mtlrvpp_npcx/mtlrvp_npcx.dts index d599a21948..86a46e3e7a 100644 --- a/zephyr/projects/intelrvp/mtlrvp/mtlrvpp_npcx/mtlrvp_npcx.dts +++ b/zephyr/projects/intelrvp/mtlrvp/mtlrvpp_npcx/mtlrvp_npcx.dts @@ -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. */ diff --git a/zephyr/projects/intelrvp/mtlrvp/mtlrvpp_npcx/mtlrvp_npcx_power_signals.dts b/zephyr/projects/intelrvp/mtlrvp/mtlrvpp_npcx/mtlrvp_npcx_power_signals.dts index c791b8c1b1..42745d328b 100644 --- a/zephyr/projects/intelrvp/mtlrvp/mtlrvpp_npcx/mtlrvp_npcx_power_signals.dts +++ b/zephyr/projects/intelrvp/mtlrvp/mtlrvpp_npcx/mtlrvp_npcx_power_signals.dts @@ -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. */ diff --git a/zephyr/projects/intelrvp/mtlrvp/mtlrvpp_npcx/prj.conf b/zephyr/projects/intelrvp/mtlrvp/mtlrvpp_npcx/prj.conf index 42abe0eeb1..bd26630c9c 100644 --- a/zephyr/projects/intelrvp/mtlrvp/mtlrvpp_npcx/prj.conf +++ b/zephyr/projects/intelrvp/mtlrvp/mtlrvpp_npcx/prj.conf @@ -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. diff --git a/zephyr/projects/intelrvp/mtlrvp/prj.conf b/zephyr/projects/intelrvp/mtlrvp/prj.conf index 714ae7764e..5781a274c5 100644 --- a/zephyr/projects/intelrvp/mtlrvp/prj.conf +++ b/zephyr/projects/intelrvp/mtlrvp/prj.conf @@ -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. diff --git a/zephyr/projects/intelrvp/mtlrvp/src/board_power.c b/zephyr/projects/intelrvp/mtlrvp/src/board_power.c index 081c04eb2c..301402bf0f 100644 --- a/zephyr/projects/intelrvp/mtlrvp/src/board_power.c +++ b/zephyr/projects/intelrvp/mtlrvp/src/board_power.c @@ -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. */ diff --git a/zephyr/projects/intelrvp/mtlrvp/src/mtlrvp.c b/zephyr/projects/intelrvp/mtlrvp/src/mtlrvp.c index 50dffef90b..9d96a08712 100644 --- a/zephyr/projects/intelrvp/mtlrvp/src/mtlrvp.c +++ b/zephyr/projects/intelrvp/mtlrvp/src/mtlrvp.c @@ -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. */ diff --git a/zephyr/projects/intelrvp/mtlrvp/usbc.dts b/zephyr/projects/intelrvp/mtlrvp/usbc.dts index 4a250cb818..e4f3bdc465 100644 --- a/zephyr/projects/intelrvp/mtlrvp/usbc.dts +++ b/zephyr/projects/intelrvp/mtlrvp/usbc.dts @@ -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. */ @@ -13,7 +13,11 @@ reg = <0>; tcpc = <&tcpc_port0>; chg = <&charger>; - usb-muxes = <&usb_c0_hb_retimer &virtual_mux_c0>; + usb-mux-chain-0 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&usb_c0_hb_retimer + &virtual_mux_c0>; + }; }; port0-muxes { virtual_mux_c0: virtual-mux-c0 { @@ -25,7 +29,11 @@ compatible = "named-usbc-port"; reg = <1>; tcpc = <&tcpc_port1>; - usb-muxes = <&usb_c1_hb_retimer &virtual_mux_c1>; + usb-mux-chain-1 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&usb_c1_hb_retimer + &virtual_mux_c1>; + }; }; port1-muxes { virtual_mux_c1: virtual-mux-c1 { @@ -37,7 +45,11 @@ compatible = "named-usbc-port"; reg = <2>; tcpc = <&tcpc_port2>; - usb-muxes = <&usb_c2_hb_retimer &virtual_mux_c2>; + usb-mux-chain-2 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&usb_c2_hb_retimer + &virtual_mux_c2>; + }; }; port2-muxes { virtual_mux_c2: virtual-mux-c2 { @@ -49,7 +61,11 @@ compatible = "named-usbc-port"; reg = <3>; tcpc = <&tcpc_port3>; - usb-muxes = <&usb_c3_hb_retimer &virtual_mux_c3>; + usb-mux-chain-3 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&usb_c3_hb_retimer + &virtual_mux_c3>; + }; }; port3-muxes { virtual_mux_c3: virtual-mux-c3 { diff --git a/zephyr/projects/intelrvp/prj.conf b/zephyr/projects/intelrvp/prj.conf index 3bff9d50e9..305ed90a1b 100644 --- a/zephyr/projects/intelrvp/prj.conf +++ b/zephyr/projects/intelrvp/prj.conf @@ -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. @@ -37,9 +37,9 @@ CONFIG_I2C=y # eSPI CONFIG_ESPI=y -CONFIG_PLATFORM_EC_ESPI_VW_SLP_S3=y -CONFIG_PLATFORM_EC_ESPI_VW_SLP_S4=y -CONFIG_PLATFORM_EC_ESPI_VW_SLP_S5=y +CONFIG_PLATFORM_EC_HOST_INTERFACE_ESPI_VW_SLP_S3=y +CONFIG_PLATFORM_EC_HOST_INTERFACE_ESPI_VW_SLP_S4=y +CONFIG_PLATFORM_EC_HOST_INTERFACE_ESPI_VW_SLP_S5=y # Keyboard CONFIG_PLATFORM_EC_KEYBOARD=y diff --git a/zephyr/projects/intelrvp/src/chg_usb_pd.c b/zephyr/projects/intelrvp/src/chg_usb_pd.c index 9919602877..63a1853b4d 100644 --- a/zephyr/projects/intelrvp/src/chg_usb_pd.c +++ b/zephyr/projects/intelrvp/src/chg_usb_pd.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/intelrvp/src/chg_usb_pd_mecc_1_1.c b/zephyr/projects/intelrvp/src/chg_usb_pd_mecc_1_1.c index 203803e663..45fbbc6f65 100644 --- a/zephyr/projects/intelrvp/src/chg_usb_pd_mecc_1_1.c +++ b/zephyr/projects/intelrvp/src/chg_usb_pd_mecc_1_1.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/intelrvp/src/intel_rvp_board_id.c b/zephyr/projects/intelrvp/src/intel_rvp_board_id.c index ea8e98da3a..77d4e93afd 100644 --- a/zephyr/projects/intelrvp/src/intel_rvp_board_id.c +++ b/zephyr/projects/intelrvp/src/intel_rvp_board_id.c @@ -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. */ diff --git a/zephyr/projects/intelrvp/src/intel_rvp_led.c b/zephyr/projects/intelrvp/src/intel_rvp_led.c index 0ef5b01fcd..0e4d872963 100644 --- a/zephyr/projects/intelrvp/src/intel_rvp_led.c +++ b/zephyr/projects/intelrvp/src/intel_rvp_led.c @@ -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. */ diff --git a/zephyr/projects/intelrvp/src/intelrvp.c b/zephyr/projects/intelrvp/src/intelrvp.c index fd0514f438..7098f26cbf 100644 --- a/zephyr/projects/intelrvp/src/intelrvp.c +++ b/zephyr/projects/intelrvp/src/intelrvp.c @@ -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. */ diff --git a/zephyr/projects/intelrvp/src/usb_pd_policy_mecc_1_1.c b/zephyr/projects/intelrvp/src/usb_pd_policy_mecc_1_1.c index 946521c3a5..a194b358f1 100644 --- a/zephyr/projects/intelrvp/src/usb_pd_policy_mecc_1_1.c +++ b/zephyr/projects/intelrvp/src/usb_pd_policy_mecc_1_1.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/intelrvp/zephyr_ap_pwrseq.conf b/zephyr/projects/intelrvp/zephyr_ap_pwrseq.conf index de84be2eab..1ef365a8fa 100644 --- a/zephyr/projects/intelrvp/zephyr_ap_pwrseq.conf +++ b/zephyr/projects/intelrvp/zephyr_ap_pwrseq.conf @@ -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. diff --git a/zephyr/projects/it8xxx2_evb/BUILD.py b/zephyr/projects/it8xxx2_evb/BUILD.py index 19206183c3..ee89c75390 100644 --- a/zephyr/projects/it8xxx2_evb/BUILD.py +++ b/zephyr/projects/it8xxx2_evb/BUILD.py @@ -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. diff --git a/zephyr/projects/it8xxx2_evb/CMakeLists.txt b/zephyr/projects/it8xxx2_evb/CMakeLists.txt index ca8344aeec..170606a52d 100644 --- a/zephyr/projects/it8xxx2_evb/CMakeLists.txt +++ b/zephyr/projects/it8xxx2_evb/CMakeLists.txt @@ -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. diff --git a/zephyr/projects/it8xxx2_evb/adc.dts b/zephyr/projects/it8xxx2_evb/adc.dts index fb34b54986..509c9b9daf 100644 --- a/zephyr/projects/it8xxx2_evb/adc.dts +++ b/zephyr/projects/it8xxx2_evb/adc.dts @@ -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. */ diff --git a/zephyr/projects/it8xxx2_evb/fan.dts b/zephyr/projects/it8xxx2_evb/fan.dts index 39b02d9a98..2551507ec3 100644 --- a/zephyr/projects/it8xxx2_evb/fan.dts +++ b/zephyr/projects/it8xxx2_evb/fan.dts @@ -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. */ diff --git a/zephyr/projects/it8xxx2_evb/gpio.dts b/zephyr/projects/it8xxx2_evb/gpio.dts index 4376e7bd62..85bb45d7a0 100644 --- a/zephyr/projects/it8xxx2_evb/gpio.dts +++ b/zephyr/projects/it8xxx2_evb/gpio.dts @@ -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. */ diff --git a/zephyr/projects/it8xxx2_evb/i2c.dts b/zephyr/projects/it8xxx2_evb/i2c.dts index 163844c3f6..c08c543e44 100644 --- a/zephyr/projects/it8xxx2_evb/i2c.dts +++ b/zephyr/projects/it8xxx2_evb/i2c.dts @@ -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. */ diff --git a/zephyr/projects/it8xxx2_evb/include/i2c_map.h b/zephyr/projects/it8xxx2_evb/include/i2c_map.h index 49c492f6ba..e83a238d3a 100644 --- a/zephyr/projects/it8xxx2_evb/include/i2c_map.h +++ b/zephyr/projects/it8xxx2_evb/include/i2c_map.h @@ -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. */ diff --git a/zephyr/projects/it8xxx2_evb/interrupts.dts b/zephyr/projects/it8xxx2_evb/interrupts.dts index d52a86ce43..07fc0ed339 100644 --- a/zephyr/projects/it8xxx2_evb/interrupts.dts +++ b/zephyr/projects/it8xxx2_evb/interrupts.dts @@ -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. */ diff --git a/zephyr/projects/it8xxx2_evb/prj.conf b/zephyr/projects/it8xxx2_evb/prj.conf index 37a9e7b5d5..d6d422e490 100644 --- a/zephyr/projects/it8xxx2_evb/prj.conf +++ b/zephyr/projects/it8xxx2_evb/prj.conf @@ -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. diff --git a/zephyr/projects/it8xxx2_evb/pwm.dts b/zephyr/projects/it8xxx2_evb/pwm.dts index bac40fc722..c566e5c029 100644 --- a/zephyr/projects/it8xxx2_evb/pwm.dts +++ b/zephyr/projects/it8xxx2_evb/pwm.dts @@ -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. */ diff --git a/zephyr/projects/minimal/BUILD.py b/zephyr/projects/minimal/BUILD.py index f67064c70f..5e892aa2d7 100644 --- a/zephyr/projects/minimal/BUILD.py +++ b/zephyr/projects/minimal/BUILD.py @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/zephyr/projects/minimal/CMakeLists.txt b/zephyr/projects/minimal/CMakeLists.txt index bb61a7dcd3..de3bec9428 100644 --- a/zephyr/projects/minimal/CMakeLists.txt +++ b/zephyr/projects/minimal/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/zephyr/projects/minimal/it8xxx2.dts b/zephyr/projects/minimal/it8xxx2.dts index 46efc9ca56..3d2028afb2 100644 --- a/zephyr/projects/minimal/it8xxx2.dts +++ b/zephyr/projects/minimal/it8xxx2.dts @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/minimal/npcx9.dts b/zephyr/projects/minimal/npcx9.dts index 825e2db6db..3a9f3b26e4 100644 --- a/zephyr/projects/minimal/npcx9.dts +++ b/zephyr/projects/minimal/npcx9.dts @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/minimal/prj.conf b/zephyr/projects/minimal/prj.conf index 0b810096b4..db7cac0cef 100644 --- a/zephyr/projects/minimal/prj.conf +++ b/zephyr/projects/minimal/prj.conf @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/zephyr/projects/nissa/BUILD.py b/zephyr/projects/nissa/BUILD.py index 10c52951a8..93ef8277da 100644 --- a/zephyr/projects/nissa/BUILD.py +++ b/zephyr/projects/nissa/BUILD.py @@ -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. @@ -117,6 +117,5 @@ yaviks = register_nissa_project( "overlay.dts", "keyboard.dts", "power_signals.dts", - "pwm_leds.dts", ], ) diff --git a/zephyr/projects/nissa/CMakeLists.txt b/zephyr/projects/nissa/CMakeLists.txt index 6783ceb006..2907d969b3 100644 --- a/zephyr/projects/nissa/CMakeLists.txt +++ b/zephyr/projects/nissa/CMakeLists.txt @@ -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. @@ -74,7 +74,7 @@ endif() if(DEFINED CONFIG_BOARD_YAVIKS) project(yaviks) zephyr_library_sources( - "src/led.c" + "yaviks/src/led.c" "yaviks/src/keyboard.c" "yaviks/src/hdmi.c" ) diff --git a/zephyr/projects/nissa/Kconfig b/zephyr/projects/nissa/Kconfig index 0cc8bd5966..9e9ffc2528 100644 --- a/zephyr/projects/nissa/Kconfig +++ b/zephyr/projects/nissa/Kconfig @@ -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. diff --git a/zephyr/projects/nissa/cbi.dts b/zephyr/projects/nissa/cbi.dts index ec6d8ea608..d841be1624 100644 --- a/zephyr/projects/nissa/cbi.dts +++ b/zephyr/projects/nissa/cbi.dts @@ -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. */ diff --git a/zephyr/projects/nissa/craask/cbi.dts b/zephyr/projects/nissa/craask/cbi.dts index ed61c3fc85..de17bb1db9 100644 --- a/zephyr/projects/nissa/craask/cbi.dts +++ b/zephyr/projects/nissa/craask/cbi.dts @@ -1,4 +1,4 @@ -/* Copyright 2022 The Chromium OS Authors. +/* 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. */ diff --git a/zephyr/projects/nissa/craask/generated.dts b/zephyr/projects/nissa/craask/generated.dts index a96e6c5872..af65b98d02 100644 --- a/zephyr/projects/nissa/craask/generated.dts +++ b/zephyr/projects/nissa/craask/generated.dts @@ -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. * diff --git a/zephyr/projects/nissa/craask/keyboard.dts b/zephyr/projects/nissa/craask/keyboard.dts index d3fd354b8f..f9e46de1f2 100644 --- a/zephyr/projects/nissa/craask/keyboard.dts +++ b/zephyr/projects/nissa/craask/keyboard.dts @@ -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. */ diff --git a/zephyr/projects/nissa/craask/motionsense.dts b/zephyr/projects/nissa/craask/motionsense.dts index 29e9efc923..448aed6991 100644 --- a/zephyr/projects/nissa/craask/motionsense.dts +++ b/zephyr/projects/nissa/craask/motionsense.dts @@ -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. */ diff --git a/zephyr/projects/nissa/craask/overlay.dts b/zephyr/projects/nissa/craask/overlay.dts index 24cce5b561..3c54941e9c 100644 --- a/zephyr/projects/nissa/craask/overlay.dts +++ b/zephyr/projects/nissa/craask/overlay.dts @@ -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. */ @@ -212,7 +212,10 @@ reg = <0>; bc12 = <&bc12_port0>; chg = <&chg_port0>; - usb-muxes = <&virtual_mux_0>; + usb-mux-chain-0 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&virtual_mux_0>; + }; }; port0-muxes { virtual_mux_0: virtual-mux-0 { @@ -228,11 +231,15 @@ reg = <1>; bc12 = <&bc12_port1>; chg = <&chg_port1>; - /* - * Some sub-boards may disable all usb muxes in chain - * except virtual_mux_1 - */ - usb-muxes = <&virtual_mux_1 &anx7483_mux_1>; + usb-mux-chain-1 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&virtual_mux_1 &anx7483_mux_1>; + }; + usb_mux_chain_1_no_mux: usb-mux-chain-1-no-mux { + compatible = "cros-ec,usb-mux-chain"; + alternative-chain; + usb-muxes = <&virtual_mux_1>; + }; }; port1-muxes { virtual_mux_1: virtual-mux-1 { diff --git a/zephyr/projects/nissa/craask/power_signals.dts b/zephyr/projects/nissa/craask/power_signals.dts index 91876f0402..1d2b23069d 100644 --- a/zephyr/projects/nissa/craask/power_signals.dts +++ b/zephyr/projects/nissa/craask/power_signals.dts @@ -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. */ diff --git a/zephyr/projects/nissa/craask/prj.conf b/zephyr/projects/nissa/craask/prj.conf index 88a439cbd3..d7af32bda5 100644 --- a/zephyr/projects/nissa/craask/prj.conf +++ b/zephyr/projects/nissa/craask/prj.conf @@ -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. @@ -22,6 +22,10 @@ CONFIG_PLATFORM_EC_ACCELGYRO_BMI3XX=y CONFIG_CROS_KB_RAW_NPCX=y CONFIG_PLATFORM_EC_KBLIGHT_ENABLE_PIN=y +# Ensure recovery key combination (esc+refresh+power) is reliable: b/245550574 +CONFIG_PLATFORM_EC_KEYBOARD_PWRBTN_ASSERTS_KSI3=y +CONFIG_PLATFORM_EC_KEYBOARD_REFRESH_ROW3=y + # TCPC+PPC: both C0 and C1 (if present) are RAA489000 CONFIG_PLATFORM_EC_USB_PD_TCPM_RAA489000=y CONFIG_PLATFORM_EC_USB_PD_DISCHARGE_TCPC=y diff --git a/zephyr/projects/nissa/craask/pwm_leds.dts b/zephyr/projects/nissa/craask/pwm_leds.dts index c68d93824f..e55aa1c9ef 100644 --- a/zephyr/projects/nissa/craask/pwm_leds.dts +++ b/zephyr/projects/nissa/craask/pwm_leds.dts @@ -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. */ diff --git a/zephyr/projects/nissa/craask/src/charger.c b/zephyr/projects/nissa/craask/src/charger.c index 3fbbabec6b..d4723e4a0a 100644 --- a/zephyr/projects/nissa/craask/src/charger.c +++ b/zephyr/projects/nissa/craask/src/charger.c @@ -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. */ diff --git a/zephyr/projects/nissa/craask/src/form_factor.c b/zephyr/projects/nissa/craask/src/form_factor.c index 51e6e39f2c..7c642119f1 100644 --- a/zephyr/projects/nissa/craask/src/form_factor.c +++ b/zephyr/projects/nissa/craask/src/form_factor.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/nissa/craask/src/keyboard.c b/zephyr/projects/nissa/craask/src/keyboard.c index 449e7b16b2..65229eb43f 100644 --- a/zephyr/projects/nissa/craask/src/keyboard.c +++ b/zephyr/projects/nissa/craask/src/keyboard.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/nissa/craask/src/led.c b/zephyr/projects/nissa/craask/src/led.c index fbe5c88218..0af0202cf4 100644 --- a/zephyr/projects/nissa/craask/src/led.c +++ b/zephyr/projects/nissa/craask/src/led.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. * diff --git a/zephyr/projects/nissa/craask/src/usbc.c b/zephyr/projects/nissa/craask/src/usbc.c index dcf613bd4b..a15460a212 100644 --- a/zephyr/projects/nissa/craask/src/usbc.c +++ b/zephyr/projects/nissa/craask/src/usbc.c @@ -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. */ diff --git a/zephyr/projects/nissa/include/nissa_common.h b/zephyr/projects/nissa/include/nissa_common.h index 8561d4825c..7cdaba2e50 100644 --- a/zephyr/projects/nissa/include/nissa_common.h +++ b/zephyr/projects/nissa/include/nissa_common.h @@ -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. */ @@ -18,8 +18,6 @@ enum nissa_sub_board_type { NISSA_SB_HDMI_A = 3, /* HDMI, USB type A */ }; -extern struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT]; - enum nissa_sub_board_type nissa_get_sb_type(void); #endif /* __CROS_EC_NISSA_NISSA_COMMON_H__ */ diff --git a/zephyr/projects/nissa/include/nissa_hdmi.h b/zephyr/projects/nissa/include/nissa_hdmi.h index 02be6c5ac9..9f2f533ba7 100644 --- a/zephyr/projects/nissa/include/nissa_hdmi.h +++ b/zephyr/projects/nissa/include/nissa_hdmi.h @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/nissa/joxer/cbi.dts b/zephyr/projects/nissa/joxer/cbi.dts index 7a91ab6aa9..afbd125b32 100644 --- a/zephyr/projects/nissa/joxer/cbi.dts +++ b/zephyr/projects/nissa/joxer/cbi.dts @@ -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. */ diff --git a/zephyr/projects/nissa/joxer/generated.dts b/zephyr/projects/nissa/joxer/generated.dts index cf789d7eab..22214b9726 100644 --- a/zephyr/projects/nissa/joxer/generated.dts +++ b/zephyr/projects/nissa/joxer/generated.dts @@ -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. * diff --git a/zephyr/projects/nissa/joxer/keyboard.dts b/zephyr/projects/nissa/joxer/keyboard.dts index b9e9c21707..bf0b098c62 100644 --- a/zephyr/projects/nissa/joxer/keyboard.dts +++ b/zephyr/projects/nissa/joxer/keyboard.dts @@ -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. */ diff --git a/zephyr/projects/nissa/joxer/motionsense.dts b/zephyr/projects/nissa/joxer/motionsense.dts index 137b71cdfd..537cc34451 100644 --- a/zephyr/projects/nissa/joxer/motionsense.dts +++ b/zephyr/projects/nissa/joxer/motionsense.dts @@ -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. */ diff --git a/zephyr/projects/nissa/joxer/overlay.dts b/zephyr/projects/nissa/joxer/overlay.dts index 4747a9b0e2..e0b7422edd 100644 --- a/zephyr/projects/nissa/joxer/overlay.dts +++ b/zephyr/projects/nissa/joxer/overlay.dts @@ -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. */ @@ -238,7 +238,10 @@ reg = <0>; bc12 = <&bc12_port0>; chg = <&chg_port0>; - usb-muxes = <&virtual_mux_0>; + usb-mux-chain-0 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&virtual_mux_0>; + }; }; port0-muxes { virtual_mux_0: virtual-mux-0 { @@ -250,11 +253,15 @@ reg = <1>; bc12 = <&bc12_port1>; chg = <&chg_port1>; - /* - * Some sub-boards may disable all usb muxes in chain - * except virtual_mux_1 - */ - usb-muxes = <&virtual_mux_1 &tcpci_mux_1>; + usb-mux-chain-1 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&virtual_mux_1 &tcpci_mux_1>; + }; + usb_mux_chain_1_no_mux: usb-mux-chain-1-no-mux { + compatible = "cros-ec,usb-mux-chain"; + alternative-chain; + usb-muxes = <&virtual_mux_1>; + }; }; port1-muxes { virtual_mux_1: virtual-mux-1 { diff --git a/zephyr/projects/nissa/joxer/power_signals.dts b/zephyr/projects/nissa/joxer/power_signals.dts index 0f10bba52f..8affae03b1 100644 --- a/zephyr/projects/nissa/joxer/power_signals.dts +++ b/zephyr/projects/nissa/joxer/power_signals.dts @@ -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. */ diff --git a/zephyr/projects/nissa/joxer/prj.conf b/zephyr/projects/nissa/joxer/prj.conf index c3b39b0424..c623a4f672 100644 --- a/zephyr/projects/nissa/joxer/prj.conf +++ b/zephyr/projects/nissa/joxer/prj.conf @@ -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. diff --git a/zephyr/projects/nissa/joxer/pwm_leds.dts b/zephyr/projects/nissa/joxer/pwm_leds.dts index bdeada2a82..aa4a76b271 100644 --- a/zephyr/projects/nissa/joxer/pwm_leds.dts +++ b/zephyr/projects/nissa/joxer/pwm_leds.dts @@ -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. */ diff --git a/zephyr/projects/nissa/joxer/src/charger.c b/zephyr/projects/nissa/joxer/src/charger.c index ff350b44da..b9454d8b80 100644 --- a/zephyr/projects/nissa/joxer/src/charger.c +++ b/zephyr/projects/nissa/joxer/src/charger.c @@ -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. */ diff --git a/zephyr/projects/nissa/joxer/src/fan.c b/zephyr/projects/nissa/joxer/src/fan.c index 8abeb95b39..6d234b2fc3 100644 --- a/zephyr/projects/nissa/joxer/src/fan.c +++ b/zephyr/projects/nissa/joxer/src/fan.c @@ -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. */ diff --git a/zephyr/projects/nissa/joxer/src/keyboard.c b/zephyr/projects/nissa/joxer/src/keyboard.c index fb627549b4..48db40f53f 100644 --- a/zephyr/projects/nissa/joxer/src/keyboard.c +++ b/zephyr/projects/nissa/joxer/src/keyboard.c @@ -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. */ diff --git a/zephyr/projects/nissa/joxer/src/led.c b/zephyr/projects/nissa/joxer/src/led.c index 91c6b8e118..d66e5b27a6 100644 --- a/zephyr/projects/nissa/joxer/src/led.c +++ b/zephyr/projects/nissa/joxer/src/led.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. * diff --git a/zephyr/projects/nissa/joxer/src/usbc.c b/zephyr/projects/nissa/joxer/src/usbc.c index 6ee939e47a..5fec9ab544 100644 --- a/zephyr/projects/nissa/joxer/src/usbc.c +++ b/zephyr/projects/nissa/joxer/src/usbc.c @@ -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. */ diff --git a/zephyr/projects/nissa/nereid/generated.dts b/zephyr/projects/nissa/nereid/generated.dts index 1a043d188d..bca58c478e 100644 --- a/zephyr/projects/nissa/nereid/generated.dts +++ b/zephyr/projects/nissa/nereid/generated.dts @@ -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. * diff --git a/zephyr/projects/nissa/nereid/keyboard.dts b/zephyr/projects/nissa/nereid/keyboard.dts index b9e9c21707..bf0b098c62 100644 --- a/zephyr/projects/nissa/nereid/keyboard.dts +++ b/zephyr/projects/nissa/nereid/keyboard.dts @@ -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. */ diff --git a/zephyr/projects/nissa/nereid/motionsense.dts b/zephyr/projects/nissa/nereid/motionsense.dts index 3f589d132f..3a560d512a 100644 --- a/zephyr/projects/nissa/nereid/motionsense.dts +++ b/zephyr/projects/nissa/nereid/motionsense.dts @@ -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. */ diff --git a/zephyr/projects/nissa/nereid/overlay.dts b/zephyr/projects/nissa/nereid/overlay.dts index 4ffcd22f3c..a6fab925d8 100644 --- a/zephyr/projects/nissa/nereid/overlay.dts +++ b/zephyr/projects/nissa/nereid/overlay.dts @@ -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. */ @@ -209,7 +209,10 @@ reg = <0>; bc12 = <&bc12_port0>; chg = <&chg_port0>; - usb-muxes = <&virtual_mux_0>; + usb-mux-chain-0 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&virtual_mux_0>; + }; }; port0-muxes { virtual_mux_0: virtual-mux-0 { @@ -221,11 +224,15 @@ reg = <1>; bc12 = <&bc12_port1>; chg = <&chg_port1>; - /* - * Some sub-boards may disable all usb muxes in chain - * except virtual_mux_1 - */ - usb-muxes = <&virtual_mux_1 &tcpci_mux_1>; + usb-mux-chain-1 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&virtual_mux_1 &tcpci_mux_1>; + }; + usb_mux_chain_1_no_mux: usb-mux-chain-1-no-mux { + compatible = "cros-ec,usb-mux-chain"; + alternative-chain; + usb-muxes = <&virtual_mux_1>; + }; }; port1-muxes { virtual_mux_1: virtual-mux-1 { diff --git a/zephyr/projects/nissa/nereid/power_signals.dts b/zephyr/projects/nissa/nereid/power_signals.dts index 0f10bba52f..8affae03b1 100644 --- a/zephyr/projects/nissa/nereid/power_signals.dts +++ b/zephyr/projects/nissa/nereid/power_signals.dts @@ -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. */ diff --git a/zephyr/projects/nissa/nereid/prj.conf b/zephyr/projects/nissa/nereid/prj.conf index 9cafe43216..3983163c46 100644 --- a/zephyr/projects/nissa/nereid/prj.conf +++ b/zephyr/projects/nissa/nereid/prj.conf @@ -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. diff --git a/zephyr/projects/nissa/nereid/pwm_leds.dts b/zephyr/projects/nissa/nereid/pwm_leds.dts index bdeada2a82..aa4a76b271 100644 --- a/zephyr/projects/nissa/nereid/pwm_leds.dts +++ b/zephyr/projects/nissa/nereid/pwm_leds.dts @@ -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. */ diff --git a/zephyr/projects/nissa/nereid/src/charger.c b/zephyr/projects/nissa/nereid/src/charger.c index a494988951..181e9a61fd 100644 --- a/zephyr/projects/nissa/nereid/src/charger.c +++ b/zephyr/projects/nissa/nereid/src/charger.c @@ -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. */ diff --git a/zephyr/projects/nissa/nereid/src/hdmi.c b/zephyr/projects/nissa/nereid/src/hdmi.c index 4185d3bc5e..7e5708c6eb 100644 --- a/zephyr/projects/nissa/nereid/src/hdmi.c +++ b/zephyr/projects/nissa/nereid/src/hdmi.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/nissa/nereid/src/keyboard.c b/zephyr/projects/nissa/nereid/src/keyboard.c index 0671b6570d..b69bb4da33 100644 --- a/zephyr/projects/nissa/nereid/src/keyboard.c +++ b/zephyr/projects/nissa/nereid/src/keyboard.c @@ -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. */ diff --git a/zephyr/projects/nissa/nereid/src/usbc.c b/zephyr/projects/nissa/nereid/src/usbc.c index 7ba97e9bfd..48f7cfd9cb 100644 --- a/zephyr/projects/nissa/nereid/src/usbc.c +++ b/zephyr/projects/nissa/nereid/src/usbc.c @@ -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. */ diff --git a/zephyr/projects/nissa/nivviks/cbi.dts b/zephyr/projects/nissa/nivviks/cbi.dts index d8cc34ce77..112a2a885c 100644 --- a/zephyr/projects/nissa/nivviks/cbi.dts +++ b/zephyr/projects/nissa/nivviks/cbi.dts @@ -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. */ diff --git a/zephyr/projects/nissa/nivviks/generated.dts b/zephyr/projects/nissa/nivviks/generated.dts index d46da9d530..91718302b4 100644 --- a/zephyr/projects/nissa/nivviks/generated.dts +++ b/zephyr/projects/nissa/nivviks/generated.dts @@ -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. * diff --git a/zephyr/projects/nissa/nivviks/keyboard.dts b/zephyr/projects/nissa/nivviks/keyboard.dts index ee5dd6d085..00610e4e18 100644 --- a/zephyr/projects/nissa/nivviks/keyboard.dts +++ b/zephyr/projects/nissa/nivviks/keyboard.dts @@ -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. */ diff --git a/zephyr/projects/nissa/nivviks/motionsense.dts b/zephyr/projects/nissa/nivviks/motionsense.dts index d15e7aeaef..6297a07bf5 100644 --- a/zephyr/projects/nissa/nivviks/motionsense.dts +++ b/zephyr/projects/nissa/nivviks/motionsense.dts @@ -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. */ diff --git a/zephyr/projects/nissa/nivviks/overlay.dts b/zephyr/projects/nissa/nivviks/overlay.dts index 3bae19e274..bb32f098e8 100644 --- a/zephyr/projects/nissa/nivviks/overlay.dts +++ b/zephyr/projects/nissa/nivviks/overlay.dts @@ -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. */ @@ -213,7 +213,10 @@ reg = <0>; bc12 = <&bc12_port0>; chg = <&chg_port0>; - usb-muxes = <&virtual_mux_0>; + usb-mux-chain-0 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&virtual_mux_0>; + }; }; port0-muxes { virtual_mux_0: virtual-mux-0 { @@ -229,11 +232,15 @@ reg = <1>; bc12 = <&bc12_port1>; chg = <&chg_port1>; - /* - * Some sub-boards may disable all usb muxes in chain - * except virtual_mux_1 - */ - usb-muxes = <&virtual_mux_1 &anx7483_mux_1>; + usb-mux-chain-1 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&virtual_mux_1 &anx7483_mux_1>; + }; + usb_mux_chain_1_no_mux: usb-mux-chain-1-no-mux { + compatible = "cros-ec,usb-mux-chain"; + alternative-chain; + usb-muxes = <&virtual_mux_1>; + }; }; port1-muxes { virtual_mux_1: virtual-mux-1 { diff --git a/zephyr/projects/nissa/nivviks/power_signals.dts b/zephyr/projects/nissa/nivviks/power_signals.dts index 91876f0402..1d2b23069d 100644 --- a/zephyr/projects/nissa/nivviks/power_signals.dts +++ b/zephyr/projects/nissa/nivviks/power_signals.dts @@ -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. */ diff --git a/zephyr/projects/nissa/nivviks/prj.conf b/zephyr/projects/nissa/nivviks/prj.conf index b6b026e571..1a38a3adec 100644 --- a/zephyr/projects/nissa/nivviks/prj.conf +++ b/zephyr/projects/nissa/nivviks/prj.conf @@ -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. diff --git a/zephyr/projects/nissa/nivviks/pwm_leds.dts b/zephyr/projects/nissa/nivviks/pwm_leds.dts index 031bcea5ef..a265a5929e 100644 --- a/zephyr/projects/nissa/nivviks/pwm_leds.dts +++ b/zephyr/projects/nissa/nivviks/pwm_leds.dts @@ -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. */ diff --git a/zephyr/projects/nissa/nivviks/src/charger.c b/zephyr/projects/nissa/nivviks/src/charger.c index 5a8bbe0e7a..e2f9f966e7 100644 --- a/zephyr/projects/nissa/nivviks/src/charger.c +++ b/zephyr/projects/nissa/nivviks/src/charger.c @@ -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. */ diff --git a/zephyr/projects/nissa/nivviks/src/fan.c b/zephyr/projects/nissa/nivviks/src/fan.c index 95f3a32935..840049722c 100644 --- a/zephyr/projects/nissa/nivviks/src/fan.c +++ b/zephyr/projects/nissa/nivviks/src/fan.c @@ -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. */ diff --git a/zephyr/projects/nissa/nivviks/src/form_factor.c b/zephyr/projects/nissa/nivviks/src/form_factor.c index 018ed2b959..602b22baff 100644 --- a/zephyr/projects/nissa/nivviks/src/form_factor.c +++ b/zephyr/projects/nissa/nivviks/src/form_factor.c @@ -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. */ diff --git a/zephyr/projects/nissa/nivviks/src/keyboard.c b/zephyr/projects/nissa/nivviks/src/keyboard.c index 406ea246b4..f13d5bf78c 100644 --- a/zephyr/projects/nissa/nivviks/src/keyboard.c +++ b/zephyr/projects/nissa/nivviks/src/keyboard.c @@ -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. */ diff --git a/zephyr/projects/nissa/nivviks/src/led.c b/zephyr/projects/nissa/nivviks/src/led.c index 4a6cc8cab9..c0e4645326 100644 --- a/zephyr/projects/nissa/nivviks/src/led.c +++ b/zephyr/projects/nissa/nivviks/src/led.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. * diff --git a/zephyr/projects/nissa/nivviks/src/usbc.c b/zephyr/projects/nissa/nivviks/src/usbc.c index 651a18c21c..14fc5a071d 100644 --- a/zephyr/projects/nissa/nivviks/src/usbc.c +++ b/zephyr/projects/nissa/nivviks/src/usbc.c @@ -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. */ diff --git a/zephyr/projects/nissa/prj.conf b/zephyr/projects/nissa/prj.conf index 9c30396fe8..e86271959b 100644 --- a/zephyr/projects/nissa/prj.conf +++ b/zephyr/projects/nissa/prj.conf @@ -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. @@ -39,8 +39,8 @@ CONFIG_AP=y CONFIG_AP_X86_INTEL_ADL=y CONFIG_ESPI=y CONFIG_ESPI_LOG_LEVEL_ERR=y -CONFIG_PLATFORM_EC_ESPI_VW_SLP_S4=y -CONFIG_PLATFORM_EC_ESPI_VW_SLP_S5=y +CONFIG_PLATFORM_EC_HOST_INTERFACE_ESPI_VW_SLP_S4=y +CONFIG_PLATFORM_EC_HOST_INTERFACE_ESPI_VW_SLP_S5=y CONFIG_PLATFORM_EC_HOSTCMD=y CONFIG_HCDEBUG_OFF=y CONFIG_PLATFORM_EC_THROTTLE_AP=y diff --git a/zephyr/projects/nissa/pujjo/cbi.dts b/zephyr/projects/nissa/pujjo/cbi.dts index 7b4653ab16..8ababf7a9c 100644 --- a/zephyr/projects/nissa/pujjo/cbi.dts +++ b/zephyr/projects/nissa/pujjo/cbi.dts @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/nissa/pujjo/generated.dts b/zephyr/projects/nissa/pujjo/generated.dts index 219af0db35..e6dd7bf5a3 100644 --- a/zephyr/projects/nissa/pujjo/generated.dts +++ b/zephyr/projects/nissa/pujjo/generated.dts @@ -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. * diff --git a/zephyr/projects/nissa/pujjo/keyboard.dts b/zephyr/projects/nissa/pujjo/keyboard.dts index ee5dd6d085..00610e4e18 100644 --- a/zephyr/projects/nissa/pujjo/keyboard.dts +++ b/zephyr/projects/nissa/pujjo/keyboard.dts @@ -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. */ diff --git a/zephyr/projects/nissa/pujjo/motionsense.dts b/zephyr/projects/nissa/pujjo/motionsense.dts index 3f589d132f..3a560d512a 100644 --- a/zephyr/projects/nissa/pujjo/motionsense.dts +++ b/zephyr/projects/nissa/pujjo/motionsense.dts @@ -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. */ diff --git a/zephyr/projects/nissa/pujjo/overlay.dts b/zephyr/projects/nissa/pujjo/overlay.dts index e108225a91..27b386d910 100644 --- a/zephyr/projects/nissa/pujjo/overlay.dts +++ b/zephyr/projects/nissa/pujjo/overlay.dts @@ -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. */ @@ -203,7 +203,10 @@ reg = <0>; bc12 = <&bc12_port0>; chg = <&chg_port0>; - usb-muxes = <&virtual_mux_0>; + usb-mux-chain-0 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&virtual_mux_0>; + }; }; port0-muxes { virtual_mux_0: virtual-mux-0 { diff --git a/zephyr/projects/nissa/pujjo/power_signals.dts b/zephyr/projects/nissa/pujjo/power_signals.dts index 91876f0402..1d2b23069d 100644 --- a/zephyr/projects/nissa/pujjo/power_signals.dts +++ b/zephyr/projects/nissa/pujjo/power_signals.dts @@ -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. */ diff --git a/zephyr/projects/nissa/pujjo/prj.conf b/zephyr/projects/nissa/pujjo/prj.conf index 68a0152dea..f9db19d51d 100644 --- a/zephyr/projects/nissa/pujjo/prj.conf +++ b/zephyr/projects/nissa/pujjo/prj.conf @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/zephyr/projects/nissa/pujjo/src/charger.c b/zephyr/projects/nissa/pujjo/src/charger.c index 4c6c4061f8..c091e8cf42 100644 --- a/zephyr/projects/nissa/pujjo/src/charger.c +++ b/zephyr/projects/nissa/pujjo/src/charger.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/nissa/pujjo/src/fan.c b/zephyr/projects/nissa/pujjo/src/fan.c index 1884380de8..97323a7edf 100644 --- a/zephyr/projects/nissa/pujjo/src/fan.c +++ b/zephyr/projects/nissa/pujjo/src/fan.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/nissa/pujjo/src/hdmi.c b/zephyr/projects/nissa/pujjo/src/hdmi.c index 9aa14d4bde..9461e7c53e 100644 --- a/zephyr/projects/nissa/pujjo/src/hdmi.c +++ b/zephyr/projects/nissa/pujjo/src/hdmi.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/nissa/pujjo/src/keyboard.c b/zephyr/projects/nissa/pujjo/src/keyboard.c index 8ee178a4e4..1587030080 100644 --- a/zephyr/projects/nissa/pujjo/src/keyboard.c +++ b/zephyr/projects/nissa/pujjo/src/keyboard.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/nissa/pujjo/src/led.c b/zephyr/projects/nissa/pujjo/src/led.c index 4139fb39d4..0ff36b7d97 100644 --- a/zephyr/projects/nissa/pujjo/src/led.c +++ b/zephyr/projects/nissa/pujjo/src/led.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/nissa/pujjo/src/usbc.c b/zephyr/projects/nissa/pujjo/src/usbc.c index d7dc4be290..5d3d94c243 100644 --- a/zephyr/projects/nissa/pujjo/src/usbc.c +++ b/zephyr/projects/nissa/pujjo/src/usbc.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/nissa/src/board_power.c b/zephyr/projects/nissa/src/board_power.c index c881ea50e6..d7fb4aeffe 100644 --- a/zephyr/projects/nissa/src/board_power.c +++ b/zephyr/projects/nissa/src/board_power.c @@ -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. */ diff --git a/zephyr/projects/nissa/src/common.c b/zephyr/projects/nissa/src/common.c index c752b96295..fe25d1374d 100644 --- a/zephyr/projects/nissa/src/common.c +++ b/zephyr/projects/nissa/src/common.c @@ -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. */ diff --git a/zephyr/projects/nissa/src/led.c b/zephyr/projects/nissa/src/led.c index cd24991722..2617d0092d 100644 --- a/zephyr/projects/nissa/src/led.c +++ b/zephyr/projects/nissa/src/led.c @@ -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. * diff --git a/zephyr/projects/nissa/src/sub_board.c b/zephyr/projects/nissa/src/sub_board.c index d0f4b8433b..89a9954037 100644 --- a/zephyr/projects/nissa/src/sub_board.c +++ b/zephyr/projects/nissa/src/sub_board.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ @@ -18,6 +18,7 @@ #include "hooks.h" #include "usb_charge.h" #include "usb_pd.h" +#include "usbc/usb_muxes.h" #include "task.h" #include "nissa_common.h" @@ -180,7 +181,7 @@ static void nereid_subboard_config(void) GPIO_INPUT | GPIO_PULL_UP); } else { /* Port doesn't exist, doesn't need muxing */ - usb_muxes[1].next_mux = NULL; + USB_MUX_ENABLE_ALTERNATIVE(usb_mux_chain_1_no_mux); } #endif diff --git a/zephyr/projects/nissa/xivu/cbi.dts b/zephyr/projects/nissa/xivu/cbi.dts index 18056730b5..4149ea291c 100644 --- a/zephyr/projects/nissa/xivu/cbi.dts +++ b/zephyr/projects/nissa/xivu/cbi.dts @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/nissa/xivu/generated.dts b/zephyr/projects/nissa/xivu/generated.dts index 48f3f09309..383054adf8 100644 --- a/zephyr/projects/nissa/xivu/generated.dts +++ b/zephyr/projects/nissa/xivu/generated.dts @@ -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. * diff --git a/zephyr/projects/nissa/xivu/keyboard.dts b/zephyr/projects/nissa/xivu/keyboard.dts index e97165cc92..5248c4aaff 100644 --- a/zephyr/projects/nissa/xivu/keyboard.dts +++ b/zephyr/projects/nissa/xivu/keyboard.dts @@ -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. */ diff --git a/zephyr/projects/nissa/xivu/led_pins.dts b/zephyr/projects/nissa/xivu/led_pins.dts index fb0a6aef73..d85004a0c9 100644 --- a/zephyr/projects/nissa/xivu/led_pins.dts +++ b/zephyr/projects/nissa/xivu/led_pins.dts @@ -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. */ diff --git a/zephyr/projects/nissa/xivu/led_policy.dts b/zephyr/projects/nissa/xivu/led_policy.dts index 5bb9869ba6..3f7efcf1bf 100644 --- a/zephyr/projects/nissa/xivu/led_policy.dts +++ b/zephyr/projects/nissa/xivu/led_policy.dts @@ -1,20 +1,32 @@ -#include <dt-bindings/battery.h> - / { led-colors { compatible = "cros-ec,led-policy"; power-state-charge { charge-state = "PWR_STATE_CHARGE"; + /* Battery percent range (>= Empty, <= 94%) */ + batt-lvl = <0 94>; color-0 { led-color = <&color_amber>; }; }; + power-state-near-full { + charge-state = "PWR_STATE_CHARGE"; + /* Battery percent range (>= 95%, <= Full) */ + batt-lvl = <95 100>; + + color-0 { + led-color = <&color_white>; + }; + }; + power-state-discharge-s0 { charge-state = "PWR_STATE_DISCHARGE"; chipset-state = "POWER_S0"; + /* Battery percent range (>= 11%, <= Full) */ + batt-lvl = <11 100>; color-0 { led-color = <&color_white>; @@ -45,19 +57,11 @@ }; }; - power-state-near-full { - charge-state = "PWR_STATE_CHARGE_NEAR_FULL"; - - color-0 { - led-color = <&color_white>; - }; - }; - - power-state-charge-s0-batt-low { - charge-state = "PWR_STATE_CHARGE"; + power-state-discharge-s0-batt-low { + charge-state = "PWR_STATE_DISCHARGE"; chipset-state = "POWER_S0"; - /* Battery percent range (>= Empty, <= Low) */ - batt-lvl = <BATTERY_LEVEL_EMPTY BATTERY_LEVEL_LOW>; + /* Battery percent range (>= Empty, <= 10%) */ + batt-lvl = <0 10>; /* Amber 1 sec, off 3 sec */ color-0 { @@ -70,34 +74,6 @@ }; }; - power-state-charge-s3-batt-low { - charge-state = "PWR_STATE_CHARGE"; - chipset-state = "POWER_S3"; - /* Battery percent range (>= Empty, <= Low) */ - batt-lvl = <BATTERY_LEVEL_EMPTY BATTERY_LEVEL_LOW>; - - /* White 1 sec, off 3 sec */ - color-0 { - led-color = <&color_white>; - period-ms = <1000>; - }; - color-1 { - led-color = <&color_off>; - period-ms = <3000>; - }; - }; - - power-state-charge-s5-batt-low { - charge-state = "PWR_STATE_CHARGE"; - chipset-state = "POWER_S5"; - /* Battery percent range (>= Empty, <= Low) */ - batt-lvl = <BATTERY_LEVEL_EMPTY BATTERY_LEVEL_LOW>; - - color-0 { - led-color = <&color_off>; - }; - }; - power-state-error-s0 { charge-state = "PWR_STATE_ERROR"; chipset-state = "POWER_S0"; diff --git a/zephyr/projects/nissa/xivu/motionsense.dts b/zephyr/projects/nissa/xivu/motionsense.dts index c7c0fd2ae3..332252c4ef 100644 --- a/zephyr/projects/nissa/xivu/motionsense.dts +++ b/zephyr/projects/nissa/xivu/motionsense.dts @@ -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. */ diff --git a/zephyr/projects/nissa/xivu/overlay.dts b/zephyr/projects/nissa/xivu/overlay.dts index cc8d6350e4..2c7f685502 100644 --- a/zephyr/projects/nissa/xivu/overlay.dts +++ b/zephyr/projects/nissa/xivu/overlay.dts @@ -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. */ @@ -203,7 +203,10 @@ reg = <0>; bc12 = <&bc12_port0>; chg = <&chg_port0>; - usb-muxes = <&virtual_mux_0>; + usb-mux-chain-0 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&virtual_mux_0>; + }; }; port0-muxes { virtual_mux_0: virtual-mux-0 { @@ -219,11 +222,15 @@ reg = <1>; bc12 = <&bc12_port1>; chg = <&chg_port1>; - /* - * Some sub-boards may disable all usb muxes in chain - * except virtual_mux_1 - */ - usb-muxes = <&virtual_mux_1 &anx7483_mux_1>; + usb-mux-chain-1 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&virtual_mux_1 &anx7483_mux_1>; + }; + usb_mux_chain_1_no_mux: usb-mux-chain-1-no-mux { + compatible = "cros-ec,usb-mux-chain"; + alternative-chain; + usb-muxes = <&virtual_mux_1>; + }; }; port1-muxes { virtual_mux_1: virtual-mux-1 { diff --git a/zephyr/projects/nissa/xivu/power_signals.dts b/zephyr/projects/nissa/xivu/power_signals.dts index 91876f0402..1d2b23069d 100644 --- a/zephyr/projects/nissa/xivu/power_signals.dts +++ b/zephyr/projects/nissa/xivu/power_signals.dts @@ -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. */ diff --git a/zephyr/projects/nissa/xivu/prj.conf b/zephyr/projects/nissa/xivu/prj.conf index 9527f59954..83845fdba5 100644 --- a/zephyr/projects/nissa/xivu/prj.conf +++ b/zephyr/projects/nissa/xivu/prj.conf @@ -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. diff --git a/zephyr/projects/nissa/xivu/src/charger.c b/zephyr/projects/nissa/xivu/src/charger.c index 87b247196d..5021a55758 100644 --- a/zephyr/projects/nissa/xivu/src/charger.c +++ b/zephyr/projects/nissa/xivu/src/charger.c @@ -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. */ @@ -36,9 +36,17 @@ int extpower_is_present(void) */ __override void board_check_extpower(void) { + static int last_extpower_present; int extpower_present_p0 = 0; int extpower_present_p1 = 0; + int extpower_present = extpower_is_present(); + + if (last_extpower_present ^ extpower_present) + extpower_handle_update(extpower_present); + + last_extpower_present = extpower_present; + if (pd_is_connected(0)) extpower_present_p0 = extpower_is_present(); else if (pd_is_connected(1)) diff --git a/zephyr/projects/nissa/xivu/src/keyboard.c b/zephyr/projects/nissa/xivu/src/keyboard.c index c9500fede7..ef799fb1d2 100644 --- a/zephyr/projects/nissa/xivu/src/keyboard.c +++ b/zephyr/projects/nissa/xivu/src/keyboard.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/nissa/xivu/src/usbc.c b/zephyr/projects/nissa/xivu/src/usbc.c index dcf613bd4b..a15460a212 100644 --- a/zephyr/projects/nissa/xivu/src/usbc.c +++ b/zephyr/projects/nissa/xivu/src/usbc.c @@ -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. */ diff --git a/zephyr/projects/nissa/yaviks/gpio.dts b/zephyr/projects/nissa/yaviks/gpio.dts index 0f5ec33a53..0158d5b19b 100644 --- a/zephyr/projects/nissa/yaviks/gpio.dts +++ b/zephyr/projects/nissa/yaviks/gpio.dts @@ -1,5 +1,5 @@ /* - * 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. */ @@ -201,6 +201,18 @@ gpio_vccin_aux_vid1: vccin_aux_vid1 { gpios = <&gpiok 1 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>; }; + gpio_c1_charger_led_white_l: c1_charger_led_white_l { + gpios = <&gpiol 4 GPIO_OUTPUT_HIGH>; + }; + gpio_c1_charger_led_amber_l: c1_charger_led_amber_l { + gpios = <&gpiod 4 GPIO_OUTPUT_HIGH>; + }; + gpio_c0_charger_led_white_l: c0_charger_led_white_l { + gpios = <&gpioc 3 GPIO_OUTPUT_HIGH>; + }; + gpio_c0_charger_led_amber_l: c0_charger_led_amber_l { + gpios = <&gpioj 7 GPIO_OUTPUT_HIGH>; + }; }; named-i2c-ports { diff --git a/zephyr/projects/nissa/yaviks/keyboard.dts b/zephyr/projects/nissa/yaviks/keyboard.dts index b9e9c21707..bf0b098c62 100644 --- a/zephyr/projects/nissa/yaviks/keyboard.dts +++ b/zephyr/projects/nissa/yaviks/keyboard.dts @@ -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. */ diff --git a/zephyr/projects/nissa/yaviks/overlay.dts b/zephyr/projects/nissa/yaviks/overlay.dts index 065023db97..3c5a8ff7b5 100644 --- a/zephyr/projects/nissa/yaviks/overlay.dts +++ b/zephyr/projects/nissa/yaviks/overlay.dts @@ -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. */ @@ -77,15 +77,11 @@ compatible = "unused-gpios"; unused-gpios = <&gpioa 7 0>, <&gpioc 0 0>, - <&gpioc 3 0>, - <&gpiod 4 0>, <&gpiod 7 0>, <&gpioh 2 0>, <&gpioi 6 0>, <&gpioi 7 0>, - <&gpioj 0 0>, - <&gpioj 7 0>, - <&gpiol 4 0>; + <&gpioj 0 0>; }; named-gpios { @@ -206,7 +202,10 @@ reg = <0>; bc12 = <&bc12_port0>; chg = <&chg_port0>; - usb-muxes = <&virtual_mux_0>; + usb-mux-chain-0 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&virtual_mux_0>; + }; }; port0-muxes { virtual_mux_0: virtual-mux-0 { @@ -218,11 +217,15 @@ reg = <1>; bc12 = <&bc12_port1>; chg = <&chg_port1>; - /* - * Some sub-boards may disable all usb muxes in chain - * except virtual_mux_1 - */ - usb-muxes = <&virtual_mux_1 &tcpci_mux_1>; + usb-mux-chain-1 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&virtual_mux_1 &tcpci_mux_1>; + }; + usb_mux_chain_1_no_mux: usb-mux-chain-1-no-mux { + compatible = "cros-ec,usb-mux-chain"; + alternative-chain; + usb-muxes = <&virtual_mux_1>; + }; }; port1-muxes { virtual_mux_1: virtual-mux-1 { diff --git a/zephyr/projects/nissa/yaviks/power_signals.dts b/zephyr/projects/nissa/yaviks/power_signals.dts index 7d3069f62d..d64ac83150 100644 --- a/zephyr/projects/nissa/yaviks/power_signals.dts +++ b/zephyr/projects/nissa/yaviks/power_signals.dts @@ -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. */ diff --git a/zephyr/projects/nissa/yaviks/prj.conf b/zephyr/projects/nissa/yaviks/prj.conf index 0f42fef4b1..e74049aad7 100644 --- a/zephyr/projects/nissa/yaviks/prj.conf +++ b/zephyr/projects/nissa/yaviks/prj.conf @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. @@ -37,6 +37,7 @@ CONFIG_PLATFORM_EC_TABLET_MODE=n CONFIG_PLATFORM_EC_TABLET_MODE_SWITCH=n CONFIG_PLATFORM_EC_VOLUME_BUTTONS=n +CONFIG_PLATFORM_EC_KEYBOARD_KEYPAD=y # TCPC+PPC: ITE on-chip for C0, PS8745 for optional C1 CONFIG_PLATFORM_EC_USB_PD_TCPM_ITE_ON_CHIP=y @@ -67,3 +68,10 @@ CONFIG_VCMP_IT8XXX2=y CONFIG_SENSOR=y CONFIG_SENSOR_SHELL=n CONFIG_TACH_IT8XXX2=n + +# Ensure recovery key combination (esc+refresh+power) is reliable: b/236580049 +CONFIG_PLATFORM_EC_KEYBOARD_PWRBTN_ASSERTS_KSI3=y +CONFIG_PLATFORM_EC_KEYBOARD_REFRESH_ROW3=y + +# LED +CONFIG_PLATFORM_EC_LED_PWM=n diff --git a/zephyr/projects/nissa/yaviks/pwm_leds.dts b/zephyr/projects/nissa/yaviks/pwm_leds.dts deleted file mode 100644 index bdeada2a82..0000000000 --- a/zephyr/projects/nissa/yaviks/pwm_leds.dts +++ /dev/null @@ -1,60 +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. - */ - -/ { - pwmleds { - compatible = "pwm-leds"; - pwm_led0: pwm_led_0 { - pwms = <&pwm1 1 PWM_HZ(1296) PWM_POLARITY_INVERTED>, - <&pwm2 2 PWM_HZ(1296) PWM_POLARITY_INVERTED>, - <&pwm3 3 PWM_HZ(1296) PWM_POLARITY_INVERTED>; - }; - }; - - cros-pwmleds { - compatible = "cros-ec,pwm-leds"; - - leds = <&pwm_led0>; - - /*<red green blue>*/ - color-map-red = <100 0 0>; - color-map-green = < 0 100 0>; - color-map-blue = < 0 0 100>; - color-map-yellow = < 0 50 50>; - color-map-white = <100 100 100>; - color-map-amber = <100 15 0>; - - brightness-range = <100 100 100 0 0 0>; - - #address-cells = <1>; - #size-cells = <0>; - - pwm_led_0@0 { - reg = <0>; - ec-led-name = "EC_LED_ID_BATTERY_LED"; - }; - }; -}; - -&pwm1 { - status = "okay"; - prescaler-cx = <PWM_PRESCALER_C4>; - pinctrl-0 = <&pwm1_gpa1_default>; - pinctrl-names = "default"; -}; - -&pwm2 { - status = "okay"; - prescaler-cx = <PWM_PRESCALER_C4>; - pinctrl-0 = <&pwm2_gpa2_default>; - pinctrl-names = "default"; -}; - -&pwm3 { - status = "okay"; - prescaler-cx = <PWM_PRESCALER_C4>; - pinctrl-0 = <&pwm3_gpa3_default>; - pinctrl-names = "default"; -}; diff --git a/zephyr/projects/nissa/yaviks/src/charger.c b/zephyr/projects/nissa/yaviks/src/charger.c index 2d46119762..786bb1bd3c 100644 --- a/zephyr/projects/nissa/yaviks/src/charger.c +++ b/zephyr/projects/nissa/yaviks/src/charger.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/nissa/yaviks/src/hdmi.c b/zephyr/projects/nissa/yaviks/src/hdmi.c index ef7cdda2a7..d15e9fb034 100644 --- a/zephyr/projects/nissa/yaviks/src/hdmi.c +++ b/zephyr/projects/nissa/yaviks/src/hdmi.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/nissa/yaviks/src/keyboard.c b/zephyr/projects/nissa/yaviks/src/keyboard.c index b3c425924c..1e5ac7a953 100644 --- a/zephyr/projects/nissa/yaviks/src/keyboard.c +++ b/zephyr/projects/nissa/yaviks/src/keyboard.c @@ -1,25 +1,46 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ #include "ec_commands.h" +#include "keyboard_scan.h" +#include "timer.h" + +/* Keyboard scan setting */ +__override struct keyboard_scan_config keyscan_config = { + /* Increase from 50 us, because KSO_02 passes through the H1. */ + .output_settle_us = 80, + /* Other values should be the same as the default configuration. */ + .debounce_down_us = 9 * MSEC, + .debounce_up_us = 30 * MSEC, + .scan_period_us = 3 * MSEC, + .min_post_scan_delay_us = 1000, + .poll_timeout_us = 100 * MSEC, + .actual_key_mask = { + 0x1c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xa4, 0xff, 0xf6, 0x55, 0xfe, 0xff, 0xff, 0xff, /* full set */ + }, +}; static const struct ec_response_keybd_config yaviks_kb_legacy = { - .num_top_row_keys = 10, + .num_top_row_keys = 13, .action_keys = { TK_BACK, /* T1 */ - TK_FORWARD, /* T2 */ - TK_REFRESH, /* T3 */ - TK_FULLSCREEN, /* T4 */ - TK_OVERVIEW, /* T5 */ + TK_REFRESH, /* T2 */ + TK_FULLSCREEN, /* T3 */ + TK_OVERVIEW, /* T4 */ + TK_SNAPSHOT, /* T5 */ TK_BRIGHTNESS_DOWN, /* T6 */ TK_BRIGHTNESS_UP, /* T7 */ - TK_VOL_MUTE, /* T8 */ - TK_VOL_DOWN, /* T9 */ - TK_VOL_UP, /* T10 */ + TK_KBD_BKLIGHT_TOGGLE, /* T8 */ + TK_PLAY_PAUSE, /* T9 */ + TK_MICMUTE, /* T10 */ + TK_VOL_MUTE, /* T11 */ + TK_VOL_DOWN, /* T12 */ + TK_VOL_UP, /* T13 */ }, - .capabilities = KEYBD_CAP_SCRNLOCK_KEY, + .capabilities = KEYBD_CAP_NUMERIC_KEYPAD, }; __override const struct ec_response_keybd_config * diff --git a/zephyr/projects/nissa/yaviks/src/led.c b/zephyr/projects/nissa/yaviks/src/led.c new file mode 100644 index 0000000000..e4f49dc9ad --- /dev/null +++ b/zephyr/projects/nissa/yaviks/src/led.c @@ -0,0 +1,231 @@ +/* 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. + */ + +#include <stdint.h> + +#include "battery.h" +#include "charge_manager.h" +#include "charge_state.h" +#include "chipset.h" +#include "ec_commands.h" +#include "gpio.h" +#include "host_command.h" +#include "led_common.h" +#include "hooks.h" + +#define BAT_LED_ON 0 +#define BAT_LED_OFF 1 + +#define BATT_LOW_BCT 10 + +#define LED_TICKS_PER_CYCLE 4 +#define LED_TICKS_PER_CYCLE_S3 4 +#define LED_ON_TICKS 2 +#define POWER_LED_ON_S3_TICKS 2 + +const enum ec_led_id supported_led_ids[] = { EC_LED_ID_LEFT_LED, + EC_LED_ID_RIGHT_LED }; + +const int supported_led_ids_count = ARRAY_SIZE(supported_led_ids); + +enum led_color { + LED_OFF = 0, + LED_AMBER, + LED_WHITE, + LED_COLOR_COUNT /* Number of colors, not a color itself */ +}; + +enum led_port { LEFT_PORT = 0, RIGHT_PORT }; + +static void led_set_color_battery(int port, enum led_color color) +{ + const struct gpio_dt_spec *amber_led, *white_led; + + if (port == LEFT_PORT) { + amber_led = GPIO_DT_FROM_NODELABEL(gpio_c0_charger_led_amber_l); + white_led = GPIO_DT_FROM_NODELABEL(gpio_c0_charger_led_white_l); + } else if (port == RIGHT_PORT) { + amber_led = GPIO_DT_FROM_NODELABEL(gpio_c1_charger_led_amber_l); + white_led = GPIO_DT_FROM_NODELABEL(gpio_c1_charger_led_white_l); + } + + switch (color) { + case LED_WHITE: + gpio_pin_set_dt(white_led, BAT_LED_ON); + gpio_pin_set_dt(amber_led, BAT_LED_OFF); + break; + case LED_AMBER: + gpio_pin_set_dt(white_led, BAT_LED_OFF); + gpio_pin_set_dt(amber_led, BAT_LED_ON); + break; + case LED_OFF: + gpio_pin_set_dt(white_led, BAT_LED_OFF); + gpio_pin_set_dt(amber_led, BAT_LED_OFF); + break; + default: + break; + } +} + +void led_get_brightness_range(enum ec_led_id led_id, uint8_t *brightness_range) +{ + switch (led_id) { + case EC_LED_ID_LEFT_LED: + brightness_range[EC_LED_COLOR_WHITE] = 1; + brightness_range[EC_LED_COLOR_AMBER] = 1; + break; + case EC_LED_ID_RIGHT_LED: + brightness_range[EC_LED_COLOR_WHITE] = 1; + brightness_range[EC_LED_COLOR_AMBER] = 1; + break; + default: + break; + } +} + +int led_set_brightness(enum ec_led_id led_id, const uint8_t *brightness) +{ + switch (led_id) { + case EC_LED_ID_LEFT_LED: + if (brightness[EC_LED_COLOR_WHITE] != 0) + led_set_color_battery(LEFT_PORT, LED_WHITE); + else if (brightness[EC_LED_COLOR_AMBER] != 0) + led_set_color_battery(LEFT_PORT, LED_AMBER); + else + led_set_color_battery(LEFT_PORT, LED_OFF); + break; + case EC_LED_ID_RIGHT_LED: + if (brightness[EC_LED_COLOR_WHITE] != 0) + led_set_color_battery(RIGHT_PORT, LED_WHITE); + else if (brightness[EC_LED_COLOR_AMBER] != 0) + led_set_color_battery(RIGHT_PORT, LED_AMBER); + else + led_set_color_battery(RIGHT_PORT, LED_OFF); + break; + default: + return EC_ERROR_PARAM1; + } + + return EC_SUCCESS; +} + +/* + * Set active charge port color to the parameter, turn off all others. + * If no port is active (-1), turn off all LEDs. + */ +static void set_active_port_color(enum led_color color) +{ + int port = charge_manager_get_active_charge_port(); + + if (led_auto_control_is_enabled(EC_LED_ID_RIGHT_LED)) + led_set_color_battery(RIGHT_PORT, + (port == RIGHT_PORT) ? color : LED_OFF); + if (led_auto_control_is_enabled(EC_LED_ID_LEFT_LED)) + led_set_color_battery(LEFT_PORT, + (port == LEFT_PORT) ? color : LED_OFF); +} + +static void led_set_battery(void) +{ + static unsigned int battery_ticks; + static int suspend_ticks; + + battery_ticks++; + + /* + * Override battery LEDs for Yaviks, Yaviks is non-power LED + * design, blinking both two side battery white LEDs to indicate + * system suspend with non-charging state. + */ + if (chipset_in_state(CHIPSET_STATE_ANY_SUSPEND) && + charge_get_state() != PWR_STATE_CHARGE) { + suspend_ticks++; + + led_set_color_battery(RIGHT_PORT, + suspend_ticks % LED_TICKS_PER_CYCLE_S3 < + POWER_LED_ON_S3_TICKS ? + LED_WHITE : + LED_OFF); + led_set_color_battery(LEFT_PORT, + suspend_ticks % LED_TICKS_PER_CYCLE_S3 < + POWER_LED_ON_S3_TICKS ? + LED_WHITE : + LED_OFF); + return; + } + + suspend_ticks = 0; + + switch (charge_get_state()) { + case PWR_STATE_CHARGE: + /* Always indicate when charging, even in suspend. */ + set_active_port_color(LED_AMBER); + break; + case PWR_STATE_DISCHARGE: + /* + * Blinking amber LEDs slowly if battery is lower 10 + * percentage. + */ + if (led_auto_control_is_enabled(EC_LED_ID_RIGHT_LED)) { + if (charge_get_percent() < BATT_LOW_BCT) + led_set_color_battery( + RIGHT_PORT, + (battery_ticks % LED_TICKS_PER_CYCLE < + LED_ON_TICKS) ? + LED_AMBER : + LED_OFF); + else + led_set_color_battery(RIGHT_PORT, LED_OFF); + } + + if (led_auto_control_is_enabled(EC_LED_ID_LEFT_LED)) { + if (charge_get_percent() < BATT_LOW_BCT) + led_set_color_battery( + LEFT_PORT, + (battery_ticks % LED_TICKS_PER_CYCLE < + LED_ON_TICKS) ? + LED_AMBER : + LED_OFF); + else + led_set_color_battery(LEFT_PORT, LED_OFF); + } + break; + case PWR_STATE_ERROR: + if (led_auto_control_is_enabled(EC_LED_ID_RIGHT_LED)) { + led_set_color_battery( + RIGHT_PORT, + (battery_ticks & 0x1) ? LED_AMBER : LED_OFF); + } + + if (led_auto_control_is_enabled(EC_LED_ID_LEFT_LED)) { + led_set_color_battery(LEFT_PORT, (battery_ticks & 0x1) ? + LED_AMBER : + LED_OFF); + } + break; + case PWR_STATE_CHARGE_NEAR_FULL: + set_active_port_color(LED_WHITE); + break; + case PWR_STATE_IDLE: /* External power connected in IDLE */ + set_active_port_color(LED_WHITE); + break; + case PWR_STATE_FORCED_IDLE: + set_active_port_color( + (battery_ticks % LED_TICKS_PER_CYCLE < LED_ON_TICKS) ? + LED_AMBER : + LED_OFF); + break; + default: + /* Other states don't alter LED behavior */ + break; + } +} + +/* Called by hook task every TICK(IT83xx 500ms) */ +static void led_tick(void) +{ + led_set_battery(); +} +DECLARE_HOOK(HOOK_TICK, led_tick, HOOK_PRIO_DEFAULT); diff --git a/zephyr/projects/nissa/yaviks/src/usbc.c b/zephyr/projects/nissa/yaviks/src/usbc.c index a5ee9f6eee..48f7cfd9cb 100644 --- a/zephyr/projects/nissa/yaviks/src/usbc.c +++ b/zephyr/projects/nissa/yaviks/src/usbc.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/npcx_evb/npcx7/BUILD.py b/zephyr/projects/npcx_evb/npcx7/BUILD.py index 89afed0fc1..baa6774595 100644 --- a/zephyr/projects/npcx_evb/npcx7/BUILD.py +++ b/zephyr/projects/npcx_evb/npcx7/BUILD.py @@ -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. diff --git a/zephyr/projects/npcx_evb/npcx7/CMakeLists.txt b/zephyr/projects/npcx_evb/npcx7/CMakeLists.txt index 7e3264944f..64429d586e 100644 --- a/zephyr/projects/npcx_evb/npcx7/CMakeLists.txt +++ b/zephyr/projects/npcx_evb/npcx7/CMakeLists.txt @@ -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. diff --git a/zephyr/projects/npcx_evb/npcx7/fan.dts b/zephyr/projects/npcx_evb/npcx7/fan.dts index 65653aa7df..dc4debdcb9 100644 --- a/zephyr/projects/npcx_evb/npcx7/fan.dts +++ b/zephyr/projects/npcx_evb/npcx7/fan.dts @@ -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. */ diff --git a/zephyr/projects/npcx_evb/npcx7/gpio.dts b/zephyr/projects/npcx_evb/npcx7/gpio.dts index d0aa642673..d44927609d 100644 --- a/zephyr/projects/npcx_evb/npcx7/gpio.dts +++ b/zephyr/projects/npcx_evb/npcx7/gpio.dts @@ -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. */ diff --git a/zephyr/projects/npcx_evb/npcx7/interrupts.dts b/zephyr/projects/npcx_evb/npcx7/interrupts.dts index dfa4a321ef..3e92428ef4 100644 --- a/zephyr/projects/npcx_evb/npcx7/interrupts.dts +++ b/zephyr/projects/npcx_evb/npcx7/interrupts.dts @@ -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. */ diff --git a/zephyr/projects/npcx_evb/npcx7/keyboard.dts b/zephyr/projects/npcx_evb/npcx7/keyboard.dts index 038c2e3cce..3fb6986f1a 100644 --- a/zephyr/projects/npcx_evb/npcx7/keyboard.dts +++ b/zephyr/projects/npcx_evb/npcx7/keyboard.dts @@ -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. */ diff --git a/zephyr/projects/npcx_evb/npcx7/prj.conf b/zephyr/projects/npcx_evb/npcx7/prj.conf index 4b009f9d00..5f1fc03f88 100644 --- a/zephyr/projects/npcx_evb/npcx7/prj.conf +++ b/zephyr/projects/npcx_evb/npcx7/prj.conf @@ -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. @@ -35,8 +35,8 @@ CONFIG_PLATFORM_EC_CONSOLE_CMD_IRQ=y # eSPI CONFIG_ESPI=y -CONFIG_PLATFORM_EC_ESPI_VW_SLP_S3=y -CONFIG_PLATFORM_EC_ESPI_VW_SLP_S4=y +CONFIG_PLATFORM_EC_HOST_INTERFACE_ESPI_VW_SLP_S3=y +CONFIG_PLATFORM_EC_HOST_INTERFACE_ESPI_VW_SLP_S4=y # Keyboard CONFIG_CROS_KB_RAW_NPCX_KSO_HIGH_DRIVE=y diff --git a/zephyr/projects/npcx_evb/npcx9/BUILD.py b/zephyr/projects/npcx_evb/npcx9/BUILD.py index efd96c9020..335f410d9b 100644 --- a/zephyr/projects/npcx_evb/npcx9/BUILD.py +++ b/zephyr/projects/npcx_evb/npcx9/BUILD.py @@ -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. diff --git a/zephyr/projects/npcx_evb/npcx9/CMakeLists.txt b/zephyr/projects/npcx_evb/npcx9/CMakeLists.txt index 3a7d331885..ef734c06f6 100644 --- a/zephyr/projects/npcx_evb/npcx9/CMakeLists.txt +++ b/zephyr/projects/npcx_evb/npcx9/CMakeLists.txt @@ -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. diff --git a/zephyr/projects/npcx_evb/npcx9/fan.dts b/zephyr/projects/npcx_evb/npcx9/fan.dts index 65653aa7df..dc4debdcb9 100644 --- a/zephyr/projects/npcx_evb/npcx9/fan.dts +++ b/zephyr/projects/npcx_evb/npcx9/fan.dts @@ -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. */ diff --git a/zephyr/projects/npcx_evb/npcx9/gpio.dts b/zephyr/projects/npcx_evb/npcx9/gpio.dts index 54e1db5495..9a32112471 100644 --- a/zephyr/projects/npcx_evb/npcx9/gpio.dts +++ b/zephyr/projects/npcx_evb/npcx9/gpio.dts @@ -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. */ diff --git a/zephyr/projects/npcx_evb/npcx9/interrupts.dts b/zephyr/projects/npcx_evb/npcx9/interrupts.dts index dfa4a321ef..3e92428ef4 100644 --- a/zephyr/projects/npcx_evb/npcx9/interrupts.dts +++ b/zephyr/projects/npcx_evb/npcx9/interrupts.dts @@ -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. */ diff --git a/zephyr/projects/npcx_evb/npcx9/keyboard.dts b/zephyr/projects/npcx_evb/npcx9/keyboard.dts index 038c2e3cce..3fb6986f1a 100644 --- a/zephyr/projects/npcx_evb/npcx9/keyboard.dts +++ b/zephyr/projects/npcx_evb/npcx9/keyboard.dts @@ -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. */ diff --git a/zephyr/projects/npcx_evb/npcx9/prj.conf b/zephyr/projects/npcx_evb/npcx9/prj.conf index f53ccdef1b..827b6366c6 100644 --- a/zephyr/projects/npcx_evb/npcx9/prj.conf +++ b/zephyr/projects/npcx_evb/npcx9/prj.conf @@ -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. @@ -39,8 +39,8 @@ CONFIG_PLATFORM_EC_CONSOLE_CMD_IRQ=y # eSPI CONFIG_ESPI=y -CONFIG_PLATFORM_EC_ESPI_VW_SLP_S3=y -CONFIG_PLATFORM_EC_ESPI_VW_SLP_S4=y +CONFIG_PLATFORM_EC_HOST_INTERFACE_ESPI_VW_SLP_S3=y +CONFIG_PLATFORM_EC_HOST_INTERFACE_ESPI_VW_SLP_S4=y # Keyboard CONFIG_CROS_KB_RAW_NPCX_KSO_HIGH_DRIVE=y diff --git a/zephyr/projects/rex/BUILD.py b/zephyr/projects/rex/BUILD.py index 10e5c2a14c..2537f61226 100644 --- a/zephyr/projects/rex/BUILD.py +++ b/zephyr/projects/rex/BUILD.py @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. @@ -37,6 +37,9 @@ register_variant( here / "usbc.dts", here / "keyboard.dts", here / "led.dts", + here / "fan.dts", + here / "temp_sensors.dts", + here / "motionsense.dts", ], extra_kconfig_files=[here / "prj_rex.conf"], ) diff --git a/zephyr/projects/rex/CMakeLists.txt b/zephyr/projects/rex/CMakeLists.txt index 9f2264a629..27d7dff068 100644 --- a/zephyr/projects/rex/CMakeLists.txt +++ b/zephyr/projects/rex/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/zephyr/projects/rex/Kconfig b/zephyr/projects/rex/Kconfig index 4fc561ab4f..7d17c27815 100644 --- a/zephyr/projects/rex/Kconfig +++ b/zephyr/projects/rex/Kconfig @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/zephyr/projects/rex/battery.dts b/zephyr/projects/rex/battery.dts index 5dee2e4578..e11346f48d 100644 --- a/zephyr/projects/rex/battery.dts +++ b/zephyr/projects/rex/battery.dts @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/rex/fan.dts b/zephyr/projects/rex/fan.dts new file mode 100644 index 0000000000..aa6dcfde7d --- /dev/null +++ b/zephyr/projects/rex/fan.dts @@ -0,0 +1,39 @@ +/* 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. + */ + +/ { + fans { + compatible = "cros-ec,fans"; + + fan_0 { + pwms = <&pwm5 0 PWM_KHZ(1) PWM_POLARITY_NORMAL>; + rpm_min = <2200>; + rpm_start = <2200>; + rpm_max = <4200>; + tach = <&tach1>; + enable_gpio = <&gpio_en_pp5000_fan>; + }; + }; +}; + +/* Tachemeter for fan speed measurement */ +&tach1 { + status = "okay"; + pinctrl-0 = <&ta1_1_in_gp40>; + pinctrl-names = "default"; + port = <NPCX_TACH_PORT_A>; /* port-A is selected */ + sample-clk = <NPCX_TACH_FREQ_LFCLK>; /* Use LFCLK as sampling clock */ + pulses-per-round = <2>; /* number of pulses per round of encoder */ +}; + +&pwm5_gpb7 { + drive-open-drain; +}; + +&pwm5 { + status = "okay"; + pinctrl-0 = <&pwm5_gpb7>; + pinctrl-names = "default"; +}; diff --git a/zephyr/projects/rex/generated.dts b/zephyr/projects/rex/generated.dts index 348df75926..549f0e5fde 100644 --- a/zephyr/projects/rex/generated.dts +++ b/zephyr/projects/rex/generated.dts @@ -1,8 +1,13 @@ -/* 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. * * This file is auto-generated - do not edit! + * + * TODO(b:/244441996): There are some errors in the main Rex EC GPIO spreadsheet + * which is used as input to create this device tree file. Until that issue is + * resolved, there are some edits required to this file to support EC + * functionality. */ / { @@ -10,19 +15,19 @@ named-adc-channels { compatible = "named-adc-channels"; - adc_temp_sensor_1: temp_sensor_1 { - enum-name = "ADC_TEMP_SENSOR_1"; + adc_ddr_soc: ddr_soc { + enum-name = "ADC_TEMP_SENSOR_1_DDR_SOC"; io-channels = <&adc0 0>; }; - adc_temp_sensor_2: temp_sensor_2 { + adc_ambient: ambient { enum-name = "ADC_TEMP_SENSOR_2"; io-channels = <&adc0 1>; }; - adc_temp_sensor_3: temp_sensor_3 { + adc_charger: charger { enum-name = "ADC_TEMP_SENSOR_3"; io-channels = <&adc0 8>; }; - adc_temp_sensor_4: temp_sensor_4 { + adc_wwan: wwan { enum-name = "ADC_TEMP_SENSOR_4"; io-channels = <&adc0 7>; }; @@ -79,7 +84,7 @@ gpios = <&gpiof 0 GPIO_INPUT>; }; gpio_ec_prochot_odl: ec_prochot_odl { - gpios = <&gpio6 3 GPIO_ODR_LOW>; + gpios = <&gpio6 3 GPIO_ODR_HIGH>; }; gpio_ec_rst_r_odl: ec_rst_r_odl { gpios = <&gpio7 7 GPIO_INPUT>; @@ -137,20 +142,20 @@ gpios = <&gpioa 1 GPIO_INPUT>; }; gpio_en_pp5000_fan: en_pp5000_fan { - gpios = <&gpio6 1 GPIO_ODR_HIGH>; + gpios = <&gpio6 1 GPIO_OUTPUT_LOW>; }; gpio_en_pp5000_usba_r: en_pp5000_usba_r { gpios = <&gpiod 7 GPIO_OUTPUT>; }; gpio_en_s5_rails: en_s5_rails { gpios = <&gpiob 6 GPIO_ODR_HIGH>; + enum-name = "GPIO_TEMP_SENSOR_POWER"; }; gpio_en_z1_rails: en_z1_rails { gpios = <&gpio8 5 GPIO_OUTPUT>; }; gpio_gsc_ec_pwr_btn_odl: gsc_ec_pwr_btn_odl { gpios = <&gpio0 1 GPIO_INPUT_PULL_UP>; - enum-name = "GPIO_POWER_BUTTON_L"; }; gpio_imvp92_vrrdy_od: imvp92_vrrdy_od { gpios = <&gpio4 3 GPIO_INPUT>; @@ -173,6 +178,7 @@ }; gpio_mech_pwr_btn_odl: mech_pwr_btn_odl { gpios = <&gpio0 2 GPIO_INPUT>; + enum-name = "GPIO_POWER_BUTTON_L"; }; gpio_seq_ec_all_sys_pg: seq_ec_all_sys_pg { gpios = <&gpiof 4 GPIO_INPUT>; @@ -211,7 +217,7 @@ enum-name = "GPIO_USB_C0_PPC_INT_ODL"; }; gpio_usb_c0_rt_3p3_sx_en: usb_c0_rt_3p3_sx_en { - gpios = <&gpio0 3 GPIO_ODR_HIGH>; + gpios = <&gpio0 3 GPIO_OUTPUT_LOW>; }; gpio_usb_c0_rt_int_odl: usb_c0_rt_int_odl { gpios = <&gpioa 0 GPIO_INPUT>; diff --git a/zephyr/projects/rex/include/gpio_map.h b/zephyr/projects/rex/include/gpio_map.h index 886e7d1ebf..01cbc44396 100644 --- a/zephyr/projects/rex/include/gpio_map.h +++ b/zephyr/projects/rex/include/gpio_map.h @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/rex/interrupts.dts b/zephyr/projects/rex/interrupts.dts index 5444bcfd06..7c4e6bca58 100644 --- a/zephyr/projects/rex/interrupts.dts +++ b/zephyr/projects/rex/interrupts.dts @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ @@ -42,6 +42,21 @@ flags = <GPIO_INT_EDGE_FALLING>; handler = "bc12_interrupt"; }; + int_imu: ec_imu { + irq-pin = <&gpio_ec_imu_int_r_l>; + flags = <GPIO_INT_EDGE_FALLING>; + handler = "lsm6dso_interrupt"; + }; + int_als_rgb: ec_als_rgb { + irq-pin = <&gpio_ec_als_rgb_int_r_l>; + flags = <GPIO_INT_EDGE_FALLING>; + handler = "tcs3400_interrupt"; + }; + int_accel: ec_accel { + irq-pin = <&gpio_ec_accel_int_r_l>; + flags = <GPIO_INT_EDGE_FALLING>; + handler = "lis2dw12_interrupt"; + }; }; }; diff --git a/zephyr/projects/rex/keyboard.dts b/zephyr/projects/rex/keyboard.dts index e97165cc92..5248c4aaff 100644 --- a/zephyr/projects/rex/keyboard.dts +++ b/zephyr/projects/rex/keyboard.dts @@ -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. */ diff --git a/zephyr/projects/rex/led.dts b/zephyr/projects/rex/led.dts index 5821e326e8..94acb6da5c 100644 --- a/zephyr/projects/rex/led.dts +++ b/zephyr/projects/rex/led.dts @@ -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. */ diff --git a/zephyr/projects/rex/motionsense.dts b/zephyr/projects/rex/motionsense.dts new file mode 100644 index 0000000000..8b1c80921b --- /dev/null +++ b/zephyr/projects/rex/motionsense.dts @@ -0,0 +1,257 @@ +/* + * Copyright 2022 The ChromiumOS Authors + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include <dt-bindings/motionsense/utils.h> + + +/ { + aliases { + /* + * motion sense's <>_INT_EVENT is handled + * by alias. Using the alias, each driver creates + * its own <>_INT_EVENT. + */ + lsm6dso-int = &base_accel; + lis2dw12-int = &lid_accel; + tcs3400-int = &als_clear; + }; + + /* + * Declare mutexes used by sensor drivers. + * A mutex node is used to create an instance of mutex_t. + * A mutex node is referenced by a sensor node if the + * corresponding sensor driver needs to use the + * instance of the mutex. + */ + motionsense-mutex { + compatible = "cros-ec,motionsense-mutex"; + mutex_lis2dw12: lis2dw12-mutex { + }; + + mutex_lsm6dso: lsm6dso-mutex { + }; + }; + + /* Rotation matrix used by drivers. */ + 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 = <1 0 0 + 0 (-1) 0 + 0 0 (-1)>; + }; + }; + + /* + * Driver specific data. A driver-specific data can be shared with + * different motion sensors while they are using the same driver. + * + * If a node's compatible starts with "cros-ec,accelgyro-", it is for + * a common structure defined in accelgyro.h. + * e.g) compatible = "cros-ec,accelgyro-als-drv-data" is for + * "struct als_drv_data_t" in accelgyro.h + */ + motionsense-sensor-data { + lis2dw12_data: lis2dw12-drv-data { + compatible = "cros-ec,drvdata-lis2dw12"; + status = "okay"; + }; + + lsm6dso_accel_data: lsm6dso-drv-data { + compatible = "cros-ec,drvdata-lsm6dso"; + status = "okay"; + }; + + lsm6dso_gyro_data: lsm6dso-drv-data { + compatible = "cros-ec,drvdata-lsm6dso"; + status = "okay"; + }; + + tcs_clear_data: tcs3400-clear-drv-data { + compatible = "cros-ec,drvdata-tcs3400-clear"; + status = "okay"; + + als-drv-data { + compatible = "cros-ec,accelgyro-als-drv-data"; + als-cal { + scale = <1>; + uscale = <0>; + offset = <0>; + als-channel-scale { + compatible = + "cros-ec,accelgyro-als-channel-scale"; + k-channel-scale = <1>; + cover-scale = <1>; + }; + }; + }; + }; + + tcs_rgb_data: tcs3400-rgb-drv-data { + compatible = "cros-ec,drvdata-tcs3400-rgb"; + status = "okay"; + + /* node for rgb_calibration_t defined in accelgyro.h */ + rgb_calibration { + compatible = + "cros-ec,accelgyro-rgb-calibration"; + + irt = <1>; + + rgb-cal-x { + offset = <0>; + coeff = <0 0 0 1>; + als-channel-scale { + compatible = + "cros-ec,accelgyro-als-channel-scale"; + k-channel-scale = <1>; + cover-scale = <1>; + }; + }; + rgb-cal-y { + offset = <0>; + coeff = <0 0 0 1>; + als-channel-scale { + compatible = + "cros-ec,accelgyro-als-channel-scale"; + k-channel-scale = <1>; + cover-scale = <1>; + }; + }; + rgb-cal-z { + offset = <0>; + coeff = <0 0 0 1>; + als-channel-scale { + compatible = + "cros-ec,accelgyro-als-channel-scale"; + k-channel-scale = <1>; + cover-scale = <1>; + }; + }; + }; + }; + }; + + /* + * List of motion sensors that creates motion_sensors array. + * The nodelabel "lid_accel" and "base_accel" are used to indicate + * motion sensor IDs for lid angle calculation. + */ + motionsense-sensor { + lid_accel: lid-accel { + compatible = "cros-ec,lis2dw12"; + status = "okay"; + + active-mask = "SENSOR_ACTIVE_S0_S3"; + location = "MOTIONSENSE_LOC_LID"; + mutex = <&mutex_lis2dw12>; + port = <&i2c_ec_i2c_sensor>; + rot-standard-ref = <&lid_rot_ref>; + default-range = <2>; + drv-data = <&lis2dw12_data>; + i2c-spi-addr-flags = "LIS2DWL_ADDR0_FLAGS"; + configs { + compatible = + "cros-ec,motionsense-sensor-config"; + ec-s0 { + odr = <(10000 | ROUND_UP_FLAG)>; + }; + ec-s3 { + odr = <(10000 | ROUND_UP_FLAG)>; + }; + }; + }; + + base_accel: base-accel { + compatible = "cros-ec,lsm6dso-accel"; + status = "okay"; + + active-mask = "SENSOR_ACTIVE_S0_S3"; + location = "MOTIONSENSE_LOC_BASE"; + mutex = <&mutex_lsm6dso>; + port = <&i2c_ec_i2c_sensor>; + rot-standard-ref = <&base_rot_ref>; + default-range = <4>; + drv-data = <&lsm6dso_accel_data>; + i2c-spi-addr-flags = "LSM6DSO_ADDR0_FLAGS"; + configs { + compatible = + "cros-ec,motionsense-sensor-config"; + ec-s0 { + odr = <(10000 | ROUND_UP_FLAG)>; + ec-rate = <(100 * USEC_PER_MSEC)>; + }; + ec-s3 { + odr = <(10000 | ROUND_UP_FLAG)>; + ec-rate = <(100 * USEC_PER_MSEC)>; + }; + }; + }; + + base-gyro { + compatible = "cros-ec,lsm6dso-gyro"; + status = "okay"; + + active-mask = "SENSOR_ACTIVE_S0_S3"; + location = "MOTIONSENSE_LOC_BASE"; + mutex = <&mutex_lsm6dso>; + port = <&i2c_ec_i2c_sensor>; + rot-standard-ref = <&base_rot_ref>; + default-range = <(1000 | ROUND_UP_FLAG)>; /* dps */ + drv-data = <&lsm6dso_gyro_data>; + i2c-spi-addr-flags = "LSM6DSO_ADDR0_FLAGS"; + }; + + als_clear: base-als-clear { + compatible = "cros-ec,tcs3400-clear"; + status = "okay"; + + active-mask = "SENSOR_ACTIVE_S0_S3"; + location = "MOTIONSENSE_LOC_CAMERA"; + port = <&i2c_ec_i2c_sensor>; + default-range = <0x10000>; + drv-data = <&tcs_clear_data>; + i2c-spi-addr-flags = "TCS3400_I2C_ADDR_FLAGS"; + configs { + compatible = + "cros-ec,motionsense-sensor-config"; + ec-s0 { + /* Run ALS sensor in S0 */ + odr = <1000>; + }; + }; + }; + + base-als-rgb { + compatible = "cros-ec,tcs3400-rgb"; + status = "okay"; + + active-mask = "SENSOR_ACTIVE_S0_S3"; + location = "MOTIONSENSE_LOC_CAMERA"; + default-range = <0x10000>; /* scale = 1x, uscale = 0 */ + drv-data = <&tcs_rgb_data>; + }; + }; + + motionsense-sensor-info { + compatible = "cros-ec,motionsense-sensor-info"; + + /* list of entries for motion_als_sensors */ + als-sensors = <&als_clear>; + /* + * list of GPIO interrupts that have to + * be enabled at initial stage + */ + sensor-irqs = <&int_imu &int_als_rgb &int_accel>; + /* list of sensors in force mode */ + accel-force-mode-sensors = <&lid_accel &als_clear>; + }; +}; diff --git a/zephyr/projects/rex/power_signals.dts b/zephyr/projects/rex/power_signals.dts index a4cc3cb5ef..860c316795 100644 --- a/zephyr/projects/rex/power_signals.dts +++ b/zephyr/projects/rex/power_signals.dts @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/rex/prj.conf b/zephyr/projects/rex/prj.conf index 227d732f0a..a3b874fe5f 100644 --- a/zephyr/projects/rex/prj.conf +++ b/zephyr/projects/rex/prj.conf @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. @@ -10,12 +10,18 @@ CONFIG_SYSCON=y CONFIG_LTO=n CONFIG_PLATFORM_EC_SYSTEM_UNLOCKED=y +# Shell Commands +CONFIG_SHELL_HELP=y +CONFIG_SHELL_HISTORY=y +CONFIG_SHELL_TAB=y +CONFIG_SHELL_TAB_AUTOCOMPLETION=y +CONFIG_KERNEL_SHELL=y + # Logging CONFIG_LOG=y CONFIG_LOG_MODE_MINIMAL=y # Disable default features we don't want in a minimal example. -CONFIG_PWM=n CONFIG_PLATFORM_EC_BACKLIGHT_LID=y CONFIG_PLATFORM_EC_SWITCH=y CONFIG_PLATFORM_EC_VBOOT_EFS2=n @@ -24,9 +30,9 @@ CONFIG_PLATFORM_EC_VBOOT_EFS2=n CONFIG_AP=y CONFIG_ESPI=y CONFIG_ESPI_LOG_LEVEL_ERR=y -CONFIG_PLATFORM_EC_ESPI_VW_SLP_S3=y -CONFIG_PLATFORM_EC_ESPI_VW_SLP_S4=y -CONFIG_PLATFORM_EC_ESPI_VW_SLP_S5=y +CONFIG_PLATFORM_EC_HOST_INTERFACE_ESPI_VW_SLP_S3=y +CONFIG_PLATFORM_EC_HOST_INTERFACE_ESPI_VW_SLP_S4=y +CONFIG_PLATFORM_EC_HOST_INTERFACE_ESPI_VW_SLP_S5=y CONFIG_PLATFORM_EC_HOSTCMD=y # Disabling this until temp sensor support is in CONFIG_PLATFORM_EC_THROTTLE_AP=n @@ -51,6 +57,18 @@ CONFIG_ADC=y # I2C CONFIG_I2C=y +# PWM +CONFIG_PWM=y + +# Fan +CONFIG_TACH_NPCX=y + +# Temperature sensors +CONFIG_SENSOR=y +CONFIG_PLATFORM_EC_TEMP_SENSOR=y +CONFIG_PLATFORM_EC_THERMISTOR=y +CONFIG_PLATFORM_EC_TEMP_SENSOR_POWER=y + # CBI EEPROM support CONFIG_EEPROM=y CONFIG_EEPROM_AT24=y @@ -130,3 +148,25 @@ CONFIG_PLATFORM_EC_KEYBOARD_COL2_INVERTED=y CONFIG_PLATFORM_EC_MKBP_EVENT=y CONFIG_PLATFORM_EC_MKBP_INPUT_DEVICES=y CONFIG_PLATFORM_EC_MKBP_USE_GPIO_AND_HOST_EVENT=y + +# Sensors console command +CONFIG_PLATFORM_EC_CONSOLE_CMD_ACCELS=y +CONFIG_PLATFORM_EC_CONSOLE_CMD_ACCEL_INFO=y + +# Sensors +CONFIG_SENSOR=y +CONFIG_SENSOR_SHELL=n +CONFIG_PLATFORM_EC_MOTIONSENSE=y +CONFIG_PLATFORM_EC_ACCEL_FIFO=y +CONFIG_PLATFORM_EC_DYNAMIC_MOTION_SENSOR_COUNT=y +CONFIG_PLATFORM_EC_GMR_TABLET_MODE=y +CONFIG_PLATFORM_EC_LID_ANGLE=y +CONFIG_PLATFORM_EC_LID_ANGLE_UPDATE=y +CONFIG_PLATFORM_EC_SENSOR_TIGHT_TIMESTAMPS=y +CONFIG_PLATFORM_EC_TABLET_MODE=y +CONFIG_PLATFORM_EC_TABLET_MODE_SWITCH=y + +# Sensor Drivers +CONFIG_PLATFORM_EC_ACCELGYRO_LSM6DSO=y +CONFIG_PLATFORM_EC_ACCEL_LIS2DW12=y +CONFIG_PLATFORM_EC_ALS_TCS3400=y diff --git a/zephyr/projects/rex/prj_rex.conf b/zephyr/projects/rex/prj_rex.conf index 9a3b851812..0f204b9669 100644 --- a/zephyr/projects/rex/prj_rex.conf +++ b/zephyr/projects/rex/prj_rex.conf @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/zephyr/projects/rex/rex.dts b/zephyr/projects/rex/rex.dts index c761cb7cfe..0569befc10 100644 --- a/zephyr/projects/rex/rex.dts +++ b/zephyr/projects/rex/rex.dts @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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,12 +69,6 @@ psl-in-pol = "high-rising"; }; -&psl_in3_gp01 { - /* GSC_EC_PWR_BTN_ODL */ - psl-in-mode = "edge"; - psl-in-pol = "low-falling"; -}; - &psl_in4_gp02 { /* MECH_PWR_BTN_ODL */ psl-in-mode = "edge"; @@ -92,8 +86,8 @@ &adc0 { pinctrl-0 = <&adc0_chan0_gp45 &adc0_chan1_gp44 - &adc0_chan7_gpe1 - &adc0_chan8_gpf1>; + &adc0_chan8_gpf1 + &adc0_chan7_gpe1>; pinctrl-names = "default"; }; diff --git a/zephyr/projects/rex/rex0_gpio.csv b/zephyr/projects/rex/rex0_gpio.csv index 2283ff415d..5c20f6fb00 100644 --- a/zephyr/projects/rex/rex0_gpio.csv +++ b/zephyr/projects/rex/rex0_gpio.csv @@ -34,7 +34,7 @@ TEMP_SENSOR_4,F3,ADC,ADC_TEMP_SENSOR_4 TEMP_SENSOR_3,G3,ADC,ADC_TEMP_SENSOR_3 SYS_RST_ODL,H7,INPUT, EC_SOC_WAKE_R_ODL,H8,OUTPUT_ODL, -EC_PROCHOT_ODL,J2,OUTPUT_ODL, +EC_PROCHOT_ODL,J2,OUTPUT_ODR, EC_SOC_INT_ODL,J4,OUTPUT_ODL,GPIO_EC_INT_L EC_SOC_RTCRST,J5,OUTPUT_ODR, EC_SOC_PWR_BTN_ODL,H9,OUTPUT_ODL,GPIO_PCH_PWRBTN_L diff --git a/zephyr/projects/rex/src/board_power.c b/zephyr/projects/rex/src/board_power.c index 922d2f8324..c7f12d024e 100644 --- a/zephyr/projects/rex/src/board_power.c +++ b/zephyr/projects/rex/src/board_power.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/rex/src/usb_pd_policy.c b/zephyr/projects/rex/src/usb_pd_policy.c index b61fcd6b70..7e9876f9c1 100644 --- a/zephyr/projects/rex/src/usb_pd_policy.c +++ b/zephyr/projects/rex/src/usb_pd_policy.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/rex/src/usbc_config.c b/zephyr/projects/rex/src/usbc_config.c index 1add443b50..3aeaac8977 100644 --- a/zephyr/projects/rex/src/usbc_config.c +++ b/zephyr/projects/rex/src/usbc_config.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/rex/temp_sensors.dts b/zephyr/projects/rex/temp_sensors.dts new file mode 100644 index 0000000000..53025785d4 --- /dev/null +++ b/zephyr/projects/rex/temp_sensors.dts @@ -0,0 +1,63 @@ +/* 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. + */ + +#include <cros/thermistor/thermistor.dtsi> + +/ { + named-temp-sensors { + ddr_soc { + compatible = "cros-ec,temp-sensor-thermistor", + "cros-ec,temp-sensor"; + thermistor = <&thermistor_3V3_30K9_47K_4050B>; + enum-name = "TEMP_SENSOR_1_DDR_SOC"; + temp_fan_off = <35>; + temp_fan_max = <60>; + temp_host_high = <85>; + temp_host_halt = <90>; + temp_host_release_high = <80>; + adc = <&adc_ddr_soc>; + }; + ambient { + compatible = "cros-ec,temp-sensor-thermistor", + "cros-ec,temp-sensor"; + thermistor = <&thermistor_3V3_30K9_47K_4050B>; + enum-name = "TEMP_SENSOR_2_AMBIENT"; + temp_fan_off = <35>; + temp_fan_max = <60>; + temp_host_high = <85>; + temp_host_halt = <90>; + temp_host_release_high = <80>; + adc = <&adc_ambient>; + }; + charger { + compatible = "cros-ec,temp-sensor-thermistor", + "cros-ec,temp-sensor"; + thermistor = <&thermistor_3V3_30K9_47K_4050B>; + enum-name = "TEMP_SENSOR_3_CHARGER"; + temp_fan_off = <35>; + temp_fan_max = <65>; + temp_host_high = <105>; + temp_host_halt = <120>; + temp_host_release_high = <90>; + adc = <&adc_charger>; + }; + wwan { + compatible = "cros-ec,temp-sensor-thermistor", + "cros-ec,temp-sensor"; + thermistor = <&thermistor_3V3_30K9_47K_4050B>; + enum-name = "TEMP_SENSOR_4_WWAN"; + temp_fan_off = <35>; + temp_fan_max = <60>; + temp_host_high = <130>; + temp_host_halt = <130>; + temp_host_release_high = <100>; + adc = <&adc_wwan>; + }; + }; +}; + +&thermistor_3V3_30K9_47K_4050B { + status = "okay"; +}; diff --git a/zephyr/projects/rex/usbc.dts b/zephyr/projects/rex/usbc.dts index 3c16d77935..8b3d0aa316 100644 --- a/zephyr/projects/rex/usbc.dts +++ b/zephyr/projects/rex/usbc.dts @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ @@ -15,7 +15,11 @@ ppc = <&ppc_port0_syv>; tcpc = <&tcpc_port0>; chg = <&charger>; - usb-muxes = <&usb_c0_hb_retimer &virtual_mux_c0>; + usb-mux-chain-0 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&usb_c0_hb_retimer + &virtual_mux_c0>; + }; }; port0-muxes { virtual_mux_c0: virtual-mux-c0 { diff --git a/zephyr/projects/skyrim/BUILD.py b/zephyr/projects/skyrim/BUILD.py index 7a7f209e07..bc582a7eae 100644 --- a/zephyr/projects/skyrim/BUILD.py +++ b/zephyr/projects/skyrim/BUILD.py @@ -1,4 +1,4 @@ -# Copyright 2021 The ChromiumOS Authors. +# 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. diff --git a/zephyr/projects/skyrim/CMakeLists.txt b/zephyr/projects/skyrim/CMakeLists.txt index 0a3f4b999f..8e2b7121ca 100644 --- a/zephyr/projects/skyrim/CMakeLists.txt +++ b/zephyr/projects/skyrim/CMakeLists.txt @@ -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. diff --git a/zephyr/projects/skyrim/Kconfig b/zephyr/projects/skyrim/Kconfig index 36e8b5a659..d2ef60fa52 100644 --- a/zephyr/projects/skyrim/Kconfig +++ b/zephyr/projects/skyrim/Kconfig @@ -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. diff --git a/zephyr/projects/skyrim/adc.dts b/zephyr/projects/skyrim/adc.dts index 3f044cecc8..e6f57b39fd 100644 --- a/zephyr/projects/skyrim/adc.dts +++ b/zephyr/projects/skyrim/adc.dts @@ -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. */ diff --git a/zephyr/projects/skyrim/battery_morthal.dts b/zephyr/projects/skyrim/battery_morthal.dts index b9fc0d1090..8c87cef7f9 100644 --- a/zephyr/projects/skyrim/battery_morthal.dts +++ b/zephyr/projects/skyrim/battery_morthal.dts @@ -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. */ diff --git a/zephyr/projects/skyrim/battery_skyrim.dts b/zephyr/projects/skyrim/battery_skyrim.dts index b9fc0d1090..8c87cef7f9 100644 --- a/zephyr/projects/skyrim/battery_skyrim.dts +++ b/zephyr/projects/skyrim/battery_skyrim.dts @@ -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. */ diff --git a/zephyr/projects/skyrim/battery_winterhold.dts b/zephyr/projects/skyrim/battery_winterhold.dts index f6f65b9e93..776d74cdff 100644 --- a/zephyr/projects/skyrim/battery_winterhold.dts +++ b/zephyr/projects/skyrim/battery_winterhold.dts @@ -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. */ diff --git a/zephyr/projects/skyrim/fan.dts b/zephyr/projects/skyrim/fan.dts index 0b4c56e4c3..f0bc28cb7e 100644 --- a/zephyr/projects/skyrim/fan.dts +++ b/zephyr/projects/skyrim/fan.dts @@ -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. */ diff --git a/zephyr/projects/skyrim/gpio.dts b/zephyr/projects/skyrim/gpio.dts index 5d2fdc71fc..3251104cc5 100644 --- a/zephyr/projects/skyrim/gpio.dts +++ b/zephyr/projects/skyrim/gpio.dts @@ -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. */ diff --git a/zephyr/projects/skyrim/i2c.dts b/zephyr/projects/skyrim/i2c.dts index b5ac0f476b..381a375cac 100644 --- a/zephyr/projects/skyrim/i2c.dts +++ b/zephyr/projects/skyrim/i2c.dts @@ -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. */ diff --git a/zephyr/projects/skyrim/interrupts.dts b/zephyr/projects/skyrim/interrupts.dts index 5ac0cd6d00..0749b72078 100644 --- a/zephyr/projects/skyrim/interrupts.dts +++ b/zephyr/projects/skyrim/interrupts.dts @@ -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. */ diff --git a/zephyr/projects/skyrim/keyboard.dts b/zephyr/projects/skyrim/keyboard.dts index 1b6045ce6b..df334ba54c 100644 --- a/zephyr/projects/skyrim/keyboard.dts +++ b/zephyr/projects/skyrim/keyboard.dts @@ -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. */ diff --git a/zephyr/projects/skyrim/led_pins_morthal.dts b/zephyr/projects/skyrim/led_pins_morthal.dts index 1c6bf60375..33a66c0756 100644 --- a/zephyr/projects/skyrim/led_pins_morthal.dts +++ b/zephyr/projects/skyrim/led_pins_morthal.dts @@ -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. */ diff --git a/zephyr/projects/skyrim/led_pins_skyrim.dts b/zephyr/projects/skyrim/led_pins_skyrim.dts index 1c6bf60375..33a66c0756 100644 --- a/zephyr/projects/skyrim/led_pins_skyrim.dts +++ b/zephyr/projects/skyrim/led_pins_skyrim.dts @@ -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. */ diff --git a/zephyr/projects/skyrim/led_pins_winterhold.dts b/zephyr/projects/skyrim/led_pins_winterhold.dts index 1c6bf60375..33a66c0756 100644 --- a/zephyr/projects/skyrim/led_pins_winterhold.dts +++ b/zephyr/projects/skyrim/led_pins_winterhold.dts @@ -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. */ diff --git a/zephyr/projects/skyrim/morthal.dts b/zephyr/projects/skyrim/morthal.dts index 0631627354..3e6fa0ebfd 100644 --- a/zephyr/projects/skyrim/morthal.dts +++ b/zephyr/projects/skyrim/morthal.dts @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ @@ -124,4 +124,25 @@ 0 0 1>; }; }; + + ppc_port0: aoz1380 { + compatible = "aoz,aoz1380"; + status = "okay"; + }; +}; + +&i2c1_0 { + ppc_port1: nx20p348x@71 { + compatible = "nxp,nx20p348x"; + status = "okay"; + reg = <0x71>; + }; +}; + +&usbc_port0 { + ppc = <&ppc_port0>; +}; + +&usbc_port1 { + ppc = <&ppc_port1>; }; diff --git a/zephyr/projects/skyrim/motionsense.dts b/zephyr/projects/skyrim/motionsense.dts index dd140bd971..f943bea4c8 100644 --- a/zephyr/projects/skyrim/motionsense.dts +++ b/zephyr/projects/skyrim/motionsense.dts @@ -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. */ diff --git a/zephyr/projects/skyrim/prj.conf b/zephyr/projects/skyrim/prj.conf index 0f08fd0fe1..5c20f82588 100644 --- a/zephyr/projects/skyrim/prj.conf +++ b/zephyr/projects/skyrim/prj.conf @@ -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. diff --git a/zephyr/projects/skyrim/prj_morthal.conf b/zephyr/projects/skyrim/prj_morthal.conf index 28c118ff12..3d2b3fddb7 100644 --- a/zephyr/projects/skyrim/prj_morthal.conf +++ b/zephyr/projects/skyrim/prj_morthal.conf @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/zephyr/projects/skyrim/prj_skyrim.conf b/zephyr/projects/skyrim/prj_skyrim.conf index 325fdb55a8..6a0ced86dd 100644 --- a/zephyr/projects/skyrim/prj_skyrim.conf +++ b/zephyr/projects/skyrim/prj_skyrim.conf @@ -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. diff --git a/zephyr/projects/skyrim/prj_winterhold.conf b/zephyr/projects/skyrim/prj_winterhold.conf index d0808a3767..3e6c967c6d 100644 --- a/zephyr/projects/skyrim/prj_winterhold.conf +++ b/zephyr/projects/skyrim/prj_winterhold.conf @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/zephyr/projects/skyrim/skyrim.dts b/zephyr/projects/skyrim/skyrim.dts index 908eb05dc8..818c2d3e43 100644 --- a/zephyr/projects/skyrim/skyrim.dts +++ b/zephyr/projects/skyrim/skyrim.dts @@ -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. */ @@ -20,7 +20,7 @@ temp_host_halt = <105>; temp_host_release_high = <80>; temp_host_release_halt = <80>; - temp_fan_off = <0>; + temp_fan_off = <35>; temp_fan_max = <70>; power-good-pin = <&gpio_pg_pwr_s5>; }; @@ -142,6 +142,19 @@ 0 0 1>; }; }; + + ppc_port0: aoz1380 { + compatible = "aoz,aoz1380"; + status = "okay"; + }; +}; + +&i2c1_0 { + ppc_port1: nx20p348x@71 { + compatible = "nxp,nx20p348x"; + status = "okay"; + reg = <0x71>; + }; }; &i2c4_1 { @@ -154,4 +167,9 @@ &usbc_port0 { chg_alt = <&alt_charger>; + ppc = <&ppc_port0>; +}; + +&usbc_port1 { + ppc = <&ppc_port1>; }; diff --git a/zephyr/projects/skyrim/src/common.c b/zephyr/projects/skyrim/src/common.c index 5a0e03a665..af82139c1b 100644 --- a/zephyr/projects/skyrim/src/common.c +++ b/zephyr/projects/skyrim/src/common.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/skyrim/src/power_signals.c b/zephyr/projects/skyrim/src/power_signals.c index ec0364519e..3c56e51ddc 100644 --- a/zephyr/projects/skyrim/src/power_signals.c +++ b/zephyr/projects/skyrim/src/power_signals.c @@ -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. */ diff --git a/zephyr/projects/skyrim/src/skyrim/alt_charger.c b/zephyr/projects/skyrim/src/skyrim/alt_charger.c index b6e32b9dfb..4b717901cd 100644 --- a/zephyr/projects/skyrim/src/skyrim/alt_charger.c +++ b/zephyr/projects/skyrim/src/skyrim/alt_charger.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/skyrim/src/skyrim/fan.c b/zephyr/projects/skyrim/src/skyrim/fan.c index 71896420da..70d512bb78 100644 --- a/zephyr/projects/skyrim/src/skyrim/fan.c +++ b/zephyr/projects/skyrim/src/skyrim/fan.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/skyrim/src/skyrim/form_factor.c b/zephyr/projects/skyrim/src/skyrim/form_factor.c index 216a31cd3f..f137c6db31 100644 --- a/zephyr/projects/skyrim/src/skyrim/form_factor.c +++ b/zephyr/projects/skyrim/src/skyrim/form_factor.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/skyrim/src/stt.c b/zephyr/projects/skyrim/src/stt.c index e78e712737..15d5e4dbea 100644 --- a/zephyr/projects/skyrim/src/stt.c +++ b/zephyr/projects/skyrim/src/stt.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/projects/skyrim/src/usb_pd_policy.c b/zephyr/projects/skyrim/src/usb_pd_policy.c index 1d6457278a..ec9f873863 100644 --- a/zephyr/projects/skyrim/src/usb_pd_policy.c +++ b/zephyr/projects/skyrim/src/usb_pd_policy.c @@ -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. */ diff --git a/zephyr/projects/skyrim/src/usbc_config.c b/zephyr/projects/skyrim/src/usbc_config.c index 851dc33560..7f969ecb17 100644 --- a/zephyr/projects/skyrim/src/usbc_config.c +++ b/zephyr/projects/skyrim/src/usbc_config.c @@ -1,4 +1,4 @@ -/* Copyright 2021 The ChromiumOS Authors. +/* 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. */ @@ -83,21 +83,6 @@ static void usb_fault_interrupt_disable(void) DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN, usb_fault_interrupt_disable, HOOK_PRIO_DEFAULT); -struct ppc_config_t ppc_chips[] = { - [USBC_PORT_C0] = { - /* Device does not talk I2C */ - .drv = &aoz1380_drv - }, - - [USBC_PORT_C1] = { - .i2c_port = I2C_PORT_TCPC1, - .i2c_addr_flags = NX20P3483_ADDR1_FLAGS, - .drv = &nx20p348x_drv - }, -}; -BUILD_ASSERT(ARRAY_SIZE(ppc_chips) == CONFIG_USB_PD_PORT_MAX_COUNT); -unsigned int ppc_cnt = ARRAY_SIZE(ppc_chips); - /* * .init is not necessary here because it has nothing * to do. Primary mux will handle mux state so .get is @@ -113,14 +98,20 @@ struct usb_mux_driver ioex_sbu_mux_driver = { * Since NX3DV221GM is not a i2c device, .i2c_port and * .i2c_addr_flags are not required here. */ -struct usb_mux usbc0_sbu_mux = { - .usb_port = USBC_PORT_C0, - .driver = &ioex_sbu_mux_driver, +struct usb_mux_chain usbc0_sbu_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C0, + .driver = &ioex_sbu_mux_driver, + }, }; -struct usb_mux usbc1_sbu_mux = { - .usb_port = USBC_PORT_C1, - .driver = &ioex_sbu_mux_driver, +struct usb_mux_chain usbc1_sbu_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &ioex_sbu_mux_driver, + }, }; int baseboard_anx7483_c0_mux_set(const struct usb_mux *me, @@ -180,13 +171,16 @@ int baseboard_anx7483_c1_mux_set(const struct usb_mux *me, return EC_SUCCESS; } -struct usb_mux usbc0_anx7483 = { - .usb_port = USBC_PORT_C0, - .i2c_port = I2C_PORT_TCPC0, - .i2c_addr_flags = ANX7483_I2C_ADDR0_FLAGS, - .driver = &anx7483_usb_retimer_driver, - .board_set = &baseboard_anx7483_c0_mux_set, - .next_mux = &usbc0_sbu_mux, +struct usb_mux_chain usbc0_anx7483 = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C0, + .i2c_port = I2C_PORT_TCPC0, + .i2c_addr_flags = ANX7483_I2C_ADDR0_FLAGS, + .driver = &anx7483_usb_retimer_driver, + .board_set = &baseboard_anx7483_c0_mux_set, + }, + .next = &usbc0_sbu_mux, }; __overridable int board_c1_ps8818_mux_set(const struct usb_mux *me, @@ -203,38 +197,48 @@ __overridable int board_c1_ps8818_mux_set(const struct usb_mux *me, return 0; } -struct usb_mux usbc1_ps8818 = { - .usb_port = USBC_PORT_C1, - .i2c_port = I2C_PORT_TCPC1, - .flags = USB_MUX_FLAG_RESETS_IN_G3, - .i2c_addr_flags = PS8818_I2C_ADDR_FLAGS, - .driver = &ps8818_usb_retimer_driver, - .board_set = &board_c1_ps8818_mux_set, +struct usb_mux_chain usbc1_ps8818 = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .i2c_port = I2C_PORT_TCPC1, + .flags = USB_MUX_FLAG_RESETS_IN_G3, + .i2c_addr_flags = PS8818_I2C_ADDR_FLAGS, + .driver = &ps8818_usb_retimer_driver, + .board_set = &board_c1_ps8818_mux_set, + }, }; -struct usb_mux usbc1_anx7483 = { - .usb_port = USBC_PORT_C1, - .i2c_port = I2C_PORT_TCPC1, - .i2c_addr_flags = ANX7483_I2C_ADDR0_FLAGS, - .driver = &anx7483_usb_retimer_driver, - .board_set = &baseboard_anx7483_c1_mux_set, - .next_mux = &usbc1_sbu_mux, +struct usb_mux_chain usbc1_anx7483 = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .i2c_port = I2C_PORT_TCPC1, + .i2c_addr_flags = ANX7483_I2C_ADDR0_FLAGS, + .driver = &anx7483_usb_retimer_driver, + .board_set = &baseboard_anx7483_c1_mux_set, + }, + .next = &usbc1_sbu_mux, }; -struct usb_mux usb_muxes[] = { +struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .i2c_port = I2C_PORT_USB_MUX, - .i2c_addr_flags = AMD_FP6_C0_MUX_I2C_ADDR, - .driver = &amd_fp6_usb_mux_driver, - .next_mux = &usbc0_anx7483, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .i2c_port = I2C_PORT_USB_MUX, + .i2c_addr_flags = AMD_FP6_C0_MUX_I2C_ADDR, + .driver = &amd_fp6_usb_mux_driver, + }, + .next = &usbc0_anx7483, }, [USBC_PORT_C1] = { - .usb_port = USBC_PORT_C1, - .i2c_port = I2C_PORT_USB_MUX, - .i2c_addr_flags = AMD_FP6_C4_MUX_I2C_ADDR, - .driver = &amd_fp6_usb_mux_driver, - /* .next_mux = filled in by setup_mux based on fw_config */ + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C1, + .i2c_port = I2C_PORT_USB_MUX, + .i2c_addr_flags = AMD_FP6_C4_MUX_I2C_ADDR, + .driver = &amd_fp6_usb_mux_driver, + }, + /* .next = filled in by setup_mux based on fw_config */ } }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == CONFIG_USB_PD_PORT_MAX_COUNT); @@ -274,10 +278,10 @@ static void setup_mux(void) if (val == FW_IO_DB_PS8811_PS8818) { CPRINTSUSB("C1: Setting PS8818 mux"); - usb_muxes[USBC_PORT_C1].next_mux = &usbc1_ps8818; + usb_muxes[USBC_PORT_C1].next = &usbc1_ps8818; } else if (val == FW_IO_DB_NONE_ANX7483) { CPRINTSUSB("C1: Setting ANX7483 mux"); - usb_muxes[USBC_PORT_C1].next_mux = &usbc1_anx7483; + usb_muxes[USBC_PORT_C1].next = &usbc1_anx7483; } else { CPRINTSUSB("Unexpected DB_IO board: %d", val); } diff --git a/zephyr/projects/skyrim/src/winterhold/usbc_config.c b/zephyr/projects/skyrim/src/winterhold/usbc_config.c index 09eb3adfdf..0623079191 100644 --- a/zephyr/projects/skyrim/src/winterhold/usbc_config.c +++ b/zephyr/projects/skyrim/src/winterhold/usbc_config.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ @@ -82,18 +82,6 @@ static void usb_fault_interrupt_disable(void) DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN, usb_fault_interrupt_disable, HOOK_PRIO_DEFAULT); -struct ppc_config_t ppc_chips[] = { - [USBC_PORT_C0] = { .i2c_port = I2C_PORT_TCPC0, - .i2c_addr_flags = NX20P3483_ADDR1_FLAGS, - .drv = &nx20p348x_drv }, - - [USBC_PORT_C1] = { .i2c_port = I2C_PORT_TCPC1, - .i2c_addr_flags = NX20P3483_ADDR1_FLAGS, - .drv = &nx20p348x_drv }, -}; -BUILD_ASSERT(ARRAY_SIZE(ppc_chips) == CONFIG_USB_PD_PORT_MAX_COUNT); -unsigned int ppc_cnt = ARRAY_SIZE(ppc_chips); - /* * .init is not necessary here because it has nothing * to do. Primary mux will handle mux state so .get is @@ -109,14 +97,20 @@ struct usb_mux_driver ioex_sbu_mux_driver = { * Since NX3DV221GM is not a i2c device, .i2c_port and * .i2c_addr_flags are not required here. */ -struct usb_mux usbc0_sbu_mux = { - .usb_port = USBC_PORT_C0, - .driver = &ioex_sbu_mux_driver, +struct usb_mux_chain usbc0_sbu_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C0, + .driver = &ioex_sbu_mux_driver, + }, }; -struct usb_mux usbc1_sbu_mux = { - .usb_port = USBC_PORT_C1, - .driver = &ioex_sbu_mux_driver, +struct usb_mux_chain usbc1_sbu_mux = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &ioex_sbu_mux_driver, + }, }; int baseboard_anx7483_c0_mux_set(const struct usb_mux *me, @@ -176,13 +170,16 @@ int baseboard_anx7483_c1_mux_set(const struct usb_mux *me, return EC_SUCCESS; } -struct usb_mux usbc0_anx7483 = { - .usb_port = USBC_PORT_C0, - .i2c_port = I2C_PORT_TCPC0, - .i2c_addr_flags = ANX7483_I2C_ADDR0_FLAGS, - .driver = &anx7483_usb_retimer_driver, - .board_set = &baseboard_anx7483_c0_mux_set, - .next_mux = &usbc0_sbu_mux, +struct usb_mux_chain usbc0_anx7483 = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C0, + .i2c_port = I2C_PORT_TCPC0, + .i2c_addr_flags = ANX7483_I2C_ADDR0_FLAGS, + .driver = &anx7483_usb_retimer_driver, + .board_set = &baseboard_anx7483_c0_mux_set, + }, + .next = &usbc0_sbu_mux, }; __overridable int board_c1_ps8818_mux_set(const struct usb_mux *me, @@ -199,38 +196,48 @@ __overridable int board_c1_ps8818_mux_set(const struct usb_mux *me, return 0; } -struct usb_mux usbc1_ps8818 = { - .usb_port = USBC_PORT_C1, - .i2c_port = I2C_PORT_TCPC1, - .flags = USB_MUX_FLAG_RESETS_IN_G3, - .i2c_addr_flags = PS8818_I2C_ADDR_FLAGS, - .driver = &ps8818_usb_retimer_driver, - .board_set = &board_c1_ps8818_mux_set, +struct usb_mux_chain usbc1_ps8818 = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .i2c_port = I2C_PORT_TCPC1, + .flags = USB_MUX_FLAG_RESETS_IN_G3, + .i2c_addr_flags = PS8818_I2C_ADDR_FLAGS, + .driver = &ps8818_usb_retimer_driver, + .board_set = &board_c1_ps8818_mux_set, + }, }; -struct usb_mux usbc1_anx7483 = { - .usb_port = USBC_PORT_C1, - .i2c_port = I2C_PORT_TCPC1, - .i2c_addr_flags = ANX7483_I2C_ADDR0_FLAGS, - .driver = &anx7483_usb_retimer_driver, - .board_set = &baseboard_anx7483_c1_mux_set, - .next_mux = &usbc1_sbu_mux, +struct usb_mux_chain usbc1_anx7483 = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .i2c_port = I2C_PORT_TCPC1, + .i2c_addr_flags = ANX7483_I2C_ADDR0_FLAGS, + .driver = &anx7483_usb_retimer_driver, + .board_set = &baseboard_anx7483_c1_mux_set, + }, + .next = &usbc1_sbu_mux, }; -struct usb_mux usb_muxes[] = { +struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .i2c_port = I2C_PORT_USB_MUX, - .i2c_addr_flags = AMD_FP6_C0_MUX_I2C_ADDR, - .driver = &amd_fp6_usb_mux_driver, - .next_mux = &usbc0_anx7483, + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C0, + .i2c_port = I2C_PORT_USB_MUX, + .i2c_addr_flags = AMD_FP6_C0_MUX_I2C_ADDR, + .driver = &amd_fp6_usb_mux_driver, + }, + .next = &usbc0_anx7483, }, [USBC_PORT_C1] = { - .usb_port = USBC_PORT_C1, - .i2c_port = I2C_PORT_USB_MUX, - .i2c_addr_flags = AMD_FP6_C4_MUX_I2C_ADDR, - .driver = &amd_fp6_usb_mux_driver, - /* .next_mux = filled in by setup_mux based on fw_config */ + .mux = &(const struct usb_mux) { + .usb_port = USBC_PORT_C1, + .i2c_port = I2C_PORT_USB_MUX, + .i2c_addr_flags = AMD_FP6_C4_MUX_I2C_ADDR, + .driver = &amd_fp6_usb_mux_driver, + }, + /* .next = filled in by setup_mux based on fw_config */ } }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == CONFIG_USB_PD_PORT_MAX_COUNT); @@ -270,10 +277,10 @@ static void setup_mux(void) if (val == FW_IO_DB_PS8811_PS8818) { CPRINTSUSB("C1: Setting PS8818 mux"); - usb_muxes[USBC_PORT_C1].next_mux = &usbc1_ps8818; + usb_muxes[USBC_PORT_C1].next = &usbc1_ps8818; } else if (val == FW_IO_DB_NONE_ANX7483) { CPRINTSUSB("C1: Setting ANX7483 mux"); - usb_muxes[USBC_PORT_C1].next_mux = &usbc1_anx7483; + usb_muxes[USBC_PORT_C1].next = &usbc1_anx7483; } else { CPRINTSUSB("Unexpected DB_IO board: %d", val); } diff --git a/zephyr/projects/skyrim/usbc.dts b/zephyr/projects/skyrim/usbc.dts index 582d35ac04..8486927e8d 100644 --- a/zephyr/projects/skyrim/usbc.dts +++ b/zephyr/projects/skyrim/usbc.dts @@ -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. */ @@ -16,7 +16,7 @@ chg = <&charger>; }; - port1@1 { + usbc_port1: port1@1 { compatible = "named-usbc-port"; reg = <1>; bc12 = <&bc12_port1>; diff --git a/zephyr/projects/skyrim/winterhold.dts b/zephyr/projects/skyrim/winterhold.dts index accdfea218..dd6639d9a9 100644 --- a/zephyr/projects/skyrim/winterhold.dts +++ b/zephyr/projects/skyrim/winterhold.dts @@ -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. */ @@ -119,3 +119,27 @@ }; }; }; + +&i2c0_0 { + ppc_port0: nx20p348x@71 { + compatible = "nxp,nx20p348x"; + status = "okay"; + reg = <0x71>; + }; +}; + +&i2c1_0 { + ppc_port1: nx20p348x@71 { + compatible = "nxp,nx20p348x"; + status = "okay"; + reg = <0x71>; + }; +}; + +&usbc_port0 { + ppc = <&ppc_port0>; +}; + +&usbc_port1 { + ppc = <&ppc_port1>; +}; diff --git a/zephyr/projects/trogdor/lazor/BUILD.py b/zephyr/projects/trogdor/lazor/BUILD.py index 8e7936f12f..ca1a26bdcf 100644 --- a/zephyr/projects/trogdor/lazor/BUILD.py +++ b/zephyr/projects/trogdor/lazor/BUILD.py @@ -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. diff --git a/zephyr/projects/trogdor/lazor/CMakeLists.txt b/zephyr/projects/trogdor/lazor/CMakeLists.txt index a27c4d09ab..b6d5024707 100644 --- a/zephyr/projects/trogdor/lazor/CMakeLists.txt +++ b/zephyr/projects/trogdor/lazor/CMakeLists.txt @@ -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. diff --git a/zephyr/projects/trogdor/lazor/adc.dts b/zephyr/projects/trogdor/lazor/adc.dts index 4253952872..b834001587 100644 --- a/zephyr/projects/trogdor/lazor/adc.dts +++ b/zephyr/projects/trogdor/lazor/adc.dts @@ -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. */ diff --git a/zephyr/projects/trogdor/lazor/battery.dts b/zephyr/projects/trogdor/lazor/battery.dts index 0fbb1bf359..2b17dd4761 100644 --- a/zephyr/projects/trogdor/lazor/battery.dts +++ b/zephyr/projects/trogdor/lazor/battery.dts @@ -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. */ diff --git a/zephyr/projects/trogdor/lazor/default_gpio_pinctrl.dts b/zephyr/projects/trogdor/lazor/default_gpio_pinctrl.dts index 7c752f634d..1819bdbc3e 100644 --- a/zephyr/projects/trogdor/lazor/default_gpio_pinctrl.dts +++ b/zephyr/projects/trogdor/lazor/default_gpio_pinctrl.dts @@ -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. */ diff --git a/zephyr/projects/trogdor/lazor/display.dts b/zephyr/projects/trogdor/lazor/display.dts index 94a95193e2..65d3a2d91b 100644 --- a/zephyr/projects/trogdor/lazor/display.dts +++ b/zephyr/projects/trogdor/lazor/display.dts @@ -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. */ diff --git a/zephyr/projects/trogdor/lazor/gpio.dts b/zephyr/projects/trogdor/lazor/gpio.dts index d1744b5e82..a047d7e2f2 100644 --- a/zephyr/projects/trogdor/lazor/gpio.dts +++ b/zephyr/projects/trogdor/lazor/gpio.dts @@ -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. */ diff --git a/zephyr/projects/trogdor/lazor/gpio_led.dts b/zephyr/projects/trogdor/lazor/gpio_led.dts index d85c6dd1df..c8c026506b 100644 --- a/zephyr/projects/trogdor/lazor/gpio_led.dts +++ b/zephyr/projects/trogdor/lazor/gpio_led.dts @@ -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. */ diff --git a/zephyr/projects/trogdor/lazor/host_interface_npcx.dts b/zephyr/projects/trogdor/lazor/host_interface_npcx.dts index 9c6a498940..14efa3c6b2 100644 --- a/zephyr/projects/trogdor/lazor/host_interface_npcx.dts +++ b/zephyr/projects/trogdor/lazor/host_interface_npcx.dts @@ -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. */ diff --git a/zephyr/projects/trogdor/lazor/i2c.dts b/zephyr/projects/trogdor/lazor/i2c.dts index 264d08f487..e19ad224a9 100644 --- a/zephyr/projects/trogdor/lazor/i2c.dts +++ b/zephyr/projects/trogdor/lazor/i2c.dts @@ -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. */ diff --git a/zephyr/projects/trogdor/lazor/include/sku.h b/zephyr/projects/trogdor/lazor/include/sku.h index 492d1623dd..76825bbba1 100644 --- a/zephyr/projects/trogdor/lazor/include/sku.h +++ b/zephyr/projects/trogdor/lazor/include/sku.h @@ -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. */ diff --git a/zephyr/projects/trogdor/lazor/interrupts.dts b/zephyr/projects/trogdor/lazor/interrupts.dts index da9b5297ef..5c2ed35e90 100644 --- a/zephyr/projects/trogdor/lazor/interrupts.dts +++ b/zephyr/projects/trogdor/lazor/interrupts.dts @@ -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. */ diff --git a/zephyr/projects/trogdor/lazor/keyboard.dts b/zephyr/projects/trogdor/lazor/keyboard.dts index 4e3003f6cf..b8689b883c 100644 --- a/zephyr/projects/trogdor/lazor/keyboard.dts +++ b/zephyr/projects/trogdor/lazor/keyboard.dts @@ -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. */ diff --git a/zephyr/projects/trogdor/lazor/motionsense.dts b/zephyr/projects/trogdor/lazor/motionsense.dts index 583444daec..75fe31b997 100644 --- a/zephyr/projects/trogdor/lazor/motionsense.dts +++ b/zephyr/projects/trogdor/lazor/motionsense.dts @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/zephyr/projects/trogdor/lazor/prj.conf b/zephyr/projects/trogdor/lazor/prj.conf index 9cc212bcf0..358de69d68 100644 --- a/zephyr/projects/trogdor/lazor/prj.conf +++ b/zephyr/projects/trogdor/lazor/prj.conf @@ -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. diff --git a/zephyr/projects/trogdor/lazor/pwm_led.dts b/zephyr/projects/trogdor/lazor/pwm_led.dts index 5954e18192..0582966d6a 100644 --- a/zephyr/projects/trogdor/lazor/pwm_led.dts +++ b/zephyr/projects/trogdor/lazor/pwm_led.dts @@ -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. */ diff --git a/zephyr/projects/trogdor/lazor/src/hibernate.c b/zephyr/projects/trogdor/lazor/src/hibernate.c index 58ab375ca8..388ff1b087 100644 --- a/zephyr/projects/trogdor/lazor/src/hibernate.c +++ b/zephyr/projects/trogdor/lazor/src/hibernate.c @@ -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. */ diff --git a/zephyr/projects/trogdor/lazor/src/i2c.c b/zephyr/projects/trogdor/lazor/src/i2c.c index 89e576f81a..6d737b410f 100644 --- a/zephyr/projects/trogdor/lazor/src/i2c.c +++ b/zephyr/projects/trogdor/lazor/src/i2c.c @@ -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. */ diff --git a/zephyr/projects/trogdor/lazor/src/power.c b/zephyr/projects/trogdor/lazor/src/power.c index beca598750..96f9bc43c5 100644 --- a/zephyr/projects/trogdor/lazor/src/power.c +++ b/zephyr/projects/trogdor/lazor/src/power.c @@ -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. */ diff --git a/zephyr/projects/trogdor/lazor/src/sku.c b/zephyr/projects/trogdor/lazor/src/sku.c index cfc55fcdf3..1d88437031 100644 --- a/zephyr/projects/trogdor/lazor/src/sku.c +++ b/zephyr/projects/trogdor/lazor/src/sku.c @@ -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. */ diff --git a/zephyr/projects/trogdor/lazor/src/switchcap.c b/zephyr/projects/trogdor/lazor/src/switchcap.c index 38616a21b8..d8205cbcfc 100644 --- a/zephyr/projects/trogdor/lazor/src/switchcap.c +++ b/zephyr/projects/trogdor/lazor/src/switchcap.c @@ -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. */ diff --git a/zephyr/projects/trogdor/lazor/src/usb_pd_policy.c b/zephyr/projects/trogdor/lazor/src/usb_pd_policy.c index a0549976cb..8d046826f9 100644 --- a/zephyr/projects/trogdor/lazor/src/usb_pd_policy.c +++ b/zephyr/projects/trogdor/lazor/src/usb_pd_policy.c @@ -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. */ diff --git a/zephyr/projects/trogdor/lazor/src/usbc_config.c b/zephyr/projects/trogdor/lazor/src/usbc_config.c index fdcd6678b0..f6bfdfb186 100644 --- a/zephyr/projects/trogdor/lazor/src/usbc_config.c +++ b/zephyr/projects/trogdor/lazor/src/usbc_config.c @@ -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. */ @@ -137,16 +137,22 @@ void tcpc_alert_event(enum gpio_signal signal) * to AP. But the TCPC chip is also needed to know the HPD status; otherwise, * the mux misbehaves. */ -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, }, { - .usb_port = 1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, + }, } }; diff --git a/zephyr/projects/trogdor/lazor/usbc.dts b/zephyr/projects/trogdor/lazor/usbc.dts index 95d271428a..7864c2716b 100644 --- a/zephyr/projects/trogdor/lazor/usbc.dts +++ b/zephyr/projects/trogdor/lazor/usbc.dts @@ -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. */ diff --git a/zephyr/shim/CMakeLists.txt b/zephyr/shim/CMakeLists.txt index e36101756a..5b8c815ae1 100644 --- a/zephyr/shim/CMakeLists.txt +++ b/zephyr/shim/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/shim/chip/CMakeLists.txt b/zephyr/shim/chip/CMakeLists.txt index 54281508aa..1d58857c11 100644 --- a/zephyr/shim/chip/CMakeLists.txt +++ b/zephyr/shim/chip/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/shim/chip/it8xxx2/CMakeLists.txt b/zephyr/shim/chip/it8xxx2/CMakeLists.txt index 539fd9f029..2a1c9d5909 100644 --- a/zephyr/shim/chip/it8xxx2/CMakeLists.txt +++ b/zephyr/shim/chip/it8xxx2/CMakeLists.txt @@ -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. diff --git a/zephyr/shim/chip/it8xxx2/clock.c b/zephyr/shim/chip/it8xxx2/clock.c index da57bbeb50..14dbc0e7eb 100644 --- a/zephyr/shim/chip/it8xxx2/clock.c +++ b/zephyr/shim/chip/it8xxx2/clock.c @@ -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. */ @@ -8,7 +8,6 @@ #include <zephyr/kernel.h> #include <zephyr/logging/log.h> #include <soc.h> -#include <zephyr/zephyr.h> #include <soc/ite_it8xxx2/reg_def_cros.h> #include <zephyr/sys/util.h> diff --git a/zephyr/shim/chip/it8xxx2/gpio.c b/zephyr/shim/chip/it8xxx2/gpio.c index 3baf128eab..7106b2a294 100644 --- a/zephyr/shim/chip/it8xxx2/gpio.c +++ b/zephyr/shim/chip/it8xxx2/gpio.c @@ -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. */ diff --git a/zephyr/shim/chip/it8xxx2/include/flash_chip.h b/zephyr/shim/chip/it8xxx2/include/flash_chip.h index 06b33ee6e1..00aaba05fd 100644 --- a/zephyr/shim/chip/it8xxx2/include/flash_chip.h +++ b/zephyr/shim/chip/it8xxx2/include/flash_chip.h @@ -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. */ diff --git a/zephyr/shim/chip/it8xxx2/keyboard_raw.c b/zephyr/shim/chip/it8xxx2/keyboard_raw.c index 480d528e41..0a117cda14 100644 --- a/zephyr/shim/chip/it8xxx2/keyboard_raw.c +++ b/zephyr/shim/chip/it8xxx2/keyboard_raw.c @@ -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. */ @@ -8,7 +8,7 @@ #include <zephyr/device.h> #include <zephyr/logging/log.h> #include <soc.h> -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include "drivers/cros_kb_raw.h" #include "keyboard_raw.h" diff --git a/zephyr/shim/chip/it8xxx2/power_policy.c b/zephyr/shim/chip/it8xxx2/power_policy.c index 978f620060..c8efb0ca96 100644 --- a/zephyr/shim/chip/it8xxx2/power_policy.c +++ b/zephyr/shim/chip/it8xxx2/power_policy.c @@ -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. */ @@ -6,7 +6,7 @@ #include <zephyr/pm/pm.h> #include <zephyr/pm/policy.h> #include <soc.h> -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include "system.h" diff --git a/zephyr/shim/chip/it8xxx2/system.c b/zephyr/shim/chip/it8xxx2/system.c index d9dcd7ccfb..e5f9cc5cf0 100644 --- a/zephyr/shim/chip/it8xxx2/system.c +++ b/zephyr/shim/chip/it8xxx2/system.c @@ -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. */ diff --git a/zephyr/shim/chip/mchp/CMakeLists.txt b/zephyr/shim/chip/mchp/CMakeLists.txt index 0948424275..f59a1be2b1 100644 --- a/zephyr/shim/chip/mchp/CMakeLists.txt +++ b/zephyr/shim/chip/mchp/CMakeLists.txt @@ -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. diff --git a/zephyr/shim/chip/mchp/Kconfig.xec b/zephyr/shim/chip/mchp/Kconfig.xec index 3b18b1c192..28a6b3ea3c 100644 --- a/zephyr/shim/chip/mchp/Kconfig.xec +++ b/zephyr/shim/chip/mchp/Kconfig.xec @@ -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. diff --git a/zephyr/shim/chip/mchp/clock.c b/zephyr/shim/chip/mchp/clock.c index 9328627a4b..6ee4cd931c 100644 --- a/zephyr/shim/chip/mchp/clock.c +++ b/zephyr/shim/chip/mchp/clock.c @@ -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. */ @@ -9,7 +9,6 @@ #include <zephyr/kernel.h> #include <zephyr/logging/log.h> #include <soc.h> -#include <zephyr/zephyr.h> #include "clock_chip.h" #include "module_id.h" diff --git a/zephyr/shim/chip/mchp/gpio.c b/zephyr/shim/chip/mchp/gpio.c index 3a16b9639d..7801c6f7cc 100644 --- a/zephyr/shim/chip/mchp/gpio.c +++ b/zephyr/shim/chip/mchp/gpio.c @@ -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. */ diff --git a/zephyr/shim/chip/mchp/include/clock_chip.h b/zephyr/shim/chip/mchp/include/clock_chip.h index c317ccb415..4c14d60ff9 100644 --- a/zephyr/shim/chip/mchp/include/clock_chip.h +++ b/zephyr/shim/chip/mchp/include/clock_chip.h @@ -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. */ diff --git a/zephyr/shim/chip/mchp/include/flash_chip.h b/zephyr/shim/chip/mchp/include/flash_chip.h index d2b71eea7d..de8138614c 100644 --- a/zephyr/shim/chip/mchp/include/flash_chip.h +++ b/zephyr/shim/chip/mchp/include/flash_chip.h @@ -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. */ diff --git a/zephyr/shim/chip/mchp/include/system_chip.h b/zephyr/shim/chip/mchp/include/system_chip.h index 5d60fff874..01cd1e7391 100644 --- a/zephyr/shim/chip/mchp/include/system_chip.h +++ b/zephyr/shim/chip/mchp/include/system_chip.h @@ -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. */ diff --git a/zephyr/shim/chip/mchp/keyboard_raw.c b/zephyr/shim/chip/mchp/keyboard_raw.c index 0b9280aa41..95ad642d12 100644 --- a/zephyr/shim/chip/mchp/keyboard_raw.c +++ b/zephyr/shim/chip/mchp/keyboard_raw.c @@ -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. */ @@ -8,7 +8,7 @@ #include <zephyr/device.h> #include <zephyr/logging/log.h> #include <soc.h> -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include "drivers/cros_kb_raw.h" #include "keyboard_raw.h" diff --git a/zephyr/shim/chip/mchp/system.c b/zephyr/shim/chip/mchp/system.c index 09ddefd6ee..35ba806533 100644 --- a/zephyr/shim/chip/mchp/system.c +++ b/zephyr/shim/chip/mchp/system.c @@ -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. */ diff --git a/zephyr/shim/chip/mchp/system_download_from_flash.c b/zephyr/shim/chip/mchp/system_download_from_flash.c index 409f84dd4b..ced7f4d89c 100644 --- a/zephyr/shim/chip/mchp/system_download_from_flash.c +++ b/zephyr/shim/chip/mchp/system_download_from_flash.c @@ -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. */ diff --git a/zephyr/shim/chip/mchp/system_external_storage.c b/zephyr/shim/chip/mchp/system_external_storage.c index 983cebd64e..4250b05fe3 100644 --- a/zephyr/shim/chip/mchp/system_external_storage.c +++ b/zephyr/shim/chip/mchp/system_external_storage.c @@ -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. */ diff --git a/zephyr/shim/chip/npcx/CMakeLists.txt b/zephyr/shim/chip/npcx/CMakeLists.txt index 3019118cf4..79b8cf2a62 100644 --- a/zephyr/shim/chip/npcx/CMakeLists.txt +++ b/zephyr/shim/chip/npcx/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/shim/chip/npcx/Kconfig.npcx b/zephyr/shim/chip/npcx/Kconfig.npcx index b044912ae1..5202d14448 100644 --- a/zephyr/shim/chip/npcx/Kconfig.npcx +++ b/zephyr/shim/chip/npcx/Kconfig.npcx @@ -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. @@ -15,4 +15,52 @@ config CROS_SYSTEM_NPCX_PRE_INIT_PRIORITY must be a lower priority than CONFIG_BBRAM_INIT_PRIORITY and must be a higher priority than PLATFORM_EC_SYSTEM_PRE_INIT. +config PLATFORM_EC_CONSOLE_CMD_GPIODBG + bool "Console command: gpiodbg" + depends on SOC_FAMILY_NPCX + help + Enable the "gpiodbg" command. This lists all IO pads used on platform + and turns on/off specific pad's input buffer to observe leakage + current through it. + + Example: + gpiodbg list + + IDX|ON| GPIO | Name + ---+--+------+---------- + 00 |* | io03 | recovery_l + 01 |* | io93 | wp_l + 02 |* | iod2 | ac_present + 03 |* | io00 | power_button_l + 04 |* | io01 | lid_open + 05 |* | io36 | entering_rw + 06 |* | io50 | pch_wake_l + 07 |* | ioc7 | pgood_fan + 08 |* | ioa5 | spi_cs_l + 09 |* | io64 | board_version1 + 10 |* | io65 | board_version2 + 11 |* | io66 | board_version3 + 12 |* | io52 | unused pin + 13 |* | io54 | unused pin + + gpiodbg off 11 + gpiodbg list + + IDX|ON| GPIO | Name + ---+--+------+---------- + 00 |* | io03 | recovery_l + 01 |* | io93 | wp_l + 02 |* | iod2 | ac_present + 03 |* | io00 | power_button_l + 04 |* | io01 | lid_open + 05 |* | io36 | entering_rw + 06 |* | io50 | pch_wake_l + 07 |* | ioc7 | pgood_fan + 08 |* | ioa5 | spi_cs_l + 09 |* | io64 | board_version1 + 10 |* | io65 | board_version2 + 11 | | io66 | board_version3 + 12 |* | io52 | unused pin + 13 |* | io54 | unused pin + endif # PLATFORM_EC diff --git a/zephyr/shim/chip/npcx/clock.c b/zephyr/shim/chip/npcx/clock.c index 48f47855ca..fc483ef775 100644 --- a/zephyr/shim/chip/npcx/clock.c +++ b/zephyr/shim/chip/npcx/clock.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -9,7 +9,6 @@ #include <zephyr/kernel.h> #include <zephyr/logging/log.h> #include <soc.h> -#include <zephyr/zephyr.h> #include "clock_chip.h" #include "module_id.h" diff --git a/zephyr/shim/chip/npcx/gpio.c b/zephyr/shim/chip/npcx/gpio.c index 3baf128eab..e8bf3dfdf5 100644 --- a/zephyr/shim/chip/npcx/gpio.c +++ b/zephyr/shim/chip/npcx/gpio.c @@ -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. */ @@ -6,10 +6,13 @@ #include <zephyr/device.h> #include <zephyr/drivers/gpio.h> #include <zephyr/kernel.h> +#include <zephyr/shell/shell.h> #include <zephyr/logging/log.h> #include "gpio/gpio.h" +#include "soc_gpio.h" +#include "util.h" LOG_MODULE_REGISTER(shim_cros_gpio, LOG_LEVEL_ERR); @@ -53,3 +56,142 @@ int gpio_config_unused_pins(void) return 0; } + +#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_GPIODBG +/* + * IO information about each GPIO that is configured in the `named_gpios` and + *` unused_pins` device tree nodes. + */ +struct npcx_io_info { + /* A npcx gpio port device */ + const struct device *dev; + /* A npcx gpio port number */ + int port; + /* Bit number of pin within a npcx gpio port */ + gpio_pin_t pin; + /* GPIO net name */ + const char *name; + /* Enable flag of npcx gpio input buffer */ + bool enable; +}; + +#define NAMED_GPIO_INFO(node) \ + { \ + .dev = DEVICE_DT_GET(DT_GPIO_CTLR(node, gpios)), \ + .port = DT_PROP(DT_GPIO_CTLR(node, gpios), index), \ + .pin = DT_GPIO_PIN(node, gpios), \ + .name = DT_NODE_FULL_NAME(node), \ + .enable = true, \ + }, + +#define UNUSED_GPIO_INFO(node, prop, idx) \ + { \ + .dev = DEVICE_DT_GET(DT_GPIO_CTLR_BY_IDX(node, prop, idx)), \ + .port = DT_PROP(DT_GPIO_CTLR_BY_IDX(node, prop, idx), index), \ + .pin = DT_GPIO_PIN_BY_IDX(node, prop, idx), \ + .name = "unused pin", \ + .enable = true, \ + }, + +#define NAMED_GPIO_INIT(node) \ + COND_CODE_1(DT_NODE_HAS_PROP(node, gpios), (NAMED_GPIO_INFO(node)), ()) + +static struct npcx_io_info gpio_info[] = { +#if DT_NODE_EXISTS(DT_PATH(named_gpios)) + DT_FOREACH_CHILD(DT_PATH(named_gpios), NAMED_GPIO_INIT) +#endif +#if DT_NODE_EXISTS(DT_PATH(unused_pins)) + DT_FOREACH_PROP_ELEM(DT_PATH(unused_pins), unused_gpios, + UNUSED_GPIO_INFO) +#endif +}; + +static int get_index_from_arg(const struct shell *sh, char **argv, int *index) +{ + char *end_ptr; + int num = strtol(argv[1], &end_ptr, 0); + const int gpio_cnt = ARRAY_SIZE(gpio_info); + + if (*end_ptr != '\0') { + shell_error(sh, "Failed to parse %s", argv[1]); + return -EINVAL; + } + + if (num >= gpio_cnt) { + shell_error(sh, "Index shall be less than %u, was %u", gpio_cnt, + num); + return -EINVAL; + } + + *index = num; + + return 0; +} + +static int cmd_gpio_list_all(const struct shell *sh, size_t argc, char **argv) +{ + ARG_UNUSED(argc); + ARG_UNUSED(argv); + + /* Print header */ + shell_print(sh, "IDX|ON| GPIO | Name"); + shell_print(sh, "---+--+------+----------"); + + /* List all GPIOs in 'named-gpios' and 'unused_pins' DT nodes */ + for (int i = 0; i < ARRAY_SIZE(gpio_info); i++) { + shell_print(sh, "%02d |%s | io%x%x | %s", i, + gpio_info[i].enable ? "*" : " ", gpio_info[i].port, + gpio_info[i].pin, gpio_info[i].name); + } + + return 0; +} + +static int cmd_gpio_turn_on(const struct shell *sh, size_t argc, char **argv) +{ + int index; + int res = get_index_from_arg(sh, argv, &index); + + if (res < 0) { + return res; + } + + /* Turn on GPIO's input buffer by index */ + gpio_info[index].enable = true; + npcx_gpio_enable_io_pads(gpio_info[index].dev, gpio_info[index].pin); + + return 0; +} + +static int cmd_gpio_turn_off(const struct shell *sh, size_t argc, char **argv) +{ + int index; + int res = get_index_from_arg(sh, argv, &index); + + if (res < 0) { + return res; + } + + /* Turn off GPIO's input buffer by index */ + gpio_info[index].enable = false; + npcx_gpio_disable_io_pads(gpio_info[index].dev, gpio_info[index].pin); + + return 0; +} + +SHELL_STATIC_SUBCMD_SET_CREATE( + sub_gpiodbg, + SHELL_CMD_ARG(list, NULL, "List all GPIOs used on platform by index", + cmd_gpio_list_all, 1, 0), + SHELL_CMD_ARG(on, NULL, "<index_in_list> Turn on GPIO's input buffer", + cmd_gpio_turn_on, 2, 0), + SHELL_CMD_ARG(off, NULL, "<index_in_list> Turn off GPIO's input buffer", + cmd_gpio_turn_off, 2, 0), + SHELL_SUBCMD_SET_END /* Array terminated. */ +); + +SHELL_CMD_ARG_REGISTER(gpiodbg, &sub_gpiodbg, + "Commands for power consumption " + "investigation", + NULL, 2, 0); +#endif /* CONFIG_PLATFORM_EC_CONSOLE_CMD_GPIODBG */ diff --git a/zephyr/shim/chip/npcx/include/clock_chip.h b/zephyr/shim/chip/npcx/include/clock_chip.h index 0c39ed8174..6ecca330b6 100644 --- a/zephyr/shim/chip/npcx/include/clock_chip.h +++ b/zephyr/shim/chip/npcx/include/clock_chip.h @@ -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. */ diff --git a/zephyr/shim/chip/npcx/include/flash_chip.h b/zephyr/shim/chip/npcx/include/flash_chip.h index 3b9375348b..362d8b2414 100644 --- a/zephyr/shim/chip/npcx/include/flash_chip.h +++ b/zephyr/shim/chip/npcx/include/flash_chip.h @@ -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. */ diff --git a/zephyr/shim/chip/npcx/include/rom_chip.h b/zephyr/shim/chip/npcx/include/rom_chip.h index 8def236498..d59a649c7b 100644 --- a/zephyr/shim/chip/npcx/include/rom_chip.h +++ b/zephyr/shim/chip/npcx/include/rom_chip.h @@ -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. */ diff --git a/zephyr/shim/chip/npcx/include/system_chip.h b/zephyr/shim/chip/npcx/include/system_chip.h index f446d6b634..2f59ad4627 100644 --- a/zephyr/shim/chip/npcx/include/system_chip.h +++ b/zephyr/shim/chip/npcx/include/system_chip.h @@ -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. */ diff --git a/zephyr/shim/chip/npcx/keyboard_raw.c b/zephyr/shim/chip/npcx/keyboard_raw.c index 86d6af068b..4d43134482 100644 --- a/zephyr/shim/chip/npcx/keyboard_raw.c +++ b/zephyr/shim/chip/npcx/keyboard_raw.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -10,7 +10,7 @@ #include <zephyr/logging/log.h> #include <soc.h> #include <soc_gpio.h> -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include "drivers/cros_kb_raw.h" #include "keyboard_raw.h" diff --git a/zephyr/shim/chip/npcx/npcx_monitor/CMakeLists.txt b/zephyr/shim/chip/npcx/npcx_monitor/CMakeLists.txt index 661eb86e91..d74881b2d9 100644 --- a/zephyr/shim/chip/npcx/npcx_monitor/CMakeLists.txt +++ b/zephyr/shim/chip/npcx/npcx_monitor/CMakeLists.txt @@ -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. diff --git a/zephyr/shim/chip/npcx/npcx_monitor/npcx_monitor.c b/zephyr/shim/chip/npcx/npcx_monitor/npcx_monitor.c index 8b135f66cc..e3fecc0cbd 100644 --- a/zephyr/shim/chip/npcx/npcx_monitor/npcx_monitor.c +++ b/zephyr/shim/chip/npcx/npcx_monitor/npcx_monitor.c @@ -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. * diff --git a/zephyr/shim/chip/npcx/npcx_monitor/npcx_monitor.h b/zephyr/shim/chip/npcx/npcx_monitor/npcx_monitor.h index caf96a8351..80e605eea0 100644 --- a/zephyr/shim/chip/npcx/npcx_monitor/npcx_monitor.h +++ b/zephyr/shim/chip/npcx/npcx_monitor/npcx_monitor.h @@ -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. */ diff --git a/zephyr/shim/chip/npcx/npcx_monitor/npcx_monitor.ld b/zephyr/shim/chip/npcx/npcx_monitor/npcx_monitor.ld index 03e38b0609..98892babc6 100644 --- a/zephyr/shim/chip/npcx/npcx_monitor/npcx_monitor.ld +++ b/zephyr/shim/chip/npcx/npcx_monitor/npcx_monitor.ld @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/zephyr/shim/chip/npcx/npcx_monitor/registers.h b/zephyr/shim/chip/npcx/npcx_monitor/registers.h index a52ba34349..85ab3b2389 100644 --- a/zephyr/shim/chip/npcx/npcx_monitor/registers.h +++ b/zephyr/shim/chip/npcx/npcx_monitor/registers.h @@ -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. * diff --git a/zephyr/shim/chip/npcx/power_policy.c b/zephyr/shim/chip/npcx/power_policy.c index 1e5a7b15ce..aea6e62d30 100644 --- a/zephyr/shim/chip/npcx/power_policy.c +++ b/zephyr/shim/chip/npcx/power_policy.c @@ -1,9 +1,9 @@ -/* 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. */ -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/pm/pm.h> #include <zephyr/pm/policy.h> #include <soc.h> diff --git a/zephyr/shim/chip/npcx/shi.c b/zephyr/shim/chip/npcx/shi.c index 74dfca12cd..8bec57252d 100644 --- a/zephyr/shim/chip/npcx/shi.c +++ b/zephyr/shim/chip/npcx/shi.c @@ -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. */ @@ -9,7 +9,7 @@ #include <zephyr/dt-bindings/clock/npcx_clock.h> #include <zephyr/logging/log.h> #include <soc.h> -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <ap_power/ap_power.h> #include "chipset.h" diff --git a/zephyr/shim/chip/npcx/system.c b/zephyr/shim/chip/npcx/system.c index f6751ae46a..2240acea54 100644 --- a/zephyr/shim/chip/npcx/system.c +++ b/zephyr/shim/chip/npcx/system.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/zephyr/shim/chip/npcx/system_download_from_flash.c b/zephyr/shim/chip/npcx/system_download_from_flash.c index 556140bf21..1aef9560d1 100644 --- a/zephyr/shim/chip/npcx/system_download_from_flash.c +++ b/zephyr/shim/chip/npcx/system_download_from_flash.c @@ -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. */ diff --git a/zephyr/shim/chip/npcx/system_external_storage.c b/zephyr/shim/chip/npcx/system_external_storage.c index f871ad310b..81e1968cf4 100644 --- a/zephyr/shim/chip/npcx/system_external_storage.c +++ b/zephyr/shim/chip/npcx/system_external_storage.c @@ -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. */ diff --git a/zephyr/shim/core/CMakeLists.txt b/zephyr/shim/core/CMakeLists.txt index e1b13f21f4..ef116e376a 100644 --- a/zephyr/shim/core/CMakeLists.txt +++ b/zephyr/shim/core/CMakeLists.txt @@ -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. diff --git a/zephyr/shim/core/cortex-m/CMakeLists.txt b/zephyr/shim/core/cortex-m/CMakeLists.txt index 90617d75cf..030512552a 100644 --- a/zephyr/shim/core/cortex-m/CMakeLists.txt +++ b/zephyr/shim/core/cortex-m/CMakeLists.txt @@ -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. diff --git a/zephyr/shim/core/cortex-m/irq_command.c b/zephyr/shim/core/cortex-m/irq_command.c index f88e8e9a5a..1cf1a213e4 100644 --- a/zephyr/shim/core/cortex-m/irq_command.c +++ b/zephyr/shim/core/cortex-m/irq_command.c @@ -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. */ diff --git a/zephyr/shim/core/cortex-m/mpu.c b/zephyr/shim/core/cortex-m/mpu.c index c798a2a446..8025227700 100644 --- a/zephyr/shim/core/cortex-m/mpu.c +++ b/zephyr/shim/core/cortex-m/mpu.c @@ -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. */ diff --git a/zephyr/shim/include/adc_chip.h b/zephyr/shim/include/adc_chip.h index c51cdfbb30..f5580a52ab 100644 --- a/zephyr/shim/include/adc_chip.h +++ b/zephyr/shim/include/adc_chip.h @@ -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. */ diff --git a/zephyr/shim/include/atomic.h b/zephyr/shim/include/atomic.h index 9b3d118910..beb8b111ed 100644 --- a/zephyr/shim/include/atomic.h +++ b/zephyr/shim/include/atomic.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/zephyr/shim/include/battery_enum.h b/zephyr/shim/include/battery_enum.h index 0ee36a8aa8..c0d10a6ed5 100644 --- a/zephyr/shim/include/battery_enum.h +++ b/zephyr/shim/include/battery_enum.h @@ -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. */ diff --git a/zephyr/shim/include/board.h b/zephyr/shim/include/board.h index 1175ad4a28..3e12568155 100644 --- a/zephyr/shim/include/board.h +++ b/zephyr/shim/include/board.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/zephyr/shim/include/board_led.h b/zephyr/shim/include/board_led.h index b71a2a7fe9..074ffa0256 100644 --- a/zephyr/shim/include/board_led.h +++ b/zephyr/shim/include/board_led.h @@ -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. */ diff --git a/zephyr/shim/include/builtin/assert.h b/zephyr/shim/include/builtin/assert.h index c3c43f2ba1..27dce8f2c4 100644 --- a/zephyr/shim/include/builtin/assert.h +++ b/zephyr/shim/include/builtin/assert.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/zephyr/shim/include/charger/chg_bq25710.h b/zephyr/shim/include/charger/chg_bq25710.h index 9ce7e5a037..91d100a7de 100644 --- a/zephyr/shim/include/charger/chg_bq25710.h +++ b/zephyr/shim/include/charger/chg_bq25710.h @@ -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. */ diff --git a/zephyr/shim/include/charger/chg_isl923x.h b/zephyr/shim/include/charger/chg_isl923x.h index ba383358e8..b0323cd1b8 100644 --- a/zephyr/shim/include/charger/chg_isl923x.h +++ b/zephyr/shim/include/charger/chg_isl923x.h @@ -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. */ diff --git a/zephyr/shim/include/charger/chg_isl9241.h b/zephyr/shim/include/charger/chg_isl9241.h index 0a880a1996..711a581c2f 100644 --- a/zephyr/shim/include/charger/chg_isl9241.h +++ b/zephyr/shim/include/charger/chg_isl9241.h @@ -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. */ diff --git a/zephyr/shim/include/charger/chg_rt9490.h b/zephyr/shim/include/charger/chg_rt9490.h index a8424e4db5..3ac596d482 100644 --- a/zephyr/shim/include/charger/chg_rt9490.h +++ b/zephyr/shim/include/charger/chg_rt9490.h @@ -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. */ @@ -7,6 +7,7 @@ #include "driver/charger/rt9490.h" #define RT9490_CHG_COMPAT richtek_rt9490 +#define RT9490_EMUL_COMPAT zephyr_rt9490_emul #define CHG_CONFIG_RT9490(id) \ { \ diff --git a/zephyr/shim/include/charger/chg_sm5803.h b/zephyr/shim/include/charger/chg_sm5803.h index e3e23503f4..65ef066970 100644 --- a/zephyr/shim/include/charger/chg_sm5803.h +++ b/zephyr/shim/include/charger/chg_sm5803.h @@ -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. */ diff --git a/zephyr/shim/include/charger_chips.h b/zephyr/shim/include/charger_chips.h index 2d4bee923f..b24fa246bf 100644 --- a/zephyr/shim/include/charger_chips.h +++ b/zephyr/shim/include/charger_chips.h @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/shim/include/charger_enum.h b/zephyr/shim/include/charger_enum.h index a2acc3e000..a10a274e28 100644 --- a/zephyr/shim/include/charger_enum.h +++ b/zephyr/shim/include/charger_enum.h @@ -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. */ diff --git a/zephyr/shim/include/config_chip.h b/zephyr/shim/include/config_chip.h index 5a1eb4cb80..45715a5ae3 100644 --- a/zephyr/shim/include/config_chip.h +++ b/zephyr/shim/include/config_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -430,29 +430,30 @@ #endif /* eSPI signals */ -#undef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 -#ifdef CONFIG_PLATFORM_EC_ESPI_VW_SLP_S3 -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S3 +#undef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 +#ifdef CONFIG_PLATFORM_EC_HOST_INTERFACE_ESPI_VW_SLP_S3 +#define CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 #endif -#undef CONFIG_HOSTCMD_ESPI_VW_SLP_S4 -#ifdef CONFIG_PLATFORM_EC_ESPI_VW_SLP_S4 -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#undef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 +#ifdef CONFIG_PLATFORM_EC_HOST_INTERFACE_ESPI_VW_SLP_S4 +#define CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 #endif -#undef CONFIG_HOSTCMD_ESPI_VW_SLP_S5 -#ifdef CONFIG_PLATFORM_EC_ESPI_VW_SLP_S5 -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S5 +#undef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S5 +#ifdef CONFIG_PLATFORM_EC_HOST_INTERFACE_ESPI_VW_SLP_S5 +#define CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S5 #endif -#undef CONFIG_HOSTCMD_ESPI_RESET_SLP_SX_VW_ON_ESPI_RST -#ifdef CONFIG_PLATFORM_EC_ESPI_RESET_SLP_SX_VW_ON_ESPI_RST -#define CONFIG_HOSTCMD_ESPI_RESET_SLP_SX_VW_ON_ESPI_RST +#undef CONFIG_HOST_INTERFACE_ESPI_RESET_SLP_SX_VW_ON_ESPI_RST +#ifdef CONFIG_PLATFORM_EC_HOST_INTERFACE_ESPI_RESET_SLP_SX_VW_ON_ESPI_RST +#define CONFIG_HOST_INTERFACE_ESPI_RESET_SLP_SX_VW_ON_ESPI_RST #endif -#undef CONFIG_ESPI_DEFAULT_VW_WIDTH_US +#undef CONFIG_HOST_INTERFACE_ESPI_DEFAULT_VW_WIDTH_US #ifdef CONFIG_PLATFORM_EC_DEFAULT_SCI_WIDTH_US -#define CONFIG_ESPI_DEFAULT_VW_WIDTH_US CONFIG_PLATFORM_EC_DEFAULT_SCI_WIDTH_US +#define CONFIG_HOST_INTERFACE_ESPI_DEFAULT_VW_WIDTH_US \ + CONFIG_PLATFORM_EC_DEFAULT_SCI_WIDTH_US #endif #if DT_HAS_CHOSEN(zephyr_flash) @@ -468,10 +469,11 @@ /* The jump data goes at the end of data ram, so for posix, the end of ram is * wherever the jump data ended up. */ -extern struct jump_data mock_jump_data; +#include "sysjump.h" +extern char mock_jump_data[sizeof(struct jump_data) + 256]; #define CONFIG_RAM_BASE 0x0 #define CONFIG_DATA_RAM_SIZE \ - (((uintptr_t)&mock_jump_data) + sizeof(struct jump_data)) + (((uintptr_t)&mock_jump_data) + sizeof(mock_jump_data)) #else #error "A zephyr,sram device must be chosen in the device tree" #endif diff --git a/zephyr/shim/include/cpu.h b/zephyr/shim/include/cpu.h index 617f644fa9..3e65aa0061 100644 --- a/zephyr/shim/include/cpu.h +++ b/zephyr/shim/include/cpu.h @@ -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. */ diff --git a/zephyr/shim/include/cros_cbi.h b/zephyr/shim/include/cros_cbi.h index 0969c673d5..1f8a1b3dfa 100644 --- a/zephyr/shim/include/cros_cbi.h +++ b/zephyr/shim/include/cros_cbi.h @@ -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. */ diff --git a/zephyr/shim/include/ec_tasks.h b/zephyr/shim/include/ec_tasks.h index 9b2998b64a..793beb25ae 100644 --- a/zephyr/shim/include/ec_tasks.h +++ b/zephyr/shim/include/ec_tasks.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/zephyr/shim/include/fpu.h b/zephyr/shim/include/fpu.h index 6d15c94a93..d1e4460827 100644 --- a/zephyr/shim/include/fpu.h +++ b/zephyr/shim/include/fpu.h @@ -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. */ diff --git a/zephyr/shim/include/gpio/gpio.h b/zephyr/shim/include/gpio/gpio.h index cae87ec859..3f95bdbbe0 100644 --- a/zephyr/shim/include/gpio/gpio.h +++ b/zephyr/shim/include/gpio/gpio.h @@ -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. */ diff --git a/zephyr/shim/include/gpio/gpio_int.h b/zephyr/shim/include/gpio/gpio_int.h index af5c9c4ace..835c5503ba 100644 --- a/zephyr/shim/include/gpio/gpio_int.h +++ b/zephyr/shim/include/gpio/gpio_int.h @@ -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. */ @@ -33,17 +33,15 @@ /* * Create an enum list of the interrupts */ -#define GPIO_INT_ENUM_WITH_COMMA(id) GPIO_INT_ENUM(id), enum gpio_interrupts { #if DT_HAS_COMPAT_STATUS_OKAY(cros_ec_gpio_interrupts) - DT_FOREACH_CHILD(DT_COMPAT_GET_ANY_STATUS_OKAY(cros_ec_gpio_interrupts), - GPIO_INT_ENUM_WITH_COMMA) + DT_FOREACH_CHILD_SEP( + DT_COMPAT_GET_ANY_STATUS_OKAY(cros_ec_gpio_interrupts), + GPIO_INT_ENUM, (, )), #endif - GPIO_INT_COUNT + GPIO_INT_COUNT }; -#undef GPIO_INT_ENUM_WITH_COMMA - /* * Forward reference to avoiding exposing internal structure * defined in gpio_int.c diff --git a/zephyr/shim/include/hook_types.h b/zephyr/shim/include/hook_types.h index a44a7c11c2..004e5a52db 100644 --- a/zephyr/shim/include/hook_types.h +++ b/zephyr/shim/include/hook_types.h @@ -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. */ diff --git a/zephyr/shim/include/i2c/i2c.h b/zephyr/shim/include/i2c/i2c.h index bee8f794ca..3e95fbc9d3 100644 --- a/zephyr/shim/include/i2c/i2c.h +++ b/zephyr/shim/include/i2c/i2c.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/zephyr/shim/include/linker.h b/zephyr/shim/include/linker.h index e2d75b2a7c..92dc8f5981 100644 --- a/zephyr/shim/include/linker.h +++ b/zephyr/shim/include/linker.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/zephyr/shim/include/motionsense_sensors.h b/zephyr/shim/include/motionsense_sensors.h index 85550c7c22..e00eae426e 100644 --- a/zephyr/shim/include/motionsense_sensors.h +++ b/zephyr/shim/include/motionsense_sensors.h @@ -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. */ diff --git a/zephyr/shim/include/motionsense_sensors_defs.h b/zephyr/shim/include/motionsense_sensors_defs.h index 8adae0b757..ac0fc6bf56 100644 --- a/zephyr/shim/include/motionsense_sensors_defs.h +++ b/zephyr/shim/include/motionsense_sensors_defs.h @@ -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. */ diff --git a/zephyr/shim/include/mpu.h b/zephyr/shim/include/mpu.h index 3555ef0db1..29771c9fe0 100644 --- a/zephyr/shim/include/mpu.h +++ b/zephyr/shim/include/mpu.h @@ -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. */ diff --git a/zephyr/shim/include/power/power.h b/zephyr/shim/include/power/power.h index c9a7437d4c..1e780646af 100644 --- a/zephyr/shim/include/power/power.h +++ b/zephyr/shim/include/power/power.h @@ -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. */ @@ -35,11 +35,11 @@ #define GEN_POWER_SIGNAL_ENUM_ENTRY(cid) \ DT_STRING_UPPER_TOKEN(cid, power_enum_name) -#define GEN_POWER_SIGNAL_ENUM_ENTRY_COMMA(cid) GEN_POWER_SIGNAL_ENUM_ENTRY(cid), enum power_signal { - DT_FOREACH_CHILD(POWER_SIGNAL_LIST_NODE, - GEN_POWER_SIGNAL_ENUM_ENTRY_COMMA) POWER_SIGNAL_COUNT + DT_FOREACH_CHILD_SEP(POWER_SIGNAL_LIST_NODE, + GEN_POWER_SIGNAL_ENUM_ENTRY, (, )), + POWER_SIGNAL_COUNT }; /* diff --git a/zephyr/shim/include/power_host_sleep.h b/zephyr/shim/include/power_host_sleep.h index 390de39691..8bc23fc785 100644 --- a/zephyr/shim/include/power_host_sleep.h +++ b/zephyr/shim/include/power_host_sleep.h @@ -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. */ diff --git a/zephyr/shim/include/registers.h b/zephyr/shim/include/registers.h index b693733a21..f17b05f5f8 100644 --- a/zephyr/shim/include/registers.h +++ b/zephyr/shim/include/registers.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/zephyr/shim/include/shimmed_task_id.h b/zephyr/shim/include/shimmed_task_id.h index 362f6a7d76..1a29acafdf 100644 --- a/zephyr/shim/include/shimmed_task_id.h +++ b/zephyr/shim/include/shimmed_task_id.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/zephyr/shim/include/shimmed_tasks.h b/zephyr/shim/include/shimmed_tasks.h index d1fb6129d3..75be968f4a 100644 --- a/zephyr/shim/include/shimmed_tasks.h +++ b/zephyr/shim/include/shimmed_tasks.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/zephyr/shim/include/temp_sensor/temp_sensor.h b/zephyr/shim/include/temp_sensor/temp_sensor.h index 6f06ae5a44..2aa49c5c19 100644 --- a/zephyr/shim/include/temp_sensor/temp_sensor.h +++ b/zephyr/shim/include/temp_sensor/temp_sensor.h @@ -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. */ @@ -12,7 +12,6 @@ #ifdef CONFIG_PLATFORM_EC_TEMP_SENSOR #define ZSHIM_TEMP_SENSOR_ID(node_id) DT_STRING_UPPER_TOKEN(node_id, enum_name) -#define TEMP_SENSOR_ID_WITH_COMMA(node_id) ZSHIM_TEMP_SENSOR_ID(node_id), #define HAS_POWER_GOOD_PIN(node_id) DT_NODE_HAS_PROP(node_id, power_good_pin) || #define ANY_INST_HAS_POWER_GOOD_PIN \ @@ -20,13 +19,12 @@ enum temp_sensor_id { #if DT_NODE_EXISTS(DT_PATH(named_temp_sensors)) - DT_FOREACH_CHILD(DT_PATH(named_temp_sensors), TEMP_SENSOR_ID_WITH_COMMA) + DT_FOREACH_CHILD_SEP(DT_PATH(named_temp_sensors), ZSHIM_TEMP_SENSOR_ID, + (, )), #endif /* named_temp_sensors */ - TEMP_SENSOR_COUNT + TEMP_SENSOR_COUNT }; -#undef TEMP_SENSOR_ID_WITH_COMMA - /* PCT2075 access array */ #define ZSHIM_PCT2075_SENSOR_ID(node_id) \ DT_STRING_UPPER_TOKEN(node_id, pct2075_name) diff --git a/zephyr/shim/include/usbc/anx7447_usb_mux.h b/zephyr/shim/include/usbc/anx7447_usb_mux.h index 017be9d604..874958c04c 100644 --- a/zephyr/shim/include/usbc/anx7447_usb_mux.h +++ b/zephyr/shim/include/usbc/anx7447_usb_mux.h @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ @@ -10,9 +10,9 @@ #define ANX7447_USB_MUX_COMPAT analogix_usbc_mux_anx7447 -#define USB_MUX_CONFIG_ANX7447(mux_id, port_id, idx) \ +#define USB_MUX_CONFIG_ANX7447(mux_id) \ { \ - USB_MUX_COMMON_FIELDS(mux_id, port_id, idx), \ + USB_MUX_COMMON_FIELDS(mux_id), \ .driver = &anx7447_usb_mux_driver, \ .hpd_update = COND_CODE_1( \ DT_PROP(mux_id, hpd_update_enable), \ diff --git a/zephyr/shim/include/usbc/anx7483_usb_mux.h b/zephyr/shim/include/usbc/anx7483_usb_mux.h index 28fef71115..c45b9809a2 100644 --- a/zephyr/shim/include/usbc/anx7483_usb_mux.h +++ b/zephyr/shim/include/usbc/anx7483_usb_mux.h @@ -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. */ @@ -10,9 +10,9 @@ #define ANX7483_USB_MUX_COMPAT analogix_anx7483 -#define USB_MUX_CONFIG_ANX7483(mux_id, port_id, idx) \ +#define USB_MUX_CONFIG_ANX7483(mux_id) \ { \ - USB_MUX_COMMON_FIELDS(mux_id, port_id, idx), \ + USB_MUX_COMMON_FIELDS(mux_id), \ .driver = &anx7483_usb_retimer_driver, \ .board_set = &anx7483_set_default_tuning, \ .i2c_port = I2C_PORT_BY_DEV(mux_id), \ diff --git a/zephyr/shim/include/usbc/bb_retimer_usb_mux.h b/zephyr/shim/include/usbc/bb_retimer_usb_mux.h index b5c9224f50..64e1e2693d 100644 --- a/zephyr/shim/include/usbc/bb_retimer_usb_mux.h +++ b/zephyr/shim/include/usbc/bb_retimer_usb_mux.h @@ -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. */ @@ -10,23 +10,100 @@ #define BB_RETIMER_USB_MUX_COMPAT intel_jhl8040r -#define USB_MUX_CONFIG_BB_RETIMER(mux_id, port_id, idx) \ +#define USB_MUX_CONFIG_BB_RETIMER(mux_id) \ { \ - USB_MUX_COMMON_FIELDS(mux_id, port_id, idx), \ + USB_MUX_COMMON_FIELDS(mux_id), \ .driver = &bb_usb_retimer, \ .hpd_update = bb_retimer_hpd_update, \ .i2c_port = I2C_PORT_BY_DEV(mux_id), \ .i2c_addr_flags = DT_REG_ADDR(mux_id), \ } -#define BB_RETIMER_CONTROLS_CONFIG(mux_id, port_id, idx) \ - { \ - .retimer_rst_gpio = \ - GPIO_SIGNAL(DT_PHANDLE(mux_id, reset_pin)), \ - .usb_ls_en_gpio = COND_CODE_1( \ - DT_NODE_HAS_PROP(mux_id, ls_en_pin), \ - (GPIO_SIGNAL(DT_PHANDLE(mux_id, ls_en_pin))), \ - (GPIO_UNIMPLEMENTED)), \ +/** + * @brief Get reset gpio for @p mux_id retimer + * + * @param mux_id BB retimer DTS node + */ +#define BB_RETIMER_RESET_GPIO(mux_id) GPIO_SIGNAL(DT_PHANDLE(mux_id, reset_pin)) + +/** + * @brief Get LS_EN gpio for @p mux_id retimer + * + * @param mux_id BB retimer DTS node + */ +#define BB_RETIMER_LS_EN_GPIO(mux_id) \ + COND_CODE_1(DT_NODE_HAS_PROP(mux_id, ls_en_pin), \ + (GPIO_SIGNAL(DT_PHANDLE(mux_id, ls_en_pin))), \ + (GPIO_UNIMPLEMENTED)) + +#define BB_RETIMER_CONTROLS_CONFIG(mux_id) \ + { \ + .retimer_rst_gpio = BB_RETIMER_RESET_GPIO(mux_id), \ + .usb_ls_en_gpio = BB_RETIMER_LS_EN_GPIO(mux_id), \ } +/** + * @brief Set entry in bb_controls array + * + * @param mux_id BB retimer node ID + */ +#define USB_MUX_BB_RETIMER_CONTROL_ARRAY(mux_id) \ + [USB_MUX_PORT(mux_id)] = BB_RETIMER_CONTROLS_CONFIG(mux_id), + +/** + * @brief Call USB_MUX_BB_RETIMER_CONTROL_ARRAY for every BB retimer in DTS + */ +#define USB_MUX_BB_RETIMERS_CONTROLS_ARRAY \ + DT_FOREACH_STATUS_OKAY(BB_RETIMER_USB_MUX_COMPAT, \ + USB_MUX_BB_RETIMER_CONTROL_ARRAY) + +/** + * @brief Check if BB retimers @p id_1 and @p id_2 has matching configuration + * Configuration match if reset and ls_en pins are the same for muxes + * which are on the same USB-C port. + * + * @param id_1 First BB retimer DTS node + * @param id_2 Second BB retimer DTS node + */ +#define BB_RETIMER_CHECK_PAIR(id_1, id_2) \ + BUILD_ASSERT(USB_MUX_PORT(id_1) != USB_MUX_PORT(id_2) || \ + (BB_RETIMER_RESET_GPIO(id_1) == \ + BB_RETIMER_RESET_GPIO(id_2) && \ + BB_RETIMER_LS_EN_GPIO(id_1) == \ + BB_RETIMER_LS_EN_GPIO(id_2)), \ + "BB retimers " #id_1 " and " #id_2 " have different pin " \ + "configuration and same USB-C port") + +/** + * @brief Check if BB retimers with @p inst instance number has matching + * configuration with muxes of higher instance number on @p bb_list list. + * Configuration match if reset and ls_en pins are the same for muxes + * which are on the same USB-C port. + * + * @param inst Instance number of BB retimer mux + * @param bb_list List of BB retimers in instance number order + */ +#define BB_RETIMER_CHECK_INSTANCE_WITH_LIST(inst, bb_list) \ + FOR_EACH_FIXED_ARG(BB_RETIMER_CHECK_PAIR, (;), \ + DT_INST(inst, BB_RETIMER_USB_MUX_COMPAT), \ + GET_ARGS_LESS_N(inst, __DEBRACKET bb_list)) + +/** + * @brief Check if BB retimers on the @p bb_list list have matching + * configurations (i.e. reset and ls_en pins are the same for muxes + * which are on the same USB-C port). This check is required, because + * USB_MUX_ENABLE_ALTERNATE() doesn't update bb_control[] array, so all + * BB retimers needs to use the same GPIO pins. + * + * @param bb_list List of BB retimers in instance number order + */ +#define BB_RETIMER_CHECK_SAME_CONTROLS(bb_list) \ + LISTIFY(DT_NUM_INST_STATUS_OKAY(BB_RETIMER_USB_MUX_COMPAT), \ + BB_RETIMER_CHECK_INSTANCE_WITH_LIST, (;), bb_list); + +/** List of all BB retimers in DTS in instance number order */ +#define BB_RETIMER_INSTANCES_LIST \ + (LISTIFY(DT_NUM_INST_STATUS_OKAY(BB_RETIMER_USB_MUX_COMPAT), DT_INST, \ + (, ), BB_RETIMER_USB_MUX_COMPAT)) + #endif /* __ZEPHYR_SHIM_BB_RETIMER_USB_MUX_H */ diff --git a/zephyr/shim/include/usbc/bc12_pi3usb9201.h b/zephyr/shim/include/usbc/bc12_pi3usb9201.h index 85b1c00443..701090133f 100644 --- a/zephyr/shim/include/usbc/bc12_pi3usb9201.h +++ b/zephyr/shim/include/usbc/bc12_pi3usb9201.h @@ -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. */ diff --git a/zephyr/shim/include/usbc/bc12_rt1718s.h b/zephyr/shim/include/usbc/bc12_rt1718s.h index f6860268a3..e34f21c9e0 100644 --- a/zephyr/shim/include/usbc/bc12_rt1718s.h +++ b/zephyr/shim/include/usbc/bc12_rt1718s.h @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/shim/include/usbc/bc12_rt1739.h b/zephyr/shim/include/usbc/bc12_rt1739.h index 13b307bd48..8d7427b271 100644 --- a/zephyr/shim/include/usbc/bc12_rt1739.h +++ b/zephyr/shim/include/usbc/bc12_rt1739.h @@ -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. */ diff --git a/zephyr/shim/include/usbc/bc12_rt9490.h b/zephyr/shim/include/usbc/bc12_rt9490.h index fe57e42524..a9371ddeea 100644 --- a/zephyr/shim/include/usbc/bc12_rt9490.h +++ b/zephyr/shim/include/usbc/bc12_rt9490.h @@ -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. */ diff --git a/zephyr/shim/include/usbc/it5205_usb_mux.h b/zephyr/shim/include/usbc/it5205_usb_mux.h index f2ce36d491..983248f3e2 100644 --- a/zephyr/shim/include/usbc/it5205_usb_mux.h +++ b/zephyr/shim/include/usbc/it5205_usb_mux.h @@ -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. */ @@ -10,9 +10,9 @@ #define IT5205_USB_MUX_COMPAT ite_it5205 -#define USB_MUX_CONFIG_IT5205(mux_id, port_id, idx) \ +#define USB_MUX_CONFIG_IT5205(mux_id) \ { \ - USB_MUX_COMMON_FIELDS(mux_id, port_id, idx), \ + USB_MUX_COMMON_FIELDS(mux_id), \ .driver = &it5205_usb_mux_driver, \ .i2c_port = I2C_PORT_BY_DEV(mux_id), \ .i2c_addr_flags = DT_REG_ADDR(mux_id), \ diff --git a/zephyr/shim/include/usbc/ppc.h b/zephyr/shim/include/usbc/ppc.h index 4bb8f7e106..28e518a3ef 100644 --- a/zephyr/shim/include/usbc/ppc.h +++ b/zephyr/shim/include/usbc/ppc.h @@ -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. */ diff --git a/zephyr/shim/include/usbc/ppc_aoz1380.h b/zephyr/shim/include/usbc/ppc_aoz1380.h index 75acb4c502..1ff20b802f 100644 --- a/zephyr/shim/include/usbc/ppc_aoz1380.h +++ b/zephyr/shim/include/usbc/ppc_aoz1380.h @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/shim/include/usbc/ppc_nx20p348x.h b/zephyr/shim/include/usbc/ppc_nx20p348x.h index 31d6ded2a9..2d36ab09f6 100644 --- a/zephyr/shim/include/usbc/ppc_nx20p348x.h +++ b/zephyr/shim/include/usbc/ppc_nx20p348x.h @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/shim/include/usbc/ppc_rt1739.h b/zephyr/shim/include/usbc/ppc_rt1739.h index bb4b75126a..5b71b9ff9c 100644 --- a/zephyr/shim/include/usbc/ppc_rt1739.h +++ b/zephyr/shim/include/usbc/ppc_rt1739.h @@ -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. */ diff --git a/zephyr/shim/include/usbc/ppc_sn5s330.h b/zephyr/shim/include/usbc/ppc_sn5s330.h index 71d29fd525..ecbcb53deb 100644 --- a/zephyr/shim/include/usbc/ppc_sn5s330.h +++ b/zephyr/shim/include/usbc/ppc_sn5s330.h @@ -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. */ diff --git a/zephyr/shim/include/usbc/ppc_syv682x.h b/zephyr/shim/include/usbc/ppc_syv682x.h index 0d5b03c9ec..33813a5256 100644 --- a/zephyr/shim/include/usbc/ppc_syv682x.h +++ b/zephyr/shim/include/usbc/ppc_syv682x.h @@ -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. */ diff --git a/zephyr/shim/include/usbc/ps8743_usb_mux.h b/zephyr/shim/include/usbc/ps8743_usb_mux.h index 0436bbcffd..75ce778bac 100644 --- a/zephyr/shim/include/usbc/ps8743_usb_mux.h +++ b/zephyr/shim/include/usbc/ps8743_usb_mux.h @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ @@ -10,9 +10,9 @@ #define PS8743_USB_MUX_COMPAT parade_ps8743 -#define USB_MUX_CONFIG_PS8743(mux_id, port_id, idx) \ +#define USB_MUX_CONFIG_PS8743(mux_id) \ { \ - USB_MUX_COMMON_FIELDS(mux_id, port_id, idx), \ + USB_MUX_COMMON_FIELDS(mux_id), \ .driver = &ps8743_usb_mux_driver, \ .i2c_port = I2C_PORT_BY_DEV(mux_id), \ .i2c_addr_flags = DT_REG_ADDR(mux_id), \ diff --git a/zephyr/shim/include/usbc/tcpc_anx7447.h b/zephyr/shim/include/usbc/tcpc_anx7447.h index 8342157827..7a59296e74 100644 --- a/zephyr/shim/include/usbc/tcpc_anx7447.h +++ b/zephyr/shim/include/usbc/tcpc_anx7447.h @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/shim/include/usbc/tcpc_ccgxxf.h b/zephyr/shim/include/usbc/tcpc_ccgxxf.h index e13598f4a2..0c02cf6846 100644 --- a/zephyr/shim/include/usbc/tcpc_ccgxxf.h +++ b/zephyr/shim/include/usbc/tcpc_ccgxxf.h @@ -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. */ diff --git a/zephyr/shim/include/usbc/tcpc_fusb302.h b/zephyr/shim/include/usbc/tcpc_fusb302.h index c5f735bd18..a2e512d938 100644 --- a/zephyr/shim/include/usbc/tcpc_fusb302.h +++ b/zephyr/shim/include/usbc/tcpc_fusb302.h @@ -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. */ diff --git a/zephyr/shim/include/usbc/tcpc_generic_emul.h b/zephyr/shim/include/usbc/tcpc_generic_emul.h index 019c5d8d44..7dc46c51ba 100644 --- a/zephyr/shim/include/usbc/tcpc_generic_emul.h +++ b/zephyr/shim/include/usbc/tcpc_generic_emul.h @@ -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. */ diff --git a/zephyr/shim/include/usbc/tcpc_it8xxx2.h b/zephyr/shim/include/usbc/tcpc_it8xxx2.h index 543290a893..c619656667 100644 --- a/zephyr/shim/include/usbc/tcpc_it8xxx2.h +++ b/zephyr/shim/include/usbc/tcpc_it8xxx2.h @@ -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. */ diff --git a/zephyr/shim/include/usbc/tcpc_nct38xx.h b/zephyr/shim/include/usbc/tcpc_nct38xx.h index ebb0452f35..87ba3379c8 100644 --- a/zephyr/shim/include/usbc/tcpc_nct38xx.h +++ b/zephyr/shim/include/usbc/tcpc_nct38xx.h @@ -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. */ diff --git a/zephyr/shim/include/usbc/tcpc_ps8xxx.h b/zephyr/shim/include/usbc/tcpc_ps8xxx.h index 43f8fee9d5..1a457af09b 100644 --- a/zephyr/shim/include/usbc/tcpc_ps8xxx.h +++ b/zephyr/shim/include/usbc/tcpc_ps8xxx.h @@ -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. */ diff --git a/zephyr/shim/include/usbc/tcpc_ps8xxx_emul.h b/zephyr/shim/include/usbc/tcpc_ps8xxx_emul.h index f476ed1cd7..fbd2e4bfd1 100644 --- a/zephyr/shim/include/usbc/tcpc_ps8xxx_emul.h +++ b/zephyr/shim/include/usbc/tcpc_ps8xxx_emul.h @@ -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. */ diff --git a/zephyr/shim/include/usbc/tcpc_rt1718s.h b/zephyr/shim/include/usbc/tcpc_rt1718s.h index 4374fb5be6..794fb99480 100644 --- a/zephyr/shim/include/usbc/tcpc_rt1718s.h +++ b/zephyr/shim/include/usbc/tcpc_rt1718s.h @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/shim/include/usbc/tcpci.h b/zephyr/shim/include/usbc/tcpci.h index 159e85ee27..67138dbe99 100644 --- a/zephyr/shim/include/usbc/tcpci.h +++ b/zephyr/shim/include/usbc/tcpci.h @@ -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. */ diff --git a/zephyr/shim/include/usbc/tcpci_usb_mux.h b/zephyr/shim/include/usbc/tcpci_usb_mux.h index d228d1a003..1a5dd38241 100644 --- a/zephyr/shim/include/usbc/tcpci_usb_mux.h +++ b/zephyr/shim/include/usbc/tcpci_usb_mux.h @@ -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. */ @@ -17,31 +17,29 @@ * Add I2C configuration and USB_MUX_FLAG_NOT_TCPC to enforce it when * mux_read()/mux_write() functions are used. */ -#define USB_MUX_CONFIG_TCPCI_TCPM_WITH_I2C(mux_id, port_id, idx) \ - { \ - USB_MUX_COMMON_FIELDS_WITH_FLAGS(mux_id, port_id, idx, \ - USB_MUX_FLAG_NOT_TCPC, \ - USB_MUX_FLAG_NOT_TCPC), \ - .driver = &tcpci_tcpm_usb_mux_driver, \ - .hpd_update = \ - USB_MUX_CALLBACK_OR_NULL(mux_id, hpd_update), \ - .i2c_port = I2C_PORT_BY_DEV(mux_id), \ - .i2c_addr_flags = DT_REG_ADDR(mux_id), \ +#define USB_MUX_CONFIG_TCPCI_TCPM_WITH_I2C(mux_id) \ + { \ + USB_MUX_COMMON_FIELDS_WITH_FLAGS( \ + mux_id, USB_MUX_FLAG_NOT_TCPC, USB_MUX_FLAG_NOT_TCPC), \ + .driver = &tcpci_tcpm_usb_mux_driver, \ + .hpd_update = \ + USB_MUX_CALLBACK_OR_NULL(mux_id, hpd_update), \ + .i2c_port = I2C_PORT_BY_DEV(mux_id), \ + .i2c_addr_flags = DT_REG_ADDR(mux_id), \ } /** Use I2C configuration from TCPC */ -#define USB_MUX_CONFIG_TCPCI_TCPM_WO_I2C(mux_id, port_id, idx) \ +#define USB_MUX_CONFIG_TCPCI_TCPM_WO_I2C(mux_id) \ { \ - USB_MUX_COMMON_FIELDS(mux_id, port_id, idx), \ + USB_MUX_COMMON_FIELDS(mux_id), \ .driver = &tcpci_tcpm_usb_mux_driver, \ .hpd_update = \ USB_MUX_CALLBACK_OR_NULL(mux_id, hpd_update), \ } -#define USB_MUX_CONFIG_TCPCI_TCPM(mux_id, port_id, idx) \ - COND_CODE_1( \ - DT_NODE_HAS_PROP(mux_id, reg), \ - (USB_MUX_CONFIG_TCPCI_TCPM_WITH_I2C(mux_id, port_id, idx)), \ - (USB_MUX_CONFIG_TCPCI_TCPM_WO_I2C(mux_id, port_id, idx))) +#define USB_MUX_CONFIG_TCPCI_TCPM(mux_id) \ + COND_CODE_1(DT_NODE_HAS_PROP(mux_id, reg), \ + (USB_MUX_CONFIG_TCPCI_TCPM_WITH_I2C(mux_id)), \ + (USB_MUX_CONFIG_TCPCI_TCPM_WO_I2C(mux_id))) #endif /* __ZEPHYR_SHIM_TCPCI_USB_MUX_H */ diff --git a/zephyr/shim/include/usbc/tusb1064_usb_mux.h b/zephyr/shim/include/usbc/tusb1064_usb_mux.h index bb366d13c4..55dc8d4645 100644 --- a/zephyr/shim/include/usbc/tusb1064_usb_mux.h +++ b/zephyr/shim/include/usbc/tusb1064_usb_mux.h @@ -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. */ @@ -11,26 +11,26 @@ #define TUSB1064_USB_MUX_COMPAT ti_tusb1064 #if defined(CONFIG_USB_MUX_TUSB1044) -#define USB_MUX_CONFIG_TUSB1064(mux_id, port_id, idx) \ +#define USB_MUX_CONFIG_TUSB1064(mux_id) \ { \ - USB_MUX_COMMON_FIELDS(mux_id, port_id, idx), \ + USB_MUX_COMMON_FIELDS(mux_id), \ .driver = &tusb1064_usb_mux_driver, \ .i2c_port = I2C_PORT_BY_DEV(mux_id), \ .i2c_addr_flags = DT_REG_ADDR(mux_id), \ .hpd_update = &tusb1044_hpd_update, \ } #elif defined(CONFIG_USB_MUX_TUSB546) -#define USB_MUX_CONFIG_TUSB1064(mux_id, port_id, idx) \ +#define USB_MUX_CONFIG_TUSB1064(mux_id) \ { \ - USB_MUX_COMMON_FIELDS(mux_id, port_id, idx), \ + USB_MUX_COMMON_FIELDS(mux_id), \ .driver = &tusb1064_usb_mux_driver, \ .i2c_port = I2C_PORT_BY_DEV(mux_id), \ .i2c_addr_flags = DT_REG_ADDR(mux_id), \ } #else -#define USB_MUX_CONFIG_TUSB1064(mux_id, port_id, idx) \ +#define USB_MUX_CONFIG_TUSB1064(mux_id) \ { \ - USB_MUX_COMMON_FIELDS(mux_id, port_id, idx), \ + USB_MUX_COMMON_FIELDS(mux_id), \ .driver = &tusb1064_usb_mux_driver, \ .i2c_port = I2C_PORT_BY_DEV(mux_id), \ .i2c_addr_flags = DT_REG_ADDR(mux_id), \ diff --git a/zephyr/shim/include/usbc/usb_muxes.h b/zephyr/shim/include/usbc/usb_muxes.h index f7cfd7159b..9dce1a3aa5 100644 --- a/zephyr/shim/include/usbc/usb_muxes.h +++ b/zephyr/shim/include/usbc/usb_muxes.h @@ -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. */ @@ -16,6 +16,7 @@ #include "usbc/ps8743_usb_mux.h" #include "usbc/tcpci_usb_mux.h" #include "usbc/tusb1064_usb_mux.h" +#include "usbc/utils.h" #include "usbc/virtual_usb_mux.h" /** @@ -48,15 +49,28 @@ #define USB_MUX_DRIVER_GET_CONFIG(driver) GET_ARG_N(2, __DEBRACKET driver) /** - * @brief USB mux port number based on parent node in DTS + * @brief Name of USB mux chain structure for given port and place in chain. + * Note, that root of chain is not referred by this name, but + * usb_muxes[@p port_id]. * - * @param port_id USBC node ID + * @param idx Place in chain + * @param port_id USBC port id */ -#define USB_MUX_PORT(port_id) DT_REG_ADDR(port_id) +#define USB_MUX_CHAIN_STRUCT_NAME(idx, port_id) \ + DT_CAT4(USB_MUX_chain_port_, port_id, _mux_, idx) /** - * @brief Name of USB mux structure if node is not EMPTY. Note, that root of - * chain is not referred by this name, but usb_muxes[USB_MUX_PORT(id)]. + * @brief Declaration of USB mux chain structure for @p idx mux in @p port_id + * USB-C port's chain + * + * @param port_id USBC port ID (number) + * @param idx Place in chain + */ +#define USB_MUX_CHAIN_STRUCT_DECLARE(port_id, idx) \ + MAYBE_CONST struct usb_mux_chain USB_MUX_CHAIN_STRUCT_NAME(idx, port_id) + +/** + * @brief Name of USB mux structure if node @p mux_id is not EMPTY. * * @param mux_id USB mux node ID */ @@ -82,22 +96,16 @@ * @brief Declaration of USB mux board_init function * * @param mux_id USB mux node ID - * @param port_id USBC node ID - * @param idx Position of USB mux in chain - * @param conf Driver configuration function */ -#define USB_MUX_CB_BOARD_INIT_DECLARE(mux_id, port_id, idx, conf) \ +#define USB_MUX_CB_BOARD_INIT_DECLARE(mux_id) \ int DT_STRING_TOKEN(mux_id, board_init)(const struct usb_mux *); /** * @brief Declaration of USB mux board_set function * * @param mux_id USB mux node ID - * @param port_id USBC node ID - * @param idx Position of USB mux in chain - * @param conf Driver configuration function */ -#define USB_MUX_CB_BOARD_SET_DECLARE(mux_id, port_id, idx, conf) \ +#define USB_MUX_CB_BOARD_SET_DECLARE(mux_id) \ int DT_STRING_TOKEN(mux_id, board_set)(const struct usb_mux *, \ mux_state_t); @@ -112,33 +120,43 @@ /** * @brief Get node id of @p idx USB mux in chain * + * @param chain_id USB mux chain node ID * @param idx Position of USB mux in chain - * @param port_id USBC node ID */ -#define USB_MUX_GET_CHAIN_N(idx, port_id) \ - DT_PHANDLE_BY_IDX(port_id, usb_muxes, idx) +#define USB_MUX_GET_CHAIN_N(chain_id, idx) \ + DT_PHANDLE_BY_IDX(chain_id, usb_muxes, idx) /** - * @brief Get node id of next USB mux in chain or EMPTY if it is last mux + * @brief Get next USB mux chain structure name or EMPTY if it is last mux * - * @param port_id USBC node ID + * @param chain_id USB mux chain node ID * @param idx Position of USB mux in chain */ -#define USB_MUX_NEXT(port_id, idx) \ - GET_ARG_N(2, \ - GET_ARGS_LESS_N( \ - idx, LISTIFY(DT_PROP_LEN(port_id, usb_muxes), \ - USB_MUX_GET_CHAIN_N, (, ), port_id)), \ +#define USB_MUX_CHAIN_NEXT_NAME(chain_id, idx) \ + GET_ARG_N(2, \ + GET_ARGS_LESS_N(idx, \ + LISTIFY(DT_PROP_LEN(chain_id, usb_muxes), \ + USB_MUX_CHAIN_STRUCT_NAME, (, ), \ + USBC_PORT(chain_id))), \ EMPTY) /** * @brief Get pointer to next USB mux in chain or NULL if it is last mux * - * @param port_id USBC node ID + * @param chain_id USB mux chain node ID + * @param idx Position of USB mux in chain + */ +#define USB_MUX_CHAIN_NEXT_POINTER(chain_id, idx) \ + USB_MUX_POINTER_OR_NULL(USB_MUX_CHAIN_NEXT_NAME(chain_id, idx)) + +/** + * @brief Get pointer to USB mux that is @p idx in chain @p chain_id + * + * @param chain_id USB mux chain node ID * @param idx Position of USB mux in chain */ -#define USB_MUX_NEXT_POINTER(port_id, idx) \ - USB_MUX_POINTER_OR_NULL(USB_MUX_STRUCT_NAME(USB_MUX_NEXT(port_id, idx))) +#define USB_MUX_POINTER(chain_id, idx) \ + &USB_MUX_STRUCT_NAME(USB_MUX_GET_CHAIN_N(chain_id, idx)) /** * @brief Generate pointer to function from @p cb_name property or NULL @@ -154,255 +172,328 @@ * @brief Set struct usb_mux fields common for all USB muxes and alter flags * * @param mux_id USB mux node ID - * @param port_id USBC node ID - * @param idx Position of USB mux in chain * @param flags_mask Mask for bits that should be igonred in flags property * @param flags_val Value that should be used instead for masked bits */ -#define USB_MUX_COMMON_FIELDS_WITH_FLAGS(mux_id, port_id, idx, flags_mask, \ - flags_val) \ - .usb_port = USB_MUX_PORT(port_id), \ - .next_mux = USB_MUX_NEXT_POINTER(port_id, idx), \ - .board_init = USB_MUX_CALLBACK_OR_NULL(mux_id, board_init), \ - .board_set = USB_MUX_CALLBACK_OR_NULL(mux_id, board_set), \ +#define USB_MUX_COMMON_FIELDS_WITH_FLAGS(mux_id, flags_mask, flags_val) \ + .usb_port = USB_MUX_PORT(mux_id), \ + .board_init = USB_MUX_CALLBACK_OR_NULL(mux_id, board_init), \ + .board_set = USB_MUX_CALLBACK_OR_NULL(mux_id, board_set), \ .flags = (DT_PROP(mux_id, flags) & ~(flags_mask)) | (flags_val) /** * @brief Set struct usb_mux fields common for all USB muxes * * @param mux_id USB mux node ID - * @param port_id USBC node ID - * @param idx Position of USB mux in chain */ -#define USB_MUX_COMMON_FIELDS(mux_id, port_id, idx) \ - USB_MUX_COMMON_FIELDS_WITH_FLAGS(mux_id, port_id, idx, 0, 0) +#define USB_MUX_COMMON_FIELDS(mux_id) \ + USB_MUX_COMMON_FIELDS_WITH_FLAGS(mux_id, 0, 0) /** - * @brief Expands to 1 if @p mux_id has @p compat compatible. It is required - * to makes sure that @p compat is expanded before DT_NODE_HAS_COMPAT + * @brief Declare USB mux structure * * @param mux_id USB mux node ID - * @param compat USB mux driver compatible + * @param conf Driver configuration function */ -#define USB_MUX_IS_COMPATIBLE(mux_id, compat) DT_NODE_HAS_COMPAT(mux_id, compat) +#define USB_MUX_DECLARE(mux_id, conf) extern USB_MUX_STRUCT_DECLARE(mux_id); /** - * @brief Expands to @p driver config if @p mux_id is compatible with @p driver + * @brief Define USB mux structure using driver USB_MUX_CONFIG_* macro * - * @param driver USB mux driver description in format (compatible, config) * @param mux_id USB mux node ID + * @param conf Driver configuration function */ -#define USB_MUX_DRIVER_CONFIG_IF_COMPAT(driver, mux_id) \ - COND_CODE_1(USB_MUX_IS_COMPATIBLE(mux_id, \ - USB_MUX_DRIVER_GET_COMPAT(driver)), \ - (USB_MUX_DRIVER_GET_CONFIG(driver)), ()) +#define USB_MUX_DEFINE(mux_id, conf) \ + USB_MUX_STRUCT_DECLARE(mux_id) = conf(mux_id); /** - * @brief Find driver from USB_MUX_DRIVERS that is compatible with @p mux_id + * @brief Call @p cb_op if @p mux_id has @p cb_prop property * * @param mux_id USB mux node ID + * @param cb_prop The callback property name + * @param cb_op Operation to perform on USB muxes */ -#define USB_MUX_FIND_DRIVER_CONFIG(mux_id) \ - FOR_EACH_FIXED_ARG(USB_MUX_DRIVER_CONFIG_IF_COMPAT, (), mux_id, \ - USB_MUX_DRIVERS) +#define USB_MUX_CB_DECLARE_IF_EXIST(mux_id, cb_prop, cb_op) \ + COND_CODE_1(DT_NODE_HAS_PROP(mux_id, cb_prop), (cb_op(mux_id)), ()) /** - * @brief Get driver configuration macro for @p mux_id and call @p op + * @brief Declare USB mux board_set function @p mux_id has board_set property * * @param mux_id USB mux node ID - * @param port_id USBC node ID - * @param idx Position of USB mux in chain - * @param op Operation to perform on USB muxes + * @param conf Driver configuration function */ -#define USB_MUX_CALL_OP(mux_id, port_id, idx, op) \ - op(mux_id, port_id, idx, USB_MUX_FIND_DRIVER_CONFIG(mux_id)) +#define USB_MUX_CB_BOARD_SET_DECLARE_IF_EXISTS(mux_id, conf) \ + USB_MUX_CB_DECLARE_IF_EXIST(mux_id, board_set, \ + USB_MUX_CB_BOARD_SET_DECLARE) /** - * @brief Get USB mux node ID and call USB_MUX_CALL_OP + * @brief Declare USB mux board_init function @p mux_id has board_init property * - * @param port_id USBC node ID - * @param idx Position of USB mux in chain - * @param op Operation to perform on USB muxes + * @param mux_id USB mux node ID + * @param conf Driver configuration function */ -#define USB_MUX_DO(port_id, idx, op) \ - USB_MUX_CALL_OP(USB_MUX_GET_CHAIN_N(idx, port_id), port_id, idx, op) +#define USB_MUX_CB_BOARD_INIT_DECLARE_IF_EXISTS(mux_id, conf) \ + USB_MUX_CB_DECLARE_IF_EXIST(mux_id, board_init, \ + USB_MUX_CB_BOARD_INIT_DECLARE) /** - * @brief Declare USB mux structure + * @brief Call @p op operation for each node that is compatible with @p driver * - * @param mux_id USB mux node ID - * @param port_id USBC node ID - * @param idx Position of USB mux in chain - * @param conf Driver configuration function + * @param driver USB mux driver description in format (compatible, config) + * @param op Operation to perform on each USB mux. Should accept mux node ID and + * driver config as arguments. */ -#define USB_MUX_DECLARE(mux_id, port_id, idx, conf) \ - extern USB_MUX_STRUCT_DECLARE(mux_id); +#define USB_MUX_DRIVER_CONFIG(driver, op) \ + DT_FOREACH_STATUS_OKAY_VARGS(USB_MUX_DRIVER_GET_COMPAT(driver), op, \ + USB_MUX_DRIVER_GET_CONFIG(driver)) /** - * @brief Define USB mux structure using driver USB_MUX_CONFIG_* macro + * @brief Call @p op operation for each USB mux node that is compatible with + * any driver from the USB_MUX_DRIVERS list. + * DT_FOREACH_STATUS_OKAY_VARGS() macro can not be used in @p op * - * @param mux_id USB mux node ID - * @param port_id USBC node ID - * @param idx Position of USB mux in chain - * @param conf Driver configuration function + * @param op Operation to perform on each USB mux. Should accept mux node ID and + * driver config as arguments. */ -#define USB_MUX_DEFINE(mux_id, port_id, idx, conf) \ - USB_MUX_STRUCT_DECLARE(mux_id) = conf(mux_id, port_id, idx); +#define USB_MUX_FOREACH_MUX_DT_VARGS(op) \ + FOR_EACH_FIXED_ARG(USB_MUX_DRIVER_CONFIG, (), op, USB_MUX_DRIVERS) /** - * @brief Define entry of usb_muxes array using driver USB_MUX_CONFIG_* macro + * @brief Convert @p mux_id and @p conf pair into USB_MUX_LIST entry * * @param mux_id USB mux node ID - * @param port_id USBC node ID - * @param idx Position of USB mux in chain * @param conf Driver configuration function */ -#define USB_MUX_ARRAY(mux_id, port_id, idx, conf) \ - [USB_MUX_PORT(port_id)] = conf(mux_id, port_id, idx), +#define USB_MUX_TO_LIST(mux_id, conf) , (mux_id, conf) + +/** + * @brief List of all USB muxes with config matched by compatible. List is in + * format (mux1_id, conf1) , (mux2_id, conf2) ... + */ +#define USB_MUX_LIST \ + LIST_DROP_EMPTY(USB_MUX_FOREACH_MUX_DT_VARGS(USB_MUX_TO_LIST)) /** - * @brief Call @p op with first mux in chain + * @brief Call @p op with @p args arguments * - * @param port_id USBC node ID - * @param op Operation to perform on USB mux first in chain. Needs to accept - * USB mux node ID, USBC port node ID, position in chain, and driver - * config as arguments. + * @param op Operation to perform on USB mux. Should accept mux node ID and + * driver config as arguments. + * @param args Arguments for @p op. Should be in format (mux_id, conf). */ -#define USB_MUX_FIRST(port_id, op) USB_MUX_DO(port_id, 0, op) +#define USB_MUX_CALL_OP(args, op) op args /** - * @brief Call USB_MUX_DO if @p idx is not 0 (is not first mux in chain) + * @brief Call @p op operation for each USB mux node from USB_MUX_LIST. This is + * like USB_MUX_FOREACH_MUX_DT_VARGS(), except + * DT_FOREACH_STATUS_OKAY_VARGS() macro can be used in @p op * - * @param port_id USBC node ID + * @param op Operation to perform on each USB mux. Should accept mux node ID and + * driver config as arguments. + */ +#define USB_MUX_FOREACH_MUX(op) \ + COND_CODE_0( \ + IS_EMPTY(USB_MUX_LIST), \ + (FOR_EACH_FIXED_ARG(USB_MUX_CALL_OP, (), op, USB_MUX_LIST)), \ + (EMPTY)) + +/** + * @brief Initialise chain structure for @p idx mux + * + * @param chain_id Chain DTS node ID + * @param idx USB mux index + */ +#define USB_MUX_CHAIN_STRUCT_INIT(chain_id, idx) \ + { \ + .mux = USB_MUX_POINTER(chain_id, idx), \ + .next = USB_MUX_CHAIN_NEXT_POINTER(chain_id, idx), \ + } + +/** + * @brief Helper macro to set chain structure value for @p idx mux + * + * @param chain_id Chain DTS node ID + * @param idx USB mux index + */ +#define USB_MUX_CHAIN_STRUCT_SET(chain_id, idx) \ + (struct usb_mux_chain) USB_MUX_CHAIN_STRUCT_INIT(chain_id, idx) + +/** + * @brief Declaration of USB mux chain extern structure for @p idx mux in + * @p chain_id chain + * + * @param chain_id USB mux chain node ID + * @param idx Place in chain + */ +#define USB_MUX_CHAIN_STRUCT_DECLARE_EXTERN_OP(chain_id, idx) \ + extern USB_MUX_CHAIN_STRUCT_DECLARE(USBC_PORT(chain_id), idx); + +/** + * @brief Declaration of USB mux chain structure for @p idx mux in @p chain_id + * chain + * + * @param chain_id USB mux chain node ID + * @param idx Place in chain + */ +#define USB_MUX_CHAIN_STRUCT_DECLARE_OP(chain_id, idx) \ + USB_MUX_CHAIN_STRUCT_DECLARE(USBC_PORT(chain_id), idx); + +/** + * @brief Definition of USB mux chain structure for @p idx mux in @p chain_id + * chain + * + * @param chain_id USB mux chain node ID + * @param idx Place in chain + */ +#define USB_MUX_CHAIN_STRUCT_DEFINE_OP(chain_id, idx) \ + USB_MUX_CHAIN_STRUCT_DECLARE(USBC_PORT(chain_id), idx) = \ + USB_MUX_CHAIN_STRUCT_INIT(chain_id, idx); + +/** + * @brief Call @p op if @p idx is not 0 (is not the root mux of chain) + * + * @param chain_id Chain DTS node ID * @param unused2 This argument is expected by DT_FOREACH_PROP_ELEM_VARGS * @param idx Position of USB mux in chain * @param op Operation to perform on USB muxes */ -#define USB_MUX_DO_SKIP_FIRST(port_id, unused2, idx, op) \ - COND_CODE_1(UTIL_BOOL(idx), (USB_MUX_DO(port_id, idx, op)), ()) +#define USB_MUX_SKIP_ROOT(chain_id, unused2, idx, op) \ + COND_CODE_1(UTIL_BOOL(idx), (op(chain_id, idx)), ()) /** - * @brief Call @p op with every mux in chain expect the first one + * @brief Call @p op for each mux in @p chain_id chain except the root mux * - * @param port_id USBC node ID - * @param op Operation to perform on USB muxes. Needs to accept USB mux node - * ID, USBC port node ID, position in chain, and driver config as - * arguments. + * @param chain_id Chain DTS node ID + * @param op Operation to perform on USB muxes */ -#define USB_MUX_NO_FIRST(port_id, op) \ - DT_FOREACH_PROP_ELEM_VARGS(port_id, usb_muxes, USB_MUX_DO_SKIP_FIRST, \ - op) +#define USB_MUX_FOREACH_NO_ROOT_MUX(chain_id, op) \ + DT_FOREACH_PROP_ELEM_VARGS(chain_id, usb_muxes, USB_MUX_SKIP_ROOT, op) /** - * @brief Call USB_MUX_DO if @p cb is not empty + * @brief Create usb_muxes array entry for @p chain_id chain * - * @param port_id USBC node ID - * @param mux_id USB mux node ID - * @param idx Position of USB mux in chain - * @param cb The callback name - * @param op Operation to perform on USB muxes + * @param chain_id Chain DTS node ID */ -#define USB_MUX_DO_SKIP_NO_CB(port_id, mux_id, idx, cb, op) \ - COND_CODE_0(IS_EMPTY(DT_STRING_TOKEN(mux_id, cb)), \ - (USB_MUX_DO(port_id, idx, op)), ()) +#define USB_MUX_DEFINE_ROOT_MUX(chain_id) \ + [USBC_PORT(chain_id)] = USB_MUX_CHAIN_STRUCT_INIT(chain_id, 0), /** - * @brief If usb_muxes property of @p port_id has callback property @p cb + * @brief Call @p op only if chain @p chain_id is not alternative * - * @param port_id USBC node ID - * @param cb The callback name - * @param op Operation to perform on USB muxes. Needs to accept USB mux node - * ID, USBC port node ID, position in chain, and driver config as - * arguments. + * @param chain_id Chain DTS node ID + * @param op Operation to perform on main USB mux chain + * @param ... Arguments to pass to the @p op operation */ -#define USB_MUX_HAS_CB(port_id, cb, op) \ - DT_FOREACH_PROP_ELEM_VARGS(port_id, usb_muxes, USB_MUX_DO_SKIP_NO_CB, \ - cb, op) +#define USB_MUX_FOR_MAIN_CHAIN(chain_id, op, ...) \ + COND_CODE_0(DT_PROP(chain_id, alternative_chain), \ + (op(chain_id, ##__VA_ARGS__)), ()) /** - * @brief If usb_muxes property of @p port_id has callback board_init + * @brief Call @p op for each USB mux chain * - * @param port_id USBC node ID - * @param op Operation to perform on USB muxes. Needs to accept USB mux node - * ID, USBC port node ID, position in chain, and driver config as - * arguments. + * @param op Operation to perform on USB mux chain */ -#define USB_MUX_HAS_CB_BOARD_INIT(port_id, op) \ - USB_MUX_HAS_CB(port_id, board_init, op) +#define USB_MUX_FOREACH_CHAIN(op) \ + DT_FOREACH_STATUS_OKAY(cros_ec_usb_mux_chain, op) /** - * @brief If usb_muxes property of @p port_id has callback board_set + * @brief Call @p op for each USB mux chain with arguments * - * @param port_id USBC node ID - * @param op Operation to perform on USB muxes. Needs to accept USB mux node - * ID, USBC port node ID, position in chain, and driver config as - * arguments. + * @param op Operation to perform on USB mux chain + * @param ... Arguments to pass to the @p op operation */ -#define USB_MUX_HAS_CB_BOARD_SET(port_id, op) \ - USB_MUX_HAS_CB(port_id, board_set, op) +#define USB_MUX_FOREACH_CHAIN_VARGS(op, ...) \ + DT_FOREACH_STATUS_OKAY_VARGS(cros_ec_usb_mux_chain, op, __VA_ARGS__) /** - * @brief Call @p op if @p idx mux in chain has BB retimer compatible + * @brief Construct first half of conditional expression (?:) that evaluates to + * @p chain_id USB port if @p idx mux in @p chain_id is the same as + * @p mux_id * - * @param port_id USBC node ID + * @param chain_id USB mux chain node ID * @param unused2 This argument is expected by DT_FOREACH_PROP_ELEM_VARGS * @param idx Position of USB mux in chain - * @param op Operation to perform on BB retimer + * @param mux_id USB mux node ID to compare with @p idx mux */ -#define USB_MUX_ONLY_BB_RETIMER(port_id, unused2, idx, op) \ - COND_CODE_1(USB_MUX_IS_COMPATIBLE(USB_MUX_GET_CHAIN_N(idx, port_id), \ - BB_RETIMER_USB_MUX_COMPAT), \ - (op(USB_MUX_GET_CHAIN_N(idx, port_id), port_id, idx, \ - BB_RETIMER_CONTROLS_CONFIG)), \ - ()) +#define USB_MUX_PORT_IF_SAME_NODES(chain_id, unused2, idx, mux_id) \ + DT_SAME_NODE(mux_id, USB_MUX_GET_CHAIN_N(chain_id, idx)) ? \ + USBC_PORT(chain_id): /** - * @brief Call @p op with every BB retimer in chain + * @brief Compare @p mux_id with all muxes in @p chain_id * - * @param port_id USBC node ID - * @param op Operation to perform on BB retimers. Needs to accept USB mux node - * ID, USBC port node ID, position in chain, and driver config as - * arguments. + * @param chain_id USB mux chain node ID + * @param mux_id USB mux node ID */ -#define USB_MUX_BB_RETIMERS(port_id, op) \ - DT_FOREACH_PROP_ELEM_VARGS(port_id, usb_muxes, \ - USB_MUX_ONLY_BB_RETIMER, op) +#define USB_MUX_FIND_PORT(chain_id, mux_id) \ + DT_FOREACH_PROP_ELEM_VARGS(chain_id, usb_muxes, \ + USB_MUX_PORT_IF_SAME_NODES, mux_id) + +/** + * @brief Get port for @p mux_id by looking for an usb mux chain where @p mux_id + * is present. If the mux is not present in any chain, this macro + * evaluate to -1. + * + * This expands to: + * (DT_DEP_ORD(mux_id) == DT_DEP_ORD(USB_MUX_GET_CHAIN_N(chain1_id, 0))) ? + * USBC_PORT(chain1_id) : + * (DT_DEP_ORD(mux_id) == DT_DEP_ORD(USB_MUX_GET_CHAIN_N(chain1_id, 1))) ? + * USBC_PORT(chain1_id) : + * ... + * (DT_DEP_ORD(mux_id) == DT_DEP_ORD(USB_MUX_GET_CHAIN_N(chain1_id, n))) ? + * USBC_PORT(chain1_id) : + * (DT_DEP_ORD(mux_id) == DT_DEP_ORD(USB_MUX_GET_CHAIN_N(chain2_id, 0))) ? + * USBC_PORT(chain2_id) : + * ... + * (DT_DEP_ORD(mux_id) == DT_DEP_ORD(USB_MUX_GET_CHAIN_N(chainm_id, k))) ? + * USBC_PORT(chainm_id) : (-1) + * + * @param mux_id USB mux node ID + */ +#define USB_MUX_PORT(mux_id) \ + (USB_MUX_FOREACH_CHAIN_VARGS(USB_MUX_FIND_PORT, mux_id)(-1)) /** - * @brief If @p port_id has usb_muxes property, call @p op with every mux in - * chain that passes @p filter + * @brief Set usb_mux_chain structure for mux @p idx in chain @p chain_id * - * @param port_id USBC node ID - * @param filter Macro that should filter USB muxes and call @p op on them. - * It has @p port_id and @p op as arguments. It is called - * only for @p port_id that has usb_muxes property. - * @param op Operation to perform on USB muxes. Needs to accept USB mux node - * ID, USBC port node ID, position in chain, and driver config as - * arguments. + * @param chain_id Alternative USB mux chain node ID + * @param idx Position of the mux in chain */ -#define USB_MUX_USBC_PORT_HAS_MUXES(port_id, filter, op) \ - COND_CODE_1(DT_NODE_HAS_PROP(port_id, usb_muxes), \ - (filter(port_id, op)), ()) +#define USB_MUX_SET_ALTERNATIVE(chain_id, idx) \ + USB_MUX_CHAIN_STRUCT_NAME(idx, USBC_PORT(chain_id)) = \ + USB_MUX_CHAIN_STRUCT_SET(chain_id, idx); /** - * @brief For every USBC port that has muxes, call @p op with every mux in chain - * that passes @p filter + * @brief Enable alternative USB mux chain * - * @param filter Macro that should filter USB muxes and call @p op on them. - * It has USBC port node ID and @p op as arguments. It is called - * only for USBC ports that have usb_muxes property. - * @param op Operation to perform on USB muxes. Needs to accept USB mux node - * ID, USBC port node ID, position in chain, and driver config as - * arguments. + * @param chain_id Alternative USB mux chain node ID */ -#define USB_MUX_FOREACH_USBC_PORT(filter, op) \ - DT_FOREACH_STATUS_OKAY_VARGS(named_usbc_port, \ - USB_MUX_USBC_PORT_HAS_MUXES, filter, op) +#define USB_MUX_ENABLE_ALTERNATIVE_NODE(chain_id) \ + do { \ + usb_muxes[USBC_PORT(chain_id)] = \ + USB_MUX_CHAIN_STRUCT_SET(chain_id, 0); \ + USB_MUX_FOREACH_NO_ROOT_MUX(chain_id, USB_MUX_SET_ALTERNATIVE) \ + } while (0) + +/** + * @brief Enable alternative USB mux chain + * + * @param nodelabel Label of alternative USB mux chain + */ +#define USB_MUX_ENABLE_ALTERNATIVE(nodelabel) \ + USB_MUX_ENABLE_ALTERNATIVE_NODE(DT_NODELABEL(nodelabel)) /** * Forward declare all usb_mux structures e.g. * MAYBE_CONST struct usb_mux USB_MUX_NODE_<node_id>; */ -USB_MUX_FOREACH_USBC_PORT(USB_MUX_NO_FIRST, USB_MUX_DECLARE) +USB_MUX_FOREACH_MUX(USB_MUX_DECLARE) + +/** + * Forward declare all usb_mux_chain structures e.g. + * extern MAYBE_CONST struct usb_mux_chain + * USB_MUX_chain_port_<node_id>_mux_<position_id>; + */ +USB_MUX_FOREACH_CHAIN_VARGS(USB_MUX_FOREACH_NO_ROOT_MUX, + USB_MUX_CHAIN_STRUCT_DECLARE_EXTERN_OP) #endif /* ZEPHYR_CHROME_USBC_USB_MUXES_H */ diff --git a/zephyr/shim/include/usbc/utils.h b/zephyr/shim/include/usbc/utils.h index 63410753ea..53e9a34856 100644 --- a/zephyr/shim/include/usbc/utils.h +++ b/zephyr/shim/include/usbc/utils.h @@ -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. */ diff --git a/zephyr/shim/include/usbc/virtual_usb_mux.h b/zephyr/shim/include/usbc/virtual_usb_mux.h index b7afa202c0..bbb2d8730e 100644 --- a/zephyr/shim/include/usbc/virtual_usb_mux.h +++ b/zephyr/shim/include/usbc/virtual_usb_mux.h @@ -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. */ @@ -10,11 +10,11 @@ #define VIRTUAL_USB_MUX_COMPAT cros_ec_usbc_mux_virtual -#define USB_MUX_CONFIG_VIRTUAL(mux_id, port_id, idx) \ - { \ - USB_MUX_COMMON_FIELDS(mux_id, port_id, idx), \ - .driver = &virtual_usb_mux_driver, \ - .hpd_update = &virtual_hpd_update, \ +#define USB_MUX_CONFIG_VIRTUAL(mux_id) \ + { \ + USB_MUX_COMMON_FIELDS(mux_id), \ + .driver = &virtual_usb_mux_driver, \ + .hpd_update = &virtual_hpd_update, \ } #endif /* __ZEPHYR_SHIM_VIRTUAL_USB_MUX_H */ diff --git a/zephyr/shim/include/zephyr_adc.h b/zephyr/shim/include/zephyr_adc.h index 8f9b1f85d5..d4139692f7 100644 --- a/zephyr/shim/include/zephyr_adc.h +++ b/zephyr/shim/include/zephyr_adc.h @@ -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. */ @@ -11,17 +11,15 @@ #ifdef CONFIG_ADC #define ZSHIM_ADC_ID(node_id) DT_STRING_UPPER_TOKEN(node_id, enum_name) -#define ADC_ID_WITH_COMMA(node_id) ZSHIM_ADC_ID(node_id), enum adc_channel { #if DT_NODE_EXISTS(DT_INST(0, named_adc_channels)) - DT_FOREACH_CHILD(DT_INST(0, named_adc_channels), ADC_ID_WITH_COMMA) + DT_FOREACH_CHILD_SEP(DT_INST(0, named_adc_channels), ZSHIM_ADC_ID, + (, )), #endif /* named_adc_channels */ - ADC_CH_COUNT + ADC_CH_COUNT }; -#undef ADC_ID_WITH_COMMA - struct adc_t { const char *name; const struct device *dev; diff --git a/zephyr/shim/include/zephyr_console_shim.h b/zephyr/shim/include/zephyr_console_shim.h index 1a0d754439..8c8f34e742 100644 --- a/zephyr/shim/include/zephyr_console_shim.h +++ b/zephyr/shim/include/zephyr_console_shim.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/zephyr/shim/include/zephyr_espi_shim.h b/zephyr/shim/include/zephyr_espi_shim.h index 4f147752d7..ddc4da075c 100644 --- a/zephyr/shim/include/zephyr_espi_shim.h +++ b/zephyr/shim/include/zephyr_espi_shim.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/zephyr/shim/include/zephyr_gpio_signal.h b/zephyr/shim/include/zephyr_gpio_signal.h index e15f55e74c..1a98071d6d 100644 --- a/zephyr/shim/include/zephyr_gpio_signal.h +++ b/zephyr/shim/include/zephyr_gpio_signal.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/zephyr/shim/include/zephyr_hooks_shim.h b/zephyr/shim/include/zephyr_hooks_shim.h index 3f9819b43a..f3949787bd 100644 --- a/zephyr/shim/include/zephyr_hooks_shim.h +++ b/zephyr/shim/include/zephyr_hooks_shim.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -10,7 +10,6 @@ #include <zephyr/init.h> #include <zephyr/kernel.h> -#include <zephyr/zephyr.h> #include "common.h" #include "cros_version.h" diff --git a/zephyr/shim/include/zephyr_host_command.h b/zephyr/shim/include/zephyr_host_command.h index 46275288fe..e2f0a7c296 100644 --- a/zephyr/shim/include/zephyr_host_command.h +++ b/zephyr/shim/include/zephyr_host_command.h @@ -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. */ @@ -36,10 +36,10 @@ bool in_host_command_main(void); #else /* !CONFIG_PLATFORM_EC_HOSTCMD */ /* - * Create a fake routine to call the function. The linker should - * garbage-collect it since it is behind 'if (0)' + * Create a global var to reference the host command. The linker should remove + * it since it is never referenced. */ #define DECLARE_HOST_COMMAND(command, routine, version_mask) \ - int __remove_##command = (0 && (int)(routine)) + int __remove_##command = ((int)(routine)) #endif /* CONFIG_PLATFORM_EC_HOSTCMD */ diff --git a/zephyr/shim/include/zephyr_mkbp_event.h b/zephyr/shim/include/zephyr_mkbp_event.h index 00e12b6c0f..b8cb88029d 100644 --- a/zephyr/shim/include/zephyr_mkbp_event.h +++ b/zephyr/shim/include/zephyr_mkbp_event.h @@ -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. */ diff --git a/zephyr/shim/include/zephyr_write_protect.h b/zephyr/shim/include/zephyr_write_protect.h index 3af2fb3576..227af16bd0 100644 --- a/zephyr/shim/include/zephyr_write_protect.h +++ b/zephyr/shim/include/zephyr_write_protect.h @@ -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. */ diff --git a/zephyr/shim/src/CMakeLists.txt b/zephyr/shim/src/CMakeLists.txt index f462611552..636f8ba5c9 100644 --- a/zephyr/shim/src/CMakeLists.txt +++ b/zephyr/shim/src/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -73,3 +73,7 @@ zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USB_PD_TCPM_TCPCI zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBA usba.c) zephyr_library_sources_ifdef(CONFIG_AP_PWRSEQ power_host_sleep_api.c) zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USB_MUX usb_muxes.c) +zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC_RETIMER_INTEL_BB + bb_retimer_usb_mux.c) +zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC_RETIMER_INTEL_HB + bb_retimer_usb_mux.c) diff --git a/zephyr/shim/src/adc.c b/zephyr/shim/src/adc.c index 5b5fb8e6fc..e14ef9f20f 100644 --- a/zephyr/shim/src/adc.c +++ b/zephyr/shim/src/adc.c @@ -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. */ @@ -18,7 +18,7 @@ LOG_MODULE_REGISTER(shim_adc, LOG_LEVEL_ERR); #define HAS_NAMED_ADC_CHANNELS DT_NODE_EXISTS(DT_INST(0, named_adc_channels)) #if HAS_NAMED_ADC_CHANNELS -#define ADC_CHANNEL_COMMA(node_id) \ +#define ADC_CHANNEL_INIT(node_id) \ [ZSHIM_ADC_ID(node_id)] = { \ .name = DT_NODE_FULL_NAME(node_id), \ .dev = DEVICE_DT_GET(DT_IO_CHANNELS_CTLR(node_id)), \ @@ -36,10 +36,10 @@ LOG_MODULE_REGISTER(shim_adc, LOG_LEVEL_ERR); }, #ifdef CONFIG_ADC_CHANNELS_RUNTIME_CONFIG struct adc_t adc_channels[] = { DT_FOREACH_CHILD(DT_INST(0, named_adc_channels), - ADC_CHANNEL_COMMA) }; + ADC_CHANNEL_INIT) }; #else const struct adc_t adc_channels[] = { DT_FOREACH_CHILD( - DT_INST(0, named_adc_channels), ADC_CHANNEL_COMMA) }; + DT_INST(0, named_adc_channels), ADC_CHANNEL_INIT) }; #endif #endif /* named_adc_channels */ diff --git a/zephyr/shim/src/battery.c b/zephyr/shim/src/battery.c index 37cc4db15a..7decefbb01 100644 --- a/zephyr/shim/src/battery.c +++ b/zephyr/shim/src/battery.c @@ -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. */ diff --git a/zephyr/shim/src/bb_retimer_usb_mux.c b/zephyr/shim/src/bb_retimer_usb_mux.c new file mode 100644 index 0000000000..c40068211e --- /dev/null +++ b/zephyr/shim/src/bb_retimer_usb_mux.c @@ -0,0 +1,39 @@ +/* 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. + */ + +#include <zephyr/devicetree.h> +#include <zephyr/sys/util_macro.h> +#include "usb_mux.h" +#include "usbc/usb_muxes.h" + +/** + * This prevents creating struct usb_mux bb_controls[] for platforms that didn't + * migrate USB mux configuration to DTS yet. + */ +#if DT_HAS_COMPAT_STATUS_OKAY(cros_ec_usb_mux_chain) + +BB_RETIMER_CHECK_SAME_CONTROLS(BB_RETIMER_INSTANCES_LIST) + +/** + * @brief bb_controls array should be constant only if configuration cannot + * change in runtime + */ +#define BB_CONTROLS_CONST \ + COND_CODE_1(CONFIG_PLATFORM_EC_USBC_RETIMER_INTEL_BB_RUNTIME_CONFIG, \ + (), (const)) + +/** + * Define bb_controls for BB retimers in USB muxes chain e.g. + * [0] = { + * .retimer_rst_gpio = IOEX_USB_C0_BB_RETIMER_RST, + * .usb_ls_en_gpio = IOEX_USB_C0_BB_RETIMER_LS_EN, + * }, + * [1] = { ... }, + */ +BB_CONTROLS_CONST struct bb_usb_control bb_controls[] = { + USB_MUX_BB_RETIMERS_CONTROLS_ARRAY +}; + +#endif /* #if DT_HAS_COMPAT_STATUS_OKAY(cros_ec_usb_mux_chain) */ diff --git a/zephyr/shim/src/bc12.c b/zephyr/shim/src/bc12.c index 249d112424..6542a166eb 100644 --- a/zephyr/shim/src/bc12.c +++ b/zephyr/shim/src/bc12.c @@ -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. */ diff --git a/zephyr/shim/src/bc12_pi3usb9201.c b/zephyr/shim/src/bc12_pi3usb9201.c index e49d3c4926..25d1962ff2 100644 --- a/zephyr/shim/src/bc12_pi3usb9201.c +++ b/zephyr/shim/src/bc12_pi3usb9201.c @@ -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. */ diff --git a/zephyr/shim/src/bc12_rt9490.c b/zephyr/shim/src/bc12_rt9490.c index 9bc2496031..df10fb5570 100644 --- a/zephyr/shim/src/bc12_rt9490.c +++ b/zephyr/shim/src/bc12_rt9490.c @@ -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. */ diff --git a/zephyr/shim/src/cbi/cbi_eeprom.c b/zephyr/shim/src/cbi/cbi_eeprom.c index 4b9d718ef0..aa6c4e0fa1 100644 --- a/zephyr/shim/src/cbi/cbi_eeprom.c +++ b/zephyr/shim/src/cbi/cbi_eeprom.c @@ -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. */ diff --git a/zephyr/shim/src/cbi/cros_cbi.c b/zephyr/shim/src/cbi/cros_cbi.c index 7ae1fbc098..5b90f9442d 100644 --- a/zephyr/shim/src/cbi/cros_cbi.c +++ b/zephyr/shim/src/cbi/cros_cbi.c @@ -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. */ diff --git a/zephyr/shim/src/cbi/cros_cbi_fw_config.c b/zephyr/shim/src/cbi/cros_cbi_fw_config.c index 71d68f6864..6710a30726 100644 --- a/zephyr/shim/src/cbi/cros_cbi_fw_config.c +++ b/zephyr/shim/src/cbi/cros_cbi_fw_config.c @@ -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. */ diff --git a/zephyr/shim/src/cbi/cros_cbi_ssfc.c b/zephyr/shim/src/cbi/cros_cbi_ssfc.c index 628b4e244d..eb0f69b1cb 100644 --- a/zephyr/shim/src/cbi/cros_cbi_ssfc.c +++ b/zephyr/shim/src/cbi/cros_cbi_ssfc.c @@ -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. */ diff --git a/zephyr/shim/src/charger.c b/zephyr/shim/src/charger.c index be8c7615f6..35ede5a8f7 100644 --- a/zephyr/shim/src/charger.c +++ b/zephyr/shim/src/charger.c @@ -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. */ @@ -25,6 +25,7 @@ CHECK_COMPAT(ISL923X_EMUL_COMPAT, usbc_id, chg_id, CHG_CONFIG_ISL923X) \ CHECK_COMPAT(ISL9241_CHG_COMPAT, usbc_id, chg_id, CHG_CONFIG_ISL9241) \ CHECK_COMPAT(RT9490_CHG_COMPAT, usbc_id, chg_id, CHG_CONFIG_RT9490) \ + CHECK_COMPAT(RT9490_EMUL_COMPAT, usbc_id, chg_id, CHG_CONFIG_RT9490) \ CHECK_COMPAT(SM5803_CHG_COMPAT, usbc_id, chg_id, CHG_CONFIG_SM5803) #define CHG_CHIP(usbc_id) \ diff --git a/zephyr/shim/src/chipset_api.c b/zephyr/shim/src/chipset_api.c index ac073a0d91..6c48719a7f 100644 --- a/zephyr/shim/src/chipset_api.c +++ b/zephyr/shim/src/chipset_api.c @@ -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. */ diff --git a/zephyr/shim/src/chipset_state_check.h b/zephyr/shim/src/chipset_state_check.h index 78f3add6fb..2d10b2ce4a 100644 --- a/zephyr/shim/src/chipset_state_check.h +++ b/zephyr/shim/src/chipset_state_check.h @@ -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. */ diff --git a/zephyr/shim/src/console.c b/zephyr/shim/src/console.c index 1c5aa44e99..2d0476149c 100644 --- a/zephyr/shim/src/console.c +++ b/zephyr/shim/src/console.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -14,7 +14,7 @@ #include <string.h> #include <zephyr/sys/printk.h> #include <zephyr/sys/ring_buffer.h> -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/logging/log.h> /* @@ -56,6 +56,8 @@ static struct k_poll_signal shell_init_signal; * (which requires locking the shell). */ static bool shell_stopped; + +#if defined(CONFIG_UART_INTERRUPT_DRIVEN) RING_BUF_DECLARE(rx_buffer, CONFIG_UART_RX_BUF_SIZE); static void uart_rx_handle(const struct device *dev) @@ -90,10 +92,12 @@ static void uart_callback(const struct device *dev, void *user_data) if (uart_irq_rx_ready(dev)) uart_rx_handle(dev); } +#endif static void shell_uninit_callback(const struct shell *shell, int res) { if (!res) { +#if defined(CONFIG_UART_INTERRUPT_DRIVEN) /* Set the new callback */ uart_irq_callback_user_data_set(uart_shell_dev, uart_callback, NULL); @@ -106,6 +110,7 @@ static void shell_uninit_callback(const struct shell *shell, int res) /* Enable RX interrupts */ uart_irq_rx_enable(uart_shell_dev); +#endif } /* Notify the uninit signal that we finished */ @@ -126,9 +131,11 @@ int uart_shell_stop(void) /* Clear all pending input */ uart_clear_input(); +#if defined(CONFIG_UART_INTERRUPT_DRIVEN) /* Disable RX and TX interrupts */ uart_irq_rx_disable(uart_shell_dev); uart_irq_tx_disable(uart_shell_dev); +#endif /* Initialize the uninit signal */ k_poll_signal_init(&shell_uninit_signal); @@ -169,8 +176,10 @@ static void shell_init_from_work(struct k_work *work) k_thread_priority_set(shell_zephyr->ctx->tid, EC_TASK_PRIORITY(EC_SHELL_PRIO)); +#if defined(CONFIG_UART_INTERRUPT_DRIVEN) uart_irq_rx_enable(uart_shell_dev); uart_irq_tx_enable(uart_shell_dev); +#endif /* Notify the init signal that initialization is complete */ k_poll_signal_raise(&shell_init_signal, 0); @@ -183,9 +192,11 @@ void uart_shell_start(void) K_POLL_TYPE_SIGNAL, K_POLL_MODE_NOTIFY_ONLY, &shell_init_signal); +#if defined(CONFIG_UART_INTERRUPT_DRIVEN) /* Disable RX and TX interrupts */ uart_irq_rx_disable(uart_shell_dev); uart_irq_tx_disable(uart_shell_dev); +#endif /* Initialize k_work to call shell init (this makes it thread safe) */ k_work_init(&shell_init_work, shell_init_from_work); @@ -316,24 +327,39 @@ void uart_flush_output(void) void uart_tx_flush(void) { +#if defined(CONFIG_UART_INTERRUPT_DRIVEN) while (!uart_irq_tx_complete(uart_shell_dev)) ; +#endif } int uart_getc(void) { +#if defined(CONFIG_UART_INTERRUPT_DRIVEN) uint8_t c; if (ring_buf_get(&rx_buffer, &c, 1)) { return c; } return -1; +#else + uint8_t c; + int rv; + + rv = uart_poll_in(uart_shell_dev, &c); + if (rv) { + return rv; + } + return c; +#endif } void uart_clear_input(void) { +#if defined(CONFIG_UART_INTERRUPT_DRIVEN) /* Reset the input ring buffer */ ring_buf_reset(&rx_buffer); +#endif } static void handle_sprintf_rv(int rv, size_t *len) diff --git a/zephyr/shim/src/console_buffer.c b/zephyr/shim/src/console_buffer.c index b224a19c42..fc7de6cd27 100644 --- a/zephyr/shim/src/console_buffer.c +++ b/zephyr/shim/src/console_buffer.c @@ -1,10 +1,9 @@ -/* 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. */ #include <zephyr/kernel.h> -#include <zephyr/zephyr.h> #include "common.h" #include "console.h" diff --git a/zephyr/shim/src/crc.c b/zephyr/shim/src/crc.c index 0c5a81a4dd..f8ce335029 100644 --- a/zephyr/shim/src/crc.c +++ b/zephyr/shim/src/crc.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/zephyr/shim/src/espi.c b/zephyr/shim/src/espi.c index d2fe2233ce..d6f6bed314 100644 --- a/zephyr/shim/src/espi.c +++ b/zephyr/shim/src/espi.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -10,7 +10,6 @@ #include <zephyr/logging/log.h> #include <zephyr/kernel.h> #include <stdint.h> -#include <zephyr/zephyr.h> #include <ap_power/ap_power.h> #include <ap_power/ap_power_events.h> @@ -29,7 +28,8 @@ #include "timer.h" #include "zephyr_espi_shim.h" -#define VWIRE_PULSE_TRIGGER_TIME CONFIG_PLATFORM_EC_ESPI_DEFAULT_VW_WIDTH_US +#define VWIRE_PULSE_TRIGGER_TIME \ + CONFIG_PLATFORM_EC_HOST_INTERFACE_ESPI_DEFAULT_VW_WIDTH_US LOG_MODULE_REGISTER(espi_shim, CONFIG_ESPI_LOG_LEVEL); diff --git a/zephyr/shim/src/fan.c b/zephyr/shim/src/fan.c index a36061626f..c7074b0c4d 100644 --- a/zephyr/shim/src/fan.c +++ b/zephyr/shim/src/fan.c @@ -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. */ diff --git a/zephyr/shim/src/flash.c b/zephyr/shim/src/flash.c index 90e6d1a724..8aa7deecf5 100644 --- a/zephyr/shim/src/flash.c +++ b/zephyr/shim/src/flash.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/zephyr/shim/src/gpio.c b/zephyr/shim/src/gpio.c index e52667bf26..9738bf3de2 100644 --- a/zephyr/shim/src/gpio.c +++ b/zephyr/shim/src/gpio.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/zephyr/shim/src/gpio_id.c b/zephyr/shim/src/gpio_id.c index 2329832f7d..b994154cd1 100644 --- a/zephyr/shim/src/gpio_id.c +++ b/zephyr/shim/src/gpio_id.c @@ -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. */ diff --git a/zephyr/shim/src/gpio_int.c b/zephyr/shim/src/gpio_int.c index e79fcdc7fd..8406f3abe8 100644 --- a/zephyr/shim/src/gpio_int.c +++ b/zephyr/shim/src/gpio_int.c @@ -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. */ diff --git a/zephyr/shim/src/hooks.c b/zephyr/shim/src/hooks.c index ddb48278b5..da981dea6b 100644 --- a/zephyr/shim/src/hooks.c +++ b/zephyr/shim/src/hooks.c @@ -1,10 +1,9 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ #include <zephyr/kernel.h> -#include <zephyr/zephyr.h> #include <ap_power/ap_power.h> #include <ap_power/ap_power_events.h> diff --git a/zephyr/shim/src/host_command.c b/zephyr/shim/src/host_command.c index 27e9583622..c5a51332a1 100644 --- a/zephyr/shim/src/host_command.c +++ b/zephyr/shim/src/host_command.c @@ -1,9 +1,9 @@ -/* 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. */ -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include "host_command.h" #include "task.h" diff --git a/zephyr/shim/src/hwtimer.c b/zephyr/shim/src/hwtimer.c index aaaf051d80..d99f7a826b 100644 --- a/zephyr/shim/src/hwtimer.c +++ b/zephyr/shim/src/hwtimer.c @@ -1,11 +1,10 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ #include <zephyr/kernel.h> #include <stdint.h> -#include <zephyr/zephyr.h> #include "hwtimer.h" diff --git a/zephyr/shim/src/i2c.c b/zephyr/shim/src/i2c.c index 8339f499f3..0074327826 100644 --- a/zephyr/shim/src/i2c.c +++ b/zephyr/shim/src/i2c.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/zephyr/shim/src/ioex.c b/zephyr/shim/src/ioex.c index 18410b4b68..a5d685bc48 100644 --- a/zephyr/shim/src/ioex.c +++ b/zephyr/shim/src/ioex.c @@ -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. */ diff --git a/zephyr/shim/src/ioex_drv.c b/zephyr/shim/src/ioex_drv.c index ccf142576d..96a0dd3a8e 100644 --- a/zephyr/shim/src/ioex_drv.c +++ b/zephyr/shim/src/ioex_drv.c @@ -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. */ diff --git a/zephyr/shim/src/keyboard_raw.c b/zephyr/shim/src/keyboard_raw.c index ef2dadb29c..c9f465d06d 100644 --- a/zephyr/shim/src/keyboard_raw.c +++ b/zephyr/shim/src/keyboard_raw.c @@ -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. */ @@ -8,7 +8,7 @@ #include <zephyr/device.h> #include <zephyr/logging/log.h> #include <soc.h> -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include "drivers/cros_kb_raw.h" #include "keyboard_raw.h" diff --git a/zephyr/shim/src/keyscan.c b/zephyr/shim/src/keyscan.c index a5503ecb48..514885379b 100644 --- a/zephyr/shim/src/keyscan.c +++ b/zephyr/shim/src/keyscan.c @@ -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. */ diff --git a/zephyr/shim/src/led_driver/CMakeLists.txt b/zephyr/shim/src/led_driver/CMakeLists.txt index 7c21d6827e..179f540fe1 100644 --- a/zephyr/shim/src/led_driver/CMakeLists.txt +++ b/zephyr/shim/src/led_driver/CMakeLists.txt @@ -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. diff --git a/zephyr/shim/src/led_driver/led.c b/zephyr/shim/src/led_driver/led.c index 3cc76ea6c1..011632ac83 100644 --- a/zephyr/shim/src/led_driver/led.c +++ b/zephyr/shim/src/led_driver/led.c @@ -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. * diff --git a/zephyr/shim/src/led_driver/led.h b/zephyr/shim/src/led_driver/led.h index a4c6962b41..b8cedf5af7 100644 --- a/zephyr/shim/src/led_driver/led.h +++ b/zephyr/shim/src/led_driver/led.h @@ -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. */ diff --git a/zephyr/shim/src/led_driver/led_gpio.c b/zephyr/shim/src/led_driver/led_gpio.c index fa70cab2d4..122794dc82 100644 --- a/zephyr/shim/src/led_driver/led_gpio.c +++ b/zephyr/shim/src/led_driver/led_gpio.c @@ -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. * diff --git a/zephyr/shim/src/led_driver/led_pwm.c b/zephyr/shim/src/led_driver/led_pwm.c index a8244be67d..00002fc32e 100644 --- a/zephyr/shim/src/led_driver/led_pwm.c +++ b/zephyr/shim/src/led_driver/led_pwm.c @@ -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. * diff --git a/zephyr/shim/src/libgcc_arm.S b/zephyr/shim/src/libgcc_arm.S index ffdbefc675..9e087ecf5f 100644 --- a/zephyr/shim/src/libgcc_arm.S +++ b/zephyr/shim/src/libgcc_arm.S @@ -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. */ diff --git a/zephyr/shim/src/mkbp_event.c b/zephyr/shim/src/mkbp_event.c index 0785e93706..ac39d14120 100644 --- a/zephyr/shim/src/mkbp_event.c +++ b/zephyr/shim/src/mkbp_event.c @@ -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. */ diff --git a/zephyr/shim/src/motionsense_driver/bma255-drvinfo.inc b/zephyr/shim/src/motionsense_driver/bma255-drvinfo.inc index 7db46811ad..a16c4f0fbc 100644 --- a/zephyr/shim/src/motionsense_driver/bma255-drvinfo.inc +++ b/zephyr/shim/src/motionsense_driver/bma255-drvinfo.inc @@ -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. */ diff --git a/zephyr/shim/src/motionsense_driver/bma4xx-drvinfo.inc b/zephyr/shim/src/motionsense_driver/bma4xx-drvinfo.inc index 2d40c55de7..3d02e5db70 100644 --- a/zephyr/shim/src/motionsense_driver/bma4xx-drvinfo.inc +++ b/zephyr/shim/src/motionsense_driver/bma4xx-drvinfo.inc @@ -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. */ diff --git a/zephyr/shim/src/motionsense_driver/bmi160-drvinfo.inc b/zephyr/shim/src/motionsense_driver/bmi160-drvinfo.inc index dd7b21641b..36d20db7be 100644 --- a/zephyr/shim/src/motionsense_driver/bmi160-drvinfo.inc +++ b/zephyr/shim/src/motionsense_driver/bmi160-drvinfo.inc @@ -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. */ diff --git a/zephyr/shim/src/motionsense_driver/bmi260-drvinfo.inc b/zephyr/shim/src/motionsense_driver/bmi260-drvinfo.inc index 2457fca31a..72bfc5b4b3 100644 --- a/zephyr/shim/src/motionsense_driver/bmi260-drvinfo.inc +++ b/zephyr/shim/src/motionsense_driver/bmi260-drvinfo.inc @@ -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. */ diff --git a/zephyr/shim/src/motionsense_driver/bmi3xx-drvinfo.inc b/zephyr/shim/src/motionsense_driver/bmi3xx-drvinfo.inc index ce6f686cc2..c28f5c1786 100644 --- a/zephyr/shim/src/motionsense_driver/bmi3xx-drvinfo.inc +++ b/zephyr/shim/src/motionsense_driver/bmi3xx-drvinfo.inc @@ -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. */ diff --git a/zephyr/shim/src/motionsense_driver/drvdata-accelgyro.h b/zephyr/shim/src/motionsense_driver/drvdata-accelgyro.h index fd8f9d8ded..ab2f08a496 100644 --- a/zephyr/shim/src/motionsense_driver/drvdata-accelgyro.h +++ b/zephyr/shim/src/motionsense_driver/drvdata-accelgyro.h @@ -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. */ diff --git a/zephyr/shim/src/motionsense_driver/icm42607-drvinfo.inc b/zephyr/shim/src/motionsense_driver/icm42607-drvinfo.inc index e8199eaacf..ede16342ea 100644 --- a/zephyr/shim/src/motionsense_driver/icm42607-drvinfo.inc +++ b/zephyr/shim/src/motionsense_driver/icm42607-drvinfo.inc @@ -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. */ diff --git a/zephyr/shim/src/motionsense_driver/icm426xx-drvinfo.inc b/zephyr/shim/src/motionsense_driver/icm426xx-drvinfo.inc index 5513ff934c..d949829750 100644 --- a/zephyr/shim/src/motionsense_driver/icm426xx-drvinfo.inc +++ b/zephyr/shim/src/motionsense_driver/icm426xx-drvinfo.inc @@ -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. */ diff --git a/zephyr/shim/src/motionsense_driver/kx022-drvinfo.inc b/zephyr/shim/src/motionsense_driver/kx022-drvinfo.inc index 800a9a1543..26885230e1 100644 --- a/zephyr/shim/src/motionsense_driver/kx022-drvinfo.inc +++ b/zephyr/shim/src/motionsense_driver/kx022-drvinfo.inc @@ -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. */ diff --git a/zephyr/shim/src/motionsense_driver/lis2dw12-drvinfo.inc b/zephyr/shim/src/motionsense_driver/lis2dw12-drvinfo.inc index 433a9d4192..4605fcd749 100644 --- a/zephyr/shim/src/motionsense_driver/lis2dw12-drvinfo.inc +++ b/zephyr/shim/src/motionsense_driver/lis2dw12-drvinfo.inc @@ -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. */ diff --git a/zephyr/shim/src/motionsense_driver/lsm6dso-drvinfo.inc b/zephyr/shim/src/motionsense_driver/lsm6dso-drvinfo.inc index dc0f92d468..dfffa2fe2a 100644 --- a/zephyr/shim/src/motionsense_driver/lsm6dso-drvinfo.inc +++ b/zephyr/shim/src/motionsense_driver/lsm6dso-drvinfo.inc @@ -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. */ diff --git a/zephyr/shim/src/motionsense_driver/sensor_drv_list.inc b/zephyr/shim/src/motionsense_driver/sensor_drv_list.inc index 2b70a6ec16..cecc3a9ced 100644 --- a/zephyr/shim/src/motionsense_driver/sensor_drv_list.inc +++ b/zephyr/shim/src/motionsense_driver/sensor_drv_list.inc @@ -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. */ diff --git a/zephyr/shim/src/motionsense_driver/tcs3400-drvinfo.inc b/zephyr/shim/src/motionsense_driver/tcs3400-drvinfo.inc index 346688d646..9d42860ac7 100644 --- a/zephyr/shim/src/motionsense_driver/tcs3400-drvinfo.inc +++ b/zephyr/shim/src/motionsense_driver/tcs3400-drvinfo.inc @@ -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. */ diff --git a/zephyr/shim/src/motionsense_sensors.c b/zephyr/shim/src/motionsense_sensors.c index 2480aa8477..8d886192ac 100644 --- a/zephyr/shim/src/motionsense_sensors.c +++ b/zephyr/shim/src/motionsense_sensors.c @@ -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. */ diff --git a/zephyr/shim/src/panic.c b/zephyr/shim/src/panic.c index 8b73d03400..e27372be52 100644 --- a/zephyr/shim/src/panic.c +++ b/zephyr/shim/src/panic.c @@ -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 @@ #include <zephyr/fatal.h> #include <zephyr/logging/log.h> #include <zephyr/logging/log_ctrl.h> -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include "common.h" #include "panic.h" diff --git a/zephyr/shim/src/power.c b/zephyr/shim/src/power.c index efdecb7a33..007c40ab71 100644 --- a/zephyr/shim/src/power.c +++ b/zephyr/shim/src/power.c @@ -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. */ diff --git a/zephyr/shim/src/power_host_sleep_api.c b/zephyr/shim/src/power_host_sleep_api.c index 87a91a54c5..99d535bdff 100644 --- a/zephyr/shim/src/power_host_sleep_api.c +++ b/zephyr/shim/src/power_host_sleep_api.c @@ -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. */ diff --git a/zephyr/shim/src/ppc.c b/zephyr/shim/src/ppc.c index 68ad3102a0..87161407ae 100644 --- a/zephyr/shim/src/ppc.c +++ b/zephyr/shim/src/ppc.c @@ -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. */ diff --git a/zephyr/shim/src/pwm_hc.c b/zephyr/shim/src/pwm_hc.c index 15e924f0d0..3b1a98f651 100644 --- a/zephyr/shim/src/pwm_hc.c +++ b/zephyr/shim/src/pwm_hc.c @@ -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. */ diff --git a/zephyr/shim/src/pwm_led.c b/zephyr/shim/src/pwm_led.c index 9e213f94b3..498c543ffb 100644 --- a/zephyr/shim/src/pwm_led.c +++ b/zephyr/shim/src/pwm_led.c @@ -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. */ @@ -40,10 +40,9 @@ BUILD_ASSERT((PWM_LEDS_LEN > 0) && (PWM_LEDS_LEN <= 2), DT_INST_FOREACH_PROP_ELEM(0, leds, PWM_LEDS_BUILD_ASSERT) #define PWM_LED_NAME(node_id) DT_STRING_UPPER_TOKEN(node_id, ec_led_name) -#define PWM_LED_NAME_WITH_COMMA(node_id) PWM_LED_NAME(node_id), -const enum ec_led_id supported_led_ids[] = { DT_INST_FOREACH_CHILD( - 0, PWM_LED_NAME_WITH_COMMA) }; +const enum ec_led_id supported_led_ids[] = { DT_INST_FOREACH_CHILD_SEP( + 0, PWM_LED_NAME, (, )) }; const int supported_led_ids_count = ARRAY_SIZE(supported_led_ids); BUILD_ASSERT(ARRAY_SIZE(supported_led_ids) == DT_INST_PROP_LEN(0, leds), diff --git a/zephyr/shim/src/rtc.c b/zephyr/shim/src/rtc.c index f79c5b94e1..17cc486caa 100644 --- a/zephyr/shim/src/rtc.c +++ b/zephyr/shim/src/rtc.c @@ -1,11 +1,10 @@ -/* 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. */ #include <zephyr/logging/log.h> #include <zephyr/kernel.h> -#include <zephyr/zephyr.h> #include "console.h" #include "drivers/cros_rtc.h" diff --git a/zephyr/shim/src/switchcap_gpio.c b/zephyr/shim/src/switchcap_gpio.c index 6944055fb8..91d9de942f 100644 --- a/zephyr/shim/src/switchcap_gpio.c +++ b/zephyr/shim/src/switchcap_gpio.c @@ -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. */ diff --git a/zephyr/shim/src/switchcap_ln9310.c b/zephyr/shim/src/switchcap_ln9310.c index 95d608c9ba..ae62617895 100644 --- a/zephyr/shim/src/switchcap_ln9310.c +++ b/zephyr/shim/src/switchcap_ln9310.c @@ -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. */ diff --git a/zephyr/shim/src/system.c b/zephyr/shim/src/system.c index 0d69a915df..a9cf544b97 100644 --- a/zephyr/shim/src/system.c +++ b/zephyr/shim/src/system.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/zephyr/shim/src/tasks.c b/zephyr/shim/src/tasks.c index b304696c83..4143215442 100644 --- a/zephyr/shim/src/tasks.c +++ b/zephyr/shim/src/tasks.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/zephyr/shim/src/tcpc.c b/zephyr/shim/src/tcpc.c index 6c69f2da08..cdeeb4771b 100644 --- a/zephyr/shim/src/tcpc.c +++ b/zephyr/shim/src/tcpc.c @@ -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. */ diff --git a/zephyr/shim/src/tcpc_nct38xx.c b/zephyr/shim/src/tcpc_nct38xx.c index e1afef8182..9580759a6c 100644 --- a/zephyr/shim/src/tcpc_nct38xx.c +++ b/zephyr/shim/src/tcpc_nct38xx.c @@ -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. */ diff --git a/zephyr/shim/src/temp_sensors.c b/zephyr/shim/src/temp_sensors.c index 28d012047c..3760e7fe57 100644 --- a/zephyr/shim/src/temp_sensors.c +++ b/zephyr/shim/src/temp_sensors.c @@ -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. */ diff --git a/zephyr/shim/src/test_util.c b/zephyr/shim/src/test_util.c index 28be596043..e999772fc6 100644 --- a/zephyr/shim/src/test_util.c +++ b/zephyr/shim/src/test_util.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/zephyr/shim/src/thermal.c b/zephyr/shim/src/thermal.c index e986f6a27c..4f6b89f2ef 100644 --- a/zephyr/shim/src/thermal.c +++ b/zephyr/shim/src/thermal.c @@ -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. */ diff --git a/zephyr/shim/src/usb_muxes.c b/zephyr/shim/src/usb_muxes.c index d74ba67d2b..3f81e97787 100644 --- a/zephyr/shim/src/usb_muxes.c +++ b/zephyr/shim/src/usb_muxes.c @@ -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. */ @@ -9,54 +9,83 @@ #include "usbc/usb_muxes.h" /** - * @brief Macro that can be used in USB_MUX_FOREACH_USBC_PORT as filter - * argument. It allows to evaluate to "1 ||" for each named USBC port - * that has usb-muxes property. + * This prevents creating struct usb_mux usb_muxes[] for platforms that didn't + * migrate USB mux configuration to DTS yet. */ -#define USB_MUX_PORT_HAS_MUX(unused1, unused2) 1 || +#if DT_HAS_COMPAT_STATUS_OKAY(cros_ec_usb_mux_chain) /** - * Check if there is any named USBC port with usb-muxes property. It evaluates - * to "1 || 1 || ... 1 || 0" when there are multiple named USBC ports with - * usb-muxes property and to "0" when any named USBC port has usb-muxes - * property. + * @brief Check if @p mux_id is not part of @p chain_id or if @p chain_id USBC + * port is the same as @p mux_port. Result ends with && to construct + * logical expression using FOREACH macro. * - * This prevents creating struct usb_mux usb_muxes[] for platforms that didn't - * migrate USB mux configuration to DTS yet. + * @param chain_id Chain DTS node ID + * @param mux_id USB mux node ID + * @param mux_port Port which should be associated with @p mux_id + */ +#define USB_MUX_NOT_IN_CHAIN_OR_PORT_EQ(chain_id, mux_id, mux_port) \ + ((USB_MUX_FIND_PORT(chain_id, mux_id)(-1)) == -1 || \ + USBC_PORT(chain_id) == mux_port) && + +/** + * @brief Check if all chains that contains @p mux_id have the same USB-C port + * + * @param mux_id USB mux node ID + * @param unused_conf Unused argument required by USB_MUX_FOREACH_MUX() + */ +#define USB_MUX_CHECK_ALL_PORTS_ARE_SAME(mux_id, unused_conf) \ + BUILD_ASSERT( \ + USB_MUX_FOREACH_CHAIN_VARGS(USB_MUX_NOT_IN_CHAIN_OR_PORT_EQ, \ + mux_id, USB_MUX_PORT(mux_id)) 1, \ + "USB mux " #mux_id " is in chains for different ports"); + +/** Check if for every mux, chains where mux is present have the same port */ +USB_MUX_FOREACH_MUX(USB_MUX_CHECK_ALL_PORTS_ARE_SAME) + +/** + * Declare all usb_mux_chain structures e.g. + * MAYBE_CONST struct usb_mux_chain + * USB_MUX_chain_port_<port_id>_mux_<position_id>; + */ +USB_MUX_FOREACH_CHAIN_VARGS(USB_MUX_FOREACH_NO_ROOT_MUX, + USB_MUX_CHAIN_STRUCT_DECLARE_OP) + +/** + * Define usb_mux_chain structures for main chain e.g. + * + * MAYBE_CONST struct usb_mux_chain + * USB_MUX_chain_port_<port_id>_mux_<position_id> = { + * .mux = &USB_MUX_NODE_DT_N_S_usbc_S_port0_0_S_virtual_mux_0, + * .next = &USB_MUX_chain_port_0_mux_1, + * } */ -#if USB_MUX_FOREACH_USBC_PORT(USB_MUX_PORT_HAS_MUX, _) 0 +USB_MUX_FOREACH_CHAIN_VARGS(USB_MUX_FOR_MAIN_CHAIN, USB_MUX_FOREACH_NO_ROOT_MUX, + USB_MUX_CHAIN_STRUCT_DEFINE_OP) /** * Forward declarations for board_init and board_set callbacks. e.g. * int c0_mux0_board_init(const struct usb_mux *); * int c1_mux0_board_set(const struct usb_mux *, mux_state_t); */ -USB_MUX_FOREACH_USBC_PORT(USB_MUX_HAS_CB_BOARD_INIT, - USB_MUX_CB_BOARD_INIT_DECLARE) -USB_MUX_FOREACH_USBC_PORT(USB_MUX_HAS_CB_BOARD_SET, - USB_MUX_CB_BOARD_SET_DECLARE) +USB_MUX_FOREACH_MUX(USB_MUX_CB_BOARD_INIT_DECLARE_IF_EXISTS) +USB_MUX_FOREACH_MUX(USB_MUX_CB_BOARD_SET_DECLARE_IF_EXISTS) /** * Define root of each USB muxes chain e.g. * [0] = { - * .usb_port = 0, - * .next_mux = &USB_MUX_NODE_DT_N_S_usbc_S_port0_0_S_it5205_mux_0, - * .board_init = &board_init, - * .board_set = NULL, - * .flags = 0, - * .driver = &virtual_usb_mux_driver, - * .hpd_update = &virtual_hpd_update, + * .mux = &USB_MUX_NODE_DT_N_S_usbc_S_port0_0_S_virtual_mux_0, + * .next = &USB_MUX_chain_port_0_mux_1, * }, * [1] = { ... }, */ -MAYBE_CONST struct usb_mux usb_muxes[] = { USB_MUX_FOREACH_USBC_PORT( - USB_MUX_FIRST, USB_MUX_ARRAY) }; +MAYBE_CONST struct usb_mux_chain usb_muxes[] = { USB_MUX_FOREACH_CHAIN_VARGS( + USB_MUX_FOR_MAIN_CHAIN, USB_MUX_DEFINE_ROOT_MUX) }; +BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == CONFIG_USB_PD_PORT_MAX_COUNT); /** - * Define all USB muxes except roots e.g. + * Define all USB muxes e.g. * MAYBE_CONST struct usb_mux USB_MUX_NODE_DT_N_S_usbc_S_port0_0_S_mux_0 = { * .usb_port = 0, - * .next_mux = NULL, * .board_init = NULL, * .board_set = NULL, * .flags = 0, @@ -65,30 +94,6 @@ MAYBE_CONST struct usb_mux usb_muxes[] = { USB_MUX_FOREACH_USBC_PORT( * }; * MAYBE_CONST struct usb_mux USB_MUX_NODE_<node_id> = { ... }; */ -USB_MUX_FOREACH_USBC_PORT(USB_MUX_NO_FIRST, USB_MUX_DEFINE) - -/* Create bb_controls only if BB or HB retimer driver is enabled */ -#if defined(CONFIG_PLATFORM_EC_USBC_RETIMER_INTEL_BB) || \ - defined(CONFIG_PLATFORM_EC_USBC_RETIMER_INTEL_HB) -/** - * @brief bb_controls array should be constant only if configuration cannot - * change in runtime - */ -#define BB_CONTROLS_CONST \ - COND_CODE_1(CONFIG_PLATFORM_EC_USBC_RETIMER_INTEL_BB_RUNTIME_CONFIG, \ - (), (const)) - -/** - * Define bb_controls for BB retimers in USB muxes chain e.g. - * [0] = { - * .retimer_rst_gpio = IOEX_USB_C0_BB_RETIMER_RST, - * .usb_ls_en_gpio = IOEX_USB_C0_BB_RETIMER_LS_EN, - * }, - * [1] = { ... }, - */ -BB_CONTROLS_CONST struct bb_usb_control bb_controls[] = { - USB_MUX_FOREACH_USBC_PORT(USB_MUX_BB_RETIMERS, USB_MUX_ARRAY) -}; -#endif /* CONFIG_PLATFORM_EC_USBC_RETIMER_INTEL_BB/HB */ +USB_MUX_FOREACH_MUX(USB_MUX_DEFINE) -#endif /* #if USB_MUX_FOREACH_USBC_PORT(USB_MUX_PORT_HAS_MUX, _) */ +#endif /* #if DT_HAS_COMPAT_STATUS_OKAY(cros_ec_usb_mux_chain) */ diff --git a/zephyr/shim/src/usba.c b/zephyr/shim/src/usba.c index 2b7d17bfda..4db8c31e6a 100644 --- a/zephyr/shim/src/usba.c +++ b/zephyr/shim/src/usba.c @@ -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. */ diff --git a/zephyr/shim/src/watchdog.c b/zephyr/shim/src/watchdog.c index 2f3c7b39a0..eb82f228d5 100644 --- a/zephyr/shim/src/watchdog.c +++ b/zephyr/shim/src/watchdog.c @@ -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. */ @@ -6,7 +6,7 @@ #include <zephyr/device.h> #include <zephyr/drivers/watchdog.h> #include <zephyr/logging/log.h> -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include "config.h" #include "hooks.h" diff --git a/zephyr/shim/src/ztest_system.c b/zephyr/shim/src/ztest_system.c index 74491b2b04..5933f18f05 100644 --- a/zephyr/shim/src/ztest_system.c +++ b/zephyr/shim/src/ztest_system.c @@ -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. */ @@ -12,13 +12,13 @@ #define CPRINTS(format, args...) cprints(CC_SYSTEM, format, ##args) -struct jump_data mock_jump_data = {}; +char mock_jump_data[sizeof(struct jump_data) + 256]; /* When CONFIG_RAM_SIZE is defined, this is provided by common/system.c */ #ifndef CONFIG_RAM_SIZE struct jump_data *get_jump_data(void) { - return &mock_jump_data; + return (struct jump_data *)&mock_jump_data; } #endif diff --git a/zephyr/subsys/Kconfig b/zephyr/subsys/Kconfig index f35a942afc..48011312d5 100644 --- a/zephyr/subsys/Kconfig +++ b/zephyr/subsys/Kconfig @@ -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. diff --git a/zephyr/subsys/ap_pwrseq/Kconfig b/zephyr/subsys/ap_pwrseq/Kconfig index 093543d86b..677bca7c6d 100644 --- a/zephyr/subsys/ap_pwrseq/Kconfig +++ b/zephyr/subsys/ap_pwrseq/Kconfig @@ -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. diff --git a/zephyr/subsys/ap_pwrseq/ap_events.c b/zephyr/subsys/ap_pwrseq/ap_events.c index 8072bae1e7..0d99c0fe36 100644 --- a/zephyr/subsys/ap_pwrseq/ap_events.c +++ b/zephyr/subsys/ap_pwrseq/ap_events.c @@ -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. */ diff --git a/zephyr/subsys/ap_pwrseq/ap_power_interface.c b/zephyr/subsys/ap_pwrseq/ap_power_interface.c index 6186e299dd..1461ed139b 100644 --- a/zephyr/subsys/ap_pwrseq/ap_power_interface.c +++ b/zephyr/subsys/ap_pwrseq/ap_power_interface.c @@ -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. */ diff --git a/zephyr/subsys/ap_pwrseq/include/ap_power_host_sleep.h b/zephyr/subsys/ap_pwrseq/include/ap_power_host_sleep.h index 287d438a63..7251f96b76 100644 --- a/zephyr/subsys/ap_pwrseq/include/ap_power_host_sleep.h +++ b/zephyr/subsys/ap_pwrseq/include/ap_power_host_sleep.h @@ -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. */ diff --git a/zephyr/subsys/ap_pwrseq/include/ap_power_override_functions.h b/zephyr/subsys/ap_pwrseq/include/ap_power_override_functions.h index fbe5201323..0d9195e5f2 100644 --- a/zephyr/subsys/ap_pwrseq/include/ap_power_override_functions.h +++ b/zephyr/subsys/ap_pwrseq/include/ap_power_override_functions.h @@ -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. */ diff --git a/zephyr/subsys/ap_pwrseq/include/power_signals.h b/zephyr/subsys/ap_pwrseq/include/power_signals.h index 8eda988468..5d3e97a52e 100644 --- a/zephyr/subsys/ap_pwrseq/include/power_signals.h +++ b/zephyr/subsys/ap_pwrseq/include/power_signals.h @@ -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. */ diff --git a/zephyr/subsys/ap_pwrseq/include/signal_adc.h b/zephyr/subsys/ap_pwrseq/include/signal_adc.h index 0ed00b64d9..81c6a1edd4 100644 --- a/zephyr/subsys/ap_pwrseq/include/signal_adc.h +++ b/zephyr/subsys/ap_pwrseq/include/signal_adc.h @@ -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. */ diff --git a/zephyr/subsys/ap_pwrseq/include/signal_gpio.h b/zephyr/subsys/ap_pwrseq/include/signal_gpio.h index 6dae7b1356..7cdd4ec316 100644 --- a/zephyr/subsys/ap_pwrseq/include/signal_gpio.h +++ b/zephyr/subsys/ap_pwrseq/include/signal_gpio.h @@ -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. */ diff --git a/zephyr/subsys/ap_pwrseq/include/signal_vw.h b/zephyr/subsys/ap_pwrseq/include/signal_vw.h index dba81a353f..55ecc73e99 100644 --- a/zephyr/subsys/ap_pwrseq/include/signal_vw.h +++ b/zephyr/subsys/ap_pwrseq/include/signal_vw.h @@ -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. */ diff --git a/zephyr/subsys/ap_pwrseq/include/x86_common_pwrseq.h b/zephyr/subsys/ap_pwrseq/include/x86_common_pwrseq.h index 4d369f5497..dcb2b3b968 100644 --- a/zephyr/subsys/ap_pwrseq/include/x86_common_pwrseq.h +++ b/zephyr/subsys/ap_pwrseq/include/x86_common_pwrseq.h @@ -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. */ diff --git a/zephyr/subsys/ap_pwrseq/include/x86_non_dsx_common_pwrseq_sm_handler.h b/zephyr/subsys/ap_pwrseq/include/x86_non_dsx_common_pwrseq_sm_handler.h index ed28419ac5..2320e61965 100644 --- a/zephyr/subsys/ap_pwrseq/include/x86_non_dsx_common_pwrseq_sm_handler.h +++ b/zephyr/subsys/ap_pwrseq/include/x86_non_dsx_common_pwrseq_sm_handler.h @@ -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. */ diff --git a/zephyr/subsys/ap_pwrseq/include/x86_power_signals.h b/zephyr/subsys/ap_pwrseq/include/x86_power_signals.h index 75aecdd191..7c7e25d951 100644 --- a/zephyr/subsys/ap_pwrseq/include/x86_power_signals.h +++ b/zephyr/subsys/ap_pwrseq/include/x86_power_signals.h @@ -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. */ diff --git a/zephyr/subsys/ap_pwrseq/power_host_sleep.c b/zephyr/subsys/ap_pwrseq/power_host_sleep.c index 35aada1022..30025d21ea 100644 --- a/zephyr/subsys/ap_pwrseq/power_host_sleep.c +++ b/zephyr/subsys/ap_pwrseq/power_host_sleep.c @@ -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. */ diff --git a/zephyr/subsys/ap_pwrseq/power_signals.c b/zephyr/subsys/ap_pwrseq/power_signals.c index b4eee2f209..a02eef6e6b 100644 --- a/zephyr/subsys/ap_pwrseq/power_signals.c +++ b/zephyr/subsys/ap_pwrseq/power_signals.c @@ -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. */ diff --git a/zephyr/subsys/ap_pwrseq/signal_adc.c b/zephyr/subsys/ap_pwrseq/signal_adc.c index 03c0b7c848..c23cd0d30a 100644 --- a/zephyr/subsys/ap_pwrseq/signal_adc.c +++ b/zephyr/subsys/ap_pwrseq/signal_adc.c @@ -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. */ diff --git a/zephyr/subsys/ap_pwrseq/signal_gpio.c b/zephyr/subsys/ap_pwrseq/signal_gpio.c index c66d2b0426..1dbd430bef 100644 --- a/zephyr/subsys/ap_pwrseq/signal_gpio.c +++ b/zephyr/subsys/ap_pwrseq/signal_gpio.c @@ -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. */ diff --git a/zephyr/subsys/ap_pwrseq/signal_vw.c b/zephyr/subsys/ap_pwrseq/signal_vw.c index e72fb945e5..0e9e4affff 100644 --- a/zephyr/subsys/ap_pwrseq/signal_vw.c +++ b/zephyr/subsys/ap_pwrseq/signal_vw.c @@ -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. */ diff --git a/zephyr/subsys/ap_pwrseq/x86_non_dsx_adlp_pwrseq_sm.c b/zephyr/subsys/ap_pwrseq/x86_non_dsx_adlp_pwrseq_sm.c index 50325240fb..9ef482b712 100644 --- a/zephyr/subsys/ap_pwrseq/x86_non_dsx_adlp_pwrseq_sm.c +++ b/zephyr/subsys/ap_pwrseq/x86_non_dsx_adlp_pwrseq_sm.c @@ -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. */ diff --git a/zephyr/subsys/ap_pwrseq/x86_non_dsx_chipset_power_state.c b/zephyr/subsys/ap_pwrseq/x86_non_dsx_chipset_power_state.c index d928bf6f7e..e4ce364cb1 100644 --- a/zephyr/subsys/ap_pwrseq/x86_non_dsx_chipset_power_state.c +++ b/zephyr/subsys/ap_pwrseq/x86_non_dsx_chipset_power_state.c @@ -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. */ @@ -40,15 +40,15 @@ enum power_states_ndsx chipset_pwr_seq_get_state(void) * Not sure how long to wait? 5 seconds total. */ for (int delay = 0; delay < 500; k_msleep(10), delay++) { -#if defined(CONFIG_PLATFORM_EC_ESPI_VW_SLP_S3) +#if defined(CONFIG_PLATFORM_EC_HOST_INTERFACE_ESPI_VW_SLP_S3) if (power_signal_get(PWR_SLP_S3) < 0) continue; #endif -#if defined(CONFIG_PLATFORM_EC_ESPI_VW_SLP_S4) +#if defined(CONFIG_PLATFORM_EC_HOST_INTERFACE_ESPI_VW_SLP_S4) if (power_signal_get(PWR_SLP_S4) < 0) continue; #endif -#if defined(CONFIG_PLATFORM_EC_ESPI_VW_SLP_S5) +#if defined(CONFIG_PLATFORM_EC_HOST_INTERFACE_ESPI_VW_SLP_S5) if (power_signal_get(PWR_SLP_S5) < 0) continue; #endif diff --git a/zephyr/subsys/ap_pwrseq/x86_non_dsx_common_pwrseq_console.c b/zephyr/subsys/ap_pwrseq/x86_non_dsx_common_pwrseq_console.c index 4fef071b2e..dbceeacc85 100644 --- a/zephyr/subsys/ap_pwrseq/x86_non_dsx_common_pwrseq_console.c +++ b/zephyr/subsys/ap_pwrseq/x86_non_dsx_common_pwrseq_console.c @@ -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. */ diff --git a/zephyr/subsys/ap_pwrseq/x86_non_dsx_common_pwrseq_host_command.c b/zephyr/subsys/ap_pwrseq/x86_non_dsx_common_pwrseq_host_command.c index 90aa78ecf1..ee6e2cf41e 100644 --- a/zephyr/subsys/ap_pwrseq/x86_non_dsx_common_pwrseq_host_command.c +++ b/zephyr/subsys/ap_pwrseq/x86_non_dsx_common_pwrseq_host_command.c @@ -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. */ diff --git a/zephyr/subsys/ap_pwrseq/x86_non_dsx_common_pwrseq_host_sleep.c b/zephyr/subsys/ap_pwrseq/x86_non_dsx_common_pwrseq_host_sleep.c index e13be78dad..015cecb502 100644 --- a/zephyr/subsys/ap_pwrseq/x86_non_dsx_common_pwrseq_host_sleep.c +++ b/zephyr/subsys/ap_pwrseq/x86_non_dsx_common_pwrseq_host_sleep.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/subsys/ap_pwrseq/x86_non_dsx_common_pwrseq_sm_handler.c b/zephyr/subsys/ap_pwrseq/x86_non_dsx_common_pwrseq_sm_handler.c index 0711dd30e4..48cab7f6e7 100644 --- a/zephyr/subsys/ap_pwrseq/x86_non_dsx_common_pwrseq_sm_handler.c +++ b/zephyr/subsys/ap_pwrseq/x86_non_dsx_common_pwrseq_sm_handler.c @@ -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. */ @@ -65,17 +65,17 @@ static const char *const pwrsm_dbg[] = { */ static inline bool signals_valid(power_signal_mask_t signals) { -#if defined(CONFIG_PLATFORM_EC_ESPI_VW_SLP_S3) +#if defined(CONFIG_PLATFORM_EC_HOST_INTERFACE_ESPI_VW_SLP_S3) if ((signals & POWER_SIGNAL_MASK(PWR_SLP_S3)) && power_signal_get(PWR_SLP_S3) < 0) return false; #endif -#if defined(CONFIG_PLATFORM_EC_ESPI_VW_SLP_S4) +#if defined(CONFIG_PLATFORM_EC_HOST_INTERFACE_ESPI_VW_SLP_S4) if ((signals & POWER_SIGNAL_MASK(PWR_SLP_S4)) && power_signal_get(PWR_SLP_S4) < 0) return false; #endif -#if defined(CONFIG_PLATFORM_EC_ESPI_VW_SLP_S5) +#if defined(CONFIG_PLATFORM_EC_HOST_INTERFACE_ESPI_VW_SLP_S5) if ((signals & POWER_SIGNAL_MASK(PWR_SLP_S5)) && power_signal_get(PWR_SLP_S5) < 0) return false; diff --git a/zephyr/subsys/ap_pwrseq/x86_non_dsx_mtl_pwrseq_sm.c b/zephyr/subsys/ap_pwrseq/x86_non_dsx_mtl_pwrseq_sm.c index de3b4d7656..80fa06e454 100644 --- a/zephyr/subsys/ap_pwrseq/x86_non_dsx_mtl_pwrseq_sm.c +++ b/zephyr/subsys/ap_pwrseq/x86_non_dsx_mtl_pwrseq_sm.c @@ -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. */ diff --git a/zephyr/test/accel_cal/CMakeLists.txt b/zephyr/test/accel_cal/CMakeLists.txt index 31d8dcdfb6..07c9ed8599 100644 --- a/zephyr/test/accel_cal/CMakeLists.txt +++ b/zephyr/test/accel_cal/CMakeLists.txt @@ -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. diff --git a/zephyr/test/accel_cal/boards/native_posix.overlay b/zephyr/test/accel_cal/boards/native_posix.overlay index eb24af4851..c4d4413ad7 100644 --- a/zephyr/test/accel_cal/boards/native_posix.overlay +++ b/zephyr/test/accel_cal/boards/native_posix.overlay @@ -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. */ diff --git a/zephyr/test/accel_cal/prj.conf b/zephyr/test/accel_cal/prj.conf index 5efe3ec6b7..20e6ee59bf 100644 --- a/zephyr/test/accel_cal/prj.conf +++ b/zephyr/test/accel_cal/prj.conf @@ -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. diff --git a/zephyr/test/accel_cal/shimmed_test_tasks.h b/zephyr/test/accel_cal/shimmed_test_tasks.h index ff221a5ba3..12f4c8dc22 100644 --- a/zephyr/test/accel_cal/shimmed_test_tasks.h +++ b/zephyr/test/accel_cal/shimmed_test_tasks.h @@ -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. */ diff --git a/zephyr/test/ap_power/CMakeLists.txt b/zephyr/test/ap_power/CMakeLists.txt index 80f7556402..7b44013961 100644 --- a/zephyr/test/ap_power/CMakeLists.txt +++ b/zephyr/test/ap_power/CMakeLists.txt @@ -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. diff --git a/zephyr/test/ap_power/Kconfig b/zephyr/test/ap_power/Kconfig index 6faf452ac6..ac7b264855 100644 --- a/zephyr/test/ap_power/Kconfig +++ b/zephyr/test/ap_power/Kconfig @@ -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. diff --git a/zephyr/test/ap_power/boards/native_posix.overlay b/zephyr/test/ap_power/boards/native_posix.overlay index 8c2a20a54c..c6cd8c3790 100644 --- a/zephyr/test/ap_power/boards/native_posix.overlay +++ b/zephyr/test/ap_power/boards/native_posix.overlay @@ -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. */ diff --git a/zephyr/test/ap_power/include/test_state.h b/zephyr/test/ap_power/include/test_state.h index c993fe8ff0..cb91f2b7c7 100644 --- a/zephyr/test/ap_power/include/test_state.h +++ b/zephyr/test/ap_power/include/test_state.h @@ -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. */ diff --git a/zephyr/test/ap_power/prj.conf b/zephyr/test/ap_power/prj.conf index 2229f0af32..4dd31085bd 100644 --- a/zephyr/test/ap_power/prj.conf +++ b/zephyr/test/ap_power/prj.conf @@ -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. @@ -43,8 +43,8 @@ CONFIG_HEAP_MEM_POOL_SIZE=1024 CONFIG_AP_PWRSEQ=y CONFIG_X86_NON_DSX_PWRSEQ_ADL=y CONFIG_AP_X86_INTEL_ADL=y -CONFIG_PLATFORM_EC_ESPI_VW_SLP_S4=y -CONFIG_PLATFORM_EC_ESPI_VW_SLP_S5=y +CONFIG_PLATFORM_EC_HOST_INTERFACE_ESPI_VW_SLP_S4=y +CONFIG_PLATFORM_EC_HOST_INTERFACE_ESPI_VW_SLP_S5=y CONFIG_AP_PWRSEQ_STACK_SIZE=1024 CONFIG_ESPI=y diff --git a/zephyr/test/ap_power/src/board.c b/zephyr/test/ap_power/src/board.c index 68673f1772..26c9448396 100644 --- a/zephyr/test/ap_power/src/board.c +++ b/zephyr/test/ap_power/src/board.c @@ -1,9 +1,9 @@ -/* 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. */ -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/ztest.h> #include <ap_power_override_functions.h> diff --git a/zephyr/test/ap_power/src/events.c b/zephyr/test/ap_power/src/events.c index 6119c4be7e..ae7d2b870f 100644 --- a/zephyr/test/ap_power/src/events.c +++ b/zephyr/test/ap_power/src/events.c @@ -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. */ @@ -13,7 +13,7 @@ #include <zephyr/drivers/espi.h> #include <zephyr/drivers/espi_emul.h> #include <zephyr/logging/log.h> -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/ztest.h> #include "ap_power/ap_power.h" diff --git a/zephyr/test/ap_power/src/main.c b/zephyr/test/ap_power/src/main.c index 015df61387..d653b51164 100644 --- a/zephyr/test/ap_power/src/main.c +++ b/zephyr/test/ap_power/src/main.c @@ -1,9 +1,9 @@ -/* 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. */ -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/ztest.h> #include "ec_app_main.h" #include "test_state.h" diff --git a/zephyr/test/ap_power/src/signals.c b/zephyr/test/ap_power/src/signals.c index faa8639b2f..e8bc6e426c 100644 --- a/zephyr/test/ap_power/src/signals.c +++ b/zephyr/test/ap_power/src/signals.c @@ -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. */ @@ -14,7 +14,7 @@ #include <zephyr/drivers/espi_emul.h> #include <zephyr/drivers/gpio/gpio_emul.h> #include <zephyr/logging/log.h> -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/ztest.h> #include "power_signals.h" diff --git a/zephyr/test/base32/CMakeLists.txt b/zephyr/test/base32/CMakeLists.txt index d3b05b1e9d..97e01b0ab7 100644 --- a/zephyr/test/base32/CMakeLists.txt +++ b/zephyr/test/base32/CMakeLists.txt @@ -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. diff --git a/zephyr/test/base32/boards/native_posix.overlay b/zephyr/test/base32/boards/native_posix.overlay index eb24af4851..c4d4413ad7 100644 --- a/zephyr/test/base32/boards/native_posix.overlay +++ b/zephyr/test/base32/boards/native_posix.overlay @@ -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. */ diff --git a/zephyr/test/base32/prj.conf b/zephyr/test/base32/prj.conf index ec8c5035f5..2962b8f42f 100644 --- a/zephyr/test/base32/prj.conf +++ b/zephyr/test/base32/prj.conf @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/test/crc/CMakeLists.txt b/zephyr/test/crc/CMakeLists.txt index aaf0a6a0f1..b0b0996312 100644 --- a/zephyr/test/crc/CMakeLists.txt +++ b/zephyr/test/crc/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/test/crc/boards/native_posix.overlay b/zephyr/test/crc/boards/native_posix.overlay index fe96518269..90c864d2fd 100644 --- a/zephyr/test/crc/boards/native_posix.overlay +++ b/zephyr/test/crc/boards/native_posix.overlay @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/zephyr/test/crc/main.c b/zephyr/test/crc/main.c index 709f270397..0b13970d83 100644 --- a/zephyr/test/crc/main.c +++ b/zephyr/test/crc/main.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/zephyr/test/crc/prj.conf b/zephyr/test/crc/prj.conf index 59f2c5383d..89fdcc1efe 100644 --- a/zephyr/test/crc/prj.conf +++ b/zephyr/test/crc/prj.conf @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/test/drivers/CMakeLists.txt b/zephyr/test/drivers/CMakeLists.txt index a057e4309c..ac00d0507f 100644 --- a/zephyr/test/drivers/CMakeLists.txt +++ b/zephyr/test/drivers/CMakeLists.txt @@ -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. @@ -47,7 +47,9 @@ add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_DEFAULT default) add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_AP_MUX_CONTROL ap_mux_control) add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_CHARGESPLASH chargesplash) add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_ISL923X isl923x) +add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_KEYBOARD_SCAN keyboard_scan) add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_LED_DRIVER led_driver) +add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_MKBP mkbp) add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_USB_MALFUNCTION_SINK usb_malfunction_sink) add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_USB_PD_DPS dps) add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_USB_RETIMER_FW_UPDATE usb_retimer_fw_update) diff --git a/zephyr/test/drivers/Kconfig b/zephyr/test/drivers/Kconfig index b60c95f290..30e64ae860 100644 --- a/zephyr/test/drivers/Kconfig +++ b/zephyr/test/drivers/Kconfig @@ -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. @@ -14,9 +14,15 @@ config LINK_TEST_SUITE_CHARGESPLASH config LINK_TEST_SUITE_ISL923X bool "Link and test the isl923x tests" +config LINK_TEST_SUITE_KEYBOARD_SCAN + bool "Link and test the keyboard_scan tests" + config LINK_TEST_SUITE_LED_DRIVER bool "Link and test the led_driver tests" +config LINK_TEST_SUITE_MKBP + bool "Link and test the mkbp tests" + config LINK_TEST_SUITE_USB_MALFUNCTION_SINK bool "Link and test the usb_malfunction_sink tests" diff --git a/zephyr/test/drivers/ap_mux_control/CMakeLists.txt b/zephyr/test/drivers/ap_mux_control/CMakeLists.txt index e497140878..005e72e714 100644 --- a/zephyr/test/drivers/ap_mux_control/CMakeLists.txt +++ b/zephyr/test/drivers/ap_mux_control/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/zephyr/test/drivers/ap_mux_control/prj.conf b/zephyr/test/drivers/ap_mux_control/prj.conf index 490f891ff6..75b05bce0b 100644 --- a/zephyr/test/drivers/ap_mux_control/prj.conf +++ b/zephyr/test/drivers/ap_mux_control/prj.conf @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/zephyr/test/drivers/ap_mux_control/src/ap_mux_control.c b/zephyr/test/drivers/ap_mux_control/src/ap_mux_control.c index 15ea7b8374..49c695b830 100644 --- a/zephyr/test/drivers/ap_mux_control/src/ap_mux_control.c +++ b/zephyr/test/drivers/ap_mux_control/src/ap_mux_control.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/drivers/boards/native_posix.overlay b/zephyr/test/drivers/boards/native_posix.overlay index d35397498c..f2c7d926a3 100644 --- a/zephyr/test/drivers/boards/native_posix.overlay +++ b/zephyr/test/drivers/boards/native_posix.overlay @@ -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. */ @@ -16,6 +16,7 @@ cros-ec,raw-kb = &cros_kb_raw; cros-ec,flash = &flash0; cros-ec,flash-controller = &cros_flash; + cros,rtc = &cros_rtc; }; aliases { @@ -791,6 +792,10 @@ compatible = "cros-ec,flash-emul"; }; + cros_rtc: cros-rtc { + compatible = "cros-ec,rtc-emul"; + }; + pwms { #address-cells = <1>; #size-cells = <1>; diff --git a/zephyr/test/drivers/chargesplash/CMakeLists.txt b/zephyr/test/drivers/chargesplash/CMakeLists.txt index 1dbd58fd76..f0746a4cdd 100644 --- a/zephyr/test/drivers/chargesplash/CMakeLists.txt +++ b/zephyr/test/drivers/chargesplash/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/zephyr/test/drivers/chargesplash/src/chargesplash.c b/zephyr/test/drivers/chargesplash/src/chargesplash.c index 6172d7e09f..1b89262ce4 100644 --- a/zephyr/test/drivers/chargesplash/src/chargesplash.c +++ b/zephyr/test/drivers/chargesplash/src/chargesplash.c @@ -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. */ diff --git a/zephyr/test/drivers/common/include/test/drivers/charger_utils.h b/zephyr/test/drivers/common/include/test/drivers/charger_utils.h index 1712a5a384..22331c8575 100644 --- a/zephyr/test/drivers/common/include/test/drivers/charger_utils.h +++ b/zephyr/test/drivers/common/include/test/drivers/charger_utils.h @@ -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. */ diff --git a/zephyr/test/drivers/common/include/test/drivers/stubs.h b/zephyr/test/drivers/common/include/test/drivers/stubs.h index e4c675e131..98f3fa1d15 100644 --- a/zephyr/test/drivers/common/include/test/drivers/stubs.h +++ b/zephyr/test/drivers/common/include/test/drivers/stubs.h @@ -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. */ @@ -13,6 +13,7 @@ enum usbc_port { USBC_PORT_C0 = 0, USBC_PORT_C1, USBC_PORT_COUNT }; /* Structure used by usb_mux test. It is part of usb_muxes chain. */ extern struct usb_mux usbc1_virtual_usb_mux; +extern struct usb_mux usbc0_mux0; /** * @brief Set product ID that should be returned by board_get_ps8xxx_product_id diff --git a/zephyr/test/drivers/common/include/test/drivers/tcpci_test_common.h b/zephyr/test/drivers/common/include/test/drivers/tcpci_test_common.h index 4f9f9d5678..08d75cccf7 100644 --- a/zephyr/test/drivers/common/include/test/drivers/tcpci_test_common.h +++ b/zephyr/test/drivers/common/include/test/drivers/tcpci_test_common.h @@ -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. */ diff --git a/zephyr/test/drivers/common/include/test/drivers/test_mocks.h b/zephyr/test/drivers/common/include/test/drivers/test_mocks.h index eb6325903f..8e481edef8 100644 --- a/zephyr/test/drivers/common/include/test/drivers/test_mocks.h +++ b/zephyr/test/drivers/common/include/test/drivers/test_mocks.h @@ -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. */ @@ -105,6 +105,7 @@ DECLARE_FAKE_VALUE_FUNC(int, init_rom_copy, int, int, int); /* Mocks for common/system.c */ DECLARE_FAKE_VALUE_FUNC(int, system_jumped_late); +DECLARE_FAKE_VALUE_FUNC(int, system_is_locked); DECLARE_FAKE_VOID_FUNC(system_reset, int); DECLARE_FAKE_VOID_FUNC(software_panic, uint32_t, uint32_t); DECLARE_FAKE_VOID_FUNC(assert_post_action, const char *, unsigned int); diff --git a/zephyr/test/drivers/common/include/test/drivers/test_state.h b/zephyr/test/drivers/common/include/test/drivers/test_state.h index fe8b3e8ffc..bea56224fc 100644 --- a/zephyr/test/drivers/common/include/test/drivers/test_state.h +++ b/zephyr/test/drivers/common/include/test/drivers/test_state.h @@ -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. */ diff --git a/zephyr/test/drivers/common/include/test/drivers/utils.h b/zephyr/test/drivers/common/include/test/drivers/utils.h index 2328c810fa..306f2894d4 100644 --- a/zephyr/test/drivers/common/include/test/drivers/utils.h +++ b/zephyr/test/drivers/common/include/test/drivers/utils.h @@ -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. */ @@ -610,4 +610,14 @@ void test_free(void *mem); */ void test_set_chipset_to_g3_then_transition_to_s5(void); +/** + * @brief Checks console command with expected console output and expected + * return value + * + */ +#define CHECK_CONSOLE_CMD(cmd, expected_output, expected_rv) \ + check_console_cmd((cmd), (expected_output), (expected_rv), __FILE__, \ + __LINE__) +void check_console_cmd(const char *cmd, const char *expected_output, + const int expected_rv, const char *file, const int line); #endif /* ZEPHYR_TEST_DRIVERS_INCLUDE_UTILS_H_ */ diff --git a/zephyr/test/drivers/common/src/main.c b/zephyr/test/drivers/common/src/main.c index 05f412682b..978c699d24 100644 --- a/zephyr/test/drivers/common/src/main.c +++ b/zephyr/test/drivers/common/src/main.c @@ -1,9 +1,9 @@ -/* 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. */ -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/ztest.h> #include "ec_app_main.h" #include "test/drivers/test_state.h" diff --git a/zephyr/test/drivers/common/src/stubs.c b/zephyr/test/drivers/common/src/stubs.c index e4bc75c5cf..2683b326a8 100644 --- a/zephyr/test/drivers/common/src/stubs.c +++ b/zephyr/test/drivers/common/src/stubs.c @@ -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. */ @@ -149,10 +149,13 @@ int board_is_sourcing_vbus(int port) } /* TODO(b/239457738): Move to dts */ -struct usb_mux usbc0_virtual_usb_mux = { - .usb_port = USBC_PORT_C0, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, +struct usb_mux_chain usbc0_virtual_usb_mux_chain = { + .mux = + &(const struct usb_mux){ + .usb_port = USBC_PORT_C0, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, + }, }; struct usb_mux usbc1_virtual_usb_mux = { @@ -161,22 +164,32 @@ struct usb_mux usbc1_virtual_usb_mux = { .hpd_update = &virtual_hpd_update, }; -struct usb_mux usb_muxes[] = { +struct usb_mux_chain usbc1_virtual_usb_mux_chain = { + .mux = &usbc1_virtual_usb_mux, +}; + +struct usb_mux usbc0_mux0 = { + .usb_port = USBC_PORT_C0, + .driver = &tcpci_tcpm_usb_mux_driver, + .i2c_port = I2C_PORT_USB_C0, + .i2c_addr_flags = DT_REG_ADDR(DT_NODELABEL(tcpci_emul)), +}; + +struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .driver = &tcpci_tcpm_usb_mux_driver, - .next_mux = &usbc0_virtual_usb_mux, - .i2c_port = I2C_PORT_USB_C0, - .i2c_addr_flags = DT_REG_ADDR(DT_NODELABEL(tcpci_emul)), + .mux = &usbc0_mux0, + .next = &usbc0_virtual_usb_mux_chain, }, [USBC_PORT_C1] = { - .usb_port = USBC_PORT_C1, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .next_mux = &usbc1_virtual_usb_mux, - .i2c_port = I2C_PORT_USB_C1, - .i2c_addr_flags = DT_REG_ADDR(DT_NODELABEL( - usb_c1_bb_retimer_emul)), + .mux = &(const struct usb_mux){ + .usb_port = USBC_PORT_C1, + .driver = &bb_usb_retimer, + .hpd_update = bb_retimer_hpd_update, + .i2c_port = I2C_PORT_USB_C1, + .i2c_addr_flags = DT_REG_ADDR(DT_NODELABEL( + usb_c1_bb_retimer_emul)), + }, + .next = &usbc1_virtual_usb_mux_chain, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/zephyr/test/drivers/common/src/test_mocks.c b/zephyr/test/drivers/common/src/test_mocks.c index d2e4770f9b..11887f7cb9 100644 --- a/zephyr/test/drivers/common/src/test_mocks.c +++ b/zephyr/test/drivers/common/src/test_mocks.c @@ -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. */ @@ -16,6 +16,7 @@ DEFINE_FAKE_VALUE_FUNC(int, init_rom_copy, int, int, int); /* Mocks for common/system.c */ DEFINE_FAKE_VALUE_FUNC(int, system_jumped_late); +DEFINE_FAKE_VALUE_FUNC(int, system_is_locked); DEFINE_FAKE_VOID_FUNC(system_reset, int); DEFINE_FAKE_VOID_FUNC(software_panic, uint32_t, uint32_t); DEFINE_FAKE_VOID_FUNC(assert_post_action, const char *, unsigned int); diff --git a/zephyr/test/drivers/common/src/test_rules.c b/zephyr/test/drivers/common/src/test_rules.c index 2d94ad0524..e1b1d59480 100644 --- a/zephyr/test/drivers/common/src/test_rules.c +++ b/zephyr/test/drivers/common/src/test_rules.c @@ -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. */ diff --git a/zephyr/test/drivers/common/src/utils.c b/zephyr/test/drivers/common/src/utils.c index 2a75c87c10..f083300886 100644 --- a/zephyr/test/drivers/common/src/utils.c +++ b/zephyr/test/drivers/common/src/utils.c @@ -1,11 +1,13 @@ -/* 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. */ #include <zephyr/drivers/gpio/gpio_emul.h> +#include <zephyr/shell/shell.h> +#include <zephyr/shell/shell_dummy.h> /* nocheck */ #include <zephyr/shell/shell_uart.h> -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/ztest.h> #include "acpi.h" @@ -601,3 +603,25 @@ int emul_init_stub(const struct device *dev) /* These 2 lines are needed because we don't define an espi host driver */ #define DT_DRV_COMPAT zephyr_espi_emul_espi_host DT_INST_FOREACH_STATUS_OKAY(EMUL_STUB_DEVICE); + +void check_console_cmd(const char *cmd, const char *expected_output, + const int expected_rv, const char *file, const int line) +{ + const char *buffer; + size_t buffer_size; + int rv; + + shell_backend_dummy_clear_output(get_ec_shell()); + rv = shell_execute_cmd(get_ec_shell(), cmd); + + zassert_equal(expected_rv, rv, + "%s:%u \'%s\' - Expected %d, returned %d", file, line, + cmd, expected_rv, rv); + + if (expected_output) { + buffer = shell_backend_dummy_get_output(get_ec_shell(), + &buffer_size); + zassert_true(strstr(buffer, expected_output), + "Invalid console output %s", buffer); + } +} diff --git a/zephyr/test/drivers/default/CMakeLists.txt b/zephyr/test/drivers/default/CMakeLists.txt index ad3b74dfaa..8f5a33cfa1 100644 --- a/zephyr/test/drivers/default/CMakeLists.txt +++ b/zephyr/test/drivers/default/CMakeLists.txt @@ -33,10 +33,14 @@ target_sources(app PRIVATE src/console_cmd/port80.c src/console_cmd/powerindebug.c src/console_cmd/power_button.c + src/console_cmd/rtc.c src/console_cmd/rw.c + src/console_cmd/sleepmask.c src/console_cmd/sleeptimeout.c + src/console_cmd/sysinfo.c src/console_cmd/tcpci_dump.c src/console_cmd/usb_pd_console.c + src/console_cmd/version.c src/console_cmd/waitms.c src/cros_cbi.c src/espi.c @@ -53,7 +57,6 @@ target_sources(app PRIVATE src/i2c.c src/i2c_passthru.c src/isl923x.c - src/keyboard_scan.c src/led.c src/lid_angle.c src/lid_switch.c diff --git a/zephyr/test/drivers/default/prj.conf b/zephyr/test/drivers/default/prj.conf index 90755ea72c..989a67b477 100644 --- a/zephyr/test/drivers/default/prj.conf +++ b/zephyr/test/drivers/default/prj.conf @@ -1,9 +1,13 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. CONFIG_PLATFORM_EC_CMD_BUTTON=y +CONFIG_PLATFORM_EC_CONSOLE_CMD_RTC=y +CONFIG_PLATFORM_EC_CONSOLE_CMD_RTC_ALARM=y CONFIG_PLATFORM_EC_LED_DT=y +CONFIG_PLATFORM_EC_RTC=y CONFIG_PLATFORM_EC_VOLUME_BUTTONS=y +CONFIG_SYSTEM_FAKE=y CONFIG_PWM_MOCK=y diff --git a/zephyr/test/drivers/default/src/battery.c b/zephyr/test/drivers/default/src/battery.c index 71fe4798d2..6b01a5ca39 100644 --- a/zephyr/test/drivers/default/src/battery.c +++ b/zephyr/test/drivers/default/src/battery.c @@ -1,9 +1,9 @@ -/* 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. */ -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/ztest.h> #include <zephyr/drivers/gpio.h> #include <zephyr/drivers/gpio/gpio_emul.h> diff --git a/zephyr/test/drivers/default/src/bb_retimer.c b/zephyr/test/drivers/default/src/bb_retimer.c index f2d708992a..74d8fa86a2 100644 --- a/zephyr/test/drivers/default/src/bb_retimer.c +++ b/zephyr/test/drivers/default/src/bb_retimer.c @@ -1,9 +1,9 @@ -/* 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. */ -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/ztest.h> #include <zephyr/drivers/gpio.h> #include <zephyr/drivers/gpio/gpio_emul.h> @@ -55,7 +55,7 @@ ZTEST_USER(bb_retimer_no_tasks, test_bb_set_state) /* Test fail on reset register write */ zassert_equal(EC_ERROR_INVAL, - bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1], + bb_usb_retimer.set(usb_muxes[USBC_PORT_C1].mux, USB_PD_MUX_NONE, &ack_required), NULL); zassert_false(ack_required, "ACK is never required for BB retimer"); @@ -71,7 +71,7 @@ ZTEST_USER(bb_retimer_no_tasks, test_bb_set_state) /* Test none mode */ bb_emul_set_reg(emul, BB_RETIMER_REG_CONNECTION_STATE, 0x12144678); zassert_equal(EC_SUCCESS, - bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1], + bb_usb_retimer.set(usb_muxes[USBC_PORT_C1].mux, USB_PD_MUX_NONE, &ack_required), NULL); zassert_false(ack_required, "ACK is never required for BB retimer"); @@ -84,7 +84,7 @@ ZTEST_USER(bb_retimer_no_tasks, test_bb_set_state) /* Test USB3 gen1 mode */ prl_set_rev(USBC_PORT_C1, TCPCI_MSG_SOP_PRIME, PD_REV10); zassert_equal(EC_SUCCESS, - bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1], + bb_usb_retimer.set(usb_muxes[USBC_PORT_C1].mux, USB_PD_MUX_USB_ENABLED, &ack_required), NULL); zassert_false(ack_required, "ACK is never required for BB retimer"); @@ -101,7 +101,7 @@ ZTEST_USER(bb_retimer_no_tasks, test_bb_set_state) disc->identity.product_t1.p_rev30.ss = USB_R30_SS_U32_U40_GEN2; prl_set_rev(USBC_PORT_C1, TCPCI_MSG_SOP_PRIME, PD_REV30); zassert_equal(EC_SUCCESS, - bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1], + bb_usb_retimer.set(usb_muxes[USBC_PORT_C1].mux, USB_PD_MUX_USB_ENABLED, &ack_required), NULL); zassert_false(ack_required, "ACK is never required for BB retimer"); @@ -114,7 +114,7 @@ ZTEST_USER(bb_retimer_no_tasks, test_bb_set_state) /* Test TBT mode */ zassert_equal(EC_SUCCESS, - bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1], + bb_usb_retimer.set(usb_muxes[USBC_PORT_C1].mux, USB_PD_MUX_TBT_COMPAT_ENABLED, &ack_required), NULL); @@ -128,7 +128,7 @@ ZTEST_USER(bb_retimer_no_tasks, test_bb_set_state) /* Test USB4 mode */ zassert_equal(EC_SUCCESS, - bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1], + bb_usb_retimer.set(usb_muxes[USBC_PORT_C1].mux, USB_PD_MUX_USB4_ENABLED, &ack_required), NULL); @@ -141,7 +141,7 @@ ZTEST_USER(bb_retimer_no_tasks, test_bb_set_state) /* Test USB4 mode with polarity inverted */ zassert_equal(EC_SUCCESS, - bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1], + bb_usb_retimer.set(usb_muxes[USBC_PORT_C1].mux, USB_PD_MUX_USB4_ENABLED | USB_PD_MUX_POLARITY_INVERTED, &ack_required), @@ -156,7 +156,7 @@ ZTEST_USER(bb_retimer_no_tasks, test_bb_set_state) /* Test DP mode */ zassert_equal(EC_SUCCESS, - bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1], + bb_usb_retimer.set(usb_muxes[USBC_PORT_C1].mux, USB_PD_MUX_DP_ENABLED, &ack_required), NULL); zassert_false(ack_required, "ACK is never required for BB retimer"); @@ -167,7 +167,7 @@ ZTEST_USER(bb_retimer_no_tasks, test_bb_set_state) exp_conn, conn); zassert_equal(EC_SUCCESS, - bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1], + bb_usb_retimer.set(usb_muxes[USBC_PORT_C1].mux, USB_PD_MUX_DP_ENABLED | USB_PD_MUX_HPD_IRQ, &ack_required), @@ -180,7 +180,7 @@ ZTEST_USER(bb_retimer_no_tasks, test_bb_set_state) exp_conn, conn); zassert_equal(EC_SUCCESS, - bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1], + bb_usb_retimer.set(usb_muxes[USBC_PORT_C1].mux, USB_PD_MUX_DP_ENABLED | USB_PD_MUX_HPD_LVL, &ack_required), @@ -211,7 +211,7 @@ ZTEST_USER(bb_retimer_no_tasks, test_bb_set_dfp_state) /* Test PD mux none mode with DFP should clear all bits in state */ bb_emul_set_reg(emul, BB_RETIMER_REG_CONNECTION_STATE, 0x12144678); zassert_equal(EC_SUCCESS, - bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1], + bb_usb_retimer.set(usb_muxes[USBC_PORT_C1].mux, USB_PD_MUX_NONE, &ack_required), NULL); zassert_false(ack_required, "ACK is never required for BB retimer"); @@ -258,7 +258,7 @@ ZTEST_USER(bb_retimer_no_tasks, test_bb_set_dfp_state) /* Test USB mode with active cable */ zassert_equal(EC_SUCCESS, - bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1], + bb_usb_retimer.set(usb_muxes[USBC_PORT_C1].mux, USB_PD_MUX_USB_ENABLED, &ack_required), NULL); zassert_false(ack_required, "ACK is never required for BB retimer"); @@ -271,7 +271,7 @@ ZTEST_USER(bb_retimer_no_tasks, test_bb_set_dfp_state) /* Test TBT mode with active cable */ zassert_equal(EC_SUCCESS, - bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1], + bb_usb_retimer.set(usb_muxes[USBC_PORT_C1].mux, USB_PD_MUX_TBT_COMPAT_ENABLED, &ack_required), NULL); @@ -286,7 +286,7 @@ ZTEST_USER(bb_retimer_no_tasks, test_bb_set_dfp_state) cable_resp.retimer_type = USB_RETIMER; disc->svids[0].mode_vdo[0] = cable_resp.raw_value; zassert_equal(EC_SUCCESS, - bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1], + bb_usb_retimer.set(usb_muxes[USBC_PORT_C1].mux, USB_PD_MUX_TBT_COMPAT_ENABLED, &ack_required), NULL); @@ -303,7 +303,7 @@ ZTEST_USER(bb_retimer_no_tasks, test_bb_set_dfp_state) cable_resp.tbt_cable = TBT_CABLE_OPTICAL; disc->svids[0].mode_vdo[0] = cable_resp.raw_value; zassert_equal(EC_SUCCESS, - bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1], + bb_usb_retimer.set(usb_muxes[USBC_PORT_C1].mux, USB_PD_MUX_TBT_COMPAT_ENABLED, &ack_required), NULL); @@ -320,7 +320,7 @@ ZTEST_USER(bb_retimer_no_tasks, test_bb_set_dfp_state) cable_resp.lsrx_comm = UNIDIR_LSRX_COMM; disc->svids[0].mode_vdo[0] = cable_resp.raw_value; zassert_equal(EC_SUCCESS, - bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1], + bb_usb_retimer.set(usb_muxes[USBC_PORT_C1].mux, USB_PD_MUX_TBT_COMPAT_ENABLED, &ack_required), NULL); @@ -337,7 +337,7 @@ ZTEST_USER(bb_retimer_no_tasks, test_bb_set_dfp_state) cable_resp.tbt_cable_speed = TBT_SS_U31_GEN1; disc->svids[0].mode_vdo[0] = cable_resp.raw_value; zassert_equal(EC_SUCCESS, - bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1], + bb_usb_retimer.set(usb_muxes[USBC_PORT_C1].mux, USB_PD_MUX_TBT_COMPAT_ENABLED, &ack_required), NULL); @@ -353,7 +353,7 @@ ZTEST_USER(bb_retimer_no_tasks, test_bb_set_dfp_state) cable_resp.tbt_cable_speed = TBT_SS_U32_GEN1_GEN2; disc->svids[0].mode_vdo[0] = cable_resp.raw_value; zassert_equal(EC_SUCCESS, - bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1], + bb_usb_retimer.set(usb_muxes[USBC_PORT_C1].mux, USB_PD_MUX_TBT_COMPAT_ENABLED, &ack_required), NULL); @@ -369,7 +369,7 @@ ZTEST_USER(bb_retimer_no_tasks, test_bb_set_dfp_state) cable_resp.tbt_cable_speed = TBT_SS_TBT_GEN3; disc->svids[0].mode_vdo[0] = cable_resp.raw_value; zassert_equal(EC_SUCCESS, - bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1], + bb_usb_retimer.set(usb_muxes[USBC_PORT_C1].mux, USB_PD_MUX_TBT_COMPAT_ENABLED, &ack_required), NULL); @@ -387,7 +387,7 @@ ZTEST_USER(bb_retimer_no_tasks, test_bb_set_dfp_state) cable_resp.tbt_rounded = TBT_GEN3_GEN4_ROUNDED_NON_ROUNDED; disc->svids[0].mode_vdo[0] = cable_resp.raw_value; zassert_equal(EC_SUCCESS, - bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1], + bb_usb_retimer.set(usb_muxes[USBC_PORT_C1].mux, USB_PD_MUX_TBT_COMPAT_ENABLED, &ack_required), NULL); @@ -405,7 +405,7 @@ ZTEST_USER(bb_retimer_no_tasks, test_bb_set_dfp_state) device_resp.tbt_adapter = TBT_ADAPTER_TBT2_LEGACY; dev_disc->svids[0].mode_vdo[0] = device_resp.raw_value; zassert_equal(EC_SUCCESS, - bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1], + bb_usb_retimer.set(usb_muxes[USBC_PORT_C1].mux, USB_PD_MUX_TBT_COMPAT_ENABLED, &ack_required), NULL); @@ -422,7 +422,7 @@ ZTEST_USER(bb_retimer_no_tasks, test_bb_set_dfp_state) device_resp.intel_spec_b0 = VENDOR_SPECIFIC_SUPPORTED; dev_disc->svids[0].mode_vdo[0] = device_resp.raw_value; zassert_equal(EC_SUCCESS, - bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1], + bb_usb_retimer.set(usb_muxes[USBC_PORT_C1].mux, USB_PD_MUX_TBT_COMPAT_ENABLED, &ack_required), NULL); @@ -442,7 +442,7 @@ ZTEST_USER(bb_retimer_no_tasks, test_bb_set_dfp_state) device_resp.vendor_spec_b1 = VENDOR_SPECIFIC_SUPPORTED; dev_disc->svids[0].mode_vdo[0] = device_resp.raw_value; zassert_equal(EC_SUCCESS, - bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1], + bb_usb_retimer.set(usb_muxes[USBC_PORT_C1].mux, USB_PD_MUX_TBT_COMPAT_ENABLED, &ack_required), NULL); @@ -474,7 +474,7 @@ ZTEST_USER(bb_retimer, test_bb_init) BB_RETIMER_REG_VENDOR_ID); /* Test fail on vendor ID read */ zassert_equal(EC_ERROR_INVAL, - bb_usb_retimer.init(&usb_muxes[USBC_PORT_C1]), NULL); + bb_usb_retimer.init(usb_muxes[USBC_PORT_C1].mux), NULL); /* Enable pins should be set always after init, when AP is on */ zassert_equal(1, gpio_emul_output_get(gpio_dev, GPIO_USB_C1_LS_EN_PORT), NULL); @@ -488,7 +488,7 @@ ZTEST_USER(bb_retimer, test_bb_init) bb_emul_set_reg(emul, BB_RETIMER_REG_VENDOR_ID, 0x12144678); /* Test fail on wrong vendor ID */ zassert_equal(EC_ERROR_INVAL, - bb_usb_retimer.init(&usb_muxes[USBC_PORT_C1]), NULL); + bb_usb_retimer.init(usb_muxes[USBC_PORT_C1].mux), NULL); zassert_equal(1, gpio_emul_output_get(gpio_dev, GPIO_USB_C1_LS_EN_PORT), NULL); zassert_equal( @@ -501,7 +501,7 @@ ZTEST_USER(bb_retimer, test_bb_init) bb_emul_set_reg(emul, BB_RETIMER_REG_VENDOR_ID, BB_RETIMER_VENDOR_ID_1); /* Test fail on device ID read */ zassert_equal(EC_ERROR_INVAL, - bb_usb_retimer.init(&usb_muxes[USBC_PORT_C1]), NULL); + bb_usb_retimer.init(usb_muxes[USBC_PORT_C1].mux), NULL); zassert_equal(1, gpio_emul_output_get(gpio_dev, GPIO_USB_C1_LS_EN_PORT), NULL); zassert_equal( @@ -514,7 +514,7 @@ ZTEST_USER(bb_retimer, test_bb_init) bb_emul_set_reg(emul, BB_RETIMER_REG_DEVICE_ID, 0x12144678); /* Test fail on wrong device ID */ zassert_equal(EC_ERROR_INVAL, - bb_usb_retimer.init(&usb_muxes[USBC_PORT_C1]), NULL); + bb_usb_retimer.init(usb_muxes[USBC_PORT_C1].mux), NULL); zassert_equal(1, gpio_emul_output_get(gpio_dev, GPIO_USB_C1_LS_EN_PORT), NULL); zassert_equal( @@ -523,8 +523,8 @@ ZTEST_USER(bb_retimer, test_bb_init) /* Test successful init */ bb_emul_set_reg(emul, BB_RETIMER_REG_DEVICE_ID, BB_RETIMER_DEVICE_ID); - zassert_equal(EC_SUCCESS, bb_usb_retimer.init(&usb_muxes[USBC_PORT_C1]), - NULL); + zassert_equal(EC_SUCCESS, + bb_usb_retimer.init(usb_muxes[USBC_PORT_C1].mux), NULL); zassert_equal(1, gpio_emul_output_get(gpio_dev, GPIO_USB_C1_LS_EN_PORT), NULL); zassert_equal( @@ -536,7 +536,7 @@ ZTEST_USER(bb_retimer, test_bb_init) /* With AP off, init should fail and pins should be unset */ zassert_equal(EC_ERROR_NOT_POWERED, - bb_usb_retimer.init(&usb_muxes[USBC_PORT_C1]), NULL); + bb_usb_retimer.init(usb_muxes[USBC_PORT_C1].mux), NULL); zassert_equal(0, gpio_emul_output_get(gpio_dev, GPIO_USB_C1_LS_EN_PORT), NULL); diff --git a/zephyr/test/drivers/default/src/bc12.c b/zephyr/test/drivers/default/src/bc12.c index 6605fa77bc..a8d23e73ce 100644 --- a/zephyr/test/drivers/default/src/bc12.c +++ b/zephyr/test/drivers/default/src/bc12.c @@ -1,9 +1,9 @@ -/* 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. */ -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/ztest.h> #include <zephyr/drivers/gpio.h> #include <zephyr/drivers/gpio/gpio_emul.h> diff --git a/zephyr/test/drivers/default/src/bma2x2.c b/zephyr/test/drivers/default/src/bma2x2.c index a098574623..e848a265fd 100644 --- a/zephyr/test/drivers/default/src/bma2x2.c +++ b/zephyr/test/drivers/default/src/bma2x2.c @@ -1,9 +1,9 @@ -/* 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. */ -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/ztest.h> #include "common.h" diff --git a/zephyr/test/drivers/default/src/bmi160.c b/zephyr/test/drivers/default/src/bmi160.c index a927f33e62..c90e31699b 100644 --- a/zephyr/test/drivers/default/src/bmi160.c +++ b/zephyr/test/drivers/default/src/bmi160.c @@ -1,9 +1,9 @@ -/* 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. */ -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/ztest.h> #include "common.h" diff --git a/zephyr/test/drivers/default/src/bmi260.c b/zephyr/test/drivers/default/src/bmi260.c index 56187a126e..9295d631ca 100644 --- a/zephyr/test/drivers/default/src/bmi260.c +++ b/zephyr/test/drivers/default/src/bmi260.c @@ -1,10 +1,10 @@ -/* 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. */ #include <zephyr/fff.h> -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/ztest.h> #include "common.h" diff --git a/zephyr/test/drivers/default/src/charge_manager.c b/zephyr/test/drivers/default/src/charge_manager.c index 9640915058..85048178ae 100644 --- a/zephyr/test/drivers/default/src/charge_manager.c +++ b/zephyr/test/drivers/default/src/charge_manager.c @@ -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. */ diff --git a/zephyr/test/drivers/default/src/console.c b/zephyr/test/drivers/default/src/console.c index 2d46bacdc9..3787a1f803 100644 --- a/zephyr/test/drivers/default/src/console.c +++ b/zephyr/test/drivers/default/src/console.c @@ -1,9 +1,9 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/ztest.h> #include <zephyr/shell/shell_dummy.h> diff --git a/zephyr/test/drivers/default/src/console_cmd/accelinfo.c b/zephyr/test/drivers/default/src/console_cmd/accelinfo.c index e4e6343b5f..11638fcc70 100644 --- a/zephyr/test/drivers/default/src/console_cmd/accelinfo.c +++ b/zephyr/test/drivers/default/src/console_cmd/accelinfo.c @@ -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. */ diff --git a/zephyr/test/drivers/default/src/console_cmd/accelinit.c b/zephyr/test/drivers/default/src/console_cmd/accelinit.c index 964a84aee0..c440faebba 100644 --- a/zephyr/test/drivers/default/src/console_cmd/accelinit.c +++ b/zephyr/test/drivers/default/src/console_cmd/accelinit.c @@ -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. */ diff --git a/zephyr/test/drivers/default/src/console_cmd/accelrange.c b/zephyr/test/drivers/default/src/console_cmd/accelrange.c index 4b56bc36fa..ff9d03bfe2 100644 --- a/zephyr/test/drivers/default/src/console_cmd/accelrange.c +++ b/zephyr/test/drivers/default/src/console_cmd/accelrange.c @@ -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. */ diff --git a/zephyr/test/drivers/default/src/console_cmd/accelrate.c b/zephyr/test/drivers/default/src/console_cmd/accelrate.c index 73030a758e..59482ed866 100644 --- a/zephyr/test/drivers/default/src/console_cmd/accelrate.c +++ b/zephyr/test/drivers/default/src/console_cmd/accelrate.c @@ -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. */ diff --git a/zephyr/test/drivers/default/src/console_cmd/accelread.c b/zephyr/test/drivers/default/src/console_cmd/accelread.c index 051214d7d2..81ebf87e55 100644 --- a/zephyr/test/drivers/default/src/console_cmd/accelread.c +++ b/zephyr/test/drivers/default/src/console_cmd/accelread.c @@ -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. */ diff --git a/zephyr/test/drivers/default/src/console_cmd/accelres.c b/zephyr/test/drivers/default/src/console_cmd/accelres.c index 71bc0793e0..5e29a0572d 100644 --- a/zephyr/test/drivers/default/src/console_cmd/accelres.c +++ b/zephyr/test/drivers/default/src/console_cmd/accelres.c @@ -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. */ diff --git a/zephyr/test/drivers/default/src/console_cmd/accelspoof.c b/zephyr/test/drivers/default/src/console_cmd/accelspoof.c index 3c51eb0bf1..3e183ca296 100644 --- a/zephyr/test/drivers/default/src/console_cmd/accelspoof.c +++ b/zephyr/test/drivers/default/src/console_cmd/accelspoof.c @@ -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. */ diff --git a/zephyr/test/drivers/default/src/console_cmd/adc.c b/zephyr/test/drivers/default/src/console_cmd/adc.c index fb8b1ea74b..85dfda939a 100644 --- a/zephyr/test/drivers/default/src/console_cmd/adc.c +++ b/zephyr/test/drivers/default/src/console_cmd/adc.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/drivers/default/src/console_cmd/battery.c b/zephyr/test/drivers/default/src/console_cmd/battery.c index 25f25d918f..9c3e21fcf1 100644 --- a/zephyr/test/drivers/default/src/console_cmd/battery.c +++ b/zephyr/test/drivers/default/src/console_cmd/battery.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/drivers/default/src/console_cmd/button.c b/zephyr/test/drivers/default/src/console_cmd/button.c index 8ccd062c65..9272b2ce2d 100644 --- a/zephyr/test/drivers/default/src/console_cmd/button.c +++ b/zephyr/test/drivers/default/src/console_cmd/button.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/drivers/default/src/console_cmd/cbi.c b/zephyr/test/drivers/default/src/console_cmd/cbi.c index 30d4e10f1d..495ffd7e4c 100644 --- a/zephyr/test/drivers/default/src/console_cmd/cbi.c +++ b/zephyr/test/drivers/default/src/console_cmd/cbi.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/drivers/default/src/console_cmd/charge_manager.c b/zephyr/test/drivers/default/src/console_cmd/charge_manager.c index 5d925fe4c6..f6ee049ea1 100644 --- a/zephyr/test/drivers/default/src/console_cmd/charge_manager.c +++ b/zephyr/test/drivers/default/src/console_cmd/charge_manager.c @@ -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. */ diff --git a/zephyr/test/drivers/default/src/console_cmd/charge_state.c b/zephyr/test/drivers/default/src/console_cmd/charge_state.c index fa8f23bb47..d5dc9fe415 100644 --- a/zephyr/test/drivers/default/src/console_cmd/charge_state.c +++ b/zephyr/test/drivers/default/src/console_cmd/charge_state.c @@ -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. */ diff --git a/zephyr/test/drivers/default/src/console_cmd/charger.c b/zephyr/test/drivers/default/src/console_cmd/charger.c index f1811a19ff..9adda29a8d 100644 --- a/zephyr/test/drivers/default/src/console_cmd/charger.c +++ b/zephyr/test/drivers/default/src/console_cmd/charger.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/drivers/default/src/console_cmd/crash.c b/zephyr/test/drivers/default/src/console_cmd/crash.c index 9c65c25ddb..bc0b5d0254 100644 --- a/zephyr/test/drivers/default/src/console_cmd/crash.c +++ b/zephyr/test/drivers/default/src/console_cmd/crash.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/drivers/default/src/console_cmd/cutoff.c b/zephyr/test/drivers/default/src/console_cmd/cutoff.c index a629151c93..00ce40660f 100644 --- a/zephyr/test/drivers/default/src/console_cmd/cutoff.c +++ b/zephyr/test/drivers/default/src/console_cmd/cutoff.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/drivers/default/src/console_cmd/gpio.c b/zephyr/test/drivers/default/src/console_cmd/gpio.c index 1c50e47b02..164f272e27 100644 --- a/zephyr/test/drivers/default/src/console_cmd/gpio.c +++ b/zephyr/test/drivers/default/src/console_cmd/gpio.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/drivers/default/src/console_cmd/hcdebug.c b/zephyr/test/drivers/default/src/console_cmd/hcdebug.c index ede503a286..71adb02690 100644 --- a/zephyr/test/drivers/default/src/console_cmd/hcdebug.c +++ b/zephyr/test/drivers/default/src/console_cmd/hcdebug.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/drivers/default/src/console_cmd/hibdelay.c b/zephyr/test/drivers/default/src/console_cmd/hibdelay.c index 4008431364..c72a2bf66a 100644 --- a/zephyr/test/drivers/default/src/console_cmd/hibdelay.c +++ b/zephyr/test/drivers/default/src/console_cmd/hibdelay.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/drivers/default/src/console_cmd/hostevent.c b/zephyr/test/drivers/default/src/console_cmd/hostevent.c index bcce2ff568..af9b37edd1 100644 --- a/zephyr/test/drivers/default/src/console_cmd/hostevent.c +++ b/zephyr/test/drivers/default/src/console_cmd/hostevent.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ @@ -12,6 +12,12 @@ #include "test/drivers/test_state.h" #include "test/drivers/utils.h" +#ifdef CONFIG_HOST_EVENT64 +#define HOSTEVENT_PRINT_FORMAT "016" PRIx64 +#else +#define HOSTEVENT_PRINT_FORMAT "08" PRIx32 +#endif + struct console_cmd_hostevent_fixture { struct host_events_ctx ctx; }; @@ -37,6 +43,21 @@ static void console_cmd_hostevent_after(void *fixture) host_events_restore(&f->ctx); } +static int console_cmd_hostevent(const char *subcommand, host_event_t mask) +{ + int rv; + char cmd_buf[CONFIG_SHELL_CMD_BUFF_SIZE]; + + rv = snprintf(cmd_buf, CONFIG_SHELL_CMD_BUFF_SIZE, + "hostevent %s 0x%" HOSTEVENT_PRINT_FORMAT, subcommand, + mask); + + zassume_between_inclusive(rv, 0, CONFIG_SHELL_CMD_BUFF_SIZE, + "hostevent console command too long"); + + return shell_execute_cmd(get_ec_shell(), cmd_buf); +} + /* hostevent with no arguments */ ZTEST_USER(console_cmd_hostevent, test_hostevent) { @@ -48,9 +69,10 @@ ZTEST_USER(console_cmd_hostevent, test_hostevent) ZTEST_USER(console_cmd_hostevent, test_hostevent_invalid) { int rv; + host_event_t mask = 0; /* Test invalid sub-command */ - rv = shell_execute_cmd(get_ec_shell(), "hostevent invalid 0xFFFF"); + rv = console_cmd_hostevent("invalid", mask); zassert_equal(rv, EC_ERROR_PARAM1, "Expected %d, but got %d", EC_ERROR_PARAM1, rv); @@ -60,6 +82,112 @@ ZTEST_USER(console_cmd_hostevent, test_hostevent_invalid) EC_ERROR_PARAM2, rv); } +/* hostevent with sub-commands and verification */ +ZTEST_USER(console_cmd_hostevent, test_hostevent_sub_commands) +{ + int rv; + enum ec_status ret_val; + host_event_t event_mask; + host_event_t all_events = 0; + host_event_t set_events; + struct ec_response_host_event result = { 0 }; + struct { + enum lpc_host_event_type type; + const char *name; + host_event_t mask; + } subcommand[] = { + { + .type = LPC_HOST_EVENT_SMI, + .name = "SMI", + .mask = EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_CLOSED), + }, + { + .type = LPC_HOST_EVENT_SCI, + .name = "SCI", + .mask = EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_OPEN), + }, + { + .type = LPC_HOST_EVENT_WAKE, + .name = "WAKE", + .mask = EC_HOST_EVENT_MASK(EC_HOST_EVENT_POWER_BUTTON), + }, + { + .type = LPC_HOST_EVENT_ALWAYS_REPORT, + .name = "ALWAYS_REPORT", + .mask = EC_HOST_EVENT_MASK( + EC_HOST_EVENT_AC_DISCONNECTED), + }, + }; + + for (int i = 0; i < ARRAY_SIZE(subcommand); i++) { + event_mask = lpc_get_host_event_mask(subcommand[i].type); + zassert_false(event_mask & subcommand[i].mask, + "%s mask is set before test started", + subcommand[i].name); + /* + * Setting mask value overwrites existing setting, so OR in + * the test bit. + */ + event_mask |= subcommand[i].mask; + rv = console_cmd_hostevent(subcommand[i].name, event_mask); + zassert_ok(rv, "Subcommand %s failed", subcommand[i].name); + zassert_true(lpc_get_host_event_mask(subcommand[i].type) & + subcommand[i].mask, + "Failed to set %s event mask", subcommand[i].name); + + /* + * It is only valid to set host events, once at least one mask + * value includes the event. Setting host events preserves + * existing events. + */ + zassert_false(host_get_events() & subcommand[i].mask, + "Host event is set before test started"); + rv = console_cmd_hostevent("set", subcommand[i].mask); + zassert_ok(rv, "Subcommand SET failed"); + + all_events |= subcommand[i].mask; + } + + /* Verify all host events were set, and none were lost */ + zassert_true((host_get_events() & all_events) == all_events, + "Failed to set host events"); + + /* Test clearing of host events */ + set_events = all_events; + for (int i = 0; i < ARRAY_SIZE(subcommand); i++) { + set_events &= ~subcommand[i].mask; + rv = console_cmd_hostevent("clear", subcommand[i].mask); + zassert_ok(rv, "Subcommand CLEAR failed"); + + zassert_true((host_get_events() & set_events) == set_events, + "Failed to clear host event"); + } + + /* Verify the backup host events were set, and none were cleared */ + ret_val = host_cmd_host_event(EC_HOST_EVENT_GET, EC_HOST_EVENT_B, + &result); + zassert_equal(ret_val, EC_RES_SUCCESS, "Expected=%d, returned=%d", + EC_RES_SUCCESS, ret_val); + zassert_true((result.value & all_events) == all_events, + "Failed to set host events backup"); + + /* Test clearing of backup host events */ + set_events = all_events; + for (int i = 0; i < ARRAY_SIZE(subcommand); i++) { + set_events &= ~subcommand[i].mask; + rv = console_cmd_hostevent("clearb", subcommand[i].mask); + zassert_ok(rv, "Subcommand CLEAR failed"); + + ret_val = host_cmd_host_event(EC_HOST_EVENT_GET, + EC_HOST_EVENT_B, &result); + zassert_equal(ret_val, EC_RES_SUCCESS, + "Expected=%d, returned=%d", EC_RES_SUCCESS, + ret_val); + zassert_true((result.value & set_events) == set_events, + "Failed to clear host events backup"); + } +} + ZTEST_SUITE(console_cmd_hostevent, drivers_predicate_post_main, console_cmd_hostevent_setup, console_cmd_hostevent_before, console_cmd_hostevent_after, NULL); diff --git a/zephyr/test/drivers/default/src/console_cmd/i2c_portmap.c b/zephyr/test/drivers/default/src/console_cmd/i2c_portmap.c index 4c364b606d..4b2ec548a2 100644 --- a/zephyr/test/drivers/default/src/console_cmd/i2c_portmap.c +++ b/zephyr/test/drivers/default/src/console_cmd/i2c_portmap.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/drivers/default/src/console_cmd/md.c b/zephyr/test/drivers/default/src/console_cmd/md.c index c8cc3f847f..c8c3e2c130 100644 --- a/zephyr/test/drivers/default/src/console_cmd/md.c +++ b/zephyr/test/drivers/default/src/console_cmd/md.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/drivers/default/src/console_cmd/panic_output.c b/zephyr/test/drivers/default/src/console_cmd/panic_output.c index 59a6faa22a..7cc809e835 100644 --- a/zephyr/test/drivers/default/src/console_cmd/panic_output.c +++ b/zephyr/test/drivers/default/src/console_cmd/panic_output.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/drivers/default/src/console_cmd/port80.c b/zephyr/test/drivers/default/src/console_cmd/port80.c index 4f1a7ac195..792895eb27 100644 --- a/zephyr/test/drivers/default/src/console_cmd/port80.c +++ b/zephyr/test/drivers/default/src/console_cmd/port80.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ @@ -10,7 +10,7 @@ #include <zephyr/logging/log.h> #include <zephyr/shell/shell.h> -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/ztest.h> #include "console.h" diff --git a/zephyr/test/drivers/default/src/console_cmd/power_button.c b/zephyr/test/drivers/default/src/console_cmd/power_button.c index 713b3c4966..92d0aeaf78 100644 --- a/zephyr/test/drivers/default/src/console_cmd/power_button.c +++ b/zephyr/test/drivers/default/src/console_cmd/power_button.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/drivers/default/src/console_cmd/powerindebug.c b/zephyr/test/drivers/default/src/console_cmd/powerindebug.c index a295b8168a..9f52a9b569 100644 --- a/zephyr/test/drivers/default/src/console_cmd/powerindebug.c +++ b/zephyr/test/drivers/default/src/console_cmd/powerindebug.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/drivers/default/src/console_cmd/rtc.c b/zephyr/test/drivers/default/src/console_cmd/rtc.c new file mode 100644 index 0000000000..80530129af --- /dev/null +++ b/zephyr/test/drivers/default/src/console_cmd/rtc.c @@ -0,0 +1,73 @@ +/* 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. + */ + +#include <zephyr/ztest.h> + +#include "console.h" +#include "ec_commands.h" +#include "system.h" +#include "test/drivers/test_state.h" +#include "test/drivers/utils.h" + +ZTEST_USER(console_cmd_rtc, test_rtc_no_arg) +{ + char expected_buffer[32]; + uint32_t sec = 7; + + snprintf(expected_buffer, sizeof(expected_buffer), + "RTC: 0x%08x (%d.00 s)", sec, sec); + + system_set_rtc(sec); + + CHECK_CONSOLE_CMD("rtc", expected_buffer, EC_SUCCESS); +} + +ZTEST_USER(console_cmd_rtc, test_rtc_invalid) +{ + CHECK_CONSOLE_CMD("rtc set", NULL, EC_ERROR_INVAL); +} + +ZTEST_USER(console_cmd_rtc, test_rtc_set) +{ + char command[32]; + char expected_buffer[32]; + uint32_t sec = 48879; + + snprintf(expected_buffer, sizeof(expected_buffer), + "RTC: 0x%08x (%d.00 s)", sec, sec); + snprintf(command, sizeof(command), "rtc set %d", sec); + + CHECK_CONSOLE_CMD(command, expected_buffer, EC_SUCCESS); +} + +ZTEST_USER(console_cmd_rtc, test_rtc_set_bad) +{ + CHECK_CONSOLE_CMD("rtc set t", NULL, EC_ERROR_PARAM2); +} + +ZTEST_USER(console_cmd_rtc, test_rtc_alarm_no_args) +{ + CHECK_CONSOLE_CMD("rtc_alarm", "Setting RTC alarm", EC_SUCCESS); +} + +ZTEST_USER(console_cmd_rtc, test_rtc_alarm_good_args) +{ + CHECK_CONSOLE_CMD("rtc_alarm 1", "Setting RTC alarm", EC_SUCCESS); + CHECK_CONSOLE_CMD("rtc_alarm 1 5", "Setting RTC alarm", EC_SUCCESS); +} + +ZTEST_USER(console_cmd_rtc, test_rtc_alarm_bad_args) +{ + CHECK_CONSOLE_CMD("rtc_alarm t", NULL, EC_ERROR_PARAM1); + CHECK_CONSOLE_CMD("rtc_alarm 1 t", NULL, EC_ERROR_PARAM2); +} + +ZTEST_USER(console_cmd_rtc, test_rtc_alarm_reset) +{ + CHECK_CONSOLE_CMD("rtc_alarm 0", "Setting RTC alarm", EC_SUCCESS); + CHECK_CONSOLE_CMD("rtc_alarm 0 0", "Setting RTC alarm", EC_SUCCESS); +} + +ZTEST_SUITE(console_cmd_rtc, NULL, NULL, NULL, NULL, NULL); diff --git a/zephyr/test/drivers/default/src/console_cmd/rw.c b/zephyr/test/drivers/default/src/console_cmd/rw.c index 46e6f6a4ca..ee7ff9f6cf 100644 --- a/zephyr/test/drivers/default/src/console_cmd/rw.c +++ b/zephyr/test/drivers/default/src/console_cmd/rw.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/drivers/default/src/console_cmd/sleepmask.c b/zephyr/test/drivers/default/src/console_cmd/sleepmask.c new file mode 100644 index 0000000000..6ae017dc66 --- /dev/null +++ b/zephyr/test/drivers/default/src/console_cmd/sleepmask.c @@ -0,0 +1,100 @@ +/* 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. + */ + +#include <zephyr/drivers/emul.h> +#include <zephyr/shell/shell_dummy.h> +#include <zephyr/ztest.h> + +#include "console.h" +#include "test/drivers/test_state.h" +#include "test/drivers/utils.h" +#include "system.h" + +ZTEST_USER(console_cmd_sleepmask, test_no_args) +{ + const struct shell *shell_zephyr = get_ec_shell(); + const char *outbuffer; + size_t buffer_size; + + shell_backend_dummy_clear_output(shell_zephyr); + + zassert_ok(shell_execute_cmd(shell_zephyr, "sleepmask"), NULL); + outbuffer = shell_backend_dummy_get_output(shell_zephyr, &buffer_size); + + zassert_true(buffer_size > 0, NULL); + zassert_not_null(strstr(outbuffer, "sleep mask"), NULL); +} + +ZTEST_USER(console_cmd_sleepmask, test_bad_args) +{ + const struct shell *shell_zephyr = get_ec_shell(); + + zassert_equal(EC_ERROR_PARAM1, + shell_execute_cmd(shell_zephyr, "sleepmask whoopsie"), + NULL); +} + +ZTEST_USER(console_cmd_sleepmask, test_set_sleep_mask_directly) +{ + const struct shell *shell_zephyr = get_ec_shell(); + const char *outbuffer; + size_t buffer_size; + + shell_backend_dummy_clear_output(shell_zephyr); + + /* Set mask as 0 */ + zassert_ok(shell_execute_cmd(shell_zephyr, "sleepmask 0"), NULL); + shell_backend_dummy_clear_output(shell_zephyr); + + /* Get mask and weakly verify mask is 0 */ + zassert_ok(shell_execute_cmd(shell_zephyr, "sleepmask"), NULL); + outbuffer = shell_backend_dummy_get_output(shell_zephyr, &buffer_size); + + zassert_not_null(strstr(outbuffer, "0"), NULL); + zassert_is_null(strstr(outbuffer, "1"), NULL); + + /* Set mask as 1 */ + zassert_ok(shell_execute_cmd(shell_zephyr, "sleepmask 1"), NULL); + shell_backend_dummy_clear_output(shell_zephyr); + + /* Get mask and weakly verify mask is 1 */ + zassert_ok(shell_execute_cmd(shell_zephyr, "sleepmask"), NULL); + zassert_not_null(strstr(outbuffer, "1"), NULL); +} + +ZTEST_USER(console_cmd_sleepmask, test_enable_disable_force_sleepmask) +{ + const struct shell *shell_zephyr = get_ec_shell(); + + /* Verifying enabled to disabled */ + + zassert_ok(shell_execute_cmd(shell_zephyr, "sleepmask on"), NULL); + + int enabled_bits = sleep_mask & SLEEP_MASK_FORCE_NO_DSLEEP; + + zassert_ok(shell_execute_cmd(shell_zephyr, "sleepmask off"), NULL); + + int disabled_bits = sleep_mask & SLEEP_MASK_FORCE_NO_DSLEEP; + + zassert_false(enabled_bits & disabled_bits, NULL); + + /* Verifying disabled to enabled */ + + zassert_ok(shell_execute_cmd(shell_zephyr, "sleepmask on"), NULL); + + enabled_bits = sleep_mask & SLEEP_MASK_FORCE_NO_DSLEEP; + zassert_false(enabled_bits & disabled_bits, NULL); +} + +static void console_cmd_sleepmask_before_after(void *test_data) +{ + ARG_UNUSED(test_data); + + enable_sleep(-1); +} + +ZTEST_SUITE(console_cmd_sleepmask, drivers_predicate_post_main, NULL, + console_cmd_sleepmask_before_after, + console_cmd_sleepmask_before_after, NULL); diff --git a/zephyr/test/drivers/default/src/console_cmd/sleeptimeout.c b/zephyr/test/drivers/default/src/console_cmd/sleeptimeout.c index b7683f091d..d802eb5948 100644 --- a/zephyr/test/drivers/default/src/console_cmd/sleeptimeout.c +++ b/zephyr/test/drivers/default/src/console_cmd/sleeptimeout.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/drivers/default/src/console_cmd/sysinfo.c b/zephyr/test/drivers/default/src/console_cmd/sysinfo.c new file mode 100644 index 0000000000..3aeef6510c --- /dev/null +++ b/zephyr/test/drivers/default/src/console_cmd/sysinfo.c @@ -0,0 +1,84 @@ +/* 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. + */ + +#include <zephyr/drivers/emul.h> +#include <zephyr/fff.h> +#include <zephyr/shell/shell_dummy.h> +#include <zephyr/ztest.h> + +#include "console.h" +#include "test/drivers/test_mocks.h" +#include "test/drivers/test_state.h" +#include "test/drivers/utils.h" +#include "system.h" + +ZTEST_USER(console_cmd_sysinfo, test_no_args) +{ + const struct shell *shell_zephyr = get_ec_shell(); + const char *outbuffer; + size_t buffer_size; + + shell_backend_dummy_clear_output(shell_zephyr); + + zassert_ok(shell_execute_cmd(shell_zephyr, "sysinfo"), NULL); + outbuffer = shell_backend_dummy_get_output(shell_zephyr, &buffer_size); + + zassert_true(buffer_size > 0, NULL); + + /* Weakly verify some contents */ + zassert_not_null(strstr(outbuffer, "Reset flags:"), NULL); + zassert_not_null(strstr(outbuffer, "Copy:"), NULL); + zassert_not_null(strstr(outbuffer, "Jumped:"), NULL); + zassert_not_null(strstr(outbuffer, "Recovery:"), NULL); + zassert_not_null(strstr(outbuffer, "Flags:"), NULL); +} + +ZTEST_USER(console_cmd_sysinfo, test_no_args__sys_locked) +{ + const struct shell *shell_zephyr = get_ec_shell(); + const char *outbuffer; + size_t buffer_size; + + /* System unlocked */ + shell_backend_dummy_clear_output(shell_zephyr); + system_is_locked_fake.return_val = false; + + zassert_ok(shell_execute_cmd(shell_zephyr, "sysinfo"), NULL); + outbuffer = shell_backend_dummy_get_output(shell_zephyr, &buffer_size); + + zassert_true(buffer_size > 0, NULL); + zassert_not_null(strstr(outbuffer, "unlocked"), NULL); + + /* System locked */ + shell_backend_dummy_clear_output(shell_zephyr); + system_is_locked_fake.return_val = true; + + zassert_true(buffer_size > 0, NULL); + zassert_ok(shell_execute_cmd(shell_zephyr, "sysinfo"), NULL); + + outbuffer = shell_backend_dummy_get_output(shell_zephyr, &buffer_size); + zassert_not_null(strstr(outbuffer, "locked"), NULL); + + /* Verify system_is_locked in sysinfo cmd response remains */ + shell_backend_dummy_clear_output(shell_zephyr); + system_is_locked_fake.return_val = false; + + zassert_ok(shell_execute_cmd(shell_zephyr, "sysinfo"), NULL); + outbuffer = shell_backend_dummy_get_output(shell_zephyr, &buffer_size); + + zassert_true(buffer_size > 0, NULL); + zassert_not_null(strstr(outbuffer, "locked"), NULL); +} + +static void console_cmd_sysinfo_before_after(void *test_data) +{ + ARG_UNUSED(test_data); + + system_common_reset_state(); +} + +ZTEST_SUITE(console_cmd_sysinfo, drivers_predicate_post_main, NULL, + console_cmd_sysinfo_before_after, console_cmd_sysinfo_before_after, + NULL); diff --git a/zephyr/test/drivers/default/src/console_cmd/tcpci_dump.c b/zephyr/test/drivers/default/src/console_cmd/tcpci_dump.c index deecd0f7f8..9652519cab 100644 --- a/zephyr/test/drivers/default/src/console_cmd/tcpci_dump.c +++ b/zephyr/test/drivers/default/src/console_cmd/tcpci_dump.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/drivers/default/src/console_cmd/usb_pd_console.c b/zephyr/test/drivers/default/src/console_cmd/usb_pd_console.c index f205da1357..b4ddeda62e 100644 --- a/zephyr/test/drivers/default/src/console_cmd/usb_pd_console.c +++ b/zephyr/test/drivers/default/src/console_cmd/usb_pd_console.c @@ -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. */ diff --git a/zephyr/test/drivers/default/src/console_cmd/version.c b/zephyr/test/drivers/default/src/console_cmd/version.c new file mode 100644 index 0000000000..932cc51449 --- /dev/null +++ b/zephyr/test/drivers/default/src/console_cmd/version.c @@ -0,0 +1,37 @@ +/* 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. + */ + +#include <zephyr/drivers/emul.h> +#include <zephyr/shell/shell_dummy.h> +#include <zephyr/ztest.h> + +#include "console.h" +#include "test/drivers/test_state.h" +#include "test/drivers/utils.h" +#include "system.h" + +ZTEST_USER(console_cmd_version, test_no_args) +{ + const struct shell *shell_zephyr = get_ec_shell(); + const char *outbuffer; + size_t buffer_size; + + shell_backend_dummy_clear_output(shell_zephyr); + + zassert_ok(shell_execute_cmd(shell_zephyr, "version"), NULL); + outbuffer = shell_backend_dummy_get_output(shell_zephyr, &buffer_size); + + zassert_true(buffer_size > 0, NULL); + + /* Weakly verify some contents */ + zassert_not_null(strstr(outbuffer, "Chip:"), NULL); + zassert_not_null(strstr(outbuffer, "Board:"), NULL); + zassert_not_null(strstr(outbuffer, "RO:"), NULL); + zassert_not_null(strstr(outbuffer, "RW:"), NULL); + zassert_not_null(strstr(outbuffer, "Build:"), NULL); +} + +ZTEST_SUITE(console_cmd_version, drivers_predicate_post_main, NULL, NULL, NULL, + NULL); diff --git a/zephyr/test/drivers/default/src/console_cmd/waitms.c b/zephyr/test/drivers/default/src/console_cmd/waitms.c index d86652b73b..0d03ee7414 100644 --- a/zephyr/test/drivers/default/src/console_cmd/waitms.c +++ b/zephyr/test/drivers/default/src/console_cmd/waitms.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/drivers/default/src/cros_cbi.c b/zephyr/test/drivers/default/src/cros_cbi.c index dc18243675..e92765cb52 100644 --- a/zephyr/test/drivers/default/src/cros_cbi.c +++ b/zephyr/test/drivers/default/src/cros_cbi.c @@ -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. */ diff --git a/zephyr/test/drivers/default/src/espi.c b/zephyr/test/drivers/default/src/espi.c index c518f3922f..9843471ae7 100644 --- a/zephyr/test/drivers/default/src/espi.c +++ b/zephyr/test/drivers/default/src/espi.c @@ -1,17 +1,18 @@ -/* 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. */ #include <string.h> #include <zephyr/fff.h> -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/ztest.h> #include "ec_commands.h" #include "gpio.h" #include "host_command.h" #include "system.h" +#include "test/drivers/test_mocks.h" #include "test/drivers/test_state.h" #include "test/drivers/utils.h" @@ -19,8 +20,6 @@ #define AC_OK_OD_GPIO_NAME "acok_od" -FAKE_VALUE_FUNC(int, system_is_locked); - static void espi_before(void *state) { ARG_UNUSED(state); diff --git a/zephyr/test/drivers/default/src/flash.c b/zephyr/test/drivers/default/src/flash.c index 53c6fd1806..b49d21b997 100644 --- a/zephyr/test/drivers/default/src/flash.c +++ b/zephyr/test/drivers/default/src/flash.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ @@ -6,7 +6,7 @@ #include <zephyr/drivers/emul.h> #include <zephyr/drivers/gpio.h> #include <zephyr/drivers/gpio/gpio_emul.h> -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/ztest.h> #include "ec_commands.h" diff --git a/zephyr/test/drivers/default/src/gpio.c b/zephyr/test/drivers/default/src/gpio.c index 1d89b988f2..acfa0de26e 100644 --- a/zephyr/test/drivers/default/src/gpio.c +++ b/zephyr/test/drivers/default/src/gpio.c @@ -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. */ @@ -12,7 +12,7 @@ #include <zephyr/drivers/gpio/gpio_emul.h> #include <zephyr/logging/log.h> -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/ztest.h> #include "common.h" diff --git a/zephyr/test/drivers/default/src/i2c.c b/zephyr/test/drivers/default/src/i2c.c index 55303f1c14..caced4aedf 100644 --- a/zephyr/test/drivers/default/src/i2c.c +++ b/zephyr/test/drivers/default/src/i2c.c @@ -1,9 +1,9 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/ztest.h> #include "ec_commands.h" diff --git a/zephyr/test/drivers/default/src/i2c_passthru.c b/zephyr/test/drivers/default/src/i2c_passthru.c index ec79c2b1ad..aea81fc198 100644 --- a/zephyr/test/drivers/default/src/i2c_passthru.c +++ b/zephyr/test/drivers/default/src/i2c_passthru.c @@ -1,9 +1,9 @@ -/* 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. */ -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/ztest.h> #include "driver/ln9310.h" diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb.c b/zephyr/test/drivers/default/src/integration/usbc/usb.c index 0beedc5654..0436f55e93 100644 --- a/zephyr/test/drivers/default/src/integration/usbc/usb.c +++ b/zephyr/test/drivers/default/src/integration/usbc/usb.c @@ -1,9 +1,9 @@ -/* 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. */ -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/ztest.h> #include <zephyr/drivers/gpio/gpio_emul.h> diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb_20v_3a_pd_charger.c b/zephyr/test/drivers/default/src/integration/usbc/usb_20v_3a_pd_charger.c index 4c74b132ba..3fc73337b9 100644 --- a/zephyr/test/drivers/default/src/integration/usbc/usb_20v_3a_pd_charger.c +++ b/zephyr/test/drivers/default/src/integration/usbc/usb_20v_3a_pd_charger.c @@ -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. */ diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_sink.c b/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_sink.c index 2c5af7f342..5654754838 100644 --- a/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_sink.c +++ b/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_sink.c @@ -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. */ diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_source.c b/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_source.c index 21164ee47d..49716e55c3 100644 --- a/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_source.c +++ b/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_source.c @@ -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. */ diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb_attach_src_snk.c b/zephyr/test/drivers/default/src/integration/usbc/usb_attach_src_snk.c index 8af16404ee..761bb9daf1 100644 --- a/zephyr/test/drivers/default/src/integration/usbc/usb_attach_src_snk.c +++ b/zephyr/test/drivers/default/src/integration/usbc/usb_attach_src_snk.c @@ -1,9 +1,9 @@ -/* 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. */ -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/ztest.h> #include <zephyr/drivers/gpio/gpio_emul.h> diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb_pd_bist_shared.c b/zephyr/test/drivers/default/src/integration/usbc/usb_pd_bist_shared.c index e0314e07c5..9c76f862f8 100644 --- a/zephyr/test/drivers/default/src/integration/usbc/usb_pd_bist_shared.c +++ b/zephyr/test/drivers/default/src/integration/usbc/usb_pd_bist_shared.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb_pd_ctrl_msg.c b/zephyr/test/drivers/default/src/integration/usbc/usb_pd_ctrl_msg.c index 1cfd9e589e..894deaed13 100644 --- a/zephyr/test/drivers/default/src/integration/usbc/usb_pd_ctrl_msg.c +++ b/zephyr/test/drivers/default/src/integration/usbc/usb_pd_ctrl_msg.c @@ -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. */ diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb_pd_rev3.c b/zephyr/test/drivers/default/src/integration/usbc/usb_pd_rev3.c index ec71a7721d..fbe634a838 100644 --- a/zephyr/test/drivers/default/src/integration/usbc/usb_pd_rev3.c +++ b/zephyr/test/drivers/default/src/integration/usbc/usb_pd_rev3.c @@ -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. */ diff --git a/zephyr/test/drivers/default/src/isl923x.c b/zephyr/test/drivers/default/src/isl923x.c index c5531bdc37..9144730887 100644 --- a/zephyr/test/drivers/default/src/isl923x.c +++ b/zephyr/test/drivers/default/src/isl923x.c @@ -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. */ diff --git a/zephyr/test/drivers/default/src/keyboard_scan.c b/zephyr/test/drivers/default/src/keyboard_scan.c deleted file mode 100644 index a0bb3f46ca..0000000000 --- a/zephyr/test/drivers/default/src/keyboard_scan.c +++ /dev/null @@ -1,115 +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. - */ -#include <zephyr/ztest.h> -#include <zephyr/drivers/emul.h> -#include <zephyr/drivers/gpio.h> -#include <zephyr/drivers/gpio/gpio_emul.h> -#include <emul/emul_kb_raw.h> - -#include "keyboard_scan.h" -#include "test/drivers/test_mocks.h" -#include "test/drivers/test_state.h" - -int emulate_keystate(int row, int col, int pressed) -{ - const struct device *dev = DEVICE_DT_GET(DT_NODELABEL(cros_kb_raw)); - - return emul_kb_raw_set_kbstate(dev, row, col, pressed); -} - -ZTEST(keyboard_scan, test_boot_key) -{ - const struct device *dev = DEVICE_DT_GET(DT_NODELABEL(cros_kb_raw)); - const int kb_cols = DT_PROP(DT_NODELABEL(cros_kb_raw), cols); - - emul_kb_raw_reset(dev); - zassert_equal(keyboard_scan_get_boot_keys(), BOOT_KEY_NONE, NULL); - - /* Case 1: refresh + esc -> BOOT_KEY_ESC */ - emul_kb_raw_reset(dev); - zassert_ok(emulate_keystate(KEYBOARD_ROW_REFRESH, KEYBOARD_COL_REFRESH, - true), - NULL); - zassert_ok(emulate_keystate(KEYBOARD_ROW_ESC, KEYBOARD_COL_ESC, true), - NULL); - keyboard_scan_init(); - zassert_equal(keyboard_scan_get_boot_keys(), BOOT_KEY_ESC, NULL); - - /* - * Case 1.5: - * GSC may hold ksi2 when power button is pressed, simulate this - * behavior and verify boot key detection again. - */ - zassert_true(IS_ENABLED(CONFIG_KEYBOARD_PWRBTN_ASSERTS_KSI2), NULL); - for (int i = 0; i < kb_cols; i++) { - zassert_ok(emulate_keystate(KEYBOARD_ROW_REFRESH, i, true), - NULL); - } - keyboard_scan_init(); - zassert_equal(keyboard_scan_get_boot_keys(), BOOT_KEY_ESC, NULL); - - /* Case 2: esc only -> BOOT_KEY_NONE */ - emul_kb_raw_reset(dev); - zassert_ok(emulate_keystate(KEYBOARD_ROW_ESC, KEYBOARD_COL_ESC, true), - NULL); - keyboard_scan_init(); - zassert_equal(keyboard_scan_get_boot_keys(), BOOT_KEY_NONE, NULL); - - /* Case 3: refresh + arrow down -> BOOT_KEY_DOWN_ARROW */ - emul_kb_raw_reset(dev); - zassert_ok(emulate_keystate(KEYBOARD_ROW_REFRESH, KEYBOARD_COL_REFRESH, - true), - NULL); - zassert_ok(emulate_keystate(KEYBOARD_ROW_DOWN, KEYBOARD_COL_DOWN, true), - NULL); - keyboard_scan_init(); - zassert_equal(keyboard_scan_get_boot_keys(), BOOT_KEY_DOWN_ARROW, NULL); - - /* Case 4: refresh + L shift -> BOOT_KEY_LEFT_SHIFT */ - emul_kb_raw_reset(dev); - zassert_ok(emulate_keystate(KEYBOARD_ROW_REFRESH, KEYBOARD_COL_REFRESH, - true), - NULL); - zassert_ok(emulate_keystate(KEYBOARD_ROW_LEFT_SHIFT, - KEYBOARD_COL_LEFT_SHIFT, true), - NULL); - keyboard_scan_init(); - zassert_equal(keyboard_scan_get_boot_keys(), BOOT_KEY_LEFT_SHIFT, NULL); - - /* Case 5: refresh + esc + other random key -> BOOT_KEY_NONE */ - emul_kb_raw_reset(dev); - zassert_ok(emulate_keystate(KEYBOARD_ROW_REFRESH, KEYBOARD_COL_REFRESH, - true), - NULL); - zassert_ok(emulate_keystate(KEYBOARD_ROW_ESC, KEYBOARD_COL_ESC, true), - NULL); - zassert_ok(emulate_keystate(KEYBOARD_ROW_KEY_0, KEYBOARD_COL_KEY_0, - true), - NULL); - keyboard_scan_init(); - zassert_equal(keyboard_scan_get_boot_keys(), BOOT_KEY_NONE, NULL); - - /* Case 6: BOOT_KEY_NONE after late sysjump */ - system_jumped_late_fake.return_val = 1; - emul_kb_raw_reset(dev); - zassert_ok(emulate_keystate(KEYBOARD_ROW_REFRESH, KEYBOARD_COL_REFRESH, - true), - NULL); - zassert_ok(emulate_keystate(KEYBOARD_ROW_LEFT_SHIFT, - KEYBOARD_COL_LEFT_SHIFT, true), - NULL); - keyboard_scan_init(); - zassert_equal(keyboard_scan_get_boot_keys(), BOOT_KEY_NONE, NULL); -} - -ZTEST(keyboard_scan, test_press_enter) -{ - zassert_ok(emulate_keystate(4, 11, true), NULL); - k_sleep(K_MSEC(100)); - /* TODO(jbettis): Check espi_emul to verify the AP was notified. */ - zassert_ok(emulate_keystate(4, 11, false), NULL); - k_sleep(K_MSEC(100)); -} -ZTEST_SUITE(keyboard_scan, drivers_predicate_post_main, NULL, NULL, NULL, NULL); diff --git a/zephyr/test/drivers/default/src/led.c b/zephyr/test/drivers/default/src/led.c index 3b3a970ae6..e89a3d8b66 100644 --- a/zephyr/test/drivers/default/src/led.c +++ b/zephyr/test/drivers/default/src/led.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/drivers/default/src/lid_angle.c b/zephyr/test/drivers/default/src/lid_angle.c index 0289261cda..568057d95a 100644 --- a/zephyr/test/drivers/default/src/lid_angle.c +++ b/zephyr/test/drivers/default/src/lid_angle.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/drivers/default/src/lid_switch.c b/zephyr/test/drivers/default/src/lid_switch.c index 00ccba291e..1647f73e00 100644 --- a/zephyr/test/drivers/default/src/lid_switch.c +++ b/zephyr/test/drivers/default/src/lid_switch.c @@ -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. */ diff --git a/zephyr/test/drivers/default/src/lis2dw12.c b/zephyr/test/drivers/default/src/lis2dw12.c index 519f71f269..4cb29796f8 100644 --- a/zephyr/test/drivers/default/src/lis2dw12.c +++ b/zephyr/test/drivers/default/src/lis2dw12.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/drivers/default/src/ln9310.c b/zephyr/test/drivers/default/src/ln9310.c index 45d6ebaba1..326e8480ef 100644 --- a/zephyr/test/drivers/default/src/ln9310.c +++ b/zephyr/test/drivers/default/src/ln9310.c @@ -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. */ diff --git a/zephyr/test/drivers/default/src/locate_chip.c b/zephyr/test/drivers/default/src/locate_chip.c index 81985f2577..6842543971 100644 --- a/zephyr/test/drivers/default/src/locate_chip.c +++ b/zephyr/test/drivers/default/src/locate_chip.c @@ -1,11 +1,11 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ #include <zephyr/fff.h> #include <zephyr/shell/shell.h> -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/ztest.h> #include "test/drivers/test_state.h" diff --git a/zephyr/test/drivers/default/src/motion_sense/motion_sense.c b/zephyr/test/drivers/default/src/motion_sense/motion_sense.c index 443f7dfbd2..d39c3ce335 100644 --- a/zephyr/test/drivers/default/src/motion_sense/motion_sense.c +++ b/zephyr/test/drivers/default/src/motion_sense/motion_sense.c @@ -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. */ diff --git a/zephyr/test/drivers/default/src/panic.c b/zephyr/test/drivers/default/src/panic.c index c35a862f7c..4b97ed63d9 100644 --- a/zephyr/test/drivers/default/src/panic.c +++ b/zephyr/test/drivers/default/src/panic.c @@ -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. */ @@ -11,7 +11,7 @@ #include <zephyr/device.h> #include <zephyr/logging/log.h> -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/ztest.h> #include "common.h" diff --git a/zephyr/test/drivers/default/src/panic_output.c b/zephyr/test/drivers/default/src/panic_output.c index 0df1249d27..210c862901 100644 --- a/zephyr/test/drivers/default/src/panic_output.c +++ b/zephyr/test/drivers/default/src/panic_output.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/drivers/default/src/port80.c b/zephyr/test/drivers/default/src/port80.c index 7ac3dd9cdb..8563c2e478 100644 --- a/zephyr/test/drivers/default/src/port80.c +++ b/zephyr/test/drivers/default/src/port80.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ @@ -10,7 +10,7 @@ #include <zephyr/logging/log.h> #include <zephyr/shell/shell.h> -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/ztest.h> #include "console.h" diff --git a/zephyr/test/drivers/default/src/power_common.c b/zephyr/test/drivers/default/src/power_common.c index 23931f322f..3579cb7b3c 100644 --- a/zephyr/test/drivers/default/src/power_common.c +++ b/zephyr/test/drivers/default/src/power_common.c @@ -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. */ diff --git a/zephyr/test/drivers/default/src/ppc_sn5s330.c b/zephyr/test/drivers/default/src/ppc_sn5s330.c index 1582e012b6..c9ba62cf20 100644 --- a/zephyr/test/drivers/default/src/ppc_sn5s330.c +++ b/zephyr/test/drivers/default/src/ppc_sn5s330.c @@ -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. */ diff --git a/zephyr/test/drivers/default/src/ppc_syv682x.c b/zephyr/test/drivers/default/src/ppc_syv682x.c index 3e4785e569..edfbd45171 100644 --- a/zephyr/test/drivers/default/src/ppc_syv682x.c +++ b/zephyr/test/drivers/default/src/ppc_syv682x.c @@ -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. */ @@ -8,7 +8,7 @@ #include <zephyr/drivers/gpio/gpio_emul.h> #include <zephyr/drivers/gpio.h> #include <zephyr/fff.h> -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/ztest.h> #include <zephyr/ztest_assert.h> diff --git a/zephyr/test/drivers/default/src/ps8xxx.c b/zephyr/test/drivers/default/src/ps8xxx.c index 9d2ffc9fe5..29d720a639 100644 --- a/zephyr/test/drivers/default/src/ps8xxx.c +++ b/zephyr/test/drivers/default/src/ps8xxx.c @@ -1,9 +1,9 @@ -/* 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. */ -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/ztest.h> #include "common.h" diff --git a/zephyr/test/drivers/default/src/smart.c b/zephyr/test/drivers/default/src/smart.c index 37fbba2681..96200f1b91 100644 --- a/zephyr/test/drivers/default/src/smart.c +++ b/zephyr/test/drivers/default/src/smart.c @@ -1,9 +1,9 @@ -/* 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. */ -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/ztest.h> #include <zephyr/shell/shell.h> #include <zephyr/shell/shell_uart.h> diff --git a/zephyr/test/drivers/default/src/stm_mems_common.c b/zephyr/test/drivers/default/src/stm_mems_common.c index 7472a3438a..f7c59105b0 100644 --- a/zephyr/test/drivers/default/src/stm_mems_common.c +++ b/zephyr/test/drivers/default/src/stm_mems_common.c @@ -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. */ diff --git a/zephyr/test/drivers/default/src/system.c b/zephyr/test/drivers/default/src/system.c index 74b238ced2..01956d8721 100644 --- a/zephyr/test/drivers/default/src/system.c +++ b/zephyr/test/drivers/default/src/system.c @@ -1,15 +1,18 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/ztest.h> #include "ec_commands.h" #include "host_command.h" +#include "system.h" #include "test/drivers/test_state.h" +/* System Host Commands */ + ZTEST_USER(system, test_hostcmd_sysinfo) { struct ec_response_sysinfo response; @@ -41,4 +44,70 @@ ZTEST_USER(system, test_hostcmd_board_version) response.board_version); } +/* System Function Testing */ + +static void system_flags_before_after(void *data) +{ + ARG_UNUSED(data); + system_clear_reset_flags(-1); +} + +ZTEST(system_save_flags, test_system_encode_save_flags) +{ + int flags_to_save = 0; + uint32_t saved_flags = 0; + int arbitrary_reset_flags = 1; + + /* Save all possible flags */ + flags_to_save = -1; + + /* Clear all reset flags and set them arbitrarily */ + system_set_reset_flags(arbitrary_reset_flags); + + system_encode_save_flags(flags_to_save, &saved_flags); + + /* Verify all non-mutually exclusive flags */ + zassert_equal(1, saved_flags & system_get_reset_flags(), NULL); + zassert_not_equal(0, saved_flags & EC_RESET_FLAG_AP_OFF, NULL); + zassert_not_equal(0, saved_flags & EC_RESET_FLAG_STAY_IN_RO, NULL); + zassert_not_equal(0, saved_flags & EC_RESET_FLAG_AP_WATCHDOG, NULL); +} + +ZTEST(system_save_flags, + test_system_encode_save_flags_mutually_exclusive_reset_flags) +{ + int flags_to_save = 0; + uint32_t saved_flags = 0; + + /* Verify reset hard takes precedence over hibernate/soft */ + flags_to_save = SYSTEM_RESET_HARD | SYSTEM_RESET_HIBERNATE; + + system_encode_save_flags(flags_to_save, &saved_flags); + + zassert_not_equal(0, saved_flags & EC_RESET_FLAG_HARD, NULL); + zassert_equal(0, saved_flags & EC_RESET_FLAG_HIBERNATE, NULL); + zassert_equal(0, saved_flags & EC_RESET_FLAG_SOFT, NULL); + + /* Verify reset hibernate takes precedence over soft */ + flags_to_save = SYSTEM_RESET_HIBERNATE; + + system_encode_save_flags(flags_to_save, &saved_flags); + + zassert_equal(0, saved_flags & EC_RESET_FLAG_HARD, NULL); + zassert_not_equal(0, saved_flags & EC_RESET_FLAG_HIBERNATE, NULL); + zassert_equal(0, saved_flags & EC_RESET_FLAG_SOFT, NULL); + + /* Verify reset soft is always saved given no other flags */ + flags_to_save = 0; + + system_encode_save_flags(flags_to_save, &saved_flags); + + zassert_equal(0, saved_flags & EC_RESET_FLAG_HARD, NULL); + zassert_equal(0, saved_flags & EC_RESET_FLAG_HIBERNATE, NULL); + zassert_not_equal(0, saved_flags & EC_RESET_FLAG_SOFT, NULL); +} + ZTEST_SUITE(system, drivers_predicate_post_main, NULL, NULL, NULL, NULL); + +ZTEST_SUITE(system_save_flags, drivers_predicate_post_main, NULL, + system_flags_before_after, system_flags_before_after, NULL); diff --git a/zephyr/test/drivers/default/src/tablet_mode.c b/zephyr/test/drivers/default/src/tablet_mode.c index f6aa25fcd3..d600d26072 100644 --- a/zephyr/test/drivers/default/src/tablet_mode.c +++ b/zephyr/test/drivers/default/src/tablet_mode.c @@ -1,11 +1,11 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ #include <zephyr/fff.h> #include <zephyr/shell/shell.h> -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/ztest.h> #include "console.h" diff --git a/zephyr/test/drivers/default/src/tcpci.c b/zephyr/test/drivers/default/src/tcpci.c index f7e79e14cd..e549e5056a 100644 --- a/zephyr/test/drivers/default/src/tcpci.c +++ b/zephyr/test/drivers/default/src/tcpci.c @@ -1,9 +1,9 @@ -/* 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. */ -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/ztest.h> #include <zephyr/drivers/gpio.h> #include <zephyr/drivers/gpio/gpio_emul.h> @@ -288,13 +288,13 @@ ZTEST(tcpci, test_generic_tcpci_debug_accessory) /* Setup TCPCI usb mux to behave as it is used only for usb mux */ static void set_usb_mux_not_tcpc(void) { - usb_muxes[USBC_PORT_C0].flags = USB_MUX_FLAG_NOT_TCPC; + usbc0_mux0.flags = USB_MUX_FLAG_NOT_TCPC; } /* Setup TCPCI usb mux to behave as it is used for usb mux and TCPC */ static void set_usb_mux_tcpc(void) { - usb_muxes[USBC_PORT_C0].flags = 0; + usbc0_mux0.flags = 0; } /** Test TCPCI mux init */ @@ -303,7 +303,7 @@ ZTEST(tcpci, test_generic_tcpci_mux_init) const struct emul *emul = EMUL_DT_GET(TCPCI_EMUL_NODE); struct i2c_common_emul_data *common_data = emul_tcpci_generic_get_i2c_common_data(emul); - struct usb_mux *tcpci_usb_mux = &usb_muxes[USBC_PORT_C0]; + const struct usb_mux *tcpci_usb_mux = usb_muxes[USBC_PORT_C0].mux; /* Set as usb mux with TCPC for first init call */ set_usb_mux_tcpc(); @@ -360,7 +360,7 @@ ZTEST(tcpci, test_generic_tcpci_mux_enter_low_power) const struct emul *emul = EMUL_DT_GET(TCPCI_EMUL_NODE); struct i2c_common_emul_data *common_data = emul_tcpci_generic_get_i2c_common_data(emul); - struct usb_mux *tcpci_usb_mux = &usb_muxes[USBC_PORT_C0]; + const struct usb_mux *tcpci_usb_mux = usb_muxes[USBC_PORT_C0].mux; /* Set as usb mux with TCPC for first enter_low_power call */ set_usb_mux_tcpc(); @@ -393,7 +393,7 @@ static void test_generic_tcpci_mux_set_get(void) const struct emul *emul = EMUL_DT_GET(TCPCI_EMUL_NODE); struct i2c_common_emul_data *common_data = emul_tcpci_generic_get_i2c_common_data(emul); - struct usb_mux *tcpci_usb_mux = &usb_muxes[USBC_PORT_C0]; + const struct usb_mux *tcpci_usb_mux = usb_muxes[USBC_PORT_C0].mux; mux_state_t mux_state, mux_state_get; uint16_t exp_val, initial_val; bool ack; @@ -508,7 +508,8 @@ ZTEST(tcpci, test_generic_tcpci_hard_reset_reinit) static void *tcpci_setup(void) { /* This test suite assumes that first usb mux for port C0 is TCPCI */ - __ASSERT(usb_muxes[USBC_PORT_C0].driver == &tcpci_tcpm_usb_mux_driver, + __ASSERT(usb_muxes[USBC_PORT_C0].mux->driver == + &tcpci_tcpm_usb_mux_driver, "Invalid config of usb_muxes in test/drivers/src/stubs.c"); return NULL; diff --git a/zephyr/test/drivers/default/src/tcpci_test_common.c b/zephyr/test/drivers/default/src/tcpci_test_common.c index 4b9c7903f7..f2c0c58bf9 100644 --- a/zephyr/test/drivers/default/src/tcpci_test_common.c +++ b/zephyr/test/drivers/default/src/tcpci_test_common.c @@ -1,9 +1,9 @@ -/* 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. */ -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/ztest.h> #include "common.h" diff --git a/zephyr/test/drivers/default/src/tcs3400.c b/zephyr/test/drivers/default/src/tcs3400.c index 79700ce671..860b069532 100644 --- a/zephyr/test/drivers/default/src/tcs3400.c +++ b/zephyr/test/drivers/default/src/tcs3400.c @@ -1,9 +1,9 @@ -/* 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. */ -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/ztest.h> #include "common.h" diff --git a/zephyr/test/drivers/default/src/temp_sensor.c b/zephyr/test/drivers/default/src/temp_sensor.c index a4a514b7db..ff07e2d375 100644 --- a/zephyr/test/drivers/default/src/temp_sensor.c +++ b/zephyr/test/drivers/default/src/temp_sensor.c @@ -1,9 +1,9 @@ -/* 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. */ -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/ztest.h> #include <zephyr/drivers/adc.h> #include <zephyr/drivers/adc/adc_emul.h> diff --git a/zephyr/test/drivers/default/src/thermistor.c b/zephyr/test/drivers/default/src/thermistor.c index 695f7b36b5..78fa508ad4 100644 --- a/zephyr/test/drivers/default/src/thermistor.c +++ b/zephyr/test/drivers/default/src/thermistor.c @@ -1,9 +1,9 @@ -/* 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. */ -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/ztest.h> #include <zephyr/drivers/adc.h> #include <zephyr/drivers/adc/adc_emul.h> diff --git a/zephyr/test/drivers/default/src/uart_hostcmd.c b/zephyr/test/drivers/default/src/uart_hostcmd.c index 2b65481382..879e734837 100644 --- a/zephyr/test/drivers/default/src/uart_hostcmd.c +++ b/zephyr/test/drivers/default/src/uart_hostcmd.c @@ -1,9 +1,9 @@ -/* 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. */ -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/ztest.h> #include "console.h" diff --git a/zephyr/test/drivers/default/src/usb_mux.c b/zephyr/test/drivers/default/src/usb_mux.c index 5366bcb563..45b81d6ea5 100644 --- a/zephyr/test/drivers/default/src/usb_mux.c +++ b/zephyr/test/drivers/default/src/usb_mux.c @@ -1,10 +1,9 @@ -/* 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. */ #include <zephyr/kernel.h> -#include <zephyr/zephyr.h> #include <zephyr/ztest.h> #include <zephyr/drivers/gpio.h> #include <zephyr/drivers/gpio/gpio_emul.h> @@ -30,7 +29,7 @@ #include "test/drivers/utils.h" /** Copy of original usb_muxes[USB_PORT_C1] */ -struct usb_mux usb_mux_c1; +struct usb_mux_chain usb_mux_c1; /** Number of usb mux proxies in chain */ #define NUM_OF_PROXY 3 @@ -281,39 +280,51 @@ static void reset_proxy_fakes(void) } /** Chain of 3 proxy usb muxes */ -struct usb_mux proxy_chain_2 = { +struct usb_mux proxy_mux_2 = { .usb_port = USBC_PORT_C1, .driver = &proxy_usb_mux, - .next_mux = NULL, .i2c_addr_flags = 2, .hpd_update = &proxy_hpd_update, }; -struct usb_mux proxy_chain_1 = { +struct usb_mux_chain proxy_chain_2 = { + .mux = &proxy_mux_2, +}; + +struct usb_mux proxy_mux_1 = { .usb_port = USBC_PORT_C1, .driver = &proxy_usb_mux, - .next_mux = &proxy_chain_2, .i2c_addr_flags = 1, .hpd_update = &proxy_hpd_update, }; -struct usb_mux proxy_chain_0 = { +struct usb_mux_chain proxy_chain_1 = { + .mux = &proxy_mux_1, + .next = &proxy_chain_2, +}; + +struct usb_mux proxy_mux_0 = { .usb_port = USBC_PORT_C1, .driver = &proxy_usb_mux, - .next_mux = &proxy_chain_1, .i2c_addr_flags = 0, .hpd_update = &proxy_hpd_update, }; +struct usb_mux_chain proxy_chain_0 = { + .mux = &proxy_mux_0, + .next = &proxy_chain_1, +}; + /** Setup first 3 usb muxes of port 1 with proxy */ static void setup_usb_mux_proxy_chain(void) { - const struct usb_mux *t; + const struct usb_mux_chain *t; int i; - memcpy(&usb_mux_c1, &usb_muxes[USBC_PORT_C1], sizeof(struct usb_mux)); + memcpy(&usb_mux_c1, &usb_muxes[USBC_PORT_C1], + sizeof(struct usb_mux_chain)); memcpy(&usb_muxes[USBC_PORT_C1], &proxy_chain_0, - sizeof(struct usb_mux)); + sizeof(struct usb_mux_chain)); /* * Setup org_mux array to point real driver which should be called by @@ -321,28 +332,31 @@ static void setup_usb_mux_proxy_chain(void) */ t = &usb_mux_c1; for (i = 0; i < NUM_OF_PROXY; i++) { - org_mux[i] = t; if (t != NULL) { - t = t->next_mux; + org_mux[i] = t->mux; + t = t->next; + } else { + org_mux[i] = NULL; } } - if (org_mux[2] != NULL) { - proxy_chain_2.next_mux = org_mux[2]->next_mux; + if (t != NULL) { + proxy_chain_2.next = t; } else { - proxy_chain_2.next_mux = NULL; + proxy_chain_2.next = NULL; } } /** Restore original usb_mux chain without proxy */ static void restore_usb_mux_chain(void) { - memcpy(&usb_muxes[USBC_PORT_C1], &usb_mux_c1, sizeof(struct usb_mux)); + memcpy(&usb_muxes[USBC_PORT_C1], &usb_mux_c1, + sizeof(struct usb_mux_chain)); /* Reset flags to default */ - proxy_chain_0.flags = 0; - proxy_chain_1.flags = 0; - proxy_chain_2.flags = 0; + proxy_mux_0.flags = 0; + proxy_mux_1.flags = 0; + proxy_mux_2.flags = 0; } /** @@ -355,15 +369,15 @@ static void restore_usb_mux_chain(void) zassert_equal(num, proxy##_fake.call_count, "%d != %d", num, \ proxy##_fake.call_count); \ if (num >= 1) { \ - zassert_equal(&usb_muxes[USBC_PORT_C1], \ + zassert_equal(usb_muxes[USBC_PORT_C1].mux, \ proxy##_fake.arg0_history[0], NULL); \ } \ if (num >= 2) { \ - zassert_equal(&proxy_chain_1, \ + zassert_equal(proxy_chain_1.mux, \ proxy##_fake.arg0_history[1], NULL); \ } \ if (num >= 3) { \ - zassert_equal(&proxy_chain_2, \ + zassert_equal(proxy_chain_2.mux, \ proxy##_fake.arg0_history[2], NULL); \ } \ } while (0) @@ -415,16 +429,16 @@ ZTEST(usb_uninit_mux, test_usb_mux_init) CHECK_PROXY_FAKE_CALL_CNT(proxy_init, 2); /* Test board init callback */ - proxy_chain_1.board_init = &mock_board_init; + proxy_mux_1.board_init = &mock_board_init; reset_proxy_fakes(); usb_mux_init(USBC_PORT_C1); CHECK_PROXY_FAKE_CALL_CNT(proxy_init, NUM_OF_PROXY); /* Check if board_init was called for proxy 1 */ zassert_equal(1, mock_board_init_fake.call_count, NULL); - zassert_equal(&proxy_chain_1, mock_board_init_fake.arg0_history[0], + zassert_equal(proxy_chain_1.mux, mock_board_init_fake.arg0_history[0], NULL); - proxy_chain_1.board_init = NULL; + proxy_mux_1.board_init = NULL; } /** Test usb_mux setting mux mode */ @@ -434,7 +448,7 @@ ZTEST(usb_uninit_mux, test_usb_mux_set) mux_state_t exp_mode; /* Set flag for usb mux 1 to disable polarity setting */ - proxy_chain_1.flags = USB_MUX_FLAG_SET_WITHOUT_FLIP; + proxy_mux_1.flags = USB_MUX_FLAG_SET_WITHOUT_FLIP; /* Test setting mux mode without polarity inversion */ reset_proxy_fakes(); @@ -461,14 +475,14 @@ ZTEST(usb_uninit_mux, test_usb_mux_set) /* Test board set callback */ reset_proxy_fakes(); - proxy_chain_1.board_set = &mock_board_set; + proxy_mux_1.board_set = &mock_board_set; usb_mux_set(USBC_PORT_C1, exp_mode, USB_SWITCH_CONNECT, 0 /* = polarity */); CHECK_PROXY_FAKE_CALL_CNT(proxy_init, 0); CHECK_PROXY_FAKE_CALL_CNT_MUX_STATE(proxy_set, NUM_OF_PROXY, exp_mode); /* Check if board_set was called for proxy 1 */ zassert_equal(1, mock_board_set_fake.call_count, NULL); - zassert_equal(&proxy_chain_1, mock_board_set_fake.arg0_history[0], + zassert_equal(proxy_chain_1.mux, mock_board_set_fake.arg0_history[0], NULL); zassert_equal(exp_mode, mock_board_set_fake.arg1_history[0], NULL); @@ -482,7 +496,7 @@ ZTEST(usb_uninit_mux, test_usb_mux_set) /* board_set shouldn't be called after fail */ zassert_equal(0, mock_board_set_fake.call_count, NULL); - proxy_chain_1.board_set = NULL; + proxy_mux_1.board_set = NULL; } /** Test usb_mux reset in g3 when required flag is set */ @@ -498,7 +512,7 @@ ZTEST(usb_uninit_mux, test_usb_mux_reset_in_g3) CHECK_PROXY_FAKE_CALL_CNT_MUX_STATE(proxy_set, NUM_OF_PROXY, exp_mode); /* Usb muxes of port 1 should stay initialised */ - usb_muxes[USBC_PORT_C1].flags = 0; + proxy_mux_0.flags = 0; hook_notify(HOOK_CHIPSET_HARD_OFF); /* Test that init is not called */ @@ -618,7 +632,7 @@ ZTEST(usb_uninit_mux, test_usb_mux_flip) mux_state_t exp_mode; /* Set flag for usb mux 1 to disable polarity setting */ - proxy_chain_1.flags = USB_MUX_FLAG_SET_WITHOUT_FLIP; + proxy_mux_1.flags = USB_MUX_FLAG_SET_WITHOUT_FLIP; /* Test flip port without polarity inverted */ exp_mode = USB_PD_MUX_USB_ENABLED; @@ -702,15 +716,21 @@ ZTEST(usb_uninit_mux, test_usb_mux_hpd_update) exp_mode); /* Test ps8xxx hpd update */ - usb_muxes[USBC_PORT_C1].usb_port = 1; - usb_muxes[USBC_PORT_C1].driver = &tcpci_tcpm_usb_mux_driver; - usb_muxes[USBC_PORT_C1].hpd_update = &ps8xxx_tcpc_update_hpd_status; + proxy_mux_0.usb_port = 1; + proxy_mux_0.driver = &tcpci_tcpm_usb_mux_driver; + proxy_mux_0.hpd_update = &ps8xxx_tcpc_update_hpd_status; reset_proxy_fakes(); exp_mode = virt_mode | USB_PD_MUX_HPD_LVL | USB_PD_MUX_HPD_IRQ; usb_mux_hpd_update(USBC_PORT_C1, exp_mode); /* Check if PS8xxx mux mode is updated correctly */ - tcpci_tcpm_usb_mux_driver.get(&usb_muxes[USBC_PORT_C1], &mode); + tcpci_tcpm_usb_mux_driver.get(usb_muxes[USBC_PORT_C1].mux, &mode); + + /* Restore proxy chain 0 */ + proxy_mux_0.usb_port = USBC_PORT_C1; + proxy_mux_0.driver = &proxy_usb_mux; + proxy_mux_0.hpd_update = &proxy_hpd_update; + zassert_equal(0, mode, "mux mode is 0x%x (!= 0x%x)", mode, 0); } @@ -856,7 +876,7 @@ void usb_uninit_mux_before(void *state) set_test_runner_tid(); /* Makes sure that usb muxes of port 1 are not init */ - usb_muxes[USBC_PORT_C1].flags = USB_MUX_FLAG_RESETS_IN_G3; + proxy_mux_0.flags = USB_MUX_FLAG_RESETS_IN_G3; hook_notify(HOOK_CHIPSET_HARD_OFF); reset_proxy_fakes(); } diff --git a/zephyr/test/drivers/default/src/usb_pd_host_cmd.c b/zephyr/test/drivers/default/src/usb_pd_host_cmd.c index 0a67c608f9..c8851fbeb1 100644 --- a/zephyr/test/drivers/default/src/usb_pd_host_cmd.c +++ b/zephyr/test/drivers/default/src/usb_pd_host_cmd.c @@ -1,9 +1,9 @@ -/* 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. */ -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/ztest.h> #include "ec_commands.h" diff --git a/zephyr/test/drivers/default/src/vboot_hash.c b/zephyr/test/drivers/default/src/vboot_hash.c index 46f0731058..546fc8135f 100644 --- a/zephyr/test/drivers/default/src/vboot_hash.c +++ b/zephyr/test/drivers/default/src/vboot_hash.c @@ -1,9 +1,9 @@ -/* 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. */ -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/ztest.h> #include <sha256.h> diff --git a/zephyr/test/drivers/default/src/virtual_battery.c b/zephyr/test/drivers/default/src/virtual_battery.c index 6de4df6190..0b9063d8f3 100644 --- a/zephyr/test/drivers/default/src/virtual_battery.c +++ b/zephyr/test/drivers/default/src/virtual_battery.c @@ -1,9 +1,9 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/ztest.h> #include "battery.h" diff --git a/zephyr/test/drivers/default/src/vstore.c b/zephyr/test/drivers/default/src/vstore.c index cbdbe65ccc..b4264aaeb3 100644 --- a/zephyr/test/drivers/default/src/vstore.c +++ b/zephyr/test/drivers/default/src/vstore.c @@ -1,12 +1,19 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ +#include <setjmp.h> + +#include <console.h> +#include <zephyr/fff.h> +#include <zephyr/shell/shell_dummy.h> #include <zephyr/ztest.h> #include "ec_commands.h" #include "host_command.h" +#include "system.h" +#include "system_fake.h" #include "vstore.h" #include "test/drivers/test_state.h" @@ -167,3 +174,57 @@ ZTEST_USER(vstore, test_vstore_write_read) do_vstore_write_read(0); do_vstore_write_read(1); } + +ZTEST_USER(vstore, test_vstore_state) +{ + struct ec_params_vstore_write write_params = { + .slot = 0, + /* .data is set up below */ + }; + struct host_cmd_handler_args write_args = + BUILD_HOST_COMMAND_PARAMS(EC_CMD_VSTORE_WRITE, 0, write_params); + + struct ec_params_reboot_ec reboot_params = { + .cmd = EC_REBOOT_JUMP_RW, + }; + struct host_cmd_handler_args reboot_args = + BUILD_HOST_COMMAND_PARAMS(EC_CMD_REBOOT_EC, 0, reboot_params); + struct ec_response_vstore_info info_response; + struct host_cmd_handler_args info_args = BUILD_HOST_COMMAND_RESPONSE( + EC_CMD_VSTORE_INFO, 0, info_response); + jmp_buf env; + int i; + + shell_backend_dummy_clear_output(get_ec_shell()); + system_common_pre_init(); + + for (i = 0; i < EC_VSTORE_SLOT_SIZE; i++) + write_params.data[i] = i + 1; + + /* Write to a slot */ + zassert_ok(host_command_process(&write_args), NULL); + zassert_ok(write_args.result, NULL); + + /* Set up so we get back to this test on a reboot */ + if (!setjmp(env)) { + system_fake_setenv(&env); + + /* Reboot to RW */ + zassert_ok(host_command_process(&reboot_args), NULL); + + /* Does not return unless something went wrong */ + zassert_unreachable("Failed to reboot"); + } + + /* the reboot should end up here: check the slot is still locked */ + zassert_ok(host_command_process(&info_args), NULL); + zassert_ok(info_args.result, NULL); + zassert_equal(info_args.response_size, sizeof(info_response), NULL); + zassert_equal(info_response.slot_count, CONFIG_VSTORE_SLOT_COUNT, + "response.slot_count = %d", info_response.slot_count); + zassert_equal(info_response.slot_locked, 1 << 0, + "response.slot_locked = %#x", info_response.slot_locked); + + /* Clear locks to put things into a normal state */ + vstore_clear_lock(); +} diff --git a/zephyr/test/drivers/default/src/watchdog.c b/zephyr/test/drivers/default/src/watchdog.c index 82d180eea8..958aa3eaaa 100644 --- a/zephyr/test/drivers/default/src/watchdog.c +++ b/zephyr/test/drivers/default/src/watchdog.c @@ -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. */ @@ -12,7 +12,7 @@ #include <zephyr/drivers/watchdog.h> #include <zephyr/logging/log.h> -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/ztest.h> #include "common.h" diff --git a/zephyr/test/drivers/dps/CMakeLists.txt b/zephyr/test/drivers/dps/CMakeLists.txt index e0b4095173..0e175e182f 100644 --- a/zephyr/test/drivers/dps/CMakeLists.txt +++ b/zephyr/test/drivers/dps/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/zephyr/test/drivers/dps/prj.conf b/zephyr/test/drivers/dps/prj.conf index d84daeefe1..1f1e1c5d0e 100644 --- a/zephyr/test/drivers/dps/prj.conf +++ b/zephyr/test/drivers/dps/prj.conf @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/zephyr/test/drivers/dps/src/dps.c b/zephyr/test/drivers/dps/src/dps.c index 7c537fd27d..d445767df4 100644 --- a/zephyr/test/drivers/dps/src/dps.c +++ b/zephyr/test/drivers/dps/src/dps.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/drivers/host_cmd/CMakeLists.txt b/zephyr/test/drivers/host_cmd/CMakeLists.txt index 9eea699e83..ddd8e4d54c 100644 --- a/zephyr/test/drivers/host_cmd/CMakeLists.txt +++ b/zephyr/test/drivers/host_cmd/CMakeLists.txt @@ -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. diff --git a/zephyr/test/drivers/host_cmd/src/battery_cut_off.c b/zephyr/test/drivers/host_cmd/src/battery_cut_off.c index 64009618ad..ed9d96481d 100644 --- a/zephyr/test/drivers/host_cmd/src/battery_cut_off.c +++ b/zephyr/test/drivers/host_cmd/src/battery_cut_off.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/drivers/host_cmd/src/get_panic_info.c b/zephyr/test/drivers/host_cmd/src/get_panic_info.c index 6dc13b463a..04b83d07f9 100644 --- a/zephyr/test/drivers/host_cmd/src/get_panic_info.c +++ b/zephyr/test/drivers/host_cmd/src/get_panic_info.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/drivers/host_cmd/src/get_pd_port_caps.c b/zephyr/test/drivers/host_cmd/src/get_pd_port_caps.c index 479ee54388..907329f8a1 100644 --- a/zephyr/test/drivers/host_cmd/src/get_pd_port_caps.c +++ b/zephyr/test/drivers/host_cmd/src/get_pd_port_caps.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/drivers/host_cmd/src/host_event_commands.c b/zephyr/test/drivers/host_cmd/src/host_event_commands.c index a0da815df8..c2f7e72045 100644 --- a/zephyr/test/drivers/host_cmd/src/host_event_commands.c +++ b/zephyr/test/drivers/host_cmd/src/host_event_commands.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/drivers/host_cmd/src/host_event_commands_deprecated.c b/zephyr/test/drivers/host_cmd/src/host_event_commands_deprecated.c index 6190558994..6d0a386d6e 100644 --- a/zephyr/test/drivers/host_cmd/src/host_event_commands_deprecated.c +++ b/zephyr/test/drivers/host_cmd/src/host_event_commands_deprecated.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/drivers/host_cmd/src/keyboard_mkbp.c b/zephyr/test/drivers/host_cmd/src/keyboard_mkbp.c index a874983b44..4c74a48ab4 100644 --- a/zephyr/test/drivers/host_cmd/src/keyboard_mkbp.c +++ b/zephyr/test/drivers/host_cmd/src/keyboard_mkbp.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/drivers/host_cmd/src/motion_sense.c b/zephyr/test/drivers/host_cmd/src/motion_sense.c index 26578cfdaf..c75f327fed 100644 --- a/zephyr/test/drivers/host_cmd/src/motion_sense.c +++ b/zephyr/test/drivers/host_cmd/src/motion_sense.c @@ -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. */ diff --git a/zephyr/test/drivers/host_cmd/src/pd_chip_info.c b/zephyr/test/drivers/host_cmd/src/pd_chip_info.c index e41c1b2e7a..95e2339899 100644 --- a/zephyr/test/drivers/host_cmd/src/pd_chip_info.c +++ b/zephyr/test/drivers/host_cmd/src/pd_chip_info.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/drivers/host_cmd/src/pd_control.c b/zephyr/test/drivers/host_cmd/src/pd_control.c index d512875c89..e8de27f6ce 100644 --- a/zephyr/test/drivers/host_cmd/src/pd_control.c +++ b/zephyr/test/drivers/host_cmd/src/pd_control.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/drivers/host_cmd/src/pd_log.c b/zephyr/test/drivers/host_cmd/src/pd_log.c index 642e5c99db..a6022d8bb1 100644 --- a/zephyr/test/drivers/host_cmd/src/pd_log.c +++ b/zephyr/test/drivers/host_cmd/src/pd_log.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/drivers/host_cmd/src/usb_pd_control.c b/zephyr/test/drivers/host_cmd/src/usb_pd_control.c index b71a2957cc..c439141da9 100644 --- a/zephyr/test/drivers/host_cmd/src/usb_pd_control.c +++ b/zephyr/test/drivers/host_cmd/src/usb_pd_control.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/drivers/isl923x/CMakeLists.txt b/zephyr/test/drivers/isl923x/CMakeLists.txt index 809d9f0862..734742c6b6 100644 --- a/zephyr/test/drivers/isl923x/CMakeLists.txt +++ b/zephyr/test/drivers/isl923x/CMakeLists.txt @@ -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. diff --git a/zephyr/test/drivers/isl923x/src/charge_ramp_hw.c b/zephyr/test/drivers/isl923x/src/charge_ramp_hw.c index c09b2b81d6..c814b75de9 100644 --- a/zephyr/test/drivers/isl923x/src/charge_ramp_hw.c +++ b/zephyr/test/drivers/isl923x/src/charge_ramp_hw.c @@ -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. */ diff --git a/zephyr/test/drivers/isl923x/src/console_cmd_amon_bmon.c b/zephyr/test/drivers/isl923x/src/console_cmd_amon_bmon.c index b298310005..9246bf5b6b 100644 --- a/zephyr/test/drivers/isl923x/src/console_cmd_amon_bmon.c +++ b/zephyr/test/drivers/isl923x/src/console_cmd_amon_bmon.c @@ -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. */ diff --git a/zephyr/test/drivers/keyboard_scan/CMakeLists.txt b/zephyr/test/drivers/keyboard_scan/CMakeLists.txt new file mode 100644 index 0000000000..dc57dbe259 --- /dev/null +++ b/zephyr/test/drivers/keyboard_scan/CMakeLists.txt @@ -0,0 +1,8 @@ +# 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. + +target_sources(app PRIVATE + src/keyboard_scan.c + src/mkbp_event.c +) diff --git a/zephyr/test/drivers/keyboard_scan/src/keyboard_scan.c b/zephyr/test/drivers/keyboard_scan/src/keyboard_scan.c new file mode 100644 index 0000000000..2f5bb1015f --- /dev/null +++ b/zephyr/test/drivers/keyboard_scan/src/keyboard_scan.c @@ -0,0 +1,423 @@ +/* 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. + */ +#include <string.h> +#include <zephyr/shell/shell_dummy.h> +#include <zephyr/ztest.h> +#include <zephyr/drivers/emul.h> +#include <zephyr/drivers/gpio.h> +#include <zephyr/drivers/gpio/gpio_emul.h> +#include <zephyr/fff.h> +#include <emul/emul_kb_raw.h> + +#include "console.h" +#include "host_command.h" +#include "keyboard_scan.h" +#include "test/drivers/test_mocks.h" +#include "test/drivers/test_state.h" + +int emulate_keystate(int row, int col, int pressed) +{ + const struct device *dev = DEVICE_DT_GET(DT_NODELABEL(cros_kb_raw)); + + return emul_kb_raw_set_kbstate(dev, row, col, pressed); +} + +ZTEST(keyboard_scan, test_boot_key) +{ + const struct device *dev = DEVICE_DT_GET(DT_NODELABEL(cros_kb_raw)); + const int kb_cols = DT_PROP(DT_NODELABEL(cros_kb_raw), cols); + + emul_kb_raw_reset(dev); + zassert_equal(keyboard_scan_get_boot_keys(), BOOT_KEY_NONE, NULL); + + /* Case 1: refresh + esc -> BOOT_KEY_ESC */ + emul_kb_raw_reset(dev); + zassert_ok(emulate_keystate(KEYBOARD_ROW_REFRESH, KEYBOARD_COL_REFRESH, + true), + NULL); + zassert_ok(emulate_keystate(KEYBOARD_ROW_ESC, KEYBOARD_COL_ESC, true), + NULL); + keyboard_scan_init(); + zassert_equal(keyboard_scan_get_boot_keys(), BOOT_KEY_ESC, NULL); + + /* + * Case 1.5: + * GSC may hold ksi2 when power button is pressed, simulate this + * behavior and verify boot key detection again. + */ + zassert_true(IS_ENABLED(CONFIG_KEYBOARD_PWRBTN_ASSERTS_KSI2), NULL); + for (int i = 0; i < kb_cols; i++) { + zassert_ok(emulate_keystate(KEYBOARD_ROW_REFRESH, i, true), + NULL); + } + keyboard_scan_init(); + zassert_equal(keyboard_scan_get_boot_keys(), BOOT_KEY_ESC, NULL); + + /* Case 2: esc only -> BOOT_KEY_NONE */ + emul_kb_raw_reset(dev); + zassert_ok(emulate_keystate(KEYBOARD_ROW_ESC, KEYBOARD_COL_ESC, true), + NULL); + keyboard_scan_init(); + zassert_equal(keyboard_scan_get_boot_keys(), BOOT_KEY_NONE, NULL); + + /* Case 3: refresh + arrow down -> BOOT_KEY_DOWN_ARROW */ + emul_kb_raw_reset(dev); + zassert_ok(emulate_keystate(KEYBOARD_ROW_REFRESH, KEYBOARD_COL_REFRESH, + true), + NULL); + zassert_ok(emulate_keystate(KEYBOARD_ROW_DOWN, KEYBOARD_COL_DOWN, true), + NULL); + keyboard_scan_init(); + zassert_equal(keyboard_scan_get_boot_keys(), BOOT_KEY_DOWN_ARROW, NULL); + + /* Case 4: refresh + L shift -> BOOT_KEY_LEFT_SHIFT */ + emul_kb_raw_reset(dev); + zassert_ok(emulate_keystate(KEYBOARD_ROW_REFRESH, KEYBOARD_COL_REFRESH, + true), + NULL); + zassert_ok(emulate_keystate(KEYBOARD_ROW_LEFT_SHIFT, + KEYBOARD_COL_LEFT_SHIFT, true), + NULL); + keyboard_scan_init(); + zassert_equal(keyboard_scan_get_boot_keys(), BOOT_KEY_LEFT_SHIFT, NULL); + + /* Case 5: refresh + esc + other random key -> BOOT_KEY_NONE */ + emul_kb_raw_reset(dev); + zassert_ok(emulate_keystate(KEYBOARD_ROW_REFRESH, KEYBOARD_COL_REFRESH, + true), + NULL); + zassert_ok(emulate_keystate(KEYBOARD_ROW_ESC, KEYBOARD_COL_ESC, true), + NULL); + zassert_ok(emulate_keystate(KEYBOARD_ROW_KEY_0, KEYBOARD_COL_KEY_0, + true), + NULL); + keyboard_scan_init(); + zassert_equal(keyboard_scan_get_boot_keys(), BOOT_KEY_NONE, NULL); + + /* Case 6: BOOT_KEY_NONE after late sysjump */ + system_jumped_late_fake.return_val = 1; + emul_kb_raw_reset(dev); + zassert_ok(emulate_keystate(KEYBOARD_ROW_REFRESH, KEYBOARD_COL_REFRESH, + true), + NULL); + zassert_ok(emulate_keystate(KEYBOARD_ROW_LEFT_SHIFT, + KEYBOARD_COL_LEFT_SHIFT, true), + NULL); + keyboard_scan_init(); + zassert_equal(keyboard_scan_get_boot_keys(), BOOT_KEY_NONE, NULL); +} + +ZTEST(keyboard_scan, test_press_enter) +{ + zassert_ok(emulate_keystate(4, 11, true), NULL); + k_sleep(K_MSEC(100)); + /* TODO(jbettis): Check espi_emul to verify the AP was notified. */ + zassert_ok(emulate_keystate(4, 11, false), NULL); + k_sleep(K_MSEC(100)); +} + +ZTEST(keyboard_scan, console_command_ksstate__noargs) +{ + const char *outbuffer; + size_t buffer_size; + + /* With no args, print current state */ + shell_backend_dummy_clear_output(get_ec_shell()); + zassert_ok(shell_execute_cmd(get_ec_shell(), "ksstate"), NULL); + outbuffer = + shell_backend_dummy_get_output(get_ec_shell(), &buffer_size); + + /* Check for some expected lines */ + zassert_true(buffer_size > 0, NULL); + zassert_ok(!strstr(outbuffer, "Keyboard scan disable mask: 0x00000000"), + "Output was: `%s`", outbuffer); + zassert_ok(!strstr(outbuffer, "Keyboard scan state printing off"), + "Output was: `%s`", outbuffer); + + /* Ensure we are still scanning */ + zassert_true(keyboard_scan_is_enabled(), NULL); +} + +ZTEST(keyboard_scan, console_command_ksstate__force) +{ + /* This command forces the keyboard to start scanning (if not already) + * and enable state change printing. To test: turn scanning off, run + * command, and verify we are scanning and printing state + */ + + keyboard_scan_enable(false, -1); + zassume_false(keyboard_scan_is_enabled(), NULL); + + zassert_ok(shell_execute_cmd(get_ec_shell(), "ksstate force"), NULL); + + zassert_true(keyboard_scan_is_enabled(), NULL); + zassert_true(keyboard_scan_get_print_state_changes(), NULL); +} + +ZTEST(keyboard_scan, console_command_ksstate__on_off) +{ + /* This command turns state change printing on/off */ + + zassume_false(keyboard_scan_get_print_state_changes(), NULL); + + zassert_ok(shell_execute_cmd(get_ec_shell(), "ksstate on"), NULL); + zassert_true(keyboard_scan_get_print_state_changes(), NULL); + + zassert_ok(shell_execute_cmd(get_ec_shell(), "ksstate off"), NULL); + zassert_false(keyboard_scan_get_print_state_changes(), NULL); +} + +ZTEST(keyboard_scan, console_command_ksstate__invalid) +{ + /* Pass a string that cannot be parsed as a bool */ + zassert_ok(!shell_execute_cmd(get_ec_shell(), "ksstate xyz"), NULL); +} + +ZTEST(keyboard_scan, console_command_kbpress__noargs) +{ + const char *outbuffer; + size_t buffer_size; + + /* With no args, print list of simulated keys */ + shell_backend_dummy_clear_output(get_ec_shell()); + zassert_ok(shell_execute_cmd(get_ec_shell(), "kbpress"), NULL); + outbuffer = + shell_backend_dummy_get_output(get_ec_shell(), &buffer_size); + + /* Check for an expected line */ + zassert_true(buffer_size > 0, NULL); + zassert_ok(!strstr(outbuffer, "Simulated keys:"), "Output was: `%s`", + outbuffer); +} + +ZTEST(keyboard_scan, console_command_kbpress__invalid) +{ + /* Row or column number out of range, or wrong type */ + zassert_ok(!shell_execute_cmd(get_ec_shell(), "kbpress -1 0"), NULL); + zassert_ok(!shell_execute_cmd(get_ec_shell(), "kbpress foo 0"), NULL); + zassert_ok(!shell_execute_cmd( + get_ec_shell(), + "kbpress " STRINGIFY(KEYBOARD_COLS_MAX) " 0"), + NULL); + + zassert_ok(!shell_execute_cmd(get_ec_shell(), "kbpress 0 -1"), NULL); + zassert_ok(!shell_execute_cmd(get_ec_shell(), "kbpress 0 foo"), NULL); + zassert_ok( + !shell_execute_cmd(get_ec_shell(), + "kbpress 0 " STRINGIFY(KEYBOARD_COLS_MAX)), + NULL); +} + +/* Mock the key_state_changed callback that the key scan task invokes whenever + * a key event occurs. This will capture a history of key presses. + */ +FAKE_VOID_FUNC(key_state_changed, int, int, uint8_t); + +ZTEST(keyboard_scan, console_command_kbpress__press_and_release) +{ + /* Pres and release a key */ + zassert_ok(shell_execute_cmd(get_ec_shell(), "kbpress 1 2"), NULL); + + /* Hold a key down */ + zassert_ok(shell_execute_cmd(get_ec_shell(), "kbpress 3 4 1"), NULL); + + /* Release the key */ + zassert_ok(shell_execute_cmd(get_ec_shell(), "kbpress 3 4 0"), NULL); + + /* Pause a bit to allow the key scan task to process. */ + k_sleep(K_MSEC(200)); + + /* Expect four key events */ + zassert_equal(4, key_state_changed_fake.call_count, NULL); + + /* Press col=1,row=2 (state==1) */ + zassert_equal(1, key_state_changed_fake.arg1_history[0], NULL); + zassert_equal(2, key_state_changed_fake.arg0_history[0], NULL); + zassert_true(key_state_changed_fake.arg2_history[0], NULL); + + /* Release col=1,row=2 (state==0) */ + zassert_equal(1, key_state_changed_fake.arg1_history[1], NULL); + zassert_equal(2, key_state_changed_fake.arg0_history[1], NULL); + zassert_false(key_state_changed_fake.arg2_history[1], NULL); + + /* Press col=3,row=4 (state==1) */ + zassert_equal(3, key_state_changed_fake.arg1_history[2], NULL); + zassert_equal(4, key_state_changed_fake.arg0_history[2], NULL); + zassert_true(key_state_changed_fake.arg2_history[2], NULL); + + /* Release col=3,row=4 (state==0) */ + zassert_equal(3, key_state_changed_fake.arg1_history[3], NULL); + zassert_equal(4, key_state_changed_fake.arg0_history[3], NULL); + zassert_false(key_state_changed_fake.arg2_history[3], NULL); +} + +ZTEST(keyboard_scan, host_command_simulate_key__locked) +{ + uint16_t ret; + + zassume_true(system_is_locked(), "Expecting locked system."); + + struct ec_response_keyboard_factory_test response; + struct ec_params_mkbp_simulate_key params; + struct host_cmd_handler_args args = BUILD_HOST_COMMAND( + EC_CMD_MKBP_SIMULATE_KEY, 0, response, params); + + ret = host_command_process(&args); + zassert_equal(EC_RES_ACCESS_DENIED, ret, "Command returned %u", ret); +} + +ZTEST(keyboard_scan, host_command_simulate_key__bad_params) +{ + uint16_t ret; + + system_is_locked_fake.return_val = 0; + zassume_false(system_is_locked(), "Expecting unlocked system."); + + struct ec_response_keyboard_factory_test response; + struct ec_params_mkbp_simulate_key params = { + .col = KEYBOARD_COLS_MAX, + .row = KEYBOARD_ROWS, + }; + struct host_cmd_handler_args args = BUILD_HOST_COMMAND( + EC_CMD_MKBP_SIMULATE_KEY, 0, response, params); + + ret = host_command_process(&args); + zassert_equal(EC_RES_INVALID_PARAM, ret, "Command returned %u", ret); +} + +/** + * @brief Helper function that sends a host command to press or release the + * specified key. + * + * @param col Key column + * @param row Key row + * @param pressed 1=press, 0=release + * @return uint16_t Host command return code. + */ +static uint16_t send_keypress_host_command(uint8_t col, uint8_t row, + uint8_t pressed) +{ + struct ec_params_mkbp_simulate_key params = { + .col = col, + .row = row, + .pressed = pressed, + }; + struct host_cmd_handler_args args = + BUILD_HOST_COMMAND_PARAMS(EC_CMD_MKBP_SIMULATE_KEY, 0, params); + + return host_command_process(&args); +} + +ZTEST(keyboard_scan, host_command_simulate__key_press) +{ + uint16_t ret; + + system_is_locked_fake.return_val = 0; + zassume_false(system_is_locked(), "Expecting unlocked system."); + + ret = send_keypress_host_command(1, 2, 1); + zassert_equal(EC_RES_SUCCESS, ret, "Command returned %u", ret); + + /* Release the key */ + ret = send_keypress_host_command(1, 2, 0); + zassert_equal(EC_RES_SUCCESS, ret, "Command returned %u", ret); + + /* Verify key events happened */ + + zassert_equal(2, key_state_changed_fake.call_count, NULL); + + /* Press col=1,row=2 (state==1) */ + zassert_equal(1, key_state_changed_fake.arg1_history[0], NULL); + zassert_equal(2, key_state_changed_fake.arg0_history[0], NULL); + zassert_true(key_state_changed_fake.arg2_history[0], NULL); + + /* Release col=1,row=2 (state==0) */ + zassert_equal(1, key_state_changed_fake.arg1_history[1], NULL); + zassert_equal(2, key_state_changed_fake.arg0_history[1], NULL); + zassert_false(key_state_changed_fake.arg2_history[1], NULL); +} + +FAKE_VOID_FUNC(system_enter_hibernate, uint32_t, uint32_t); +FAKE_VOID_FUNC(chipset_reset, int); + +ZTEST(keyboard_scan, special_key_combos) +{ + system_is_locked_fake.return_val = 0; + zassume_false(system_is_locked(), "Expecting unlocked system."); + + /* Set the volume up key coordinates to something arbitrary */ + int vol_up_col = 1; + int vol_up_row = 2; + + set_vol_up_key(vol_up_row, vol_up_col); + + /* Vol up and the alt keys must be in different columns */ + zassume_false(vol_up_col == KEYBOARD_COL_LEFT_ALT, NULL); + + /* Hold down volume up, left alt (either alt key works), and R */ + zassert_ok(send_keypress_host_command(vol_up_col, vol_up_row, 1), NULL); + zassert_ok(send_keypress_host_command(KEYBOARD_COL_LEFT_ALT, + KEYBOARD_ROW_LEFT_ALT, 1), + NULL); + zassert_ok(send_keypress_host_command(KEYBOARD_COL_KEY_R, + KEYBOARD_ROW_KEY_R, 1), + NULL); + + k_sleep(K_MSEC(100)); + + /* Release R and the press H */ + zassert_ok(send_keypress_host_command(KEYBOARD_COL_KEY_R, + KEYBOARD_ROW_KEY_R, 0), + NULL); + zassert_ok(send_keypress_host_command(KEYBOARD_COL_KEY_H, + KEYBOARD_ROW_KEY_H, 1), + NULL); + + k_sleep(K_MSEC(100)); + + /* Release all */ + zassert_ok(send_keypress_host_command(vol_up_col, vol_up_row, 0), NULL); + zassert_ok(send_keypress_host_command(KEYBOARD_COL_LEFT_ALT, + KEYBOARD_ROW_LEFT_ALT, 0), + NULL); + zassert_ok(send_keypress_host_command(KEYBOARD_COL_KEY_H, + KEYBOARD_ROW_KEY_H, 0), + NULL); + + /* Check that a reboot was requested (VOLUP + ALT + R) */ + zassert_equal(1, chipset_reset_fake.call_count, + "Did not try to reboot"); + zassert_equal(CHIPSET_RESET_KB_WARM_REBOOT, + chipset_reset_fake.arg0_history[0], NULL); + + /* Check that we called system_enter_hibernate (VOLUP + ALT + H) */ + zassert_equal(1, system_enter_hibernate_fake.call_count, + "Did not enter hibernate"); +} + +static void reset_keyboard(void *data) +{ + ARG_UNUSED(data); + + /* Enable scanning and clear all reason bits (reason bits explain why + * scanning was disabled -- see `enum kb_scan_disable_masks`) + */ + keyboard_scan_enable(true, -1); + + /* Turn off key state change printing */ + keyboard_scan_set_print_state_changes(0); + + /* Reset all mocks. */ + RESET_FAKE(key_state_changed); + RESET_FAKE(system_is_locked); + RESET_FAKE(system_enter_hibernate); + RESET_FAKE(chipset_reset); + + /* Be locked by default */ + system_is_locked_fake.return_val = 1; +} + +ZTEST_SUITE(keyboard_scan, drivers_predicate_post_main, NULL, reset_keyboard, + reset_keyboard, NULL); diff --git a/zephyr/test/drivers/keyboard_scan/src/mkbp_event.c b/zephyr/test/drivers/keyboard_scan/src/mkbp_event.c new file mode 100644 index 0000000000..40fd4ff457 --- /dev/null +++ b/zephyr/test/drivers/keyboard_scan/src/mkbp_event.c @@ -0,0 +1,99 @@ +/* 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. + */ +#include <zephyr/ztest.h> +#include <zephyr/drivers/emul.h> +#include <zephyr/drivers/gpio.h> +#include <zephyr/drivers/gpio/gpio_emul.h> +#include <zephyr/fff.h> +#include <emul/emul_kb_raw.h> + +#include "console.h" +#include "host_command.h" +#include "mkbp_event.h" +#include "test/drivers/test_mocks.h" +#include "test/drivers/test_state.h" + +ZTEST(mkbp_event, host_command_get_events__empty) +{ + /* Issue a host command to get the next event (from any source) */ + uint16_t ret; + struct ec_response_get_next_event response; + struct host_cmd_handler_args args = + BUILD_HOST_COMMAND_RESPONSE(EC_CMD_GET_NEXT_EVENT, 0, response); + + ret = host_command_process(&args); + zassert_equal(EC_RES_UNAVAILABLE, ret, + "Expected EC_RES_UNAVAILABLE but got %d", ret); +} + +ZTEST(mkbp_event, host_command_get_events__get_event) +{ + /* Dispatch a fake keyboard event and ensure it gets returned by the + * host command. + */ + int ret; + + struct ec_response_get_next_event expected_event = { + .event_type = EC_MKBP_EVENT_KEY_MATRIX, + .data.key_matrix = { + /* Arbitrary key matrix data (uint8_t[13]) */ + 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb, + 0xc, 0xd + }, + }; + + /* Add the above event to the MKBP keyboard FIFO and raise the event */ + + ret = mkbp_fifo_add(expected_event.event_type, + &expected_event.data.key_matrix); + activate_mkbp_with_events(BIT(expected_event.event_type)); + + zassert_equal(EC_SUCCESS, ret, "Got %d when adding to FIFO", ret); + + /* Retrieve this event via host command */ + + struct ec_response_get_next_event response; + struct host_cmd_handler_args args = + BUILD_HOST_COMMAND_RESPONSE(EC_CMD_GET_NEXT_EVENT, 0, response); + + ret = host_command_process(&args); + zassert_equal(EC_RES_SUCCESS, ret, "Expected EC_RES_SUCCESS but got %d", + ret); + + /* Compare event data in response */ + zassert_equal(expected_event.event_type, response.event_type, + "Got event type 0x%02x", response.event_type); + zassert_mem_equal(&expected_event.data.key_matrix, + &response.data.key_matrix, + sizeof(expected_event.data.key_matrix), + "Event data payload does not match."); +} + +/* Set up a mock for mkbp_send_event(). This function is called by the MKBP + * event sources to signal that a new event is available for servicing. Since we + * are unit testing just event handling code, we do not want the various event + * source tasks to raise unexpected events during testing and throw us off. + * This mock will essentially cause mkbp_send_event() to become a no-op and + * block the reset of the EC code from raising events and interfering. The test + * code will bypass this by calling mkbp_event.c's internal + * `activate_mkbp_with_events()` directly. + */ +FAKE_VALUE_FUNC(int, mkbp_send_event, uint8_t); + +static void reset_events(void *data) +{ + /* Clear any keyboard scan events (type EC_MKBP_EVENT_KEY_MATRIX) */ + mkbp_clear_fifo(); + + /* Clear pending events */ + mkbp_event_clear_all(); + + /* Mock reset */ + RESET_FAKE(mkbp_send_event); + mkbp_send_event_fake.return_val = 1; +} + +ZTEST_SUITE(mkbp_event, drivers_predicate_post_main, NULL, reset_events, + reset_events, NULL); diff --git a/zephyr/test/drivers/led_driver/CMakeLists.txt b/zephyr/test/drivers/led_driver/CMakeLists.txt index 3e4f48724d..333785e4df 100644 --- a/zephyr/test/drivers/led_driver/CMakeLists.txt +++ b/zephyr/test/drivers/led_driver/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/zephyr/test/drivers/led_driver/led_pins.dts b/zephyr/test/drivers/led_driver/led_pins.dts index 2378d79803..f1488a59d8 100644 --- a/zephyr/test/drivers/led_driver/led_pins.dts +++ b/zephyr/test/drivers/led_driver/led_pins.dts @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/drivers/led_driver/led_policy.dts b/zephyr/test/drivers/led_driver/led_policy.dts index cc4dc19ead..fb6d37cb05 100644 --- a/zephyr/test/drivers/led_driver/led_policy.dts +++ b/zephyr/test/drivers/led_driver/led_policy.dts @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/drivers/led_driver/prj.conf b/zephyr/test/drivers/led_driver/prj.conf index abdb8cc6a1..6ab9702320 100644 --- a/zephyr/test/drivers/led_driver/prj.conf +++ b/zephyr/test/drivers/led_driver/prj.conf @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/zephyr/test/drivers/led_driver/src/led.c b/zephyr/test/drivers/led_driver/src/led.c index b5a4a48037..7dfaa32bbb 100644 --- a/zephyr/test/drivers/led_driver/src/led.c +++ b/zephyr/test/drivers/led_driver/src/led.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/drivers/mkbp/CMakeLists.txt b/zephyr/test/drivers/mkbp/CMakeLists.txt new file mode 100644 index 0000000000..decd3ec0a7 --- /dev/null +++ b/zephyr/test/drivers/mkbp/CMakeLists.txt @@ -0,0 +1,6 @@ +# 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. + +# Add source files +target_sources(app PRIVATE src/mkbp_fifo.c) diff --git a/zephyr/test/drivers/mkbp/src/mkbp_fifo.c b/zephyr/test/drivers/mkbp/src/mkbp_fifo.c new file mode 100644 index 0000000000..e6a6ba5f04 --- /dev/null +++ b/zephyr/test/drivers/mkbp/src/mkbp_fifo.c @@ -0,0 +1,102 @@ +/* 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. + */ + +#include <zephyr/ztest.h> +#include <zephyr/drivers/emul.h> +#include <zephyr/kernel.h> +#include <zephyr/ztest_assert.h> +#include <zephyr/drivers/i2c_emul.h> + +#include "keyboard_config.h" +#include "mkbp_fifo.h" +#include "test/drivers/test_state.h" + +/* Tests for Matrix Keyboard Protocol (MKBP) */ + +/* Largest event size that we support */ +#define KEY_MATRIX_EVENT_DATA_SIZE KEYBOARD_COLS_MAX + +#define MAX_EVENT_DATA_SIZE KEY_MATRIX_EVENT_DATA_SIZE + +struct mkbp_fifo_fixture { + uint8_t input_event_data[MAX_EVENT_DATA_SIZE]; +}; + +static void *mkbp_fifo_setup(void) +{ + static struct mkbp_fifo_fixture fixture; + + return &fixture; +} + +static void mkbp_fifo_before(void *data) +{ + struct mkbp_fifo_fixture *fixture = data; + + mkbp_clear_fifo(); + memset(fixture->input_event_data, 0, MAX_EVENT_DATA_SIZE); + mkbp_fifo_depth_update(FIFO_DEPTH); +} + +static void mkbp_fifo_after(void *data) +{ + mkbp_clear_fifo(); + mkbp_fifo_depth_update(FIFO_DEPTH); +} + +static void fill_array_with_incrementing_numbers(int8_t *dst, int size) +{ + for (int i = 0; i < size; i++) { + dst[i] = i; + } +} + +ZTEST_F(mkbp_fifo, test_fifo_add_keyboard_key_matrix_event) +{ + uint8_t out[KEY_MATRIX_EVENT_DATA_SIZE + 1]; + + memset(out, 0, sizeof(out)); + + fill_array_with_incrementing_numbers(fixture->input_event_data, + KEY_MATRIX_EVENT_DATA_SIZE); + + /* Keyboard Key Matrix Event */ + zassert_ok(mkbp_fifo_add(EC_MKBP_EVENT_KEY_MATRIX, + fixture->input_event_data), + NULL); + + int dequeued_data_size = + mkbp_fifo_get_next_event(out, EC_MKBP_EVENT_KEY_MATRIX); + + zassert_equal(dequeued_data_size, KEY_MATRIX_EVENT_DATA_SIZE, NULL); + zassert_mem_equal(fixture->input_event_data, out, + KEY_MATRIX_EVENT_DATA_SIZE, NULL); + zassert_equal(out[KEY_MATRIX_EVENT_DATA_SIZE], 0, NULL); +} + +ZTEST_F(mkbp_fifo, test_fifo_depth_update) +{ + uint8_t out[KEY_MATRIX_EVENT_DATA_SIZE + 1]; + uint8_t new_depth = 0; + + mkbp_fifo_depth_update(new_depth); + fill_array_with_incrementing_numbers(fixture->input_event_data, + MAX_EVENT_DATA_SIZE); + zassert_equal(EC_ERROR_OVERFLOW, + mkbp_fifo_add(EC_MKBP_EVENT_KEY_MATRIX, + fixture->input_event_data), + NULL); + zassert_equal(-1, /* get_next_event explicitly returns -1 */ + mkbp_fifo_get_next_event(out, EC_MKBP_EVENT_KEY_MATRIX), + NULL); + + mkbp_fifo_depth_update(FIFO_DEPTH); + zassert_ok(mkbp_fifo_add(EC_MKBP_EVENT_KEY_MATRIX, + fixture->input_event_data), + NULL); +} + +ZTEST_SUITE(mkbp_fifo, drivers_predicate_post_main, mkbp_fifo_setup, + mkbp_fifo_before, mkbp_fifo_after, NULL); diff --git a/zephyr/test/drivers/prj.conf b/zephyr/test/drivers/prj.conf index ac4867cbd9..70b73dd645 100644 --- a/zephyr/test/drivers/prj.conf +++ b/zephyr/test/drivers/prj.conf @@ -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. @@ -64,6 +64,7 @@ CONFIG_EMUL_TCS3400=y CONFIG_EMUL_BB_RETIMER=y CONFIG_EMUL_TCPCI=y CONFIG_EMUL_PS8XXX=y +CONFIG_EMUL_RTC=y CONFIG_EMUL_TCPCI_PARTNER_DRP=y CONFIG_EMUL_TCPCI_PARTNER_FAULTY_EXT=y CONFIG_PLATFORM_EC_CHARGE_MANAGER=y @@ -183,3 +184,6 @@ CONFIG_PLATFORM_EC_CONSOLE_CMD_MD=y CONFIG_PLATFORM_EC_LID_ANGLE=y CONFIG_PLATFORM_EC_TABLET_MODE=y + +# Power Management (Herobrine arch enables this) +CONFIG_PM=y
\ No newline at end of file diff --git a/zephyr/test/drivers/testcase.yaml b/zephyr/test/drivers/testcase.yaml index 34139dbf7a..22888a2cfb 100644 --- a/zephyr/test/drivers/testcase.yaml +++ b/zephyr/test/drivers/testcase.yaml @@ -47,10 +47,20 @@ tests: extra_configs: - CONFIG_LINK_TEST_SUITE_ISL923X=y - CONFIG_POWER_SEQUENCE_MOCK=y + drivers.keyboard_scan: + extra_configs: + - CONFIG_LINK_TEST_SUITE_KEYBOARD_SCAN=y drivers.led_driver: extra_args: CONF_FILE="prj.conf;led_driver/prj.conf" DTC_OVERLAY_FILE="./boards/native_posix.overlay;./led_driver/led_pins.dts;./led_driver/led_policy.dts" extra_configs: - CONFIG_LINK_TEST_SUITE_LED_DRIVER=y + drivers.mkbp: + extra_configs: + - CONFIG_LINK_TEST_SUITE_MKBP=y + - CONFIG_PLATFORM_EC_KEYBOARD_PROTOCOL_MKBP=y + - CONFIG_PLATFORM_EC_MKBP_INPUT_DEVICES=y + - CONFIG_PLATFORM_EC_MKBP_EVENT=y + - CONFIG_PLATFORM_EC_MKBP_USE_GPIO=y drivers.usb_retimer_fw_update: extra_args: CONF_FILE="prj.conf;usb_retimer_fw_update/prj.conf" extra_configs: diff --git a/zephyr/test/drivers/usb_malfunction_sink/CMakeLists.txt b/zephyr/test/drivers/usb_malfunction_sink/CMakeLists.txt index 719366cb86..2e247726f0 100644 --- a/zephyr/test/drivers/usb_malfunction_sink/CMakeLists.txt +++ b/zephyr/test/drivers/usb_malfunction_sink/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/zephyr/test/drivers/usb_malfunction_sink/src/usb_malfunction_sink.c b/zephyr/test/drivers/usb_malfunction_sink/src/usb_malfunction_sink.c index 3999bec6b9..38ce979594 100644 --- a/zephyr/test/drivers/usb_malfunction_sink/src/usb_malfunction_sink.c +++ b/zephyr/test/drivers/usb_malfunction_sink/src/usb_malfunction_sink.c @@ -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. */ diff --git a/zephyr/test/drivers/usb_retimer_fw_update/CMakeLists.txt b/zephyr/test/drivers/usb_retimer_fw_update/CMakeLists.txt index b891d0b2b8..786726414b 100644 --- a/zephyr/test/drivers/usb_retimer_fw_update/CMakeLists.txt +++ b/zephyr/test/drivers/usb_retimer_fw_update/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/zephyr/test/drivers/usb_retimer_fw_update/prj.conf b/zephyr/test/drivers/usb_retimer_fw_update/prj.conf index 4318a6f9cb..de54617e71 100644 --- a/zephyr/test/drivers/usb_retimer_fw_update/prj.conf +++ b/zephyr/test/drivers/usb_retimer_fw_update/prj.conf @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/zephyr/test/drivers/usb_retimer_fw_update/src/usb_retimer_fw_update.c b/zephyr/test/drivers/usb_retimer_fw_update/src/usb_retimer_fw_update.c index efc48d1f20..9a360761ab 100644 --- a/zephyr/test/drivers/usb_retimer_fw_update/src/usb_retimer_fw_update.c +++ b/zephyr/test/drivers/usb_retimer_fw_update/src/usb_retimer_fw_update.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/drivers/usbc_alt_mode/CMakeLists.txt b/zephyr/test/drivers/usbc_alt_mode/CMakeLists.txt index 1093c92968..6bb0c90ed8 100644 --- a/zephyr/test/drivers/usbc_alt_mode/CMakeLists.txt +++ b/zephyr/test/drivers/usbc_alt_mode/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/zephyr/test/drivers/usbc_alt_mode/src/usbc_alt_mode.c b/zephyr/test/drivers/usbc_alt_mode/src/usbc_alt_mode.c index 3a356d85a1..b5866d6b7d 100644 --- a/zephyr/test/drivers/usbc_alt_mode/src/usbc_alt_mode.c +++ b/zephyr/test/drivers/usbc_alt_mode/src/usbc_alt_mode.c @@ -1,10 +1,10 @@ -/* 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. */ #include <stdint.h> -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/ztest.h> #include <zephyr/drivers/gpio/gpio_emul.h> diff --git a/zephyr/test/drivers/usbc_tbt_mode/CMakeLists.txt b/zephyr/test/drivers/usbc_tbt_mode/CMakeLists.txt index 6d884a26bf..05eddf9c69 100644 --- a/zephyr/test/drivers/usbc_tbt_mode/CMakeLists.txt +++ b/zephyr/test/drivers/usbc_tbt_mode/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/zephyr/test/drivers/usbc_tbt_mode/src/usbc_tbt_mode.c b/zephyr/test/drivers/usbc_tbt_mode/src/usbc_tbt_mode.c index c943eaabf6..66a145c475 100644 --- a/zephyr/test/drivers/usbc_tbt_mode/src/usbc_tbt_mode.c +++ b/zephyr/test/drivers/usbc_tbt_mode/src/usbc_tbt_mode.c @@ -1,10 +1,10 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ #include <stdint.h> -#include <zephyr/zephyr.h> +#include <zephyr/kernel.h> #include <zephyr/sys/byteorder.h> #include <zephyr/ztest.h> diff --git a/zephyr/test/ec_app/CMakeLists.txt b/zephyr/test/ec_app/CMakeLists.txt index cdcf9d1482..83daf93e67 100644 --- a/zephyr/test/ec_app/CMakeLists.txt +++ b/zephyr/test/ec_app/CMakeLists.txt @@ -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. diff --git a/zephyr/test/ec_app/boards/native_posix.overlay b/zephyr/test/ec_app/boards/native_posix.overlay index e457cb9ba7..69bf044ec6 100644 --- a/zephyr/test/ec_app/boards/native_posix.overlay +++ b/zephyr/test/ec_app/boards/native_posix.overlay @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/zephyr/test/ec_app/prj.conf b/zephyr/test/ec_app/prj.conf index a3fcbd082a..3b44c56b6b 100644 --- a/zephyr/test/ec_app/prj.conf +++ b/zephyr/test/ec_app/prj.conf @@ -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. diff --git a/zephyr/test/ec_app/src/main.c b/zephyr/test/ec_app/src/main.c index 42798f1201..b106754d47 100644 --- a/zephyr/test/ec_app/src/main.c +++ b/zephyr/test/ec_app/src/main.c @@ -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. */ diff --git a/zephyr/test/hooks/CMakeLists.txt b/zephyr/test/hooks/CMakeLists.txt index f19d93644e..99b0b3f430 100644 --- a/zephyr/test/hooks/CMakeLists.txt +++ b/zephyr/test/hooks/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/test/hooks/boards/native_posix.overlay b/zephyr/test/hooks/boards/native_posix.overlay index fe96518269..90c864d2fd 100644 --- a/zephyr/test/hooks/boards/native_posix.overlay +++ b/zephyr/test/hooks/boards/native_posix.overlay @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/zephyr/test/hooks/hooks.c b/zephyr/test/hooks/hooks.c index ae6f6b63ab..7d784aa65f 100644 --- a/zephyr/test/hooks/hooks.c +++ b/zephyr/test/hooks/hooks.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/zephyr/test/hooks/prj.conf b/zephyr/test/hooks/prj.conf index 56227c3812..cab9107094 100644 --- a/zephyr/test/hooks/prj.conf +++ b/zephyr/test/hooks/prj.conf @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/test/i2c/CMakeLists.txt b/zephyr/test/i2c/CMakeLists.txt index 4fa96d0bad..4b355c4932 100644 --- a/zephyr/test/i2c/CMakeLists.txt +++ b/zephyr/test/i2c/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/test/i2c/boards/native_posix.overlay b/zephyr/test/i2c/boards/native_posix.overlay index 8dff15ffe0..e78c5d0faa 100644 --- a/zephyr/test/i2c/boards/native_posix.overlay +++ b/zephyr/test/i2c/boards/native_posix.overlay @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/zephyr/test/i2c/prj.conf b/zephyr/test/i2c/prj.conf index 69c276712e..ee6c43f51a 100644 --- a/zephyr/test/i2c/prj.conf +++ b/zephyr/test/i2c/prj.conf @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/test/i2c/src/main.c b/zephyr/test/i2c/src/main.c index e7831b0ec4..364353f06d 100644 --- a/zephyr/test/i2c/src/main.c +++ b/zephyr/test/i2c/src/main.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/zephyr/test/i2c_dts/CMakeLists.txt b/zephyr/test/i2c_dts/CMakeLists.txt index 6ff71d72fb..3e36468a33 100644 --- a/zephyr/test/i2c_dts/CMakeLists.txt +++ b/zephyr/test/i2c_dts/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/test/i2c_dts/boards/native_posix.overlay b/zephyr/test/i2c_dts/boards/native_posix.overlay index 747085814e..0abd2f1f31 100644 --- a/zephyr/test/i2c_dts/boards/native_posix.overlay +++ b/zephyr/test/i2c_dts/boards/native_posix.overlay @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/zephyr/test/i2c_dts/prj.conf b/zephyr/test/i2c_dts/prj.conf index 6f19b3a8a4..6c008faf64 100644 --- a/zephyr/test/i2c_dts/prj.conf +++ b/zephyr/test/i2c_dts/prj.conf @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/zephyr/test/i2c_dts/src/main.c b/zephyr/test/i2c_dts/src/main.c index 122916f153..1557eaf9e9 100644 --- a/zephyr/test/i2c_dts/src/main.c +++ b/zephyr/test/i2c_dts/src/main.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/zephyr/test/kingler/CMakeLists.txt b/zephyr/test/kingler/CMakeLists.txt index b8e6cd5b8a..b572e67fb5 100644 --- a/zephyr/test/kingler/CMakeLists.txt +++ b/zephyr/test/kingler/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/zephyr/test/kingler/Kconfig b/zephyr/test/kingler/Kconfig index 2d66b9f99b..af52042cb6 100644 --- a/zephyr/test/kingler/Kconfig +++ b/zephyr/test/kingler/Kconfig @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/zephyr/test/kingler/common.dts b/zephyr/test/kingler/common.dts index fea1bbcfd5..e065da896a 100644 --- a/zephyr/test/kingler/common.dts +++ b/zephyr/test/kingler/common.dts @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/kingler/prj.conf b/zephyr/test/kingler/prj.conf index e9f5c8b89f..dfa1c68d4d 100644 --- a/zephyr/test/kingler/prj.conf +++ b/zephyr/test/kingler/prj.conf @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/zephyr/test/kingler/src/clamshell.c b/zephyr/test/kingler/src/clamshell.c index faa340add0..88595cc114 100644 --- a/zephyr/test/kingler/src/clamshell.c +++ b/zephyr/test/kingler/src/clamshell.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/kingler/src/db_detect_hdmi.c b/zephyr/test/kingler/src/db_detect_hdmi.c index 2b0f0bc35e..35cf92ae5e 100644 --- a/zephyr/test/kingler/src/db_detect_hdmi.c +++ b/zephyr/test/kingler/src/db_detect_hdmi.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/kingler/src/db_detect_none.c b/zephyr/test/kingler/src/db_detect_none.c index dbcefaab5a..9f37db04af 100644 --- a/zephyr/test/kingler/src/db_detect_none.c +++ b/zephyr/test/kingler/src/db_detect_none.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/kingler/src/db_detect_typec.c b/zephyr/test/kingler/src/db_detect_typec.c index c158996a4b..53716fe552 100644 --- a/zephyr/test/kingler/src/db_detect_typec.c +++ b/zephyr/test/kingler/src/db_detect_typec.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/kingler/src/fakes.c b/zephyr/test/kingler/src/fakes.c index 11cfe1ebfc..cbf6c8d98c 100644 --- a/zephyr/test/kingler/src/fakes.c +++ b/zephyr/test/kingler/src/fakes.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/kingler/src/tablet.c b/zephyr/test/kingler/src/tablet.c index 694cea3577..68be2b2b68 100644 --- a/zephyr/test/kingler/src/tablet.c +++ b/zephyr/test/kingler/src/tablet.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/kingler/testcase.yaml b/zephyr/test/kingler/testcase.yaml index 3ff77cb592..1d6c1bd0a8 100644 --- a/zephyr/test/kingler/testcase.yaml +++ b/zephyr/test/kingler/testcase.yaml @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/zephyr/test/krabby/CMakeLists.txt b/zephyr/test/krabby/CMakeLists.txt new file mode 100644 index 0000000000..eba91a7be4 --- /dev/null +++ b/zephyr/test/krabby/CMakeLists.txt @@ -0,0 +1,14 @@ +# 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. + +cmake_minimum_required(VERSION 3.13.1) +find_package(Zephyr REQUIRED HINTS "${ZEPHYR_BASE}") +project(krabby) + +zephyr_include_directories("${PLATFORM_EC}/zephyr/projects/corsola/include") + +target_sources(app PRIVATE + src/charger_workaround.c + src/stubs.c + ${PLATFORM_EC}/zephyr/projects/corsola/src/krabby/charger_workaround.c) diff --git a/zephyr/test/krabby/README.md b/zephyr/test/krabby/README.md new file mode 100644 index 0000000000..8262d85fcc --- /dev/null +++ b/zephyr/test/krabby/README.md @@ -0,0 +1,3 @@ +Tests for board specific code under `zephyr/projects/corsola/src/krabby`. + +Run with ./twister -T zephyr/test/krabby diff --git a/zephyr/test/krabby/common.dts b/zephyr/test/krabby/common.dts new file mode 100644 index 0000000000..d9f1a4f463 --- /dev/null +++ b/zephyr/test/krabby/common.dts @@ -0,0 +1,70 @@ +/* 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. + */ + +#include <it8xxx2_emul.dts> + +/ { + pinctrl: pinctrl { + compatible = "ite,it8xxx2-pinctrl"; + status = "disabled"; + }; + + named-i2c-ports { + compatible = "named-i2c-ports"; + + i2c_charger: charger { + i2c-port = <&i2c_ctrl0>; + enum-names = "I2C_PORT_CHARGER", + "I2C_PORT_BATTERY"; + }; + }; + + usbc { + #address-cells = <1>; + #size-cells = <0>; + + port0@0 { + compatible = "named-usbc-port"; + status = "okay"; + reg = <0>; + chg = <&charger>; + tcpc = <&tcpci_emul>; + }; + }; + + batteries { + default_battery: lgc_ac17a8m { + compatible = "lgc,ac17a8m", "battery-smart"; + }; + }; +}; + +&i2c_ctrl0 { + status="okay"; + + charger: rt9490@53 { + compatible = "zephyr,rt9490-emul"; + status = "okay"; + reg = <0x53>; + }; + + battery: sb@b { + compatible = "zephyr,smart-battery"; + reg = <0xb>; + cycle-count = <99>; + version = "BATTERY_SPEC_VER_1_1_WITH_PEC"; + /* Real battery voltages are multiples of 4.4V. */ + desired-charg-volt = <5000>; + desired-charg-cur = <1000>; + mf-name = "LGC"; + dev-name = "AC17A8M"; + }; + + tcpci_emul: tcpci_emul@82 { + compatible = "cros,tcpci-generic-emul"; + status = "okay"; + reg = <0x82>; + }; +}; diff --git a/zephyr/test/krabby/pinctrl.dts b/zephyr/test/krabby/pinctrl.dts new file mode 100644 index 0000000000..9d01591238 --- /dev/null +++ b/zephyr/test/krabby/pinctrl.dts @@ -0,0 +1,7 @@ +/* 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. + */ + +/* remove pinctrl to avoid pull in too many unwanted dependency */ +/delete-node/ &pinctrl; diff --git a/zephyr/test/krabby/prj.conf b/zephyr/test/krabby/prj.conf new file mode 100644 index 0000000000..25bc89c33a --- /dev/null +++ b/zephyr/test/krabby/prj.conf @@ -0,0 +1,36 @@ +# 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. + +CONFIG_ZTEST=y +CONFIG_ZTEST_ASSERT_VERBOSE=1 +CONFIG_ZTEST_NEW_API=y + +CONFIG_ASSERT=y +CONFIG_CROS_EC=y +CONFIG_EMUL=y +CONFIG_EMUL_RT9490=y +CONFIG_EMUL_SMART_BATTERY=y +CONFIG_EMUL_TCPCI=y +CONFIG_I2C=y +CONFIG_I2C_EMUL=y +CONFIG_SHIMMED_TASKS=y + +CONFIG_PLATFORM_EC=y +CONFIG_PLATFORM_EC_BACKLIGHT_LID=n +CONFIG_PLATFORM_EC_BATTERY=y +CONFIG_PLATFORM_EC_BATTERY_FUEL_GAUGE=y +CONFIG_PLATFORM_EC_BATTERY_PRESENT_GPIO=y +CONFIG_PLATFORM_EC_CHARGER=y +CONFIG_PLATFORM_EC_CHARGER_RT9490=y +CONFIG_PLATFORM_EC_CHARGER_SENSE_RESISTOR=10 +CONFIG_PLATFORM_EC_CHARGER_SENSE_RESISTOR_AC=20 +CONFIG_PLATFORM_EC_CHARGE_MANAGER=n +CONFIG_PLATFORM_EC_HOOKS=y +CONFIG_PLATFORM_EC_HOSTCMD=y +CONFIG_PLATFORM_EC_LID_SWITCH=n +CONFIG_PLATFORM_EC_SWITCH=n +CONFIG_PLATFORM_EC_USBC=n +CONFIG_PLATFORM_EC_USB_CHARGER=n +CONFIG_PLATFORM_EC_USB_POWER_DELIVERY=n +CONFIG_PLATFORM_EC_VBOOT_HASH=n diff --git a/zephyr/test/krabby/src/charger_workaround.c b/zephyr/test/krabby/src/charger_workaround.c new file mode 100644 index 0000000000..97aa4328c8 --- /dev/null +++ b/zephyr/test/krabby/src/charger_workaround.c @@ -0,0 +1,98 @@ +/* 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. + */ + +#include <zephyr/devicetree.h> +#include <zephyr/drivers/emul.h> +#include <zephyr/fff.h> +#include <zephyr/ztest.h> + +#include "charger.h" +#include "driver/charger/rt9490.h" +#include "emul/emul_rt9490.h" +#include "hooks.h" +#include "i2c.h" +#include "system.h" + +DEFINE_FFF_GLOBALS; + +FAKE_VALUE_FUNC(int, board_get_version); + +const struct emul *emul = EMUL_DT_GET(DT_NODELABEL(charger)); + +static bool ibus_adc_workaround_called(void) +{ + return rt9490_emul_peek_reg(emul, 0x52) == 0xC4; +} + +static bool i2c_speed_workaround_called(void) +{ + return rt9490_emul_peek_reg(emul, 0x71) == 0x22; +} + +static bool eoc_deglitch_workaround_called(void) +{ + return !(rt9490_emul_peek_reg(emul, RT9490_REG_ADD_CTRL0) & + RT9490_TD_EOC); +} + +static bool disable_safety_timer_called(void) +{ + return rt9490_emul_peek_reg(emul, RT9490_REG_SAFETY_TMR_CTRL) == + (RT9490_EN_TRICHG_TMR | RT9490_EN_PRECHG_TMR | + RT9490_EN_FASTCHG_TMR); +} + +ZTEST(charger_workaround, test_board_version_0) +{ + board_get_version_fake.return_val = 0; + + hook_notify(HOOK_INIT); + zassert_true(ibus_adc_workaround_called(), NULL); + zassert_true(i2c_speed_workaround_called(), NULL); + zassert_false(eoc_deglitch_workaround_called(), NULL); + zassert_true(disable_safety_timer_called(), NULL); +} + +ZTEST(charger_workaround, test_board_version_1) +{ + board_get_version_fake.return_val = 1; + + hook_notify(HOOK_INIT); + zassert_false(ibus_adc_workaround_called(), NULL); + zassert_true(i2c_speed_workaround_called(), NULL); + zassert_true(eoc_deglitch_workaround_called(), NULL); + zassert_true(disable_safety_timer_called(), NULL); +} + +ZTEST(charger_workaround, test_board_version_2) +{ + board_get_version_fake.return_val = 2; + + hook_notify(HOOK_INIT); + zassert_false(ibus_adc_workaround_called(), NULL); + zassert_true(i2c_speed_workaround_called(), NULL); + zassert_false(eoc_deglitch_workaround_called(), NULL); + zassert_false(disable_safety_timer_called(), NULL); +} + +ZTEST(charger_workaround, test_board_version_3) +{ + board_get_version_fake.return_val = 3; + + hook_notify(HOOK_INIT); + zassert_false(ibus_adc_workaround_called(), NULL); + zassert_false(i2c_speed_workaround_called(), NULL); + zassert_false(eoc_deglitch_workaround_called(), NULL); + zassert_false(disable_safety_timer_called(), NULL); +} + +static void charge_workaround_before(void *fixture) +{ + RESET_FAKE(board_get_version); + rt9490_emul_reset_regs(emul); +} + +ZTEST_SUITE(charger_workaround, NULL, NULL, charge_workaround_before, NULL, + NULL); diff --git a/zephyr/test/krabby/src/stubs.c b/zephyr/test/krabby/src/stubs.c new file mode 100644 index 0000000000..b6cc0c5368 --- /dev/null +++ b/zephyr/test/krabby/src/stubs.c @@ -0,0 +1,29 @@ +/* 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. + */ + +#include "charge_ramp.h" +#include "charge_state.h" + +int board_set_active_charge_port(int port) +{ + return 0; +} + +int board_is_vbus_too_low(int port, enum chg_ramp_vbus_state ramp_state) +{ + return 0; +} + +void board_set_charge_limit(int port, int supplier, int charge_ma, int max_ma, + int charge_mv) +{ +} + +const struct batt_params *charger_current_battery_params(void) +{ + static const struct batt_params params = {}; + + return ¶ms; +} diff --git a/zephyr/test/krabby/testcase.yaml b/zephyr/test/krabby/testcase.yaml new file mode 100644 index 0000000000..c8cf0e070b --- /dev/null +++ b/zephyr/test/krabby/testcase.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. + +common: + platform_allow: native_posix +tests: + krabby.default: + extra_args: DTC_OVERLAY_FILE="common.dts;../projects/corsola/interrupts_krabby.dts;../projects/corsola/gpio_krabby.dts;pinctrl.dts" diff --git a/zephyr/test/math/CMakeLists.txt b/zephyr/test/math/CMakeLists.txt index dd78d41849..57fe7e389f 100644 --- a/zephyr/test/math/CMakeLists.txt +++ b/zephyr/test/math/CMakeLists.txt @@ -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. diff --git a/zephyr/test/math/fixed_point.conf b/zephyr/test/math/fixed_point.conf index 5274cb2287..c1ddcc0911 100644 --- a/zephyr/test/math/fixed_point.conf +++ b/zephyr/test/math/fixed_point.conf @@ -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. diff --git a/zephyr/test/math/floating_point.conf b/zephyr/test/math/floating_point.conf index ce8f17011d..c6b8f58176 100644 --- a/zephyr/test/math/floating_point.conf +++ b/zephyr/test/math/floating_point.conf @@ -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. diff --git a/zephyr/test/math/prj.conf b/zephyr/test/math/prj.conf index d1592a2932..7c5ef483a2 100644 --- a/zephyr/test/math/prj.conf +++ b/zephyr/test/math/prj.conf @@ -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. diff --git a/zephyr/test/math/src/fixed_point_int_sqrtf.c b/zephyr/test/math/src/fixed_point_int_sqrtf.c index 1fcfb5bcbe..163c36c26b 100644 --- a/zephyr/test/math/src/fixed_point_int_sqrtf.c +++ b/zephyr/test/math/src/fixed_point_int_sqrtf.c @@ -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. */ diff --git a/zephyr/test/math/src/mask.c b/zephyr/test/math/src/mask.c index 2d803eaa76..5e690c9653 100644 --- a/zephyr/test/math/src/mask.c +++ b/zephyr/test/math/src/mask.c @@ -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. */ diff --git a/zephyr/test/math/src/math_util.c b/zephyr/test/math/src/math_util.c index 74fbe021dc..d3bd2c6fb6 100644 --- a/zephyr/test/math/src/math_util.c +++ b/zephyr/test/math/src/math_util.c @@ -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. */ diff --git a/zephyr/test/math/src/suite.c b/zephyr/test/math/src/suite.c index a174c57cee..95da93b113 100644 --- a/zephyr/test/math/src/suite.c +++ b/zephyr/test/math/src/suite.c @@ -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. */ diff --git a/zephyr/test/math/src/vector.c b/zephyr/test/math/src/vector.c index 481c22a3f6..e79a350a92 100644 --- a/zephyr/test/math/src/vector.c +++ b/zephyr/test/math/src/vector.c @@ -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. */ diff --git a/zephyr/test/system_common/CMakeLists.txt b/zephyr/test/system_common/CMakeLists.txt index a51c436fc2..05938b2ec6 100644 --- a/zephyr/test/system_common/CMakeLists.txt +++ b/zephyr/test/system_common/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2022 The Chromium OS Authors. +# 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. diff --git a/zephyr/test/system_common/boards/native_posix.overlay b/zephyr/test/system_common/boards/native_posix.overlay index 67dfebf130..c6325f6ecc 100644 --- a/zephyr/test/system_common/boards/native_posix.overlay +++ b/zephyr/test/system_common/boards/native_posix.overlay @@ -1,4 +1,4 @@ -/* Copyright 2022 The Chromium OS Authors. +/* 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. */ diff --git a/zephyr/test/system_common/prj.conf b/zephyr/test/system_common/prj.conf index 9f6d11d031..ebc7c64321 100644 --- a/zephyr/test/system_common/prj.conf +++ b/zephyr/test/system_common/prj.conf @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/zephyr/test/system_common/src/build_info.c b/zephyr/test/system_common/src/build_info.c index bcd442475f..7983c1f0a4 100644 --- a/zephyr/test/system_common/src/build_info.c +++ b/zephyr/test/system_common/src/build_info.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/system_common/src/fff.c b/zephyr/test/system_common/src/fff.c index 009aeb9bb0..3b10dc3706 100644 --- a/zephyr/test/system_common/src/fff.c +++ b/zephyr/test/system_common/src/fff.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/system_common/src/get_version.c b/zephyr/test/system_common/src/get_version.c index f1f0d781cd..87a41bad58 100644 --- a/zephyr/test/system_common/src/get_version.c +++ b/zephyr/test/system_common/src/get_version.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/system_common/src/reboot.c b/zephyr/test/system_common/src/reboot.c index 930b844632..759b93d89f 100644 --- a/zephyr/test/system_common/src/reboot.c +++ b/zephyr/test/system_common/src/reboot.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/system_shim/CMakeLists.txt b/zephyr/test/system_shim/CMakeLists.txt index 104058557a..2f8b61cda8 100644 --- a/zephyr/test/system_shim/CMakeLists.txt +++ b/zephyr/test/system_shim/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/test/system_shim/boards/native_posix.overlay b/zephyr/test/system_shim/boards/native_posix.overlay index 1e2401277d..0bcda0f513 100644 --- a/zephyr/test/system_shim/boards/native_posix.overlay +++ b/zephyr/test/system_shim/boards/native_posix.overlay @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/zephyr/test/system_shim/prj.conf b/zephyr/test/system_shim/prj.conf index 201c2feacc..fa7bd9fc04 100644 --- a/zephyr/test/system_shim/prj.conf +++ b/zephyr/test/system_shim/prj.conf @@ -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. diff --git a/zephyr/test/system_shim/test_system.c b/zephyr/test/system_shim/test_system.c index 45aed5dfff..d8b92e9504 100644 --- a/zephyr/test/system_shim/test_system.c +++ b/zephyr/test/system_shim/test_system.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/zephyr/test/tasks/CMakeLists.txt b/zephyr/test/tasks/CMakeLists.txt index f522683cab..b0b59e7c99 100644 --- a/zephyr/test/tasks/CMakeLists.txt +++ b/zephyr/test/tasks/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/test/tasks/boards/native_posix.overlay b/zephyr/test/tasks/boards/native_posix.overlay index 8768a662d0..2e36118442 100644 --- a/zephyr/test/tasks/boards/native_posix.overlay +++ b/zephyr/test/tasks/boards/native_posix.overlay @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ diff --git a/zephyr/test/tasks/main.c b/zephyr/test/tasks/main.c index 64d4b16f80..8bfe9eb602 100644 --- a/zephyr/test/tasks/main.c +++ b/zephyr/test/tasks/main.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/zephyr/test/tasks/prj.conf b/zephyr/test/tasks/prj.conf index 15af430451..6c8e2fbc90 100644 --- a/zephyr/test/tasks/prj.conf +++ b/zephyr/test/tasks/prj.conf @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/test/tasks/shimmed_test_tasks.h b/zephyr/test/tasks/shimmed_test_tasks.h index f35e9dd312..ebd1215446 100644 --- a/zephyr/test/tasks/shimmed_test_tasks.h +++ b/zephyr/test/tasks/shimmed_test_tasks.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/zephyr/test/tasks/testcase.yaml b/zephyr/test/tasks/testcase.yaml index 39d7bfed84..a72199a14a 100644 --- a/zephyr/test/tasks/testcase.yaml +++ b/zephyr/test/tasks/testcase.yaml @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. diff --git a/zephyr/test/vboot_efs2/CMakeLists.txt b/zephyr/test/vboot_efs2/CMakeLists.txt index 95c47c4c97..c3343bcdd2 100644 --- a/zephyr/test/vboot_efs2/CMakeLists.txt +++ b/zephyr/test/vboot_efs2/CMakeLists.txt @@ -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. diff --git a/zephyr/test/vboot_efs2/boards/native_posix.overlay b/zephyr/test/vboot_efs2/boards/native_posix.overlay index d0ab830358..ced94c28b1 100644 --- a/zephyr/test/vboot_efs2/boards/native_posix.overlay +++ b/zephyr/test/vboot_efs2/boards/native_posix.overlay @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ @@ -10,6 +10,7 @@ chosen { cros-ec,flash = &flash1; cros-ec,flash-controller = &cros_flash; + zephyr,shell-uart = &test_uart; }; aliases { gpio-wp = &gpio_wp_l; @@ -74,7 +75,6 @@ compatible = "cros,tcpci-generic-emul"; status = "okay"; reg = <0x82>; - label = "TCPCI_EMUL"; alert_gpio = <&usb_c0_tcpc_int_odl>; }; }; @@ -98,6 +98,12 @@ compatible = "lgc,ac17a8m", "battery-smart"; }; }; + test_uart: uart@55556666 { + compatible = "vnd,serial"; + reg = <0x55556666 0x1000>; + status = "okay"; + buffer-size = <200>; + }; }; &gpio0 { @@ -121,7 +127,6 @@ compatible = "cros,isl923x-emul"; status = "okay"; reg = <0x9>; - label = "ISL923X_EMUL"; battery = <&battery>; }; }; diff --git a/zephyr/test/vboot_efs2/prj.conf b/zephyr/test/vboot_efs2/prj.conf index 1b73555f90..602bd22c65 100644 --- a/zephyr/test/vboot_efs2/prj.conf +++ b/zephyr/test/vboot_efs2/prj.conf @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. @@ -36,6 +36,7 @@ CONFIG_PLATFORM_EC_VBOOT_HASH=y CONFIG_RING_BUFFER=y CONFIG_SERIAL=y CONFIG_SHELL_BACKEND_DUMMY=y +CONFIG_SHELL_BACKEND_DUMMY_BUF_SIZE=1000 CONFIG_SHELL_BACKEND_SERIAL=n CONFIG_SHIMMED_TASKS=y CONFIG_ZTEST=y diff --git a/zephyr/test/vboot_efs2/src/main.c b/zephyr/test/vboot_efs2/src/main.c index b0ef86c92a..6d4a9661bd 100644 --- a/zephyr/test/vboot_efs2/src/main.c +++ b/zephyr/test/vboot_efs2/src/main.c @@ -1,23 +1,27 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* 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. */ -#include "zephyr/kernel.h" -#include <zephyr/ztest_assert.h> -#include <zephyr/ztest_test_new.h> -#include <zephyr/shell/shell_dummy.h> - +#include "driver/bc12/pi3usb9201_public.h" +#include "driver/tcpm/tcpci.h" #include "ec_app_main.h" +#include "emul/emul_flash.h" #include "hooks.h" +#include "ppc/sn5s330_public.h" #include "task.h" -#include "emul/emul_flash.h" -#include "vboot.h" -#include "driver/bc12/pi3usb9201_public.h" #include "usb_mux.h" -#include "driver/tcpm/tcpci.h" -#include "ppc/sn5s330_public.h" #include "usbc_ppc.h" +#include "vboot.h" + +#include <stdint.h> + +#include <zephyr/drivers/gpio/gpio_emul.h> +#include <zephyr/drivers/uart/serial_test.h> +#include <zephyr/kernel.h> +#include <zephyr/shell/shell_dummy.h> +#include <zephyr/ztest_assert.h> +#include <zephyr/ztest_test_new.h> static int show_power_shortage_called; void show_power_shortage(void) @@ -126,15 +130,139 @@ ZTEST(vboot_efs2, test_vboot_main_jump_timeout) zassert_equal(show_power_shortage_called, 0, NULL); } -/* TODO(jbettis): Add cases for verify_and_jump() CR50_COMM_ERR_BAD_PAYLOAD & - * CR50_COMM_SUCCESS - */ +#define PACKET_MODE_GPIO DT_PATH(named_gpios, ec_gsc_packet_mode) + +static const struct device *uart_shell_dev = + DEVICE_DT_GET(DT_CHOSEN(zephyr_shell_uart)); +static const struct device *gpio_dev = + DEVICE_DT_GET(DT_GPIO_CTLR(PACKET_MODE_GPIO, gpios)); + +static void reply_cr50_payload(const struct device *dev, void *user_data) +{ + if (gpio_emul_output_get(gpio_dev, + DT_GPIO_PIN(PACKET_MODE_GPIO, gpios))) { + struct cr50_comm_request req; + uint32_t bytes_read; + + bytes_read = serial_vnd_peek_out_data( + uart_shell_dev, (void *)&req, sizeof(req)); + /* If ! valid cr50_comm_request header, read 1 byte. */ + while (bytes_read == sizeof(req) && + req.magic != CR50_PACKET_MAGIC) { + /* Consume one byte and then peek again. */ + serial_vnd_read_out_data(uart_shell_dev, NULL, 1); + bytes_read = serial_vnd_peek_out_data( + uart_shell_dev, (void *)&req, sizeof(req)); + } + if (bytes_read == sizeof(req)) { + /* If we have a full packet, consume it, and reply + * with whatever is in user_data which holds a cr50 + * reply. + */ + if (req.size <= + serial_vnd_out_data_size_get(uart_shell_dev)) { + serial_vnd_read_out_data(uart_shell_dev, NULL, + req.size); + serial_vnd_queue_in_data( + uart_shell_dev, user_data, + sizeof(struct cr50_comm_response)); + } + } + } else { + /* Packet mode is off, so just consume some bytes from the out + * buffer. The buffer is only 200 in the dts, so 1000 will + * consume it all. + */ + serial_vnd_read_out_data(uart_shell_dev, NULL, 1000); + } +} + +ZTEST(vboot_efs2, test_vboot_main_jump_bad_payload) +{ + const struct shell *shell_zephyr = get_ec_shell(); + const char *outbuffer; + size_t buffer_size; + struct cr50_comm_response resp = { + .error = CR50_COMM_ERR_BAD_PAYLOAD, + }; + + serial_vnd_set_callback(uart_shell_dev, reply_cr50_payload, &resp); + + shell_backend_dummy_clear_output(shell_zephyr); + vboot_main(); + + outbuffer = shell_backend_dummy_get_output(shell_zephyr, &buffer_size); + + zassert_true(strstr(outbuffer, "VB Ping Cr50") != NULL, + "Expected msg not in %s", outbuffer); + zassert_true(strstr(outbuffer, "VB Hash mismatch") != NULL, + "Expected msg not in %s", outbuffer); + zassert_true(vboot_allow_usb_pd(), NULL); + zassert_equal(show_power_shortage_called, 0, NULL); + zassert_equal(show_critical_error_called, 0, NULL); +} + +/* This hits the default case in verify_and_jump. */ +ZTEST(vboot_efs2, test_vboot_main_jump_bad_crc) +{ + const struct shell *shell_zephyr = get_ec_shell(); + const char *outbuffer; + size_t buffer_size; + struct cr50_comm_response resp = { + .error = CR50_COMM_ERR_CRC, + }; + + serial_vnd_set_callback(uart_shell_dev, reply_cr50_payload, &resp); + + shell_backend_dummy_clear_output(shell_zephyr); + vboot_main(); + + outbuffer = shell_backend_dummy_get_output(shell_zephyr, &buffer_size); + + zassert_true(strstr(outbuffer, "VB Ping Cr50") != NULL, + "Expected msg not in %s", outbuffer); + zassert_true(strstr(outbuffer, "VB Failed to verify RW (0xec03)") != + NULL, + "Expected msg not in %s", outbuffer); + zassert_false(vboot_allow_usb_pd(), NULL); + zassert_equal(show_power_shortage_called, 0, NULL); + zassert_equal(show_critical_error_called, 1, NULL); +} + +ZTEST(vboot_efs2, test_vboot_main_jump_success) +{ + const struct shell *shell_zephyr = get_ec_shell(); + const char *outbuffer; + size_t buffer_size; + struct cr50_comm_response resp = { + .error = CR50_COMM_SUCCESS, + }; + + serial_vnd_set_callback(uart_shell_dev, reply_cr50_payload, &resp); + + shell_backend_dummy_clear_output(shell_zephyr); + vboot_main(); + + outbuffer = shell_backend_dummy_get_output(shell_zephyr, &buffer_size); + + zassert_true(strstr(outbuffer, "VB Ping Cr50") != NULL, + "Expected msg not in %s", outbuffer); + zassert_true(strstr(outbuffer, "VB Failed to jump") != NULL, + "Expected msg not in %s", outbuffer); + zassert_false(vboot_allow_usb_pd(), NULL); + zassert_equal(show_power_shortage_called, 0, NULL); + zassert_equal(show_critical_error_called, 1, NULL); + zassert_equal(system_get_reset_flags(), 0, NULL); +} void *vboot_efs2_setup(void) { /* Wait for the shell to start. */ k_sleep(K_MSEC(1)); zassert_equal(get_ec_shell()->ctx->state, SHELL_STATE_ACTIVE, NULL); + + system_common_pre_init(); + return NULL; } @@ -146,8 +274,9 @@ void vboot_efs2_cleanup(void *fixture) show_power_shortage_called = 0; show_critical_error_called = 0; system_exit_manual_recovery(); - system_clear_reset_flags(EC_RESET_FLAG_STAY_IN_RO); + system_clear_reset_flags(EC_RESET_FLAG_STAY_IN_RO | EC_RESET_FLAG_EFS); vboot_disable_pd(); + serial_vnd_set_callback(uart_shell_dev, NULL, NULL); } ZTEST_SUITE(vboot_efs2, NULL, vboot_efs2_setup, NULL, vboot_efs2_cleanup, NULL); @@ -186,12 +315,14 @@ const struct pi3usb9201_config_t pi3usb9201_bc12_chips[] = { }, }; -struct usb_mux usb_muxes[] = { +struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .driver = &tcpci_tcpm_usb_mux_driver, - .i2c_port = I2C_PORT_USB_C0, - .i2c_addr_flags = DT_REG_ADDR(DT_NODELABEL(tcpci_emul)), + .mux = &(struct usb_mux) { + .usb_port = USBC_PORT_C0, + .driver = &tcpci_tcpm_usb_mux_driver, + .i2c_port = I2C_PORT_USB_C0, + .i2c_addr_flags = DT_REG_ADDR(DT_NODELABEL(tcpci_emul)), + }, }, }; diff --git a/zephyr/test/vboot_efs2/testcase.yaml b/zephyr/test/vboot_efs2/testcase.yaml index 15e6f2f1d4..59716f3fb2 100644 --- a/zephyr/test/vboot_efs2/testcase.yaml +++ b/zephyr/test/vboot_efs2/testcase.yaml @@ -1,4 +1,4 @@ -# Copyright 2022 The ChromiumOS Authors. +# 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. common: diff --git a/zephyr/zmake/run_tests.sh b/zephyr/zmake/run_tests.sh index b57230ff48..3468a22deb 100755 --- a/zephyr/zmake/run_tests.sh +++ b/zephyr/zmake/run_tests.sh @@ -1,5 +1,5 @@ #!/bin/bash -# 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. diff --git a/zephyr/zmake/setup.py b/zephyr/zmake/setup.py index 97c126d424..b7e58ef803 100644 --- a/zephyr/zmake/setup.py +++ b/zephyr/zmake/setup.py @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -11,7 +11,7 @@ setuptools.setup( description="CrOS Zephyr Utilities", long_description="Utilities used for working on a Zephyr-based EC", url="https://chromium.googlesource.com/chromiumos/platform/ec", - author="Chromium OS Authors", + author="ChromiumOS Authors", author_email="chromiumos-dev@chromium.org", license="BSD", # What does your project relate to? diff --git a/zephyr/zmake/tests/conftest.py b/zephyr/zmake/tests/conftest.py index 28de3fe074..dfea10457c 100644 --- a/zephyr/zmake/tests/conftest.py +++ b/zephyr/zmake/tests/conftest.py @@ -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. diff --git a/zephyr/zmake/tests/test_build_config.py b/zephyr/zmake/tests/test_build_config.py index 043c4e5539..d8355da768 100644 --- a/zephyr/zmake/tests/test_build_config.py +++ b/zephyr/zmake/tests/test_build_config.py @@ -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. diff --git a/zephyr/zmake/tests/test_generate_readme.py b/zephyr/zmake/tests/test_generate_readme.py index ee4bb5767e..e7873f1980 100644 --- a/zephyr/zmake/tests/test_generate_readme.py +++ b/zephyr/zmake/tests/test_generate_readme.py @@ -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. diff --git a/zephyr/zmake/tests/test_modules.py b/zephyr/zmake/tests/test_modules.py index 4128f7787a..dc4c170535 100644 --- a/zephyr/zmake/tests/test_modules.py +++ b/zephyr/zmake/tests/test_modules.py @@ -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. diff --git a/zephyr/zmake/tests/test_multiproc_executor.py b/zephyr/zmake/tests/test_multiproc_executor.py index c905ef03ec..ff443e2f4b 100644 --- a/zephyr/zmake/tests/test_multiproc_executor.py +++ b/zephyr/zmake/tests/test_multiproc_executor.py @@ -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. diff --git a/zephyr/zmake/tests/test_multiproc_logging.py b/zephyr/zmake/tests/test_multiproc_logging.py index fe5bb62e8f..88d029675b 100644 --- a/zephyr/zmake/tests/test_multiproc_logging.py +++ b/zephyr/zmake/tests/test_multiproc_logging.py @@ -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. diff --git a/zephyr/zmake/tests/test_packers.py b/zephyr/zmake/tests/test_packers.py index 8f9cfc9821..23bdb2bf6b 100644 --- a/zephyr/zmake/tests/test_packers.py +++ b/zephyr/zmake/tests/test_packers.py @@ -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. diff --git a/zephyr/zmake/tests/test_project.py b/zephyr/zmake/tests/test_project.py index 5dae09cd21..3225de1d75 100644 --- a/zephyr/zmake/tests/test_project.py +++ b/zephyr/zmake/tests/test_project.py @@ -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. diff --git a/zephyr/zmake/tests/test_reexec.py b/zephyr/zmake/tests/test_reexec.py index d36b873506..63aa76cb70 100644 --- a/zephyr/zmake/tests/test_reexec.py +++ b/zephyr/zmake/tests/test_reexec.py @@ -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. """Test the zmake re-exec functionality.""" diff --git a/zephyr/zmake/tests/test_toolchains.py b/zephyr/zmake/tests/test_toolchains.py index b9efc52eb2..ca40f482af 100644 --- a/zephyr/zmake/tests/test_toolchains.py +++ b/zephyr/zmake/tests/test_toolchains.py @@ -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. diff --git a/zephyr/zmake/tests/test_util.py b/zephyr/zmake/tests/test_util.py index 824e38d045..c5efa2d18e 100644 --- a/zephyr/zmake/tests/test_util.py +++ b/zephyr/zmake/tests/test_util.py @@ -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. diff --git a/zephyr/zmake/tests/test_version.py b/zephyr/zmake/tests/test_version.py index b0ed0953f4..d6202c0d85 100644 --- a/zephyr/zmake/tests/test_version.py +++ b/zephyr/zmake/tests/test_version.py @@ -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. diff --git a/zephyr/zmake/tests/test_zmake.py b/zephyr/zmake/tests/test_zmake.py index c0fbee441d..370e8d1bfa 100644 --- a/zephyr/zmake/tests/test_zmake.py +++ b/zephyr/zmake/tests/test_zmake.py @@ -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. diff --git a/zephyr/zmake/zephyr_build_tools/generate_ec_version.py b/zephyr/zmake/zephyr_build_tools/generate_ec_version.py index c43ee4eba3..7d3a9450ee 100755 --- a/zephyr/zmake/zephyr_build_tools/generate_ec_version.py +++ b/zephyr/zmake/zephyr_build_tools/generate_ec_version.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# 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. diff --git a/zephyr/zmake/zmake/__main__.py b/zephyr/zmake/zmake/__main__.py index 951b958bcf..680289e8b9 100644 --- a/zephyr/zmake/zmake/__main__.py +++ b/zephyr/zmake/zmake/__main__.py @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/zmake/zmake/build_config.py b/zephyr/zmake/zmake/build_config.py index 6725d18c0d..24e877dd89 100644 --- a/zephyr/zmake/zmake/build_config.py +++ b/zephyr/zmake/zmake/build_config.py @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. """Encapsulation of a build configuration.""" diff --git a/zephyr/zmake/zmake/configlib.py b/zephyr/zmake/zmake/configlib.py index 6264f19e45..139394745f 100644 --- a/zephyr/zmake/zmake/configlib.py +++ b/zephyr/zmake/zmake/configlib.py @@ -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. diff --git a/zephyr/zmake/zmake/generate_readme.py b/zephyr/zmake/zmake/generate_readme.py index ebac0d908b..f309a104ba 100644 --- a/zephyr/zmake/zmake/generate_readme.py +++ b/zephyr/zmake/zmake/generate_readme.py @@ -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. diff --git a/zephyr/zmake/zmake/jobserver.py b/zephyr/zmake/zmake/jobserver.py index e4643dfd87..a3d6287da2 100644 --- a/zephyr/zmake/zmake/jobserver.py +++ b/zephyr/zmake/zmake/jobserver.py @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. """Module for job counters, limiting the amount of concurrent executions.""" diff --git a/zephyr/zmake/zmake/modules.py b/zephyr/zmake/zmake/modules.py index 91f0dd50b9..a2b77342c7 100644 --- a/zephyr/zmake/zmake/modules.py +++ b/zephyr/zmake/zmake/modules.py @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. """Registry of known Zephyr modules.""" diff --git a/zephyr/zmake/zmake/multiproc.py b/zephyr/zmake/zmake/multiproc.py index be33057c4e..0838f5f1f8 100644 --- a/zephyr/zmake/zmake/multiproc.py +++ b/zephyr/zmake/zmake/multiproc.py @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/zmake/zmake/output_packers.py b/zephyr/zmake/zmake/output_packers.py index 7ef6d65dc5..d2203fa7b4 100644 --- a/zephyr/zmake/zmake/output_packers.py +++ b/zephyr/zmake/zmake/output_packers.py @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. """Types which provide many builds and composite them into a single binary.""" diff --git a/zephyr/zmake/zmake/project.py b/zephyr/zmake/zmake/project.py index ca7b30e6ba..a707da2462 100644 --- a/zephyr/zmake/zmake/project.py +++ b/zephyr/zmake/zmake/project.py @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. """Module for project config wrapper object.""" diff --git a/zephyr/zmake/zmake/toolchains.py b/zephyr/zmake/zmake/toolchains.py index 73033fb745..39a4bf707b 100644 --- a/zephyr/zmake/zmake/toolchains.py +++ b/zephyr/zmake/zmake/toolchains.py @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. """Definitions of toolchain variables.""" diff --git a/zephyr/zmake/zmake/util.py b/zephyr/zmake/zmake/util.py index 22d45d7deb..e0e0ff98b1 100644 --- a/zephyr/zmake/zmake/util.py +++ b/zephyr/zmake/zmake/util.py @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. """Common miscellaneous utility functions for zmake.""" diff --git a/zephyr/zmake/zmake/version.py b/zephyr/zmake/zmake/version.py index 76d9777eda..ee857db209 100644 --- a/zephyr/zmake/zmake/version.py +++ b/zephyr/zmake/zmake/version.py @@ -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. |