From patchwork Fri Oct 12 03:12:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Lu X-Patchwork-Id: 1585031 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 1A69EDFFCF for ; Fri, 12 Oct 2012 03:12:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757309Ab2JLDMy (ORCPT ); Thu, 11 Oct 2012 23:12:54 -0400 Received: from mga09.intel.com ([134.134.136.24]:38228 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755821Ab2JLDMw (ORCPT ); Thu, 11 Oct 2012 23:12:52 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 11 Oct 2012 20:12:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,576,1344236400"; d="scan'208";a="204632815" Received: from aaronlu.sh.intel.com ([10.239.36.146]) by orsmga001.jf.intel.com with ESMTP; 11 Oct 2012 20:12:49 -0700 From: Aaron Lu To: Chris Ball , "Rafael J. Wysocki" Cc: linux-mmc@vger.kernel.org, linux-pm@vger.kernel.org, linux-acpi@vger.kernel.org, Aaron Lu Subject: [RFC PATCH 2/4] mmc: sdio: bind sdio device with acpi device Date: Fri, 12 Oct 2012 11:12:39 +0800 Message-Id: <1350011561-21039-3-git-send-email-aaron.lu@intel.com> X-Mailer: git-send-email 1.7.12.3.3.g40701ad In-Reply-To: <1350011561-21039-1-git-send-email-aaron.lu@intel.com> References: <1350011561-21039-1-git-send-email-aaron.lu@intel.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org ACPI spec defines the _ADDR encoding for sdio bus as: High word - slot number (0 based) Low word - function number This patch adds support for sdio device binding with acpi using the generic ACPI glue framework. Signed-off-by: Aaron Lu --- drivers/mmc/core/Makefile | 1 + drivers/mmc/core/sdio_acpi.c | 35 +++++++++++++++++++++++++++++++++++ drivers/mmc/core/sdio_bus.c | 14 ++++++++++++-- drivers/mmc/core/sdio_bus.h | 2 ++ 4 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 drivers/mmc/core/sdio_acpi.c diff --git a/drivers/mmc/core/Makefile b/drivers/mmc/core/Makefile index 38ed210..c8300aa 100644 --- a/drivers/mmc/core/Makefile +++ b/drivers/mmc/core/Makefile @@ -10,3 +10,4 @@ mmc_core-y := core.o bus.o host.o \ quirks.o slot-gpio.o mmc_core-$(CONFIG_DEBUG_FS) += debugfs.o +mmc_core-$(CONFIG_ACPI) += sdio_acpi.o diff --git a/drivers/mmc/core/sdio_acpi.c b/drivers/mmc/core/sdio_acpi.c new file mode 100644 index 0000000..0f92e90 --- /dev/null +++ b/drivers/mmc/core/sdio_acpi.c @@ -0,0 +1,35 @@ +#include +#include +#include +#include +#include +#include +#include "sdio_bus.h" + +static int acpi_sdio_find_device(struct device *dev, acpi_handle *handle) +{ + struct sdio_func *func; + struct sdhci_host *host; + u64 addr; + + func = dev_to_sdio_func(dev); + host = mmc_priv(func->card->host); + + addr = (host->slotno << 16) | func->num; + + *handle = acpi_get_child(DEVICE_ACPI_HANDLE(dev), addr); + if (!*handle) + return -ENODEV; + + return 0; +} + +static struct acpi_bus_type acpi_sdio_bus = { + .bus = &sdio_bus_type, + .find_device = acpi_sdio_find_device, +}; + +int sdio_acpi_register(void) +{ + return register_acpi_bus_type(&acpi_sdio_bus); +} diff --git a/drivers/mmc/core/sdio_bus.c b/drivers/mmc/core/sdio_bus.c index 6bf6879..aaec9e2 100644 --- a/drivers/mmc/core/sdio_bus.c +++ b/drivers/mmc/core/sdio_bus.c @@ -23,6 +23,7 @@ #include "sdio_cis.h" #include "sdio_bus.h" +#include "sdio_acpi.h" /* show configuration fields */ #define sdio_config_attr(field, format_string) \ @@ -209,7 +210,7 @@ static const struct dev_pm_ops sdio_bus_pm_ops = { #endif /* !CONFIG_PM */ -static struct bus_type sdio_bus_type = { +struct bus_type sdio_bus_type = { .name = "sdio", .dev_attrs = sdio_dev_attrs, .match = sdio_bus_match, @@ -221,7 +222,16 @@ static struct bus_type sdio_bus_type = { int sdio_register_bus(void) { - return bus_register(&sdio_bus_type); + int ret; + + ret = bus_register(&sdio_bus_type); + if (ret) + goto out; + + ret = sdio_acpi_register(); + +out: + return ret; } void sdio_unregister_bus(void) diff --git a/drivers/mmc/core/sdio_bus.h b/drivers/mmc/core/sdio_bus.h index 567a768..91c0e93 100644 --- a/drivers/mmc/core/sdio_bus.h +++ b/drivers/mmc/core/sdio_bus.h @@ -18,5 +18,7 @@ void sdio_remove_func(struct sdio_func *func); int sdio_register_bus(void); void sdio_unregister_bus(void); +extern struct bus_type sdio_bus_type; + #endif