[PATCH 0/1] mmc: sdhci-acpi: enable runtime-pm for device HID INT33C6

[PATCH 0/1] mmc: sdhci-acpi: enable runtime-pm for device HID INT33C6

[Adrian Hunter]

Hi

Here is a minor hardware ID addition to sdhci-acpi.

Please consider this for Linux 3.8, in which case it must go via
Rafael's linux-pm tree because that is where the new driver is.


Adrian Hunter (1):
      mmc: sdhci-acpi: enable runtime-pm for device HID INT33C6

 drivers/mmc/host/sdhci-acpi.c | 8 ++++++++
 1 file changed, 8 insertions(+)


Regards
Adrian Hunter

[PATCH 1/1] mmc: sdhci-acpi: enable runtime-pm for device HID INT33C6

[Adrian Hunter]

sdhci-acpi supports ACPI devices which have compatibility ID
PNP0D40, however it is not possible to know if those devices
will all work correctly with runtime-pm, so that must be configured
per hardware ID.

For INT33C6, several related quirks, capabilities and flags are set:

	MMC_CAP_NONREMOVABLE
		The SDIO card will never be removable

	SDHCI_ACPI_RUNTIME_PM
		Enable runtime-pm of the host controller

	MMC_CAP_POWER_OFF_CARD
		Enable runtime-pm of the SDIO card

	MMC_PM_KEEP_POWER
		SDIO card has the capability to remain powered up
		during system suspend

	SDHCI_QUIRK2_HOST_OFF_CARD_ON
		Always do a full reset during system resume
		because the card may be already initialized having
		not been powered off.

Wake-ups from the INT33C6 host controller are not supported, so the
following capability must *not* be set:

	MMC_PM_WAKE_SDIO_IRQ
		Enable wake on card interrupt

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
---
 drivers/mmc/host/sdhci-acpi.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c
index 6ac3617..12b0a78 100644
--- a/drivers/mmc/host/sdhci-acpi.c
+++ b/drivers/mmc/host/sdhci-acpi.c
@@ -87,7 +87,15 @@ static const struct sdhci_ops sdhci_acpi_ops_dflt = {
 	.enable_dma = sdhci_acpi_enable_dma,
 };
 
+static const struct sdhci_acpi_slot sdhci_acpi_slot_int_sdio = {
+	.quirks2 = SDHCI_QUIRK2_HOST_OFF_CARD_ON,
+	.caps    = MMC_CAP_NONREMOVABLE | MMC_CAP_POWER_OFF_CARD,
+	.flags   = SDHCI_ACPI_RUNTIME_PM,
+	.pm_caps = MMC_PM_KEEP_POWER,
+};
+
 static const struct acpi_device_id sdhci_acpi_ids[] = {
+	{ "INT33C6", (kernel_ulong_t)&sdhci_acpi_slot_int_sdio },
 	{ "PNP0D40" },
 	{ },
 };
-- 
1.7.11.7

Re: [PATCH 1/1] mmc: sdhci-acpi: enable runtime-pm for device HID INT33C6

[Chris Ball]

Hi,

On Mon, Dec 10 2012, Adrian Hunter wrote:
> sdhci-acpi supports ACPI devices which have compatibility ID
> PNP0D40, however it is not possible to know if those devices
> will all work correctly with runtime-pm, so that must be configured
> per hardware ID.

Acked-by: Chris Ball <cjb@laptop.org>

- Chris.
-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child

Re: [PATCH 1/1] mmc: sdhci-acpi: enable runtime-pm for device HID INT33C6

[Rafael J. Wysocki]

On Monday, December 10, 2012 09:20:03 AM Chris Ball wrote:
> Hi,
> 
> On Mon, Dec 10 2012, Adrian Hunter wrote:
> > sdhci-acpi supports ACPI devices which have compatibility ID
> > PNP0D40, however it is not possible to know if those devices
> > will all work correctly with runtime-pm, so that must be configured
> > per hardware ID.
> 
> Acked-by: Chris Ball <cjb@laptop.org>

Applied.

Thanks,
Rafael


-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.