From: Sameer Pujar <spujar@nvidia.com>
To: <perex@perex.cz>, <tiwai@suse.com>, <robh+dt@kernel.org>
Cc: <broonie@kernel.org>, <lgirdwood@gmail.com>,
<thierry.reding@gmail.com>, <jonathanh@nvidia.com>,
<digetx@gmail.com>, <alsa-devel@alsa-project.org>,
<devicetree@vger.kernel.org>, <linux-tegra@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <sharadg@nvidia.com>,
<mkumard@nvidia.com>, <viswanathl@nvidia.com>,
<rlokhande@nvidia.com>, <dramesh@nvidia.com>,
<atalambedu@nvidia.com>, Sameer Pujar <spujar@nvidia.com>
Subject: [PATCH v2 2/9] ASoC: tegra: add support for CIF programming
Date: Thu, 30 Jan 2020 16:03:35 +0530 [thread overview]
Message-ID: <1580380422-3431-3-git-send-email-spujar@nvidia.com> (raw)
In-Reply-To: <1580380422-3431-1-git-send-email-spujar@nvidia.com>
Audio Client Interface (CIF) is a proprietary interface employed to route
audio samples through Audio Hub (AHUB) components by inter connecting the
various modules.
This patch exports a helper function tegra_set_cif() which can be used,
for now, to program CIF on Tegra210 and later Tegra generations. Later it
can be extended to include helpers for legacy chips as well.
Signed-off-by: Sameer Pujar <spujar@nvidia.com>
---
sound/soc/tegra/Makefile | 2 ++
sound/soc/tegra/tegra_cif.c | 34 ++++++++++++++++++++++++++++++++
sound/soc/tegra/tegra_cif.h | 47 +++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 83 insertions(+)
create mode 100644 sound/soc/tegra/tegra_cif.c
create mode 100644 sound/soc/tegra/tegra_cif.h
diff --git a/sound/soc/tegra/Makefile b/sound/soc/tegra/Makefile
index c84f183..261aa21 100644
--- a/sound/soc/tegra/Makefile
+++ b/sound/soc/tegra/Makefile
@@ -8,9 +8,11 @@ snd-soc-tegra20-i2s-objs := tegra20_i2s.o
snd-soc-tegra20-spdif-objs := tegra20_spdif.o
snd-soc-tegra30-ahub-objs := tegra30_ahub.o
snd-soc-tegra30-i2s-objs := tegra30_i2s.o
+snd-soc-tegra-cif-objs := tegra_cif.o
obj-$(CONFIG_SND_SOC_TEGRA) += snd-soc-tegra-pcm.o
obj-$(CONFIG_SND_SOC_TEGRA) += snd-soc-tegra-utils.o
+obj-$(CONFIG_SND_SOC_TEGRA) += snd-soc-tegra-cif.o
obj-$(CONFIG_SND_SOC_TEGRA20_AC97) += snd-soc-tegra20-ac97.o
obj-$(CONFIG_SND_SOC_TEGRA20_DAS) += snd-soc-tegra20-das.o
obj-$(CONFIG_SND_SOC_TEGRA20_I2S) += snd-soc-tegra20-i2s.o
diff --git a/sound/soc/tegra/tegra_cif.c b/sound/soc/tegra/tegra_cif.c
new file mode 100644
index 0000000..242ae34
--- /dev/null
+++ b/sound/soc/tegra/tegra_cif.c
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * tegra_cif.c - Tegra Audio CIF Programming for AHUB modules
+ *
+ * Copyright (c) 2020 NVIDIA CORPORATION. All rights reserved.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/regmap.h>
+#include "tegra_cif.h"
+
+void tegra_set_cif(struct regmap *regmap, unsigned int reg,
+ struct tegra_cif_conf *conf)
+{
+ unsigned int value;
+
+ value = (conf->threshold << TEGRA_ACIF_CTRL_FIFO_TH_SHIFT) |
+ ((conf->audio_ch - 1) << TEGRA_ACIF_CTRL_AUDIO_CH_SHIFT) |
+ ((conf->client_ch - 1) << TEGRA_ACIF_CTRL_CLIENT_CH_SHIFT) |
+ (conf->audio_bits << TEGRA_ACIF_CTRL_AUDIO_BITS_SHIFT) |
+ (conf->client_bits << TEGRA_ACIF_CTRL_CLIENT_BITS_SHIFT) |
+ (conf->expand << TEGRA_ACIF_CTRL_EXPAND_SHIFT) |
+ (conf->stereo_conv << TEGRA_ACIF_CTRL_STEREO_CONV_SHIFT) |
+ (conf->replicate << TEGRA_ACIF_CTRL_REPLICATE_SHIFT) |
+ (conf->truncate << TEGRA_ACIF_CTRL_TRUNCATE_SHIFT) |
+ (conf->mono_conv << TEGRA_ACIF_CTRL_MONO_CONV_SHIFT);
+
+ regmap_update_bits(regmap, reg, TEGRA_ACIF_UPDATE_MASK, value);
+}
+EXPORT_SYMBOL_GPL(tegra_set_cif);
+
+MODULE_DESCRIPTION("Tegra Audio Client Interface (ACIF) driver");
+MODULE_LICENSE("GPL v2");
diff --git a/sound/soc/tegra/tegra_cif.h b/sound/soc/tegra/tegra_cif.h
new file mode 100644
index 0000000..fb55812
--- /dev/null
+++ b/sound/soc/tegra/tegra_cif.h
@@ -0,0 +1,47 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * tegra_cif.h - TEGRA Audio CIF Programming
+ *
+ * Copyright (c) 2020 NVIDIA CORPORATION. All rights reserved.
+ *
+ */
+
+#ifndef __TEGRA_CIF_H__
+#define __TEGRA_CIF_H__
+
+#define TEGRA_ACIF_CTRL_FIFO_TH_SHIFT 24
+#define TEGRA_ACIF_CTRL_AUDIO_CH_SHIFT 20
+#define TEGRA_ACIF_CTRL_CLIENT_CH_SHIFT 16
+#define TEGRA_ACIF_CTRL_AUDIO_BITS_SHIFT 12
+#define TEGRA_ACIF_CTRL_CLIENT_BITS_SHIFT 8
+#define TEGRA_ACIF_CTRL_EXPAND_SHIFT 6
+#define TEGRA_ACIF_CTRL_STEREO_CONV_SHIFT 4
+#define TEGRA_ACIF_CTRL_REPLICATE_SHIFT 3
+#define TEGRA_ACIF_CTRL_TRUNCATE_SHIFT 1
+#define TEGRA_ACIF_CTRL_MONO_CONV_SHIFT 0
+
+/* AUDIO/CLIENT_BITS values */
+#define TEGRA_ACIF_BITS_8 1
+#define TEGRA_ACIF_BITS_16 3
+#define TEGRA_ACIF_BITS_24 5
+#define TEGRA_ACIF_BITS_32 7
+
+#define TEGRA_ACIF_UPDATE_MASK 0x3ffffffb
+
+struct tegra_cif_conf {
+ unsigned int threshold;
+ unsigned int audio_ch;
+ unsigned int client_ch;
+ unsigned int audio_bits;
+ unsigned int client_bits;
+ unsigned int expand;
+ unsigned int stereo_conv;
+ unsigned int replicate;
+ unsigned int truncate;
+ unsigned int mono_conv;
+};
+
+void tegra_set_cif(struct regmap *regmap, unsigned int reg,
+ struct tegra_cif_conf *conf);
+
+#endif
--
2.7.4
next prev parent reply other threads:[~2020-01-30 10:34 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-30 10:33 [PATCH v2 0/9] add ASoC components for AHUB Sameer Pujar
2020-01-30 10:33 ` [PATCH v2 1/9] dt-bindings: sound: tegra: add DT binding " Sameer Pujar
2020-02-03 20:19 ` Dmitry Osipenko
2020-02-04 4:24 ` Sameer Pujar
2020-02-06 18:10 ` Rob Herring
2020-02-10 11:30 ` Sameer Pujar
2020-02-11 18:15 ` Rob Herring
2020-01-30 10:33 ` Sameer Pujar [this message]
2020-02-05 17:02 ` [PATCH v2 2/9] ASoC: tegra: add support for CIF programming Dmitry Osipenko
2020-02-06 11:56 ` Sameer Pujar
2020-02-06 16:49 ` Dmitry Osipenko
2020-02-07 11:03 ` Sameer Pujar
2020-01-30 10:33 ` [PATCH v2 3/9] ASoC: tegra: add Tegra210 based DMIC driver Sameer Pujar
2020-02-06 16:53 ` Dmitry Osipenko
2020-02-07 11:06 ` Sameer Pujar
2020-02-08 16:19 ` Dmitry Osipenko
2020-01-30 10:33 ` [PATCH v2 4/9] ASoC: tegra: add Tegra210 based I2S driver Sameer Pujar
2020-02-06 16:59 ` Dmitry Osipenko
2020-02-06 17:06 ` David Laight
2020-02-07 11:23 ` Sameer Pujar
2020-02-07 11:24 ` Sameer Pujar
2020-01-30 10:33 ` [PATCH v2 5/9] ASoC: tegra: add Tegra210 based AHUB driver Sameer Pujar
2020-01-30 16:22 ` Dmitry Osipenko
2020-02-04 4:29 ` Sameer Pujar
2020-01-30 17:09 ` Dmitry Osipenko
2020-01-30 17:18 ` Dmitry Osipenko
2020-02-04 4:35 ` Sameer Pujar
2020-02-04 4:34 ` Sameer Pujar
2020-01-30 17:25 ` Dmitry Osipenko
2020-01-31 3:12 ` Sameer Pujar
2020-01-31 14:34 ` Dmitry Osipenko
2020-02-04 4:36 ` Sameer Pujar
2020-01-30 10:33 ` [PATCH v2 6/9] ASoC: tegra: add Tegra186 based DSPK driver Sameer Pujar
2020-02-06 17:15 ` Dmitry Osipenko
2020-02-07 11:26 ` Sameer Pujar
2020-02-07 18:22 ` Dmitry Osipenko
2020-02-10 11:15 ` Sameer Pujar
2020-02-10 12:22 ` Jon Hunter
2020-02-10 14:49 ` Sameer Pujar
2020-01-30 10:33 ` [PATCH v2 7/9] ASoC: tegra: add Tegra210 based ADMAIF driver Sameer Pujar
2020-01-30 10:33 ` [PATCH v2 8/9] arm64: tegra: add AHUB components for few Tegra chips Sameer Pujar
2020-01-30 10:33 ` [PATCH v2 9/9] arm64: tegra: enable AHUB modules " Sameer Pujar
2020-02-06 17:36 ` [PATCH v2 0/9] add ASoC components for AHUB Dmitry Osipenko
2020-02-07 11:30 ` Sameer Pujar
2020-02-07 18:25 ` Dmitry Osipenko
2020-02-10 11:22 ` Sameer Pujar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1580380422-3431-3-git-send-email-spujar@nvidia.com \
--to=spujar@nvidia.com \
--cc=alsa-devel@alsa-project.org \
--cc=atalambedu@nvidia.com \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=digetx@gmail.com \
--cc=dramesh@nvidia.com \
--cc=jonathanh@nvidia.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=mkumard@nvidia.com \
--cc=perex@perex.cz \
--cc=rlokhande@nvidia.com \
--cc=robh+dt@kernel.org \
--cc=sharadg@nvidia.com \
--cc=thierry.reding@gmail.com \
--cc=tiwai@suse.com \
--cc=viswanathl@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).