Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4c6e2ea authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-platform-for-linus' of... 

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

* '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
parents 6f46b120 991cfffa

Documentation/x86/boot.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -600,6 +600,7 @@ Protocol: 2.07+ 
  0x00000001	lguest

  0x00000001	lguest

  0x00000002	Xen

  0x00000002	Xen

  0x00000003	Moorestown MID

  0x00000003	Moorestown MID

  0x00000004	CE4100 TV Platform





Field name:	hardware_subarch_data

Field name:	hardware_subarch_data

Type:		write (subarch-dependent)

Type:		write (subarch-dependent)

arch/x86/Kconfig

+29 −0
Original line number Original line Diff line number Diff line
@@ -377,6 +377,18 @@ config X86_ELAN 




	  If unsure, choose "PC-compatible" instead.

	  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

config X86_MRST

       bool "Moorestown MID platform"

       bool "Moorestown MID platform"

	depends on PCI

	depends on PCI
@@ -385,6 +397,10 @@ config X86_MRST 
	depends on X86_EXTENDED_PLATFORM

	depends on X86_EXTENDED_PLATFORM

	depends on X86_IO_APIC

	depends on X86_IO_APIC

	select APB_TIMER

	select APB_TIMER

	select I2C

	select SPI

	select INTEL_SCU_IPC

	select X86_PLATFORM_DEVICES

	---help---

	---help---

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

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

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

	  Internet Device(MID) platform. Moorestown consists of two chips:
@@ -466,6 +482,19 @@ config X86_ES7000 
	  Support for Unisys ES7000 systems.  Say 'Y' here if this kernel is

	  Support for Unisys ES7000 systems.  Say 'Y' here if this kernel is

	  supposed to run on an IA32-based Unisys ES7000 system.

	  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

config SCHED_OMIT_FRAME_POINTER

	def_bool y

	def_bool y

	prompt "Single-depth WCHAN output"

	prompt "Single-depth WCHAN output"

arch/x86/include/asm/bootparam.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -124,6 +124,7 @@ enum { 
	X86_SUBARCH_LGUEST,

	X86_SUBARCH_LGUEST,

	X86_SUBARCH_XEN,

	X86_SUBARCH_XEN,

	X86_SUBARCH_MRST,

	X86_SUBARCH_MRST,

	X86_SUBARCH_CE4100,

	X86_NR_SUBARCHS,

	X86_NR_SUBARCHS,

};

};

arch/x86/include/asm/fixmap.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -117,6 +117,10 @@ enum fixed_addresses { 
	FIX_TEXT_POKE1,	/* reserve 2 pages for text_poke() */

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

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

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

	__end_of_permanent_fixed_addresses,

	__end_of_permanent_fixed_addresses,



#ifdef	CONFIG_X86_MRST

	FIX_LNW_VRTC,

#endif

	/*

	/*

	 * 256 temporary boot-time mappings, used by early_ioremap(),

	 * 256 temporary boot-time mappings, used by early_ioremap(),

	 * before ioremap() is functional.

	 * before ioremap() is functional.

arch/x86/include/asm/mrst-vrtc.h

0 → 100644
+9 −0
Original line number Original line Diff line number Diff line 
#ifndef _MRST_VRTC_H

#define _MRST_VRTC_H



extern unsigned char vrtc_cmos_read(unsigned char reg);

extern void vrtc_cmos_write(unsigned char val, unsigned char reg);

extern unsigned long vrtc_get_time(void);

extern int vrtc_set_mmss(unsigned long nowtime);



#endif