sdhci: pci: Fix up power if device has ACPI companion
Fix up a power state in case PCI device has an ACPI companion. Do it only for Intel Merrifield for now. This is almost copy'n'paste of part of sdhci_acpi_probe() and might be split out to a helper function in the future. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Acked-by: Adrian Hunter <adrian.hunter@intel.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Родитель
cd25c7be3c
Коммит
0e39220ed6
|
@ -730,6 +730,24 @@ static const struct sdhci_pci_fixes sdhci_intel_byt_sd = {
|
|||
#define INTEL_MRFLD_SD 2
|
||||
#define INTEL_MRFLD_SDIO 3
|
||||
|
||||
#ifdef CONFIG_ACPI
|
||||
static void intel_mrfld_mmc_fix_up_power_slot(struct sdhci_pci_slot *slot)
|
||||
{
|
||||
struct acpi_device *device, *child;
|
||||
|
||||
device = ACPI_COMPANION(&slot->chip->pdev->dev);
|
||||
if (!device)
|
||||
return;
|
||||
|
||||
acpi_device_fix_up_power(device);
|
||||
list_for_each_entry(child, &device->children, node)
|
||||
if (child->status.present && child->status.enabled)
|
||||
acpi_device_fix_up_power(child);
|
||||
}
|
||||
#else
|
||||
static inline void intel_mrfld_mmc_fix_up_power_slot(struct sdhci_pci_slot *slot) {}
|
||||
#endif
|
||||
|
||||
static int intel_mrfld_mmc_probe_slot(struct sdhci_pci_slot *slot)
|
||||
{
|
||||
unsigned int func = PCI_FUNC(slot->chip->pdev->devfn);
|
||||
|
@ -751,6 +769,8 @@ static int intel_mrfld_mmc_probe_slot(struct sdhci_pci_slot *slot)
|
|||
default:
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
intel_mrfld_mmc_fix_up_power_slot(slot);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче