diff --git a/src/drivers/intel/mipi_camera/camera.c b/src/drivers/intel/mipi_camera/camera.c
index ec89971..00c85a7 100644
--- a/src/drivers/intel/mipi_camera/camera.c
+++ b/src/drivers/intel/mipi_camera/camera.c
@@ -5,9 +5,7 @@
 #include <acpi/acpi_device.h>
 #include <acpi/acpigen.h>
 #include <acpi/acpigen_pci.h>
-#include <cpu/cpu.h>
 #include <console/console.h>
-#include <cpu/intel/cpu_ids.h>
 #include <device/i2c_simple.h>
 #include <device/device.h>
 #include <device/path.h>
@@ -136,14 +134,8 @@
 
 		snprintf(name, sizeof(name), "port%u", i);
 		port_name[i] = strdup(name);
-		if (CONFIG(ACPI_ADL_IPU_ES_SUPPORT)) {
-			u32 cpu_id = cpu_get_cpuid();
-			if (cpu_id == CPUID_ALDERLAKE_J0 || cpu_id == CPUID_ALDERLAKE_Q0)
-				acpi_dp_add_integer(dsd, "is_es", 1);
-			else
-				acpi_dp_add_integer(dsd, "is_es", 0);
-		}
-
+		acpi_dp_add_integer(dsd, "is_es",
+			CONFIG(DRIVERS_INTEL_MIPI_SUPPORTS_PRE_PRODUCTION_SOC));
 		acpi_dp_add_child(dsd, port_name[i], port_table);
 	}