- Add patch to port RV-8263-C8 driver from upstream Zephyr to ZSWatch…

… Zephyr - Move patches from "zephyr_patches" directory into "patches" directory - Remove "zephyr_patches" directory - Add RTC to firmware
jakkra · Jul 16, 2024 · 9467849 · 9467849
1 parent 230eb25
commit 9467849
Show file tree

Hide file tree

Showing 20 changed files with 1,099 additions and 1,107 deletions.
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -47,13 +47,18 @@ include_directories(src/applications)
 include_directories(src/ui/watchfaces)
 
 if (CONFIG_DT_HAS_NORDIC_NPM1300_ENABLED)
-add_subdirectory(src/fuel_gauge)
+    add_subdirectory(src/fuel_gauge)
 else()
-add_subdirectory(src/basic_battery)
+    add_subdirectory(src/basic_battery)
+endif()
+
+if (CONFIG_RTC)
+    target_sources(app PRIVATE src/zsw_rtc.c)
+else()
+    target_sources(app PRIVATE src/zsw_clock.c)
 endif()
 
 target_sources(app PRIVATE src/main.c)
-target_sources(app PRIVATE src/zsw_clock.c)
 target_sources(app PRIVATE src/zsw_cpu_freq.c)
 target_sources(app PRIVATE src/zsw_retained_ram_storage.c)
 target_sources(app PRIVATE src/zsw_coredump.c)

diff --git a/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_3.overlay b/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_3.overlay
@@ -83,6 +83,10 @@
     };
 };
 
+&uart0 {
+    status = "disabled";
+};
+
 &i2c1 {
     bmi270: bmi270@68 {
         compatible = "bosch,bmi270-plus";

diff --git a/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_4.overlay b/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_4.overlay
@@ -127,6 +127,10 @@
 
 };
 
+&uart0 {
+    status = "disabled";
+};
+
 &i2c1 {
     bmi270: bmi270@68 {
         compatible = "bosch,bmi270-plus";

diff --git a/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_5.conf b/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_5.conf
@@ -48,8 +48,4 @@ CONFIG_NVS=y
 CONFIG_DEBUG_COREDUMP_BACKEND_OTHER=y
 
 CONFIG_RTC=y
-CONFIG_RTC_ALARM=y
-CONFIG_RTC_RV8263_ALARM_OWN_THREAD=y
 CONFIG_RTC_UPDATE=y
-CONFIG_RTC_RV8263_UPDATE_OWN_THREAD=y
-CONFIG_RTC_CALIBRATION=y
diff --git a/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_5.overlay b/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_5.overlay
@@ -185,13 +185,16 @@
             pwms = <&pwm2 0 PWM_HZ(880) PWM_POLARITY_NORMAL>;
         };
     };
+};
 
+&uart0 {
+    status = "disabled";
 };
 
 &i2c1 {
-	rv_8263_c8: rv-8263-c8@A2 {
+	rv_8263_c8: rv-8263-c8@51 {
 		compatible = "microcrystal,rv-8263-c8";
-		reg = <0xA2>;
+		reg = <0x51>;
 		status = "okay";
 		clkout = <0>;
 		int-gpios = <&gpio1 13 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>;
@@ -367,4 +370,4 @@
 			reg = <0x400000 0x100000 >;
 		};
 	};
-};
+};
diff --git a/app/drivers/CMakeLists.txt b/app/drivers/CMakeLists.txt
@@ -1,5 +1,4 @@
 add_subdirectory(display)
 add_subdirectory(input)
-add_subdirectory(rtc)
 
-add_subdirectory_ifdef(CONFIG_SENSOR sensor)
+add_subdirectory_ifdef(CONFIG_SENSOR sensor)
diff --git a/app/drivers/Kconfig b/app/drivers/Kconfig
@@ -1,4 +1,3 @@
 rsource "display/Kconfig"
 rsource "input/Kconfig"
-rsource "rtc/Kconfig"
-rsource "sensor/Kconfig"
+rsource "sensor/Kconfig"
diff --git a/app/drivers/rtc/CMakeLists.txt b/app/drivers/rtc/CMakeLists.txt
diff --git a/app/drivers/rtc/Kconfig b/app/drivers/rtc/Kconfig
diff --git a/app/drivers/rtc/rv8263c8/CMakeLists.txt b/app/drivers/rtc/rv8263c8/CMakeLists.txt
diff --git a/app/drivers/rtc/rv8263c8/Kconfig b/app/drivers/rtc/rv8263c8/Kconfig