linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: richard.zhao@linaro.org (Richard Zhao)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 5/9] ARM: mxc: convert audmux-v2 to a platform driver
Date: Thu, 2 Feb 2012 10:12:04 +0800	[thread overview]
Message-ID: <1328148728-32258-6-git-send-email-richard.zhao@linaro.org> (raw)
In-Reply-To: <1328148728-32258-1-git-send-email-richard.zhao@linaro.org>

Plaform driver is more flexible and easy to add DT support.

Signed-off-by: Richard Zhao <richard.zhao@linaro.org>
---
 arch/arm/plat-mxc/audmux-v2.c |  102 ++++++++++++++++++++++++++++++----------
 1 files changed, 76 insertions(+), 26 deletions(-)

diff --git a/arch/arm/plat-mxc/audmux-v2.c b/arch/arm/plat-mxc/audmux-v2.c
index 8cced35..d53c029 100644
--- a/arch/arm/plat-mxc/audmux-v2.c
+++ b/arch/arm/plat-mxc/audmux-v2.c
@@ -24,6 +24,9 @@
 #include <mach/audmux.h>
 #include <mach/hardware.h>
 
+#define DRIVER_NAME "audmux-v2"
+
+struct resource *audmux_res;
 static struct clk *audmux_clk;
 static void __iomem *audmux_base;
 
@@ -140,7 +143,7 @@ static const struct file_operations audmux_debugfs_fops = {
 	.llseek = default_llseek,
 };
 
-static void audmux_debugfs_init(void)
+static void __init audmux_debugfs_init(void)
 {
 	int i;
 	char buf[20];
@@ -159,10 +162,18 @@ static void audmux_debugfs_init(void)
 				   i);
 	}
 }
+
+static void __exit audmux_debugfs_remove(void)
+{
+	debugfs_remove_recursive(audmux_debugfs_root);
+}
 #else
 static inline void audmux_debugfs_init(void)
 {
 }
+static void audmux_debugfs_remove(void)
+{
+}
 #endif
 
 int mxc_audmux_v2_configure_port(unsigned int port, unsigned int ptcr,
@@ -184,36 +195,75 @@ int mxc_audmux_v2_configure_port(unsigned int port, unsigned int ptcr,
 }
 EXPORT_SYMBOL_GPL(mxc_audmux_v2_configure_port);
 
-static int mxc_audmux_v2_init(void)
+static int __init mxc_audmux_v2_probe(struct platform_device *pdev)
 {
-	int ret;
-	if (cpu_is_mx51()) {
-		audmux_base = MX51_IO_ADDRESS(MX51_AUDMUX_BASE_ADDR);
-	} else if (cpu_is_mx31()) {
-		audmux_base = MX31_IO_ADDRESS(MX31_AUDMUX_BASE_ADDR);
-	} else if (cpu_is_mx35()) {
-		audmux_clk = clk_get(NULL, "audmux");
-		if (IS_ERR(audmux_clk)) {
-			ret = PTR_ERR(audmux_clk);
-			printk(KERN_ERR "%s: cannot get clock: %d\n", __func__,
-					ret);
-			return ret;
-		}
-		audmux_base = MX35_IO_ADDRESS(MX35_AUDMUX_BASE_ADDR);
-	} else if (cpu_is_mx25()) {
-		audmux_clk = clk_get(NULL, "audmux");
-		if (IS_ERR(audmux_clk)) {
-			ret = PTR_ERR(audmux_clk);
-			printk(KERN_ERR "%s: cannot get clock: %d\n", __func__,
-					ret);
-			return ret;
-		}
-		audmux_base = MX25_IO_ADDRESS(MX25_AUDMUX_BASE_ADDR);
+	struct resource *res;
+	resource_size_t res_size;
+
+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	if (!res) {
+		dev_err(&pdev->dev, "can't get device resources\n");
+		return -ENOENT;
+	}
+
+	res_size = resource_size(res);
+
+	if (!request_mem_region(res->start, res_size, DRIVER_NAME)) {
+		dev_err(&pdev->dev, "request_mem_region failed\n");
+		return -EBUSY;
+	}
+
+	audmux_base = ioremap(res->start, res_size);
+
+	if (!audmux_base) {
+		dev_err(&pdev->dev, "ioremap failed\n");
+		release_mem_region(res->start, resource_size(res));
+		return -EIO;
+	}
+
+	audmux_clk = clk_get(&pdev->dev, "audmux");
+	if (IS_ERR(audmux_clk)) {
+		dev_warn(&pdev->dev, "cannot get clock: %ld\n",
+				PTR_ERR(audmux_clk));
+		audmux_clk = NULL;
 	}
 
 	audmux_debugfs_init();
+	audmux_res = res;
 
 	return 0;
 }
 
-postcore_initcall(mxc_audmux_v2_init);
+static int __exit mxc_audmux_v2_remove(struct platform_device *pdev)
+{
+	audmux_debugfs_remove();
+	clk_put(audmux_clk);
+	iounmap(audmux_base);
+	release_mem_region(audmux_res->start, resource_size(audmux_res));
+
+	return 0;
+}
+
+static struct platform_driver mxc_audmux_v2_driver = {
+	.remove		= __exit_p(mxc_audmux_v2_remove),
+	.driver	= {
+		.name	= DRIVER_NAME,
+		.owner	= THIS_MODULE,
+	}
+};
+
+static int __init mxc_audmux_v2_init(void)
+{
+	return platform_driver_probe(&mxc_audmux_v2_driver,
+					mxc_audmux_v2_probe);
+}
+subsys_initcall(mxc_audmux_v2_init);
+
+static void __exit mxc_audmux_v2_exit(void)
+{
+	platform_driver_unregister(&mxc_audmux_v2_driver);
+}
+module_exit(mxc_audmux_v2_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:" DRIVER_NAME);
-- 
1.7.5.4

  parent reply	other threads:[~2012-02-02  2:12 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-02  2:11 [PATCH v2 0/9] imx patches when I enable imx6q sabrelite audio Richard Zhao
2012-02-02  2:12 ` [PATCH v2 1/9] ARM: mxc: make imx_dma_is_general_purpose more generic for sdma Richard Zhao
2012-02-02  2:12 ` [PATCH v2 2/9] ARM: imx6q: add cko1 clock Richard Zhao
2012-02-02  2:12 ` [PATCH v2 3/9] ARM: dts: imx6q-sabrelite: add 2p5v and 3p3v regulators Richard Zhao
2012-02-02  2:12 ` [PATCH v2 4/9] ARM: dts: imx6q-sabrelite: add sgtl5000 audio codec Richard Zhao
2012-02-02 11:24   ` Fabio Estevam
2012-02-02 13:49     ` Richard Zhao
2012-02-02 14:15       ` Fabio Estevam
2012-02-02 14:41         ` Richard Zhao
2012-02-02  2:12 ` Richard Zhao [this message]
2012-02-02  2:12 ` [PATCH v2 6/9] ARM: mx31ads: add audmux device Richard Zhao
2012-02-02  8:55   ` Shawn Guo
2012-02-02  9:11     ` Shawn Guo
2012-02-02  9:24       ` Richard Zhao
2012-02-02 13:09         ` Shawn Guo
2012-02-02 13:58           ` Richard Zhao
2012-02-02 14:09             ` Mark Brown
2012-02-02 14:25             ` Shawn Guo
2012-02-03  2:15             ` Richard Zhao
2012-02-03 13:32               ` Shawn Guo
2012-02-05  4:50                 ` Richard Zhao
2012-02-14  1:35                   ` Richard Zhao
2012-02-14  6:06                     ` Mark Brown
2012-02-14  7:34                       ` Richard Zhao
2012-02-14 17:23                         ` Mark Brown
2012-02-03 13:27           ` Shawn Guo
2012-02-02 12:09   ` Mark Brown
2012-02-02 13:17     ` Shawn Guo
2012-02-02 13:26       ` Mark Brown
2012-02-02 14:11         ` Shawn Guo
2012-02-02 14:16           ` Mark Brown
2012-02-02  2:12 ` [PATCH v2 7/9] ARM: mxc: move audmux-v2 to sound/soc/imx Richard Zhao
2012-02-02  9:02   ` Shawn Guo
2012-02-02  9:42     ` Richard Zhao
2012-02-02  2:12 ` [PATCH v2 8/9] ASoC: imx: add dt support for audmux-v2 Richard Zhao
2012-02-02 12:10   ` Mark Brown
2012-02-02 14:02     ` Richard Zhao
2012-02-02  2:12 ` [PATCH v2 9/9] ARM: imx6q-sabrelite: add audmux support Richard Zhao
2012-02-02  8:30   ` Shawn Guo
2012-02-02  8:22     ` Richard Zhao
2012-02-02  8:32   ` Shawn Guo
2012-02-27  7:59 ` [PATCH v2 0/9] imx patches when I enable imx6q sabrelite audio Shawn Guo
2012-02-28 12:07   ` Richard Zhao

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1328148728-32258-6-git-send-email-richard.zhao@linaro.org \
    --to=richard.zhao@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).