diff --git a/sound/soc/tegra-alt/include/tegra210_xbar_alt.h b/sound/soc/tegra-alt/include/tegra210_xbar_alt.h index 15ff963e..c55452d1 100644 --- a/sound/soc/tegra-alt/include/tegra210_xbar_alt.h +++ b/sound/soc/tegra-alt/include/tegra210_xbar_alt.h @@ -91,80 +91,6 @@ #define TEGRA_XBAR_UPDATE_MAX_REG (TEGRA186_XBAR_UPDATE_MAX_REG) -/* T210 Modules Base address */ -#define T210_ADMAIF_BASE_ADDR 0x702d0000 -#define T210_I2S1_BASE_ADDR 0x702d1000 -#define T210_I2S2_BASE_ADDR 0x702d1100 -#define T210_I2S3_BASE_ADDR 0x702d1200 -#define T210_I2S4_BASE_ADDR 0x702d1300 -#define T210_I2S5_BASE_ADDR 0x702d1400 -#define T210_AMX1_BASE_ADDR 0x702d3000 -#define T210_AMX2_BASE_ADDR 0x702d3100 -#define T210_ADX1_BASE_ADDR 0x702d3800 -#define T210_ADX2_BASE_ADDR 0x702d3900 -#define T210_AFC1_BASE_ADDR 0x702d7000 -#define T210_AFC2_BASE_ADDR 0x702d7100 -#define T210_AFC3_BASE_ADDR 0x702d7200 -#define T210_AFC4_BASE_ADDR 0x702d7300 -#define T210_AFC5_BASE_ADDR 0x702d7400 -#define T210_AFC6_BASE_ADDR 0x702d7500 -#define T210_SFC1_BASE_ADDR 0x702d2000 -#define T210_SFC2_BASE_ADDR 0x702d2200 -#define T210_SFC3_BASE_ADDR 0x702d2400 -#define T210_SFC4_BASE_ADDR 0x702d2600 -#define T210_MVC1_BASE_ADDR 0x702da000 -#define T210_MVC2_BASE_ADDR 0x702da200 -#define T210_IQC1_BASE_ADDR 0x702de000 -#define T210_IQC2_BASE_ADDR 0x702de200 -#define T210_DMIC1_BASE_ADDR 0x702d4000 -#define T210_DMIC2_BASE_ADDR 0x702d4100 -#define T210_DMIC3_BASE_ADDR 0x702d4200 -#define T210_OPE1_BASE_ADDR 0x702d8000 -#define T210_OPE2_BASE_ADDR 0x702d8400 -#define T210_AMIXER1_BASE_ADDR 0x702dbb00 - -/* T186 Modules Base address */ -#define T186_ADMAIF_BASE_ADDR 0x0290F000 -#define T186_I2S1_BASE_ADDR 0x02901000 -#define T186_I2S2_BASE_ADDR 0x02901100 -#define T186_I2S3_BASE_ADDR 0x02901200 -#define T186_I2S4_BASE_ADDR 0x02901300 -#define T186_I2S5_BASE_ADDR 0x02901400 -#define T186_I2S6_BASE_ADDR 0x02901500 -#define T186_AMX1_BASE_ADDR 0x02903000 -#define T186_AMX2_BASE_ADDR 0x02903100 -#define T186_AMX3_BASE_ADDR 0x02903200 -#define T186_AMX4_BASE_ADDR 0x02903300 -#define T186_ADX1_BASE_ADDR 0x02903800 -#define T186_ADX2_BASE_ADDR 0x02903900 -#define T186_ADX3_BASE_ADDR 0x02903a00 -#define T186_ADX4_BASE_ADDR 0x02903b00 -#define T186_AFC1_BASE_ADDR 0x02907000 -#define T186_AFC2_BASE_ADDR 0x02907100 -#define T186_AFC3_BASE_ADDR 0x02907200 -#define T186_AFC4_BASE_ADDR 0x02907300 -#define T186_AFC5_BASE_ADDR 0x02907400 -#define T186_AFC6_BASE_ADDR 0x02907500 -#define T186_SFC1_BASE_ADDR 0x02902000 -#define T186_SFC2_BASE_ADDR 0x02902200 -#define T186_SFC3_BASE_ADDR 0x02902400 -#define T186_SFC4_BASE_ADDR 0x02902600 -#define T186_MVC1_BASE_ADDR 0x0290A000 -#define T186_MVC2_BASE_ADDR 0x0290A200 -#define T186_IQC1_BASE_ADDR 0x0290E000 -#define T186_IQC2_BASE_ADDR 0x0290E200 -#define T186_DMIC1_BASE_ADDR 0x02904000 -#define T186_DMIC2_BASE_ADDR 0x02904100 -#define T186_DMIC3_BASE_ADDR 0x02904200 -#define T186_DMIC4_BASE_ADDR 0x02904300 -#define T186_OPE1_BASE_ADDR 0x02908000 -#define T186_AMIXER1_BASE_ADDR 0x0290BB00 -#define T186_ASRC1_BASE_ADDR 0x02910000 -#define T186_ARAD1_BASE_ADDR 0x0290E400 -#define T186_DSPK1_BASE_ADDR 0x02905000 -#define T186_DSPK2_BASE_ADDR 0x02905100 - - struct tegra210_xbar_cif_conf { unsigned int threshold; unsigned int audio_channels; diff --git a/sound/soc/tegra-alt/tegra210_amx_alt.c b/sound/soc/tegra-alt/tegra210_amx_alt.c index c1ca6779..09698e68 100644 --- a/sound/soc/tegra-alt/tegra210_amx_alt.c +++ b/sound/soc/tegra-alt/tegra210_amx_alt.c @@ -912,12 +912,6 @@ static int tegra210_amx_platform_probe(struct platform_device *pdev) return ret; } - /* following is necessary to have the required codec-dai-name */ - if (dev_set_name(&pdev->dev, "%s.%d", DRV_NAME, pdev->dev.id)) { - dev_err(&pdev->dev, "error in setting AMX dev name\n"); - return -ENODEV; - } - pm_runtime_enable(&pdev->dev); ret = snd_soc_register_codec(&pdev->dev, &tegra210_amx_codec, tegra210_amx_dais, diff --git a/sound/soc/tegra-alt/tegra210_xbar_alt.c b/sound/soc/tegra-alt/tegra210_xbar_alt.c index e6ba3f55..df1096bf 100644 --- a/sound/soc/tegra-alt/tegra210_xbar_alt.c +++ b/sound/soc/tegra-alt/tegra210_xbar_alt.c @@ -1110,140 +1110,6 @@ static const struct snd_soc_dapm_route tegra186_xbar_routes[] = { IN_OUT_ROUTES("ARAD1") }; -static struct of_dev_auxdata tegra210_xbar_auxdata[] = { - OF_DEV_AUXDATA("nvidia,tegra210-admaif", T210_ADMAIF_BASE_ADDR, - "tegra210-admaif", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-i2s", T210_I2S1_BASE_ADDR, - "tegra210-i2s.0", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-i2s", T210_I2S2_BASE_ADDR, - "tegra210-i2s.1", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-i2s", T210_I2S3_BASE_ADDR, - "tegra210-i2s.2", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-i2s", T210_I2S4_BASE_ADDR, - "tegra210-i2s.3", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-i2s", T210_I2S5_BASE_ADDR, - "tegra210-i2s.4", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-adx", T210_ADX1_BASE_ADDR, - "tegra210-adx.0", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-adx", T210_ADX2_BASE_ADDR, - "tegra210-adx.1", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-afc", T210_AFC1_BASE_ADDR, - "tegra210-afc.0", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-afc", T210_AFC2_BASE_ADDR, - "tegra210-afc.1", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-afc", T210_AFC3_BASE_ADDR, - "tegra210-afc.2", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-afc", T210_AFC4_BASE_ADDR, - "tegra210-afc.3", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-afc", T210_AFC5_BASE_ADDR, - "tegra210-afc.4", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-afc", T210_AFC6_BASE_ADDR, - "tegra210-afc.5", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-sfc", T210_SFC1_BASE_ADDR, - "tegra210-sfc.0", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-sfc", T210_SFC2_BASE_ADDR, - "tegra210-sfc.1", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-sfc", T210_SFC3_BASE_ADDR, - "tegra210-sfc.2", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-sfc", T210_SFC4_BASE_ADDR, - "tegra210-sfc.3", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-mvc", T210_MVC1_BASE_ADDR, - "tegra210-mvc.0", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-mvc", T210_MVC2_BASE_ADDR, - "tegra210-mvc.1", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-iqc", T210_IQC1_BASE_ADDR, - "tegra210-iqc.0", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-iqc", T210_IQC2_BASE_ADDR, - "tegra210-iqc.1", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-dmic", T210_DMIC1_BASE_ADDR, - "tegra210-dmic.0", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-dmic", T210_DMIC2_BASE_ADDR, - "tegra210-dmic.1", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-dmic", T210_DMIC3_BASE_ADDR, - "tegra210-dmic.2", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-ope", T210_OPE1_BASE_ADDR, - "tegra210-ope.0", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-ope", T210_OPE2_BASE_ADDR, - "tegra210-ope.1", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-amixer", T210_AMIXER1_BASE_ADDR, - "tegra210-mixer", NULL), - {} -}; - -static struct of_dev_auxdata tegra186_xbar_auxdata[] = { - OF_DEV_AUXDATA("nvidia,tegra186-admaif", T186_ADMAIF_BASE_ADDR, - "tegra186-admaif", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-i2s", T186_I2S1_BASE_ADDR, - "tegra210-i2s.0", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-i2s", T186_I2S2_BASE_ADDR, - "tegra210-i2s.1", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-i2s", T186_I2S3_BASE_ADDR, - "tegra210-i2s.2", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-i2s", T186_I2S4_BASE_ADDR, - "tegra210-i2s.3", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-i2s", T186_I2S5_BASE_ADDR, - "tegra210-i2s.4", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-i2s", T186_I2S6_BASE_ADDR, - "tegra210-i2s.5", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-adx", T186_ADX1_BASE_ADDR, - "tegra210-adx.0", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-adx", T186_ADX2_BASE_ADDR, - "tegra210-adx.1", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-adx", T186_ADX3_BASE_ADDR, - "tegra210-adx.2", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-adx", T186_ADX4_BASE_ADDR, - "tegra210-adx.3", NULL), - OF_DEV_AUXDATA("nvidia,tegra186-afc", T186_AFC1_BASE_ADDR, - "tegra186-afc.0", NULL), - OF_DEV_AUXDATA("nvidia,tegra186-afc", T186_AFC2_BASE_ADDR, - "tegra186-afc.1", NULL), - OF_DEV_AUXDATA("nvidia,tegra186-afc", T186_AFC3_BASE_ADDR, - "tegra186-afc.2", NULL), - OF_DEV_AUXDATA("nvidia,tegra186-afc", T186_AFC4_BASE_ADDR, - "tegra186-afc.3", NULL), - OF_DEV_AUXDATA("nvidia,tegra186-afc", T186_AFC5_BASE_ADDR, - "tegra186-afc.4", NULL), - OF_DEV_AUXDATA("nvidia,tegra186-afc", T186_AFC6_BASE_ADDR, - "tegra186-afc.5", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-sfc", T186_SFC1_BASE_ADDR, - "tegra210-sfc.0", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-sfc", T186_SFC2_BASE_ADDR, - "tegra210-sfc.1", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-sfc", T186_SFC3_BASE_ADDR, - "tegra210-sfc.2", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-sfc", T186_SFC4_BASE_ADDR, - "tegra210-sfc.3", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-mvc", T186_MVC1_BASE_ADDR, - "tegra210-mvc.0", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-mvc", T186_MVC2_BASE_ADDR, - "tegra210-mvc.1", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-iqc", T186_IQC1_BASE_ADDR, - "tegra210-iqc.0", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-iqc", T186_IQC2_BASE_ADDR, - "tegra210-iqc.1", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-dmic", T186_DMIC1_BASE_ADDR, - "tegra210-dmic.0", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-dmic", T186_DMIC2_BASE_ADDR, - "tegra210-dmic.1", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-dmic", T186_DMIC3_BASE_ADDR, - "tegra210-dmic.2", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-dmic", T186_DMIC4_BASE_ADDR, - "tegra210-dmic.3", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-ope", T186_OPE1_BASE_ADDR, - "tegra210-ope.0", NULL), - OF_DEV_AUXDATA("nvidia,tegra210-amixer", T186_AMIXER1_BASE_ADDR, - "tegra210-mixer", NULL), - OF_DEV_AUXDATA("nvidia,tegra186-asrc", T186_ASRC1_BASE_ADDR, - "tegra186-asrc", NULL), - OF_DEV_AUXDATA("nvidia,tegra186-arad", T186_ARAD1_BASE_ADDR, - "tegra186-arad", NULL), - OF_DEV_AUXDATA("nvidia,tegra186-dspk", T186_DSPK1_BASE_ADDR, - "tegra186-dspk.0", NULL), - OF_DEV_AUXDATA("nvidia,tegra186-dspk", T186_DSPK2_BASE_ADDR, - "tegra186-dspk.1", NULL), - {} -}; - static struct snd_soc_codec_driver tegra210_xbar_codec = { .idle_bias_off = 1, .component_driver = { @@ -1306,10 +1172,7 @@ static int tegra210_xbar_registration(struct platform_device *pdev) return -EBUSY; } - of_platform_populate(pdev->dev.of_node, NULL, tegra210_xbar_auxdata, - &pdev->dev); - - return 0; + return of_platform_populate(pdev->dev.of_node, NULL, NULL, &pdev->dev); } static int tegra186_xbar_registration(struct platform_device *pdev) @@ -1336,10 +1199,7 @@ static int tegra186_xbar_registration(struct platform_device *pdev) return -EBUSY; } - of_platform_populate(pdev->dev.of_node, NULL, tegra186_xbar_auxdata, - &pdev->dev); - - return 0; + return of_platform_populate(pdev->dev.of_node, NULL, NULL, &pdev->dev); } static const struct tegra_xbar_soc_data soc_data_tegra210 = { @@ -1375,12 +1235,6 @@ static int tegra_dev_xbar_probe(struct platform_device *pdev) const struct of_device_id *match; struct tegra_xbar_soc_data *soc_data; - /* required to register the xbar codec with generic name */ - if (dev_set_name(&pdev->dev, "%s", DRV_NAME) < 0) { - dev_err(&pdev->dev, "error in setting xbar device name\n"); - return -ENODEV; - } - match = of_match_device(tegra_xbar_of_match, &pdev->dev); if (!match) { dev_err(&pdev->dev, "Error: No device match found\n"); diff --git a/sound/soc/tegra-alt/utils/tegra_asoc_machine_alt.c b/sound/soc/tegra-alt/utils/tegra_asoc_machine_alt.c index 142fc8aa..7e772f7c 100644 --- a/sound/soc/tegra-alt/utils/tegra_asoc_machine_alt.c +++ b/sound/soc/tegra-alt/utils/tegra_asoc_machine_alt.c @@ -85,9 +85,9 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF1 CIF", .cpu_dai_name = "ADMAIF1", .codec_dai_name = "ADMAIF1", - .cpu_name = "tegra210-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra210-admaif", + .cpu_name = "702d0000.admaif", + .codec_name = "702d0800.ahub", + .platform_name = "702d0000.admaif", .ignore_pmdown_time = 1, }, [TEGRA210_DAI_LINK_ADMAIF2] = { @@ -95,9 +95,9 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF2 CIF", .cpu_dai_name = "ADMAIF2", .codec_dai_name = "ADMAIF2", - .cpu_name = "tegra210-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra210-admaif", + .cpu_name = "702d0000.admaif", + .codec_name = "702d0800.ahub", + .platform_name = "702d0000.admaif", .ignore_pmdown_time = 1, }, [TEGRA210_DAI_LINK_ADMAIF3] = { @@ -105,9 +105,9 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF3 CIF", .cpu_dai_name = "ADMAIF3", .codec_dai_name = "ADMAIF3", - .cpu_name = "tegra210-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra210-admaif", + .cpu_name = "702d0000.admaif", + .codec_name = "702d0800.ahub", + .platform_name = "702d0000.admaif", .ignore_pmdown_time = 1, }, [TEGRA210_DAI_LINK_ADMAIF4] = { @@ -115,9 +115,9 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF4 CIF", .cpu_dai_name = "ADMAIF4", .codec_dai_name = "ADMAIF4", - .cpu_name = "tegra210-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra210-admaif", + .cpu_name = "702d0000.admaif", + .codec_name = "702d0800.ahub", + .platform_name = "702d0000.admaif", .ignore_pmdown_time = 1, }, [TEGRA210_DAI_LINK_ADMAIF5] = { @@ -125,9 +125,9 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF5 CIF", .cpu_dai_name = "ADMAIF5", .codec_dai_name = "ADMAIF5", - .cpu_name = "tegra210-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra210-admaif", + .cpu_name = "702d0000.admaif", + .codec_name = "702d0800.ahub", + .platform_name = "702d0000.admaif", .ignore_pmdown_time = 1, }, [TEGRA210_DAI_LINK_ADMAIF6] = { @@ -135,9 +135,9 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF6 CIF", .cpu_dai_name = "ADMAIF6", .codec_dai_name = "ADMAIF6", - .cpu_name = "tegra210-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra210-admaif", + .cpu_name = "702d0000.admaif", + .codec_name = "702d0800.ahub", + .platform_name = "702d0000.admaif", .ignore_pmdown_time = 1, }, [TEGRA210_DAI_LINK_ADMAIF7] = { @@ -145,9 +145,9 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF7 CIF", .cpu_dai_name = "ADMAIF7", .codec_dai_name = "ADMAIF7", - .cpu_name = "tegra210-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra210-admaif", + .cpu_name = "702d0000.admaif", + .codec_name = "702d0800.ahub", + .platform_name = "702d0000.admaif", .ignore_pmdown_time = 1, }, [TEGRA210_DAI_LINK_ADMAIF8] = { @@ -155,9 +155,9 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF8 CIF", .cpu_dai_name = "ADMAIF8", .codec_dai_name = "ADMAIF8", - .cpu_name = "tegra210-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra210-admaif", + .cpu_name = "702d0000.admaif", + .codec_name = "702d0800.ahub", + .platform_name = "702d0000.admaif", .ignore_pmdown_time = 1, }, [TEGRA210_DAI_LINK_ADMAIF9] = { @@ -165,9 +165,9 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF9 CIF", .cpu_dai_name = "ADMAIF9", .codec_dai_name = "ADMAIF9", - .cpu_name = "tegra210-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra210-admaif", + .cpu_name = "702d0000.admaif", + .codec_name = "702d0800.ahub", + .platform_name = "702d0000.admaif", .ignore_pmdown_time = 1, }, [TEGRA210_DAI_LINK_ADMAIF10] = { @@ -175,9 +175,9 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF10 CIF", .cpu_dai_name = "ADMAIF10", .codec_dai_name = "ADMAIF10", - .cpu_name = "tegra210-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra210-admaif", + .cpu_name = "702d0000.admaif", + .codec_name = "702d0800.ahub", + .platform_name = "702d0000.admaif", .ignore_pmdown_time = 1, }, #if IS_ENABLED(CONFIG_SND_SOC_TEGRA210_AMX_ALT) @@ -186,8 +186,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "AMX1 IN", .cpu_dai_name = "AMX1-1", .codec_dai_name = "IN1", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-amx.0", + .cpu_name = "702d0800.ahub", + .codec_name = "702d3000.amx", .params = &default_link_params, }, [TEGRA210_DAI_LINK_AMX1_2] = { @@ -195,8 +195,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "AMX1 IN", .cpu_dai_name = "AMX1-2", .codec_dai_name = "IN2", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-amx.0", + .cpu_name = "702d0800.ahub", + .codec_name = "702d3000.amx", .params = &default_link_params, }, [TEGRA210_DAI_LINK_AMX1_3] = { @@ -204,8 +204,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "AMX1 IN", .cpu_dai_name = "AMX1-3", .codec_dai_name = "IN3", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-amx.0", + .cpu_name = "702d0800.ahub", + .codec_name = "702d3000.amx", .params = &default_link_params, }, [TEGRA210_DAI_LINK_AMX1_4] = { @@ -213,8 +213,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "AMX1 IN", .cpu_dai_name = "AMX1-4", .codec_dai_name = "IN4", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-amx.0", + .cpu_name = "702d0800.ahub", + .codec_name = "702d3000.amx", .params = &default_link_params, }, [TEGRA210_DAI_LINK_AMX1] = { @@ -222,8 +222,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "AMX1 CIF", .cpu_dai_name = "OUT", .codec_dai_name = "AMX1", - .cpu_name = "tegra210-amx.0", - .codec_name = "tegra210-axbar", + .cpu_name = "702d3000.amx", + .codec_name = "702d0800.ahub", .params = &tdm_link_params, }, [TEGRA210_DAI_LINK_AMX2_1] = { @@ -231,8 +231,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "AMX2 IN", .cpu_dai_name = "AMX2-1", .codec_dai_name = "IN1", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-amx.1", + .cpu_name = "702d0800.ahub", + .codec_name = "702d3100.amx", .params = &default_link_params, }, [TEGRA210_DAI_LINK_AMX2_2] = { @@ -240,8 +240,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "AMX2 IN", .cpu_dai_name = "AMX2-2", .codec_dai_name = "IN2", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-amx.1", + .cpu_name = "702d0800.ahub", + .codec_name = "702d3100.amx", .params = &default_link_params, }, [TEGRA210_DAI_LINK_AMX2_3] = { @@ -249,8 +249,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "AMX2 IN", .cpu_dai_name = "AMX2-3", .codec_dai_name = "IN3", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-amx.1", + .cpu_name = "702d0800.ahub", + .codec_name = "702d3100.amx", .params = &default_link_params, }, [TEGRA210_DAI_LINK_AMX2_4] = { @@ -258,8 +258,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "AMX2 IN", .cpu_dai_name = "AMX2-4", .codec_dai_name = "IN4", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-amx.1", + .cpu_name = "702d0800.ahub", + .codec_name = "702d3100.amx", .params = &default_link_params, }, [TEGRA210_DAI_LINK_AMX2] = { @@ -267,8 +267,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "AMX2 CIF", .cpu_dai_name = "OUT", .codec_dai_name = "AMX2", - .cpu_name = "tegra210-amx.1", - .codec_name = "tegra210-axbar", + .cpu_name = "702d3100.amx", + .codec_name = "702d0800.ahub", .params = &tdm_link_params, }, #endif /* IS_ENABLED(CONFIG_SND_SOC_TEGRA210_AMX_ALT) */ @@ -278,8 +278,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "ADX1 IN", .cpu_dai_name = "ADX1", .codec_dai_name = "IN", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-adx.0", + .cpu_name = "702d0800.ahub", + .codec_name = "702d3800.adx", .params = &tdm_link_params, }, [TEGRA210_DAI_LINK_ADX1_1] = { @@ -287,8 +287,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "ADX1 OUT", .cpu_dai_name = "OUT1", .codec_dai_name = "ADX1-1", - .cpu_name = "tegra210-adx.0", - .codec_name = "tegra210-axbar", + .cpu_name = "702d3800.adx", + .codec_name = "702d0800.ahub", .params = &default_link_params, }, [TEGRA210_DAI_LINK_ADX1_2] = { @@ -296,8 +296,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "ADX1 OUT", .cpu_dai_name = "OUT2", .codec_dai_name = "ADX1-2", - .cpu_name = "tegra210-adx.0", - .codec_name = "tegra210-axbar", + .cpu_name = "702d3800.adx", + .codec_name = "702d0800.ahub", .params = &default_link_params, }, [TEGRA210_DAI_LINK_ADX1_3] = { @@ -305,8 +305,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "ADX1 OUT", .cpu_dai_name = "OUT3", .codec_dai_name = "ADX1-3", - .cpu_name = "tegra210-adx.0", - .codec_name = "tegra210-axbar", + .cpu_name = "702d3800.adx", + .codec_name = "702d0800.ahub", .params = &default_link_params, }, [TEGRA210_DAI_LINK_ADX1_4] = { @@ -314,8 +314,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "ADX1 OUT", .cpu_dai_name = "OUT4", .codec_dai_name = "ADX1-4", - .cpu_name = "tegra210-adx.0", - .codec_name = "tegra210-axbar", + .cpu_name = "702d3800.adx", + .codec_name = "702d0800.ahub", .params = &default_link_params, }, [TEGRA210_DAI_LINK_ADX2] = { @@ -323,8 +323,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "ADX2 IN", .cpu_dai_name = "ADX2", .codec_dai_name = "IN", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-adx.1", + .cpu_name = "702d0800.ahub", + .codec_name = "702d3900.adx", .params = &tdm_link_params, }, [TEGRA210_DAI_LINK_ADX2_1] = { @@ -332,8 +332,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "ADX2 OUT", .cpu_dai_name = "OUT1", .codec_dai_name = "ADX2-1", - .cpu_name = "tegra210-adx.1", - .codec_name = "tegra210-axbar", + .cpu_name = "702d3900.adx", + .codec_name = "702d0800.ahub", .params = &default_link_params, }, [TEGRA210_DAI_LINK_ADX2_2] = { @@ -341,8 +341,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "ADX2 OUT", .cpu_dai_name = "OUT2", .codec_dai_name = "ADX2-2", - .cpu_name = "tegra210-adx.1", - .codec_name = "tegra210-axbar", + .cpu_name = "702d3900.adx", + .codec_name = "702d0800.ahub", .params = &default_link_params, }, [TEGRA210_DAI_LINK_ADX2_3] = { @@ -350,8 +350,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "ADX2 OUT", .cpu_dai_name = "OUT3", .codec_dai_name = "ADX2-3", - .cpu_name = "tegra210-adx.1", - .codec_name = "tegra210-axbar", + .cpu_name = "702d3900.adx", + .codec_name = "702d0800.ahub", .params = &default_link_params, }, [TEGRA210_DAI_LINK_ADX2_4] = { @@ -359,8 +359,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "ADX2 OUT", .cpu_dai_name = "OUT4", .codec_dai_name = "ADX2-4", - .cpu_name = "tegra210-adx.1", - .codec_name = "tegra210-axbar", + .cpu_name = "702d3900.adx", + .codec_name = "702d0800.ahub", .params = &default_link_params, }, #endif /* IS_ENABLED(CONFIG_SND_SOC_TEGRA210_ADX_ALT) */ @@ -370,8 +370,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "MIXER1 RX", .cpu_dai_name = "MIXER1-1", .codec_dai_name = "RX1", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-mixer", + .cpu_name = "702d0800.ahub", + .codec_name = "702dbb00.amixer", .params = &default_link_params, }, [TEGRA210_DAI_LINK_MIXER1_RX2] = { @@ -379,8 +379,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "MIXER1 RX", .cpu_dai_name = "MIXER1-2", .codec_dai_name = "RX2", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-mixer", + .cpu_name = "702d0800.ahub", + .codec_name = "702dbb00.amixer", .params = &default_link_params, }, [TEGRA210_DAI_LINK_MIXER1_RX3] = { @@ -388,8 +388,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "MIXER1 RX", .cpu_dai_name = "MIXER1-3", .codec_dai_name = "RX3", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-mixer", + .cpu_name = "702d0800.ahub", + .codec_name = "702dbb00.amixer", .params = &default_link_params, }, [TEGRA210_DAI_LINK_MIXER1_RX4] = { @@ -397,8 +397,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "MIXER1 RX", .cpu_dai_name = "MIXER1-4", .codec_dai_name = "RX4", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-mixer", + .cpu_name = "702d0800.ahub", + .codec_name = "702dbb00.amixer", .params = &default_link_params, }, [TEGRA210_DAI_LINK_MIXER1_RX5] = { @@ -406,8 +406,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "MIXER1 RX", .cpu_dai_name = "MIXER1-5", .codec_dai_name = "RX5", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-mixer", + .cpu_name = "702d0800.ahub", + .codec_name = "702dbb00.amixer", .params = &default_link_params, }, [TEGRA210_DAI_LINK_MIXER1_RX6] = { @@ -415,8 +415,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "MIXER1 RX", .cpu_dai_name = "MIXER1-6", .codec_dai_name = "RX6", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-mixer", + .cpu_name = "702d0800.ahub", + .codec_name = "702dbb00.amixer", .params = &default_link_params, }, [TEGRA210_DAI_LINK_MIXER1_RX7] = { @@ -424,8 +424,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "MIXER1 RX", .cpu_dai_name = "MIXER1-7", .codec_dai_name = "RX7", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-mixer", + .cpu_name = "702d0800.ahub", + .codec_name = "702dbb00.amixer", .params = &default_link_params, }, [TEGRA210_DAI_LINK_MIXER1_RX8] = { @@ -433,8 +433,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "MIXER1 RX", .cpu_dai_name = "MIXER1-8", .codec_dai_name = "RX8", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-mixer", + .cpu_name = "702d0800.ahub", + .codec_name = "702dbb00.amixer", .params = &default_link_params, }, [TEGRA210_DAI_LINK_MIXER1_RX9] = { @@ -442,8 +442,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "MIXER1 RX", .cpu_dai_name = "MIXER1-9", .codec_dai_name = "RX9", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-mixer", + .cpu_name = "702d0800.ahub", + .codec_name = "702dbb00.amixer", .params = &default_link_params, }, [TEGRA210_DAI_LINK_MIXER1_RX10] = { @@ -451,8 +451,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "MIXER1 RX", .cpu_dai_name = "MIXER1-10", .codec_dai_name = "RX10", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-mixer", + .cpu_name = "702d0800.ahub", + .codec_name = "702dbb00.amixer", .params = &default_link_params, }, [TEGRA210_DAI_LINK_MIXER1_TX1] = { @@ -460,8 +460,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "MIXER1 TX", .cpu_dai_name = "TX1", .codec_dai_name = "MIXER1-1", - .cpu_name = "tegra210-mixer", - .codec_name = "tegra210-axbar", + .cpu_name = "702dbb00.amixer", + .codec_name = "702d0800.ahub", .params = &default_link_params, }, [TEGRA210_DAI_LINK_MIXER1_TX2] = { @@ -469,8 +469,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "MIXER1 TX", .cpu_dai_name = "TX2", .codec_dai_name = "MIXER1-2", - .cpu_name = "tegra210-mixer", - .codec_name = "tegra210-axbar", + .cpu_name = "702dbb00.amixer", + .codec_name = "702d0800.ahub", .params = &default_link_params, }, [TEGRA210_DAI_LINK_MIXER1_TX3] = { @@ -478,8 +478,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "MIXER1 TX", .cpu_dai_name = "TX3", .codec_dai_name = "MIXER1-3", - .cpu_name = "tegra210-mixer", - .codec_name = "tegra210-axbar", + .cpu_name = "702dbb00.amixer", + .codec_name = "702d0800.ahub", .params = &default_link_params, }, [TEGRA210_DAI_LINK_MIXER1_TX4] = { @@ -487,8 +487,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "MIXER1 TX", .cpu_dai_name = "TX4", .codec_dai_name = "MIXER1-4", - .cpu_name = "tegra210-mixer", - .codec_name = "tegra210-axbar", + .cpu_name = "702dbb00.amixer", + .codec_name = "702d0800.ahub", .params = &default_link_params, }, [TEGRA210_DAI_LINK_MIXER1_TX5] = { @@ -496,8 +496,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "MIXER1 TX", .cpu_dai_name = "TX5", .codec_dai_name = "MIXER1-5", - .cpu_name = "tegra210-mixer", - .codec_name = "tegra210-axbar", + .cpu_name = "702dbb00.amixer", + .codec_name = "702d0800.ahub", .params = &default_link_params, }, #endif /* IS_ENABLED(CONFIG_SND_SOC_TEGRA210_MIXER_ALT) */ @@ -507,8 +507,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "SFC1 RX", .cpu_dai_name = "SFC1", .codec_dai_name = "CIF", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-sfc.0", + .cpu_name = "702d0800.ahub", + .codec_name = "702d2000.sfc", .params = &default_link_params, }, [TEGRA210_DAI_LINK_SFC1_TX] = { @@ -516,8 +516,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "SFC1 TX", .cpu_dai_name = "DAP", .codec_dai_name = "SFC1", - .cpu_name = "tegra210-sfc.0", - .codec_name = "tegra210-axbar", + .cpu_name = "702d2000.sfc", + .codec_name = "702d0800.ahub", .params = &default_link_params, }, [TEGRA210_DAI_LINK_SFC2_RX] = { @@ -525,8 +525,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "SFC2 RX", .cpu_dai_name = "SFC2", .codec_dai_name = "CIF", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-sfc.1", + .cpu_name = "702d0800.ahub", + .codec_name = "702d2200.sfc", .params = &default_link_params, }, [TEGRA210_DAI_LINK_SFC2_TX] = { @@ -534,8 +534,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "SFC2 TX", .cpu_dai_name = "DAP", .codec_dai_name = "SFC2", - .cpu_name = "tegra210-sfc.1", - .codec_name = "tegra210-axbar", + .cpu_name = "702d2200.sfc", + .codec_name = "702d0800.ahub", .params = &default_link_params, }, [TEGRA210_DAI_LINK_SFC3_RX] = { @@ -543,8 +543,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "SFC3 RX", .cpu_dai_name = "SFC3", .codec_dai_name = "CIF", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-sfc.2", + .cpu_name = "702d0800.ahub", + .codec_name = "702d2400.sfc", .params = &default_link_params, }, [TEGRA210_DAI_LINK_SFC3_TX] = { @@ -552,8 +552,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "SFC3 TX", .cpu_dai_name = "DAP", .codec_dai_name = "SFC3", - .cpu_name = "tegra210-sfc.2", - .codec_name = "tegra210-axbar", + .cpu_name = "702d2400.sfc", + .codec_name = "702d0800.ahub", .params = &default_link_params, }, [TEGRA210_DAI_LINK_SFC4_RX] = { @@ -561,8 +561,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "SFC4 RX", .cpu_dai_name = "SFC4", .codec_dai_name = "CIF", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-sfc.3", + .cpu_name = "702d0800.ahub", + .codec_name = "702d2600.sfc", .params = &default_link_params, }, [TEGRA210_DAI_LINK_SFC4_TX] = { @@ -570,8 +570,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "SFC4 TX", .cpu_dai_name = "DAP", .codec_dai_name = "SFC4", - .cpu_name = "tegra210-sfc.3", - .codec_name = "tegra210-axbar", + .cpu_name = "702d2600.sfc", + .codec_name = "702d0800.ahub", .params = &default_link_params, }, #endif /* IS_ENABLED(CONFIG_SND_SOC_TEGRA210_SFC_ALT) */ @@ -581,8 +581,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "AFC1 RX", .cpu_dai_name = "AFC1", .codec_dai_name = "AFC IN", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-afc.0", + .cpu_name = "702d0800.ahub", + .codec_name = "702d7000.afc", .params = &default_link_params, }, [TEGRA210_DAI_LINK_AFC1_TX] = { @@ -590,8 +590,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "AFC1 TX", .cpu_dai_name = "AFC OUT", .codec_dai_name = "AFC1", - .cpu_name = "tegra210-afc.0", - .codec_name = "tegra210-axbar", + .cpu_name = "702d7000.afc", + .codec_name = "702d0800.ahub", .params = &default_link_params, }, [TEGRA210_DAI_LINK_AFC2_RX] = { @@ -599,8 +599,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "AFC2 RX", .cpu_dai_name = "AFC2", .codec_dai_name = "AFC IN", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-afc.1", + .cpu_name = "702d0800.ahub", + .codec_name = "702d7100.afc", .params = &default_link_params, }, [TEGRA210_DAI_LINK_AFC2_TX] = { @@ -608,8 +608,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "AFC2 TX", .cpu_dai_name = "AFC OUT", .codec_dai_name = "AFC2", - .cpu_name = "tegra210-afc.1", - .codec_name = "tegra210-axbar", + .cpu_name = "702d7100.afc", + .codec_name = "702d0800.ahub", .params = &default_link_params, }, [TEGRA210_DAI_LINK_AFC3_RX] = { @@ -617,8 +617,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "AFC3 RX", .cpu_dai_name = "AFC3", .codec_dai_name = "AFC IN", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-afc.2", + .cpu_name = "702d0800.ahub", + .codec_name = "702d7200.afc", .params = &default_link_params, }, [TEGRA210_DAI_LINK_AFC3_TX] = { @@ -626,8 +626,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "AFC3 TX", .cpu_dai_name = "AFC OUT", .codec_dai_name = "AFC3", - .cpu_name = "tegra210-afc.2", - .codec_name = "tegra210-axbar", + .cpu_name = "702d7200.afc", + .codec_name = "702d0800.ahub", .params = &default_link_params, }, [TEGRA210_DAI_LINK_AFC4_RX] = { @@ -635,8 +635,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "AFC4 RX", .cpu_dai_name = "AFC4", .codec_dai_name = "AFC IN", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-afc.3", + .cpu_name = "702d0800.ahub", + .codec_name = "702d7300.afc", .params = &default_link_params, }, [TEGRA210_DAI_LINK_AFC4_TX] = { @@ -644,8 +644,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "AFC4 TX", .cpu_dai_name = "AFC OUT", .codec_dai_name = "AFC4", - .cpu_name = "tegra210-afc.3", - .codec_name = "tegra210-axbar", + .cpu_name = "702d7300.afc", + .codec_name = "702d0800.ahub", .params = &default_link_params, }, [TEGRA210_DAI_LINK_AFC5_RX] = { @@ -653,8 +653,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "AFC5 RX", .cpu_dai_name = "AFC5", .codec_dai_name = "AFC IN", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-afc.4", + .cpu_name = "702d0800.ahub", + .codec_name = "702d7400.afc", .params = &default_link_params, }, [TEGRA210_DAI_LINK_AFC5_TX] = { @@ -662,8 +662,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "AFC5 TX", .cpu_dai_name = "AFC OUT", .codec_dai_name = "AFC5", - .cpu_name = "tegra210-afc.4", - .codec_name = "tegra210-axbar", + .cpu_name = "702d7400.afc", + .codec_name = "702d0800.ahub", .params = &default_link_params, }, [TEGRA210_DAI_LINK_AFC6_RX] = { @@ -671,8 +671,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "AFC6 RX", .cpu_dai_name = "AFC6", .codec_dai_name = "AFC IN", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-afc.5", + .cpu_name = "702d0800.ahub", + .codec_name = "702d7500.afc", .params = &default_link_params, }, [TEGRA210_DAI_LINK_AFC6_TX] = { @@ -680,8 +680,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "AFC6 TX", .cpu_dai_name = "AFC OUT", .codec_dai_name = "AFC6", - .cpu_name = "tegra210-afc.5", - .codec_name = "tegra210-axbar", + .cpu_name = "702d7500.afc", + .codec_name = "702d0800.ahub", .params = &default_link_params, }, #endif /* IS_ENABLED(CONFIG_SND_SOC_TEGRA210_AFC_ALT) */ @@ -691,8 +691,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "MVC1 RX", .cpu_dai_name = "MVC1", .codec_dai_name = "MVC IN", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-mvc.0", + .cpu_name = "702d0800.ahub", + .codec_name = "702da000.mvc", .params = &default_link_params, }, [TEGRA210_DAI_LINK_MVC1_TX] = { @@ -700,8 +700,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "MVC1 TX", .cpu_dai_name = "MVC OUT", .codec_dai_name = "MVC1", - .cpu_name = "tegra210-mvc.0", - .codec_name = "tegra210-axbar", + .cpu_name = "702da000.mvc", + .codec_name = "702d0800.ahub", .params = &default_link_params, }, [TEGRA210_DAI_LINK_MVC2_RX] = { @@ -709,8 +709,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "MVC2 RX", .cpu_dai_name = "MVC2", .codec_dai_name = "MVC IN", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-mvc.1", + .cpu_name = "702d0800.ahub", + .codec_name = "702da200.mvc", .params = &default_link_params, }, [TEGRA210_DAI_LINK_MVC2_TX] = { @@ -718,8 +718,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "AFC2 TX", .cpu_dai_name = "MVC OUT", .codec_dai_name = "MVC2", - .cpu_name = "tegra210-mvc.1", - .codec_name = "tegra210-axbar", + .cpu_name = "702da200.mvc", + .codec_name = "702d0800.ahub", .params = &default_link_params, }, #endif /* IS_ENABLED(CONFIG_SND_SOC_TEGRA210_MVC_ALT) */ @@ -729,8 +729,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "OPE1 RX", .cpu_dai_name = "OPE1", .codec_dai_name = "OPE IN", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-ope.0", + .cpu_name = "702d0800.ahub", + .codec_name = "702d8000.ope", .params = &default_link_params, }, [TEGRA210_DAI_LINK_OPE1_TX] = { @@ -738,8 +738,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "OPE1 TX", .cpu_dai_name = "OPE OUT", .codec_dai_name = "OPE1", - .cpu_name = "tegra210-ope.0", - .codec_name = "tegra210-axbar", + .cpu_name = "702d8000.ope", + .codec_name = "702d0800.ahub", .params = &default_link_params, }, [TEGRA210_DAI_LINK_OPE2_RX] = { @@ -747,8 +747,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "OPE2 RX", .cpu_dai_name = "OPE2", .codec_dai_name = "OPE IN", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-ope.1", + .cpu_name = "702d0800.ahub", + .codec_name = "702d8400.ope", .params = &default_link_params, }, [TEGRA210_DAI_LINK_OPE2_TX] = { @@ -756,8 +756,8 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "OPE2 TX", .cpu_dai_name = "OPE OUT", .codec_dai_name = "OPE2", - .cpu_name = "tegra210-ope.1", - .codec_name = "tegra210-axbar", + .cpu_name = "702d8400.ope", + .codec_name = "702d0800.ahub", .params = &default_link_params, }, #endif /* IS_ENABLED(CONFIG_SND_SOC_TEGRA210_OPE_ALT) */ @@ -766,9 +766,9 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF1 CODEC", .cpu_dai_name = "ADMAIF1 CIF", .codec_dai_name = "ADMAIF1", - .cpu_name = "tegra210-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra210-admaif", + .cpu_name = "702d0000.admaif", + .codec_name = "702d0800.ahub", + .platform_name = "702d0000.admaif", .ignore_pmdown_time = 1, .params = &default_link_params, }, @@ -777,9 +777,9 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF2 CODEC", .cpu_dai_name = "ADMAIF2 CIF", .codec_dai_name = "ADMAIF2", - .cpu_name = "tegra210-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra210-admaif", + .cpu_name = "702d0000.admaif", + .codec_name = "702d0800.ahub", + .platform_name = "702d0000.admaif", .ignore_pmdown_time = 1, .params = &default_link_params, }, @@ -788,9 +788,9 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF3 CODEC", .cpu_dai_name = "ADMAIF3 CIF", .codec_dai_name = "ADMAIF3", - .cpu_name = "tegra210-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra210-admaif", + .cpu_name = "702d0000.admaif", + .codec_name = "702d0800.ahub", + .platform_name = "702d0000.admaif", .ignore_pmdown_time = 1, .params = &default_link_params, }, @@ -799,9 +799,9 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF4 CODEC", .cpu_dai_name = "ADMAIF4 CIF", .codec_dai_name = "ADMAIF4", - .cpu_name = "tegra210-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra210-admaif", + .cpu_name = "702d0000.admaif", + .codec_name = "702d0800.ahub", + .platform_name = "702d0000.admaif", .ignore_pmdown_time = 1, .params = &default_link_params, }, @@ -810,9 +810,9 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF5 CODEC", .cpu_dai_name = "ADMAIF5 CIF", .codec_dai_name = "ADMAIF5", - .cpu_name = "tegra210-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra210-admaif", + .cpu_name = "702d0000.admaif", + .codec_name = "702d0800.ahub", + .platform_name = "702d0000.admaif", .ignore_pmdown_time = 1, .params = &default_link_params, }, @@ -821,9 +821,9 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF6 CODEC", .cpu_dai_name = "ADMAIF6 CIF", .codec_dai_name = "ADMAIF6", - .cpu_name = "tegra210-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra210-admaif", + .cpu_name = "702d0000.admaif", + .codec_name = "702d0800.ahub", + .platform_name = "702d0000.admaif", .ignore_pmdown_time = 1, .params = &default_link_params, }, @@ -832,9 +832,9 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF7 CODEC", .cpu_dai_name = "ADMAIF7 CIF", .codec_dai_name = "ADMAIF7", - .cpu_name = "tegra210-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra210-admaif", + .cpu_name = "702d0000.admaif", + .codec_name = "702d0800.ahub", + .platform_name = "702d0000.admaif", .ignore_pmdown_time = 1, .params = &default_link_params, }, @@ -843,9 +843,9 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF8 CODEC", .cpu_dai_name = "ADMAIF8 CIF", .codec_dai_name = "ADMAIF8", - .cpu_name = "tegra210-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra210-admaif", + .cpu_name = "702d0000.admaif", + .codec_name = "702d0800.ahub", + .platform_name = "702d0000.admaif", .ignore_pmdown_time = 1, .params = &default_link_params, }, @@ -854,9 +854,9 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF9 CODEC", .cpu_dai_name = "ADMAIF9 CIF", .codec_dai_name = "ADMAIF9", - .cpu_name = "tegra210-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra210-admaif", + .cpu_name = "702d0000.admaif", + .codec_name = "702d0800.ahub", + .platform_name = "702d0000.admaif", .ignore_pmdown_time = 1, .params = &default_link_params, }, @@ -865,9 +865,9 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF10 CODEC", .cpu_dai_name = "ADMAIF10 CIF", .codec_dai_name = "ADMAIF10", - .cpu_name = "tegra210-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra210-admaif", + .cpu_name = "702d0000.admaif", + .codec_name = "702d0800.ahub", + .platform_name = "702d0000.admaif", .ignore_pmdown_time = 1, .params = &default_link_params, }, @@ -878,7 +878,7 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .cpu_dai_name = "ADSP-ADMAIF1", .codec_dai_name = "ADMAIF1 FIFO", .cpu_name = "tegra210-adsp", - .codec_name = "tegra210-admaif", + .codec_name = "702d0000.admaif", .params = &default_link_params, }, [TEGRA210_DAI_LINK_ADSP_ADMAIF2] = { @@ -887,7 +887,7 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .cpu_dai_name = "ADSP-ADMAIF2", .codec_dai_name = "ADMAIF2 FIFO", .cpu_name = "tegra210-adsp", - .codec_name = "tegra210-admaif", + .codec_name = "702d0000.admaif", .params = &default_link_params, }, [TEGRA210_DAI_LINK_ADSP_ADMAIF3] = { @@ -896,7 +896,7 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .cpu_dai_name = "ADSP-ADMAIF3", .codec_dai_name = "ADMAIF3 FIFO", .cpu_name = "tegra210-adsp", - .codec_name = "tegra210-admaif", + .codec_name = "702d0000.admaif", .params = &default_link_params, }, [TEGRA210_DAI_LINK_ADSP_ADMAIF4] = { @@ -905,7 +905,7 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .cpu_dai_name = "ADSP-ADMAIF4", .codec_dai_name = "ADMAIF4 FIFO", .cpu_name = "tegra210-adsp", - .codec_name = "tegra210-admaif", + .codec_name = "702d0000.admaif", .params = &default_link_params, }, [TEGRA210_DAI_LINK_ADSP_ADMAIF5] = { @@ -914,7 +914,7 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .cpu_dai_name = "ADSP-ADMAIF5", .codec_dai_name = "ADMAIF5 FIFO", .cpu_name = "tegra210-adsp", - .codec_name = "tegra210-admaif", + .codec_name = "702d0000.admaif", .params = &default_link_params, }, [TEGRA210_DAI_LINK_ADSP_ADMAIF6] = { @@ -923,7 +923,7 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .cpu_dai_name = "ADSP-ADMAIF6", .codec_dai_name = "ADMAIF6 FIFO", .cpu_name = "tegra210-adsp", - .codec_name = "tegra210-admaif", + .codec_name = "702d0000.admaif", .params = &default_link_params, }, [TEGRA210_DAI_LINK_ADSP_ADMAIF7] = { @@ -932,7 +932,7 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .cpu_dai_name = "ADSP-ADMAIF7", .codec_dai_name = "ADMAIF7 FIFO", .cpu_name = "tegra210-adsp", - .codec_name = "tegra210-admaif", + .codec_name = "702d0000.admaif", .params = &default_link_params, }, [TEGRA210_DAI_LINK_ADSP_ADMAIF8] = { @@ -941,7 +941,7 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .cpu_dai_name = "ADSP-ADMAIF8", .codec_dai_name = "ADMAIF8 FIFO", .cpu_name = "tegra210-adsp", - .codec_name = "tegra210-admaif", + .codec_name = "702d0000.admaif", .params = &default_link_params, }, [TEGRA210_DAI_LINK_ADSP_ADMAIF9] = { @@ -950,7 +950,7 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .cpu_dai_name = "ADSP-ADMAIF9", .codec_dai_name = "ADMAIF9 FIFO", .cpu_name = "tegra210-adsp", - .codec_name = "tegra210-admaif", + .codec_name = "702d0000.admaif", .params = &default_link_params, }, [TEGRA210_DAI_LINK_ADSP_ADMAIF10] = { @@ -959,7 +959,7 @@ struct snd_soc_dai_link tegra210_xbar_dai_links[TEGRA210_XBAR_DAI_LINKS] = { .cpu_dai_name = "ADSP-ADMAIF10", .codec_dai_name = "ADMAIF10 FIFO", .cpu_name = "tegra210-adsp", - .codec_name = "tegra210-admaif", + .codec_name = "702d0000.admaif", .params = &default_link_params, }, [TEGRA210_DAI_LINK_ADSP_PCM1] = { @@ -1008,107 +1008,107 @@ EXPORT_SYMBOL_GPL(tegra210_xbar_dai_links); struct snd_soc_codec_conf tegra210_xbar_codec_conf[TEGRA210_XBAR_CODEC_CONF] = { [TEGRA210_CODEC_AMX1_CONF] = { - .dev_name = "tegra210-amx.0", + .dev_name = "702d3000.amx", .name_prefix = "AMX1", }, [TEGRA210_CODEC_AMX2_CONF] = { - .dev_name = "tegra210-amx.1", + .dev_name = "702d3100.amx", .name_prefix = "AMX2", }, [TEGRA210_CODEC_ADX1_CONF] = { - .dev_name = "tegra210-adx.0", + .dev_name = "702d3800.adx", .name_prefix = "ADX1", }, [TEGRA210_CODEC_ADX2_CONF] = { - .dev_name = "tegra210-adx.1", + .dev_name = "702d3900.adx", .name_prefix = "ADX2", }, [TEGRA210_CODEC_SFC1_CONF] = { - .dev_name = "tegra210-sfc.0", + .dev_name = "702d2000.sfc", .name_prefix = "SFC1", }, [TEGRA210_CODEC_SFC2_CONF] = { - .dev_name = "tegra210-sfc.1", + .dev_name = "702d2200.sfc", .name_prefix = "SFC2", }, [TEGRA210_CODEC_SFC3_CONF] = { - .dev_name = "tegra210-sfc.2", + .dev_name = "702d2400.sfc", .name_prefix = "SFC3", }, [TEGRA210_CODEC_SFC4_CONF] = { - .dev_name = "tegra210-sfc.3", + .dev_name = "702d2600.sfc", .name_prefix = "SFC4", }, [TEGRA210_CODEC_MVC1_CONF] = { - .dev_name = "tegra210-mvc.0", + .dev_name = "702da000.mvc", .name_prefix = "MVC1", }, [TEGRA210_CODEC_MVC2_CONF] = { - .dev_name = "tegra210-mvc.1", + .dev_name = "702da200.mvc", .name_prefix = "MVC2", }, [TEGRA210_CODEC_OPE1_CONF] = { - .dev_name = "tegra210-ope.0", + .dev_name = "702d8000.ope", .name_prefix = "OPE1", }, [TEGRA210_CODEC_OPE2_CONF] = { - .dev_name = "tegra210-ope.1", + .dev_name = "702d8400.ope", .name_prefix = "OPE2", }, [TEGRA210_CODEC_AFC1_CONF] = { - .dev_name = "tegra210-afc.0", + .dev_name = "702d7000.afc", .name_prefix = "AFC1", }, [TEGRA210_CODEC_AFC2_CONF] = { - .dev_name = "tegra210-afc.1", + .dev_name = "702d7100.afc", .name_prefix = "AFC2", }, [TEGRA210_CODEC_AFC3_CONF] = { - .dev_name = "tegra210-afc.2", + .dev_name = "702d7200.afc", .name_prefix = "AFC3", }, [TEGRA210_CODEC_AFC4_CONF] = { - .dev_name = "tegra210-afc.3", + .dev_name = "702d7300.afc", .name_prefix = "AFC4", }, [TEGRA210_CODEC_AFC5_CONF] = { - .dev_name = "tegra210-afc.4", + .dev_name = "702d7400.afc", .name_prefix = "AFC5", }, [TEGRA210_CODEC_AFC6_CONF] = { - .dev_name = "tegra210-afc.5", + .dev_name = "702d7500.afc", .name_prefix = "AFC6", }, [TEGRA210_CODEC_I2S1_CONF] = { - .dev_name = "tegra210-i2s.0", + .dev_name = "702d1000.i2s", .name_prefix = "I2S1", }, [TEGRA210_CODEC_I2S2_CONF] = { - .dev_name = "tegra210-i2s.1", + .dev_name = "702d1100.i2s", .name_prefix = "I2S2", }, [TEGRA210_CODEC_I2S3_CONF] = { - .dev_name = "tegra210-i2s.2", + .dev_name = "702d1200.i2s", .name_prefix = "I2S3", }, [TEGRA210_CODEC_I2S4_CONF] = { - .dev_name = "tegra210-i2s.3", + .dev_name = "702d1300.i2s", .name_prefix = "I2S4", }, [TEGRA210_CODEC_I2S5_CONF] = { - .dev_name = "tegra210-i2s.4", + .dev_name = "702d1400.i2s", .name_prefix = "I2S5", }, [TEGRA210_CODEC_DMIC1_CONF] = { - .dev_name = "tegra210-dmic.0", + .dev_name = "702d4000.dmic", .name_prefix = "DMIC1", }, [TEGRA210_CODEC_DMIC2_CONF] = { - .dev_name = "tegra210-dmic.1", + .dev_name = "702d4100.dmic", .name_prefix = "DMIC2", }, [TEGRA210_CODEC_DMIC3_CONF] = { - .dev_name = "tegra210-dmic.2", + .dev_name = "702d4200.dmic", .name_prefix = "DMIC3", }, }; @@ -1120,9 +1120,9 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF1 CIF", .cpu_dai_name = "ADMAIF1", .codec_dai_name = "ADMAIF1", - .cpu_name = "tegra186-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra186-admaif", + .cpu_name = "290f000.admaif", + .codec_name = "2900800.ahub", + .platform_name = "290f000.admaif", .ignore_pmdown_time = 1, }, [TEGRA186_DAI_LINK_ADMAIF2] = { @@ -1130,9 +1130,9 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF2 CIF", .cpu_dai_name = "ADMAIF2", .codec_dai_name = "ADMAIF2", - .cpu_name = "tegra186-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra186-admaif", + .cpu_name = "290f000.admaif", + .codec_name = "2900800.ahub", + .platform_name = "290f000.admaif", .ignore_pmdown_time = 1, }, [TEGRA186_DAI_LINK_ADMAIF3] = { @@ -1140,9 +1140,9 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF3 CIF", .cpu_dai_name = "ADMAIF3", .codec_dai_name = "ADMAIF3", - .cpu_name = "tegra186-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra186-admaif", + .cpu_name = "290f000.admaif", + .codec_name = "2900800.ahub", + .platform_name = "290f000.admaif", .ignore_pmdown_time = 1, }, [TEGRA186_DAI_LINK_ADMAIF4] = { @@ -1150,9 +1150,9 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF4 CIF", .cpu_dai_name = "ADMAIF4", .codec_dai_name = "ADMAIF4", - .cpu_name = "tegra186-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra186-admaif", + .cpu_name = "290f000.admaif", + .codec_name = "2900800.ahub", + .platform_name = "290f000.admaif", .ignore_pmdown_time = 1, }, [TEGRA186_DAI_LINK_ADMAIF5] = { @@ -1160,9 +1160,9 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF5 CIF", .cpu_dai_name = "ADMAIF5", .codec_dai_name = "ADMAIF5", - .cpu_name = "tegra186-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra186-admaif", + .cpu_name = "290f000.admaif", + .codec_name = "2900800.ahub", + .platform_name = "290f000.admaif", .ignore_pmdown_time = 1, }, [TEGRA186_DAI_LINK_ADMAIF6] = { @@ -1170,9 +1170,9 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF6 CIF", .cpu_dai_name = "ADMAIF6", .codec_dai_name = "ADMAIF6", - .cpu_name = "tegra186-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra186-admaif", + .cpu_name = "290f000.admaif", + .codec_name = "2900800.ahub", + .platform_name = "290f000.admaif", .ignore_pmdown_time = 1, }, [TEGRA186_DAI_LINK_ADMAIF7] = { @@ -1180,9 +1180,9 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF7 CIF", .cpu_dai_name = "ADMAIF7", .codec_dai_name = "ADMAIF7", - .cpu_name = "tegra186-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra186-admaif", + .cpu_name = "290f000.admaif", + .codec_name = "2900800.ahub", + .platform_name = "290f000.admaif", .ignore_pmdown_time = 1, }, [TEGRA186_DAI_LINK_ADMAIF8] = { @@ -1190,9 +1190,9 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF8 CIF", .cpu_dai_name = "ADMAIF8", .codec_dai_name = "ADMAIF8", - .cpu_name = "tegra186-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra186-admaif", + .cpu_name = "290f000.admaif", + .codec_name = "2900800.ahub", + .platform_name = "290f000.admaif", .ignore_pmdown_time = 1, }, [TEGRA186_DAI_LINK_ADMAIF9] = { @@ -1200,9 +1200,9 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF9 CIF", .cpu_dai_name = "ADMAIF9", .codec_dai_name = "ADMAIF9", - .cpu_name = "tegra186-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra186-admaif", + .cpu_name = "290f000.admaif", + .codec_name = "2900800.ahub", + .platform_name = "290f000.admaif", .ignore_pmdown_time = 1, }, [TEGRA186_DAI_LINK_ADMAIF10] = { @@ -1210,9 +1210,9 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF10 CIF", .cpu_dai_name = "ADMAIF10", .codec_dai_name = "ADMAIF10", - .cpu_name = "tegra186-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra186-admaif", + .cpu_name = "290f000.admaif", + .codec_name = "2900800.ahub", + .platform_name = "290f000.admaif", .ignore_pmdown_time = 1, }, [TEGRA186_DAI_LINK_ADMAIF11] = { @@ -1220,9 +1220,9 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF11 CIF", .cpu_dai_name = "ADMAIF11", .codec_dai_name = "ADMAIF11", - .cpu_name = "tegra186-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra186-admaif", + .cpu_name = "290f000.admaif", + .codec_name = "2900800.ahub", + .platform_name = "290f000.admaif", .ignore_pmdown_time = 1, }, [TEGRA186_DAI_LINK_ADMAIF12] = { @@ -1230,9 +1230,9 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF12 CIF", .cpu_dai_name = "ADMAIF12", .codec_dai_name = "ADMAIF12", - .cpu_name = "tegra186-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra186-admaif", + .cpu_name = "290f000.admaif", + .codec_name = "2900800.ahub", + .platform_name = "290f000.admaif", .ignore_pmdown_time = 1, }, [TEGRA186_DAI_LINK_ADMAIF13] = { @@ -1240,9 +1240,9 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF13 CIF", .cpu_dai_name = "ADMAIF13", .codec_dai_name = "ADMAIF13", - .cpu_name = "tegra186-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra186-admaif", + .cpu_name = "290f000.admaif", + .codec_name = "2900800.ahub", + .platform_name = "290f000.admaif", .ignore_pmdown_time = 1, }, [TEGRA186_DAI_LINK_ADMAIF14] = { @@ -1250,9 +1250,9 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF14 CIF", .cpu_dai_name = "ADMAIF14", .codec_dai_name = "ADMAIF14", - .cpu_name = "tegra186-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra186-admaif", + .cpu_name = "290f000.admaif", + .codec_name = "2900800.ahub", + .platform_name = "290f000.admaif", .ignore_pmdown_time = 1, }, [TEGRA186_DAI_LINK_ADMAIF15] = { @@ -1260,9 +1260,9 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF15 CIF", .cpu_dai_name = "ADMAIF15", .codec_dai_name = "ADMAIF15", - .cpu_name = "tegra186-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra186-admaif", + .cpu_name = "290f000.admaif", + .codec_name = "2900800.ahub", + .platform_name = "290f000.admaif", .ignore_pmdown_time = 1, }, [TEGRA186_DAI_LINK_ADMAIF16] = { @@ -1270,9 +1270,9 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF16 CIF", .cpu_dai_name = "ADMAIF16", .codec_dai_name = "ADMAIF16", - .cpu_name = "tegra186-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra186-admaif", + .cpu_name = "290f000.admaif", + .codec_name = "2900800.ahub", + .platform_name = "290f000.admaif", .ignore_pmdown_time = 1, }, [TEGRA186_DAI_LINK_ADMAIF17] = { @@ -1280,9 +1280,9 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF17 CIF", .cpu_dai_name = "ADMAIF17", .codec_dai_name = "ADMAIF17", - .cpu_name = "tegra186-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra186-admaif", + .cpu_name = "290f000.admaif", + .codec_name = "2900800.ahub", + .platform_name = "290f000.admaif", .ignore_pmdown_time = 1, }, [TEGRA186_DAI_LINK_ADMAIF18] = { @@ -1290,9 +1290,9 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF18 CIF", .cpu_dai_name = "ADMAIF18", .codec_dai_name = "ADMAIF18", - .cpu_name = "tegra186-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra186-admaif", + .cpu_name = "290f000.admaif", + .codec_name = "2900800.ahub", + .platform_name = "290f000.admaif", .ignore_pmdown_time = 1, }, [TEGRA186_DAI_LINK_ADMAIF19] = { @@ -1300,9 +1300,9 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF19 CIF", .cpu_dai_name = "ADMAIF19", .codec_dai_name = "ADMAIF19", - .cpu_name = "tegra186-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra186-admaif", + .cpu_name = "290f000.admaif", + .codec_name = "2900800.ahub", + .platform_name = "290f000.admaif", .ignore_pmdown_time = 1, }, [TEGRA186_DAI_LINK_ADMAIF20] = { @@ -1310,9 +1310,9 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF20 CIF", .cpu_dai_name = "ADMAIF20", .codec_dai_name = "ADMAIF20", - .cpu_name = "tegra186-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra186-admaif", + .cpu_name = "290f000.admaif", + .codec_name = "2900800.ahub", + .platform_name = "290f000.admaif", .ignore_pmdown_time = 1, }, [TEGRA186_DAI_LINK_ADMAIF1_CODEC] = { @@ -1320,9 +1320,9 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF1 CODEC", .cpu_dai_name = "ADMAIF1 CIF", .codec_dai_name = "ADMAIF1", - .cpu_name = "tegra186-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra186-admaif", + .cpu_name = "290f000.admaif", + .codec_name = "2900800.ahub", + .platform_name = "290f000.admaif", .ignore_pmdown_time = 1, .ignore_suspend = 1, .params = &default_link_params, @@ -1332,9 +1332,9 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF2 CODEC", .cpu_dai_name = "ADMAIF2 CIF", .codec_dai_name = "ADMAIF2", - .cpu_name = "tegra186-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra186-admaif", + .cpu_name = "290f000.admaif", + .codec_name = "2900800.ahub", + .platform_name = "290f000.admaif", .ignore_pmdown_time = 1, .ignore_suspend = 1, .params = &default_link_params, @@ -1344,9 +1344,9 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF3 CODEC", .cpu_dai_name = "ADMAIF3 CIF", .codec_dai_name = "ADMAIF3", - .cpu_name = "tegra186-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra186-admaif", + .cpu_name = "290f000.admaif", + .codec_name = "2900800.ahub", + .platform_name = "290f000.admaif", .ignore_pmdown_time = 1, .ignore_suspend = 1, .params = &default_link_params, @@ -1356,9 +1356,9 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF4 CODEC", .cpu_dai_name = "ADMAIF4 CIF", .codec_dai_name = "ADMAIF4", - .cpu_name = "tegra186-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra186-admaif", + .cpu_name = "290f000.admaif", + .codec_name = "2900800.ahub", + .platform_name = "290f000.admaif", .ignore_pmdown_time = 1, .ignore_suspend = 1, .params = &default_link_params, @@ -1368,9 +1368,9 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF5 CODEC", .cpu_dai_name = "ADMAIF5 CIF", .codec_dai_name = "ADMAIF5", - .cpu_name = "tegra186-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra186-admaif", + .cpu_name = "290f000.admaif", + .codec_name = "2900800.ahub", + .platform_name = "290f000.admaif", .ignore_pmdown_time = 1, .ignore_suspend = 1, .params = &default_link_params, @@ -1380,9 +1380,9 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF6 CODEC", .cpu_dai_name = "ADMAIF6 CIF", .codec_dai_name = "ADMAIF6", - .cpu_name = "tegra186-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra186-admaif", + .cpu_name = "290f000.admaif", + .codec_name = "2900800.ahub", + .platform_name = "290f000.admaif", .ignore_pmdown_time = 1, .ignore_suspend = 1, .params = &default_link_params, @@ -1392,9 +1392,9 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF7 CODEC", .cpu_dai_name = "ADMAIF7 CIF", .codec_dai_name = "ADMAIF7", - .cpu_name = "tegra186-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra186-admaif", + .cpu_name = "290f000.admaif", + .codec_name = "2900800.ahub", + .platform_name = "290f000.admaif", .ignore_pmdown_time = 1, .ignore_suspend = 1, .params = &default_link_params, @@ -1404,9 +1404,9 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF8 CODEC", .cpu_dai_name = "ADMAIF8 CIF", .codec_dai_name = "ADMAIF8", - .cpu_name = "tegra186-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra186-admaif", + .cpu_name = "290f000.admaif", + .codec_name = "2900800.ahub", + .platform_name = "290f000.admaif", .ignore_pmdown_time = 1, .ignore_suspend = 1, .params = &default_link_params, @@ -1416,9 +1416,9 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF9 CODEC", .cpu_dai_name = "ADMAIF9 CIF", .codec_dai_name = "ADMAIF9", - .cpu_name = "tegra186-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra186-admaif", + .cpu_name = "290f000.admaif", + .codec_name = "2900800.ahub", + .platform_name = "290f000.admaif", .ignore_pmdown_time = 1, .ignore_suspend = 1, .params = &default_link_params, @@ -1428,9 +1428,9 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF10 CODEC", .cpu_dai_name = "ADMAIF10 CIF", .codec_dai_name = "ADMAIF10", - .cpu_name = "tegra186-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra186-admaif", + .cpu_name = "290f000.admaif", + .codec_name = "2900800.ahub", + .platform_name = "290f000.admaif", .ignore_pmdown_time = 1, .ignore_suspend = 1, .params = &default_link_params, @@ -1440,9 +1440,9 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF11 CODEC", .cpu_dai_name = "ADMAIF11 CIF", .codec_dai_name = "ADMAIF11", - .cpu_name = "tegra186-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra186-admaif", + .cpu_name = "290f000.admaif", + .codec_name = "2900800.ahub", + .platform_name = "290f000.admaif", .ignore_pmdown_time = 1, .ignore_suspend = 1, .params = &default_link_params, @@ -1452,9 +1452,9 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF12 CODEC", .cpu_dai_name = "ADMAIF12 CIF", .codec_dai_name = "ADMAIF12", - .cpu_name = "tegra186-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra186-admaif", + .cpu_name = "290f000.admaif", + .codec_name = "2900800.ahub", + .platform_name = "290f000.admaif", .ignore_pmdown_time = 1, .ignore_suspend = 1, .params = &default_link_params, @@ -1464,9 +1464,9 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF13 CODEC", .cpu_dai_name = "ADMAIF13 CIF", .codec_dai_name = "ADMAIF13", - .cpu_name = "tegra186-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra186-admaif", + .cpu_name = "290f000.admaif", + .codec_name = "2900800.ahub", + .platform_name = "290f000.admaif", .ignore_pmdown_time = 1, .ignore_suspend = 1, .params = &default_link_params, @@ -1476,9 +1476,9 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF14 CODEC", .cpu_dai_name = "ADMAIF14 CIF", .codec_dai_name = "ADMAIF14", - .cpu_name = "tegra186-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra186-admaif", + .cpu_name = "290f000.admaif", + .codec_name = "2900800.ahub", + .platform_name = "290f000.admaif", .ignore_pmdown_time = 1, .ignore_suspend = 1, .params = &default_link_params, @@ -1488,9 +1488,9 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF15 CODEC", .cpu_dai_name = "ADMAIF15 CIF", .codec_dai_name = "ADMAIF15", - .cpu_name = "tegra186-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra186-admaif", + .cpu_name = "290f000.admaif", + .codec_name = "2900800.ahub", + .platform_name = "290f000.admaif", .ignore_pmdown_time = 1, .ignore_suspend = 1, .params = &default_link_params, @@ -1500,9 +1500,9 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF16 CODEC", .cpu_dai_name = "ADMAIF16 CIF", .codec_dai_name = "ADMAIF16", - .cpu_name = "tegra186-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra186-admaif", + .cpu_name = "290f000.admaif", + .codec_name = "2900800.ahub", + .platform_name = "290f000.admaif", .ignore_pmdown_time = 1, .ignore_suspend = 1, .params = &default_link_params, @@ -1512,9 +1512,9 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF17 CODEC", .cpu_dai_name = "ADMAIF17 CIF", .codec_dai_name = "ADMAIF17", - .cpu_name = "tegra186-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra186-admaif", + .cpu_name = "290f000.admaif", + .codec_name = "2900800.ahub", + .platform_name = "290f000.admaif", .ignore_pmdown_time = 1, .ignore_suspend = 1, .params = &default_link_params, @@ -1524,9 +1524,9 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF18 CODEC", .cpu_dai_name = "ADMAIF18 CIF", .codec_dai_name = "ADMAIF18", - .cpu_name = "tegra186-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra186-admaif", + .cpu_name = "290f000.admaif", + .codec_name = "2900800.ahub", + .platform_name = "290f000.admaif", .ignore_pmdown_time = 1, .ignore_suspend = 1, .params = &default_link_params, @@ -1536,9 +1536,9 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF19 CODEC", .cpu_dai_name = "ADMAIF19 CIF", .codec_dai_name = "ADMAIF19", - .cpu_name = "tegra186-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra186-admaif", + .cpu_name = "290f000.admaif", + .codec_name = "2900800.ahub", + .platform_name = "290f000.admaif", .ignore_pmdown_time = 1, .ignore_suspend = 1, .params = &default_link_params, @@ -1548,9 +1548,9 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADMAIF20 CODEC", .cpu_dai_name = "ADMAIF20 CIF", .codec_dai_name = "ADMAIF20", - .cpu_name = "tegra186-admaif", - .codec_name = "tegra210-axbar", - .platform_name = "tegra186-admaif", + .cpu_name = "290f000.admaif", + .codec_name = "2900800.ahub", + .platform_name = "290f000.admaif", .ignore_pmdown_time = 1, .ignore_suspend = 1, .params = &default_link_params, @@ -1560,8 +1560,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "AMX1 IN", .cpu_dai_name = "AMX1-1", .codec_dai_name = "IN1", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-amx.0", + .cpu_name = "2900800.ahub", + .codec_name = "2903000.amx", .params = &default_link_params, .ignore_suspend = 1, }, @@ -1570,8 +1570,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "AMX1 IN", .cpu_dai_name = "AMX1-2", .codec_dai_name = "IN2", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-amx.0", + .cpu_name = "2900800.ahub", + .codec_name = "2903000.amx", .params = &default_link_params, .ignore_suspend = 1, }, @@ -1580,8 +1580,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "AMX1 IN", .cpu_dai_name = "AMX1-3", .codec_dai_name = "IN3", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-amx.0", + .cpu_name = "2900800.ahub", + .codec_name = "2903000.amx", .params = &default_link_params, .ignore_suspend = 1, }, @@ -1590,8 +1590,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "AMX1 IN", .cpu_dai_name = "AMX1-4", .codec_dai_name = "IN4", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-amx.0", + .cpu_name = "2900800.ahub", + .codec_name = "2903000.amx", .params = &default_link_params, .ignore_suspend = 1, }, @@ -1600,8 +1600,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "AMX1 CIF", .cpu_dai_name = "OUT", .codec_dai_name = "AMX1", - .cpu_name = "tegra210-amx.0", - .codec_name = "tegra210-axbar", + .cpu_name = "2903000.amx", + .codec_name = "2900800.ahub", .params = &tdm_link_params, .ignore_suspend = 1, }, @@ -1610,8 +1610,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "AMX2 IN", .cpu_dai_name = "AMX2-1", .codec_dai_name = "IN1", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-amx.1", + .cpu_name = "2900800.ahub", + .codec_name = "2903100.amx", .params = &default_link_params, .ignore_suspend = 1, }, @@ -1620,8 +1620,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "AMX2 IN", .cpu_dai_name = "AMX2-2", .codec_dai_name = "IN2", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-amx.1", + .cpu_name = "2900800.ahub", + .codec_name = "2903100.amx", .params = &default_link_params, .ignore_suspend = 1, }, @@ -1630,8 +1630,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "AMX2 IN", .cpu_dai_name = "AMX2-3", .codec_dai_name = "IN3", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-amx.1", + .cpu_name = "2900800.ahub", + .codec_name = "2903100.amx", .params = &default_link_params, .ignore_suspend = 1, }, @@ -1640,8 +1640,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "AMX2 IN", .cpu_dai_name = "AMX2-4", .codec_dai_name = "IN4", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-amx.1", + .cpu_name = "2900800.ahub", + .codec_name = "2903100.amx", .params = &default_link_params, .ignore_suspend = 1, }, @@ -1650,8 +1650,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "AMX2 CIF", .cpu_dai_name = "OUT", .codec_dai_name = "AMX2", - .cpu_name = "tegra210-amx.1", - .codec_name = "tegra210-axbar", + .cpu_name = "2903100.amx", + .codec_name = "2900800.ahub", .params = &tdm_link_params, .ignore_suspend = 1, }, @@ -1660,8 +1660,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "AMX3 IN", .cpu_dai_name = "AMX3-1", .codec_dai_name = "IN1", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-amx.2", + .cpu_name = "2900800.ahub", + .codec_name = "2903200.amx", .params = &default_link_params, .ignore_suspend = 1, }, @@ -1670,8 +1670,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "AMX3 IN", .cpu_dai_name = "AMX3-2", .codec_dai_name = "IN2", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-amx.2", + .cpu_name = "2900800.ahub", + .codec_name = "2903200.amx", .params = &default_link_params, .ignore_suspend = 1, }, @@ -1680,8 +1680,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "AMX3 IN", .cpu_dai_name = "AMX3-3", .codec_dai_name = "IN3", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-amx.2", + .cpu_name = "2900800.ahub", + .codec_name = "2903200.amx", .params = &default_link_params, .ignore_suspend = 1, }, @@ -1690,8 +1690,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "AMX3 IN", .cpu_dai_name = "AMX3-4", .codec_dai_name = "IN4", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-amx.2", + .cpu_name = "2900800.ahub", + .codec_name = "2903200.amx", .params = &default_link_params, .ignore_suspend = 1, }, @@ -1700,8 +1700,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "AMX3 CIF", .cpu_dai_name = "OUT", .codec_dai_name = "AMX3", - .cpu_name = "tegra210-amx.2", - .codec_name = "tegra210-axbar", + .cpu_name = "2903200.amx", + .codec_name = "2900800.ahub", .params = &tdm_link_params, .ignore_suspend = 1, }, @@ -1710,8 +1710,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "AMX4 IN", .cpu_dai_name = "AMX4-1", .codec_dai_name = "IN1", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-amx.3", + .cpu_name = "2900800.ahub", + .codec_name = "2903300.amx", .params = &default_link_params, .ignore_suspend = 1, }, @@ -1720,8 +1720,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "AMX4 IN", .cpu_dai_name = "AMX4-2", .codec_dai_name = "IN2", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-amx.3", + .cpu_name = "2900800.ahub", + .codec_name = "2903300.amx", .params = &default_link_params, .ignore_suspend = 1, }, @@ -1730,8 +1730,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "AMX4 IN", .cpu_dai_name = "AMX4-3", .codec_dai_name = "IN3", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-amx.3", + .cpu_name = "2900800.ahub", + .codec_name = "2903300.amx", .params = &default_link_params, .ignore_suspend = 1, }, @@ -1740,8 +1740,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "AMX4 IN", .cpu_dai_name = "AMX4-4", .codec_dai_name = "IN4", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-amx.3", + .cpu_name = "2900800.ahub", + .codec_name = "2903300.amx", .params = &default_link_params, .ignore_suspend = 1, }, @@ -1750,8 +1750,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "AMX4 CIF", .cpu_dai_name = "OUT", .codec_dai_name = "AMX4", - .cpu_name = "tegra210-amx.3", - .codec_name = "tegra210-axbar", + .cpu_name = "2903300.amx", + .codec_name = "2900800.ahub", .params = &tdm_link_params, .ignore_suspend = 1, }, @@ -1760,8 +1760,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADX1 IN", .cpu_dai_name = "ADX1", .codec_dai_name = "IN", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-adx.0", + .cpu_name = "2900800.ahub", + .codec_name = "2903800.adx", .params = &tdm_link_params, .ignore_suspend = 1, }, @@ -1770,8 +1770,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADX1 OUT", .cpu_dai_name = "OUT1", .codec_dai_name = "ADX1-1", - .cpu_name = "tegra210-adx.0", - .codec_name = "tegra210-axbar", + .cpu_name = "2903800.adx", + .codec_name = "2900800.ahub", .params = &default_link_params, .ignore_suspend = 1, }, @@ -1780,8 +1780,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADX1 OUT", .cpu_dai_name = "OUT2", .codec_dai_name = "ADX1-2", - .cpu_name = "tegra210-adx.0", - .codec_name = "tegra210-axbar", + .cpu_name = "2903800.adx", + .codec_name = "2900800.ahub", .params = &default_link_params, .ignore_suspend = 1, }, @@ -1790,8 +1790,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADX1 OUT", .cpu_dai_name = "OUT3", .codec_dai_name = "ADX1-3", - .cpu_name = "tegra210-adx.0", - .codec_name = "tegra210-axbar", + .cpu_name = "2903800.adx", + .codec_name = "2900800.ahub", .params = &default_link_params, .ignore_suspend = 1, }, @@ -1800,8 +1800,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADX1 OUT", .cpu_dai_name = "OUT4", .codec_dai_name = "ADX1-4", - .cpu_name = "tegra210-adx.0", - .codec_name = "tegra210-axbar", + .cpu_name = "2903800.adx", + .codec_name = "2900800.ahub", .params = &default_link_params, .ignore_suspend = 1, }, @@ -1810,8 +1810,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADX2 IN", .cpu_dai_name = "ADX2", .codec_dai_name = "IN", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-adx.1", + .cpu_name = "2900800.ahub", + .codec_name = "2903900.adx", .params = &tdm_link_params, .ignore_suspend = 1, }, @@ -1820,8 +1820,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADX2 OUT", .cpu_dai_name = "OUT1", .codec_dai_name = "ADX2-1", - .cpu_name = "tegra210-adx.1", - .codec_name = "tegra210-axbar", + .cpu_name = "2903900.adx", + .codec_name = "2900800.ahub", .params = &default_link_params, .ignore_suspend = 1, }, @@ -1830,8 +1830,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADX2 OUT", .cpu_dai_name = "OUT2", .codec_dai_name = "ADX2-2", - .cpu_name = "tegra210-adx.1", - .codec_name = "tegra210-axbar", + .cpu_name = "2903900.adx", + .codec_name = "2900800.ahub", .params = &default_link_params, .ignore_suspend = 1, }, @@ -1840,8 +1840,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADX2 OUT", .cpu_dai_name = "OUT3", .codec_dai_name = "ADX2-3", - .cpu_name = "tegra210-adx.1", - .codec_name = "tegra210-axbar", + .cpu_name = "2903900.adx", + .codec_name = "2900800.ahub", .params = &default_link_params, .ignore_suspend = 1, }, @@ -1850,8 +1850,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADX2 OUT", .cpu_dai_name = "OUT4", .codec_dai_name = "ADX2-4", - .cpu_name = "tegra210-adx.1", - .codec_name = "tegra210-axbar", + .cpu_name = "2903900.adx", + .codec_name = "2900800.ahub", .params = &default_link_params, .ignore_suspend = 1, }, @@ -1860,8 +1860,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADX3 IN", .cpu_dai_name = "ADX3", .codec_dai_name = "IN", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-adx.2", + .cpu_name = "2900800.ahub", + .codec_name = "2903a00.adx", .params = &tdm_link_params, .ignore_suspend = 1, }, @@ -1870,8 +1870,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADX3 OUT", .cpu_dai_name = "OUT1", .codec_dai_name = "ADX3-1", - .cpu_name = "tegra210-adx.2", - .codec_name = "tegra210-axbar", + .cpu_name = "2903a00.adx", + .codec_name = "2900800.ahub", .params = &default_link_params, .ignore_suspend = 1, }, @@ -1880,8 +1880,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADX3 OUT", .cpu_dai_name = "OUT2", .codec_dai_name = "ADX3-2", - .cpu_name = "tegra210-adx.2", - .codec_name = "tegra210-axbar", + .cpu_name = "2903a00.adx", + .codec_name = "2900800.ahub", .params = &default_link_params, .ignore_suspend = 1, }, @@ -1890,8 +1890,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADX3 OUT", .cpu_dai_name = "OUT3", .codec_dai_name = "ADX3-3", - .cpu_name = "tegra210-adx.2", - .codec_name = "tegra210-axbar", + .cpu_name = "2903a00.adx", + .codec_name = "2900800.ahub", .params = &default_link_params, .ignore_suspend = 1, }, @@ -1900,8 +1900,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADX3 OUT", .cpu_dai_name = "OUT4", .codec_dai_name = "ADX3-4", - .cpu_name = "tegra210-adx.2", - .codec_name = "tegra210-axbar", + .cpu_name = "2903a00.adx", + .codec_name = "2900800.ahub", .params = &default_link_params, .ignore_suspend = 1, }, @@ -1910,8 +1910,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADX4 IN", .cpu_dai_name = "ADX4", .codec_dai_name = "IN", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-adx.3", + .cpu_name = "2900800.ahub", + .codec_name = "2903b00.adx", .params = &tdm_link_params, .ignore_suspend = 1, }, @@ -1920,8 +1920,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADX4 OUT", .cpu_dai_name = "OUT1", .codec_dai_name = "ADX4-1", - .cpu_name = "tegra210-adx.3", - .codec_name = "tegra210-axbar", + .cpu_name = "2903b00.adx", + .codec_name = "2900800.ahub", .params = &default_link_params, .ignore_suspend = 1, }, @@ -1930,8 +1930,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADX4 OUT", .cpu_dai_name = "OUT2", .codec_dai_name = "ADX4-2", - .cpu_name = "tegra210-adx.3", - .codec_name = "tegra210-axbar", + .cpu_name = "2903b00.adx", + .codec_name = "2900800.ahub", .params = &default_link_params, .ignore_suspend = 1, }, @@ -1940,8 +1940,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADX4 OUT", .cpu_dai_name = "OUT3", .codec_dai_name = "ADX4-3", - .cpu_name = "tegra210-adx.3", - .codec_name = "tegra210-axbar", + .cpu_name = "2903b00.adx", + .codec_name = "2900800.ahub", .params = &default_link_params, .ignore_suspend = 1, }, @@ -1950,8 +1950,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ADX4 OUT", .cpu_dai_name = "OUT4", .codec_dai_name = "ADX4-4", - .cpu_name = "tegra210-adx.3", - .codec_name = "tegra210-axbar", + .cpu_name = "2903b00.adx", + .codec_name = "2900800.ahub", .params = &default_link_params, .ignore_suspend = 1, }, @@ -1960,8 +1960,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "MIXER1 RX", .cpu_dai_name = "MIXER1-1", .codec_dai_name = "RX1", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-mixer", + .cpu_name = "2900800.ahub", + .codec_name = "290bb00.amixer", .params = &default_link_params, .ignore_suspend = 1, }, @@ -1970,8 +1970,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "MIXER1 RX", .cpu_dai_name = "MIXER1-2", .codec_dai_name = "RX2", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-mixer", + .cpu_name = "2900800.ahub", + .codec_name = "290bb00.amixer", .params = &default_link_params, .ignore_suspend = 1, }, @@ -1980,8 +1980,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "MIXER1 RX", .cpu_dai_name = "MIXER1-3", .codec_dai_name = "RX3", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-mixer", + .cpu_name = "2900800.ahub", + .codec_name = "290bb00.amixer", .params = &default_link_params, .ignore_suspend = 1, }, @@ -1990,8 +1990,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "MIXER1 RX", .cpu_dai_name = "MIXER1-4", .codec_dai_name = "RX4", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-mixer", + .cpu_name = "2900800.ahub", + .codec_name = "290bb00.amixer", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2000,8 +2000,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "MIXER1 RX", .cpu_dai_name = "MIXER1-5", .codec_dai_name = "RX5", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-mixer", + .cpu_name = "2900800.ahub", + .codec_name = "290bb00.amixer", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2010,8 +2010,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "MIXER1 RX", .cpu_dai_name = "MIXER1-6", .codec_dai_name = "RX6", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-mixer", + .cpu_name = "2900800.ahub", + .codec_name = "290bb00.amixer", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2020,8 +2020,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "MIXER1 RX", .cpu_dai_name = "MIXER1-7", .codec_dai_name = "RX7", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-mixer", + .cpu_name = "2900800.ahub", + .codec_name = "290bb00.amixer", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2030,8 +2030,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "MIXER1 RX", .cpu_dai_name = "MIXER1-8", .codec_dai_name = "RX8", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-mixer", + .cpu_name = "2900800.ahub", + .codec_name = "290bb00.amixer", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2040,8 +2040,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "MIXER1 RX", .cpu_dai_name = "MIXER1-9", .codec_dai_name = "RX9", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-mixer", + .cpu_name = "2900800.ahub", + .codec_name = "290bb00.amixer", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2050,8 +2050,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "MIXER1 RX", .cpu_dai_name = "MIXER1-10", .codec_dai_name = "RX10", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-mixer", + .cpu_name = "2900800.ahub", + .codec_name = "290bb00.amixer", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2060,8 +2060,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "MIXER1 TX", .cpu_dai_name = "TX1", .codec_dai_name = "MIXER1-1", - .cpu_name = "tegra210-mixer", - .codec_name = "tegra210-axbar", + .cpu_name = "290bb00.amixer", + .codec_name = "2900800.ahub", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2070,8 +2070,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "MIXER1 TX", .cpu_dai_name = "TX2", .codec_dai_name = "MIXER1-2", - .cpu_name = "tegra210-mixer", - .codec_name = "tegra210-axbar", + .cpu_name = "290bb00.amixer", + .codec_name = "2900800.ahub", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2080,8 +2080,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "MIXER1 TX", .cpu_dai_name = "TX3", .codec_dai_name = "MIXER1-3", - .cpu_name = "tegra210-mixer", - .codec_name = "tegra210-axbar", + .cpu_name = "290bb00.amixer", + .codec_name = "2900800.ahub", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2090,8 +2090,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "MIXER1 TX", .cpu_dai_name = "TX4", .codec_dai_name = "MIXER1-4", - .cpu_name = "tegra210-mixer", - .codec_name = "tegra210-axbar", + .cpu_name = "290bb00.amixer", + .codec_name = "2900800.ahub", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2100,8 +2100,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "MIXER1 TX", .cpu_dai_name = "TX5", .codec_dai_name = "MIXER1-5", - .cpu_name = "tegra210-mixer", - .codec_name = "tegra210-axbar", + .cpu_name = "290bb00.amixer", + .codec_name = "2900800.ahub", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2110,8 +2110,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "SFC1 RX", .cpu_dai_name = "SFC1", .codec_dai_name = "CIF", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-sfc.0", + .cpu_name = "2900800.ahub", + .codec_name = "2902000.sfc", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2120,8 +2120,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "SFC1 TX", .cpu_dai_name = "DAP", .codec_dai_name = "SFC1", - .cpu_name = "tegra210-sfc.0", - .codec_name = "tegra210-axbar", + .cpu_name = "2902000.sfc", + .codec_name = "2900800.ahub", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2130,8 +2130,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "SFC2 RX", .cpu_dai_name = "SFC2", .codec_dai_name = "CIF", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-sfc.1", + .cpu_name = "2900800.ahub", + .codec_name = "2902200.sfc", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2140,8 +2140,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "SFC2 TX", .cpu_dai_name = "DAP", .codec_dai_name = "SFC2", - .cpu_name = "tegra210-sfc.1", - .codec_name = "tegra210-axbar", + .cpu_name = "2902200.sfc", + .codec_name = "2900800.ahub", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2150,8 +2150,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "SFC3 RX", .cpu_dai_name = "SFC3", .codec_dai_name = "CIF", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-sfc.2", + .cpu_name = "2900800.ahub", + .codec_name = "2902400.sfc", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2160,8 +2160,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "SFC3 TX", .cpu_dai_name = "DAP", .codec_dai_name = "SFC3", - .cpu_name = "tegra210-sfc.2", - .codec_name = "tegra210-axbar", + .cpu_name = "2902400.sfc", + .codec_name = "2900800.ahub", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2170,8 +2170,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "SFC4 RX", .cpu_dai_name = "SFC4", .codec_dai_name = "CIF", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-sfc.3", + .cpu_name = "2900800.ahub", + .codec_name = "2902600.sfc", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2180,8 +2180,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "SFC4 TX", .cpu_dai_name = "DAP", .codec_dai_name = "SFC4", - .cpu_name = "tegra210-sfc.3", - .codec_name = "tegra210-axbar", + .cpu_name = "2902600.sfc", + .codec_name = "2900800.ahub", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2190,8 +2190,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "AFC1 RX", .cpu_dai_name = "AFC1", .codec_dai_name = "AFC IN", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra186-afc.0", + .cpu_name = "2900800.ahub", + .codec_name = "2907000.afc", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2200,8 +2200,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "AFC1 TX", .cpu_dai_name = "AFC OUT", .codec_dai_name = "AFC1", - .cpu_name = "tegra186-afc.0", - .codec_name = "tegra210-axbar", + .cpu_name = "2907000.afc", + .codec_name = "2900800.ahub", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2210,8 +2210,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "AFC2 RX", .cpu_dai_name = "AFC2", .codec_dai_name = "AFC IN", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra186-afc.1", + .cpu_name = "2900800.ahub", + .codec_name = "2907100.afc", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2220,8 +2220,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "AFC2 TX", .cpu_dai_name = "AFC OUT", .codec_dai_name = "AFC2", - .cpu_name = "tegra186-afc.1", - .codec_name = "tegra210-axbar", + .cpu_name = "2907100.afc", + .codec_name = "2900800.ahub", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2230,8 +2230,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "AFC3 RX", .cpu_dai_name = "AFC3", .codec_dai_name = "AFC IN", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra186-afc.2", + .cpu_name = "2900800.ahub", + .codec_name = "2907200.afc", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2240,8 +2240,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "AFC3 TX", .cpu_dai_name = "AFC OUT", .codec_dai_name = "AFC3", - .cpu_name = "tegra186-afc.2", - .codec_name = "tegra210-axbar", + .cpu_name = "2907200.afc", + .codec_name = "2900800.ahub", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2250,8 +2250,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "AFC4 RX", .cpu_dai_name = "AFC4", .codec_dai_name = "AFC IN", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra186-afc.3", + .cpu_name = "2900800.ahub", + .codec_name = "2907300.afc", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2260,8 +2260,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "AFC4 TX", .cpu_dai_name = "AFC OUT", .codec_dai_name = "AFC4", - .cpu_name = "tegra186-afc.3", - .codec_name = "tegra210-axbar", + .cpu_name = "2907300.afc", + .codec_name = "2900800.ahub", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2270,8 +2270,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "AFC5 RX", .cpu_dai_name = "AFC5", .codec_dai_name = "AFC IN", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra186-afc.4", + .cpu_name = "2900800.ahub", + .codec_name = "2907400.afc", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2280,8 +2280,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "AFC5 TX", .cpu_dai_name = "AFC OUT", .codec_dai_name = "AFC5", - .cpu_name = "tegra186-afc.4", - .codec_name = "tegra210-axbar", + .cpu_name = "2907400.afc", + .codec_name = "2900800.ahub", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2290,8 +2290,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "AFC6 RX", .cpu_dai_name = "AFC6", .codec_dai_name = "AFC IN", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra186-afc.5", + .cpu_name = "2900800.ahub", + .codec_name = "2907500.afc", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2300,8 +2300,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "AFC6 TX", .cpu_dai_name = "AFC OUT", .codec_dai_name = "AFC6", - .cpu_name = "tegra186-afc.5", - .codec_name = "tegra210-axbar", + .cpu_name = "2907500.afc", + .codec_name = "2900800.ahub", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2310,8 +2310,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "MVC1 RX", .cpu_dai_name = "MVC1", .codec_dai_name = "MVC IN", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-mvc.0", + .cpu_name = "2900800.ahub", + .codec_name = "290a000.mvc", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2320,8 +2320,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "MVC1 TX", .cpu_dai_name = "MVC OUT", .codec_dai_name = "MVC1", - .cpu_name = "tegra210-mvc.0", - .codec_name = "tegra210-axbar", + .cpu_name = "290a000.mvc", + .codec_name = "2900800.ahub", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2330,8 +2330,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "MVC2 RX", .cpu_dai_name = "MVC2", .codec_dai_name = "MVC IN", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-mvc.1", + .cpu_name = "2900800.ahub", + .codec_name = "290a200.mvc", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2340,8 +2340,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "MVC2 TX", .cpu_dai_name = "MVC OUT", .codec_dai_name = "MVC2", - .cpu_name = "tegra210-mvc.1", - .codec_name = "tegra210-axbar", + .cpu_name = "290a200.mvc", + .codec_name = "2900800.ahub", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2350,8 +2350,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "OPE1 RX", .cpu_dai_name = "OPE1", .codec_dai_name = "OPE IN", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra210-ope.0", + .cpu_name = "2900800.ahub", + .codec_name = "2908000.ope", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2360,8 +2360,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "OPE1 TX", .cpu_dai_name = "OPE OUT", .codec_dai_name = "OPE1", - .cpu_name = "tegra210-ope.0", - .codec_name = "tegra210-axbar", + .cpu_name = "2908000.ope", + .codec_name = "2900800.ahub", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2370,8 +2370,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ASRC1 RX", .cpu_dai_name = "ASRC1-1", .codec_dai_name = "RX1", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra186-asrc", + .cpu_name = "2900800.ahub", + .codec_name = "2910000.asrc", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2380,8 +2380,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ASRC1 RX", .cpu_dai_name = "ASRC1-2", .codec_dai_name = "RX2", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra186-asrc", + .cpu_name = "2900800.ahub", + .codec_name = "2910000.asrc", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2390,8 +2390,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ASRC1 RX", .cpu_dai_name = "ASRC1-3", .codec_dai_name = "RX3", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra186-asrc", + .cpu_name = "2900800.ahub", + .codec_name = "2910000.asrc", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2400,8 +2400,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ASRC1 RX", .cpu_dai_name = "ASRC1-4", .codec_dai_name = "RX4", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra186-asrc", + .cpu_name = "2900800.ahub", + .codec_name = "2910000.asrc", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2410,8 +2410,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ASRC1 RX", .cpu_dai_name = "ASRC1-5", .codec_dai_name = "RX5", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra186-asrc", + .cpu_name = "2900800.ahub", + .codec_name = "2910000.asrc", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2420,8 +2420,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ASRC1 RX", .cpu_dai_name = "ASRC1-6", .codec_dai_name = "RX6", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra186-asrc", + .cpu_name = "2900800.ahub", + .codec_name = "2910000.asrc", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2430,8 +2430,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ASRC1 RX", .cpu_dai_name = "ASRC1-7", .codec_dai_name = "RX7", - .cpu_name = "tegra210-axbar", - .codec_name = "tegra186-asrc", + .cpu_name = "2900800.ahub", + .codec_name = "2910000.asrc", .params = &arad_link_params, .ignore_suspend = 1, }, @@ -2440,8 +2440,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ASRC1 TX", .cpu_dai_name = "TX1", .codec_dai_name = "ASRC1-1", - .cpu_name = "tegra186-asrc", - .codec_name = "tegra210-axbar", + .cpu_name = "2910000.asrc", + .codec_name = "2900800.ahub", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2450,8 +2450,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ASRC1 TX", .cpu_dai_name = "TX2", .codec_dai_name = "ASRC1-2", - .cpu_name = "tegra186-asrc", - .codec_name = "tegra210-axbar", + .cpu_name = "2910000.asrc", + .codec_name = "2900800.ahub", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2460,8 +2460,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ASRC1 TX", .cpu_dai_name = "TX3", .codec_dai_name = "ASRC1-3", - .cpu_name = "tegra186-asrc", - .codec_name = "tegra210-axbar", + .cpu_name = "2910000.asrc", + .codec_name = "2900800.ahub", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2470,8 +2470,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ASRC1 TX", .cpu_dai_name = "TX4", .codec_dai_name = "ASRC1-4", - .cpu_name = "tegra186-asrc", - .codec_name = "tegra210-axbar", + .cpu_name = "2910000.asrc", + .codec_name = "2900800.ahub", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2480,8 +2480,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ASRC1 TX", .cpu_dai_name = "TX5", .codec_dai_name = "ASRC1-5", - .cpu_name = "tegra186-asrc", - .codec_name = "tegra210-axbar", + .cpu_name = "2910000.asrc", + .codec_name = "2900800.ahub", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2490,8 +2490,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ASRC1 TX", .cpu_dai_name = "TX6", .codec_dai_name = "ASRC1-6", - .cpu_name = "tegra186-asrc", - .codec_name = "tegra210-axbar", + .cpu_name = "2910000.asrc", + .codec_name = "2900800.ahub", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2502,7 +2502,7 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .cpu_dai_name = "ADSP-ADMAIF1", .codec_dai_name = "ADMAIF1 FIFO", .cpu_name = "tegra210-adsp", - .codec_name = "tegra186-admaif", + .codec_name = "290f000.admaif", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2512,7 +2512,7 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .cpu_dai_name = "ADSP-ADMAIF2", .codec_dai_name = "ADMAIF2 FIFO", .cpu_name = "tegra210-adsp", - .codec_name = "tegra186-admaif", + .codec_name = "290f000.admaif", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2522,7 +2522,7 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .cpu_dai_name = "ADSP-ADMAIF3", .codec_dai_name = "ADMAIF3 FIFO", .cpu_name = "tegra210-adsp", - .codec_name = "tegra186-admaif", + .codec_name = "290f000.admaif", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2532,7 +2532,7 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .cpu_dai_name = "ADSP-ADMAIF4", .codec_dai_name = "ADMAIF4 FIFO", .cpu_name = "tegra210-adsp", - .codec_name = "tegra186-admaif", + .codec_name = "290f000.admaif", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2542,7 +2542,7 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .cpu_dai_name = "ADSP-ADMAIF5", .codec_dai_name = "ADMAIF5 FIFO", .cpu_name = "tegra210-adsp", - .codec_name = "tegra186-admaif", + .codec_name = "290f000.admaif", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2552,7 +2552,7 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .cpu_dai_name = "ADSP-ADMAIF6", .codec_dai_name = "ADMAIF6 FIFO", .cpu_name = "tegra210-adsp", - .codec_name = "tegra186-admaif", + .codec_name = "290f000.admaif", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2562,7 +2562,7 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .cpu_dai_name = "ADSP-ADMAIF7", .codec_dai_name = "ADMAIF7 FIFO", .cpu_name = "tegra210-adsp", - .codec_name = "tegra186-admaif", + .codec_name = "290f000.admaif", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2572,7 +2572,7 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .cpu_dai_name = "ADSP-ADMAIF8", .codec_dai_name = "ADMAIF8 FIFO", .cpu_name = "tegra210-adsp", - .codec_name = "tegra186-admaif", + .codec_name = "290f000.admaif", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2582,7 +2582,7 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .cpu_dai_name = "ADSP-ADMAIF9", .codec_dai_name = "ADMAIF9 FIFO", .cpu_name = "tegra210-adsp", - .codec_name = "tegra186-admaif", + .codec_name = "290f000.admaif", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2592,7 +2592,7 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .cpu_dai_name = "ADSP-ADMAIF10", .codec_dai_name = "ADMAIF10 FIFO", .cpu_name = "tegra210-adsp", - .codec_name = "tegra186-admaif", + .codec_name = "290f000.admaif", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2602,7 +2602,7 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .cpu_dai_name = "ADSP-ADMAIF11", .codec_dai_name = "ADMAIF11 FIFO", .cpu_name = "tegra210-adsp", - .codec_name = "tegra186-admaif", + .codec_name = "290f000.admaif", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2612,7 +2612,7 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .cpu_dai_name = "ADSP-ADMAIF12", .codec_dai_name = "ADMAIF12 FIFO", .cpu_name = "tegra210-adsp", - .codec_name = "tegra186-admaif", + .codec_name = "290f000.admaif", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2622,7 +2622,7 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .cpu_dai_name = "ADSP-ADMAIF13", .codec_dai_name = "ADMAIF13 FIFO", .cpu_name = "tegra210-adsp", - .codec_name = "tegra186-admaif", + .codec_name = "290f000.admaif", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2632,7 +2632,7 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .cpu_dai_name = "ADSP-ADMAIF14", .codec_dai_name = "ADMAIF14 FIFO", .cpu_name = "tegra210-adsp", - .codec_name = "tegra186-admaif", + .codec_name = "290f000.admaif", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2642,7 +2642,7 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .cpu_dai_name = "ADSP-ADMAIF15", .codec_dai_name = "ADMAIF15 FIFO", .cpu_name = "tegra210-adsp", - .codec_name = "tegra186-admaif", + .codec_name = "290f000.admaif", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2652,7 +2652,7 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .cpu_dai_name = "ADSP-ADMAIF16", .codec_dai_name = "ADMAIF16 FIFO", .cpu_name = "tegra210-adsp", - .codec_name = "tegra186-admaif", + .codec_name = "290f000.admaif", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2662,7 +2662,7 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .cpu_dai_name = "ADSP-ADMAIF17", .codec_dai_name = "ADMAIF17 FIFO", .cpu_name = "tegra210-adsp", - .codec_name = "tegra186-admaif", + .codec_name = "290f000.admaif", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2672,7 +2672,7 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .cpu_dai_name = "ADSP-ADMAIF18", .codec_dai_name = "ADMAIF18 FIFO", .cpu_name = "tegra210-adsp", - .codec_name = "tegra186-admaif", + .codec_name = "290f000.admaif", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2682,7 +2682,7 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .cpu_dai_name = "ADSP-ADMAIF19", .codec_dai_name = "ADMAIF19 FIFO", .cpu_name = "tegra210-adsp", - .codec_name = "tegra186-admaif", + .codec_name = "290f000.admaif", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2692,7 +2692,7 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .cpu_dai_name = "ADSP-ADMAIF20", .codec_dai_name = "ADMAIF20 FIFO", .cpu_name = "tegra210-adsp", - .codec_name = "tegra186-admaif", + .codec_name = "290f000.admaif", .params = &default_link_params, .ignore_suspend = 1, }, @@ -2746,8 +2746,8 @@ struct snd_soc_dai_link tegra186_xbar_dai_links[TEGRA186_XBAR_DAI_LINKS] = { .stream_name = "ARAD ratio info", .cpu_dai_name = "ARAD OUT", .codec_dai_name = "ARAD1", - .cpu_name = "tegra186-arad", - .codec_name = "tegra210-axbar", + .cpu_name = "290e400.arad", + .codec_name = "2900800.ahub", .params = &arad_link_params, .ignore_pmdown_time = 1, .ignore_suspend = 1, @@ -2757,139 +2757,139 @@ EXPORT_SYMBOL_GPL(tegra186_xbar_dai_links); struct snd_soc_codec_conf tegra186_xbar_codec_conf[TEGRA186_XBAR_CODEC_CONF] = { [TEGRA186_CODEC_AMX1_CONF] = { - .dev_name = "tegra210-amx.0", + .dev_name = "2903000.amx", .name_prefix = "AMX1", }, [TEGRA186_CODEC_AMX2_CONF] = { - .dev_name = "tegra210-amx.1", + .dev_name = "2903100.amx", .name_prefix = "AMX2", }, [TEGRA186_CODEC_AMX3_CONF] = { - .dev_name = "tegra210-amx.2", + .dev_name = "2903200.amx", .name_prefix = "AMX3", }, [TEGRA186_CODEC_AMX4_CONF] = { - .dev_name = "tegra210-amx.3", + .dev_name = "2903300.amx", .name_prefix = "AMX4", }, [TEGRA186_CODEC_ADX1_CONF] = { - .dev_name = "tegra210-adx.0", + .dev_name = "2903800.adx", .name_prefix = "ADX1", }, [TEGRA186_CODEC_ADX2_CONF] = { - .dev_name = "tegra210-adx.1", + .dev_name = "2903900.adx", .name_prefix = "ADX2", }, [TEGRA186_CODEC_ADX3_CONF] = { - .dev_name = "tegra210-adx.2", + .dev_name = "2903a00.adx", .name_prefix = "ADX3", }, [TEGRA186_CODEC_ADX4_CONF] = { - .dev_name = "tegra210-adx.3", + .dev_name = "2903b00.adx", .name_prefix = "ADX4", }, [TEGRA186_CODEC_SFC1_CONF] = { - .dev_name = "tegra210-sfc.0", + .dev_name = "2902000.sfc", .name_prefix = "SFC1", }, [TEGRA186_CODEC_SFC2_CONF] = { - .dev_name = "tegra210-sfc.1", + .dev_name = "2902200.sfc", .name_prefix = "SFC2", }, [TEGRA186_CODEC_SFC3_CONF] = { - .dev_name = "tegra210-sfc.2", + .dev_name = "2902400.sfc", .name_prefix = "SFC3", }, [TEGRA186_CODEC_SFC4_CONF] = { - .dev_name = "tegra210-sfc.3", + .dev_name = "2902600.sfc", .name_prefix = "SFC4", }, [TEGRA186_CODEC_MVC1_CONF] = { - .dev_name = "tegra210-mvc.0", + .dev_name = "290a000.mvc", .name_prefix = "MVC1", }, [TEGRA186_CODEC_MVC2_CONF] = { - .dev_name = "tegra210-mvc.1", + .dev_name = "290a200.mvc", .name_prefix = "MVC2", }, [TEGRA186_CODEC_OPE1_CONF] = { - .dev_name = "tegra210-ope.0", + .dev_name = "2908000.ope", .name_prefix = "OPE1", }, [TEGRA186_CODEC_AFC1_CONF] = { - .dev_name = "tegra186-afc.0", + .dev_name = "2907000.afc", .name_prefix = "AFC1", }, [TEGRA186_CODEC_AFC2_CONF] = { - .dev_name = "tegra186-afc.1", + .dev_name = "2907100.afc", .name_prefix = "AFC2", }, [TEGRA186_CODEC_AFC3_CONF] = { - .dev_name = "tegra186-afc.2", + .dev_name = "2907200.afc", .name_prefix = "AFC3", }, [TEGRA186_CODEC_AFC4_CONF] = { - .dev_name = "tegra186-afc.3", + .dev_name = "2907300.afc", .name_prefix = "AFC4", }, [TEGRA186_CODEC_AFC5_CONF] = { - .dev_name = "tegra186-afc.4", + .dev_name = "2907400.afc", .name_prefix = "AFC5", }, [TEGRA186_CODEC_AFC6_CONF] = { - .dev_name = "tegra186-afc.5", + .dev_name = "2907500.afc", .name_prefix = "AFC6", }, [TEGRA186_CODEC_I2S1_CONF] = { - .dev_name = "tegra210-i2s.0", + .dev_name = "2901000.i2s", .name_prefix = "I2S1", }, [TEGRA186_CODEC_I2S2_CONF] = { - .dev_name = "tegra210-i2s.1", + .dev_name = "2901100.i2s", .name_prefix = "I2S2", }, [TEGRA186_CODEC_I2S3_CONF] = { - .dev_name = "tegra210-i2s.2", + .dev_name = "2901200.i2s", .name_prefix = "I2S3", }, [TEGRA186_CODEC_I2S4_CONF] = { - .dev_name = "tegra210-i2s.3", + .dev_name = "2901300.i2s", .name_prefix = "I2S4", }, [TEGRA186_CODEC_I2S5_CONF] = { - .dev_name = "tegra210-i2s.4", + .dev_name = "2901400.i2s", .name_prefix = "I2S5", }, [TEGRA186_CODEC_I2S6_CONF] = { - .dev_name = "tegra210-i2s.5", + .dev_name = "2901500.i2s", .name_prefix = "I2S6", }, [TEGRA186_CODEC_DMIC1_CONF] = { - .dev_name = "tegra210-dmic.0", + .dev_name = "2904000.dmic", .name_prefix = "DMIC1", }, [TEGRA186_CODEC_DMIC2_CONF] = { - .dev_name = "tegra210-dmic.1", + .dev_name = "2904100.dmic", .name_prefix = "DMIC2", }, [TEGRA186_CODEC_DMIC3_CONF] = { - .dev_name = "tegra210-dmic.2", + .dev_name = "2904200.dmic", .name_prefix = "DMIC3", }, [TEGRA186_CODEC_DMIC4_CONF] = { - .dev_name = "tegra210-dmic.3", + .dev_name = "2904300.dmic", .name_prefix = "DMIC4", }, [TEGRA186_CODEC_DSPK1_CONF] = { - .dev_name = "tegra186-dspk.0", + .dev_name = "2905000.dspk", .name_prefix = "DSPK1", }, [TEGRA186_CODEC_DSPK2_CONF] = { - .dev_name = "tegra186-dspk.1", + .dev_name = "2905100.dspk", .name_prefix = "DSPK2", }, [TEGRA186_CODEC_ASRC1_CONF] = { - .dev_name = "tegra186-asrc", + .dev_name = "2910000.asrc", .name_prefix = "ASRC1", }, };