Commit 23904815 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 

Pull x86 platform changes from Ingo Molnar.

Removes the Moorestown platform that nobody ever used.

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/platform: Move APIC ID validity check into platform APIC code
  x86/olpc/xo15/sci: Enable lid close wakeup control
  x86/geode/net5501: Add platform driver for Soekris Engineering net5501
  x86/geode/alix2: Supplement driver to include GPIO button support
  x86/mid/powerbtn: Use MSIC read/write instead of ipc_scu
  x86/mid/thermal: Turn off thermistor
  x86/mid/thermal: Add msic_thermal alias
  x86/mid/thermal: Convert to use Intel MSIC API
  x86/mid/scu_ipc: Remove Moorestown support
  x86/mid: Kill off Moorestown
  x86/mrst: Add msic_thermal platform support
  x86/config: Select MSIC MFD driver on Intel Medfield platform
  x86/mid: Remove Intel Moorestown
  x86/mrst: Set ISA bus type for fake MP IRQs
  x86/ioapic: Use legacy_pic to set correct gsi-irq mapping
parents 754b9800 fa63030e

arch/x86/Kconfig

+7 −21
Original line number Diff line number Diff line
@@ -422,27 +422,6 @@ if X86_WANT_INTEL_MID 
config X86_INTEL_MID

	bool



config X86_MRST

       bool "Moorestown 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---

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

	  Internet Device(MID) platform. Moorestown consists of two chips:

	  Lincroft (CPU core, graphics, and memory controller) and Langwell IOH.

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

	  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
@@ -456,6 +435,7 @@ config X86_MDFLD 
	select SPI

	select INTEL_SCU_IPC

	select X86_PLATFORM_DEVICES

	select MFD_INTEL_MSIC

	---help---

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

	  Internet Device(MID) platform.
@@ -2139,6 +2119,12 @@ config ALIX 


	  Note: You have to set alix.force=1 for boards with Award BIOS.



config NET5501

	bool "Soekris Engineering net5501 System Support (LEDS, GPIO, etc)"

	select GPIOLIB

	---help---

	  This option enables system support for the Soekris Engineering net5501.



endif # X86_32



config AMD_NB

arch/x86/include/asm/apic.h

+6 −0
Original line number Diff line number Diff line
@@ -288,6 +288,7 @@ struct apic { 


	int (*probe)(void);

	int (*acpi_madt_oem_check)(char *oem_id, char *oem_table_id);

	int (*apic_id_valid)(int apicid);

	int (*apic_id_registered)(void);



	u32 irq_delivery_mode;
@@ -532,6 +533,11 @@ static inline unsigned int read_apic_id(void) 
	return apic->get_apic_id(reg);

}



static inline int default_apic_id_valid(int apicid)

{

	return x2apic_mode || (apicid < 255);

}



extern void default_setup_apic_routing(void);



extern struct apic apic_noop;

arch/x86/include/asm/mrst.h

+2 −2
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ extern struct sfi_rtc_table_entry sfi_mrtc_array[]; 
 * identified via MSRs.

 */

enum mrst_cpu_type {

	MRST_CPU_CHIP_LINCROFT = 1,

	MRST_CPU_CHIP_PENWELL,

	/* 1 was Moorestown */

	MRST_CPU_CHIP_PENWELL = 2,

};



extern enum mrst_cpu_type __mrst_cpu_chip;

arch/x86/kernel/apic/apic_flat_64.c

+2 −0
Original line number Diff line number Diff line
@@ -180,6 +180,7 @@ static struct apic apic_flat = { 
	.name				= "flat",

	.probe				= flat_probe,

	.acpi_madt_oem_check		= flat_acpi_madt_oem_check,

	.apic_id_valid			= default_apic_id_valid,

	.apic_id_registered		= flat_apic_id_registered,



	.irq_delivery_mode		= dest_LowestPrio,
@@ -337,6 +338,7 @@ static struct apic apic_physflat = { 
	.name				= "physical flat",

	.probe				= physflat_probe,

	.acpi_madt_oem_check		= physflat_acpi_madt_oem_check,

	.apic_id_valid			= default_apic_id_valid,

	.apic_id_registered		= flat_apic_id_registered,



	.irq_delivery_mode		= dest_Fixed,

arch/x86/kernel/apic/apic_noop.c

+1 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ struct apic apic_noop = { 
	.probe				= noop_probe,

	.acpi_madt_oem_check		= NULL,



	.apic_id_valid			= default_apic_id_valid,

	.apic_id_registered		= noop_apic_id_registered,



	.irq_delivery_mode		= dest_LowestPrio,

CRA Git | Maintained and supported by SUSTech CRA and CCSE