hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 platform updates from Ingo Molnar:
 "Two minor OLPC changes: a build fix and a new quirk"

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/olpc: Fix build error with CONFIG_MFD_CS5535=m
  x86/olpc: Indicate that legacy PC XO-1 platform should not register RTC
This commit is contained in:
Linus Torvalds 2018-10-23 18:17:11 +01:00
parent f682a7920b fa112cf1e8
commit d7197a5ad8
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/x86/Kconfig
View File

@ -2749,8 +2749,7 @@ config OLPC
config OLPC_XO1_PM config OLPC_XO1_PM
bool "OLPC XO-1 Power Management" bool "OLPC XO-1 Power Management"
depends on OLPC && MFD_CS5535 && PM_SLEEP depends on OLPC && MFD_CS5535=y && PM_SLEEP
select MFD_CORE
---help--- ---help---
Add support for poweroff and suspend of the OLPC XO-1 laptop. Add support for poweroff and suspend of the OLPC XO-1 laptop.

3
arch/x86/platform/olpc/olpc-xo1-rtc.c
View File

@ -16,6 +16,7 @@
#include <asm/msr.h> #include <asm/msr.h>
#include <asm/olpc.h> #include <asm/olpc.h>
#include <asm/x86_init.h>
static void rtc_wake_on(struct device *dev) static void rtc_wake_on(struct device *dev)
{ {
@ -75,6 +76,8 @@ static int __init xo1_rtc_init(void)
if (r) if (r)
return r; return r;
x86_platform.legacy.rtc = 0;
device_init_wakeup(&xo1_rtc_device.dev, 1); device_init_wakeup(&xo1_rtc_device.dev, 1);
return 0; return 0;
} }