diff options
author | Krzysztof Kozlowski <k.kozlowski@samsung.com> | 2014-06-10 18:18:40 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-10 18:34:46 -0400 |
commit | 602cb5bbae9868fe48989efa78aca62415309fcf (patch) | |
tree | 7e6794e8085412d6d67c23b63dcf14695585697f /include/linux/mfd | |
parent | a992bf836f9c3039a16f4bd068d161c86c6c3e2c (diff) |
mfd/rtc: sec/s5m: rename SEC* symbols to S5M
Prepare for adding support for S2MPS14 RTC device to the rtc-s5m driver:
1. Rename SEC* symbols to S5M.
2. Add S5M prefix to some of defines which are different between S5M876X
and S2MPS14.
This is only a rename-like patch, new code is not added.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Acked-by: Lee Jones <lee.jones@linaro.org>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Sangbeom Kim <sbkim73@samsung.com>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
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/rtc.h | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/include/linux/mfd/samsung/rtc.h b/include/linux/mfd/samsung/rtc.h index 3e02b768d537..207fcfbde82e 100644 --- a/include/linux/mfd/samsung/rtc.h +++ b/include/linux/mfd/samsung/rtc.h | |||
@@ -18,38 +18,38 @@ | |||
18 | #ifndef __LINUX_MFD_SEC_RTC_H | 18 | #ifndef __LINUX_MFD_SEC_RTC_H |
19 | #define __LINUX_MFD_SEC_RTC_H | 19 | #define __LINUX_MFD_SEC_RTC_H |
20 | 20 | ||
21 | enum sec_rtc_reg { | 21 | enum s5m_rtc_reg { |
22 | SEC_RTC_SEC, | 22 | S5M_RTC_SEC, |
23 | SEC_RTC_MIN, | 23 | S5M_RTC_MIN, |
24 | SEC_RTC_HOUR, | 24 | S5M_RTC_HOUR, |
25 | SEC_RTC_WEEKDAY, | 25 | S5M_RTC_WEEKDAY, |
26 | SEC_RTC_DATE, | 26 | S5M_RTC_DATE, |
27 | SEC_RTC_MONTH, | 27 | S5M_RTC_MONTH, |
28 | SEC_RTC_YEAR1, | 28 | S5M_RTC_YEAR1, |
29 | SEC_RTC_YEAR2, | 29 | S5M_RTC_YEAR2, |
30 | SEC_ALARM0_SEC, | 30 | S5M_ALARM0_SEC, |
31 | SEC_ALARM0_MIN, | 31 | S5M_ALARM0_MIN, |
32 | SEC_ALARM0_HOUR, | 32 | S5M_ALARM0_HOUR, |
33 | SEC_ALARM0_WEEKDAY, | 33 | S5M_ALARM0_WEEKDAY, |
34 | SEC_ALARM0_DATE, | 34 | S5M_ALARM0_DATE, |
35 | SEC_ALARM0_MONTH, | 35 | S5M_ALARM0_MONTH, |
36 | SEC_ALARM0_YEAR1, | 36 | S5M_ALARM0_YEAR1, |
37 | SEC_ALARM0_YEAR2, | 37 | S5M_ALARM0_YEAR2, |
38 | SEC_ALARM1_SEC, | 38 | S5M_ALARM1_SEC, |
39 | SEC_ALARM1_MIN, | 39 | S5M_ALARM1_MIN, |
40 | SEC_ALARM1_HOUR, | 40 | S5M_ALARM1_HOUR, |
41 | SEC_ALARM1_WEEKDAY, | 41 | S5M_ALARM1_WEEKDAY, |
42 | SEC_ALARM1_DATE, | 42 | S5M_ALARM1_DATE, |
43 | SEC_ALARM1_MONTH, | 43 | S5M_ALARM1_MONTH, |
44 | SEC_ALARM1_YEAR1, | 44 | S5M_ALARM1_YEAR1, |
45 | SEC_ALARM1_YEAR2, | 45 | S5M_ALARM1_YEAR2, |
46 | SEC_ALARM0_CONF, | 46 | S5M_ALARM0_CONF, |
47 | SEC_ALARM1_CONF, | 47 | S5M_ALARM1_CONF, |
48 | SEC_RTC_STATUS, | 48 | S5M_RTC_STATUS, |
49 | SEC_WTSR_SMPL_CNTL, | 49 | S5M_WTSR_SMPL_CNTL, |
50 | SEC_RTC_UDR_CON, | 50 | S5M_RTC_UDR_CON, |
51 | 51 | ||
52 | SEC_RTC_REG_MAX, | 52 | S5M_RTC_REG_MAX, |
53 | }; | 53 | }; |
54 | 54 | ||
55 | enum s2mps_rtc_reg { | 55 | enum s2mps_rtc_reg { |
@@ -88,9 +88,9 @@ enum s2mps_rtc_reg { | |||
88 | #define HOUR_12 (1 << 7) | 88 | #define HOUR_12 (1 << 7) |
89 | #define HOUR_AMPM (1 << 6) | 89 | #define HOUR_AMPM (1 << 6) |
90 | #define HOUR_PM (1 << 5) | 90 | #define HOUR_PM (1 << 5) |
91 | #define ALARM0_STATUS (1 << 1) | 91 | #define S5M_ALARM0_STATUS (1 << 1) |
92 | #define ALARM1_STATUS (1 << 2) | 92 | #define S5M_ALARM1_STATUS (1 << 2) |
93 | #define UPDATE_AD (1 << 0) | 93 | #define S5M_UPDATE_AD (1 << 0) |
94 | 94 | ||
95 | #define S2MPS_ALARM0_STATUS (1 << 2) | 95 | #define S2MPS_ALARM0_STATUS (1 << 2) |
96 | #define S2MPS_ALARM1_STATUS (1 << 1) | 96 | #define S2MPS_ALARM1_STATUS (1 << 1) |
@@ -101,16 +101,16 @@ enum s2mps_rtc_reg { | |||
101 | #define MODEL24_SHIFT 1 | 101 | #define MODEL24_SHIFT 1 |
102 | #define MODEL24_MASK (1 << MODEL24_SHIFT) | 102 | #define MODEL24_MASK (1 << MODEL24_SHIFT) |
103 | /* RTC Update Register1 */ | 103 | /* RTC Update Register1 */ |
104 | #define RTC_UDR_SHIFT 0 | 104 | #define S5M_RTC_UDR_SHIFT 0 |
105 | #define RTC_UDR_MASK (1 << RTC_UDR_SHIFT) | 105 | #define S5M_RTC_UDR_MASK (1 << S5M_RTC_UDR_SHIFT) |
106 | #define S2MPS_RTC_WUDR_SHIFT 4 | 106 | #define S2MPS_RTC_WUDR_SHIFT 4 |
107 | #define S2MPS_RTC_WUDR_MASK (1 << S2MPS_RTC_WUDR_SHIFT) | 107 | #define S2MPS_RTC_WUDR_MASK (1 << S2MPS_RTC_WUDR_SHIFT) |
108 | #define S2MPS_RTC_RUDR_SHIFT 0 | 108 | #define S2MPS_RTC_RUDR_SHIFT 0 |
109 | #define S2MPS_RTC_RUDR_MASK (1 << S2MPS_RTC_RUDR_SHIFT) | 109 | #define S2MPS_RTC_RUDR_MASK (1 << S2MPS_RTC_RUDR_SHIFT) |
110 | #define RTC_TCON_SHIFT 1 | 110 | #define RTC_TCON_SHIFT 1 |
111 | #define RTC_TCON_MASK (1 << RTC_TCON_SHIFT) | 111 | #define RTC_TCON_MASK (1 << RTC_TCON_SHIFT) |
112 | #define RTC_TIME_EN_SHIFT 3 | 112 | #define S5M_RTC_TIME_EN_SHIFT 3 |
113 | #define RTC_TIME_EN_MASK (1 << RTC_TIME_EN_SHIFT) | 113 | #define S5M_RTC_TIME_EN_MASK (1 << S5M_RTC_TIME_EN_SHIFT) |
114 | 114 | ||
115 | /* RTC Hour register */ | 115 | /* RTC Hour register */ |
116 | #define HOUR_PM_SHIFT 6 | 116 | #define HOUR_PM_SHIFT 6 |