From 73968fd14b67a38bf671479c0b55859497649062 Mon Sep 17 00:00:00 2001
From: Subrata Banik <subrata.banik@intel.com>
Date: Sat, 3 Oct 2020 21:04:04 +0530
Subject: mb/{google,intel}/{volteer,tglrvp}: Refer to common IPU ASL

Delete SoC local copy of ipu.asl and refer from common block ipu.asl

TEST=Dump and disassemble DSDT on tglrvp, verify IPU0 device
present there.

Signed-off-by: Subrata Banik <subrata.banik@intel.com>
Change-Id: I6a0f8a919092f7bbcd64d4791746d30fdee33894
Reviewed-on: https://review.coreboot.org/c/coreboot/+/45978
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
---
 src/mainboard/google/volteer/dsdt.asl |  4 +++-
 src/mainboard/intel/tglrvp/dsdt.asl   |  2 +-
 src/soc/intel/tigerlake/acpi/ipu.asl  | 10 ----------
 3 files changed, 4 insertions(+), 12 deletions(-)
 delete mode 100644 src/soc/intel/tigerlake/acpi/ipu.asl

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")
-	}
-}
-- 
cgit v1.2.3