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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 45C43C54E67 for ; Tue, 26 Mar 2024 15:23:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:In-reply-to: Date:Subject:Cc:To:From:References:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=sYyv9FL+o5k/js523Gd3krzo3/3FsbacRVO+9XrdPDs=; b=DOCG8Vxs7a3/oC SY3FB/Oai0z1aWM3ADfvA3A488nKOOMW5FybOWwaA1vygLuda+a9bYhG+d73Vh2v1t5wxu2+/ex4m zTrmy+PIAUOMQT4oEWEYs3zzDmiklHVGnVQSoT05ZDOjxqpdZ6kXTFI6M5mVV+HWj5sj65O03LQ4H XhdkcKXfadC1uM5ut8Kq+ueR2HpKBcAEFnXqg+oalJUuC+E0s3lgvUphM2frJRVs7hBxqmj9Ra6JO cvY2ZQXnrqMJUsaEhZgy9grEUKHLleaXeWEpatww4xkl6TjBCbhoKKLHaFmwz6g5rPH3r4+688G2S cNFOWN0q0LhHUpq3e2Og==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rp8eR-000000058RH-2Nox; Tue, 26 Mar 2024 15:23:47 +0000 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rp8eO-000000058Pf-0ahM for linux-arm-kernel@lists.infradead.org; Tue, 26 Mar 2024 15:23:46 +0000 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-34005b5927eso3959736f8f.1 for ; Tue, 26 Mar 2024 08:23:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1711466622; x=1712071422; darn=lists.infradead.org; h=mime-version:message-id:in-reply-to:date:subject:cc:to:from :user-agent:references:from:to:cc:subject:date:message-id:reply-to; bh=aM+9RXmEYQB5vl1fffTAMXMZVqZ/ACCmOiJ2FPQkdAA=; b=2V7JIZI97d/EfgQ6SpiBhLIZA/lN5IDetmx3rVvWuegbkljfuDSPp0BRV9P3ImGmmg nZaaK3zKShw7Mtj7c1y/0xzlTIYITVl+2ZLOhvAuoP4JpnSrmVFNHcbUb4DdwF89CRWf nYyzMOqZNnQqG8ZhaOIvAQ/cHc/STCbQY/NPaQg63HVaTzglGXvvy21/EleHwoN4/wRd 2qj6UIk01+NvD+Th0a1oB8xiM7BlqzfpC8dahvSuxz2NTwt4uCbXDnQhj1iQffuJt877 eUSKwYumrlmM9cjSukyYDEIsrXS5v2V3zwUmP/aFZKtdoLoWcjKtami2e34aY0mnFIAQ PvOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711466622; x=1712071422; h=mime-version:message-id:in-reply-to:date:subject:cc:to:from :user-agent:references:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=aM+9RXmEYQB5vl1fffTAMXMZVqZ/ACCmOiJ2FPQkdAA=; b=UbqadfHedO83pUq1pe2rjGlCfBSZtF0/qzwZ3+V69lW0NW7D5uuIaE7+Z4Kj/N0nDg 7OlA1XPwzMkY0QzmzXYVxC9sqh8qa1hrjgn7Ai59gY9n2NE+GASN4GVqkJURkspoSH1x L+KsO1EQ6/e/KXNmuNIKbGowinDgkNIYwolm/muEBhiHV9PrgpEMB6hPUQBfsbpV0gZn Wkr/fUqgvDuLT0jB4N53C6rVBAbEjBk2rt+qAX5khHli/LlahLPMEm2doXI70vx9vkM1 9hOjiWpSKLDSdq8xbsH3VcB2Vn6CH6IFt78abUUbiml2mRzW8Sln0TtFpgyD9mirBxmv noqA== X-Forwarded-Encrypted: i=1; AJvYcCWFovFVgRZ5KXSes2wThnTyFYRr4vbfaHU4LA5T++hwYsC5Y1ZXo2TtUa6HhOTLpUZOLYYNnPNC5ioMulFzA2egwpB1+TtSVXwayLGMOU7VoevH2P4= X-Gm-Message-State: AOJu0YzuW7ZlUz3EBH/cU5RkMPhjiW4cw1aPI7NNOpaqVrnbF/ttgQY+ r6GGysJpgdfNo/bNbWEIWHSZtvz3DImp7rYc22uBT088F1A+vQ/nD3a+t8DQS5w= X-Google-Smtp-Source: AGHT+IHsYZJ/uOqZnp1TmWFGMlVgZ+AivccEHh8xx3hUmGEHsDKWJ4EN0Xf/+CitijnbkfltJZVucg== X-Received: by 2002:a5d:69ca:0:b0:33e:7adc:516c with SMTP id s10-20020a5d69ca000000b0033e7adc516cmr1290781wrw.57.1711466621739; Tue, 26 Mar 2024 08:23:41 -0700 (PDT) Received: from localhost ([2a01:e0a:3c5:5fb1:97a2:bb9f:463a:6468]) by smtp.gmail.com with ESMTPSA id ch9-20020a5d5d09000000b00341c6778171sm8083186wrb.83.2024.03.26.08.23.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Mar 2024 08:23:41 -0700 (PDT) References: <20240325235311.411920-1-jan.dakinevich@salutedevices.com> User-agent: mu4e 1.10.8; emacs 29.2 From: Jerome Brunet To: Jan Dakinevich Cc: Jerome Brunet , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Neil Armstrong , Kevin Hilman , Martin Blumenstingl , alsa-devel@alsa-project.org, linux-sound@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [RFC PATCH v2] ASoC: meson: g12a-toacodec: rework the definition of bits Date: Tue, 26 Mar 2024 16:15:51 +0100 In-reply-to: <20240325235311.411920-1-jan.dakinevich@salutedevices.com> Message-ID: <1j34sd9fur.fsf@starbuckisacylon.baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240326_082344_189838_E5026774 X-CRM114-Status: GOOD ( 21.18 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue 26 Mar 2024 at 02:53, Jan Dakinevich wrote: > There is a lot of defines, but almost all of them are not used. Lets > rework them: Thanks for noticing. Please start by removing what's unused. > > - keep separate the definition for different platforms to make easier > checking that they match documentation. > > - use LSB/MSB sufixes for uniformity. I'd be in favor of dropping these suffixes completely. > > - don't use hard-coded values for already declared defines. > > Signed-off-by: Jan Dakinevich > --- > Links: > > [1] https://lore.kernel.org/lkml/20240314232201.2102178-1-jan.dakinevich@salutedevices.com/ > > Changes v1 -> v2: > - Detached from v1's series (patch 7). > - Fixed my wrong understanding of SOC_SINGLE's input parameters. > > sound/soc/meson/g12a-toacodec.c | 79 ++++++++++++++++++++------------- > 1 file changed, 49 insertions(+), 30 deletions(-) > > diff --git a/sound/soc/meson/g12a-toacodec.c b/sound/soc/meson/g12a-toacodec.c > index 531bb8707a3e..22181f4bab72 100644 > --- a/sound/soc/meson/g12a-toacodec.c > +++ b/sound/soc/meson/g12a-toacodec.c > @@ -20,26 +20,37 @@ > #define G12A_TOACODEC_DRV_NAME "g12a-toacodec" > > #define TOACODEC_CTRL0 0x0 > -#define CTRL0_ENABLE_SHIFT 31 > -#define CTRL0_DAT_SEL_SM1_MSB 19 > -#define CTRL0_DAT_SEL_SM1_LSB 18 > -#define CTRL0_DAT_SEL_MSB 15 > -#define CTRL0_DAT_SEL_LSB 14 > -#define CTRL0_LANE_SEL_SM1 16 > -#define CTRL0_LANE_SEL 12 > -#define CTRL0_LRCLK_SEL_SM1_MSB 14 > -#define CTRL0_LRCLK_SEL_SM1_LSB 12 > -#define CTRL0_LRCLK_SEL_MSB 9 > -#define CTRL0_LRCLK_SEL_LSB 8 > -#define CTRL0_LRCLK_INV_SM1 BIT(10) > -#define CTRL0_BLK_CAP_INV_SM1 BIT(9) > -#define CTRL0_BLK_CAP_INV BIT(7) > -#define CTRL0_BCLK_O_INV_SM1 BIT(8) > -#define CTRL0_BCLK_O_INV BIT(6) > -#define CTRL0_BCLK_SEL_SM1_MSB 6 > -#define CTRL0_BCLK_SEL_MSB 5 > -#define CTRL0_BCLK_SEL_LSB 4 > -#define CTRL0_MCLK_SEL GENMASK(2, 0) > + > +/* Common bits */ > +#define CTRL0_ENABLE_SHIFT 31 > +#define CTRL0_MCLK_SEL GENMASK(2, 0) > + > +/* G12A bits */ > +#define CTRL0_DAT_SEL_G12A_MSB 15 > +#define CTRL0_DAT_SEL_G12A_LSB 14 > +#define CTRL0_LANE_SEL_G12A_MSB 13 > +#define CTRL0_LANE_SEL_G12A_LSB 12 > +#define CTRL0_LANE_SEL_G12A_MAX 3 > +#define CTRL0_LRCLK_SEL_G12A_MSB 9 > +#define CTRL0_LRCLK_SEL_G12A_LSB 8 > +#define CTRL0_BLK_CAP_INV_G12A BIT(7) > +#define CTRL0_BCLK_O_INV_G12A BIT(6) > +#define CTRL0_BCLK_SEL_G12A_MSB 5 > +#define CTRL0_BCLK_SEL_G12A_LSB 4 > + > +/* SM1 bits */ > +#define CTRL0_DAT_SEL_SM1_MSB 19 > +#define CTRL0_DAT_SEL_SM1_LSB 18 > +#define CTRL0_LANE_SEL_SM1_MSB 17 > +#define CTRL0_LANE_SEL_SM1_LSB 16 > +#define CTRL0_LANE_SEL_SM1_MAX 3 > +#define CTRL0_LRCLK_SEL_SM1_MSB 14 > +#define CTRL0_LRCLK_SEL_SM1_LSB 12 > +#define CTRL0_LRCLK_INV_SM1 BIT(10) > +#define CTRL0_BLK_CAP_INV_SM1 BIT(9) > +#define CTRL0_BCLK_O_INV_SM1 BIT(8) > +#define CTRL0_BCLK_SEL_SM1_MSB 6 > +#define CTRL0_BCLK_SEL_SM1_LSB 4 > > #define TOACODEC_OUT_CHMAX 2 > > @@ -108,7 +119,7 @@ static int g12a_toacodec_mux_put_enum(struct snd_kcontrol *kcontrol, > } > > static SOC_ENUM_SINGLE_DECL(g12a_toacodec_mux_enum, TOACODEC_CTRL0, > - CTRL0_DAT_SEL_LSB, > + CTRL0_DAT_SEL_G12A_LSB, > g12a_toacodec_mux_texts); > > static SOC_ENUM_SINGLE_DECL(sm1_toacodec_mux_enum, TOACODEC_CTRL0, > @@ -210,7 +221,7 @@ static int g12a_toacodec_component_probe(struct snd_soc_component *c) > { > /* Initialize the static clock parameters */ > return snd_soc_component_write(c, TOACODEC_CTRL0, > - CTRL0_BLK_CAP_INV); > + CTRL0_BLK_CAP_INV_G12A); > } > > static int sm1_toacodec_component_probe(struct snd_soc_component *c) > @@ -229,11 +240,13 @@ static const struct snd_soc_dapm_route g12a_toacodec_routes[] = { > }; > > static const struct snd_kcontrol_new g12a_toacodec_controls[] = { > - SOC_SINGLE("Lane Select", TOACODEC_CTRL0, CTRL0_LANE_SEL, 3, 0), > + SOC_SINGLE("Lane Select", TOACODEC_CTRL0, CTRL0_LANE_SEL_G12A_LSB, > + CTRL0_LANE_SEL_G12A_MAX, 0), > }; > > static const struct snd_kcontrol_new sm1_toacodec_controls[] = { > - SOC_SINGLE("Lane Select", TOACODEC_CTRL0, CTRL0_LANE_SEL_SM1, 3, 0), > + SOC_SINGLE("Lane Select", TOACODEC_CTRL0, CTRL0_LANE_SEL_SM1_LSB, > + CTRL0_LANE_SEL_SM1_MAX, 0), > }; > > static const struct snd_soc_component_driver g12a_toacodec_component_drv = { > @@ -266,16 +279,22 @@ static const struct regmap_config g12a_toacodec_regmap_cfg = { > > static const struct g12a_toacodec_match_data g12a_toacodec_match_data = { > .component_drv = &g12a_toacodec_component_drv, > - .field_dat_sel = REG_FIELD(TOACODEC_CTRL0, 14, 15), > - .field_lrclk_sel = REG_FIELD(TOACODEC_CTRL0, 8, 9), > - .field_bclk_sel = REG_FIELD(TOACODEC_CTRL0, 4, 5), > + .field_dat_sel = REG_FIELD(TOACODEC_CTRL0, CTRL0_DAT_SEL_G12A_LSB, > + CTRL0_DAT_SEL_G12A_MSB), > + .field_lrclk_sel = REG_FIELD(TOACODEC_CTRL0, CTRL0_LRCLK_SEL_G12A_LSB, > + CTRL0_LRCLK_SEL_G12A_MSB), > + .field_bclk_sel = REG_FIELD(TOACODEC_CTRL0, CTRL0_BCLK_SEL_G12A_LSB, > + CTRL0_BCLK_SEL_G12A_MSB), > }; > > static const struct g12a_toacodec_match_data sm1_toacodec_match_data = { > .component_drv = &sm1_toacodec_component_drv, > - .field_dat_sel = REG_FIELD(TOACODEC_CTRL0, 18, 19), > - .field_lrclk_sel = REG_FIELD(TOACODEC_CTRL0, 12, 14), > - .field_bclk_sel = REG_FIELD(TOACODEC_CTRL0, 4, 6), > + .field_dat_sel = REG_FIELD(TOACODEC_CTRL0, CTRL0_DAT_SEL_SM1_LSB, > + CTRL0_DAT_SEL_SM1_MSB), > + .field_lrclk_sel = REG_FIELD(TOACODEC_CTRL0, CTRL0_LRCLK_SEL_SM1_LSB, > + CTRL0_LRCLK_SEL_SM1_MSB), > + .field_bclk_sel = REG_FIELD(TOACODEC_CTRL0, CTRL0_BCLK_SEL_SM1_LSB, > + CTRL0_BCLK_SEL_SM1_MSB), Those defines are already platform specific by the structure holding them and the defines you have added are not helping readability. I don't see the point to see. I'd prefer to keep the field defined as they are. > }; > > static const struct of_device_id g12a_toacodec_of_match[] = { -- Jerome _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel