From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8EE3FC433E2 for ; Fri, 4 Sep 2020 09:11:06 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1133920791 for ; Fri, 4 Sep 2020 09:11:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="CfkoH/71" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1133920791 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 5ADC51AD6; Fri, 4 Sep 2020 11:10:14 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 5ADC51AD6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1599210664; bh=CWQXr6NKX/ZFEYge82gykHQvM5rf1/cpOe75/pqHh0k=; h=Date:From:To:Subject:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=CfkoH/71+N7baTMNtJLMvx30NpCqPrLl+EfE4Z92BoDhB7eSpvHE9s/YahPzT3HwK 9T8/NpuyQ4p1zy+tbYX0Sq6Nbp3vriTBLPbQB4auhKRGMzY7X9o0JxCj7d0CcIE3VK x+e6IHHB7rdar747jUfwxXgq+fEtBuVQji5TBYDw= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id E8565F801DA; Fri, 4 Sep 2020 11:10:13 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 4161CF8024A; Fri, 4 Sep 2020 11:10:12 +0200 (CEST) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 328E3F801DA for ; Fri, 4 Sep 2020 11:10:05 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 328E3F801DA X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 0367DB080; Fri, 4 Sep 2020 09:10:06 +0000 (UTC) Date: Fri, 04 Sep 2020 11:10:04 +0200 Message-ID: From: Takashi Iwai To: Pierre-Louis Bossart Subject: Re: [RFC PATCH 1/3] topology: use inclusive language for bclk In-Reply-To: <20200903201024.1109914-2-pierre-louis.bossart@linux.intel.com> References: <20200903201024.1109914-1-pierre-louis.bossart@linux.intel.com> <20200903201024.1109914-2-pierre-louis.bossart@linux.intel.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Cc: alsa-devel@alsa-project.org, broonie@kernel.org X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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" On Thu, 03 Sep 2020 22:10:22 +0200, Pierre-Louis Bossart wrote: > > use bclk_provider for structure fields, 'codec_provider' and > 'codec_follower' for options and modify #defines to use CP and CF > suffixes. > > Signed-off-by: Pierre-Louis Bossart > --- > include/sound/uapi/asoc.h | 11 +++++++---- > include/topology.h | 2 +- > src/topology/pcm.c | 37 +++++++++++++++++++++++++++---------- > 3 files changed, 35 insertions(+), 15 deletions(-) > > diff --git a/include/sound/uapi/asoc.h b/include/sound/uapi/asoc.h > index 4efb4ec4..8558992f 100644 > --- a/include/sound/uapi/asoc.h > +++ b/include/sound/uapi/asoc.h > @@ -169,10 +169,13 @@ > #define SND_SOC_TPLG_LNK_FLGBIT_VOICE_WAKEUP (1 << 3) > > /* DAI topology BCLK parameter > - * For the backwards capability, by default codec is bclk master > + * For the backwards capability, by default codec is bclk provider > */ > -#define SND_SOC_TPLG_BCLK_CM 0 /* codec is bclk master */ > -#define SND_SOC_TPLG_BCLK_CS 1 /* codec is bclk slave */ > +#define SND_SOC_TPLG_BCLK_CP 0 /* codec is bclk provider */ > +#define SND_SOC_TPLG_BCLK_CF 1 /* codec is bclk follower */ > +/* keep previous definitions for compatibility */ > +#define SND_SOC_TPLG_BCLK_CM SND_SOC_TPLG_BCLK_CP > +#define SND_SOC_TPLG_BCLK_CS SND_SOC_TPLG_BCLK_CF Those change are indeed backward compatible, but ... > > /* DAI topology FSYNC parameter > * For the backwards capability, by default codec is fsync master > @@ -335,7 +338,7 @@ struct snd_soc_tplg_hw_config { > __u8 clock_gated; /* SND_SOC_TPLG_DAI_CLK_GATE_ value */ > __u8 invert_bclk; /* 1 for inverted BCLK, 0 for normal */ > __u8 invert_fsync; /* 1 for inverted frame clock, 0 for normal */ > - __u8 bclk_master; /* SND_SOC_TPLG_BCLK_ value */ > + __u8 bclk_provider; /* SND_SOC_TPLG_BCLK_ value */ > __u8 fsync_master; /* SND_SOC_TPLG_FSYNC_ value */ > __u8 mclk_direction; /* SND_SOC_TPLG_MCLK_ value */ > __le16 reserved; /* for 32bit alignment */ Is it 100% compatible? Note that the uapi/* header is a copy from the kernel header, and it means that we'll change the same for the kernel, too. The similar argument applied to the patch 2, too. thanks, Takashi