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

Commit 8e522e1d authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Ingo Molnar
Browse files

x86/platform/intel-mid: Add Intel Penwell to ID table 



Commit:

  ca22312d ("x86/platform/intel-mid: Extend PWRMU to support Penwell")

... enabled the PWRMU driver on platforms based on Intel Penwell, but
unfortunately this is not enough.

Add Intel Penwell ID to pci-mid.c driver as well. To avoid confusion in the
future add a comment to both drivers.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Fixes: ca22312d ("x86/platform/intel-mid: Extend PWRMU to support Penwell")
Link: http://lkml.kernel.org/r/20160908103232.137587-1-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent f5fbf848

arch/x86/platform/intel-mid/pwr.c

+1 −0
Original line number Diff line number Diff line
@@ -427,6 +427,7 @@ static const struct mid_pwr_device_info mid_info = { 
	.set_initial_state = mid_set_initial_state,

};



/* This table should be in sync with the one in drivers/pci/pci-mid.c */

static const struct pci_device_id mid_pwr_pci_ids[] = {

	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_PENWELL), (kernel_ulong_t)&mid_info },

	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_TANGIER), (kernel_ulong_t)&mid_info },

drivers/pci/pci-mid.c

+5 −0
Original line number Diff line number Diff line
@@ -60,7 +60,12 @@ static struct pci_platform_pm_ops mid_pci_platform_pm = { 


#define ICPU(model)	{ X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, }



/*

 * This table should be in sync with the one in

 * arch/x86/platform/intel-mid/pwr.c.

 */

static const struct x86_cpu_id lpss_cpu_ids[] = {

	ICPU(INTEL_FAM6_ATOM_PENWELL),

	ICPU(INTEL_FAM6_ATOM_MERRIFIELD),

	{}

};