Merge tag 'v3.13-rc1' into asoc-arizona

Linux 3.13-rc1

1 files changed, 11 insertions, 0 deletions

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 {
 /* RTC Update Register1 */
 #define RTC_UDR_SHIFT           0
 #define RTC_UDR_MASK            (1 << RTC_UDR_SHIFT)
+#define RTC_TCON_SHIFT          1
+#define RTC_TCON_MASK           (1 << RTC_TCON_SHIFT)
+#define RTC_TIME_EN_SHIFT       3
+#define RTC_TIME_EN_MASK        (1 << RTC_TIME_EN_SHIFT)
+
 /* RTC Hour register */
 #define HOUR_PM_SHIFT           6
 #define HOUR_PM_MASK            (1 << HOUR_PM_SHIFT)
@@ -69,6 +74,12 @@ enum sec_rtc_reg {
 #define ALARM_ENABLE_SHIFT      7
 #define ALARM_ENABLE_MASK       (1 << ALARM_ENABLE_SHIFT)
 
+#define SMPL_ENABLE_SHIFT       7
+#define SMPL_ENABLE_MASK        (1 << SMPL_ENABLE_SHIFT)
+
+#define WTSR_ENABLE_SHIFT       6
+#define WTSR_ENABLE_MASK        (1 << WTSR_ENABLE_SHIFT)
+
 enum {
         RTC_SEC = 0,
         RTC_MIN,