lkml.org 
[lkml]   [2010]   [Jul]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:x86/urgent] x86, mrst: Add i8042_detect API for Moorestwon platform
    Commit-ID:  6d2cce62017efe957e34cfcbba23861b7671980b
    Gitweb: http://git.kernel.org/tip/6d2cce62017efe957e34cfcbba23861b7671980b
    Author: Feng Tang <feng.tang@intel.com>
    AuthorDate: Mon, 5 Jul 2010 23:03:19 +0800
    Committer: H. Peter Anvin <hpa@linux.intel.com>
    CommitDate: Wed, 7 Jul 2010 17:05:06 -0700

    x86, mrst: Add i8042_detect API for Moorestwon platform

    It will just return 0 as there is no i8042 controller

    Signed-off-by: Feng Tang <feng.tang@intel.com>
    LKML-Reference: <1278342202-10973-3-git-send-email-feng.tang@intel.com>
    Acked-by: Dmitry Torokhov <dtor@mail.ru>
    Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
    ---
    arch/x86/kernel/mrst.c | 7 +++++++
    1 files changed, 7 insertions(+), 0 deletions(-)

    diff --git a/arch/x86/kernel/mrst.c b/arch/x86/kernel/mrst.c
    index e796448..5915e0b 100644
    --- a/arch/x86/kernel/mrst.c
    +++ b/arch/x86/kernel/mrst.c
    @@ -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;


    \
     
     \ /
      Last update: 2010-07-08 09:19    [W:0.021 / U:29.964 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site