From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
To: Linux Media Mailing List <linux-media@vger.kernel.org>
Cc: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>,
Sakari Ailus <sakari.ailus@linux.intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Subject: [PATCH 10/15] media: atomisp: use macros from intel-family.h
Date: Wed, 3 Jun 2020 09:00:56 +0200 [thread overview]
Message-ID: <965cadd19363e32bd885e195276dd366a4a0b24a.1591167358.git.mchehab+huawei@kernel.org> (raw)
In-Reply-To: <cover.1591167358.git.mchehab+huawei@kernel.org>
Instead of hardcoding the intel family values there, use
the already defined ones from asm/intel-family.h.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
---
.../media/atomisp/include/linux/atomisp_platform.h | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/media/atomisp/include/linux/atomisp_platform.h b/drivers/staging/media/atomisp/include/linux/atomisp_platform.h
index 4bf76a780b6d..395d7c022ad1 100644
--- a/drivers/staging/media/atomisp/include/linux/atomisp_platform.h
+++ b/drivers/staging/media/atomisp/include/linux/atomisp_platform.h
@@ -18,6 +18,8 @@
#ifndef ATOMISP_PLATFORM_H_
#define ATOMISP_PLATFORM_H_
+#include <asm/intel-family.h>
+
#include <linux/i2c.h>
#include <linux/sfi.h>
#include <media/v4l2-subdev.h>
@@ -240,9 +242,9 @@ const struct atomisp_camera_caps *atomisp_get_default_camera_caps(void);
boot_cpu_data.x86 == 6 && \
boot_cpu_data.x86_model == x)
-#define IS_MFLD __IS_SOC(0x27)
-#define IS_BYT __IS_SOC(0x37)
-#define IS_CHT __IS_SOC(0x4C)
-#define IS_MOFD __IS_SOC(0x5A)
+#define IS_MFLD __IS_SOC(INTEL_FAM6_ATOM_SALTWELL_MID)
+#define IS_BYT __IS_SOC(INTEL_FAM6_ATOM_SILVERMONT)
+#define IS_CHT __IS_SOC(INTEL_FAM6_ATOM_AIRMONT)
+#define IS_MOFD __IS_SOC(INTEL_FAM6_ATOM_AIRMONT_MID)
#endif /* ATOMISP_PLATFORM_H_ */
--
2.26.2
next prev parent reply other threads:[~2020-06-03 7:01 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-03 7:00 [PATCH 00/15] More atomisp fixes and cleanups Mauro Carvalho Chehab
2020-06-03 7:00 ` [PATCH 01/15] media: atomisp: improve IRQ handling debug messages Mauro Carvalho Chehab
2020-06-03 7:00 ` [PATCH 02/15] media: atomisp: do some cleanup at irq_local.h Mauro Carvalho Chehab
2020-06-03 7:00 ` [PATCH 03/15] media: atomisp: get rid of a duplicated file Mauro Carvalho Chehab
2020-06-03 7:00 ` [PATCH 04/15] media: atomisp: get rid of ifdef nonsense Mauro Carvalho Chehab
2020-06-03 7:00 ` [PATCH 05/15] media: atomisp: simplify IRQ ifdef logic Mauro Carvalho Chehab
2020-06-03 7:00 ` [PATCH 06/15] media: atomisp: remove some unused defines from *mamoiada_params.h Mauro Carvalho Chehab
2020-06-03 7:00 ` [PATCH 07/15] media: atomisp: use just one mamoiada_params.h Mauro Carvalho Chehab
2020-06-03 7:00 ` [PATCH 08/15] media: atomisp: get rid of a detection hack for a BYT Andorid-based tablet Mauro Carvalho Chehab
2020-06-03 7:00 ` [PATCH 09/15] media: atomisp: don't set hpll_freq twice with different values Mauro Carvalho Chehab
2020-06-03 7:00 ` Mauro Carvalho Chehab [this message]
2020-06-03 7:00 ` [PATCH 11/15] media: atomisp: change the detection of ISP2401 at runtime Mauro Carvalho Chehab
2020-06-03 7:00 ` [PATCH 12/15] media: atomisp: use different dfs failed messages Mauro Carvalho Chehab
2020-06-03 7:00 ` [PATCH 13/15] media: atomisp: set DFS to MAX if sensor doesn't report fps Mauro Carvalho Chehab
2020-06-03 7:01 ` [PATCH 14/15] media: atomisp: use strscpy() instead of less secure variants Mauro Carvalho Chehab
2020-06-03 7:01 ` [PATCH 15/15] media: atomisp: get rid of a string_support.h abstraction layer Mauro Carvalho Chehab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=965cadd19363e32bd885e195276dd366a4a0b24a.1591167358.git.mchehab+huawei@kernel.org \
--to=mchehab+huawei@kernel.org \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=sakari.ailus@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).