Skip to content

Commit e651cc3

Browse files
andy-shevmchehab
authored andcommitted
media: atomisp: Replace last use of Intel MID APIs
Intel MID special header is not in use in this driver. Replace it with a better macro for now on. Signed-off-by: Andy Shevchenko <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
1 parent 79317ba commit e651cc3

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

drivers/staging/media/atomisp/include/linux/atomisp_platform.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,7 @@ const struct atomisp_camera_caps *atomisp_get_default_camera_caps(void);
250250
#define IS_MFLD __IS_SOC(INTEL_FAM6_ATOM_SALTWELL_MID)
251251
#define IS_BYT __IS_SOC(INTEL_FAM6_ATOM_SILVERMONT)
252252
#define IS_CHT __IS_SOC(INTEL_FAM6_ATOM_AIRMONT)
253+
#define IS_MRFD __IS_SOC(INTEL_FAM6_ATOM_SILVERMONT_MID)
253254
#define IS_MOFD __IS_SOC(INTEL_FAM6_ATOM_AIRMONT_MID)
254255

255256
/* Both CHT and MOFD come with ISP2401 */

drivers/staging/media/atomisp/pci/atomisp_compat_css20.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333
#include "atomisp_ioctl.h"
3434
#include "atomisp_acc.h"
3535

36-
#include <asm/intel-mid.h>
37-
3836
#include "ia_css_debug.h"
3937
#include "ia_css_isp_param.h"
4038
#include "sh_css_hrt.h"
@@ -1966,8 +1964,7 @@ void atomisp_css_input_set_mode(struct atomisp_sub_device *asd,
19661964
true,
19671965
0x13000,
19681966
&size_mem_words) != 0) {
1969-
if (intel_mid_identify_cpu() ==
1970-
INTEL_MID_CPU_CHIP_TANGIER)
1967+
if (IS_MRFD)
19711968
size_mem_words = CSS_MIPI_FRAME_BUFFER_SIZE_2;
19721969
else
19731970
size_mem_words = CSS_MIPI_FRAME_BUFFER_SIZE_1;

0 commit comments

Comments
 (0)