diff options
author | Mike Frysinger <vapier@gentoo.org> | 2009-10-14 23:10:38 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2009-12-15 00:14:33 -0500 |
commit | 1915b6c0aedbba3bc5042e2b9bdbf7734579352d (patch) | |
tree | f0764ef6e50d9ab02b3cc198c9b2adab30194bd5 /arch | |
parent | 60883e28b3dc6a85fca6f45f2306599523657a49 (diff) |
Blackfin: scrub unused RTC masks
The RTC driver code doesn't need these, and the other parts had these
punted, so keep the global namespace clean.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch')
4 files changed, 0 insertions, 147 deletions
diff --git a/arch/blackfin/mach-bf518/include/mach/defBF51x_base.h b/arch/blackfin/mach-bf518/include/mach/defBF51x_base.h index f9fd2b2a2956..48c702d2aee3 100644 --- a/arch/blackfin/mach-bf518/include/mach/defBF51x_base.h +++ b/arch/blackfin/mach-bf518/include/mach/defBF51x_base.h | |||
@@ -790,32 +790,6 @@ | |||
790 | #define TRO_P 0x0F | 790 | #define TRO_P 0x0F |
791 | 791 | ||
792 | 792 | ||
793 | |||
794 | /* *************** REAL TIME CLOCK MASKS **************************/ | ||
795 | /* RTC_STAT and RTC_ALARM Masks */ | ||
796 | #define RTC_SEC 0x0000003F /* Real-Time Clock Seconds */ | ||
797 | #define RTC_MIN 0x00000FC0 /* Real-Time Clock Minutes */ | ||
798 | #define RTC_HR 0x0001F000 /* Real-Time Clock Hours */ | ||
799 | #define RTC_DAY 0xFFFE0000 /* Real-Time Clock Days */ | ||
800 | |||
801 | /* RTC_ALARM Macro z=day y=hr x=min w=sec */ | ||
802 | #define SET_ALARM(z,y,x,w) ((((z)&0x7FFF)<<0x11)|(((y)&0x1F)<<0xC)|(((x)&0x3F)<<0x6)|((w)&0x3F)) | ||
803 | |||
804 | /* RTC_ICTL and RTC_ISTAT Masks */ | ||
805 | #define STOPWATCH 0x0001 /* Stopwatch Interrupt Enable */ | ||
806 | #define ALARM 0x0002 /* Alarm Interrupt Enable */ | ||
807 | #define SECOND 0x0004 /* Seconds (1 Hz) Interrupt Enable */ | ||
808 | #define MINUTE 0x0008 /* Minutes Interrupt Enable */ | ||
809 | #define HOUR 0x0010 /* Hours Interrupt Enable */ | ||
810 | #define DAY 0x0020 /* 24 Hours (Days) Interrupt Enable */ | ||
811 | #define DAY_ALARM 0x0040 /* Day Alarm (Day, Hour, Minute, Second) Interrupt Enable */ | ||
812 | #define WRITE_PENDING 0x4000 /* Write Pending Status */ | ||
813 | #define WRITE_COMPLETE 0x8000 /* Write Complete Interrupt Enable */ | ||
814 | |||
815 | /* RTC_FAST / RTC_PREN Mask */ | ||
816 | #define PREN 0x0001 /* Enable Prescaler, RTC Runs @1 Hz */ | ||
817 | |||
818 | |||
819 | /* ************** UART CONTROLLER MASKS *************************/ | 793 | /* ************** UART CONTROLLER MASKS *************************/ |
820 | /* UARTx_LCR Masks */ | 794 | /* UARTx_LCR Masks */ |
821 | #define WLS(x) (((x)-5) & 0x03) /* Word Length Select */ | 795 | #define WLS(x) (((x)-5) & 0x03) /* Word Length Select */ |
diff --git a/arch/blackfin/mach-bf527/include/mach/defBF52x_base.h b/arch/blackfin/mach-bf527/include/mach/defBF52x_base.h index b9dbb73d7ef0..51bdea2075b6 100644 --- a/arch/blackfin/mach-bf527/include/mach/defBF52x_base.h +++ b/arch/blackfin/mach-bf527/include/mach/defBF52x_base.h | |||
@@ -791,32 +791,6 @@ | |||
791 | #define TRO_P 0x0F | 791 | #define TRO_P 0x0F |
792 | 792 | ||
793 | 793 | ||
794 | |||
795 | /* *************** REAL TIME CLOCK MASKS **************************/ | ||
796 | /* RTC_STAT and RTC_ALARM Masks */ | ||
797 | #define RTC_SEC 0x0000003F /* Real-Time Clock Seconds */ | ||
798 | #define RTC_MIN 0x00000FC0 /* Real-Time Clock Minutes */ | ||
799 | #define RTC_HR 0x0001F000 /* Real-Time Clock Hours */ | ||
800 | #define RTC_DAY 0xFFFE0000 /* Real-Time Clock Days */ | ||
801 | |||
802 | /* RTC_ALARM Macro z=day y=hr x=min w=sec */ | ||
803 | #define SET_ALARM(z,y,x,w) ((((z)&0x7FFF)<<0x11)|(((y)&0x1F)<<0xC)|(((x)&0x3F)<<0x6)|((w)&0x3F)) | ||
804 | |||
805 | /* RTC_ICTL and RTC_ISTAT Masks */ | ||
806 | #define STOPWATCH 0x0001 /* Stopwatch Interrupt Enable */ | ||
807 | #define ALARM 0x0002 /* Alarm Interrupt Enable */ | ||
808 | #define SECOND 0x0004 /* Seconds (1 Hz) Interrupt Enable */ | ||
809 | #define MINUTE 0x0008 /* Minutes Interrupt Enable */ | ||
810 | #define HOUR 0x0010 /* Hours Interrupt Enable */ | ||
811 | #define DAY 0x0020 /* 24 Hours (Days) Interrupt Enable */ | ||
812 | #define DAY_ALARM 0x0040 /* Day Alarm (Day, Hour, Minute, Second) Interrupt Enable */ | ||
813 | #define WRITE_PENDING 0x4000 /* Write Pending Status */ | ||
814 | #define WRITE_COMPLETE 0x8000 /* Write Complete Interrupt Enable */ | ||
815 | |||
816 | /* RTC_FAST / RTC_PREN Mask */ | ||
817 | #define PREN 0x0001 /* Enable Prescaler, RTC Runs @1 Hz */ | ||
818 | |||
819 | |||
820 | /* ************** UART CONTROLLER MASKS *************************/ | 794 | /* ************** UART CONTROLLER MASKS *************************/ |
821 | /* UARTx_LCR Masks */ | 795 | /* UARTx_LCR Masks */ |
822 | #define WLS(x) (((x)-5) & 0x03) /* Word Length Select */ | 796 | #define WLS(x) (((x)-5) & 0x03) /* Word Length Select */ |
diff --git a/arch/blackfin/mach-bf538/include/mach/defBF539.h b/arch/blackfin/mach-bf538/include/mach/defBF539.h index 1f1aeabc8c89..bfe94dd8340c 100644 --- a/arch/blackfin/mach-bf538/include/mach/defBF539.h +++ b/arch/blackfin/mach-bf538/include/mach/defBF539.h | |||
@@ -1644,56 +1644,6 @@ | |||
1644 | #define TRO_P 0x0F | 1644 | #define TRO_P 0x0F |
1645 | 1645 | ||
1646 | 1646 | ||
1647 | /* *************** REAL TIME CLOCK MASKS **************************/ | ||
1648 | /* RTC_STAT and RTC_ALARM register */ | ||
1649 | #define RTSEC 0x0000003F /* Real-Time Clock Seconds */ | ||
1650 | #define RTMIN 0x00000FC0 /* Real-Time Clock Minutes */ | ||
1651 | #define RTHR 0x0001F000 /* Real-Time Clock Hours */ | ||
1652 | #define RTDAY 0xFFFE0000 /* Real-Time Clock Days */ | ||
1653 | |||
1654 | /* RTC_ICTL register */ | ||
1655 | #define SWIE 0x0001 /* Stopwatch Interrupt Enable */ | ||
1656 | #define AIE 0x0002 /* Alarm Interrupt Enable */ | ||
1657 | #define SIE 0x0004 /* Seconds (1 Hz) Interrupt Enable */ | ||
1658 | #define MIE 0x0008 /* Minutes Interrupt Enable */ | ||
1659 | #define HIE 0x0010 /* Hours Interrupt Enable */ | ||
1660 | #define DIE 0x0020 /* 24 Hours (Days) Interrupt Enable */ | ||
1661 | #define DAIE 0x0040 /* Day Alarm (Day, Hour, Minute, Second) Interrupt Enable */ | ||
1662 | #define WCIE 0x8000 /* Write Complete Interrupt Enable */ | ||
1663 | |||
1664 | /* RTC_ISTAT register */ | ||
1665 | #define SWEF 0x0001 /* Stopwatch Event Flag */ | ||
1666 | #define AEF 0x0002 /* Alarm Event Flag */ | ||
1667 | #define SEF 0x0004 /* Seconds (1 Hz) Event Flag */ | ||
1668 | #define MEF 0x0008 /* Minutes Event Flag */ | ||
1669 | #define HEF 0x0010 /* Hours Event Flag */ | ||
1670 | #define DEF 0x0020 /* 24 Hours (Days) Event Flag */ | ||
1671 | #define DAEF 0x0040 /* Day Alarm (Day, Hour, Minute, Second) Event Flag */ | ||
1672 | #define WPS 0x4000 /* Write Pending Status (RO) */ | ||
1673 | #define WCOM 0x8000 /* Write Complete */ | ||
1674 | |||
1675 | /* RTC_FAST Mask (RTC_PREN Mask) */ | ||
1676 | #define ENABLE_PRESCALE 0x00000001 /* Enable prescaler so RTC runs at 1 Hz */ | ||
1677 | #define PREN 0x00000001 | ||
1678 | /* ** Must be set after power-up for proper operation of RTC */ | ||
1679 | |||
1680 | /* Deprecated RTC_STAT and RTC_ALARM Masks */ | ||
1681 | #define RTC_SEC RTSEC /* Real-Time Clock Seconds */ | ||
1682 | #define RTC_MIN RTMIN /* Real-Time Clock Minutes */ | ||
1683 | #define RTC_HR RTHR /* Real-Time Clock Hours */ | ||
1684 | #define RTC_DAY RTDAY /* Real-Time Clock Days */ | ||
1685 | |||
1686 | /* Deprecated RTC_ICTL/RTC_ISTAT Masks */ | ||
1687 | #define STOPWATCH SWIE /* Stopwatch Interrupt Enable */ | ||
1688 | #define ALARM AIE /* Alarm Interrupt Enable */ | ||
1689 | #define SECOND SIE /* Seconds (1 Hz) Interrupt Enable */ | ||
1690 | #define MINUTE MIE /* Minutes Interrupt Enable */ | ||
1691 | #define HOUR HIE /* Hours Interrupt Enable */ | ||
1692 | #define DAY DIE /* 24 Hours (Days) Interrupt Enable */ | ||
1693 | #define DAY_ALARM DAIE /* Day Alarm (Day, Hour, Minute, Second) Interrupt Enable */ | ||
1694 | #define WRITE_COMPLETE WCIE /* Write Complete Interrupt Enable */ | ||
1695 | |||
1696 | |||
1697 | /* ***************************** UART CONTROLLER MASKS ********************** */ | 1647 | /* ***************************** UART CONTROLLER MASKS ********************** */ |
1698 | /* UARTx_LCR Register */ | 1648 | /* UARTx_LCR Register */ |
1699 | #ifdef _MISRA_RULES | 1649 | #ifdef _MISRA_RULES |
diff --git a/arch/blackfin/mach-bf548/include/mach/defBF54x_base.h b/arch/blackfin/mach-bf548/include/mach/defBF54x_base.h index 8590c8c78336..0d89f2262418 100644 --- a/arch/blackfin/mach-bf548/include/mach/defBF54x_base.h +++ b/arch/blackfin/mach-bf548/include/mach/defBF54x_base.h | |||
@@ -2149,51 +2149,6 @@ | |||
2149 | 2149 | ||
2150 | #define DPRESCALE 0xf /* Load Counter Register */ | 2150 | #define DPRESCALE 0xf /* Load Counter Register */ |
2151 | 2151 | ||
2152 | /* Bit masks for RTC_STAT */ | ||
2153 | |||
2154 | #define SECONDS 0x3f /* Seconds */ | ||
2155 | #define MINUTES 0xfc0 /* Minutes */ | ||
2156 | #define HOURS 0x1f000 /* Hours */ | ||
2157 | #define DAY_COUNTER 0xfffe0000 /* Day Counter */ | ||
2158 | |||
2159 | /* Bit masks for RTC_ICTL */ | ||
2160 | |||
2161 | #define STOPWATCH_INTERRUPT_ENABLE 0x1 /* Stopwatch Interrupt Enable */ | ||
2162 | #define ALARM_INTERRUPT_ENABLE 0x2 /* Alarm Interrupt Enable */ | ||
2163 | #define SECONDS_INTERRUPT_ENABLE 0x4 /* Seconds Interrupt Enable */ | ||
2164 | #define MINUTES_INTERRUPT_ENABLE 0x8 /* Minutes Interrupt Enable */ | ||
2165 | #define HOURS_INTERRUPT_ENABLE 0x10 /* Hours Interrupt Enable */ | ||
2166 | #define TWENTY_FOUR_HOURS_INTERRUPT_ENABLE 0x20 /* 24 Hours Interrupt Enable */ | ||
2167 | #define DAY_ALARM_INTERRUPT_ENABLE 0x40 /* Day Alarm Interrupt Enable */ | ||
2168 | #define WRITE_COMPLETE_INTERRUPT_ENABLE 0x8000 /* Write Complete Interrupt Enable */ | ||
2169 | |||
2170 | /* Bit masks for RTC_ISTAT */ | ||
2171 | |||
2172 | #define STOPWATCH_EVENT_FLAG 0x1 /* Stopwatch Event Flag */ | ||
2173 | #define ALARM_EVENT_FLAG 0x2 /* Alarm Event Flag */ | ||
2174 | #define SECONDS_EVENT_FLAG 0x4 /* Seconds Event Flag */ | ||
2175 | #define MINUTES_EVENT_FLAG 0x8 /* Minutes Event Flag */ | ||
2176 | #define HOURS_EVENT_FLAG 0x10 /* Hours Event Flag */ | ||
2177 | #define TWENTY_FOUR_HOURS_EVENT_FLAG 0x20 /* 24 Hours Event Flag */ | ||
2178 | #define DAY_ALARM_EVENT_FLAG 0x40 /* Day Alarm Event Flag */ | ||
2179 | #define WRITE_PENDING__STATUS 0x4000 /* Write Pending Status */ | ||
2180 | #define WRITE_COMPLETE 0x8000 /* Write Complete */ | ||
2181 | |||
2182 | /* Bit masks for RTC_SWCNT */ | ||
2183 | |||
2184 | #define STOPWATCH_COUNT 0xffff /* Stopwatch Count */ | ||
2185 | |||
2186 | /* Bit masks for RTC_ALARM */ | ||
2187 | |||
2188 | #define SECONDS 0x3f /* Seconds */ | ||
2189 | #define MINUTES 0xfc0 /* Minutes */ | ||
2190 | #define HOURS 0x1f000 /* Hours */ | ||
2191 | #define DAY 0xfffe0000 /* Day */ | ||
2192 | |||
2193 | /* Bit masks for RTC_PREN */ | ||
2194 | |||
2195 | #define PREN 0x1 /* Prescaler Enable */ | ||
2196 | |||
2197 | /* Bit masks for OTP_CONTROL */ | 2152 | /* Bit masks for OTP_CONTROL */ |
2198 | 2153 | ||
2199 | #define FUSE_FADDR 0x1ff /* OTP/Fuse Address */ | 2154 | #define FUSE_FADDR 0x1ff /* OTP/Fuse Address */ |