New CPU #defines encode vendor and family as well as model.
Link: https://lore.kernel.org/lkml/20240611174016.352953-1-tony.luck@intel.com/
Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
---
drivers/extcon/extcon-axp288.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/extcon/extcon-axp288.c b/drivers/extcon/extcon-axp288.c
index a703a8315634..d3bcbe839c09 100644
--- a/drivers/extcon/extcon-axp288.c
+++ b/drivers/extcon/extcon-axp288.c
@@ -108,7 +108,7 @@ struct axp288_extcon_info {
};
static const struct x86_cpu_id cherry_trail_cpu_ids[] = {
- X86_MATCH_INTEL_FAM6_MODEL(ATOM_AIRMONT, NULL),
+ X86_MATCH_VFM(INTEL_ATOM_AIRMONT, NULL),
{}
};
--
2.46.0
24. 9. 4. 02:34에 Tony Luck 이(가) 쓴 글:
> New CPU #defines encode vendor and family as well as model.
>
> Link: https://lore.kernel.org/lkml/20240611174016.352953-1-tony.luck@intel.com/
> Signed-off-by: Tony Luck <tony.luck@intel.com>
> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
> ---
> drivers/extcon/extcon-axp288.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/extcon/extcon-axp288.c b/drivers/extcon/extcon-axp288.c
> index a703a8315634..d3bcbe839c09 100644
> --- a/drivers/extcon/extcon-axp288.c
> +++ b/drivers/extcon/extcon-axp288.c
> @@ -108,7 +108,7 @@ struct axp288_extcon_info {
> };
>
> static const struct x86_cpu_id cherry_trail_cpu_ids[] = {
> - X86_MATCH_INTEL_FAM6_MODEL(ATOM_AIRMONT, NULL),
> + X86_MATCH_VFM(INTEL_ATOM_AIRMONT, NULL),
> {}
> };
>
Applied it.
https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git/commit/?h=extcon-next&id=089a6e37c5394bc22d34c0c22b14a31b897b5831
--
Best Regards,
Samsung Electronics
Chanwoo Choi
On Thu, Sep 05, 2024 at 12:19:17AM +0900, Chanwoo Choi wrote:
> Applied it.
> https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git/commit/?h=extcon-next&id=089a6e37c5394bc22d34c0c22b14a31b897b5831
Now, can you remove it pls?
It will be way easier if I queue it along with the other two...
Thx.
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
24. 9. 5. 00:24에 Borislav Petkov 이(가) 쓴 글: > On Thu, Sep 05, 2024 at 12:19:17AM +0900, Chanwoo Choi wrote: >> Applied it. >> https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git/commit/?h=extcon-next&id=089a6e37c5394bc22d34c0c22b14a31b897b5831 > > Now, can you remove it pls? > > It will be way easier if I queue it along with the other two... > > Thx. > OK. I'll remove it from extcon.git. -- Best Regards, Samsung Electronics Chanwoo Choi
On Thu, Sep 05, 2024 at 12:30:13AM +0900, Chanwoo Choi wrote:
> OK. I'll remove it from extcon.git.
Thx, lemme queue it through tip.
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
The following commit has been merged into the x86/cpu branch of tip:
Commit-ID: 171a7d9563a07a5101cc536932bc4db88a53374d
Gitweb: https://git.kernel.org/tip/171a7d9563a07a5101cc536932bc4db88a53374d
Author: Tony Luck <tony.luck@intel.com>
AuthorDate: Tue, 03 Sep 2024 10:34:41 -07:00
Committer: Borislav Petkov (AMD) <bp@alien8.de>
CommitterDate: Wed, 04 Sep 2024 17:58:43 +02:00
extcon: axp288: 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>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20240903173443.7962-2-tony.luck@intel.com
---
drivers/extcon/extcon-axp288.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/extcon/extcon-axp288.c b/drivers/extcon/extcon-axp288.c
index a703a83..d3bcbe8 100644
--- a/drivers/extcon/extcon-axp288.c
+++ b/drivers/extcon/extcon-axp288.c
@@ -108,7 +108,7 @@ struct axp288_extcon_info {
};
static const struct x86_cpu_id cherry_trail_cpu_ids[] = {
- X86_MATCH_INTEL_FAM6_MODEL(ATOM_AIRMONT, NULL),
+ X86_MATCH_VFM(INTEL_ATOM_AIRMONT, NULL),
{}
};
© 2016 - 2025 Red Hat, Inc.