Commit-ID: a50b22a7a1e60c48ca26cada362076b54823c501 Gitweb: http://git.kernel.org/tip/a50b22a7a1e60c48ca26cada362076b54823c501 Author: Luis R. Rodriguez <mcg...@kernel.org> AuthorDate: Wed, 13 Apr 2016 17:04:46 -0700 Committer: Ingo Molnar <mi...@kernel.org> CommitDate: Fri, 22 Apr 2016 10:29:09 +0200
x86/init: Disable pnpbios and rtc for X86_SUBARCH_CE4100 As per hpa CE4100 platforms can also disable pnpbios: http://lkml.kernel.org/r/5702b5c2.7070...@zytor.com Then Sebastian also recently noted that CE4100 also disables RTC probe, to do that Sebastian had long ago added the RTC of_have_populated_dt() check, he noted that it was meant to skip the RTC probe on all OF platforms but as of now, CE4100 was the only x86 DT using this. We can just fold this requirement into the platform quirk then. This now means that all of these match platform quirks for pnpbios and RTC preferences: * X86_SUBARCH_XEN * X86_SUBARCH_LGUEST * X86_SUBARCH_INTEL_MID * X86_SUBARCH_CE4100 Also see: http://lkml.kernel.org/r/570b52ea.60...@linutronix.de Suggested-by: H. Peter Anvin <h...@zytor.com> Suggested-by: Sebastian Andrzej Siewior <bige...@linutronix.de> Signed-off-by: Luis R. Rodriguez <mcg...@kernel.org> Cc: Andy Lutomirski <l...@amacapital.net> Cc: Borislav Petkov <b...@alien8.de> Cc: Brian Gerst <brge...@gmail.com> Cc: Denys Vlasenko <dvlas...@redhat.com> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Thomas Gleixner <t...@linutronix.de> Cc: andrew.coop...@citrix.com Cc: andriy.shevche...@linux.intel.com Cc: boris.ostrov...@oracle.com Cc: david.vra...@citrix.com Cc: ffaine...@freebox.fr Cc: george.dun...@citrix.com Cc: g...@suse.com Cc: jgr...@suse.com Cc: j...@suse.com Cc: j...@joshtriplett.org Cc: julien.gr...@linaro.org Cc: konrad.w...@oracle.com Cc: kozer...@parallels.com Cc: l...@kernel.org Cc: lgu...@lists.ozlabs.org Cc: linux-a...@vger.kernel.org Cc: lv.zh...@intel.com Cc: m...@codeblueprint.co.uk Cc: mbi...@freebox.fr Cc: r...@rjwysocki.net Cc: robert.mo...@intel.com Cc: ru...@rustcorp.com.au Cc: ti...@suse.de Cc: toshi.k...@hp.com Cc: xen-de...@lists.xensource.com Link: http://lkml.kernel.org/r/1460592286-300-17-git-send-email-mcg...@kernel.org Signed-off-by: Ingo Molnar <mi...@kernel.org> --- arch/x86/kernel/platform-quirks.c | 1 + arch/x86/kernel/rtc.c | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/x86/kernel/platform-quirks.c b/arch/x86/kernel/platform-quirks.c index 8539194..b2f8a33 100644 --- a/arch/x86/kernel/platform-quirks.c +++ b/arch/x86/kernel/platform-quirks.c @@ -17,6 +17,7 @@ void __init x86_early_init_platform_quirks(void) case X86_SUBARCH_XEN: case X86_SUBARCH_LGUEST: case X86_SUBARCH_INTEL_MID: + case X86_SUBARCH_CE4100: x86_platform.legacy.devices.pnpbios = 0; x86_platform.legacy.rtc = 0; break; diff --git a/arch/x86/kernel/rtc.c b/arch/x86/kernel/rtc.c index ff4f418..eceaa08 100644 --- a/arch/x86/kernel/rtc.c +++ b/arch/x86/kernel/rtc.c @@ -186,9 +186,6 @@ static __init int add_rtc_cmos(void) } } #endif - if (of_have_populated_dt()) - return 0; - if (!x86_platform.legacy.rtc) return -ENODEV;
