[PATCH 4.8 22/37] x86/cpu: Rename Merrifield2 to Moorefield

2016-10-14 Thread Greg Kroah-Hartman 
4.8-stable review patch.  If anyone has any objections, please let me know.

--

From: Andy Shevchenko 

commit f5fbf848303c8704d0e1a1e7cabd08fd0a49552f upstream.

Merrifield2 is actually Moorefield.

Rename it accordingly and drop tail digit from Merrifield1.

Signed-off-by: Andy Shevchenko 
Cc: Dave Hansen 
Cc: Linus Torvalds 
Cc: Peter Zijlstra 
Cc: Thomas Gleixner 
Link: 
http://lkml.kernel.org/r/20160906184254.94440-1-andriy.shevche...@linux.intel.com
Signed-off-by: Ingo Molnar 
Signed-off-by: Greg Kroah-Hartman 

---
 arch/x86/include/asm/intel-family.h   |4 ++--
 arch/x86/platform/atom/punit_atom_debug.c |2 +-
 drivers/pci/pci-mid.c |2 +-
 drivers/powercap/intel_rapl.c |4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

--- a/arch/x86/include/asm/intel-family.h
+++ b/arch/x86/include/asm/intel-family.h
@@ -56,8 +56,8 @@
 #define INTEL_FAM6_ATOM_SILVERMONT10x37 /* BayTrail/BYT / Valleyview */
 #define INTEL_FAM6_ATOM_SILVERMONT20x4D /* Avaton/Rangely */
 #define INTEL_FAM6_ATOM_AIRMONT0x4C /* CherryTrail / Braswell 
*/
-#define INTEL_FAM6_ATOM_MERRIFIELD10x4A /* Tangier */
-#define INTEL_FAM6_ATOM_MERRIFIELD20x5A /* 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 */
 
--- a/arch/x86/platform/atom/punit_atom_debug.c
+++ b/arch/x86/platform/atom/punit_atom_debug.c
@@ -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),
{}
 };
--- a/drivers/pci/pci-mid.c
+++ b/drivers/pci/pci-mid.c
@@ -61,7 +61,7 @@ static struct pci_platform_pm_ops mid_pc
 #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),
{}
 };
 
--- a/drivers/powercap/intel_rapl.c
+++ b/drivers/powercap/intel_rapl.c
@@ -1154,8 +1154,8 @@ static const struct x86_cpu_id rapl_ids[
 
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),

[PATCH 4.8 22/37] x86/cpu: Rename Merrifield2 to Moorefield

2016-10-14 Thread Greg Kroah-Hartman 
4.8-stable review patch.  If anyone has any objections, please let me know.

--

From: Andy Shevchenko 

commit f5fbf848303c8704d0e1a1e7cabd08fd0a49552f upstream.

Merrifield2 is actually Moorefield.

Rename it accordingly and drop tail digit from Merrifield1.

Signed-off-by: Andy Shevchenko 
Cc: Dave Hansen 
Cc: Linus Torvalds 
Cc: Peter Zijlstra 
Cc: Thomas Gleixner 
Link: 
http://lkml.kernel.org/r/20160906184254.94440-1-andriy.shevche...@linux.intel.com
Signed-off-by: Ingo Molnar 
Signed-off-by: Greg Kroah-Hartman 

---
 arch/x86/include/asm/intel-family.h   |4 ++--
 arch/x86/platform/atom/punit_atom_debug.c |2 +-
 drivers/pci/pci-mid.c |2 +-
 drivers/powercap/intel_rapl.c |4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

--- a/arch/x86/include/asm/intel-family.h
+++ b/arch/x86/include/asm/intel-family.h
@@ -56,8 +56,8 @@
 #define INTEL_FAM6_ATOM_SILVERMONT10x37 /* BayTrail/BYT / Valleyview */
 #define INTEL_FAM6_ATOM_SILVERMONT20x4D /* Avaton/Rangely */
 #define INTEL_FAM6_ATOM_AIRMONT0x4C /* CherryTrail / Braswell 
*/
-#define INTEL_FAM6_ATOM_MERRIFIELD10x4A /* Tangier */
-#define INTEL_FAM6_ATOM_MERRIFIELD20x5A /* 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 */
 
--- a/arch/x86/platform/atom/punit_atom_debug.c
+++ b/arch/x86/platform/atom/punit_atom_debug.c
@@ -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),
{}
 };
--- a/drivers/pci/pci-mid.c
+++ b/drivers/pci/pci-mid.c
@@ -61,7 +61,7 @@ static struct pci_platform_pm_ops mid_pc
 #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),
{}
 };
 
--- a/drivers/powercap/intel_rapl.c
+++ b/drivers/powercap/intel_rapl.c
@@ -1154,8 +1154,8 @@ static const struct x86_cpu_id rapl_ids[
 
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),