From patchwork Mon Feb 15 14:11:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 8315701 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A5631C02AE for ; Mon, 15 Feb 2016 14:13:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AA146203C0 for ; Mon, 15 Feb 2016 14:13:36 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 6D576203A9 for ; Mon, 15 Feb 2016 14:13:35 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 775DA26559B; Mon, 15 Feb 2016 15:13:34 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id C60D726513A; Mon, 15 Feb 2016 15:11:58 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id D130C2651FE; Mon, 15 Feb 2016 15:11:56 +0100 (CET) Received: from comal.ext.ti.com (comal.ext.ti.com [198.47.26.152]) by alsa0.perex.cz (Postfix) with ESMTP id 24829264FBB for ; Mon, 15 Feb 2016 15:11:48 +0100 (CET) Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id u1FEBmvG001873; Mon, 15 Feb 2016 08:11:48 -0600 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id u1FEBldi018875; Mon, 15 Feb 2016 08:11:47 -0600 Received: from dflp32.itg.ti.com (10.64.6.15) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.3.224.2; Mon, 15 Feb 2016 08:11:47 -0600 Received: from dflp33.itg.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id u1FEBcmZ032690; Mon, 15 Feb 2016 08:11:46 -0600 From: Peter Ujfalusi To: Mark Brown , Liam Girdwood Date: Mon, 15 Feb 2016 16:11:34 +0200 Message-ID: <1455545495-20292-4-git-send-email-peter.ujfalusi@ti.com> X-Mailer: git-send-email 2.7.1 In-Reply-To: <1455545495-20292-1-git-send-email-peter.ujfalusi@ti.com> References: <1455545495-20292-1-git-send-email-peter.ujfalusi@ti.com> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, Jyri Sarha Subject: [alsa-devel] [PATCH 3/4] ASoC: simple-card: Add system-clock-direction DT parameter to dai nodes X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jyri Sarha Select dir parameters for set_sysclk calls in the card init phase. Signed-off-by: Jyri Sarha Signed-off-by: Peter Ujfalusi --- Documentation/devicetree/bindings/sound/simple-card.txt | 1 + include/sound/simple_card.h | 1 + sound/soc/generic/simple-card.c | 14 +++++++++++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/sound/simple-card.txt b/Documentation/devicetree/bindings/sound/simple-card.txt index cf3979eb3578..1f2cf76d701a 100644 --- a/Documentation/devicetree/bindings/sound/simple-card.txt +++ b/Documentation/devicetree/bindings/sound/simple-card.txt @@ -84,6 +84,7 @@ Optional CPU/CODEC subnodes properties: in dai startup() and disabled with clk_disable_unprepare() in dai shutdown(). +- system-clock-direction : "in" or "out", default "in" Example 1 - single DAI link: diff --git a/include/sound/simple_card.h b/include/sound/simple_card.h index 0399352f3a62..783bc5499794 100644 --- a/include/sound/simple_card.h +++ b/include/sound/simple_card.h @@ -17,6 +17,7 @@ struct asoc_simple_dai { const char *name; unsigned int sysclk; + int sysclk_dir; int slots; int slot_width; unsigned int tx_slot_mask; diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 2389ab47e25f..f0d89e6f28a6 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -142,7 +142,8 @@ static int __asoc_simple_card_dai_init(struct snd_soc_dai *dai, int ret; if (set->sysclk) { - ret = snd_soc_dai_set_sysclk(dai, 0, set->sysclk, 0); + ret = snd_soc_dai_set_sysclk(dai, 0, set->sysclk, + set->sysclk_dir); if (ret && ret != -ENOTSUPP) { dev_err(dai->dev, "simple-card: set_sysclk error\n"); goto err; @@ -220,6 +221,7 @@ asoc_simple_card_sub_parse_of(struct device_node *np, { struct of_phandle_args args; struct clk *clk; + const char *str; u32 val; int ret; @@ -249,6 +251,16 @@ asoc_simple_card_sub_parse_of(struct device_node *np, if (ret) return ret; + ret = of_property_read_string(np, "system-clock-direction", &str); + if (ret == 0) { + if (!strcmp(str, "out")) + dai->sysclk_dir = SND_SOC_CLOCK_OUT; + else if (!strcmp(str, "in")) + dai->sysclk_dir = SND_SOC_CLOCK_IN; + else + return -EINVAL; + } + /* * Parse dai->sysclk come from "clocks = <&xxx>" * (if system has common clock)