From: TsiChungLiew Date: Fri, 6 Jul 2007 04:21:09 +0000 (-0500) Subject: Rename mcfrtc to rtc X-Git-Tag: v1.3.0-rc1~19^2~2^2~17^2~12^2~8 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e04acb2eba4782489417240eff76e20e176aec10;p=oweals%2Fu-boot.git Rename mcfrtc to rtc Since it is already in m68k folder, un-necessary to pad mcf. Replaced immap_5329.h and m5329.h to immap.h Signed-off-by: TsiChungLiew --- diff --git a/include/asm-m68k/mcfrtc.h b/include/asm-m68k/mcfrtc.h deleted file mode 100644 index 70785354fb..0000000000 --- a/include/asm-m68k/mcfrtc.h +++ /dev/null @@ -1,108 +0,0 @@ -/* - * RealTime Clock - * - * (C) Copyright 2007 - * TsiChung Liew (Tsi-Chung.Liew@freescale.com) - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -#ifndef __MCFRTC_H__ -#define __MCFRTC_H__ - -/* Real time Clock */ -typedef struct rtc_ctrl { - u32 hourmin; /* 0x00 Hours and Minutes Counter Register */ - u32 seconds; /* 0x04 Seconds Counter Register */ - u32 alrm_hm; /* 0x08 Hours and Minutes Alarm Register */ - u32 alrm_sec; /* 0x0C Seconds Alarm Register */ - u32 cr; /* 0x10 Control Register */ - u32 isr; /* 0x14 Interrupt Status Register */ - u32 ier; /* 0x18 Interrupt Enable Register */ - u32 stpwach; /* 0x1C Stopwatch Minutes Register */ - u32 days; /* 0x20 Days Counter Register */ - u32 alrm_day; /* 0x24 Days Alarm Register */ -} rtc_t; - -/* Bit definitions and macros for HOURMIN */ -#define RTC_HOURMIN_MINUTES(x) (((x)&0x0000003F)) -#define RTC_HOURMIN_HOURS(x) (((x)&0x0000001F)<<8) - -/* Bit definitions and macros for SECONDS */ -#define RTC_SECONDS_SECONDS(x) (((x)&0x0000003F)) - -/* Bit definitions and macros for ALRM_HM */ -#define RTC_ALRM_HM_MINUTES(x) (((x)&0x0000003F)) -#define RTC_ALRM_HM_HOURS(x) (((x)&0x0000001F)<<8) - -/* Bit definitions and macros for ALRM_SEC */ -#define RTC_ALRM_SEC_SECONDS(x) (((x)&0x0000003F)) - -/* Bit definitions and macros for CR */ -#define RTC_CR_SWR (0x00000001) -#define RTC_CR_XTL(x) (((x)&0x00000003)<<5) -#define RTC_CR_EN (0x00000080) -#define RTC_CR_32768 (0x0) -#define RTC_CR_32000 (0x1) -#define RTC_CR_38400 (0x2) - -/* Bit definitions and macros for ISR */ -#define RTC_ISR_SW (0x00000001) -#define RTC_ISR_MIN (0x00000002) -#define RTC_ISR_ALM (0x00000004) -#define RTC_ISR_DAY (0x00000008) -#define RTC_ISR_1HZ (0x00000010) -#define RTC_ISR_HR (0x00000020) -#define RTC_ISR_2HZ (0x00000080) -#define RTC_ISR_SAM0 (0x00000100) -#define RTC_ISR_SAM1 (0x00000200) -#define RTC_ISR_SAM2 (0x00000400) -#define RTC_ISR_SAM3 (0x00000800) -#define RTC_ISR_SAM4 (0x00001000) -#define RTC_ISR_SAM5 (0x00002000) -#define RTC_ISR_SAM6 (0x00004000) -#define RTC_ISR_SAM7 (0x00008000) - -/* Bit definitions and macros for IER */ -#define RTC_IER_SW (0x00000001) -#define RTC_IER_MIN (0x00000002) -#define RTC_IER_ALM (0x00000004) -#define RTC_IER_DAY (0x00000008) -#define RTC_IER_1HZ (0x00000010) -#define RTC_IER_HR (0x00000020) -#define RTC_IER_2HZ (0x00000080) -#define RTC_IER_SAM0 (0x00000100) -#define RTC_IER_SAM1 (0x00000200) -#define RTC_IER_SAM2 (0x00000400) -#define RTC_IER_SAM3 (0x00000800) -#define RTC_IER_SAM4 (0x00001000) -#define RTC_IER_SAM5 (0x00002000) -#define RTC_IER_SAM6 (0x00004000) -#define RTC_IER_SAM7 (0x00008000) - -/* Bit definitions and macros for STPWCH */ -#define RTC_STPWCH_CNT(x) (((x)&0x0000003F)) - -/* Bit definitions and macros for DAYS */ -#define RTC_DAYS_DAYS(x) (((x)&0x0000FFFF)) - -/* Bit definitions and macros for ALRM_DAY */ -#define RTC_ALRM_DAY_DAYS(x) (((x)&0x0000FFFF)) - -#endif /* __MCFRTC_H__ */ diff --git a/include/asm-m68k/rtc.h b/include/asm-m68k/rtc.h new file mode 100644 index 0000000000..f955bc5fe1 --- /dev/null +++ b/include/asm-m68k/rtc.h @@ -0,0 +1,108 @@ +/* + * RealTime Clock + * + * Copyright (C) 2004-2007 Freescale Semiconductor, Inc. + * TsiChung Liew (Tsi-Chung.Liew@freescale.com) + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#ifndef __MCFRTC_H__ +#define __MCFRTC_H__ + +/* Real time Clock */ +typedef struct rtc_ctrl { + u32 hourmin; /* 0x00 Hours and Minutes Counter Register */ + u32 seconds; /* 0x04 Seconds Counter Register */ + u32 alrm_hm; /* 0x08 Hours and Minutes Alarm Register */ + u32 alrm_sec; /* 0x0C Seconds Alarm Register */ + u32 cr; /* 0x10 Control Register */ + u32 isr; /* 0x14 Interrupt Status Register */ + u32 ier; /* 0x18 Interrupt Enable Register */ + u32 stpwach; /* 0x1C Stopwatch Minutes Register */ + u32 days; /* 0x20 Days Counter Register */ + u32 alrm_day; /* 0x24 Days Alarm Register */ +} rtc_t; + +/* Bit definitions and macros for HOURMIN */ +#define RTC_HOURMIN_MINUTES(x) (((x)&0x0000003F)) +#define RTC_HOURMIN_HOURS(x) (((x)&0x0000001F)<<8) + +/* Bit definitions and macros for SECONDS */ +#define RTC_SECONDS_SECONDS(x) (((x)&0x0000003F)) + +/* Bit definitions and macros for ALRM_HM */ +#define RTC_ALRM_HM_MINUTES(x) (((x)&0x0000003F)) +#define RTC_ALRM_HM_HOURS(x) (((x)&0x0000001F)<<8) + +/* Bit definitions and macros for ALRM_SEC */ +#define RTC_ALRM_SEC_SECONDS(x) (((x)&0x0000003F)) + +/* Bit definitions and macros for CR */ +#define RTC_CR_SWR (0x00000001) +#define RTC_CR_XTL(x) (((x)&0x00000003)<<5) +#define RTC_CR_EN (0x00000080) +#define RTC_CR_32768 (0x0) +#define RTC_CR_32000 (0x1) +#define RTC_CR_38400 (0x2) + +/* Bit definitions and macros for ISR */ +#define RTC_ISR_SW (0x00000001) +#define RTC_ISR_MIN (0x00000002) +#define RTC_ISR_ALM (0x00000004) +#define RTC_ISR_DAY (0x00000008) +#define RTC_ISR_1HZ (0x00000010) +#define RTC_ISR_HR (0x00000020) +#define RTC_ISR_2HZ (0x00000080) +#define RTC_ISR_SAM0 (0x00000100) +#define RTC_ISR_SAM1 (0x00000200) +#define RTC_ISR_SAM2 (0x00000400) +#define RTC_ISR_SAM3 (0x00000800) +#define RTC_ISR_SAM4 (0x00001000) +#define RTC_ISR_SAM5 (0x00002000) +#define RTC_ISR_SAM6 (0x00004000) +#define RTC_ISR_SAM7 (0x00008000) + +/* Bit definitions and macros for IER */ +#define RTC_IER_SW (0x00000001) +#define RTC_IER_MIN (0x00000002) +#define RTC_IER_ALM (0x00000004) +#define RTC_IER_DAY (0x00000008) +#define RTC_IER_1HZ (0x00000010) +#define RTC_IER_HR (0x00000020) +#define RTC_IER_2HZ (0x00000080) +#define RTC_IER_SAM0 (0x00000100) +#define RTC_IER_SAM1 (0x00000200) +#define RTC_IER_SAM2 (0x00000400) +#define RTC_IER_SAM3 (0x00000800) +#define RTC_IER_SAM4 (0x00001000) +#define RTC_IER_SAM5 (0x00002000) +#define RTC_IER_SAM6 (0x00004000) +#define RTC_IER_SAM7 (0x00008000) + +/* Bit definitions and macros for STPWCH */ +#define RTC_STPWCH_CNT(x) (((x)&0x0000003F)) + +/* Bit definitions and macros for DAYS */ +#define RTC_DAYS_DAYS(x) (((x)&0x0000FFFF)) + +/* Bit definitions and macros for ALRM_DAY */ +#define RTC_ALRM_DAY_DAYS(x) (((x)&0x0000FFFF)) + +#endif /* __MCFRTC_H__ */