summaryrefslogtreecommitdiff
path: root/src/soc/intel/cannonlake
diff options
context:
space:
mode:
authorSubrata Banik <subrata.banik@intel.com>2020-09-23 19:17:12 +0530
committerSubrata Banik <subrata.banik@intel.com>2020-09-27 03:03:06 +0000
commit8ff80b269d3e94c46d88c135f5f0e41e7c626905 (patch)
treed52d1bc999a7caff1abdf847876649526aaf36fa /src/soc/intel/cannonlake
parented6604d1f571f020471886172b896132406d0415 (diff)
downloadcoreboot-8ff80b269d3e94c46d88c135f5f0e41e7c626905.tar.xz
soc/intel/common/block/acpi: Factor out common gpio_op.asl
This patch moves gpio_op.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 all methods present inside common gpio_op.asl like GRXS, GTXS etc. are still there. 2) Verify no ACPI error seen while running 'dmesg` from console. Signed-off-by: Subrata Banik <subrata.banik@intel.com> Change-Id: I248f5e66994d2f3d6b0bd398347e7cf9ae7f2cc6 Reviewed-on: https://review.coreboot.org/c/coreboot/+/45566 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Furquan Shaikh <furquan@google.com>
Diffstat (limited to 'src/soc/intel/cannonlake')
-rw-r--r--src/soc/intel/cannonlake/acpi/gpio.asl2
-rw-r--r--src/soc/intel/cannonlake/acpi/gpio_cnp_h.asl2
-rw-r--r--src/soc/intel/cannonlake/acpi/gpio_op.asl127
3 files changed, 2 insertions, 129 deletions
diff --git a/src/soc/intel/cannonlake/acpi/gpio.asl b/src/soc/intel/cannonlake/acpi/gpio.asl
index 2a4534330f..f1284e1412 100644
--- a/src/soc/intel/cannonlake/acpi/gpio.asl
+++ b/src/soc/intel/cannonlake/acpi/gpio.asl
@@ -1,9 +1,9 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <soc/gpio_defs.h>
+#include <soc/intel/common/block/acpi/acpi/gpio_op.asl>
#include <soc/irq.h>
#include <soc/pcr_ids.h>
#include <intelblocks/gpio.h>
-#include "gpio_op.asl"
Device (GPIO)
{
diff --git a/src/soc/intel/cannonlake/acpi/gpio_cnp_h.asl b/src/soc/intel/cannonlake/acpi/gpio_cnp_h.asl
index da0756f62a..5b3123df2c 100644
--- a/src/soc/intel/cannonlake/acpi/gpio_cnp_h.asl
+++ b/src/soc/intel/cannonlake/acpi/gpio_cnp_h.asl
@@ -1,8 +1,8 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <soc/gpio_defs_cnp_h.h>
+#include <soc/intel/common/block/acpi/acpi/gpio_op.asl>
#include <soc/irq.h>
#include <soc/pcr_ids.h>
-#include "gpio_op.asl"
Device (GPIO)
{
diff --git a/src/soc/intel/cannonlake/acpi/gpio_op.asl b/src/soc/intel/cannonlake/acpi/gpio_op.asl
deleted file mode 100644
index 9fa3dc4a86..0000000000
--- a/src/soc/intel/cannonlake/acpi/gpio_op.asl
+++ /dev/null
@@ -1,127 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-#include <intelblocks/gpio_defs.h>
-
-/*
- * Get GPIO Value
- * Arg0 - GPIO Number
- */
-Method (GRXS, 1, Serialized)
-{
- OperationRegion (PREG, SystemMemory, GADD (Arg0), 4)
- Field (PREG, AnyAcc, NoLock, Preserve)
- {
- VAL0, 32
- }
- Local0 = (PAD_CFG0_RX_STATE & VAL0) >> PAD_CFG0_RX_STATE_BIT
-
- Return (Local0)
-}
-
-/*
- * Get GPIO Tx Value
- * Arg0 - GPIO Number
- */
-Method (GTXS, 1, Serialized)
-{
- OperationRegion (PREG, SystemMemory, GADD (Arg0), 4)
- Field (PREG, AnyAcc, NoLock, Preserve)
- {
- VAL0, 32
- }
- Local0 = PAD_CFG0_TX_STATE & VAL0
-
- Return (Local0)
-}
-
-/*
- * Set GPIO Tx Value
- * Arg0 - GPIO Number
- */
-Method (STXS, 1, Serialized)
-{
- OperationRegion (PREG, SystemMemory, GADD (Arg0), 4)
- Field (PREG, AnyAcc, NoLock, Preserve)
- {
- VAL0, 32
- }
- VAL0 |= PAD_CFG0_TX_STATE
-}
-
-/*
- * Clear GPIO Tx Value
- * Arg0 - GPIO Number
- */
-Method (CTXS, 1, Serialized)
-{
- OperationRegion (PREG, SystemMemory, GADD (Arg0), 4)
- Field (PREG, AnyAcc, NoLock, Preserve)
- {
- VAL0, 32
- }
- VAL0 &= ~PAD_CFG0_TX_STATE
-}
-
-/*
- * Set Pad mode
- * Arg0 - GPIO Number
- * Arg1 - Pad mode
- * 0 = GPIO control pad
- * 1 = Native Function 1
- * 2 = Native Function 2
- * 3 = Native Function 3
- */
-Method (GPMO, 2, Serialized)
-{
- OperationRegion (PREG, SystemMemory, GADD (Arg0), 4)
- Field (PREG, AnyAcc, NoLock, Preserve)
- {
- VAL0, 32
- }
- Local0 = ~PAD_CFG0_MODE_MASK & VAL0
- Arg1 = (Arg1 << PAD_CFG0_MODE_SHIFT) & PAD_CFG0_MODE_MASK
- VAL0 = Local0 | Arg1
-}
-
-/*
- * Enable/Disable Tx buffer
- * Arg0 - GPIO Number
- * Arg1 - TxBuffer state
- * 0 = Disable Tx Buffer
- * 1 = Enable Tx Buffer
- */
-Method (GTXE, 2, Serialized)
-{
- OperationRegion (PREG, SystemMemory, GADD (Arg0), 4)
- Field (PREG, AnyAcc, NoLock, Preserve)
- {
- VAL0, 32
- }
-
- If (Arg1 == 1) {
- VAL0 &= ~PAD_CFG0_TX_DISABLE
- } ElseIf (Arg1 == 0){
- VAL0 |= PAD_CFG0_TX_DISABLE
- }
-}
-
-/*
- * Enable/Disable Rx buffer
- * Arg0 - GPIO Number
- * Arg1 - RxBuffer state
- * 0 = Disable Rx Buffer
- * 1 = Enable Rx Buffer
- */
-Method (GRXE, 2, Serialized)
-{
- OperationRegion (PREG, SystemMemory, GADD (Arg0), 4)
- Field (PREG, AnyAcc, NoLock, Preserve)
- {
- VAL0, 32
- }
-
- If (Arg1 == 1) {
- VAL0 &= ~PAD_CFG0_RX_DISABLE
- } ElseIf (Arg1 == 0){
- VAL0 |= PAD_CFG0_RX_DISABLE
- }
-}