* [PATCH v1 1/1] media: Consolidate AtomISP v2 PCI IDs in the pci_ids.h
@ 2026-10-02 9:43 Andy Shevchenko
2026-10-02 9:56 ` Jani Nikula
0 siblings, 1 reply; 2+ messages in thread
From: Andy Shevchenko @ 2026-10-02 9:43 UTC (permalink / raw)
To: Jani Nikula, Andy Shevchenko, Bjorn Helgaas, intel-gfx, intel-xe,
dri-devel, linux-kernel, platform-driver-x86, linux-media,
linux-staging, linux-pci
Cc: Jani Nikula, Rodrigo Vivi, Joonas Lahtinen, Tvrtko Ursulin,
David Airlie, Simona Vetter, Hans de Goede, Ilpo Järvinen,
Andy Shevchenko, Mauro Carvalho Chehab, Sakari Ailus,
Greg Kroah-Hartman
We have a few drivers using same pair of the PCI IDs across the kernel and
there seems more to go, consolidate AtomISP v2 PCI IDs in pci_ids.h database.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
Assuming that media subsystem is the main beneficiary I think it is the best
to route it via that tree. For others (i915, PCI, PDx86), please Ack if you
are agree.
drivers/gpu/drm/i915/display/intel_display_power.c | 6 +++---
drivers/platform/x86/intel/atomisp2/pm.c | 6 +++---
drivers/staging/media/atomisp/pci/atomisp_internal.h | 2 --
drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 10 +++++-----
include/linux/pci_ids.h | 2 ++
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c
index 2e534ddb7347..ee2c59b72b4a 100644
--- a/drivers/gpu/drm/i915/display/intel_display_power.c
+++ b/drivers/gpu/drm/i915/display/intel_display_power.c
@@ -2086,9 +2086,9 @@ static void assert_ved_power_gated(struct intel_display *display)
static void assert_isp_power_gated(struct intel_display *display)
{
static const struct pci_device_id isp_ids[] = {
- {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0f38)},
- {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x22b8)},
- {}
+ { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ISP_BYT) },
+ { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ISP_BSW) },
+ { }
};
drm_WARN(display->drm, !pci_dev_present(isp_ids) &&
diff --git a/drivers/platform/x86/intel/atomisp2/pm.c b/drivers/platform/x86/intel/atomisp2/pm.c
index ad1f99140962..f3dee0e58f62 100644
--- a/drivers/platform/x86/intel/atomisp2/pm.c
+++ b/drivers/platform/x86/intel/atomisp2/pm.c
@@ -121,9 +121,9 @@ static UNIVERSAL_DEV_PM_OPS(isp_pm_ops, isp_pci_suspend,
isp_pci_resume, NULL);
static const struct pci_device_id isp_id_table[] = {
- { PCI_VDEVICE(INTEL, 0x0f38), },
- { PCI_VDEVICE(INTEL, 0x22b8), },
- { 0, }
+ { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ISP_BYT) },
+ { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ISP_BSW) },
+ { }
};
MODULE_DEVICE_TABLE(pci, isp_id_table);
diff --git a/drivers/staging/media/atomisp/pci/atomisp_internal.h b/drivers/staging/media/atomisp/pci/atomisp_internal.h
index 5a69580b8251..1a05fc331557 100644
--- a/drivers/staging/media/atomisp/pci/atomisp_internal.h
+++ b/drivers/staging/media/atomisp/pci/atomisp_internal.h
@@ -37,7 +37,6 @@
(((isp)->media_dev.hw_revision & ATOMISP_HW_REVISION_MASK) == \
((rev) << ATOMISP_HW_REVISION_SHIFT))
-#define ATOMISP_PCI_DEVICE_SOC_BYT 0x0f38
/* MRFLD with 0x1178: ISP freq can burst to 457MHz */
#define ATOMISP_PCI_DEVICE_SOC_MRFLD 0x1178
/* MRFLD with 0x1179: max ISP freq limited to 400MHz */
@@ -45,7 +44,6 @@
/* MRFLD with 0x117a: max ISP freq is 400MHz and max freq at Vmin is 200MHz */
#define ATOMISP_PCI_DEVICE_SOC_MRFLD_117A 0x117a
#define ATOMISP_PCI_DEVICE_SOC_ANN 0x1478
-#define ATOMISP_PCI_DEVICE_SOC_CHT 0x22b8
#define ATOMISP_PCI_REV_MRFLD_A0_MAX 0
#define ATOMISP_PCI_REV_BYT_A0_MAX 4
diff --git a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
index 476fe143a591..ab8727a806bf 100644
--- a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
@@ -1239,7 +1239,7 @@ static int atomisp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *i
}
isp->hpll_freq = HPLL_FREQ_1600MHZ;
break;
- case ATOMISP_PCI_DEVICE_SOC_BYT:
+ case PCI_DEVICE_ID_INTEL_ISP_BYT:
isp->media_dev.hw_revision =
(ATOMISP_HW_REVISION_ISP2400
<< ATOMISP_HW_REVISION_SHIFT) |
@@ -1284,7 +1284,7 @@ static int atomisp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *i
isp->dfs = &dfs_config_merr;
isp->hpll_freq = HPLL_FREQ_1600MHZ;
break;
- case ATOMISP_PCI_DEVICE_SOC_CHT:
+ case PCI_DEVICE_ID_INTEL_ISP_BSW:
isp->media_dev.hw_revision = (ATOMISP_HW_REVISION_ISP2401
<< ATOMISP_HW_REVISION_SHIFT);
isp->media_dev.hw_revision |= pdev->revision < 2 ?
@@ -1487,12 +1487,12 @@ static const struct pci_device_id atomisp_pci_tbl[] = {
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, ATOMISP_PCI_DEVICE_SOC_MRFLD_1179)},
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, ATOMISP_PCI_DEVICE_SOC_MRFLD_117A)},
/* Baytrail */
- {PCI_DEVICE(PCI_VENDOR_ID_INTEL, ATOMISP_PCI_DEVICE_SOC_BYT)},
+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ISP_BYT) },
/* Anniedale (Merrifield+ / Moorefield) */
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, ATOMISP_PCI_DEVICE_SOC_ANN)},
/* Cherrytrail */
- {PCI_DEVICE(PCI_VENDOR_ID_INTEL, ATOMISP_PCI_DEVICE_SOC_CHT)},
- {0,}
+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ISP_BSW) },
+ { }
};
MODULE_DEVICE_TABLE(pci, atomisp_pci_tbl);
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 63774ae2bf71..0693e4532a68 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2732,6 +2732,7 @@
#define PCI_DEVICE_ID_INTEL_HDA_HSW_3 0x0d0c
#define PCI_DEVICE_ID_INTEL_HDA_BYT 0x0f04
#define PCI_DEVICE_ID_INTEL_SST_BYT 0x0f28
+#define PCI_DEVICE_ID_INTEL_ISP_BYT 0x0f38
#define PCI_DEVICE_ID_INTEL_8257X_SOL 0x1062
#define PCI_DEVICE_ID_INTEL_82573E_SOL 0x1085
#define PCI_DEVICE_ID_INTEL_82573L_SOL 0x108f
@@ -2787,6 +2788,7 @@
#define PCI_DEVICE_ID_INTEL_VMD_201D 0x201d
#define PCI_DEVICE_ID_INTEL_HDA_BSW 0x2284
#define PCI_DEVICE_ID_INTEL_SST_BSW 0x22a8
+#define PCI_DEVICE_ID_INTEL_ISP_BSW 0x22b8
#define PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MIN 0x2310
#define PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MAX 0x231f
#define PCI_DEVICE_ID_INTEL_82801AA_0 0x2410
--
2.50.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH v1 1/1] media: Consolidate AtomISP v2 PCI IDs in the pci_ids.h
2026-10-02 9:43 [PATCH v1 1/1] media: Consolidate AtomISP v2 PCI IDs in the pci_ids.h Andy Shevchenko
@ 2026-10-02 9:56 ` Jani Nikula
0 siblings, 0 replies; 2+ messages in thread
From: Jani Nikula @ 2026-10-02 9:56 UTC (permalink / raw)
To: Andy Shevchenko, Andy Shevchenko, Bjorn Helgaas, intel-gfx,
intel-xe, dri-devel, linux-kernel, platform-driver-x86,
linux-media, linux-staging, linux-pci
Cc: Rodrigo Vivi, Joonas Lahtinen, Tvrtko Ursulin, David Airlie,
Simona Vetter, Hans de Goede, Ilpo Järvinen,
Andy Shevchenko, Mauro Carvalho Chehab, Sakari Ailus,
Greg Kroah-Hartman
On Fri, 02 Oct 2026, Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote:
> We have a few drivers using same pair of the PCI IDs across the kernel and
> there seems more to go, consolidate AtomISP v2 PCI IDs in pci_ids.h database.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
>
> Assuming that media subsystem is the main beneficiary I think it is the best
> to route it via that tree. For others (i915, PCI, PDx86), please Ack if you
> are agree.
Acked-by: Jani Nikula <jani.nikula@intel.com>
>
> drivers/gpu/drm/i915/display/intel_display_power.c | 6 +++---
> drivers/platform/x86/intel/atomisp2/pm.c | 6 +++---
> drivers/staging/media/atomisp/pci/atomisp_internal.h | 2 --
> drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 10 +++++-----
> include/linux/pci_ids.h | 2 ++
> 5 files changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c
> index 2e534ddb7347..ee2c59b72b4a 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_power.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_power.c
> @@ -2086,9 +2086,9 @@ static void assert_ved_power_gated(struct intel_display *display)
> static void assert_isp_power_gated(struct intel_display *display)
> {
> static const struct pci_device_id isp_ids[] = {
> - {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0f38)},
> - {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x22b8)},
> - {}
> + { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ISP_BYT) },
> + { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ISP_BSW) },
> + { }
> };
>
> drm_WARN(display->drm, !pci_dev_present(isp_ids) &&
> diff --git a/drivers/platform/x86/intel/atomisp2/pm.c b/drivers/platform/x86/intel/atomisp2/pm.c
> index ad1f99140962..f3dee0e58f62 100644
> --- a/drivers/platform/x86/intel/atomisp2/pm.c
> +++ b/drivers/platform/x86/intel/atomisp2/pm.c
> @@ -121,9 +121,9 @@ static UNIVERSAL_DEV_PM_OPS(isp_pm_ops, isp_pci_suspend,
> isp_pci_resume, NULL);
>
> static const struct pci_device_id isp_id_table[] = {
> - { PCI_VDEVICE(INTEL, 0x0f38), },
> - { PCI_VDEVICE(INTEL, 0x22b8), },
> - { 0, }
> + { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ISP_BYT) },
> + { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ISP_BSW) },
> + { }
> };
> MODULE_DEVICE_TABLE(pci, isp_id_table);
>
> diff --git a/drivers/staging/media/atomisp/pci/atomisp_internal.h b/drivers/staging/media/atomisp/pci/atomisp_internal.h
> index 5a69580b8251..1a05fc331557 100644
> --- a/drivers/staging/media/atomisp/pci/atomisp_internal.h
> +++ b/drivers/staging/media/atomisp/pci/atomisp_internal.h
> @@ -37,7 +37,6 @@
> (((isp)->media_dev.hw_revision & ATOMISP_HW_REVISION_MASK) == \
> ((rev) << ATOMISP_HW_REVISION_SHIFT))
>
> -#define ATOMISP_PCI_DEVICE_SOC_BYT 0x0f38
> /* MRFLD with 0x1178: ISP freq can burst to 457MHz */
> #define ATOMISP_PCI_DEVICE_SOC_MRFLD 0x1178
> /* MRFLD with 0x1179: max ISP freq limited to 400MHz */
> @@ -45,7 +44,6 @@
> /* MRFLD with 0x117a: max ISP freq is 400MHz and max freq at Vmin is 200MHz */
> #define ATOMISP_PCI_DEVICE_SOC_MRFLD_117A 0x117a
> #define ATOMISP_PCI_DEVICE_SOC_ANN 0x1478
> -#define ATOMISP_PCI_DEVICE_SOC_CHT 0x22b8
>
> #define ATOMISP_PCI_REV_MRFLD_A0_MAX 0
> #define ATOMISP_PCI_REV_BYT_A0_MAX 4
> diff --git a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
> index 476fe143a591..ab8727a806bf 100644
> --- a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
> +++ b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
> @@ -1239,7 +1239,7 @@ static int atomisp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *i
> }
> isp->hpll_freq = HPLL_FREQ_1600MHZ;
> break;
> - case ATOMISP_PCI_DEVICE_SOC_BYT:
> + case PCI_DEVICE_ID_INTEL_ISP_BYT:
> isp->media_dev.hw_revision =
> (ATOMISP_HW_REVISION_ISP2400
> << ATOMISP_HW_REVISION_SHIFT) |
> @@ -1284,7 +1284,7 @@ static int atomisp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *i
> isp->dfs = &dfs_config_merr;
> isp->hpll_freq = HPLL_FREQ_1600MHZ;
> break;
> - case ATOMISP_PCI_DEVICE_SOC_CHT:
> + case PCI_DEVICE_ID_INTEL_ISP_BSW:
> isp->media_dev.hw_revision = (ATOMISP_HW_REVISION_ISP2401
> << ATOMISP_HW_REVISION_SHIFT);
> isp->media_dev.hw_revision |= pdev->revision < 2 ?
> @@ -1487,12 +1487,12 @@ static const struct pci_device_id atomisp_pci_tbl[] = {
> {PCI_DEVICE(PCI_VENDOR_ID_INTEL, ATOMISP_PCI_DEVICE_SOC_MRFLD_1179)},
> {PCI_DEVICE(PCI_VENDOR_ID_INTEL, ATOMISP_PCI_DEVICE_SOC_MRFLD_117A)},
> /* Baytrail */
> - {PCI_DEVICE(PCI_VENDOR_ID_INTEL, ATOMISP_PCI_DEVICE_SOC_BYT)},
> + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ISP_BYT) },
> /* Anniedale (Merrifield+ / Moorefield) */
> {PCI_DEVICE(PCI_VENDOR_ID_INTEL, ATOMISP_PCI_DEVICE_SOC_ANN)},
> /* Cherrytrail */
> - {PCI_DEVICE(PCI_VENDOR_ID_INTEL, ATOMISP_PCI_DEVICE_SOC_CHT)},
> - {0,}
> + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ISP_BSW) },
> + { }
> };
> MODULE_DEVICE_TABLE(pci, atomisp_pci_tbl);
>
> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
> index 63774ae2bf71..0693e4532a68 100644
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -2732,6 +2732,7 @@
> #define PCI_DEVICE_ID_INTEL_HDA_HSW_3 0x0d0c
> #define PCI_DEVICE_ID_INTEL_HDA_BYT 0x0f04
> #define PCI_DEVICE_ID_INTEL_SST_BYT 0x0f28
> +#define PCI_DEVICE_ID_INTEL_ISP_BYT 0x0f38
> #define PCI_DEVICE_ID_INTEL_8257X_SOL 0x1062
> #define PCI_DEVICE_ID_INTEL_82573E_SOL 0x1085
> #define PCI_DEVICE_ID_INTEL_82573L_SOL 0x108f
> @@ -2787,6 +2788,7 @@
> #define PCI_DEVICE_ID_INTEL_VMD_201D 0x201d
> #define PCI_DEVICE_ID_INTEL_HDA_BSW 0x2284
> #define PCI_DEVICE_ID_INTEL_SST_BSW 0x22a8
> +#define PCI_DEVICE_ID_INTEL_ISP_BSW 0x22b8
> #define PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MIN 0x2310
> #define PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MAX 0x231f
> #define PCI_DEVICE_ID_INTEL_82801AA_0 0x2410
--
Jani Nikula, Intel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-10-02 9:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-10-02 9:43 [PATCH v1 1/1] media: Consolidate AtomISP v2 PCI IDs in the pci_ids.h Andy Shevchenko
2026-10-02 9:56 ` Jani Nikula
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®