diff options
Diffstat (limited to 'src/soc/intel')
| -rw-r--r-- | src/soc/intel/skylake/chip.h | 7 | ||||
| -rw-r--r-- | src/soc/intel/skylake/sd.c | 26 |
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; } |