From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 12 Nov 2013 02:12:22 +0000 (+0900)
Subject: Merge branch 'x86-intel-mid-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.13-rc1~138
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dba538ff5610ee126e33a28fe713b3f108d31f2c;p=profile%2Fcommon%2Fkernel-common.git

Merge branch 'x86-intel-mid-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86/intel-mid changes from Ingo Molnar:
 "Update the 'intel mid' (mobile internet device) platform code as Intel
  is rolling out more SoC designs.

  This gets rid of most of the 'MRST' platform code in the process,
  mostly by renaming and shuffling code around into their respective
  'intel-mid' platform drivers"

* 'x86-intel-mid-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, intel-mid: Do not re-introduce usage of obsolete __cpuinit
  intel_mid: Move platform device setups to their own platform_<device>.* files
  x86: intel-mid: Add section for sfi device table
  intel-mid: sfi: Allow struct devs_id.get_platform_data to be NULL
  intel_mid: Moved SFI related code to sfi.c
  intel_mid: Added custom handler for ipc devices
  intel_mid: Added custom device_handler support
  intel_mid: Refactored sfi_parse_devs() function
  intel_mid: Renamed *mrst* to *intel_mid*
  pci: intel_mid: Return true/false in function returning bool
  intel_mid: Renamed *mrst* to *intel_mid*
  mrst: Fixed indentation issues
  mrst: Fixed printk/pr_* related issues
---

dba538ff5610ee126e33a28fe713b3f108d31f2c
diff --cc arch/x86/kernel/early_printk.c
index 6d3d200,38ca398..01d1c18
--- a/arch/x86/kernel/early_printk.c
+++ b/arch/x86/kernel/early_printk.c
@@@ -14,11 -14,9 +14,11 @@@
  #include <xen/hvc-console.h>
  #include <asm/pci-direct.h>
  #include <asm/fixmap.h>
- #include <asm/mrst.h>
+ #include <asm/intel-mid.h>
  #include <asm/pgtable.h>
  #include <linux/usb/ehci_def.h>
 +#include <linux/efi.h>
 +#include <asm/efi.h>
  
  /* Simple VGA output */
  #define VGABASE		(__ISA_IO_base + 0xb8000)
diff --cc arch/x86/kernel/rtc.c
index 5b9dd44,e35cb18..ca9622a
--- a/arch/x86/kernel/rtc.c
+++ b/arch/x86/kernel/rtc.c
@@@ -189,17 -189,9 +189,17 @@@ static __init int add_rtc_cmos(void
  		return 0;
  
  	/* Intel MID platforms don't have ioport rtc */
- 	if (mrst_identify_cpu())
+ 	if (intel_mid_identify_cpu())
  		return -ENODEV;
  
 +#ifdef CONFIG_ACPI
 +	if (acpi_gbl_FADT.boot_flags & ACPI_FADT_NO_CMOS_RTC) {
 +		/* This warning can likely go away again in a year or two. */
 +		pr_info("ACPI: not registering RTC platform device\n");
 +		return -ENODEV;
 +	}
 +#endif
 +
  	platform_device_register(&rtc_device);
  	dev_info(&rtc_device.dev,
  		 "registered platform RTC device (no PNP device found)\n");