Skip to content

Commit

Permalink
intel_scu_ipc: detect CPU type automatically
Browse files Browse the repository at this point in the history
Intel SCU message formats depend upon the processor type. Replace the
module option with automatic detection of the processor type.

Signed-off-by: Sreedhara DS <sreedhara.ds@intel.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
  • Loading branch information
Sreedhara DS authored and Matthew Garrett committed Aug 3, 2010
1 parent a00cd11 commit 14d10f0
Showing 1 changed file with 12 additions and 7 deletions.
19 changes: 12 additions & 7 deletions drivers/platform/x86/intel_scu_ipc.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <linux/pm.h>
#include <linux/pci.h>
#include <linux/interrupt.h>
#include <asm/setup.h>
#include <asm/mrst.h>
#include <asm/intel_scu_ipc.h>

/* IPC defines the following message types */
Expand Down Expand Up @@ -78,12 +78,9 @@ struct intel_scu_ipc_dev {

static struct intel_scu_ipc_dev ipcdev; /* Only one for now */

static int platform = 1;
module_param(platform, int, 0);
MODULE_PARM_DESC(platform, "1 for moorestown platform");



#define PLATFORM_LANGWELL 1
#define PLATFORM_PENWELL 2
static int platform; /* Platform type */

/*
* IPC Read Buffer (Read Only):
Expand Down Expand Up @@ -817,6 +814,14 @@ static struct pci_driver ipc_driver = {

static int __init intel_scu_ipc_init(void)
{
if (boot_cpu_data.x86 == 6 &&
boot_cpu_data.x86_model == 0x27 &&
boot_cpu_data.x86_mask == 1)
platform = PLATFORM_PENWELL;
else if (boot_cpu_data.x86 == 6 &&
boot_cpu_data.x86_model == 0x26)
platform = PLATFORM_LANGWELL;

return pci_register_driver(&ipc_driver);
}

Expand Down

0 comments on commit 14d10f0

Please sign in to comment.