Commit 9fc5c3e3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/intel config: Fix the APB_TIMER selection
  x86/mrst: Add additional debug prints for pb_keys
  x86/intel config: Revamp configuration to allow for Moorestown and Medfield
  x86/intel/scu/ipc: Match the changes in the x86 configuration
  x86/apb: Fix configuration constraints
  x86: Fix INTEL_MID silly
  x86/Kconfig: Cyclone-timer depends on x86-summit
  x86: Reduce clock calibration time during slave cpu startup
  x86/config: Revamp configuration for MID devices
  x86/sfi: Kill the IRQ as id hack
parents 541048a1 7c9c3a1e

arch/x86/Kconfig

+27 −4
Original line number Diff line number Diff line
@@ -420,12 +420,14 @@ config X86_MRST 
	depends on PCI

	depends on PCI_GOANY

	depends on X86_IO_APIC

	select X86_INTEL_MID

	select SFI

	select DW_APB_TIMER

	select APB_TIMER

	select I2C

	select SPI

	select INTEL_SCU_IPC

	select X86_PLATFORM_DEVICES

	select X86_INTEL_MID

	---help---

	  Moorestown is Intel's Low Power Intel Architecture (LPIA) based Moblin

	  Internet Device(MID) platform. Moorestown consists of two chips:
@@ -434,6 +436,26 @@ config X86_MRST 
	  nor standard legacy replacement devices/features. e.g. Moorestown does

	  not contain i8259, i8254, HPET, legacy BIOS, most of the io ports.



config X86_MDFLD

       bool "Medfield MID platform"

	depends on PCI

	depends on PCI_GOANY

	depends on X86_IO_APIC

	select X86_INTEL_MID

	select SFI

	select DW_APB_TIMER

	select APB_TIMER

	select I2C

	select SPI

	select INTEL_SCU_IPC

	select X86_PLATFORM_DEVICES

	---help---

	  Medfield is Intel's Low Power Intel Architecture (LPIA) based Moblin

	  Internet Device(MID) platform. 

	  Unlike standard x86 PCs, Medfield does not have many legacy devices

	  nor standard legacy replacement devices/features. e.g. Medfield does

	  not contain i8259, i8254, HPET, legacy BIOS, most of the io ports.



endif



config X86_RDC321X
@@ -631,7 +653,7 @@ config X86_SUMMIT_NUMA 


config X86_CYCLONE_TIMER

	def_bool y

	depends on X86_32_NON_STANDARD

	depends on X86_SUMMIT



source "arch/x86/Kconfig.cpu"
@@ -659,9 +681,10 @@ config HPET_EMULATE_RTC 
	depends on HPET_TIMER && (RTC=y || RTC=m || RTC_DRV_CMOS=m || RTC_DRV_CMOS=y)



config APB_TIMER

       def_bool y if MRST

       prompt "Langwell APB Timer Support" if X86_MRST

       def_bool y if X86_INTEL_MID

       prompt "Intel MID APB Timer Support" if X86_INTEL_MID

       select DW_APB_TIMER

       depends on X86_INTEL_MID && SFI

       help

         APB timer is the replacement for 8254, HPET on X86 MID platforms.

         The APBT provides a stable time base on SMP

arch/x86/Kconfig.debug

+3 −3
Original line number Diff line number Diff line
@@ -43,9 +43,9 @@ config EARLY_PRINTK 
	  with klogd/syslogd or the X server. You should normally N here,

	  unless you want to debug such a crash.



config EARLY_PRINTK_MRST

	bool "Early printk for MRST platform support"

	depends on EARLY_PRINTK && X86_MRST

config EARLY_PRINTK_INTEL_MID

	bool "Early printk for Intel MID platform support"

	depends on EARLY_PRINTK && X86_INTEL_MID



config EARLY_PRINTK_DBGP

	bool "Early printk via EHCI debug port"

arch/x86/include/asm/fixmap.h

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ enum fixed_addresses { 
#endif

	FIX_TEXT_POKE1,	/* reserve 2 pages for text_poke() */

	FIX_TEXT_POKE0, /* first page is last, because allocation is backward */

#ifdef	CONFIG_X86_MRST

#ifdef	CONFIG_X86_INTEL_MID

	FIX_LNW_VRTC,

#endif

	__end_of_permanent_fixed_addresses,

arch/x86/include/asm/setup.h

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ extern void reserve_standard_io_resources(void); 
extern void i386_reserve_resources(void);

extern void setup_default_timer_irq(void);



#ifdef CONFIG_X86_MRST

#ifdef CONFIG_X86_INTEL_MID

extern void x86_mrst_early_setup(void);

#else

static inline void x86_mrst_early_setup(void) { }

arch/x86/kernel/early_printk.c

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ static int __init setup_early_printk(char *buf) 
		if (!strncmp(buf, "xen", 3))

			early_console_register(&xenboot_console, keep);

#endif

#ifdef CONFIG_EARLY_PRINTK_MRST

#ifdef CONFIG_EARLY_PRINTK_INTEL_MID

		if (!strncmp(buf, "mrst", 4)) {

			mrst_early_console_init();

			early_console_register(&early_mrst_console, keep);

CRA Git | Maintained and supported by SUSTech CRA and CCSE