Skip to content

L
linux
Commit 74cc53cf authored by Mark Brown's avatar Mark Brown
Browse files
Options

Tegra234 APE support 

Merge series from Sameer Pujar <spujar@nvidia.com>:

This adds APE support on Tegra234 and enables sound card on
Jetson AGX Orin platform.
parents 7bd04b8d fed44d6c
Hide whitespace changes
Inline Side-by-side
Showing with 169 additions and 5 deletions
Documentation/devicetree/bindings/bus/nvidia,tegra210-aconnect.yaml
View file @ 74cc53cf
...@@ -21,6 +21,7 @@ properties: ...@@ -21,6 +21,7 @@ properties:
- const: nvidia,tegra210-aconnect - const: nvidia,tegra210-aconnect
- items: - items:
- enum: - enum:
- nvidia,tegra234-aconnect
- nvidia,tegra186-aconnect - nvidia,tegra186-aconnect
- nvidia,tegra194-aconnect - nvidia,tegra194-aconnect
- const: nvidia,tegra210-aconnect - const: nvidia,tegra210-aconnect
......
Documentation/devicetree/bindings/dma/nvidia,tegra210-adma.yaml
View file @ 74cc53cf
...@@ -23,7 +23,9 @@ properties: ...@@ -23,7 +23,9 @@ properties:
- nvidia,tegra210-adma - nvidia,tegra210-adma
- nvidia,tegra186-adma - nvidia,tegra186-adma
- items: - items:
- const: nvidia,tegra194-adma - enum:
- nvidia,tegra234-adma
- nvidia,tegra194-adma
- const: nvidia,tegra186-adma - const: nvidia,tegra186-adma
reg: reg:
......
Documentation/devicetree/bindings/interrupt-controller/arm,gic.yaml
View file @ 74cc53cf
...@@ -58,6 +58,7 @@ properties: ...@@ -58,6 +58,7 @@ properties:
- enum: - enum:
- nvidia,tegra186-agic - nvidia,tegra186-agic
- nvidia,tegra194-agic - nvidia,tegra194-agic
- nvidia,tegra234-agic
- const: nvidia,tegra210-agic - const: nvidia,tegra210-agic
interrupt-controller: true interrupt-controller: true
......
Documentation/devicetree/bindings/sound/nvidia,tegra186-dspk.yaml
View file @ 74cc53cf
...@@ -28,7 +28,9 @@ properties: ...@@ -28,7 +28,9 @@ properties:
oneOf: oneOf:
- const: nvidia,tegra186-dspk - const: nvidia,tegra186-dspk
- items: - items:
- const: nvidia,tegra194-dspk - enum:
- nvidia,tegra234-dspk
- nvidia,tegra194-dspk
- const: nvidia,tegra186-dspk - const: nvidia,tegra186-dspk
reg: reg:
......
Documentation/devicetree/bindings/sound/nvidia,tegra210-admaif.yaml
View file @ 74cc53cf
...@@ -27,7 +27,9 @@ properties: ...@@ -27,7 +27,9 @@ properties:
- nvidia,tegra210-admaif - nvidia,tegra210-admaif
- nvidia,tegra186-admaif - nvidia,tegra186-admaif
- items: - items:
- const: nvidia,tegra194-admaif - enum:
- nvidia,tegra234-admaif
- nvidia,tegra194-admaif
- const: nvidia,tegra186-admaif - const: nvidia,tegra186-admaif
reg: reg:
......
Documentation/devicetree/bindings/sound/nvidia,tegra210-adx.yaml
View file @ 74cc53cf
...@@ -30,6 +30,7 @@ properties: ...@@ -30,6 +30,7 @@ properties:
- const: nvidia,tegra210-adx - const: nvidia,tegra210-adx
- items: - items:
- enum: - enum:
- nvidia,tegra234-adx
- nvidia,tegra194-adx - nvidia,tegra194-adx
- nvidia,tegra186-adx - nvidia,tegra186-adx
- const: nvidia,tegra210-adx - const: nvidia,tegra210-adx
......
Documentation/devicetree/bindings/sound/nvidia,tegra210-ahub.yaml
View file @ 74cc53cf
...@@ -26,6 +26,7 @@ properties: ...@@ -26,6 +26,7 @@ properties:
- enum: - enum:
- nvidia,tegra210-ahub - nvidia,tegra210-ahub
- nvidia,tegra186-ahub - nvidia,tegra186-ahub
- nvidia,tegra234-ahub
- items: - items:
- const: nvidia,tegra194-ahub - const: nvidia,tegra194-ahub
- const: nvidia,tegra186-ahub - const: nvidia,tegra186-ahub
......
Documentation/devicetree/bindings/sound/nvidia,tegra210-amx.yaml
View file @ 74cc53cf
...@@ -31,6 +31,9 @@ properties: ...@@ -31,6 +31,9 @@ properties:
- const: nvidia,tegra186-amx - const: nvidia,tegra186-amx
- const: nvidia,tegra210-amx - const: nvidia,tegra210-amx
- const: nvidia,tegra194-amx - const: nvidia,tegra194-amx
- items:
- const: nvidia,tegra234-amx
- const: nvidia,tegra194-amx
reg: reg:
maxItems: 1 maxItems: 1
......
Documentation/devicetree/bindings/sound/nvidia,tegra210-dmic.yaml
View file @ 74cc53cf
...@@ -28,6 +28,7 @@ properties: ...@@ -28,6 +28,7 @@ properties:
- const: nvidia,tegra210-dmic - const: nvidia,tegra210-dmic
- items: - items:
- enum: - enum:
- nvidia,tegra234-dmic
- nvidia,tegra194-dmic - nvidia,tegra194-dmic
- nvidia,tegra186-dmic - nvidia,tegra186-dmic
- const: nvidia,tegra210-dmic - const: nvidia,tegra210-dmic
......
Documentation/devicetree/bindings/sound/nvidia,tegra210-i2s.yaml
View file @ 74cc53cf
...@@ -28,6 +28,7 @@ properties: ...@@ -28,6 +28,7 @@ properties:
- const: nvidia,tegra210-i2s - const: nvidia,tegra210-i2s
- items: - items:
- enum: - enum:
- nvidia,tegra234-i2s
- nvidia,tegra194-i2s - nvidia,tegra194-i2s
- nvidia,tegra186-i2s - nvidia,tegra186-i2s
- const: nvidia,tegra210-i2s - const: nvidia,tegra210-i2s
......
Documentation/devicetree/bindings/sound/nvidia,tegra210-mixer.yaml
View file @ 74cc53cf
...@@ -28,6 +28,7 @@ properties: ...@@ -28,6 +28,7 @@ properties:
- const: nvidia,tegra210-amixer - const: nvidia,tegra210-amixer
- items: - items:
- enum: - enum:
- nvidia,tegra234-amixer
- nvidia,tegra194-amixer - nvidia,tegra194-amixer
- nvidia,tegra186-amixer - nvidia,tegra186-amixer
- const: nvidia,tegra210-amixer - const: nvidia,tegra210-amixer
......
Documentation/devicetree/bindings/sound/nvidia,tegra210-mvc.yaml
View file @ 74cc53cf
...@@ -31,6 +31,7 @@ properties: ...@@ -31,6 +31,7 @@ properties:
- const: nvidia,tegra210-mvc - const: nvidia,tegra210-mvc
- items: - items:
- enum: - enum:
- nvidia,tegra234-mvc
- nvidia,tegra194-mvc - nvidia,tegra194-mvc
- nvidia,tegra186-mvc - nvidia,tegra186-mvc
- const: nvidia,tegra210-mvc - const: nvidia,tegra210-mvc
......
Documentation/devicetree/bindings/sound/nvidia,tegra210-sfc.yaml
View file @ 74cc53cf
...@@ -28,6 +28,7 @@ properties: ...@@ -28,6 +28,7 @@ properties:
- const: nvidia,tegra210-sfc - const: nvidia,tegra210-sfc
- items: - items:
- enum: - enum:
- nvidia,tegra234-sfc
- nvidia,tegra194-sfc - nvidia,tegra194-sfc
- nvidia,tegra186-sfc - nvidia,tegra186-sfc
- const: nvidia,tegra210-sfc - const: nvidia,tegra210-sfc
......
sound/soc/tegra/tegra210_ahub.c
View file @ 74cc53cf
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// //
// tegra210_ahub.c - Tegra210 AHUB driver // tegra210_ahub.c - Tegra210 AHUB driver
// //
// Copyright (c) 2020 NVIDIA CORPORATION. All rights reserved. // Copyright (c) 2020-2022, NVIDIA CORPORATION. All rights reserved.
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/device.h> #include <linux/device.h>
...@@ -624,6 +624,34 @@ MUX_ENUM_CTRL_DECL_186(t186_mixer18_tx, 0x27); ...@@ -624,6 +624,34 @@ MUX_ENUM_CTRL_DECL_186(t186_mixer18_tx, 0x27);
MUX_ENUM_CTRL_DECL_186(t186_mixer19_tx, 0x28); MUX_ENUM_CTRL_DECL_186(t186_mixer19_tx, 0x28);
MUX_ENUM_CTRL_DECL_186(t186_mixer110_tx, 0x29); MUX_ENUM_CTRL_DECL_186(t186_mixer110_tx, 0x29);
/* Controls for t234 */
MUX_ENUM_CTRL_DECL_234(t234_mvc1_tx, 0x44);
MUX_ENUM_CTRL_DECL_234(t234_mvc2_tx, 0x45);
MUX_ENUM_CTRL_DECL_234(t234_amx11_tx, 0x48);
MUX_ENUM_CTRL_DECL_234(t234_amx12_tx, 0x49);
MUX_ENUM_CTRL_DECL_234(t234_amx13_tx, 0x4a);
MUX_ENUM_CTRL_DECL_234(t234_amx14_tx, 0x4b);
MUX_ENUM_CTRL_DECL_234(t234_amx21_tx, 0x4c);
MUX_ENUM_CTRL_DECL_234(t234_amx22_tx, 0x4d);
MUX_ENUM_CTRL_DECL_234(t234_amx23_tx, 0x4e);
MUX_ENUM_CTRL_DECL_234(t234_amx24_tx, 0x4f);
MUX_ENUM_CTRL_DECL_234(t234_amx31_tx, 0x50);
MUX_ENUM_CTRL_DECL_234(t234_amx32_tx, 0x51);
MUX_ENUM_CTRL_DECL_234(t234_amx33_tx, 0x52);
MUX_ENUM_CTRL_DECL_234(t234_amx34_tx, 0x53);
MUX_ENUM_CTRL_DECL_234(t234_adx1_tx, 0x58);
MUX_ENUM_CTRL_DECL_234(t234_adx2_tx, 0x59);
MUX_ENUM_CTRL_DECL_234(t234_adx3_tx, 0x5a);
MUX_ENUM_CTRL_DECL_234(t234_adx4_tx, 0x5b);
MUX_ENUM_CTRL_DECL_234(t234_amx41_tx, 0x5c);
MUX_ENUM_CTRL_DECL_234(t234_amx42_tx, 0x5d);
MUX_ENUM_CTRL_DECL_234(t234_amx43_tx, 0x5e);
MUX_ENUM_CTRL_DECL_234(t234_amx44_tx, 0x5f);
MUX_ENUM_CTRL_DECL_234(t234_admaif17_tx, 0x60);
MUX_ENUM_CTRL_DECL_234(t234_admaif18_tx, 0x61);
MUX_ENUM_CTRL_DECL_234(t234_admaif19_tx, 0x62);
MUX_ENUM_CTRL_DECL_234(t234_admaif20_tx, 0x63);
/* /*
* The number of entries in, and order of, this array is closely tied to the * The number of entries in, and order of, this array is closely tied to the
* calculation of tegra210_ahub_codec.num_dapm_widgets near the end of * calculation of tegra210_ahub_codec.num_dapm_widgets near the end of
...@@ -787,6 +815,102 @@ static const struct snd_soc_dapm_widget tegra186_ahub_widgets[] = { ...@@ -787,6 +815,102 @@ static const struct snd_soc_dapm_widget tegra186_ahub_widgets[] = {
TX_WIDGETS("MIXER1 TX5"), TX_WIDGETS("MIXER1 TX5"),
}; };
static const struct snd_soc_dapm_widget tegra234_ahub_widgets[] = {
WIDGETS("ADMAIF1", t186_admaif1_tx),
WIDGETS("ADMAIF2", t186_admaif2_tx),
WIDGETS("ADMAIF3", t186_admaif3_tx),
WIDGETS("ADMAIF4", t186_admaif4_tx),
WIDGETS("ADMAIF5", t186_admaif5_tx),
WIDGETS("ADMAIF6", t186_admaif6_tx),
WIDGETS("ADMAIF7", t186_admaif7_tx),
WIDGETS("ADMAIF8", t186_admaif8_tx),
WIDGETS("ADMAIF9", t186_admaif9_tx),
WIDGETS("ADMAIF10", t186_admaif10_tx),
WIDGETS("ADMAIF11", t186_admaif11_tx),
WIDGETS("ADMAIF12", t186_admaif12_tx),
WIDGETS("ADMAIF13", t186_admaif13_tx),
WIDGETS("ADMAIF14", t186_admaif14_tx),
WIDGETS("ADMAIF15", t186_admaif15_tx),
WIDGETS("ADMAIF16", t186_admaif16_tx),
WIDGETS("ADMAIF17", t234_admaif17_tx),
WIDGETS("ADMAIF18", t234_admaif18_tx),
WIDGETS("ADMAIF19", t234_admaif19_tx),
WIDGETS("ADMAIF20", t234_admaif20_tx),
WIDGETS("I2S1", t186_i2s1_tx),
WIDGETS("I2S2", t186_i2s2_tx),
WIDGETS("I2S3", t186_i2s3_tx),
WIDGETS("I2S4", t186_i2s4_tx),
WIDGETS("I2S5", t186_i2s5_tx),
WIDGETS("I2S6", t186_i2s6_tx),
TX_WIDGETS("DMIC1"),
TX_WIDGETS("DMIC2"),
TX_WIDGETS("DMIC3"),
TX_WIDGETS("DMIC4"),
WIDGETS("DSPK1", t186_dspk1_tx),
WIDGETS("DSPK2", t186_dspk2_tx),
WIDGETS("SFC1", t186_sfc1_tx),
WIDGETS("SFC2", t186_sfc2_tx),
WIDGETS("SFC3", t186_sfc3_tx),
WIDGETS("SFC4", t186_sfc4_tx),
WIDGETS("MVC1", t234_mvc1_tx),
WIDGETS("MVC2", t234_mvc2_tx),
WIDGETS("AMX1 RX1", t234_amx11_tx),
WIDGETS("AMX1 RX2", t234_amx12_tx),
WIDGETS("AMX1 RX3", t234_amx13_tx),
WIDGETS("AMX1 RX4", t234_amx14_tx),
WIDGETS("AMX2 RX1", t234_amx21_tx),
WIDGETS("AMX2 RX2", t234_amx22_tx),
WIDGETS("AMX2 RX3", t234_amx23_tx),
WIDGETS("AMX2 RX4", t234_amx24_tx),
WIDGETS("AMX3 RX1", t234_amx31_tx),
WIDGETS("AMX3 RX2", t234_amx32_tx),
WIDGETS("AMX3 RX3", t234_amx33_tx),
WIDGETS("AMX3 RX4", t234_amx34_tx),
WIDGETS("AMX4 RX1", t234_amx41_tx),
WIDGETS("AMX4 RX2", t234_amx42_tx),
WIDGETS("AMX4 RX3", t234_amx43_tx),
WIDGETS("AMX4 RX4", t234_amx44_tx),
TX_WIDGETS("AMX1"),
TX_WIDGETS("AMX2"),
TX_WIDGETS("AMX3"),
TX_WIDGETS("AMX4"),
WIDGETS("ADX1", t234_adx1_tx),
WIDGETS("ADX2", t234_adx2_tx),
WIDGETS("ADX3", t234_adx3_tx),
WIDGETS("ADX4", t234_adx4_tx),
TX_WIDGETS("ADX1 TX1"),
TX_WIDGETS("ADX1 TX2"),
TX_WIDGETS("ADX1 TX3"),
TX_WIDGETS("ADX1 TX4"),
TX_WIDGETS("ADX2 TX1"),
TX_WIDGETS("ADX2 TX2"),
TX_WIDGETS("ADX2 TX3"),
TX_WIDGETS("ADX2 TX4"),
TX_WIDGETS("ADX3 TX1"),
TX_WIDGETS("ADX3 TX2"),
TX_WIDGETS("ADX3 TX3"),
TX_WIDGETS("ADX3 TX4"),
TX_WIDGETS("ADX4 TX1"),
TX_WIDGETS("ADX4 TX2"),
TX_WIDGETS("ADX4 TX3"),
TX_WIDGETS("ADX4 TX4"),
WIDGETS("MIXER1 RX1", t186_mixer11_tx),
WIDGETS("MIXER1 RX2", t186_mixer12_tx),
WIDGETS("MIXER1 RX3", t186_mixer13_tx),
WIDGETS("MIXER1 RX4", t186_mixer14_tx),
WIDGETS("MIXER1 RX5", t186_mixer15_tx),
WIDGETS("MIXER1 RX6", t186_mixer16_tx),
WIDGETS("MIXER1 RX7", t186_mixer17_tx),
WIDGETS("MIXER1 RX8", t186_mixer18_tx),
WIDGETS("MIXER1 RX9", t186_mixer19_tx),
WIDGETS("MIXER1 RX10", t186_mixer110_tx),
TX_WIDGETS("MIXER1 TX1"),
TX_WIDGETS("MIXER1 TX2"),
TX_WIDGETS("MIXER1 TX3"),
TX_WIDGETS("MIXER1 TX4"),
TX_WIDGETS("MIXER1 TX5"),
};
#define TEGRA_COMMON_MUX_ROUTES(name) \ #define TEGRA_COMMON_MUX_ROUTES(name) \
{ name " XBAR-TX", NULL, name " Mux" }, \ { name " XBAR-TX", NULL, name " Mux" }, \
{ name " Mux", "ADMAIF1", "ADMAIF1 XBAR-RX" }, \ { name " Mux", "ADMAIF1", "ADMAIF1 XBAR-RX" }, \
...@@ -1027,6 +1151,13 @@ static const struct snd_soc_component_driver tegra186_ahub_component = { ...@@ -1027,6 +1151,13 @@ static const struct snd_soc_component_driver tegra186_ahub_component = {
.num_dapm_routes = ARRAY_SIZE(tegra186_ahub_routes), .num_dapm_routes = ARRAY_SIZE(tegra186_ahub_routes),
}; };
static const struct snd_soc_component_driver tegra234_ahub_component = {
.dapm_widgets = tegra234_ahub_widgets,
.num_dapm_widgets = ARRAY_SIZE(tegra234_ahub_widgets),
.dapm_routes = tegra186_ahub_routes,
.num_dapm_routes = ARRAY_SIZE(tegra186_ahub_routes),
};
static const struct regmap_config tegra210_ahub_regmap_config = { static const struct regmap_config tegra210_ahub_regmap_config = {
.reg_bits = 32, .reg_bits = 32,
.val_bits = 32, .val_bits = 32,
...@@ -1067,9 +1198,22 @@ static const struct tegra_ahub_soc_data soc_data_tegra186 = { ...@@ -1067,9 +1198,22 @@ static const struct tegra_ahub_soc_data soc_data_tegra186 = {
.reg_count = TEGRA186_XBAR_UPDATE_MAX_REG, .reg_count = TEGRA186_XBAR_UPDATE_MAX_REG,
}; };
static const struct tegra_ahub_soc_data soc_data_tegra234 = {
.cmpnt_drv = &tegra234_ahub_component,
.dai_drv = tegra186_ahub_dais,
.num_dais = ARRAY_SIZE(tegra186_ahub_dais),
.regmap_config = &tegra186_ahub_regmap_config,
.mask[0] = TEGRA186_XBAR_REG_MASK_0,
.mask[1] = TEGRA186_XBAR_REG_MASK_1,
.mask[2] = TEGRA186_XBAR_REG_MASK_2,
.mask[3] = TEGRA186_XBAR_REG_MASK_3,
.reg_count = TEGRA186_XBAR_UPDATE_MAX_REG,
};
static const struct of_device_id tegra_ahub_of_match[] = { static const struct of_device_id tegra_ahub_of_match[] = {
{ .compatible = "nvidia,tegra210-ahub", .data = &soc_data_tegra210 }, { .compatible = "nvidia,tegra210-ahub", .data = &soc_data_tegra210 },
{ .compatible = "nvidia,tegra186-ahub", .data = &soc_data_tegra186 }, { .compatible = "nvidia,tegra186-ahub", .data = &soc_data_tegra186 },
{ .compatible = "nvidia,tegra234-ahub", .data = &soc_data_tegra234 },
{}, {},
}; };
MODULE_DEVICE_TABLE(of, tegra_ahub_of_match); MODULE_DEVICE_TABLE(of, tegra_ahub_of_match);
......
sound/soc/tegra/tegra210_ahub.h
View file @ 74cc53cf
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* /*
* tegra210_ahub.h - TEGRA210 AHUB * tegra210_ahub.h - TEGRA210 AHUB
* *
* Copyright (c) 2020 NVIDIA CORPORATION. All rights reserved. * Copyright (c) 2020-2022, NVIDIA CORPORATION. All rights reserved.
* *
*/ */
...@@ -74,6 +74,8 @@ ...@@ -74,6 +74,8 @@
tegra_ahub_get_value_enum, \ tegra_ahub_get_value_enum, \
tegra_ahub_put_value_enum) tegra_ahub_put_value_enum)
#define MUX_ENUM_CTRL_DECL_234(ename, id) MUX_ENUM_CTRL_DECL_186(ename, id)
#define WIDGETS(sname, ename) \ #define WIDGETS(sname, ename) \
SND_SOC_DAPM_AIF_IN(sname " XBAR-RX", NULL, 0, SND_SOC_NOPM, 0, 0), \ SND_SOC_DAPM_AIF_IN(sname " XBAR-RX", NULL, 0, SND_SOC_NOPM, 0, 0), \
SND_SOC_DAPM_AIF_OUT(sname " XBAR-TX", NULL, 0, SND_SOC_NOPM, 0, 0), \ SND_SOC_DAPM_AIF_OUT(sname " XBAR-TX", NULL, 0, SND_SOC_NOPM, 0, 0), \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7