[tip:x86/boot] x86/init: Disable pnpbios and rtc for X86_SUBARCH_CE4100

[tip-bot for Luis R. Rodriguez]

Commit-ID:  a50b22a7a1e60c48ca26cada362076b54823c501
Gitweb:     http://git.kernel.org/tip/a50b22a7a1e60c48ca26cada362076b54823c501
Author:     Luis R. Rodriguez <mcgrof@xxxxxxxxxx>
AuthorDate: Wed, 13 Apr 2016 17:04:46 -0700
Committer:  Ingo Molnar <mingo@xxxxxxxxxx>
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.7070101@xxxxxxxxx

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.60300@xxxxxxxxxxxxx

Suggested-by: H. Peter Anvin <hpa@xxxxxxxxx>
Suggested-by: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
Signed-off-by: Luis R. Rodriguez <mcgrof@xxxxxxxxxx>
Cc: Andy Lutomirski <luto@xxxxxxxxxxxxxx>
Cc: Borislav Petkov <bp@xxxxxxxxx>
Cc: Brian Gerst <brgerst@xxxxxxxxx>
Cc: Denys Vlasenko <dvlasenk@xxxxxxxxxx>
Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: andrew.cooper3@xxxxxxxxxx
Cc: andriy.shevchenko@xxxxxxxxxxxxxxx
Cc: boris.ostrovsky@xxxxxxxxxx
Cc: david.vrabel@xxxxxxxxxx
Cc: ffainelli@xxxxxxxxxx
Cc: george.dunlap@xxxxxxxxxx
Cc: glin@xxxxxxxx
Cc: jgross@xxxxxxxx
Cc: jlee@xxxxxxxx
Cc: josh@xxxxxxxxxxxxxxxx
Cc: julien.grall@xxxxxxxxxx
Cc: konrad.wilk@xxxxxxxxxx
Cc: kozerkov@xxxxxxxxxxxxx
Cc: lenb@xxxxxxxxxx
Cc: lguest@xxxxxxxxxxxxxxxx
Cc: linux-acpi@xxxxxxxxxxxxxxx
Cc: lv.zheng@xxxxxxxxx
Cc: matt@xxxxxxxxxxxxxxxxxxx
Cc: mbizon@xxxxxxxxxx
Cc: rjw@xxxxxxxxxxxxx
Cc: robert.moore@xxxxxxxxx
Cc: rusty@xxxxxxxxxxxxxxx
Cc: tiwai@xxxxxxx
Cc: toshi.kani@xxxxxx
Cc: xen-devel@xxxxxxxxxxxxxxxxxxx
Link: http://lkml.kernel.org/r/1460592286-300-17-git-send-email-mcgrof@xxxxxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
---
 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;