diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c
index 0a481575bc54d8..51bdb7401da6d6 100644
--- a/sound/soc/sof/intel/hda.c
+++ b/sound/soc/sof/intel/hda.c
@@ -28,6 +28,7 @@
 #include <sound/soc-acpi-intel-ssp-common.h>
 #include <sound/sof.h>
 #include <sound/sof/xtensa.h>
+#include <sound/hda_i915.h>
 #include <sound/hda-mlink.h>
 #include "../sof-audio.h"
 #include "../sof-pci-dev.h"
@@ -41,6 +42,11 @@
 #include <sound/soc-acpi-intel-match.h>
 #endif
 
+static bool disable_display_audio_bind;
+module_param(disable_display_audio_bind, bool, 0444);
+MODULE_PARM_DESC(disable_display_audio_bind,
+		 "Disable i915/Xe display audio component binding");
+
 /* platform specific devices */
 #include "shim.h"
 
@@ -704,6 +710,9 @@ int hda_dsp_probe_early(struct snd_sof_dev *sdev)
 	const struct sof_intel_dsp_desc *chip;
 	int ret = 0;
 
+	if (disable_display_audio_bind)
+		snd_hdac_i915_bind(sof_to_bus(sdev), 0);
+
 	if (!sdev->dspless_mode_selected) {
 		/*
 		 * detect DSP by checking class/subclass/prog-id information
diff --git a/sound/soc/sof/intel/hda.h b/sound/soc/sof/intel/hda.h
index 72bef81fc69348..22bd9c3c8216c5 100644
--- a/sound/soc/sof/intel/hda.h
+++ b/sound/soc/sof/intel/hda.h
@@ -917,7 +917,6 @@ extern struct snd_sof_dsp_ops sof_mtl_ops;
 int sof_mtl_ops_init(struct snd_sof_dev *sdev);
 extern struct snd_sof_dsp_ops sof_lnl_ops;
 int sof_lnl_ops_init(struct snd_sof_dev *sdev);
-int sof_ptl_ops_init(struct snd_sof_dev *sdev);
 
 extern const struct sof_intel_dsp_desc skl_chip_info;
 extern const struct sof_intel_dsp_desc apl_chip_info;
diff --git a/sound/soc/sof/intel/lnl.c b/sound/soc/sof/intel/lnl.c
index 15ba47633b3cce..e3c4b4a0d705f2 100644
--- a/sound/soc/sof/intel/lnl.c
+++ b/sound/soc/sof/intel/lnl.c
@@ -7,7 +7,6 @@
  */
 
 #include <linux/debugfs.h>
-#include <sound/hda_i915.h>
 #include <linux/firmware.h>
 #include <sound/hda_register.h>
 #include <sound/sof/ipc4/header.h>
@@ -185,24 +184,6 @@ int sof_lnl_ops_init(struct snd_sof_dev *sdev)
 };
 EXPORT_SYMBOL_NS(sof_lnl_ops_init, SND_SOC_SOF_INTEL_LNL);
 
-static int ptl_hda_dsp_probe_early(struct snd_sof_dev *sdev)
-{
-	snd_hdac_i915_bind(sof_to_bus(sdev), 0);
-	return hda_dsp_probe_early(sdev);
-}
-
-int sof_ptl_ops_init(struct snd_sof_dev *sdev)
-{
-	int ret;
-
-	ret = sof_lnl_ops_init(sdev);
-	if (!ret)
-		sof_lnl_ops.probe_early = ptl_hda_dsp_probe_early;
-
-	return ret;
-};
-EXPORT_SYMBOL_NS(sof_ptl_ops_init, SND_SOC_SOF_INTEL_LNL);
-
 /* Check if an SDW IRQ occurred */
 static bool lnl_dsp_check_sdw_irq(struct snd_sof_dev *sdev)
 {
diff --git a/sound/soc/sof/intel/pci-ptl.c b/sound/soc/sof/intel/pci-ptl.c
index ad84d484173298..69195b5e7b1a92 100644
--- a/sound/soc/sof/intel/pci-ptl.c
+++ b/sound/soc/sof/intel/pci-ptl.c
@@ -44,7 +44,7 @@ static const struct sof_dev_desc ptl_desc = {
 	},
 	.nocodec_tplg_filename = "sof-ptl-nocodec.tplg",
 	.ops = &sof_lnl_ops,
-	.ops_init = sof_ptl_ops_init,
+	.ops_init = sof_lnl_ops_init,
 };
 
 /* PCI IDs */