From patchwork Thu Mar 1 06:45:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kirill Marinushkin X-Patchwork-Id: 10250483 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 3A6DC6037D for ; Thu, 1 Mar 2018 06:46:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2824228EC3 for ; Thu, 1 Mar 2018 06:46:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1CC6E28F60; Thu, 1 Mar 2018 06:46:12 +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 7402428EC3 for ; Thu, 1 Mar 2018 06:46:11 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id E3898267863; Thu, 1 Mar 2018 07:46:09 +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 57C7A267866; Thu, 1 Mar 2018 07:46:07 +0100 (CET) Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by alsa0.perex.cz (Postfix) with ESMTP id D95272671DB for ; Thu, 1 Mar 2018 07:46:02 +0100 (CET) Received: by mail-wr0-f195.google.com with SMTP id v111so4893455wrb.3 for ; Wed, 28 Feb 2018 22:46:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=LA7AGTEaCuaEgZ0QEVtzldCTtCsagh6QASoZJudC+mY=; b=Vwots+TB9/dO58IeRO8Mok2YcTtv19fdqF4Zgmg7GFZDLWVKv+8fXgSMLilekp6uwQ zr4ImoadyY2VJbmow8PACrmRRoeBzqHRc/o1vpA91pl3/886IAqyHaOTovkTMk+970kV /yleImj9HDioUgVYv6BDXC6d3+5GYmJqEm1Lc3ykE1TRE23tnjV1TRkuT/ImTkRQ5823 jGU1jpsxaelj2gIU2TcFoCblIEOpGzJeQFJx2Lpm3C1nkQHrDAtxg9IW32ryLqVNiTKN aRSCGktU0ViUavnUB4f8FEn5SQv95S+VK+UZZpRce8NY3MD1Bnn/NEiDf9im24K3PATq Aosg== 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; bh=LA7AGTEaCuaEgZ0QEVtzldCTtCsagh6QASoZJudC+mY=; b=IJGH0GtqMq45bkh33x688KQqlFfLyc3ly6hwLdJQEYsce4DjIchyWImLlfKzQopTlx S6PIRgXISnhhY8wGnzOSVn8q4bm4h0B0GRi7bkWvvBo4OtycQQi5a+bSblRq6EK3XyVF llKEs/1J1aPE2f2c4phCoHu0965bijqQ8LnO0KvurqVvqT68Nh1Kk+WKtqwBfSx4C+iX AFZgjlif6hRhnZW5exhUbBEf6xYev8koGYU7wXNIKN26oIMzbEskArnUa07Xwcjy2Lju KH68DKRn8Z3SYq/HaDS61ww+ha1WtfHF9CoKOUfBNZrOXHJ6PIR7XFHoH8Nwfwc8cBP7 8WQg== X-Gm-Message-State: APf1xPAiNjYAWt2Ks/kW6qMKMKpoVnKqbjIvcuuMgdOkCAwx+uVxTuEN MVLbsZP9KwLtFplsj7FrSQc= X-Google-Smtp-Source: AG47ELscluLod5Trsnm6UglCOduRbcmTQKNmdfj1EubAsABe+lbDxbtOxTsBh91oT1BuId8rmtbWuA== X-Received: by 10.223.135.102 with SMTP id 35mr692584wrz.53.1519886761870; Wed, 28 Feb 2018 22:46:01 -0800 (PST) Received: from gentoo0.localdomain (x4dbc595e.dyn.telefonica.de. [77.188.89.94]) by smtp.gmail.com with ESMTPSA id w29sm3025425wra.84.2018.02.28.22.45.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Feb 2018 22:45:58 -0800 (PST) From: Kirill Marinushkin To: Mark Brown , Takashi Iwai , Pierre-Louis Bossart , Pan Xiuli Date: Thu, 1 Mar 2018 07:45:56 +0100 Message-Id: <20180301064556.5387-1-k.marinushkin@gmail.com> X-Mailer: git-send-email 2.13.6 Cc: Liam Girdwood , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Kirill Marinushkin Subject: [alsa-devel] [PATCH v2] 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. This commit goes in pair with the corresponding patch for alsa-lib. Signed-off-by: Kirill Marinushkin Cc: Mark Brown Cc: Takashi Iwai Cc: Jaroslav Kysela Cc: Pierre-Louis Bossart Cc: Pan Xiuli Cc: Liam Girdwood Cc: linux-kernel@vger.kernel.org Cc: alsa-devel@alsa-project.org Tested-by: Pierre-Louis Bossart --- 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;