| Message ID | 1322634584-4347-1-git-send-email-jtzhou@marvell.com |
|---|---|
| State | Accepted |
| Headers | show |
On 14:29 Wed 30 Nov , Jett.Zhou wrote: > These registers are used in old ioctl of UIE and PIE, now they are > emulated by rtc generic code of hrtimer, so it can be removed. > > Signed-off-by: Jett.Zhou <jtzhou@marvell.com> > Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com> > --- > drivers/rtc/rtc-sa1100.c | 3 --- > 1 files changed, 0 insertions(+), 3 deletions(-) > > diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c > index 0b40bb8..6f22c1f 100644 > --- a/drivers/rtc/rtc-sa1100.c > +++ b/drivers/rtc/rtc-sa1100.c > @@ -36,7 +36,6 @@ > > #ifdef CONFIG_ARCH_PXA > #include <mach/regs-rtc.h> please move this to include/linux too to allow the simgle zImage Best Regards, J.
On Wed, Nov 30, 2011 at 9:46 PM, Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> wrote: > On 14:29 Wed 30 Nov , Jett.Zhou wrote: >> These registers are used in old ioctl of UIE and PIE, now they are >> emulated by rtc generic code of hrtimer, so it can be removed. >> >> Signed-off-by: Jett.Zhou <jtzhou@marvell.com> >> Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com> >> --- >> drivers/rtc/rtc-sa1100.c | 3 --- >> 1 files changed, 0 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c >> index 0b40bb8..6f22c1f 100644 >> --- a/drivers/rtc/rtc-sa1100.c >> +++ b/drivers/rtc/rtc-sa1100.c >> @@ -36,7 +36,6 @@ >> >> #ifdef CONFIG_ARCH_PXA >> #include <mach/regs-rtc.h> > please move this to include/linux too > to allow the simgle zImage > > Best Regards, > J. This patch is used to remove <mach/regs-ost.h>. <regs-rtc.h> will be removed in the rest of this patch series. Please check the third patch.
diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c index 0b40bb8..6f22c1f 100644 --- a/drivers/rtc/rtc-sa1100.c +++ b/drivers/rtc/rtc-sa1100.c @@ -36,7 +36,6 @@ #ifdef CONFIG_ARCH_PXA #include <mach/regs-rtc.h> -#include <mach/regs-ost.h> #endif #define RTC_DEF_DIVIDER (32768 - 1) @@ -188,8 +187,6 @@ static void sa1100_rtc_release(struct device *dev) { spin_lock_irq(&sa1100_rtc_lock); RTSR = 0; - OIER &= ~OIER_E1; - OSSR = OSSR_M1; spin_unlock_irq(&sa1100_rtc_lock); free_irq(IRQ_RTCAlrm, dev);