From patchwork Tue Mar 27 20:56:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kirill Marinushkin X-Patchwork-Id: 10311635 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E0069600F6 for ; Tue, 27 Mar 2018 20:56:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DD0CE2953A for ; Tue, 27 Mar 2018 20:56:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D1BF8295A6; Tue, 27 Mar 2018 20:56:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID autolearn=no version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 35CC52953A for ; Tue, 27 Mar 2018 20:56:26 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id DFE222671E9; Tue, 27 Mar 2018 22:56:23 +0200 (CEST) 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 370162671E9; Tue, 27 Mar 2018 22:56:21 +0200 (CEST) Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by alsa0.perex.cz (Postfix) with ESMTP id 5D5662671E9 for ; Tue, 27 Mar 2018 22:56:16 +0200 (CEST) Received: by mail-wm0-f65.google.com with SMTP id l9so1187385wmh.2 for ; Tue, 27 Mar 2018 13:56:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nGcyGfSSLmbPXqrIGUcSGIqkJO0piA301gIOmjtLPxY=; b=J6EpzpN0SHIufVUwp4jbc55pmh2uwHf8jPnSsCxPgpx56nT/0fY9VQLhiiALXTHuhe gMJx6g68divi3LNjFPARfB0+Gugn5MwnxbHiEeP67uzSxaBvtUxi7V0DclEq1NezrRU0 4FV73qXBcFehlBiMbLaJiC4Zg3o9lzUy8BCuHJUMg9Q6f+IqJnXUZgJVRBNxRHpRK4KU nT6+H9tC9Hg3IXGMhDnHrRs4C95MblN6VWz93IDG85WhcZkloxxtWKmb59MTb2+QLnlC EGlkW39Hb8/b8rndm/dxZwCgh1LSXU6ZgFCsFuW+Fyg+v4ekk1b6xzEg88+5nIZACtAb +sAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=nGcyGfSSLmbPXqrIGUcSGIqkJO0piA301gIOmjtLPxY=; b=b9Pq5qwWVstG4qLP9Cjfmkq0D+thD6sJuMjzQAYx5cJ+Gf85jf1yYUZz9jKMCgLcBb x9+JLXGeJMIG8kiG4eGD39UE6og73HMBczwUwVgCrxfFZ4bzdOA1o9Slaq2dOo5Q/b66 v6Gf8nATwbkUefXt81i7Jed3yPtyLv/Ooik1fvQ6R+7V5B1xWzpC0JP25LIL4ixFQZ80 5G1Gm6GpKWJpnMMIxt4iEXyWA5D+0QiZPDfeToel2XC4qZejwDLGfumCbvldGoLl+q7u N4MiZ54shFC9e0mguZ8m/FT+S1rJ474OFmh0TwETHhJKo2iNVIZv43F77tCQTXhzbri9 CkOA== X-Gm-Message-State: AElRT7FvaaWInb1VvdwSD0VRoQ6vN5NR5SrqL4Lx5RohXsn0HqDEgfaR NjXXfPj0inxAQo6TnI8n5w4= X-Google-Smtp-Source: AIpwx4/BZuOQjD2IKHcfwS/9vcAJtb2GwR5rx0KiXh4GDBxR2N0OE8LflQHNt5Y6BeiGqHabEu0gLA== X-Received: by 10.80.154.195 with SMTP id p61mr767672edb.68.1522184176580; Tue, 27 Mar 2018 13:56:16 -0700 (PDT) Received: from gentoo0.localdomain (x4dbab50a.dyn.telefonica.de. [77.186.181.10]) by smtp.gmail.com with ESMTPSA id o3sm1307135edi.24.2018.03.27.13.56.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Mar 2018 13:56:15 -0700 (PDT) From: Kirill Marinushkin To: Jaroslav Kysela , Takashi Iwai , Mark Brown Date: Tue, 27 Mar 2018 22:56:31 +0200 Message-Id: <20180327205632.3677-2-k.marinushkin@gmail.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180327205632.3677-1-k.marinushkin@gmail.com> References: <20180327205632.3677-1-k.marinushkin@gmail.com> Cc: alsa-devel@alsa-project.org, Pan Xiuli , Pierre-Louis Bossart , linux-kernel@vger.kernel.org, Liam Girdwood , Kirill Marinushkin Subject: [alsa-devel] [PATCH v3 1/2] ASoC: topology: Fix bclk and fsync inversion in set_link_hw_format() 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: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP The values of bclk and fsync are inverted WRT the codec. But the existing solution already works for Broadwell, see the alsa-lib config: `alsa-lib/src/conf/topology/broadwell/broadwell.conf` This commit provides the backwards-compatible solution to fix this misuse. Signed-off-by: Kirill Marinushkin Tested-by: Pan Xiuli Tested-by: Pierre-Louis Bossart Cc: Jaroslav Kysela Cc: Takashi Iwai Cc: Mark Brown Cc: Liam Girdwood Cc: linux-kernel@vger.kernel.org Cc: alsa-devel@alsa-project.org --- include/uapi/sound/asoc.h | 16 ++++++++++++++-- sound/soc/soc-topology.c | 12 +++++++----- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/include/uapi/sound/asoc.h b/include/uapi/sound/asoc.h index 69c37ecbff7e..f0e5e21efa54 100644 --- a/include/uapi/sound/asoc.h +++ b/include/uapi/sound/asoc.h @@ -160,6 +160,18 @@ #define SND_SOC_TPLG_LNK_FLGBIT_SYMMETRIC_SAMPLEBITS (1 << 2) #define SND_SOC_TPLG_LNK_FLGBIT_VOICE_WAKEUP (1 << 3) +/* DAI topology BCLK parameter + * For the backwards capability, by default codec is bclk master + */ +#define SND_SOC_TPLG_BCLK_CM 0 /* codec is bclk master */ +#define SND_SOC_TPLG_BCLK_CS 1 /* codec is bclk slave */ + +/* DAI topology FSYNC parameter + * For the backwards capability, by default codec is fsync master + */ +#define SND_SOC_TPLG_FSYNC_CM 0 /* codec is fsync master */ +#define SND_SOC_TPLG_FSYNC_CS 1 /* codec is fsync slave */ + /* * Block Header. * This header precedes all object and object arrays below. @@ -315,8 +327,8 @@ struct snd_soc_tplg_hw_config { __u8 clock_gated; /* 1 if clock can be gated to save power */ __u8 invert_bclk; /* 1 for inverted BCLK, 0 for normal */ __u8 invert_fsync; /* 1 for inverted frame clock, 0 for normal */ - __u8 bclk_master; /* 1 for master of BCLK, 0 for slave */ - __u8 fsync_master; /* 1 for master of FSYNC, 0 for slave */ + __u8 bclk_master; /* SND_SOC_TPLG_BCLK_ value */ + __u8 fsync_master; /* SND_SOC_TPLG_FSYNC_ value */ __u8 mclk_direction; /* 0 for input, 1 for output */ __le16 reserved; /* for 32bit alignment */ __le32 mclk_rate; /* MCLK or SYSCLK freqency in Hz */ diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index 01a50413c66f..c5bdc673b195 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -1994,13 +1994,15 @@ static void set_link_hw_format(struct snd_soc_dai_link *link, link->dai_fmt |= SND_SOC_DAIFMT_IB_IF; /* clock masters */ - bclk_master = hw_config->bclk_master; - fsync_master = hw_config->fsync_master; - if (!bclk_master && !fsync_master) + bclk_master = (hw_config->bclk_master == + SND_SOC_TPLG_BCLK_CM); + fsync_master = (hw_config->fsync_master == + SND_SOC_TPLG_FSYNC_CM); + if (bclk_master && fsync_master) link->dai_fmt |= SND_SOC_DAIFMT_CBM_CFM; - else if (bclk_master && !fsync_master) - link->dai_fmt |= SND_SOC_DAIFMT_CBS_CFM; else if (!bclk_master && fsync_master) + link->dai_fmt |= SND_SOC_DAIFMT_CBS_CFM; + else if (bclk_master && !fsync_master) link->dai_fmt |= SND_SOC_DAIFMT_CBM_CFS; else link->dai_fmt |= SND_SOC_DAIFMT_CBS_CFS;