summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/google/volteer/dsdt.asl4
-rw-r--r--src/mainboard/intel/tglrvp/dsdt.asl2
-rw-r--r--src/soc/intel/tigerlake/acpi/ipu.asl10
3 files changed, 4 insertions, 12 deletions
diff --git a/src/mainboard/google/volteer/dsdt.asl b/src/mainboard/google/volteer/dsdt.asl
index d0bab1ab34..dc8f7ad4b3 100644
--- a/src/mainboard/google/volteer/dsdt.asl
+++ b/src/mainboard/google/volteer/dsdt.asl
@@ -27,6 +27,9 @@ DefinitionBlock(
#include <soc/intel/common/block/acpi/acpi/northbridge.asl>
#include <soc/intel/tigerlake/acpi/southbridge.asl>
#include <soc/intel/tigerlake/acpi/tcss.asl>
+#if CONFIG(VARIANT_HAS_MIPI_CAMERA)
+ #include <soc/intel/common/block/acpi/acpi/ipu.asl>
+#endif
}
/* Mainboard hooks */
#include "mainboard.asl"
@@ -52,7 +55,6 @@ DefinitionBlock(
#if CONFIG(VARIANT_HAS_MIPI_CAMERA)
/* Camera */
- #include <soc/intel/tigerlake/acpi/ipu.asl>
#include <variant/acpi/mipi_camera.asl>
#endif /* VARIANT_HAS_MIPI_CAMERA */
}
diff --git a/src/mainboard/intel/tglrvp/dsdt.asl b/src/mainboard/intel/tglrvp/dsdt.asl
index e34fd58cc7..e5323ef3b9 100644
--- a/src/mainboard/intel/tglrvp/dsdt.asl
+++ b/src/mainboard/intel/tglrvp/dsdt.asl
@@ -27,6 +27,7 @@ DefinitionBlock(
#include <soc/intel/common/block/acpi/acpi/northbridge.asl>
#include <soc/intel/tigerlake/acpi/southbridge.asl>
#include <soc/intel/tigerlake/acpi/tcss.asl>
+ #include <soc/intel/common/block/acpi/acpi/ipu.asl>
}
}
@@ -52,6 +53,5 @@ DefinitionBlock(
#include "acpi/mainboard.asl"
/* Camera */
- #include <soc/intel/tigerlake/acpi/ipu.asl>
#include "acpi/mipi_camera.asl"
}
diff --git a/src/soc/intel/tigerlake/acpi/ipu.asl b/src/soc/intel/tigerlake/acpi/ipu.asl
deleted file mode 100644
index b6d8e8fe01..0000000000
--- a/src/soc/intel/tigerlake/acpi/ipu.asl
+++ /dev/null
@@ -1,10 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-Scope (\_SB.PCI0)
-{
- Device (IPU0)
- {
- Name (_ADR, 0x00050000)
- Name (_DDN, "Camera and Imaging Subsystem")
- }
-}