From 51e0fd91d5d73c168e572622f91d0197a8ec031b Mon Sep 17 00:00:00 2001
From: Sumeet R Pawnikar <sumeet.r.pawnikar@intel.com>
Date: Tue, 16 Jun 2020 12:59:39 +0530
Subject: soc/intel/common/acpi: rename dptf.asl to dptf_common.asl file

Rename dptf.asl to dptf_common.asl under soc/intel/common/acpi path
to avoid any kind of confusion with another dptf.asl file under
soc/intel/common/acpi/dptf path. Sometime it's confusing to have
two dptf.asl files just one directory apart.

BUG=None
BRANCH=None
TEST=Build and boot on volteer system

Change-Id: I23d93719e23c0b7659ccb23e5d0868f879bc162c
Signed-off-by: Sumeet R Pawnikar <sumeet.r.pawnikar@intel.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42417
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
---
 src/soc/intel/common/acpi/dptf.asl        | 52 -------------------------------
 src/soc/intel/common/acpi/dptf/dptf.asl   |  2 +-
 src/soc/intel/common/acpi/dptf_common.asl | 52 +++++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 53 deletions(-)
 delete mode 100644 src/soc/intel/common/acpi/dptf.asl
 create mode 100644 src/soc/intel/common/acpi/dptf_common.asl

(limited to 'src/soc/intel/common')

diff --git a/src/soc/intel/common/acpi/dptf.asl b/src/soc/intel/common/acpi/dptf.asl
deleted file mode 100644
index 50ed2f21f1..0000000000
--- a/src/soc/intel/common/acpi/dptf.asl
+++ /dev/null
@@ -1,52 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#ifndef DPTF_CPU_DEVICE
-#define DPTF_CPU_DEVICE		TCPU
-#endif
-
-#ifndef DPTF_CPU_ADDR
-#define DPTF_CPU_ADDR		0x00040000
-#endif
-
-#ifndef DPTF_CPU_PASSIVE
-#define DPTF_CPU_PASSIVE	80
-#endif
-
-#ifndef DPTF_CPU_CRITICAL
-#define DPTF_CPU_CRITICAL	90
-#endif
-
-#ifndef DPTF_CPU_ACTIVE_AC0
-#define DPTF_CPU_ACTIVE_AC0	90
-#endif
-
-#ifndef DPTF_CPU_ACTIVE_AC1
-#define DPTF_CPU_ACTIVE_AC1	80
-#endif
-
-#ifndef DPTF_CPU_ACTIVE_AC2
-#define DPTF_CPU_ACTIVE_AC2	70
-#endif
-
-#ifndef DPTF_CPU_ACTIVE_AC3
-#define DPTF_CPU_ACTIVE_AC3	60
-#endif
-
-#ifndef DPTF_CPU_ACTIVE_AC4
-#define DPTF_CPU_ACTIVE_AC4	50
-#endif
-
-/* DPTF ACPI Device ID */
-#ifndef DPTF_DPTF_DEVICE
-#define DPTF_DPTF_DEVICE	"INT3400"
-#endif
-
-/* Generic ACPI Device ID for TSR0/1/2/3 and charger */
-#ifndef DPTF_GEN_DEVICE
-#define DPTF_GEN_DEVICE		"INT3403"
-#endif
-
-/* Fan ACPI Device ID */
-#ifndef DPTF_FAN_DEVICE
-#define DPTF_FAN_DEVICE		"INT3404"
-#endif
diff --git a/src/soc/intel/common/acpi/dptf/dptf.asl b/src/soc/intel/common/acpi/dptf/dptf.asl
index 69d2bae402..637dfedb8f 100644
--- a/src/soc/intel/common/acpi/dptf/dptf.asl
+++ b/src/soc/intel/common/acpi/dptf/dptf.asl
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 /* Include common dptf ASL files */
-#include <soc/intel/common/acpi/dptf.asl>
+#include <soc/intel/common/acpi/dptf_common.asl>
 
 Device (DPTF)
 {
diff --git a/src/soc/intel/common/acpi/dptf_common.asl b/src/soc/intel/common/acpi/dptf_common.asl
new file mode 100644
index 0000000000..50ed2f21f1
--- /dev/null
+++ b/src/soc/intel/common/acpi/dptf_common.asl
@@ -0,0 +1,52 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef DPTF_CPU_DEVICE
+#define DPTF_CPU_DEVICE		TCPU
+#endif
+
+#ifndef DPTF_CPU_ADDR
+#define DPTF_CPU_ADDR		0x00040000
+#endif
+
+#ifndef DPTF_CPU_PASSIVE
+#define DPTF_CPU_PASSIVE	80
+#endif
+
+#ifndef DPTF_CPU_CRITICAL
+#define DPTF_CPU_CRITICAL	90
+#endif
+
+#ifndef DPTF_CPU_ACTIVE_AC0
+#define DPTF_CPU_ACTIVE_AC0	90
+#endif
+
+#ifndef DPTF_CPU_ACTIVE_AC1
+#define DPTF_CPU_ACTIVE_AC1	80
+#endif
+
+#ifndef DPTF_CPU_ACTIVE_AC2
+#define DPTF_CPU_ACTIVE_AC2	70
+#endif
+
+#ifndef DPTF_CPU_ACTIVE_AC3
+#define DPTF_CPU_ACTIVE_AC3	60
+#endif
+
+#ifndef DPTF_CPU_ACTIVE_AC4
+#define DPTF_CPU_ACTIVE_AC4	50
+#endif
+
+/* DPTF ACPI Device ID */
+#ifndef DPTF_DPTF_DEVICE
+#define DPTF_DPTF_DEVICE	"INT3400"
+#endif
+
+/* Generic ACPI Device ID for TSR0/1/2/3 and charger */
+#ifndef DPTF_GEN_DEVICE
+#define DPTF_GEN_DEVICE		"INT3403"
+#endif
+
+/* Fan ACPI Device ID */
+#ifndef DPTF_FAN_DEVICE
+#define DPTF_FAN_DEVICE		"INT3404"
+#endif
-- 
cgit v1.2.3