From 29f12e4d487724b40d01df98df15ecbee7f016c9 Mon Sep 17 00:00:00 2001 From: Subrata Banik Date: Wed, 30 Oct 2019 16:34:41 +0530 Subject: soc/intel/{cnl,icl,skl}: Move ipu.asl into common/block/acpi MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/36459 Tested-by: build bot (Jenkins) Reviewed-by: Michael Niewöhner Reviewed-by: Angel Pons --- src/soc/intel/cannonlake/acpi/ipu.asl | 23 ----------------------- src/soc/intel/common/block/acpi/acpi/ipu.asl | 23 +++++++++++++++++++++++ src/soc/intel/icelake/acpi/ipu.asl | 23 ----------------------- src/soc/intel/skylake/acpi/ipu.asl | 8 +------- 4 files changed, 24 insertions(+), 53 deletions(-) delete mode 100644 src/soc/intel/cannonlake/acpi/ipu.asl create mode 100644 src/soc/intel/common/block/acpi/acpi/ipu.asl delete mode 100644 src/soc/intel/icelake/acpi/ipu.asl 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/common/block/acpi/acpi/ipu.asl b/src/soc/intel/common/block/acpi/acpi/ipu.asl new file mode 100644 index 0000000000..2c550edcbb --- /dev/null +++ b/src/soc/intel/common/block/acpi/acpi/ipu.asl @@ -0,0 +1,23 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2018 Intel Corp. + * + * 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/icelake/acpi/ipu.asl deleted file mode 100644 index 2c550edcbb..0000000000 --- a/src/soc/intel/icelake/acpi/ipu.asl +++ /dev/null @@ -1,23 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2018 Intel Corp. - * - * 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/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 /* IPU3 processing system - Device 14, Function 3 */ Device (CIO2) -- cgit v1.2.3