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

torvalds · torvalds · commit d7197a5ad852 · 2018-10-23T18:17:11.000+01:00
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
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
@@ -2749,8 +2749,7 @@ config OLPC
 
 config OLPC_XO1_PM
 	bool "OLPC XO-1 Power Management"
-	depends on OLPC && MFD_CS5535 && PM_SLEEP
-	select MFD_CORE
+	depends on OLPC && MFD_CS5535=y && PM_SLEEP
 	---help---
 	  Add support for poweroff and suspend of the OLPC XO-1 laptop.
 
diff --git a/arch/x86/platform/olpc/olpc-xo1-rtc.c b/arch/x86/platform/olpc/olpc-xo1-rtc.c
@@ -16,6 +16,7 @@
 
 #include <asm/msr.h>
 #include <asm/olpc.h>
+#include <asm/x86_init.h>
 
 static void rtc_wake_on(struct device *dev)
 {
@@ -75,6 +76,8 @@ static int __init xo1_rtc_init(void)
 	if (r)
 		return r;
 
+	x86_platform.legacy.rtc = 0;
+
 	device_init_wakeup(&xo1_rtc_device.dev, 1);
 	return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`
`17`	`17`	`#include <asm/msr.h>`
`18`	`18`	`#include <asm/olpc.h>`
	`19`	`+#include <asm/x86_init.h>`
`19`	`20`
`20`	`21`	`static void rtc_wake_on(struct device *dev)`
`21`	`22`	`{`
`@@ -75,6 +76,8 @@ static int __init xo1_rtc_init(void)`
`75`	`76`	`if (r)`
`76`	`77`	`return r;`
`77`	`78`
	`79`	`+ x86_platform.legacy.rtc = 0;`
	`80`	`+`
`78`	`81`	`device_init_wakeup(&xo1_rtc_device.dev, 1);`
`79`	`82`	`return 0;`
`80`	`83`	`}`