Subrata Banik has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/36459 )
Change subject: soc/intel/{cnl,icl,skl}: Move ipu.asl into common/block/acpi ......................................................................
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 --- M src/mainboard/asrock/h110m/dsdt.asl M src/mainboard/google/poppy/dsdt.asl M src/mainboard/intel/kblrvp/dsdt.asl D src/soc/intel/cannonlake/acpi/ipu.asl R src/soc/intel/common/block/acpi/acpi/ipu.asl D src/soc/intel/skylake/acpi/ipu.asl 6 files changed, 5 insertions(+), 58 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/59/36459/1
diff --git a/src/mainboard/asrock/h110m/dsdt.asl b/src/mainboard/asrock/h110m/dsdt.asl index f3e216d..fbfad90 100644 --- a/src/mainboard/asrock/h110m/dsdt.asl +++ b/src/mainboard/asrock/h110m/dsdt.asl @@ -38,7 +38,7 @@ Device (PCI0) { /* Image processing unit */ - #include <soc/intel/skylake/acpi/ipu.asl> + #include <soc/intel/common/block/acpi/acpi/ipu.asl> #include <soc/intel/skylake/acpi/systemagent.asl> #include <soc/intel/skylake/acpi/pch.asl> } diff --git a/src/mainboard/google/poppy/dsdt.asl b/src/mainboard/google/poppy/dsdt.asl index 34862df..68e851c 100644 --- a/src/mainboard/google/poppy/dsdt.asl +++ b/src/mainboard/google/poppy/dsdt.asl @@ -40,7 +40,7 @@ Device (PCI0) { /* Image processing unit */ - #include <soc/intel/skylake/acpi/ipu.asl> + #include <soc/intel/common/block/acpi/acpi/ipu.asl> #include <soc/intel/skylake/acpi/systemagent.asl> #include <soc/intel/skylake/acpi/pch.asl> } diff --git a/src/mainboard/intel/kblrvp/dsdt.asl b/src/mainboard/intel/kblrvp/dsdt.asl index 8a16551..01e6550 100644 --- a/src/mainboard/intel/kblrvp/dsdt.asl +++ b/src/mainboard/intel/kblrvp/dsdt.asl @@ -37,8 +37,8 @@ Scope (_SB) { Device (PCI0) { - /* Image processing unit */ - #include <soc/intel/skylake/acpi/ipu.asl> + /* Image processing unit */ + #include <soc/intel/common/block/acpi/acpi/ipu.asl> #include <soc/intel/skylake/acpi/systemagent.asl> #include <soc/intel/skylake/acpi/pch.asl> } diff --git a/src/soc/intel/cannonlake/acpi/ipu.asl b/src/soc/intel/cannonlake/acpi/ipu.asl deleted file mode 100644 index 68a0f3d..0000000 --- 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 similarity index 94% rename from src/soc/intel/icelake/acpi/ipu.asl rename to src/soc/intel/common/block/acpi/acpi/ipu.asl index 2c550ed..208e035 100644 --- a/src/soc/intel/icelake/acpi/ipu.asl +++ b/src/soc/intel/common/block/acpi/acpi/ipu.asl @@ -1,7 +1,7 @@ /* * This file is part of the coreboot project. * - * Copyright (C) 2018 Intel Corp. + * Copyright (C) 2019 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 diff --git a/src/soc/intel/skylake/acpi/ipu.asl b/src/soc/intel/skylake/acpi/ipu.asl deleted file mode 100644 index c78b5be..0000000 --- a/src/soc/intel/skylake/acpi/ipu.asl +++ /dev/null @@ -1,30 +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 (CAMD, 0x01) -} - -/* IPU3 processing system - Device 14, Function 3 */ -Device (CIO2) -{ - Name (_ADR, 0x00140003) - Name (_DDN, "Camera and Imaging Subsystem") - Name (CAMD, 0x00) -}