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

Commit 6d2cce62 authored by Feng Tang's avatar Feng Tang Committed by H. Peter Anvin
Browse files

x86, mrst: Add i8042_detect API for Moorestwon platform 



It will just return 0 as there is no i8042 controller

Signed-off-by: default avatarFeng Tang <feng.tang@intel.com>
LKML-Reference: <1278342202-10973-3-git-send-email-feng.tang@intel.com>
Acked-by: default avatarDmitry Torokhov <dtor@mail.ru>
Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent c516ac58

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;