tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 2e4333c1 04516981

+2 -2
+1 -1
arch/mips/kernel/time.c
··· 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)
+1 -1
arch/mips/lantiq/falcon/sysctrl.c
··· 24 24 25 25 /* GPE frequency selection */ 26 26 #define GPPC_OFFSET 24 27 - #define GPEFREQ_MASK 0x00000C0 27 + #define GPEFREQ_MASK 0x0000C00 28 28 #define GPEFREQ_OFFSET 10 29 29 /* Clock status register */ 30 30 #define SYSCTL_CLKS 0x0000