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

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

x86/cpu: Rename Merrifield2 to Moorefield 



Merrifield2 is actually Moorefield.

Rename it accordingly and drop tail digit from Merrifield1.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20160906184254.94440-1-andriy.shevchenko@linux.intel.com


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

arch/x86/include/asm/intel-family.h

+2 −2
Original line number Diff line number Diff line
@@ -56,8 +56,8 @@ 
#define INTEL_FAM6_ATOM_SILVERMONT1	0x37 /* BayTrail/BYT / Valleyview */

#define INTEL_FAM6_ATOM_SILVERMONT2	0x4D /* Avaton/Rangely */

#define INTEL_FAM6_ATOM_AIRMONT		0x4C /* CherryTrail / Braswell */

#define INTEL_FAM6_ATOM_MERRIFIELD1	0x4A /* Tangier */

#define INTEL_FAM6_ATOM_MERRIFIELD2	0x5A /* Annidale */

#define INTEL_FAM6_ATOM_MERRIFIELD	0x4A /* Tangier */

#define INTEL_FAM6_ATOM_MOOREFIELD	0x5A /* Annidale */

#define INTEL_FAM6_ATOM_GOLDMONT	0x5C

#define INTEL_FAM6_ATOM_DENVERTON	0x5F /* Goldmont Microserver */

arch/x86/platform/atom/punit_atom_debug.c

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ static void punit_dbgfs_unregister(void) 


static const struct x86_cpu_id intel_punit_cpu_ids[] = {

	ICPU(INTEL_FAM6_ATOM_SILVERMONT1, punit_device_byt),

	ICPU(INTEL_FAM6_ATOM_MERRIFIELD1, punit_device_tng),

	ICPU(INTEL_FAM6_ATOM_MERRIFIELD,  punit_device_tng),

	ICPU(INTEL_FAM6_ATOM_AIRMONT,	  punit_device_cht),

	{}

};

drivers/pci/pci-mid.c

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static struct pci_platform_pm_ops mid_pci_platform_pm = { 
#define ICPU(model)	{ X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, }



static const struct x86_cpu_id lpss_cpu_ids[] = {

	ICPU(INTEL_FAM6_ATOM_MERRIFIELD1),

	ICPU(INTEL_FAM6_ATOM_MERRIFIELD),

	{}

};

drivers/powercap/intel_rapl.c

+2 −2
Original line number Diff line number Diff line
@@ -1154,8 +1154,8 @@ static const struct x86_cpu_id rapl_ids[] __initconst = { 


	RAPL_CPU(INTEL_FAM6_ATOM_SILVERMONT1,	rapl_defaults_byt),

	RAPL_CPU(INTEL_FAM6_ATOM_AIRMONT,	rapl_defaults_cht),

	RAPL_CPU(INTEL_FAM6_ATOM_MERRIFIELD1,	rapl_defaults_tng),

	RAPL_CPU(INTEL_FAM6_ATOM_MERRIFIELD2,	rapl_defaults_ann),

	RAPL_CPU(INTEL_FAM6_ATOM_MERRIFIELD,	rapl_defaults_tng),

	RAPL_CPU(INTEL_FAM6_ATOM_MOOREFIELD,	rapl_defaults_ann),

	RAPL_CPU(INTEL_FAM6_ATOM_GOLDMONT,	rapl_defaults_core),

	RAPL_CPU(INTEL_FAM6_ATOM_DENVERTON,	rapl_defaults_core),