diff options
| author | Subrata Banik <subrata.banik@intel.com> | 2019-10-30 16:34:41 +0530 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2019-11-01 11:50:45 +0000 |
| commit | 29f12e4d487724b40d01df98df15ecbee7f016c9 (patch) | |
| tree | abeb0f41dbebffbb7d6ccead044902b951bfbf08 | |
| parent | fa2f793957d03c96b2ad3a048b0889fe4203cb81 (diff) | |
soc/intel/{cnl,icl,skl}: Move ipu.asl into common/block/acpi
This patch creates a common instance of ipu.asl inside intel common
code (soc/intel/common/block/acpi/acpi) and ask cnl & icl soc code to
refer ipu.asl from common code block.
TEST=Able to build and boot Hatch and ICL DE system. Dump DSDT.asl to verify
Device(IMGU) presence after booting to OS.
Change-Id: I4d18571008c199fd5c3dbeed8cba9374520359b4
Signed-off-by: Subrata Banik <subrata.banik@intel.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36459
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Michael Niewöhner
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
| -rw-r--r-- | src/soc/intel/cannonlake/acpi/ipu.asl | 23 | ||||
| -rw-r--r-- | src/soc/intel/common/block/acpi/acpi/ipu.asl (renamed from src/soc/intel/icelake/acpi/ipu.asl) | 0 | ||||
| -rw-r--r-- | src/soc/intel/skylake/acpi/ipu.asl | 8 |
3 files changed, 1 insertions, 30 deletions
diff --git a/src/soc/intel/cannonlake/acpi/ipu.asl b/src/soc/intel/cannonlake/acpi/ipu.asl deleted file mode 100644 index 68a0f3d0e2..0000000000 --- a/src/soc/intel/cannonlake/acpi/ipu.asl +++ /dev/null @@ -1,23 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2017 Intel Corporation. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -/* IPU3 input system - Device 05, Function 0 */ -Device (IMGU) -{ - Name (_ADR, 0x00050000) - Name (_DDN, "Imaging Unit") - Name (_CCA, ZERO) - Name (CAMD, 0x01) -} diff --git a/src/soc/intel/icelake/acpi/ipu.asl b/src/soc/intel/common/block/acpi/acpi/ipu.asl index 2c550edcbb..2c550edcbb 100644 --- a/src/soc/intel/icelake/acpi/ipu.asl +++ b/src/soc/intel/common/block/acpi/acpi/ipu.asl diff --git a/src/soc/intel/skylake/acpi/ipu.asl b/src/soc/intel/skylake/acpi/ipu.asl index c78b5be4a5..66dcd3b8f5 100644 --- a/src/soc/intel/skylake/acpi/ipu.asl +++ b/src/soc/intel/skylake/acpi/ipu.asl @@ -13,13 +13,7 @@ * GNU General Public License for more details. */ -/* IPU3 input system - Device 05, Function 0 */ -Device (IMGU) -{ - Name (_ADR, 0x00050000) - Name (_DDN, "Imaging Unit") - Name (CAMD, 0x01) -} +#include <soc/intel/common/block/acpi/acpi/ipu.asl> /* IPU3 processing system - Device 14, Function 3 */ Device (CIO2) |