x86/platform changes for v4.20
Linus,
Please pull the latest x86-platform-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-platform-for-linus
# HEAD: fa112cf1e8bc693d5a666b1c479a2859c8b6e0f1 x86/olpc: Fix build error with CONFIG_MFD_CS5535=m
Two minor OLPC changes: a build fix and a new quirk.
Thanks,
Ingo
------------------>
Borislav Petkov (1):
x86/olpc: Fix build error with CONFIG_MFD_CS5535=m
Lubomir Rintel (1):
x86/olpc: Indicate that legacy PC XO-1 platform should not register RTC
arch/x86/Kconfig | 3 +-- arch/x86/platform/olpc/olpc-xo1-rtc.c | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-)
arch/x86/Kconfig +1 -2
@@ -2742,8 +2742,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.
arch/x86/platform/olpc/olpc-xo1-rtc.c +3 -0
@@ -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 ; }