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 8/9] ASoC: imx: add dt support for audmux-v2
Date: Thu, 2 Feb 2012 10:12:07 +0800	[thread overview]
Message-ID: <1328148728-32258-9-git-send-email-richard.zhao@linaro.org> (raw)
In-Reply-To: <1328148728-32258-1-git-send-email-richard.zhao@linaro.org>

Signed-off-by: Richard Zhao <richard.zhao@linaro.org>
---
 .../bindings/sound/soc/imx/audmux-v2.txt           |   11 +++++++++++
 sound/soc/imx/audmux-v2.c                          |    8 ++++++++
 2 files changed, 19 insertions(+), 0 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/sound/soc/imx/audmux-v2.txt

diff --git a/Documentation/devicetree/bindings/sound/soc/imx/audmux-v2.txt b/Documentation/devicetree/bindings/sound/soc/imx/audmux-v2.txt
new file mode 100644
index 0000000..b8ec5aa
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/soc/imx/audmux-v2.txt
@@ -0,0 +1,11 @@
+* Freescale audmux device for imx3, imx5, imx6 etc.
+
+Required properties:
+- compatible : "fsl,imx31-audmux".
+
+Example:
+
+audmux at 021d8000 {
+	compatible = "fsl,imx6q-audmux", "fsl,imx31-audmux";
+	reg = <0x021d8000 0x4000>;
+};
diff --git a/sound/soc/imx/audmux-v2.c b/sound/soc/imx/audmux-v2.c
index d53c029..af42fca 100644
--- a/sound/soc/imx/audmux-v2.c
+++ b/sound/soc/imx/audmux-v2.c
@@ -20,7 +20,9 @@
 #include <linux/io.h>
 #include <linux/clk.h>
 #include <linux/debugfs.h>
+#include <linux/platform_device.h>
 #include <linux/slab.h>
+#include <linux/of.h>
 #include <mach/audmux.h>
 #include <mach/hardware.h>
 
@@ -244,11 +246,17 @@ static int __exit mxc_audmux_v2_remove(struct platform_device *pdev)
 	return 0;
 }
 
+static const struct of_device_id audmux_v2_dt_ids[] = {
+	{ .compatible = "fsl,imx31-audmux", },
+	{ /* sentinel */ }
+};
+
 static struct platform_driver mxc_audmux_v2_driver = {
 	.remove		= __exit_p(mxc_audmux_v2_remove),
 	.driver	= {
 		.name	= DRIVER_NAME,
 		.owner	= THIS_MODULE,
+		.of_match_table = audmux_v2_dt_ids,
 	}
 };
 
-- 
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 ` [PATCH v2 5/9] ARM: mxc: convert audmux-v2 to a platform driver Richard Zhao
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 ` Richard Zhao [this message]
2012-02-02 12:10   ` [PATCH v2 8/9] ASoC: imx: add dt support for audmux-v2 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-9-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).