Commit a31a0a3e authored by Tony Luck's avatar Tony Luck Committed by Rafael J. Wysocki
Browse files

thermal: intel: intel_soc_dts_thermal: Switch to new Intel CPU model defines 



New CPU #defines encode vendor and family as well as model.

Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 0f46ecc4

drivers/thermal/intel/intel_soc_dts_thermal.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ static irqreturn_t soc_irq_thread_fn(int irq, void *dev_data) 
}



static const struct x86_cpu_id soc_thermal_ids[] = {

	X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT, BYT_SOC_DTS_APIC_IRQ),

	X86_MATCH_VFM(INTEL_ATOM_SILVERMONT, BYT_SOC_DTS_APIC_IRQ),

	{}

};

MODULE_DEVICE_TABLE(x86cpu, soc_thermal_ids);

include/linux/platform_data/x86/soc.h

+6 −6
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
static inline bool soc_intel_is_##soc(void)			\

{								\

	static const struct x86_cpu_id soc##_cpu_ids[] = {	\

		X86_MATCH_INTEL_FAM6_MODEL(type, NULL),		\

		X86_MATCH_VFM(type, NULL),			\

		{}						\

	};							\

	const struct x86_cpu_id *id;				\
@@ -31,11 +31,11 @@ static inline bool soc_intel_is_##soc(void) \ 
	return false;						\

}



SOC_INTEL_IS_CPU(byt, ATOM_SILVERMONT);

SOC_INTEL_IS_CPU(cht, ATOM_AIRMONT);

SOC_INTEL_IS_CPU(apl, ATOM_GOLDMONT);

SOC_INTEL_IS_CPU(glk, ATOM_GOLDMONT_PLUS);

SOC_INTEL_IS_CPU(cml, KABYLAKE_L);

SOC_INTEL_IS_CPU(byt, INTEL_ATOM_SILVERMONT);

SOC_INTEL_IS_CPU(cht, INTEL_ATOM_AIRMONT);

SOC_INTEL_IS_CPU(apl, INTEL_ATOM_GOLDMONT);

SOC_INTEL_IS_CPU(glk, INTEL_ATOM_GOLDMONT_PLUS);

SOC_INTEL_IS_CPU(cml, INTEL_KABYLAKE_L);



#undef SOC_INTEL_IS_CPU