nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-25 10:42:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: tegra-alt: add adsp admaif dai

Browse Source 
Change adds dais for adsp-admaif dai
links.

Bug 200130700

Change-Id: I9d7ca54b760e77295d6a898ead01bb1033b0dce9
Signed-off-by: Dipesh Gandhi <dipeshg@nvidia.com>
Reviewed-on: http://git-master/r/934517
Reviewed-by: Nitin Pai <npai@nvidia.com>
Tested-by: Nitin Pai <npai@nvidia.com>
This commit is contained in:
Dipesh Gandhi
2016-01-19 17:15:52 +05:30
committed by Sameer Pujar
parent cf994c29d6
commit ea7da663e0
2 changed files with 76 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
sound/soc/tegra-alt/tegra210_admaif_alt.c
View File

@@ -615,16 +615,7 @@ static struct snd_soc_dai_driver tegra210_admaif_codec_dais[] = {
ADMAIF_CODEC_FIFO_DAI(8),
ADMAIF_CODEC_FIFO_DAI(9),
ADMAIF_CODEC_FIFO_DAI(10),
ADMAIF_CODEC_CIF_DAI(1),
ADMAIF_CODEC_CIF_DAI(2),
ADMAIF_CODEC_CIF_DAI(3),
ADMAIF_CODEC_CIF_DAI(4),
ADMAIF_CODEC_CIF_DAI(5),
ADMAIF_CODEC_CIF_DAI(6),
ADMAIF_CODEC_CIF_DAI(7),
ADMAIF_CODEC_CIF_DAI(8),
ADMAIF_CODEC_CIF_DAI(9),
ADMAIF_CODEC_CIF_DAI(10),
#if defined(CONFIG_ARCH_TEGRA_18x_SOC)
ADMAIF_CODEC_FIFO_DAI(11),
ADMAIF_CODEC_FIFO_DAI(12),
ADMAIF_CODEC_FIFO_DAI(13),
@@ -635,6 +626,18 @@ static struct snd_soc_dai_driver tegra210_admaif_codec_dais[] = {
ADMAIF_CODEC_FIFO_DAI(18),
ADMAIF_CODEC_FIFO_DAI(19),
ADMAIF_CODEC_FIFO_DAI(20),
#endif
ADMAIF_CODEC_CIF_DAI(1),
ADMAIF_CODEC_CIF_DAI(2),
ADMAIF_CODEC_CIF_DAI(3),
ADMAIF_CODEC_CIF_DAI(4),
ADMAIF_CODEC_CIF_DAI(5),
ADMAIF_CODEC_CIF_DAI(6),
ADMAIF_CODEC_CIF_DAI(7),
ADMAIF_CODEC_CIF_DAI(8),
ADMAIF_CODEC_CIF_DAI(9),
ADMAIF_CODEC_CIF_DAI(10),
#if defined(CONFIG_ARCH_TEGRA_18x_SOC)
ADMAIF_CODEC_CIF_DAI(11),
ADMAIF_CODEC_CIF_DAI(12),
ADMAIF_CODEC_CIF_DAI(13),
@@ -645,6 +648,7 @@ static struct snd_soc_dai_driver tegra210_admaif_codec_dais[] = {
ADMAIF_CODEC_CIF_DAI(18),
ADMAIF_CODEC_CIF_DAI(19),
ADMAIF_CODEC_CIF_DAI(20),
#endif
};
#define ADMAIF_WIDGETS(id) \

64
sound/soc/tegra-alt/tegra210_adsp_alt.c
View File

@@ -2,7 +2,7 @@
* tegra210_adsp_alt.c - Tegra ADSP audio driver
*
* Author: Sumit Bhattacharya <sumitb@nvidia.com>
* Copyright (c) 2014-2015, NVIDIA CORPORATION. All rights reserved.
* Copyright (c) 2014-2016, NVIDIA CORPORATION. All rights reserved.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -1993,6 +1993,16 @@ static struct snd_soc_dai_driver tegra210_adsp_codec_dai[] = {
ADSP_ADMAIF_CODEC_DAI(8),
ADSP_ADMAIF_CODEC_DAI(9),
ADSP_ADMAIF_CODEC_DAI(10),
ADSP_ADMAIF_CODEC_DAI(11),
ADSP_ADMAIF_CODEC_DAI(12),
ADSP_ADMAIF_CODEC_DAI(13),
ADSP_ADMAIF_CODEC_DAI(14),
ADSP_ADMAIF_CODEC_DAI(15),
ADSP_ADMAIF_CODEC_DAI(16),
ADSP_ADMAIF_CODEC_DAI(17),
ADSP_ADMAIF_CODEC_DAI(18),
ADSP_ADMAIF_CODEC_DAI(19),
ADSP_ADMAIF_CODEC_DAI(20),
};
/* This array is linked with tegra210_adsp_virt_widgets enum defines. Any thing
@@ -2014,6 +2024,16 @@ static const char * const tegra210_adsp_mux_texts[] = {
"ADSP-ADMAIF8",
"ADSP-ADMAIF9",
"ADSP-ADMAIF10",
"ADSP-ADMAIF11",
"ADSP-ADMAIF12",
"ADSP-ADMAIF13",
"ADSP-ADMAIF14",
"ADSP-ADMAIF15",
"ADSP-ADMAIF16",
"ADSP-ADMAIF17",
"ADSP-ADMAIF18",
"ADSP-ADMAIF19",
"ADSP-ADMAIF20",
"APM-IN1",
"APM-IN2",
"APM-IN3",
@@ -2075,6 +2095,16 @@ static ADSP_MUX_ENUM_CTRL_DECL(adsp_admaif7, TEGRA210_ADSP_ADMAIF7);
static ADSP_MUX_ENUM_CTRL_DECL(adsp_admaif8, TEGRA210_ADSP_ADMAIF8);
static ADSP_MUX_ENUM_CTRL_DECL(adsp_admaif9, TEGRA210_ADSP_ADMAIF9);
static ADSP_MUX_ENUM_CTRL_DECL(adsp_admaif10, TEGRA210_ADSP_ADMAIF10);
static ADSP_MUX_ENUM_CTRL_DECL(adsp_admaif11, TEGRA210_ADSP_ADMAIF11);
static ADSP_MUX_ENUM_CTRL_DECL(adsp_admaif12, TEGRA210_ADSP_ADMAIF12);
static ADSP_MUX_ENUM_CTRL_DECL(adsp_admaif13, TEGRA210_ADSP_ADMAIF13);
static ADSP_MUX_ENUM_CTRL_DECL(adsp_admaif14, TEGRA210_ADSP_ADMAIF14);
static ADSP_MUX_ENUM_CTRL_DECL(adsp_admaif15, TEGRA210_ADSP_ADMAIF15);
static ADSP_MUX_ENUM_CTRL_DECL(adsp_admaif16, TEGRA210_ADSP_ADMAIF16);
static ADSP_MUX_ENUM_CTRL_DECL(adsp_admaif17, TEGRA210_ADSP_ADMAIF17);
static ADSP_MUX_ENUM_CTRL_DECL(adsp_admaif18, TEGRA210_ADSP_ADMAIF18);
static ADSP_MUX_ENUM_CTRL_DECL(adsp_admaif19, TEGRA210_ADSP_ADMAIF19);
static ADSP_MUX_ENUM_CTRL_DECL(adsp_admaif20, TEGRA210_ADSP_ADMAIF20);
static ADSP_MUX_ENUM_CTRL_DECL(apm_in1, TEGRA210_ADSP_APM_IN1);
static ADSP_MUX_ENUM_CTRL_DECL(apm_in2, TEGRA210_ADSP_APM_IN2);
static ADSP_MUX_ENUM_CTRL_DECL(apm_in3, TEGRA210_ADSP_APM_IN3);
@@ -2139,6 +2169,16 @@ static const struct snd_soc_dapm_widget tegra210_adsp_widgets[] = {
ADSP_EP_WIDGETS("ADSP-ADMAIF8", adsp_admaif8),
ADSP_EP_WIDGETS("ADSP-ADMAIF9", adsp_admaif9),
ADSP_EP_WIDGETS("ADSP-ADMAIF10", adsp_admaif10),
ADSP_EP_WIDGETS("ADSP-ADMAIF11", adsp_admaif11),
ADSP_EP_WIDGETS("ADSP-ADMAIF12", adsp_admaif12),
ADSP_EP_WIDGETS("ADSP-ADMAIF13", adsp_admaif13),
ADSP_EP_WIDGETS("ADSP-ADMAIF14", adsp_admaif14),
ADSP_EP_WIDGETS("ADSP-ADMAIF15", adsp_admaif15),
ADSP_EP_WIDGETS("ADSP-ADMAIF16", adsp_admaif16),
ADSP_EP_WIDGETS("ADSP-ADMAIF17", adsp_admaif17),
ADSP_EP_WIDGETS("ADSP-ADMAIF18", adsp_admaif18),
ADSP_EP_WIDGETS("ADSP-ADMAIF19", adsp_admaif19),
ADSP_EP_WIDGETS("ADSP-ADMAIF20", adsp_admaif20),
ADSP_WIDGETS("APM-IN1", apm_in1, TEGRA210_ADSP_APM_IN1),
ADSP_WIDGETS("APM-IN2", apm_in2, TEGRA210_ADSP_APM_IN2),
ADSP_WIDGETS("APM-IN3", apm_in3, TEGRA210_ADSP_APM_IN3),
@@ -2192,7 +2232,17 @@ static const struct snd_soc_dapm_widget tegra210_adsp_widgets[] = {
{ name " MUX", "ADSP-ADMAIF7", "ADSP-ADMAIF7 RX"}, \
{ name " MUX", "ADSP-ADMAIF8", "ADSP-ADMAIF8 RX"}, \
{ name " MUX", "ADSP-ADMAIF9", "ADSP-ADMAIF9 RX"}, \
{ name " MUX", "ADSP-ADMAIF10", "ADSP-ADMAIF10 RX"}
{ name " MUX", "ADSP-ADMAIF10", "ADSP-ADMAIF10 RX"}, \
{ name " MUX", "ADSP-ADMAIF11", "ADSP-ADMAIF11 RX"}, \
{ name " MUX", "ADSP-ADMAIF12", "ADSP-ADMAIF12 RX"}, \
{ name " MUX", "ADSP-ADMAIF13", "ADSP-ADMAIF13 RX"}, \
{ name " MUX", "ADSP-ADMAIF14", "ADSP-ADMAIF14 RX"}, \
{ name " MUX", "ADSP-ADMAIF15", "ADSP-ADMAIF15 RX"}, \
{ name " MUX", "ADSP-ADMAIF16", "ADSP-ADMAIF16 RX"}, \
{ name " MUX", "ADSP-ADMAIF17", "ADSP-ADMAIF17 RX"}, \
{ name " MUX", "ADSP-ADMAIF18", "ADSP-ADMAIF18 RX"}, \
{ name " MUX", "ADSP-ADMAIF19", "ADSP-ADMAIF19 RX"}, \
{ name " MUX", "ADSP-ADMAIF20", "ADSP-ADMAIF20 RX"}
#define ADSP_APM_IN_ROUTES(name) \
{ name " MUX", "APM-IN1", "APM-IN1 TX"}, \
@@ -2281,6 +2331,16 @@ static const struct snd_soc_dapm_route tegra210_adsp_routes[] = {
ADSP_EP_MUX_ROUTES("ADSP-ADMAIF8"),
ADSP_EP_MUX_ROUTES("ADSP-ADMAIF9"),
ADSP_EP_MUX_ROUTES("ADSP-ADMAIF10"),
ADSP_EP_MUX_ROUTES("ADSP-ADMAIF11"),
ADSP_EP_MUX_ROUTES("ADSP-ADMAIF12"),
ADSP_EP_MUX_ROUTES("ADSP-ADMAIF13"),
ADSP_EP_MUX_ROUTES("ADSP-ADMAIF14"),
ADSP_EP_MUX_ROUTES("ADSP-ADMAIF15"),
ADSP_EP_MUX_ROUTES("ADSP-ADMAIF16"),
ADSP_EP_MUX_ROUTES("ADSP-ADMAIF17"),
ADSP_EP_MUX_ROUTES("ADSP-ADMAIF18"),
ADSP_EP_MUX_ROUTES("ADSP-ADMAIF19"),
ADSP_EP_MUX_ROUTES("ADSP-ADMAIF20"),
ADSP_APM_IN_MUX_ROUTES("APM-IN1"),
ADSP_APM_IN_MUX_ROUTES("APM-IN2"),