Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, earlyprintk: Move mrst early console to platform/ and fix a typo
  x86, apbt: Setup affinity for apb timers acting as per-cpu timer
  ce4100: Add errata fixes for UART on CE4100
  x86: platform: Move iris to x86/platform where it belongs
  x86, mrst: Check platform_device_register() return code
  x86/platform: Add Eurobraille/Iris power off support
  x86, mrst: Add explanation for using 1960 as the year offset for vrtc
  x86, mrst: Fix dependencies of "select INTEL_SCU_IPC"
  x86, mrst: The shutdown for MRST requires the SCU IPC mechanism
  x86: Ce4100: Add reboot_fixup() for CE4100
  ce4100: Add PCI register emulation for CE4100
  x86: Add CE4100 platform support
  x86: mrst: Set vRTC's IRQ to level trigger type
  x86: mrst: Add audio driver bindings
  rtc: Add drivers/rtc/rtc-mrst.c
  x86: mrst: Add vrtc driver which serves as a wall clock device
  x86: mrst: Add Moorestown specific reboot/shutdown support
  x86: mrst: Parse SFI timer table for all timer configs
  x86/mrst: Add SFI platform device parsing code

diff --combined arch/x86/Kconfig
index 97b528d660ad47f778358e029f289f5aa9df6bc8,6ab63107eeafdbf040025e4ccc4486105b515363..b6fccb07123e206e23a4b73534d4891f66753b90
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -21,7 -21,7 +21,7 @@@ config X8
        select HAVE_UNSTABLE_SCHED_CLOCK
        select HAVE_IDE
        select HAVE_OPROFILE
 -      select HAVE_PERF_EVENTS if (!M386 && !M486)
 +      select HAVE_PERF_EVENTS
        select HAVE_IRQ_WORK
        select HAVE_IOREMAP_PROT
        select HAVE_KPROBES
@@@ -377,6 -377,18 +377,18 @@@ config X86_ELA
  
          If unsure, choose "PC-compatible" instead.
  
+ config X86_INTEL_CE
+       bool "CE4100 TV platform"
+       depends on PCI
+       depends on PCI_GODIRECT
+       depends on X86_32
+       depends on X86_EXTENDED_PLATFORM
+       select X86_REBOOTFIXUPS
+       ---help---
+         Select for the Intel CE media processor (CE4100) SOC.
+         This option compiles in support for the CE4100 SOC for settop
+         boxes and media devices.
+ 
  config X86_MRST
         bool "Moorestown MID platform"
        depends on PCI
@@@ -385,6 -397,10 +397,10 @@@
        depends on X86_EXTENDED_PLATFORM
        depends on X86_IO_APIC
        select APB_TIMER
+       select I2C
+       select SPI
+       select INTEL_SCU_IPC
+       select X86_PLATFORM_DEVICES
        ---help---
          Moorestown is Intel's Low Power Intel Architecture (LPIA) based Moblin
          Internet Device(MID) platform. Moorestown consists of two chips:
@@@ -466,6 -482,19 +482,19 @@@ config X86_ES700
          Support for Unisys ES7000 systems.  Say 'Y' here if this kernel is
          supposed to run on an IA32-based Unisys ES7000 system.
  
+ config X86_32_IRIS
+       tristate "Eurobraille/Iris poweroff module"
+       depends on X86_32
+       ---help---
+         The Iris machines from EuroBraille do not have APM or ACPI support
+         to shut themselves down properly.  A special I/O sequence is
+         needed to do so, which is what this module does at
+         kernel shutdown.
+ 
+         This is only for Iris machines from EuroBraille.
+ 
+         If unused, say N.
+ 
  config SCHED_OMIT_FRAME_POINTER
        def_bool y
        prompt "Single-depth WCHAN output"
@@@ -1141,16 -1170,16 +1170,16 @@@ config NUM
  comment "NUMA (Summit) requires SMP, 64GB highmem support, ACPI"
        depends on X86_32 && X86_SUMMIT && (!HIGHMEM64G || !ACPI)
  
 -config K8_NUMA
 +config AMD_NUMA
        def_bool y
        prompt "Old style AMD Opteron NUMA detection"
        depends on X86_64 && NUMA && PCI
        ---help---
 -        Enable K8 NUMA node topology detection.  You should say Y here if
 -        you have a multi processor AMD K8 system. This uses an old
 -        method to read the NUMA configuration directly from the builtin
 -        Northbridge of Opteron. It is recommended to use X86_64_ACPI_NUMA
 -        instead, which also takes priority if both are compiled in.
 +        Enable AMD NUMA node topology detection.  You should say Y here if
 +        you have a multi processor AMD system. This uses an old method to
 +        read the NUMA configuration directly from the builtin Northbridge
 +        of Opteron. It is recommended to use X86_64_ACPI_NUMA instead,
 +        which also takes priority if both are compiled in.
  
  config X86_64_ACPI_NUMA
        def_bool y

diff --combined arch/x86/include/asm/fixmap.h
index 9479a037419fe1358a96cece0d877a269c71e365,139591a933f68c0e196a1451972bf8816a855014..0141b234406fb01f8418320ea49c997fdbd14cbb
--- 1/arch/x86/include/asm/fixmap.h
--- 2/arch/x86/include/asm/fixmap.h
+++ b/arch/x86/include/asm/fixmap.h
@@@ -117,6 -117,10 +117,10 @@@ enum fixed_addresses 
        FIX_TEXT_POKE1, /* reserve 2 pages for text_poke() */
        FIX_TEXT_POKE0, /* first page is last, because allocation is backward */
        __end_of_permanent_fixed_addresses,
+ 
+ #ifdef        CONFIG_X86_MRST
+       FIX_LNW_VRTC,
+ #endif
        /*
         * 256 temporary boot-time mappings, used by early_ioremap(),
         * before ioremap() is functional.
@@@ -216,8 -220,8 +220,8 @@@ static inline unsigned long virt_to_fix
  }
  
  /* Return an pointer with offset calculated */
 -static inline unsigned long __set_fixmap_offset(enum fixed_addresses idx,
 -                              phys_addr_t phys, pgprot_t flags)
 +static __always_inline unsigned long
 +__set_fixmap_offset(enum fixed_addresses idx, phys_addr_t phys, pgprot_t flags)
  {
        __set_fixmap(idx, phys, flags);
        return fix_to_virt(idx) + (phys & (PAGE_SIZE - 1));

diff --combined arch/x86/kernel/Makefile
index 1e994754d323f400b85c5d1d7350c6e52a702ff9,f60153d5de5747b4d23a3da9e385f24a191715fa..34244b2cd880cff373e744ec34193adb8287ab2a
--- 1/arch/x86/kernel/Makefile
--- 2/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@@ -45,7 -45,6 +45,7 @@@ obj-y                 += pci-dma.o quirks.o i8237.o t
  obj-y                 += alternative.o i8253.o pci-nommu.o hw_breakpoint.o
  obj-y                 += tsc.o io_delay.o rtc.o
  obj-y                 += pci-iommu_table.o
 +obj-y                 += resource.o
  
  obj-$(CONFIG_X86_TRAMPOLINE)  += trampoline.o
  obj-y                         += process.o
@@@ -85,7 -84,6 +85,6 @@@ obj-$(CONFIG_DOUBLEFAULT)     += doublefau
  obj-$(CONFIG_KGDB)            += kgdb.o
  obj-$(CONFIG_VM86)            += vm86_32.o
  obj-$(CONFIG_EARLY_PRINTK)    += early_printk.o
- obj-$(CONFIG_EARLY_PRINTK_MRST)       += early_printk_mrst.o
  
  obj-$(CONFIG_HPET_TIMER)      += hpet.o
  obj-$(CONFIG_APB_TIMER)               += apb_timer.o