Patchwork [V3,1/6] RTC: sa1100: Clean out ost register

login
register
mail settings
Submitter Jett.Zhou
Date Nov. 30, 2011, 6:29 a.m.
Message ID <1322634584-4347-1-git-send-email-jtzhou@marvell.com>
Download mbox | patch
Permalink /patch/128419/
State New
Headers show

Comments

Jett.Zhou - Nov. 30, 2011, 6:29 a.m.
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(-)
Jean-Christophe PLAGNIOL-VILLARD - Nov. 30, 2011, 1:46 p.m.
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.
Haojian Zhuang - Nov. 30, 2011, 2:47 p.m.
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.

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);