From patchwork Thu Feb 2 02:12:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zhao X-Patchwork-Id: 6562 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id F0AFB23E16 for ; Thu, 2 Feb 2012 02:13:11 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id AF236A18142 for ; Thu, 2 Feb 2012 02:13:11 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id z7so3346576iab.11 for ; Wed, 01 Feb 2012 18:13:11 -0800 (PST) Received: by 10.50.15.169 with SMTP id y9mr10123092igc.9.1328148791407; Wed, 01 Feb 2012 18:13:11 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.169.210 with SMTP id a18cs34154ibz; Wed, 1 Feb 2012 18:13:11 -0800 (PST) Received: by 10.101.5.17 with SMTP id h17mr395372ani.15.1328148790385; Wed, 01 Feb 2012 18:13:10 -0800 (PST) Received: from ch1outboundpool.messaging.microsoft.com (ch1ehsobe005.messaging.microsoft.com. [216.32.181.185]) by mx.google.com with ESMTPS id d9si915295yhn.83.2012.02.01.18.13.09 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 01 Feb 2012 18:13:10 -0800 (PST) Received-SPF: neutral (google.com: 216.32.181.185 is neither permitted nor denied by best guess record for domain of richard.zhao@linaro.org) client-ip=216.32.181.185; Authentication-Results: mx.google.com; spf=neutral (google.com: 216.32.181.185 is neither permitted nor denied by best guess record for domain of richard.zhao@linaro.org) smtp.mail=richard.zhao@linaro.org Received: from mail73-ch1-R.bigfish.com (10.43.68.233) by CH1EHSOBE014.bigfish.com (10.43.70.64) with Microsoft SMTP Server id 14.1.225.23; Thu, 2 Feb 2012 02:13:09 +0000 Received: from mail73-ch1 (localhost [127.0.0.1]) by mail73-ch1-R.bigfish.com (Postfix) with ESMTP id 6C861E045A; Thu, 2 Feb 2012 02:13:09 +0000 (UTC) X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275dhz2dh87h2a8h668h839h) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-FB-DOMAIN-IP-MATCH: fail Received: from mail73-ch1 (localhost.localdomain [127.0.0.1]) by mail73-ch1 (MessageSwitch) id 1328148787727433_5219; Thu, 2 Feb 2012 02:13:07 +0000 (UTC) Received: from CH1EHSMHS011.bigfish.com (snatpool1.int.messaging.microsoft.com [10.43.68.242]) by mail73-ch1.bigfish.com (Postfix) with ESMTP id AC55E340049; Thu, 2 Feb 2012 02:13:07 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CH1EHSMHS011.bigfish.com (10.43.70.11) with Microsoft SMTP Server (TLS) id 14.1.225.23; Thu, 2 Feb 2012 02:13:07 +0000 Received: from az33smr01.freescale.net (10.64.34.199) by 039-SN1MMR1-001.039d.mgd.msft.net (10.84.1.13) with Microsoft SMTP Server id 14.1.355.3; Wed, 1 Feb 2012 20:12:58 -0600 Received: from b20223-02.ap.freescale.net (b20223-02.ap.freescale.net [10.192.242.124]) by az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id q122CTOi028023; Wed, 1 Feb 2012 20:12:55 -0600 (CST) From: Richard Zhao To: CC: , , , , , , , , Richard Zhao Subject: [PATCH v2 8/9] ASoC: imx: add dt support for audmux-v2 Date: Thu, 2 Feb 2012 10:12:07 +0800 Message-ID: <1328148728-32258-9-git-send-email-richard.zhao@linaro.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1328148728-32258-1-git-send-email-richard.zhao@linaro.org> References: <1328148728-32258-1-git-send-email-richard.zhao@linaro.org> MIME-Version: 1.0 X-OriginatorOrg: sigmatel.com Signed-off-by: Richard Zhao --- .../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@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 #include #include +#include #include +#include #include #include @@ -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, } };