Merge branch 'x86-intel-mid-for-linus' of git://git.kernel.org/pub/scm/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

5 files changed, 19 insertions, 10 deletions

diff --git a/arch/x86/kernel/apb_timer.c b/arch/x86/kernel/apb_timer.c
index c9876efecafb..af5b08ab3b71 100644
--- a/arch/x86/kernel/apb_timer.c
+++ b/arch/x86/kernel/apb_timer.c
@@ -40,7 +40,7 @@
 
 #include <asm/fixmap.h>
 #include <asm/apb_timer.h>
-#include <asm/mrst.h>
+#include <asm/intel-mid.h>
 #include <asm/time.h>
 
 #define APBT_CLOCKEVENT_RATING          110
@@ -157,13 +157,13 @@ static int __init apbt_clockevent_register(void)
 
         adev->num = smp_processor_id();
         adev->timer = dw_apb_clockevent_init(smp_processor_id(), "apbt0",
-                mrst_timer_options == MRST_TIMER_LAPIC_APBT ?
+                intel_mid_timer_options == INTEL_MID_TIMER_LAPIC_APBT ?
                 APBT_CLOCKEVENT_RATING - 100 : APBT_CLOCKEVENT_RATING,
                 adev_virt_addr(adev), 0, apbt_freq);
         /* Firmware does EOI handling for us. */
         adev->timer->eoi = NULL;
 
-        if (mrst_timer_options == MRST_TIMER_LAPIC_APBT) {
+        if (intel_mid_timer_options == INTEL_MID_TIMER_LAPIC_APBT) {
                 global_clock_event = &adev->timer->ced;
                 printk(KERN_DEBUG "%s clockevent registered as global\n",
                        global_clock_event->name);
@@ -253,7 +253,7 @@ static int apbt_cpuhp_notify(struct notifier_block *n,
 
 static __init int apbt_late_init(void)
 {
-        if (mrst_timer_options == MRST_TIMER_LAPIC_APBT ||
+        if (intel_mid_timer_options == INTEL_MID_TIMER_LAPIC_APBT ||
                 !apb_timer_block_enabled)
                 return 0;
         /* This notifier should be called after workqueue is ready */
@@ -340,7 +340,7 @@ void __init apbt_time_init(void)
         }
 #ifdef CONFIG_SMP
         /* kernel cmdline disable apb timer, so we will use lapic timers */
-        if (mrst_timer_options == MRST_TIMER_LAPIC_APBT) {
+        if (intel_mid_timer_options == INTEL_MID_TIMER_LAPIC_APBT) {
                 printk(KERN_INFO "apbt: disabled per cpu timer\n");
                 return;
         }
diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
index 6d3d20073615..01d1c187c9f9 100644
--- a/arch/x86/kernel/early_printk.c
+++ b/arch/x86/kernel/early_printk.c
@@ -14,7 +14,7 @@
 #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>
diff --git a/arch/x86/kernel/head32.c b/arch/x86/kernel/head32.c
index 06f87bece92a..c61a14a4a310 100644
--- a/arch/x86/kernel/head32.c
+++ b/arch/x86/kernel/head32.c
@@ -35,8 +35,8 @@ asmlinkage void __init i386_start_kernel(void)
 
         /* Call the subarch specific early setup function */
         switch (boot_params.hdr.hardware_subarch) {
-        case X86_SUBARCH_MRST:
-                x86_mrst_early_setup();
+        case X86_SUBARCH_INTEL_MID:
+                x86_intel_mid_early_setup();
                 break;
         case X86_SUBARCH_CE4100:
                 x86_ce4100_early_setup();
diff --git a/arch/x86/kernel/rtc.c b/arch/x86/kernel/rtc.c
index 5b9dd445eb89..ca9622a25e95 100644
--- a/arch/x86/kernel/rtc.c
+++ b/arch/x86/kernel/rtc.c
@@ -12,7 +12,7 @@
 #include <asm/vsyscall.h>
 #include <asm/x86_init.h>
 #include <asm/time.h>
-#include <asm/mrst.h>
+#include <asm/intel-mid.h>
 #include <asm/rtc.h>
 
 #ifdef CONFIG_X86_32
@@ -189,7 +189,7 @@ 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
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index 10c4f3006afd..da6b35a98260 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -199,6 +199,15 @@ SECTIONS
                 __x86_cpu_dev_end = .;
         }
 
+#ifdef CONFIG_X86_INTEL_MID
+        .x86_intel_mid_dev.init : AT(ADDR(.x86_intel_mid_dev.init) - \
+                                                                LOAD_OFFSET) {
+                __x86_intel_mid_dev_start = .;
+                *(.x86_intel_mid_dev.init)
+                __x86_intel_mid_dev_end = .;
+        }
+#endif
+
         /*
          * start address and size of operations which during runtime
          * can be patched with virtualization friendly instructions or