From 3b3bbd4fbacf2ae50dfface02e901567a79ea985 Mon Sep 17 00:00:00 2001 From: Subrata Banik Date: Sat, 3 Oct 2020 21:42:50 +0530 Subject: soc/intel/common/block/acpi: Factor out common smbus.asl This patch moves smbus.asl into common block acpi directory to avoid duplicating the same ASL code block across SoC directory. TEST=Able to build and boot TGL, CNL and CML platform. 1) Dump and disassemble DSDT, verify SBUS device present inside common smbus.asl is still there. 2) Verify no ACPI error seen while running 'dmesg` from console. Signed-off-by: Subrata Banik Change-Id: Ib1ae48f7ece3e521501d92c40cd551287ea2f1ec Reviewed-on: https://review.coreboot.org/c/coreboot/+/45979 Tested-by: build bot (Jenkins) Reviewed-by: HAOUAS Elyes Reviewed-by: Angel Pons --- src/soc/intel/cannonlake/acpi/smbus.asl | 8 -------- src/soc/intel/cannonlake/acpi/southbridge.asl | 2 +- src/soc/intel/common/block/acpi/acpi/smbus.asl | 8 ++++++++ src/soc/intel/denverton_ns/acpi/smbus.asl | 8 -------- src/soc/intel/denverton_ns/acpi/southcluster.asl | 2 +- src/soc/intel/elkhartlake/acpi/smbus.asl | 8 -------- src/soc/intel/elkhartlake/acpi/southbridge.asl | 2 +- src/soc/intel/icelake/acpi/smbus.asl | 8 -------- src/soc/intel/icelake/acpi/southbridge.asl | 2 +- src/soc/intel/jasperlake/acpi/smbus.asl | 8 -------- src/soc/intel/jasperlake/acpi/southbridge.asl | 2 +- src/soc/intel/skylake/acpi/pch.asl | 2 +- src/soc/intel/skylake/acpi/smbus.asl | 8 -------- src/soc/intel/tigerlake/acpi/smbus.asl | 8 -------- src/soc/intel/tigerlake/acpi/southbridge.asl | 2 +- 15 files changed, 15 insertions(+), 63 deletions(-) delete mode 100644 src/soc/intel/cannonlake/acpi/smbus.asl create mode 100644 src/soc/intel/common/block/acpi/acpi/smbus.asl delete mode 100644 src/soc/intel/denverton_ns/acpi/smbus.asl delete mode 100644 src/soc/intel/elkhartlake/acpi/smbus.asl delete mode 100644 src/soc/intel/icelake/acpi/smbus.asl delete mode 100644 src/soc/intel/jasperlake/acpi/smbus.asl delete mode 100644 src/soc/intel/skylake/acpi/smbus.asl delete mode 100644 src/soc/intel/tigerlake/acpi/smbus.asl diff --git a/src/soc/intel/cannonlake/acpi/smbus.asl b/src/soc/intel/cannonlake/acpi/smbus.asl deleted file mode 100644 index 7860f606c9..0000000000 --- a/src/soc/intel/cannonlake/acpi/smbus.asl +++ /dev/null @@ -1,8 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -// Intel SMBus Controller 0:1f.4 - -Device (SBUS) -{ - Name (_ADR, 0x001f0004) -} diff --git a/src/soc/intel/cannonlake/acpi/southbridge.asl b/src/soc/intel/cannonlake/acpi/southbridge.asl index 76a54453cf..7b6708c4d7 100644 --- a/src/soc/intel/cannonlake/acpi/southbridge.asl +++ b/src/soc/intel/cannonlake/acpi/southbridge.asl @@ -32,7 +32,7 @@ #include "serialio.asl" /* SMBus 0:1f.4 */ -#include "smbus.asl" +#include /* ISH 0:13.0 */ #include "ish.asl" diff --git a/src/soc/intel/common/block/acpi/acpi/smbus.asl b/src/soc/intel/common/block/acpi/acpi/smbus.asl new file mode 100644 index 0000000000..6705f22693 --- /dev/null +++ b/src/soc/intel/common/block/acpi/acpi/smbus.asl @@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +/* Intel SMBus Controller 0:1f.4 */ + +Device (SBUS) +{ + Name (_ADR, 0x001f0004) +} diff --git a/src/soc/intel/denverton_ns/acpi/smbus.asl b/src/soc/intel/denverton_ns/acpi/smbus.asl deleted file mode 100644 index 7860f606c9..0000000000 --- a/src/soc/intel/denverton_ns/acpi/smbus.asl +++ /dev/null @@ -1,8 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -// Intel SMBus Controller 0:1f.4 - -Device (SBUS) -{ - Name (_ADR, 0x001f0004) -} diff --git a/src/soc/intel/denverton_ns/acpi/southcluster.asl b/src/soc/intel/denverton_ns/acpi/southcluster.asl index ad9c088c15..68f55f295b 100644 --- a/src/soc/intel/denverton_ns/acpi/southcluster.asl +++ b/src/soc/intel/denverton_ns/acpi/southcluster.asl @@ -117,7 +117,7 @@ Device (P2SB) #include "pmc.asl" // SMBus 0:1f.4 -#include "smbus.asl" +#include // Northpeak 0:1f.7 #include "npk.asl" diff --git a/src/soc/intel/elkhartlake/acpi/smbus.asl b/src/soc/intel/elkhartlake/acpi/smbus.asl deleted file mode 100644 index 6705f22693..0000000000 --- a/src/soc/intel/elkhartlake/acpi/smbus.asl +++ /dev/null @@ -1,8 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -/* Intel SMBus Controller 0:1f.4 */ - -Device (SBUS) -{ - Name (_ADR, 0x001f0004) -} diff --git a/src/soc/intel/elkhartlake/acpi/southbridge.asl b/src/soc/intel/elkhartlake/acpi/southbridge.asl index 003c4c29f5..d85ddac77a 100644 --- a/src/soc/intel/elkhartlake/acpi/southbridge.asl +++ b/src/soc/intel/elkhartlake/acpi/southbridge.asl @@ -30,7 +30,7 @@ #include "serialio.asl" /* SMBus 0:1f.4 */ -#include "smbus.asl" +#include /* USB XHCI 0:14.0 */ #include "xhci.asl" diff --git a/src/soc/intel/icelake/acpi/smbus.asl b/src/soc/intel/icelake/acpi/smbus.asl deleted file mode 100644 index 7860f606c9..0000000000 --- a/src/soc/intel/icelake/acpi/smbus.asl +++ /dev/null @@ -1,8 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -// Intel SMBus Controller 0:1f.4 - -Device (SBUS) -{ - Name (_ADR, 0x001f0004) -} diff --git a/src/soc/intel/icelake/acpi/southbridge.asl b/src/soc/intel/icelake/acpi/southbridge.asl index 019a5f0a25..4abea7c6f9 100644 --- a/src/soc/intel/icelake/acpi/southbridge.asl +++ b/src/soc/intel/icelake/acpi/southbridge.asl @@ -30,7 +30,7 @@ #include "serialio.asl" /* SMBus 0:1f.4 */ -#include "smbus.asl" +#include /* USB XHCI 0:14.0 */ #include "xhci.asl" diff --git a/src/soc/intel/jasperlake/acpi/smbus.asl b/src/soc/intel/jasperlake/acpi/smbus.asl deleted file mode 100644 index 6705f22693..0000000000 --- a/src/soc/intel/jasperlake/acpi/smbus.asl +++ /dev/null @@ -1,8 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -/* Intel SMBus Controller 0:1f.4 */ - -Device (SBUS) -{ - Name (_ADR, 0x001f0004) -} diff --git a/src/soc/intel/jasperlake/acpi/southbridge.asl b/src/soc/intel/jasperlake/acpi/southbridge.asl index 76a97142fc..c1ea273b15 100644 --- a/src/soc/intel/jasperlake/acpi/southbridge.asl +++ b/src/soc/intel/jasperlake/acpi/southbridge.asl @@ -33,7 +33,7 @@ #include "serialio.asl" /* SMBus 0:1f.4 */ -#include "smbus.asl" +#include /* ISH 0:12.0 */ #include "ish.asl" diff --git a/src/soc/intel/skylake/acpi/pch.asl b/src/soc/intel/skylake/acpi/pch.asl index 9d5f8be19d..6eea5bb53a 100644 --- a/src/soc/intel/skylake/acpi/pch.asl +++ b/src/soc/intel/skylake/acpi/pch.asl @@ -36,7 +36,7 @@ #include "serialio.asl" /* SMBus 0:1f.3 */ -#include "smbus.asl" +#include /* Storage Controllers */ #include "scs.asl" diff --git a/src/soc/intel/skylake/acpi/smbus.asl b/src/soc/intel/skylake/acpi/smbus.asl deleted file mode 100644 index 7860f606c9..0000000000 --- a/src/soc/intel/skylake/acpi/smbus.asl +++ /dev/null @@ -1,8 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -// Intel SMBus Controller 0:1f.4 - -Device (SBUS) -{ - Name (_ADR, 0x001f0004) -} diff --git a/src/soc/intel/tigerlake/acpi/smbus.asl b/src/soc/intel/tigerlake/acpi/smbus.asl deleted file mode 100644 index 6705f22693..0000000000 --- a/src/soc/intel/tigerlake/acpi/smbus.asl +++ /dev/null @@ -1,8 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -/* Intel SMBus Controller 0:1f.4 */ - -Device (SBUS) -{ - Name (_ADR, 0x001f0004) -} diff --git a/src/soc/intel/tigerlake/acpi/southbridge.asl b/src/soc/intel/tigerlake/acpi/southbridge.asl index b193de49c3..7d6a0fbad0 100644 --- a/src/soc/intel/tigerlake/acpi/southbridge.asl +++ b/src/soc/intel/tigerlake/acpi/southbridge.asl @@ -30,7 +30,7 @@ #include "serialio.asl" /* SMBus 0:1f.4 */ -#include "smbus.asl" +#include /* ISH 0:12.0 */ #include "ish.asl" -- cgit v1.2.3