diff options
| author | Mark Brown <broonie@kernel.org> | 2026-10-01 15:39:58 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-10-01 15:39:58 +0100 |
| commit | 20f03c0baae90a8cc3f665cddbd8a1fadb080b3b (patch) | |
| tree | f411307d289bde5e62d8be8f378dfd5a41b5e174 /include | |
| parent | 26e43d5eb9c6dd8e785d5853dceb23755e852d92 (diff) | |
| parent | 8ef8e9839a23ca7f5dda6a69b670633de5a23716 (diff) | |
| download | linux-next-20f03c0baae90a8cc3f665cddbd8a1fadb080b3b.tar.gz linux-next-20f03c0baae90a8cc3f665cddbd8a1fadb080b3b.zip | |
Merge branch 'rtc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mfd/mt6397/rtc.h | 7 | ||||
| -rw-r--r-- | include/linux/rtc/rtc-omap.h | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/include/linux/mfd/mt6397/rtc.h b/include/linux/mfd/mt6397/rtc.h index 27883af44f87..f4da579ec638 100644 --- a/include/linux/mfd/mt6397/rtc.h +++ b/include/linux/mfd/mt6397/rtc.h @@ -49,6 +49,13 @@ #define RTC_AL_SEC 0x0018 +/* The high byte of four of the alarms is spare, always-on storage */ +#define RTC_AL_HOU 0x001c +#define RTC_AL_DOM 0x001e +#define RTC_AL_DOW 0x0020 +#define RTC_AL_MTH 0x0022 +#define RTC_SPARE_MASK GENMASK(15, 8) + #define RTC_AL_SEC_MASK 0x003f #define RTC_AL_MIN_MASK 0x003f #define RTC_AL_HOU_MASK 0x001f diff --git a/include/linux/rtc/rtc-omap.h b/include/linux/rtc/rtc-omap.h index 9f03a329e63f..d6ec7c4daea6 100644 --- a/include/linux/rtc/rtc-omap.h +++ b/include/linux/rtc/rtc-omap.h @@ -3,5 +3,5 @@ #ifndef _LINUX_RTCOMAP_H_ #define _LINUX_RTCOMAP_H_ -int omap_rtc_power_off_program(struct device *dev); +int omap_rtc_power_off_program(void); #endif /* _LINUX_RTCOMAP_H_ */ |