From patchwork Mon Mar 21 03:42:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 684 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:44:43 -0000 Delivered-To: patches@linaro.org Received: by 10.220.28.198 with SMTP id n6cs113065vcc; Sun, 20 Mar 2011 20:39:35 -0700 (PDT) Received: by 10.43.50.67 with SMTP id vd3mr5991598icb.511.1300678774625; Sun, 20 Mar 2011 20:39:34 -0700 (PDT) Received: from mail-iw0-f178.google.com (mail-iw0-f178.google.com [209.85.214.178]) by mx.google.com with ESMTPS id jq2si15819559icb.120.2011.03.20.20.39.33 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 20 Mar 2011 20:39:33 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.214.178 is neither permitted nor denied by best guess record for domain of shawn.guo@linaro.org) client-ip=209.85.214.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.214.178 is neither permitted nor denied by best guess record for domain of shawn.guo@linaro.org) smtp.mail=shawn.guo@linaro.org Received: by iwn9 with SMTP id 9so7529258iwn.37 for ; Sun, 20 Mar 2011 20:39:33 -0700 (PDT) Received: by 10.42.145.198 with SMTP id g6mr6227700icv.131.1300678772887; Sun, 20 Mar 2011 20:39:32 -0700 (PDT) Received: from localhost.localdomain ([114.216.149.123]) by mx.google.com with ESMTPS id g17sm1130508ibb.40.2011.03.20.20.39.25 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 20 Mar 2011 20:39:32 -0700 (PDT) From: Shawn Guo To: devicetree-discuss@lists.ozlabs.org Cc: grant.likely@secretlab.ca, linaro-dev@lists.linaro.org, patches@linaro.org, Shawn Guo Subject: [PATCH 2/5] mmc: sdhci: make sdhci-cns3xxx driver self registered Date: Mon, 21 Mar 2011 11:42:15 +0800 Message-Id: <1300678938-8046-3-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1300678938-8046-1-git-send-email-shawn.guo@linaro.org> References: <1300678938-8046-1-git-send-email-shawn.guo@linaro.org> The patch adds sdhci-cns3xxx its own .probe and .remove which in turn call into the common functions provided by sdhci-pltfm.c, so that sdhci-cns3xxx driver registers itself and keep all sdhci-cns3xxx specific things like sdhci_cns3xxx_pdata away from sdhci-pltfm.c which is common. Signed-off-by: Shawn Guo --- drivers/mmc/host/sdhci-cns3xxx.c | 68 +++++++++++++++++++++++++++++++++++++- drivers/mmc/host/sdhci-pltfm.c | 3 -- drivers/mmc/host/sdhci-pltfm.h | 1 - 3 files changed, 67 insertions(+), 5 deletions(-) diff --git a/drivers/mmc/host/sdhci-cns3xxx.c b/drivers/mmc/host/sdhci-cns3xxx.c index 9ebd1d7..97d19cd 100644 --- a/drivers/mmc/host/sdhci-cns3xxx.c +++ b/drivers/mmc/host/sdhci-cns3xxx.c @@ -86,7 +86,7 @@ static struct sdhci_ops sdhci_cns3xxx_ops = { .set_clock = sdhci_cns3xxx_set_clock, }; -struct sdhci_pltfm_data sdhci_cns3xxx_pdata = { +static struct sdhci_pltfm_data sdhci_cns3xxx_pdata = { .ops = &sdhci_cns3xxx_ops, .quirks = SDHCI_QUIRK_BROKEN_DMA | SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK | @@ -95,3 +95,69 @@ struct sdhci_pltfm_data sdhci_cns3xxx_pdata = { SDHCI_QUIRK_BROKEN_TIMEOUT_VAL | SDHCI_QUIRK_NONSTANDARD_CLOCK, }; + +static int __devinit sdhci_cns3xxx_probe(struct platform_device *pdev) +{ + struct sdhci_host *host; + int ret; + + host = sdhci_pltfm_init(pdev, &sdhci_cns3xxx_pdata); + if (!host) + return -ENOMEM; + + ret = sdhci_add_host(host); + if (ret) + goto err_add_host; + + return 0; + +err_add_host: + sdhci_pltfm_free(pdev); + return ret; +} + +static int __devexit sdhci_cns3xxx_remove(struct platform_device *pdev) +{ + struct sdhci_host *host = platform_get_drvdata(pdev); + int dead = 0; + u32 scratch; + + scratch = readl(host->ioaddr + SDHCI_INT_STATUS); + if (scratch == (u32)-1) + dead = 1; + + sdhci_remove_host(pdev, dead); + sdhci_pltfm_free(pdev); + + return 0; +} + +static struct platform_driver sdhci_cns3xxx_driver = { + .driver = { + .name = "sdhci-cns3xxx", + .owner = THIS_MODULE, + }, + .probe = sdhci_cns3xxx_probe, + .remove = __devexit_p(sdhci_cns3xxx_remove), +#ifdef CONFIG_PM + .suspend = sdhci_pltfm_suspend, + .resume = sdhci_pltfm_resume, +#endif +}; + +static int __init sdhci_cns3xxx_init(void) +{ + return platform_driver_register(&sdhci_cns3xxx_driver); +} + +static void __exit sdhci_cns3xxx_exit(void) +{ + platform_driver_unregister(&sdhci_cns3xxx_driver); +} + +module_init(sdhci_cns3xxx_init); +module_exit(sdhci_cns3xxx_exit); + +MODULE_DESCRIPTION("SDHCI driver for CNS3xxx"); +MODULE_AUTHOR("Anton Vorontsov "); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c index 38b8cb4..b9a904d 100644 --- a/drivers/mmc/host/sdhci-pltfm.c +++ b/drivers/mmc/host/sdhci-pltfm.c @@ -272,9 +272,6 @@ static int __devexit sdhci_pltfm_remove(struct platform_device *pdev) static const struct platform_device_id sdhci_pltfm_ids[] = { { "sdhci", }, -#ifdef CONFIG_MMC_SDHCI_CNS3XXX - { "sdhci-cns3xxx", (kernel_ulong_t)&sdhci_cns3xxx_pdata }, -#endif #ifdef CONFIG_MMC_SDHCI_DOVE { "sdhci-dove", (kernel_ulong_t)&sdhci_dove_pdata }, #endif diff --git a/drivers/mmc/host/sdhci-pltfm.h b/drivers/mmc/host/sdhci-pltfm.h index 8357eba..493a8d0 100644 --- a/drivers/mmc/host/sdhci-pltfm.h +++ b/drivers/mmc/host/sdhci-pltfm.h @@ -21,7 +21,6 @@ struct sdhci_pltfm_host { u32 scratchpad; /* to handle quirks across io-accessor calls */ }; -extern struct sdhci_pltfm_data sdhci_cns3xxx_pdata; extern struct sdhci_pltfm_data sdhci_dove_pdata; extern struct sdhci_pltfm_data sdhci_tegra_pdata; extern struct sdhci_pltfm_data sdhci_tegra_dt_pdata;