tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

media: atomisp: Switch to new Intel CPU model defines

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

Signed-off-by: Tony Luck <tony.luck@intel.com>
Reviewed-by: Andy Shevchenko <andy@kernel.org>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

authored by

Tony Luck and committed by
Mauro Carvalho Chehab 156922fa dce30a66

+10 -15
+10 -15
drivers/staging/media/atomisp/include/linux/atomisp_platform.h
··· 18 18 #ifndef ATOMISP_PLATFORM_H_ 19 19 #define ATOMISP_PLATFORM_H_ 20 20 21 - #include <asm/intel-family.h> 21 + #include <asm/cpu_device_id.h> 22 22 #include <asm/processor.h> 23 23 24 24 #include <linux/i2c.h> ··· 178 178 int v4l2_get_acpi_sensor_info(struct device *dev, char **module_id_str); 179 179 180 180 /* API from old platform_camera.h, new CPUID implementation */ 181 - #define __IS_SOC(x) (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL && \ 182 - boot_cpu_data.x86 == 6 && \ 183 - boot_cpu_data.x86_model == (x)) 184 - #define __IS_SOCS(x,y) (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL && \ 185 - boot_cpu_data.x86 == 6 && \ 186 - (boot_cpu_data.x86_model == (x) || \ 187 - boot_cpu_data.x86_model == (y))) 181 + #define __IS_SOC(x) (boot_cpu_data.x86_vfm == x) 182 + #define __IS_SOCS(x, y) (boot_cpu_data.x86_vfm == x || boot_cpu_data.x86_vfm == y) 188 183 189 - #define IS_MFLD __IS_SOC(INTEL_FAM6_ATOM_SALTWELL_MID) 190 - #define IS_BYT __IS_SOC(INTEL_FAM6_ATOM_SILVERMONT) 191 - #define IS_CHT __IS_SOC(INTEL_FAM6_ATOM_AIRMONT) 192 - #define IS_MRFD __IS_SOC(INTEL_FAM6_ATOM_SILVERMONT_MID) 193 - #define IS_MOFD __IS_SOC(INTEL_FAM6_ATOM_AIRMONT_MID) 184 + #define IS_MFLD __IS_SOC(INTEL_ATOM_SALTWELL_MID) 185 + #define IS_BYT __IS_SOC(INTEL_ATOM_SILVERMONT) 186 + #define IS_CHT __IS_SOC(INTEL_ATOM_AIRMONT) 187 + #define IS_MRFD __IS_SOC(INTEL_ATOM_SILVERMONT_MID) 188 + #define IS_MOFD __IS_SOC(INTEL_ATOM_AIRMONT_MID) 194 189 195 190 /* Both CHT and MOFD come with ISP2401 */ 196 - #define IS_ISP2401 __IS_SOCS(INTEL_FAM6_ATOM_AIRMONT, \ 197 - INTEL_FAM6_ATOM_AIRMONT_MID) 191 + #define IS_ISP2401 __IS_SOCS(INTEL_ATOM_AIRMONT, \ 192 + INTEL_ATOM_AIRMONT_MID) 198 193 199 194 #endif /* ATOMISP_PLATFORM_H_ */