6 files changed, 28 insertions, 54 deletions
diff --git a/zephyr/drivers/cros_rtc/Kconfig b/zephyr/drivers/cros_rtc/Kconfig
index 2f064b4db8..2839b03c62 100644
--- a/zephyr/drivers/cros_rtc/Kconfig
+++ b/zephyr/drivers/cros_rtc/Kconfig
@@ -6,12 +6,7 @@ if PLATFORM_EC_RTC && !ARCH_POSIX
 
 choice CROS_RTC_TYPE
 	prompt "Select the RTC to use"
-	# List standalone controllers before embedded once so that they get
-	# higher priority.
-	default CROS_RTC_NXP_PCF85063A if DT_HAS_NXP_RTC_PCF85063A_ENABLED
-	default CROS_RTC_RENESAS_IDT1337AG if DT_HAS_RENESAS_RTC_IDT1337AG_ENABLED
-	default CROS_RTC_NPCX if DT_HAS_NUVOTON_NPCX_CROS_MTC_ENABLED
-	default CROS_RTC_XEC if DT_HAS_MICROCHIP_XEC_CROS_RTC_ENABLED
+	default CROS_RTC_NPCX if SOC_FAMILY_NPCX
 	help
 	  Select the RTC used on the board.
 
@@ -45,11 +40,4 @@ config CROS_RTC_RENESAS_IDT1337AG
 
 endchoice # CROS_RTC_TYPE
 
-config PLATFORM_EC_PCF85063A_CAP_SEL
-	bool "Set CAP_SEL of PCF85063A"
-	depends on CROS_RTC_NXP_PCF85063A
-	help
-	  This option select the internal oscillator capacitor to 12.5 pF,
-	  default is 7 pF.
-
 endif # PLATFORM_EC_RTC
diff --git a/zephyr/drivers/cros_rtc/cros_rtc_npcx.c b/zephyr/drivers/cros_rtc/cros_rtc_npcx.c
index a248357cfe..3312ad899f 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 The ChromiumOS Authors
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
+/*
+ * Copyright 2021 Google LLC
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #define DT_DRV_COMPAT nuvoton_npcx_cros_mtc
 
-#include "ec_tasks.h"
-#include "soc_miwu.h"
-#include "task.h"
-
 #include <assert.h>
-
+#include <drivers/cros_rtc.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>
+
+#include "ec_tasks.h"
+#include "soc_miwu.h"
+#include "task.h"
+
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(cros_rtc, LOG_LEVEL_ERR);
 
 #define NPCX_MTC_TTC_LOAD_DELAY_US 250 /* Delay after writing TTC */
diff --git a/zephyr/drivers/cros_rtc/cros_rtc_xec.c b/zephyr/drivers/cros_rtc/cros_rtc_xec.c
index f42560e107..c543aab6af 100644
--- a/zephyr/drivers/cros_rtc/cros_rtc_xec.c
+++ b/zephyr/drivers/cros_rtc/cros_rtc_xec.c
@@ -5,18 +5,17 @@
 
 #define DT_DRV_COMPAT microchip_xec_cros_rtc
 
-#include "ec_tasks.h"
-#include "task.h"
-
 #include <assert.h>
-
+#include <drivers/cros_rtc.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/microchip_xec/reg_def_cros.h>
+
+#include "ec_tasks.h"
+#include "task.h"
+
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(cros_rtc, LOG_LEVEL_ERR);
 
 /* Driver config */
diff --git a/zephyr/drivers/cros_rtc/nxp_rtc_pcf85063a.c b/zephyr/drivers/cros_rtc/nxp_rtc_pcf85063a.c
index 298c8cd64f..c5580eaeef 100644
--- a/zephyr/drivers/cros_rtc/nxp_rtc_pcf85063a.c
+++ b/zephyr/drivers/cros_rtc/nxp_rtc_pcf85063a.c
@@ -5,19 +5,18 @@
 
 #define DT_DRV_COMPAT nxp_rtc_pcf85063a
 
-#include "nxp_rtc_pcf85063a.h"
-
 #include <assert.h>
-
 #include <zephyr/device.h>
+#include <drivers/cros_rtc.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/kernel.h>
-#include <zephyr/logging/log.h>
-
-#include <drivers/cros_rtc.h>
 #include <rtc.h>
 #include <soc.h>
+
+#include "nxp_rtc_pcf85063a.h"
+
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(cros_rtc, LOG_LEVEL_ERR);
 
 /* Driver config */
@@ -363,16 +362,6 @@ static int nxp_rtc_pcf85063a_init(const struct device *dev)
 		}
 	}
 
-#ifdef CONFIG_PLATFORM_EC_PCF85063A_CAP_SEL
-	ret = pcf85063a_write_reg(dev, REG_CONTROL_1,
-				  (CONTROL_1_DEFAULT_VALUE | CAP_SEL));
-
-	if (ret < 0) {
-		LOG_ERR("PCF85063A set CAP_SEL Fail!");
-		return ret;
-	}
-#endif
-
 	/*
 	 * Read Seconds register and check if oscillator is stopped.
 	 * If so, clear the bit.
diff --git a/zephyr/drivers/cros_rtc/nxp_rtc_pcf85063a.h b/zephyr/drivers/cros_rtc/nxp_rtc_pcf85063a.h
index c0139db631..54b1fbd2ea 100644
--- a/zephyr/drivers/cros_rtc/nxp_rtc_pcf85063a.h
+++ b/zephyr/drivers/cros_rtc/nxp_rtc_pcf85063a.h
@@ -10,7 +10,6 @@
 #define SOFT_RESET 0x58
 #define CONTROL_1_DEFAULT_VALUE 0
 #define OS_BIT 0x80
-#define CAP_SEL 0x01
 #define DISABLE_ALARM 0x80
 #define ENABLE_ALARM_INTERRUPT 0x80
 #define RTC_STOP_CLOCKS 0x20
diff --git a/zephyr/drivers/cros_rtc/renesas_rtc_idt1337ag.c b/zephyr/drivers/cros_rtc/renesas_rtc_idt1337ag.c
index f6d3a7c292..7a9a11fd41 100644
--- a/zephyr/drivers/cros_rtc/renesas_rtc_idt1337ag.c
+++ b/zephyr/drivers/cros_rtc/renesas_rtc_idt1337ag.c
@@ -5,19 +5,18 @@
 
 #define DT_DRV_COMPAT renesas_rtc_idt1337ag
 
-#include "renesas_rtc_idt1337ag.h"
-
 #include <assert.h>
-
 #include <zephyr/device.h>
+#include <drivers/cros_rtc.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/kernel.h>
-#include <zephyr/logging/log.h>
-
-#include <drivers/cros_rtc.h>
 #include <rtc.h>
 #include <soc.h>
+
+#include "renesas_rtc_idt1337ag.h"
+
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(cros_rtc, LOG_LEVEL_ERR);
 
 /* Driver config */