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

torvalds · torvalds · commit 2e4333c14de0 · 2016-12-11T10:17:39.000-08:00
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
diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c
@@ -36,7 +36,7 @@ EXPORT_SYMBOL(rtc_lock);
 
 int __weak rtc_mips_set_time(unsigned long sec)
 {
-	return 0;
+	return -ENODEV;
 }
 
 int __weak rtc_mips_set_mmss(unsigned long nowtime)
diff --git a/arch/mips/lantiq/falcon/sysctrl.c b/arch/mips/lantiq/falcon/sysctrl.c
@@ -24,7 +24,7 @@
 
 /* GPE frequency selection */
 #define GPPC_OFFSET		24
-#define GPEFREQ_MASK		0x00000C0
+#define GPEFREQ_MASK		0x0000C00
 #define GPEFREQ_OFFSET		10
 /* Clock status register */
 #define SYSCTL_CLKS		0x0000

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ EXPORT_SYMBOL(rtc_lock);`
`36`	`36`
`37`	`37`	`int __weak rtc_mips_set_time(unsigned long sec)`
`38`	`38`	`{`
`39`		`- return 0;`
	`39`	`+ return -ENODEV;`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`int __weak rtc_mips_set_mmss(unsigned long nowtime)`