ALSA: hda/tegra: property for card name
Subsystems (4)
PATCH 1/3 ALSA: hda/tegra: property for card name
An optional property "nvidia,model" is introduced for hda to pass custom name for the sound card. The suffix "-hda" in the name passed is useful to distinguish between multiple cards available for a platform. When the property is not specified, default name("tegra-hda") mentioned in hda driver is used. This property can be added in platform specific file of the board and card name can relate to the board in use.
--- Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt | 5 +++++ 1 file changed, 5 insertions(+)
Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt +5 -0
@@ -13,6 +13,10 @@ Required properties: See ../reset/reset.txt for details. - reset-names : Must include the following entries: hda, hda2hdmi, hda2codec_2x +Optional properties: +- nvidia,model : The user-visible name of this sound complex. Since the property + is optional, legacy boards can use default name provided in hda driver. + Example: hda@70030000 {
@@ -27,4 +31,5 @@ hda@70030000 { <&tegra_car 128>, /* hda2hdmi */ <&tegra_car 111>; /* hda2codec_2x */ reset-names = "hda", "hda2hdmi", "hda2codec_2x"; + nvidia,model = "jetson-tk1-hda"; };
Signature · 1 line
2.7.4
PATCH 2/3 arm64: tegra: custom name for hda sound card
"nvidia,model" property is added to pass custom name for hda sound card. This is parsed in hda driver and used for card name. This aligns with the way with which sound cards are named in general.
This patch populates above for jetson-tx1, jetson-tx2 and jetson-xavier.
--- arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 1 + arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 1 + arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 1 + 3 files changed, 3 insertions(+)
arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts +1 -0
@@ -54,6 +54,7 @@ }; hda@3510000 { + nvidia,model = "jetson-tx2-hda"; status = "okay"; };
arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts +1 -0
@@ -21,6 +21,7 @@ }; hda@3510000 { + nvidia,model = "jetson-xavier-hda"; status = "okay"; };
arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi +1 -0
@@ -1323,6 +1323,7 @@ }; hda@70030000 { + nvidia,model = "jetson-tx1-hda"; status = "okay"; };
Signature · 1 line
2.7.4
Takashi Iwai
AppliedRe: [PATCH 2/3] arm64: tegra: custom name for hda sound card
Quoted 9 lines · Sameer Pujar
"nvidia,model" property is added to pass custom name for hda sound card. This is parsed in hda driver and used for card name. This aligns with the way with which sound cards are named in general.
This patch populates above for jetson-tx1, jetson-tx2 and jetson-xavier.
Signed-off-by Sameer Pujar <[email protected]>Reviewed-by Jonathan Hunter <[email protected]>
Applied, thanks.
Takashi
PATCH 3/3 ALSA: hda/tegra: sound card name from device tree
In reply to Sameer PujarA platform can have multiple sound cards for different audio paths. Following is the print seen duirng device boot for jetson-xavier,
ALSA device list:
#0: nvidia,p2972-0000 at 0x3518000 irq 17
By looking at above, it is not very clear if the sound card is for HDA. It becomes confusing when platform has registered multiple cards, and platform model name is used for card.
This patch uses "nvidia,model" property mentioned in hda device tree to get the card name. Since property is optional, legacy boards will continue to use "tegra-hda". Custom name can be passed wherever needed. This naming convention is conistent with the way sound cards are named in general.
--- sound/pci/hda/hda_tegra.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-)
sound/pci/hda/hda_tegra.c +6 -12
@@ -380,8 +380,8 @@ static int hda_tegra_first_init(struct azx *chip, struct platform_device *pdev)int err;unsigned short gcap;int irq_id =platform_get_irq (pdev,0 ); -const char *sname; -struct device_node *root; +const char *sname, *drv_name ="tegra-hda" ; +struct device_node *np = pdev->dev.of_node; err =hda_tegra_init_chip (chip, pdev);if (err)
@@ -440,17 +440,11 @@ static int hda_tegra_first_init(struct azx *chip, struct platform_device *pdev) }/* driver name */ -strcpy (card->driver,"tegra-hda" ); - - root =of_find_node_by_path ("/" ); - sname =of_get_property (root,"compatible" ,NULL ); -of_node_put (root); -if (!sname) { -dev_err (card->dev, -"failed to get compatible property from root node\n" ); -return -ENODEV ; - } +strncpy (card->driver, drv_name,sizeof (card->driver));/* shortname for card */ + sname =of_get_property (np,"nvidia,model" ,NULL ); +if (!sname) + sname = drv_name;if (strlen (sname) >sizeof (card->shortname))dev_info (card->dev,"truncating shortname for card\n" );strncpy (card->shortname, sname,sizeof (card->shortname));
Signature · 1 line
2.7.4
Takashi Iwai
AppliedRe: [PATCH 3/3] ALSA: hda/tegra: sound card name from device tree
Quoted 9 lines · Sameer Pujar
A platform can have multiple sound cards for different audio paths. Following is the print seen duirng device boot for jetson-xavier,
ALSA device list:#0: nvidia,p2972-0000 at 0x3518000 irq 17By looking at above, it is not very clear if the sound card is for HDA. It becomes confusing when platform has registered multiple cards, and platform model name is used for card.
Quoted 8 lines
This patch uses "nvidia,model" property mentioned in hda device tree to get the card name. Since property is optional, legacy boards will continue to use "tegra-hda". Custom name can be passed wherever needed. This naming convention is conistent with the way sound cards are named in general.
Signed-off-by Sameer Pujar <[email protected]>Reviewed-by Jonathan Hunter <[email protected]>
Applied, thanks.
Takashi
Takashi Iwai
AppliedQuoted 10 lines · Sameer Pujar
An optional property "nvidia,model" is introduced for hda to pass custom name for the sound card. The suffix "-hda" in the name passed is useful to distinguish between multiple cards available for a platform. When the property is not specified, default
name("tegra-hda")mentioned in hda driver is used. This property can be added in platform specific file of the board and card name can relate to the board in use.Signed-off-by Sameer Pujar <[email protected]>Reviewed-by Jonathan Hunter <[email protected]>
Applied, thanks.
Takashi