summaryrefslogtreecommitdiff
path: root/src/soc/intel/skylake
diff options
context:
space:
mode:
authorAngel Pons <th3fanbus@gmail.com>2021-02-20 00:16:47 +0100
committerAngel Pons <th3fanbus@gmail.com>2021-03-01 19:37:36 +0000
commit6bd99f9ada29f199f9bf50f1cd6b37e24ee1eb7b (patch)
tree951dd60f3e563bfbbc3c33c2f9c0fd4e1331e981 /src/soc/intel/skylake
parentba4cfb504ca1e8246d1ea135dfb566c3db5835cb (diff)
soc/intel/skylake: Clean up SD GPIO handling
This is to align with newer platforms. Change-Id: If33ea3a7835ec071be3fd060f9712c47678bd6bf Signed-off-by: Angel Pons <th3fanbus@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/50963 Reviewed-by: Michael Niewöhner <foss@mniewoehner.de> Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc/intel/skylake')
-rw-r--r--src/soc/intel/skylake/chip.h7
-rw-r--r--src/soc/intel/skylake/sd.c26
2 files changed, 13 insertions, 20 deletions
diff --git a/src/soc/intel/skylake/chip.h b/src/soc/intel/skylake/chip.h
index bef0f122c9..99eb8e653f 100644
--- a/src/soc/intel/skylake/chip.h
+++ b/src/soc/intel/skylake/chip.h
@@ -427,12 +427,9 @@ struct soc_intel_skylake_config {
*
* GpioInt (Edge, ActiveBoth, SharedAndWake, PullNone, 10000,
* "\\_SB.PCI0.GPIO", 0, ResourceConsumer)
- * { sdcard_cd_gpio_default }
+ * { sdcard_cd_gpio }
*/
- unsigned int sdcard_cd_gpio_default;
-
- /* Use custom SD card detect GPIO configuration */
- struct acpi_gpio sdcard_cd_gpio;
+ unsigned int sdcard_cd_gpio;
/* Wake Enable Bitmap for USB2 ports */
u16 usb2_wake_enable_bitmap;
diff --git a/src/soc/intel/skylake/sd.c b/src/soc/intel/skylake/sd.c
index ba56182af1..46d385256b 100644
--- a/src/soc/intel/skylake/sd.c
+++ b/src/soc/intel/skylake/sd.c
@@ -3,26 +3,22 @@
#include <intelblocks/sd.h>
#include "chip.h"
-int sd_fill_soc_gpio_info(struct acpi_gpio* gpio, const struct device *dev)
+int sd_fill_soc_gpio_info(struct acpi_gpio *gpio, const struct device *dev)
{
config_t *config = config_of(dev);
- /* Nothing to write if GPIO is not set in devicetree */
- if (!config->sdcard_cd_gpio_default && !config->sdcard_cd_gpio.pins[0])
+ if (!config->sdcard_cd_gpio)
return -1;
- if (config->sdcard_cd_gpio_default) {
- gpio->type = ACPI_GPIO_TYPE_INTERRUPT;
- gpio->pull = ACPI_GPIO_PULL_NONE;
- gpio->irq.mode = ACPI_IRQ_EDGE_TRIGGERED;
- gpio->irq.polarity = ACPI_IRQ_ACTIVE_BOTH;
- gpio->irq.shared = ACPI_IRQ_SHARED;
- gpio->irq.wake = ACPI_IRQ_WAKE;
- gpio->interrupt_debounce_timeout = 10000; /* 100ms */
- gpio->pin_count = 1;
- gpio->pins[0] = config->sdcard_cd_gpio_default;
- } else
- *gpio = config->sdcard_cd_gpio;
+ gpio->type = ACPI_GPIO_TYPE_INTERRUPT;
+ gpio->pull = ACPI_GPIO_PULL_NONE;
+ gpio->irq.mode = ACPI_IRQ_EDGE_TRIGGERED;
+ gpio->irq.polarity = ACPI_IRQ_ACTIVE_BOTH;
+ gpio->irq.shared = ACPI_IRQ_SHARED;
+ gpio->irq.wake = ACPI_IRQ_WAKE;
+ gpio->interrupt_debounce_timeout = 10000; /* 100ms */
+ gpio->pin_count = 1;
+ gpio->pins[0] = config->sdcard_cd_gpio;
return 0;
}