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

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

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

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

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  input: i8042 - add runtime check in x86's i8042_platform_init
  Revert "Input: fixup X86_MRST selects"
  Revert "Input: do not force selecting i8042 on Moorestown"
  x86, mrst: Add i8042_detect API for Moorestwon platform
  x86: Add i8042 pre-detection hook to x86_platform_ops
  x86, platform: Export x86_platform to modules
parents 177dd7e1 5cdfa1c3

arch/x86/include/asm/x86_init.h

+2 −0
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ struct x86_cpuinit_ops { 
 * @set_wallclock:		set time back to HW clock

 * @is_untracked_pat_range	exclude from PAT logic

 * @nmi_init			enable NMI on cpus

 * @i8042_detect		pre-detect if i8042 controller exists

 */

struct x86_platform_ops {

	unsigned long (*calibrate_tsc)(void);
@@ -150,6 +151,7 @@ struct x86_platform_ops { 
	void (*iommu_shutdown)(void);

	bool (*is_untracked_pat_range)(u64 start, u64 end);

	void (*nmi_init)(void);

	int (*i8042_detect)(void);

};



extern struct x86_init_ops x86_init;

arch/x86/kernel/mrst.c

+7 −0
Original line number Diff line number Diff line
@@ -216,6 +216,12 @@ static void __init mrst_setup_boot_clock(void) 
		setup_boot_APIC_clock();

};



/* MID systems don't have i8042 controller */

static int mrst_i8042_detect(void)

{

	return 0;

}



/*

 * Moorestown specific x86_init function overrides and early setup

 * calls.
@@ -233,6 +239,7 @@ void __init x86_mrst_early_setup(void) 
	x86_cpuinit.setup_percpu_clockev = mrst_setup_secondary_clock;



	x86_platform.calibrate_tsc = mrst_calibrate_tsc;

	x86_platform.i8042_detect = mrst_i8042_detect;

	x86_init.pci.init = pci_mrst_init;

	x86_init.pci.fixup_irqs = x86_init_noop;

arch/x86/kernel/x86_init.c

+6 −1
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
 */

#include <linux/init.h>

#include <linux/ioport.h>

#include <linux/module.h>



#include <asm/bios_ebda.h>

#include <asm/paravirt.h>
@@ -85,6 +86,7 @@ struct x86_cpuinit_ops x86_cpuinit __cpuinitdata = { 
};



static void default_nmi_init(void) { };

static int default_i8042_detect(void) { return 1; };



struct x86_platform_ops x86_platform = {

	.calibrate_tsc			= native_calibrate_tsc,
@@ -92,5 +94,8 @@ struct x86_platform_ops x86_platform = { 
	.set_wallclock			= mach_set_rtc_mmss,

	.iommu_shutdown			= iommu_shutdown_noop,

	.is_untracked_pat_range		= is_ISA_range,

	.nmi_init			= default_nmi_init

	.nmi_init			= default_nmi_init,

	.i8042_detect			= default_i8042_detect

};



EXPORT_SYMBOL_GPL(x86_platform);

drivers/input/keyboard/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -69,11 +69,11 @@ config KEYBOARD_ATARI 
	  module will be called atakbd.



config KEYBOARD_ATKBD

	tristate "AT keyboard" if EMBEDDED || !X86 || X86_MRST

	tristate "AT keyboard" if EMBEDDED || !X86

	default y

	select SERIO

	select SERIO_LIBPS2

	select SERIO_I8042 if X86 && !X86_MRST

	select SERIO_I8042 if X86

	select SERIO_GSCPS2 if GSC

	help

	  Say Y here if you want to use a standard AT or PS/2 keyboard. Usually

drivers/input/mouse/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ config MOUSE_PS2 
	default y

	select SERIO

	select SERIO_LIBPS2

	select SERIO_I8042 if X86 && !X86_MRST

	select SERIO_I8042 if X86

	select SERIO_GSCPS2 if GSC

	help

	  Say Y here if you have a PS/2 mouse connected to your system. This