diff options
| author | Sangbeom Kim <sbkim73@samsung.com> | 2013-11-12 18:11:04 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-12 22:09:31 -0500 |
| commit | 5bccae6ec4587044779f0b8e6fcb8f87db4181f0 (patch) | |
| tree | 7296acf72c7d9cbf594ec3e9d40140f18ac9e363 /include/linux/mfd | |
| parent | 5e0d12142e1cf5dc7a8a276fc1fe60b8a5ecb1d3 (diff) | |
rtc: s5m-rtc: add real-time clock driver for s5m8767
Add real-time clock driver for s5m8767.
Signed-off-by: Sangbeom Kim <sbkim73@samsung.com>
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Todd Broch <tbroch@chromium.org>
Cc: Mark Brown <broonie@kernel.org>
Acked-by: Lee Jones <lee.jones@linaro.org> [mfd parts]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/mfd')
| -rw-r--r-- | include/linux/mfd/samsung/core.h | 1 | ||||
| -rw-r--r-- | include/linux/mfd/samsung/rtc.h | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/include/linux/mfd/samsung/core.h b/include/linux/mfd/samsung/core.h index 378ae8a04c6a..2d0c9071bcfb 100644 --- a/include/linux/mfd/samsung/core.h +++ b/include/linux/mfd/samsung/core.h | |||
| @@ -51,6 +51,7 @@ struct sec_pmic_dev { | |||
| 51 | int ono; | 51 | int ono; |
| 52 | int type; | 52 | int type; |
| 53 | bool wakeup; | 53 | bool wakeup; |
| 54 | bool wtsr_smpl; | ||
| 54 | }; | 55 | }; |
| 55 | 56 | ||
| 56 | int sec_irq_init(struct sec_pmic_dev *sec_pmic); | 57 | int sec_irq_init(struct sec_pmic_dev *sec_pmic); |
diff --git a/include/linux/mfd/samsung/rtc.h b/include/linux/mfd/samsung/rtc.h index 71597e20cddb..94b7cd6d8891 100644 --- a/include/linux/mfd/samsung/rtc.h +++ b/include/linux/mfd/samsung/rtc.h | |||
| @@ -62,6 +62,11 @@ enum sec_rtc_reg { | |||
| 62 | /* RTC Update Register1 */ | 62 | /* RTC Update Register1 */ |
| 63 | #define RTC_UDR_SHIFT 0 | 63 | #define RTC_UDR_SHIFT 0 |
| 64 | #define RTC_UDR_MASK (1 << RTC_UDR_SHIFT) | 64 | #define RTC_UDR_MASK (1 << RTC_UDR_SHIFT) |
| 65 | #define RTC_TCON_SHIFT 1 | ||
| 66 | #define RTC_TCON_MASK (1 << RTC_TCON_SHIFT) | ||
| 67 | #define RTC_TIME_EN_SHIFT 3 | ||
| 68 | #define RTC_TIME_EN_MASK (1 << RTC_TIME_EN_SHIFT) | ||
| 69 | |||
| 65 | /* RTC Hour register */ | 70 | /* RTC Hour register */ |
| 66 | #define HOUR_PM_SHIFT 6 | 71 | #define HOUR_PM_SHIFT 6 |
| 67 | #define HOUR_PM_MASK (1 << HOUR_PM_SHIFT) | 72 | #define HOUR_PM_MASK (1 << HOUR_PM_SHIFT) |
| @@ -69,6 +74,12 @@ enum sec_rtc_reg { | |||
| 69 | #define ALARM_ENABLE_SHIFT 7 | 74 | #define ALARM_ENABLE_SHIFT 7 |
| 70 | #define ALARM_ENABLE_MASK (1 << ALARM_ENABLE_SHIFT) | 75 | #define ALARM_ENABLE_MASK (1 << ALARM_ENABLE_SHIFT) |
| 71 | 76 | ||
| 77 | #define SMPL_ENABLE_SHIFT 7 | ||
| 78 | #define SMPL_ENABLE_MASK (1 << SMPL_ENABLE_SHIFT) | ||
| 79 | |||
| 80 | #define WTSR_ENABLE_SHIFT 6 | ||
| 81 | #define WTSR_ENABLE_MASK (1 << WTSR_ENABLE_SHIFT) | ||
| 82 | |||
| 72 | enum { | 83 | enum { |
| 73 | RTC_SEC = 0, | 84 | RTC_SEC = 0, |
| 74 | RTC_MIN, | 85 | RTC_MIN, |
