1.1 --- a/pkg/landfall-examples/hw_info/jz4780.c Sat May 04 01:30:06 2024 +0200
1.2 +++ b/pkg/landfall-examples/hw_info/jz4780.c Sat May 04 01:31:54 2024 +0200
1.3 @@ -29,10 +29,7 @@
1.4 #include <l4/devices/gpio-jz4780.h>
1.5 #include <l4/devices/i2c-jz4780.h>
1.6 #include <l4/devices/msc-jz4780.h>
1.7 -
1.8 -/* The X1600 RTC functionality is a subset of that in the JZ4780. */
1.9 -
1.10 -#include <l4/devices/rtc-x1600.h>
1.11 +#include <l4/devices/rtc-jz4780.h>
1.12
1.13 /* GPIO-based SPI can use arbitrary pins, whereas on the CI20 only the secondary
1.14 header provides pins like GPC. */
1.15 @@ -382,65 +379,67 @@
1.16
1.17 void *rtc_init(l4_addr_t start, void *cpm)
1.18 {
1.19 - /* Ignore the CPM requirement for the JZ4780. */
1.20 + return jz4780_rtc_init(start, cpm);
1.21 +}
1.22
1.23 - (void) cpm;
1.24 - return x1600_rtc_init(start, NULL);
1.25 +enum Clock_identifiers rtc_get_clock(void *rtc)
1.26 +{
1.27 + return jz4780_rtc_get_clock(rtc);
1.28 }
1.29
1.30 void rtc_disable(void *rtc)
1.31 {
1.32 - x1600_rtc_disable(rtc);
1.33 + jz4780_rtc_disable(rtc);
1.34 }
1.35
1.36 void rtc_enable(void *rtc)
1.37 {
1.38 - x1600_rtc_enable(rtc);
1.39 + jz4780_rtc_enable(rtc);
1.40 }
1.41
1.42 void rtc_alarm_disable(void *rtc)
1.43 {
1.44 - x1600_rtc_alarm_disable(rtc);
1.45 + jz4780_rtc_alarm_disable(rtc);
1.46 }
1.47
1.48 void rtc_alarm_enable(void *rtc)
1.49 {
1.50 - x1600_rtc_alarm_enable(rtc);
1.51 + jz4780_rtc_alarm_enable(rtc);
1.52 }
1.53
1.54 uint32_t rtc_get_seconds(void *rtc)
1.55 {
1.56 - return x1600_rtc_get_seconds(rtc);
1.57 + return jz4780_rtc_get_seconds(rtc);
1.58 }
1.59
1.60 void rtc_set_seconds(void *rtc, uint32_t seconds)
1.61 {
1.62 - x1600_rtc_set_seconds(rtc, seconds);
1.63 + jz4780_rtc_set_seconds(rtc, seconds);
1.64 }
1.65
1.66 uint32_t rtc_get_alarm_seconds(void *rtc)
1.67 {
1.68 - return x1600_rtc_get_alarm_seconds(rtc);
1.69 + return jz4780_rtc_get_alarm_seconds(rtc);
1.70 }
1.71
1.72 void rtc_set_alarm_seconds(void *rtc, uint32_t seconds)
1.73 {
1.74 - x1600_rtc_set_alarm_seconds(rtc, seconds);
1.75 + jz4780_rtc_set_alarm_seconds(rtc, seconds);
1.76 }
1.77
1.78 void rtc_hibernate(void *rtc)
1.79 {
1.80 - x1600_rtc_hibernate(rtc);
1.81 + jz4780_rtc_hibernate(rtc);
1.82 }
1.83
1.84 void rtc_power_down(void *rtc)
1.85 {
1.86 - x1600_rtc_power_down(rtc);
1.87 + jz4780_rtc_power_down(rtc);
1.88 }
1.89
1.90 void rtc_set_regulator(void *rtc, uint32_t base, uint32_t adjustment)
1.91 {
1.92 - x1600_rtc_set_regulator(rtc, base, adjustment);
1.93 + jz4780_rtc_set_regulator(rtc, base, adjustment);
1.94 }
1.95
1.96