sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/intel/skylake: Clean up SD GPIO handling

Browse Source 
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>
This commit is contained in:
Angel Pons
2021-02-20 00:16:47 +01:00
parent ba4cfb504c
commit 6bd99f9ada
13 changed files with 24 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/soc/intel/skylake/chip.h
View File

@@ -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;

26
src/soc/intel/skylake/sd.c
View File

@@ -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;
}