diff options
| author | YH Lin <yueherngl@google.com> | 2022-11-30 21:45:30 +0000 |
|---|---|---|
| committer | YH Lin <yueherngl@google.com> | 2022-11-30 21:45:30 +0000 |
| commit | 184d13e77614be3be5374d3fef9d1edf66ec8687 (patch) | |
| tree | d0c89ae8814c2ba35c238c6c0644ec6b1602c63a /zephyr/drivers/cros_rtc/cros_rtc_npcx.c | |
| parent | 19d4d68ffa8b6910d716ab5e1953c41b58614a57 (diff) | |
| parent | aa40b859b3a73e5a205bc561c1a29eff38485461 (diff) | |
| download | chrome-ec-184d13e77614be3be5374d3fef9d1edf66ec8687.tar.gz | |
Merge remote-tracking branch cros/main into factory-brya-14909.124.B-main
Generated by: util/update_release_branch.py --baseboard brya --relevant_paths_file
baseboard/brya/relevant-paths.txt factory-brya-14909.124.B-main
Relevant changes:
git log --oneline 19d4d68ffa..aa40b859b3 -- baseboard/brya board/agah
board/anahera board/banshee board/brya board/crota board/felwinter
board/gimble board/kano board/mithrax board/osiris board/primus
board/redrix board/taeko board/taniks board/vell board/volmar
driver/bc12/pi3usb9201_public.* driver/charger/bq25710.*
driver/ppc/nx20p348x.* driver/ppc/syv682x_public.*
driver/retimer/bb_retimer_public.* driver/tcpm/nct38xx.*
driver/tcpm/ps8xxx_public.* driver/tcpm/tcpci.* include/power/alderlake*
include/intel_x86.h power/alderlake* power/intel_x86.c
util/getversion.sh
e6da633c38 driver: Sort header files
234a87ae2d tcpci: Add FRS enable to driver structure
a56be59ccd tcpm_header: add test for tcpm_dump_registers
57b3256963 Rename CONFIG_CHARGER_INPUT_CURRENT to _CHARGER_DEFAULT_CURRENT_LIMIT
e420c8ff9a marasov: Modify TypeC and TypeA configuration.
43b53e0045 Add default implementation of board_set_charge_limit
b75dc90677 Add CONFIG_CHARGER_MIN_INPUT_CURRENT_LIMIT
f1b563c350 baseboard: Sort header files
7d01b1e58d driver/retimer/ps8818.h: Add I2C ADDR FLAGS 0x30, 0x58, 0x70
ec31407993 Add CONFIG_CHARGER_INPUT_CURRENT_DERATE_PCT
8f89f69a5b crota: disable lid angle sensor for clamshell
BRANCH=None
BUG=b:260630630 b:163093572 b:259002141 b:255184961 b:259354679
BUG=b:247100970 b:254328661
TEST=`emerge-brya chromeos-ec`
Force-Relevant-Builds: all
Change-Id: I0ecfa0e6af68631283c7a9e8f1afb9d827176c62
Signed-off-by: YH Lin <yueherngl@google.com>
Diffstat (limited to 'zephyr/drivers/cros_rtc/cros_rtc_npcx.c')
| -rw-r--r-- | zephyr/drivers/cros_rtc/cros_rtc_npcx.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/zephyr/drivers/cros_rtc/cros_rtc_npcx.c b/zephyr/drivers/cros_rtc/cros_rtc_npcx.c index 3312ad899f..a248357cfe 100644 --- a/zephyr/drivers/cros_rtc/cros_rtc_npcx.c +++ b/zephyr/drivers/cros_rtc/cros_rtc_npcx.c @@ -1,23 +1,23 @@ -/* - * Copyright 2021 Google LLC - * - * SPDX-License-Identifier: Apache-2.0 +/* Copyright 2021 The ChromiumOS Authors + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. */ #define DT_DRV_COMPAT nuvoton_npcx_cros_mtc -#include <assert.h> -#include <drivers/cros_rtc.h> -#include <zephyr/drivers/gpio.h> -#include <zephyr/kernel.h> -#include <soc.h> -#include <soc/nuvoton_npcx/reg_def_cros.h> - #include "ec_tasks.h" #include "soc_miwu.h" #include "task.h" +#include <assert.h> + +#include <zephyr/drivers/gpio.h> +#include <zephyr/kernel.h> #include <zephyr/logging/log.h> + +#include <drivers/cros_rtc.h> +#include <soc.h> +#include <soc/nuvoton_npcx/reg_def_cros.h> LOG_MODULE_REGISTER(cros_rtc, LOG_LEVEL_ERR); #define NPCX_MTC_TTC_LOAD_DELAY_US 250 /* Delay after writing TTC */ |