Commit 2e4333c1 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

Pull MIPS fixes from Ralf Baechle:
 "Two more MIPS fixes for 4.9:

   - RTC: Return -ENODEV so an external RTC will be tried

   - Fix mask of GPE frequency

  These two have been tested on Imagination's automated test system and
  also both received positive reviews on the linux-mips mailing list"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: Lantiq: Fix mask of GPE frequency
  MIPS: Return -ENODEV from weak implementation of rtc_mips_set_time
parents 04516981 ba735155
...@@ -36,7 +36,7 @@ EXPORT_SYMBOL(rtc_lock); ...@@ -36,7 +36,7 @@ EXPORT_SYMBOL(rtc_lock);
int __weak rtc_mips_set_time(unsigned long sec) int __weak rtc_mips_set_time(unsigned long sec)
{ {
return 0; return -ENODEV;
} }
int __weak rtc_mips_set_mmss(unsigned long nowtime) int __weak rtc_mips_set_mmss(unsigned long nowtime)
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
/* GPE frequency selection */ /* GPE frequency selection */
#define GPPC_OFFSET 24 #define GPPC_OFFSET 24
#define GPEFREQ_MASK 0x00000C0 #define GPEFREQ_MASK 0x0000C00
#define GPEFREQ_OFFSET 10 #define GPEFREQ_OFFSET 10
/* Clock status register */ /* Clock status register */
#define SYSCTL_CLKS 0x0000 #define SYSCTL_CLKS 0x0000
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment