| Message ID | 1257349762-21407-1-git-send-email-wuzhangjin@gmail.com |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Wed, Nov 04, 2009 at 11:49:22PM +0800, Wu Zhangjin wrote: > diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c > index f7a4701..820bdad 100644 > --- a/drivers/rtc/rtc-cmos.c > +++ b/drivers/rtc/rtc-cmos.c > @@ -691,7 +691,8 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq) > */ > #if defined(CONFIG_ATARI) > address_space = 64; > -#elif defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__sparc__) > +#elif defined(__i386__) || defined(__x86_64__) || defined(__arm__) \ > + || defined(__sparc__) || defined(__mips__) > address_space = 128; > #else > #warning Assuming 128 bytes of RTC+NVRAM address space, not 64 bytes. I'd like to see at least this first segment included for 2.6.32 already. Ralf --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to "rtc-linux". Membership options at http://groups.google.com/group/rtc-linux . Please read http://groups.google.com/group/rtc-linux/web/checklist before submitting a driver. -~----------~----~----~----~------~----~------~--~---
On Wed, 2009-11-04 at 17:26 +0100, Ralf Baechle wrote: > On Wed, Nov 04, 2009 at 11:49:22PM +0800, Wu Zhangjin wrote: > > > diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c > > index f7a4701..820bdad 100644 > > --- a/drivers/rtc/rtc-cmos.c > > +++ b/drivers/rtc/rtc-cmos.c > > @@ -691,7 +691,8 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq) > > */ > > #if defined(CONFIG_ATARI) > > address_space = 64; > > -#elif defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__sparc__) > > +#elif defined(__i386__) || defined(__x86_64__) || defined(__arm__) \ > > + || defined(__sparc__) || defined(__mips__) > > address_space = 128; > > #else > > #warning Assuming 128 bytes of RTC+NVRAM address space, not 64 bytes. > > I'd like to see at least this first segment included for 2.6.32 already. > Will split it out for 2.6.32. Regards, Wu Zhangjin --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to "rtc-linux". Membership options at http://groups.google.com/group/rtc-linux . Please read http://groups.google.com/group/rtc-linux/web/checklist before submitting a driver. -~----------~----~----~----~------~----~------~--~---
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c index f7a4701..820bdad 100644 --- a/drivers/rtc/rtc-cmos.c +++ b/drivers/rtc/rtc-cmos.c @@ -691,7 +691,8 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq) */ #if defined(CONFIG_ATARI) address_space = 64; -#elif defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__sparc__) +#elif defined(__i386__) || defined(__x86_64__) || defined(__arm__) \ + || defined(__sparc__) || defined(__mips__) address_space = 128; #else #warning Assuming 128 bytes of RTC+NVRAM address space, not 64 bytes. @@ -756,9 +757,8 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq) /* FIXME teach the alarm code how to handle binary mode; * <asm-generic/rtc.h> doesn't know 12-hour mode either. */ - if (is_valid_irq(rtc_irq) && - (!(rtc_control & RTC_24H) || (rtc_control & (RTC_DM_BINARY)))) { - dev_dbg(dev, "only 24-hr BCD mode supported\n"); + if (is_valid_irq(rtc_irq) && !(rtc_control & RTC_24H)) { + dev_dbg(dev, "only 24-hr supported\n"); retval = -ENXIO; goto cleanup1; }
This patch fixes the following warning with RTC_LIB on MIPS: drivers/rtc/rtc-cmos.c:697:2: warning: #warning Assuming 128 bytes of RTC+NVRAM address space, not 64 bytes. and also, enables the RTC_DM_BINARY support. without this support, RTC_LIB of fuloong2e and fuloong2f does not work. The platform RTC device driver is coming in the next patch. Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com> --- drivers/rtc/rtc-cmos.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)