Support HDMI audio on NVIDIA Tegra20
Subsystems (8)
v3 cover Support HDMI audio on NVIDIA Tegra20
This series revives Tegra20 S/PDIF driver which was upstreamed long time ago, but never was used. It also turns Tegra DRM HDMI driver into HDMI audio CODEC provider. Finally, HDMI audio is enabled in device-trees. For now the audio is enable only for Acer A500 tablet and Toshiba AC100 netbook because they're already supported by upstream, later on ASUS TF101 tablet will join them.
I based S/PDIF patches on Arnd's Bergmann patch from a separate series [1] that removes obsolete slave_id. This eases merging of the patches by removing the merge conflict. This is a note for Mark Brown.
I also based this series on top of power management series [2]. I.e. [2] should be applied first, otherwise "Add S/PDIF node to Tegra20 device-tree" patch should have merge conflict. This is a note for Thierry.
[1] https://patchwork.ozlabs.org/project/linux-tegra/list/?series=273312
[2] https://patchwork.ozlabs.org/project/linux-tegra/list/?series=274534
Changelog:
v3: - Renamed S/PDIF device-tree clocks as was suggested by Rob Herring.
- Added r-bs and acks that were given by Rob Herring to v2.
v2: - Corrected I2S yaml problem that was reported by the DT bot for v1
by removing the non-existent required clock-names property.
- Removed assigned-clocks property from S/PDIF yaml since this property is now inherited from the clocks property.
- Reordered the "tegra20: spdif: Set FIFO trigger level" patch, making it the first sound/soc patch in the series, like it was suggested by Mark Brown in the comment to v1. Also reworded commit message of this patch to *not* make it looks like it should be backported to stable kernels.
Arnd Bergmann (1):
ASoC: tegra20-spdif: stop setting slave_id
Dmitry Osipenko (19):
ASoC: dt-bindings: Add binding for Tegra20 S/PDIF
ASoC: dt-bindings: tegra20-i2s: Convert to schema
ASoC: dt-bindings: tegra20-i2s: Document new nvidia,fixed-parent-rate
property
dt-bindings: host1x: Document optional HDMI sound-dai-cells
ASoC: tegra20: spdif: Set FIFO trigger level
ASoC: tegra20: spdif: Support device-tree
ASoC: tegra20: spdif: Improve driver's code
ASoC: tegra20: spdif: Use more resource-managed helpers
ASoC: tegra20: spdif: Reset hardware
ASoC: tegra20: spdif: Support system suspend
ASoC: tegra20: spdif: Filter out unsupported rates
ASoC: tegra20: i2s: Filter out unsupported rates drm/tegra: hdmi: Unwind tegra_hdmi_init() errors drm/tegra: hdmi: Register audio CODEC on Tegra20
ARM: tegra_defconfig: Enable S/PDIF driver
ARM: tegra: Add S/PDIF node to Tegra20 device-tree
ARM: tegra: Add HDMI audio graph to Tegra20 device-tree
ARM: tegra: acer-a500: Enable S/PDIF and HDMI audio
ARM: tegra: paz00: Enable S/PDIF and HDMI audio
.../display/tegra/nvidia,tegra20-host1x.txt | 1 + .../bindings/sound/nvidia,tegra20-i2s.txt | 30 --- .../bindings/sound/nvidia,tegra20-i2s.yaml | 77 +++++++ .../bindings/sound/nvidia,tegra20-spdif.yaml | 85 ++++++++ .../boot/dts/tegra20-acer-a500-picasso.dts | 8 + arch/arm/boot/dts/tegra20-paz00.dts | 8 + arch/arm/boot/dts/tegra20.dtsi | 40 +++- arch/arm/configs/tegra_defconfig | 1 + drivers/gpu/drm/tegra/Kconfig | 3 + drivers/gpu/drm/tegra/hdmi.c | 168 +++++++++++++-- sound/soc/tegra/tegra20_i2s.c | 49 +++++ sound/soc/tegra/tegra20_spdif.c | 197 ++++++++++++------ sound/soc/tegra/tegra20_spdif.h | 1 + sound/soc/tegra/tegra_pcm.c | 6 + sound/soc/tegra/tegra_pcm.h | 1 + 15 files changed, 572 insertions(+), 103 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra20-i2s.txt create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra20-i2s.yaml create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra20-spdif.yaml
Signature · 1 line
2.33.1
PATCH v3 1/20 ASoC: dt-bindings: Add binding for Tegra20 S/PDIF
Add device-tree binding for Tegra20 S/PDIF controller.
--- .../bindings/sound/nvidia,tegra20-spdif.yaml | 85 +++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra20-spdif.yaml
Documentation/devicetree/bindings/sound/nvidia,tegra20-spdif.yaml new file +85 -0
@@ -0,0 +1,85 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/nvidia,tegra20-spdif.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: NVIDIA Tegra20 S/PDIF Controller + +description: | + The S/PDIF controller supports both input and output in serial audio + digital interface format. The input controller can digitally recover + a clock from the received stream. The S/PDIF controller is also used + to generate the embedded audio for HDMI output channel. + +maintainers: + - Thierry Reding <[email protected]> + - Jon Hunter <[email protected]> + +properties: + compatible: + const: nvidia,tegra20-spdif + + reg: + maxItems: 1 + + resets: + maxItems: 1 + + interrupts: + maxItems: 1 + + clocks: + minItems: 2 + + clock-names: + items: + - const: out + - const: in + + dmas: + minItems: 2 + + dma-names: + items: + - const: rx + - const: tx + + "#sound-dai-cells": + const: 0 + + nvidia,fixed-parent-rate: + description: | + Specifies whether board prefers parent clock to stay at a fixed rate. + This allows multiple Tegra20 audio components work simultaneously by + limiting number of supportable audio rates. + type: boolean + +required: + - compatible + - reg + - resets + - interrupts + - clocks + - clock-names + - dmas + - dma-names + - "#sound-dai-cells" + +additionalProperties: false + +examples: + - | + spdif@70002400 { + compatible = "nvidia,tegra20-spdif"; + reg = <0x70002400 0x200>; + interrupts = <77>; + clocks = <&clk 99>, <&clk 98>; + clock-names = "out", "in"; + resets = <&rst 10>; + dmas = <&apbdma 3>, <&apbdma 3>; + dma-names = "rx", "tx"; + #sound-dai-cells = <0>; + }; + +...
Signature · 1 line
2.33.1
PATCH v3 2/20 ASoC: dt-bindings: tegra20-i2s: Convert to schema
In reply to Dmitry OsipenkoConvert NVIDIA Tegra20 I2S binding to schema.
--- .../bindings/sound/nvidia,tegra20-i2s.txt | 30 -------- .../bindings/sound/nvidia,tegra20-i2s.yaml | 70 +++++++++++++++++++ 2 files changed, 70 insertions(+), 30 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra20-i2s.txt create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra20-i2s.yaml
Documentation/devicetree/bindings/sound/nvidia,tegra20-i2s.txt deleted +0 -30
@@ -1,30 +0,0 @@ -NVIDIA Tegra 20 I2S controller - -Required properties: -- compatible : "nvidia,tegra20-i2s" -- reg : Should contain I2S registers location and length -- interrupts : Should contain I2S interrupt -- resets : Must contain an entry for each entry in reset-names. - See ../reset/reset.txt for details. -- reset-names : Must include the following entries: - - i2s -- dmas : Must contain an entry for each entry in clock-names. - See ../dma/dma.txt for details. -- dma-names : Must include the following entries: - - rx - - tx -- clocks : Must contain one entry, for the module clock. - See ../clocks/clock-bindings.txt for details. - -Example: - -i2s@70002800 { - compatible = "nvidia,tegra20-i2s"; - reg = <0x70002800 0x200>; - interrupts = < 45 >; - clocks = <&tegra_car 11>; - resets = <&tegra_car 11>; - reset-names = "i2s"; - dmas = <&apbdma 21>, <&apbdma 21>; - dma-names = "rx", "tx"; -};
Documentation/devicetree/bindings/sound/nvidia,tegra20-i2s.yaml new file +70 -0
70 lines not on this page · raw message
Signature · 1 line
2.33.1
PATCH v3 3/20 ASoC: dt-bindings: tegra20-i2s: Document new nvidia,fixed-parent-rate property
In reply to Dmitry OsipenkoDocument new nvidia,fixed-parent-rate property which instructs that this board wants parent clock to stay at a fixed rate. It allows to prevent conflicts between audio components that share same parent PLL. For instance, this property allows to have HDMI audio, speaker and headphones in the system playing audio simultaneously, which is a common pattern for consumer devices.
--- .../devicetree/bindings/sound/nvidia,tegra20-i2s.yaml | 7 +++++++ 1 file changed, 7 insertions(+)
Documentation/devicetree/bindings/sound/nvidia,tegra20-i2s.yaml +7 -0
@@ -42,6 +42,13 @@ properties: - const: rx - const: tx + nvidia,fixed-parent-rate: + description: | + Specifies whether board prefers parent clock to stay at a fixed rate. + This allows multiple Tegra20 audio components work simultaneously by + limiting number of supportable audio rates. + type: boolean + required: - compatible - reg
Signature · 1 line
2.33.1
PATCH v3 4/20 dt-bindings: host1x: Document optional HDMI sound-dai-cells
In reply to Dmitry OsipenkoDocument new optional sound-dai-cells property of HDMI node. This node will be used as endpoint of HDMI sound DAI graph.
--- .../devicetree/bindings/display/tegra/nvidia,tegra20-host1x.txt | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.txt +1 -0
@@ -297,6 +297,7 @@ of the following host1x client modules: - nvidia,edid: supplies a binary EDID blob - nvidia,panel: phandle of a display panel - operating-points-v2: See ../bindings/opp/opp.txt for details. + - #sound-dai-cells: Should be 0. - tvo: TV encoder output
Signature · 1 line
2.33.1
PATCH v3 5/20 ASoC: tegra20: spdif: Set FIFO trigger level
In reply to Dmitry OsipenkoFIFO trigger level must be not less than the size of DMA burst, otherwise audio will be played x4 faster that it should be because part of the DMA data will be dropped on FIFO input buffer overflow.
--- sound/soc/tegra/tegra20_spdif.c | 8 ++++++++ 1 file changed, 8 insertions(+)
sound/soc/tegra/tegra20_spdif.c +8 -0
@@ -69,6 +69,14 @@ static int tegra20_spdif_hw_params(struct snd_pcm_substream *substream,regmap_update_bits (spdif->regmap,TEGRA20_SPDIF_CTRL , mask, val); +/* +* FIFO trigger level must be bigger than DMA burst or equal to it, +* otherwise data is discarded on overflow. +*/ +regmap_update_bits (spdif->regmap,TEGRA20_SPDIF_DATA_FIFO_CSR , +TEGRA20_SPDIF_DATA_FIFO_CSR_TX_ATN_LVL_MASK , +TEGRA20_SPDIF_DATA_FIFO_CSR_TX_ATN_LVL_TU4_WORD_FULL ); +switch (params_rate (params)) {case 32000 : spdifclock =4096000 ;
Signature · 1 line
2.33.1
PATCH v3 6/20 ASoC: tegra20-spdif: stop setting slave_id
In reply to Dmitry OsipenkoFrom: Arnd Bergmann <[email protected]>
The DMA resource is never set up anywhere, and passing this as slave_id has not been the proper procedure in a long time.
As a preparation for removing all slave_id references from the ALSA code, remove this one.
According to Dmitry Osipenko, this driver has never been used and the mechanism for configuring DMA would not work as it is implemented, so this part will get rewritten when the driver gets put into use again in the future.
--- sound/soc/tegra/tegra20_spdif.c | 1 - 1 file changed, 1 deletion(-)
sound/soc/tegra/tegra20_spdif.c +0 -1
@@ -298,7 +298,6 @@ static int tegra20_spdif_platform_probe(struct platform_device *pdev) spdif->playback_dma_data.addr = mem->start +TEGRA20_SPDIF_DATA_OUT ; spdif->playback_dma_data.addr_width =DMA_SLAVE_BUSWIDTH_4_BYTES ; spdif->playback_dma_data.maxburst =4 ; - spdif->playback_dma_data.slave_id = dmareq->start;pm_runtime_enable (&pdev->dev);
Signature · 1 line
2.33.1
PATCH v3 7/20 ASoC: tegra20: spdif: Support device-tree
In reply to Dmitry OsipenkoTegra20 S/PDIF driver was added in a pre-DT era and was never used since that time. Revive driver by adding device-tree support.
--- sound/soc/tegra/tegra20_spdif.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
sound/soc/tegra/tegra20_spdif.c +9 -2
@@ -10,6 +10,7 @@#include <linux/device.h> #include <linux/io.h> #include <linux/module.h> +#include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/regmap.h>
@@ -270,7 +271,7 @@ static int tegra20_spdif_platform_probe(struct platform_device *pdev)dev_set_drvdata (&pdev->dev, spdif); - spdif->clk_spdif_out =devm_clk_get (&pdev->dev,"spdif_out" ); + spdif->clk_spdif_out =devm_clk_get (&pdev->dev,"out" );if (IS_ERR (spdif->clk_spdif_out)) {pr_err ("Can't retrieve spdif clock\n" ); ret =PTR_ERR (spdif->clk_spdif_out);
@@ -340,10 +341,17 @@ static const struct dev_pm_ops tegra20_spdif_pm_ops = { tegra20_spdif_runtime_resume, NULL) }; +static const struct of_device_id tegra20_spdif_of_match[] = { + { .compatible ="nvidia,tegra20-spdif" , }, + {}, +}; +MODULE_DEVICE_TABLE (of, tegra20_spdif_of_match); +static struct platform_driver tegra20_spdif_driver = { .driver = { .name =DRV_NAME , .pm = &tegra20_spdif_pm_ops, + .of_match_table = tegra20_spdif_of_match, }, .probe = tegra20_spdif_platform_probe, .remove = tegra20_spdif_platform_remove,
@@ -354,4 +362,3 @@ module_platform_driver(tegra20_spdif_driver);MODULE_AUTHOR ("Stephen Warren <[email protected]>" );MODULE_DESCRIPTION ("Tegra20 SPDIF ASoC driver" );MODULE_LICENSE ("GPL" ); -MODULE_ALIAS ("platform:" DRV_NAME );
Signature · 1 line
2.33.1
PATCH v3 8/20 ASoC: tegra20: spdif: Improve driver's code
In reply to Dmitry Osipenko- Clean up whitespaces, defines and variables.
- Remove obsolete code.
- Adhere to upstream coding style.
- Don't override returned error code.
- Replace pr_err with dev_err.
No functional changes are made by this patch. This is a minor code's refactoring that will ease further maintenance of the driver.
--- sound/soc/tegra/tegra20_spdif.c | 49 ++++++++++++--------------------- 1 file changed, 18 insertions(+), 31 deletions(-)
sound/soc/tegra/tegra20_spdif.c +18 -31
@@ -23,8 +23,6 @@#include "tegra20_spdif.h" -#define DRV_NAME "tegra20-spdif" -static __maybe_unused int tegra20_spdif_runtime_suspend (struct device *dev) {struct tegra20_spdif *spdif =dev_get_drvdata (dev);
@@ -49,11 +47,10 @@ static __maybe_unused int tegra20_spdif_runtime_resume(struct device *dev) }static int tegra20_spdif_hw_params (struct snd_pcm_substream *substream, -struct snd_pcm_hw_params *params, -struct snd_soc_dai *dai) +struct snd_pcm_hw_params *params, +struct snd_soc_dai *dai) { -struct device *dev = dai->dev; -struct tegra20_spdif *spdif =snd_soc_dai_get_drvdata (dai); +struct tegra20_spdif *spdif =dev_get_drvdata (dai->dev);unsigned int mask =0 , val =0 ;int ret, spdifclock;
@@ -106,7 +103,7 @@ static int tegra20_spdif_hw_params(struct snd_pcm_substream *substream, ret =clk_set_rate (spdif->clk_spdif_out, spdifclock);if (ret) { -dev_err (dev,"Can't set SPDIF clock rate: %d\n" , ret); +dev_err (dai->dev,"Can't set SPDIF clock rate: %d\n" , ret);return ret; }
@@ -127,9 +124,9 @@ static void tegra20_spdif_stop_playback(struct tegra20_spdif *spdif) }static int tegra20_spdif_trigger (struct snd_pcm_substream *substream,int cmd, -struct snd_soc_dai *dai) +struct snd_soc_dai *dai) { -struct tegra20_spdif *spdif =snd_soc_dai_get_drvdata (dai); +struct tegra20_spdif *spdif =dev_get_drvdata (dai->dev);switch (cmd) {case SNDRV_PCM_TRIGGER_START :
@@ -151,7 +148,7 @@ static int tegra20_spdif_trigger(struct snd_pcm_substream *substream, int cmd,static int tegra20_spdif_probe (struct snd_soc_dai *dai) { -struct tegra20_spdif *spdif =snd_soc_dai_get_drvdata (dai); +struct tegra20_spdif *spdif =dev_get_drvdata (dai->dev); dai->capture_dma_data =NULL ; dai->playback_dma_data = &spdif->playback_dma_data;
@@ -160,26 +157,26 @@ static int tegra20_spdif_probe(struct snd_soc_dai *dai) }static const struct snd_soc_dai_ops tegra20_spdif_dai_ops = { - .hw_params = tegra20_spdif_hw_params, - .trigger = tegra20_spdif_trigger, + .hw_params = tegra20_spdif_hw_params, + .trigger = tegra20_spdif_trigger, };static struct snd_soc_dai_driver tegra20_spdif_dai = { - .name =DRV_NAME , + .name ="tegra20-spdif" , .probe = tegra20_spdif_probe, .playback = { .stream_name ="Playback" , .channels_min =2 , .channels_max =2 , .rates =SNDRV_PCM_RATE_32000 |SNDRV_PCM_RATE_44100 | -SNDRV_PCM_RATE_48000 , +SNDRV_PCM_RATE_48000 , .formats =SNDRV_PCM_FMTBIT_S16_LE , }, .ops = &tegra20_spdif_dai_ops, };static const struct snd_soc_component_driver tegra20_spdif_component = { - .name =DRV_NAME , + .name ="tegra20-spdif" , };static bool tegra20_spdif_wr_rd_reg (struct device *dev,unsigned int reg)
@@ -260,7 +257,7 @@ static const struct regmap_config tegra20_spdif_regmap_config = {static int tegra20_spdif_platform_probe (struct platform_device *pdev) {struct tegra20_spdif *spdif; -struct resource *mem, *dmareq; +struct resource *mem;void __iomem *regs;int ret;
@@ -273,27 +270,19 @@ static int tegra20_spdif_platform_probe(struct platform_device *pdev) spdif->clk_spdif_out =devm_clk_get (&pdev->dev,"out" );if (IS_ERR (spdif->clk_spdif_out)) { -pr_err ("Can't retrieve spdif clock\n" ); - ret =PTR_ERR (spdif->clk_spdif_out); -return ret; +dev_err (&pdev->dev,"Could not retrieve spdif clock\n" ); +return PTR_ERR (spdif->clk_spdif_out); } regs =devm_platform_get_and_ioremap_resource (pdev,0 , &mem);if (IS_ERR (regs))return PTR_ERR (regs); - dmareq =platform_get_resource (pdev,IORESOURCE_DMA ,0 ); -if (!dmareq) { -dev_err (&pdev->dev,"No DMA resource\n" ); -return -ENODEV ; - } - spdif->regmap =devm_regmap_init_mmio (&pdev->dev, regs, - &tegra20_spdif_regmap_config); + &tegra20_spdif_regmap_config);if (IS_ERR (spdif->regmap)) {dev_err (&pdev->dev,"regmap init failed\n" ); - ret =PTR_ERR (spdif->regmap); -return ret; +return PTR_ERR (spdif->regmap); } spdif->playback_dma_data.addr = mem->start +TEGRA20_SPDIF_DATA_OUT ;
@@ -306,7 +295,6 @@ static int tegra20_spdif_platform_probe(struct platform_device *pdev) &tegra20_spdif_dai, 1);if (ret) {dev_err (&pdev->dev,"Could not register DAI: %d\n" , ret); - ret = -ENOMEM ; goto err_pm_disable; }
@@ -349,14 +337,13 @@ MODULE_DEVICE_TABLE(of, tegra20_spdif_of_match);static struct platform_driver tegra20_spdif_driver = { .driver = { - .name =DRV_NAME , + .name ="tegra20-spdif" , .pm = &tegra20_spdif_pm_ops, .of_match_table = tegra20_spdif_of_match, }, .probe = tegra20_spdif_platform_probe, .remove = tegra20_spdif_platform_remove, }; -module_platform_driver (tegra20_spdif_driver);MODULE_AUTHOR ("Stephen Warren <[email protected]>" );
Signature · 1 line
2.33.1
PATCH v3 9/20 ASoC: tegra20: spdif: Use more resource-managed helpers
In reply to Dmitry OsipenkoUse resource-managed helpers to make code cleaner. Driver's remove callback isn't needed anymore since driver is completely resource-managed now.
--- sound/soc/tegra/tegra20_spdif.c | 33 +++++++++------------------------ sound/soc/tegra/tegra_pcm.c | 6 ++++++ sound/soc/tegra/tegra_pcm.h | 1 + 3 files changed, 16 insertions(+), 24 deletions(-)
sound/soc/tegra/tegra20_spdif.c +9 -24
@@ -289,38 +289,24 @@ static int tegra20_spdif_platform_probe(struct platform_device *pdev) spdif->playback_dma_data.addr_width =DMA_SLAVE_BUSWIDTH_4_BYTES ; spdif->playback_dma_data.maxburst =4 ; -pm_runtime_enable (&pdev->dev); + ret =devm_pm_runtime_enable (&pdev->dev); +if (ret) +return ret; - ret =snd_soc_register_component (&pdev->dev, &tegra20_spdif_component, - &tegra20_spdif_dai,1 ); + ret =devm_snd_soc_register_component (&pdev->dev, + &tegra20_spdif_component, + &tegra20_spdif_dai,1 );if (ret) {dev_err (&pdev->dev,"Could not register DAI: %d\n" , ret); - goto err_pm_disable; +return ret; } - ret =tegra_pcm_platform_register (&pdev->dev); + ret =devm_tegra_pcm_platform_register (&pdev->dev);if (ret) {dev_err (&pdev->dev,"Could not register PCM: %d\n" , ret); - goto err_unregister_component; +return ret; } -return 0 ; - -err_unregister_component: -snd_soc_unregister_component (&pdev->dev); -err_pm_disable: -pm_runtime_disable (&pdev->dev); - -return ret; -} - -static int tegra20_spdif_platform_remove (struct platform_device *pdev) -{ -tegra_pcm_platform_unregister (&pdev->dev); -snd_soc_unregister_component (&pdev->dev); - -pm_runtime_disable (&pdev->dev); -return 0 ; }
@@ -342,7 +328,6 @@ static struct platform_driver tegra20_spdif_driver = { .of_match_table = tegra20_spdif_of_match, }, .probe = tegra20_spdif_platform_probe, - .remove = tegra20_spdif_platform_remove, };module_platform_driver (tegra20_spdif_driver);
sound/soc/tegra/tegra_pcm.c +6 -0
@@ -48,6 +48,12 @@ int tegra_pcm_platform_register(struct device *dev) }EXPORT_SYMBOL_GPL (tegra_pcm_platform_register); +int devm_tegra_pcm_platform_register (struct device *dev) +{ +return devm_snd_dmaengine_pcm_register (dev, &tegra_dmaengine_pcm_config,0 ); +} +EXPORT_SYMBOL_GPL (devm_tegra_pcm_platform_register); +int tegra_pcm_platform_register_with_chan_names (struct device *dev,struct snd_dmaengine_pcm_config *config,char *txdmachan,char *rxdmachan)
sound/soc/tegra/tegra_pcm.h +1 -0
@@ -32,6 +32,7 @@ int tegra_pcm_hw_params(struct snd_soc_component *component,snd_pcm_uframes_t tegra_pcm_pointer (struct snd_soc_component *component,struct snd_pcm_substream *substream);int tegra_pcm_platform_register (struct device *dev); +int devm_tegra_pcm_platform_register (struct device *dev);int tegra_pcm_platform_register_with_chan_names (struct device *dev,struct snd_dmaengine_pcm_config *config,char *txdmachan,char *rxdmachan);
Signature · 1 line
2.33.1
PATCH v3 10/20 ASoC: tegra20: spdif: Reset hardware
In reply to Dmitry OsipenkoReset S/PDIF controller on runtime PM suspend/resume to ensure that we always have a consistent hardware state.
--- sound/soc/tegra/tegra20_spdif.c | 32 ++++++++++++++++++++++++++++++++ sound/soc/tegra/tegra20_spdif.h | 1 + 2 files changed, 33 insertions(+)
sound/soc/tegra/tegra20_spdif.c +32 -0
@@ -7,6 +7,7 @@*/ #include <linux/clk.h> +#include <linux/delay.h> #include <linux/device.h> #include <linux/io.h> #include <linux/module.h>
@@ -14,6 +15,7 @@#include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/regmap.h> +#include <linux/reset.h> #include <linux/slab.h> #include <sound/core.h> #include <sound/pcm.h>
@@ -27,6 +29,8 @@ static __maybe_unused int tegra20_spdif_runtime_suspend(struct device *dev) {struct tegra20_spdif *spdif =dev_get_drvdata (dev); +regcache_cache_only (spdif->regmap, true); +clk_disable_unprepare (spdif->clk_spdif_out);return 0 ;
@@ -37,13 +41,35 @@ static __maybe_unused int tegra20_spdif_runtime_resume(struct device *dev)struct tegra20_spdif *spdif =dev_get_drvdata (dev);int ret; + ret =reset_control_assert (spdif->reset); +if (ret) +return ret; + ret =clk_prepare_enable (spdif->clk_spdif_out);if (ret) {dev_err (dev,"clk_enable failed: %d\n" , ret);return ret; } +usleep_range (10 ,100 ); + + ret =reset_control_deassert (spdif->reset); +if (ret) + goto disable_clocks; + +regcache_cache_only (spdif->regmap, false); +regcache_mark_dirty (spdif->regmap); + + ret =regcache_sync (spdif->regmap); +if (ret) + goto disable_clocks; +return 0 ; + +disable_clocks: +clk_disable_unprepare (spdif->clk_spdif_out); + +return ret; } static int tegra20_spdif_hw_params(struct snd_pcm_substream *substream,
@@ -268,6 +294,12 @@ static int tegra20_spdif_platform_probe(struct platform_device *pdev)dev_set_drvdata (&pdev->dev, spdif); + spdif->reset =devm_reset_control_get_exclusive (&pdev->dev,NULL ); +if (IS_ERR (spdif->reset)) { +dev_err (&pdev->dev,"Can't retrieve spdif reset\n" ); +return PTR_ERR (spdif->reset); + } + spdif->clk_spdif_out =devm_clk_get (&pdev->dev,"out" );if (IS_ERR (spdif->clk_spdif_out)) {dev_err (&pdev->dev,"Could not retrieve spdif clock\n" );
sound/soc/tegra/tegra20_spdif.h +1 -0
@@ -451,6 +451,7 @@ struct tegra20_spdif {struct snd_dmaengine_dai_dma_data capture_dma_data;struct snd_dmaengine_dai_dma_data playback_dma_data;struct regmap *regmap; + struct reset_control *reset; };#endif
Signature · 1 line
2.33.1
PATCH v3 11/20 ASoC: tegra20: spdif: Support system suspend
In reply to Dmitry OsipenkoSupport system suspend by enforcing runtime PM suspend/resume. Now there is no doubt that h/w is indeed stopped during suspend and that h/w state will be properly restored after resume.
--- sound/soc/tegra/tegra20_spdif.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/tegra/tegra20_spdif.c +2 -0
@@ -345,6 +345,8 @@ static int tegra20_spdif_platform_probe(struct platform_device *pdev)static const struct dev_pm_ops tegra20_spdif_pm_ops = { SET_RUNTIME_PM_OPS(tegra20_spdif_runtime_suspend, tegra20_spdif_runtime_resume, NULL) +SET_SYSTEM_SLEEP_PM_OPS (pm_runtime_force_suspend, + pm_runtime_force_resume) };static const struct of_device_id tegra20_spdif_of_match[] = {
Signature · 1 line
2.33.1
PATCH v3 12/20 ASoC: tegra20: spdif: Filter out unsupported rates
In reply to Dmitry OsipenkoSPDIF and other SoC components share audio PLL on Tegra, thus only one component may set the desired base clock rate. This creates problem for HDMI audio because it uses SPDIF and audio may not work if SPDIF's clock doesn't exactly match standard audio rate since some receivers may reject audio in that case. Filter out audio rates which SPDIF output can't support, assuming that other components won't change rate at runtime.
--- sound/soc/tegra/tegra20_spdif.c | 61 +++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+)
sound/soc/tegra/tegra20_spdif.c +61 -0
@@ -79,6 +79,7 @@ static int tegra20_spdif_hw_params(struct snd_pcm_substream *substream,struct tegra20_spdif *spdif =dev_get_drvdata (dai->dev);unsigned int mask =0 , val =0 ;int ret, spdifclock; +long rate; mask |=TEGRA20_SPDIF_CTRL_PACK |TEGRA20_SPDIF_CTRL_BIT_MODE_MASK ;
@@ -133,6 +134,12 @@ static int tegra20_spdif_hw_params(struct snd_pcm_substream *substream,return ret; } + rate =clk_get_rate (spdif->clk_spdif_out); +if (rate != spdifclock) +dev_warn_once (dai->dev, +"SPDIF clock rate %d doesn't match requested rate %lu\n" , + spdifclock, rate); +return 0 ; }
@@ -172,6 +179,59 @@ static int tegra20_spdif_trigger(struct snd_pcm_substream *substream, int cmd,return 0 ; } +static int tegra20_spdif_filter_rates (struct snd_pcm_hw_params *params, +struct snd_pcm_hw_rule *rule) +{ +struct snd_interval *r =hw_param_interval (params, rule->var); +struct snd_soc_dai *dai = rule->private; +struct tegra20_spdif *spdif =dev_get_drvdata (dai->dev); +struct clk *parent =clk_get_parent (spdif->clk_spdif_out); +const unsigned int rates[] = {32000 ,44100 ,48000 }; +long i, parent_rate, valid_rates =0 ; + + parent_rate =clk_get_rate (parent); +if (parent_rate <=0 ) { +dev_err (dai->dev,"Can't get parent clock rate: %ld\n" , + parent_rate); +return parent_rate ?: -EINVAL ; + } + +for (i =0 ; i <ARRAY_SIZE (rates); i++) { +if (parent_rate % (rates[i] *128 ) ==0 ) + valid_rates |=BIT (i); + } + +/* +* At least one rate must be valid, otherwise the parent clock isn't +* audio PLL. Nothing should be filtered in this case. +*/ +if (!valid_rates) + valid_rates =BIT (ARRAY_SIZE (rates)) -1 ; + +return snd_interval_list (r,ARRAY_SIZE (rates), rates, valid_rates); +} + +static int tegra20_spdif_startup (struct snd_pcm_substream *substream, +struct snd_soc_dai *dai) +{ +if (!device_property_read_bool (dai->dev,"nvidia,fixed-parent-rate" )) +return 0 ; + +/* +* SPDIF and I2S share audio PLL. HDMI takes audio packets from SPDIF +* and audio may not work on some TVs if clock rate isn't precise. +* +* PLL rate is controlled by I2S side. Filter out audio rates that +* don't match PLL rate at the start of stream to allow both SPDIF +* and I2S work simultaneously, assuming that PLL rate won't be +* changed later on. +*/ +return snd_pcm_hw_rule_add (substream->runtime,0 , +SNDRV_PCM_HW_PARAM_RATE , + tegra20_spdif_filter_rates, dai, +SNDRV_PCM_HW_PARAM_RATE ,-1 ); +} +static int tegra20_spdif_probe (struct snd_soc_dai *dai) {struct tegra20_spdif *spdif =dev_get_drvdata (dai->dev);
@@ -185,6 +245,7 @@ static int tegra20_spdif_probe(struct snd_soc_dai *dai)static const struct snd_soc_dai_ops tegra20_spdif_dai_ops = { .hw_params = tegra20_spdif_hw_params, .trigger = tegra20_spdif_trigger, + .startup = tegra20_spdif_startup, };static struct snd_soc_dai_driver tegra20_spdif_dai = {
Signature · 1 line
2.33.1
PATCH v3 13/20 ASoC: tegra20: i2s: Filter out unsupported rates
In reply to Dmitry OsipenkoSupport new nvidia,fixed-parent-rate device-tree property which instructs I2S that board wants parent clock rate to stay at a fixed rate. This allows to play audio over S/PDIF and I2S simultaneously. The root of the problem is that audio components on Tegra share the same audio PLL, and thus, only a subset of rates can be supported if we want to play audio simultaneously. Filter out audio rates that don't match parent clock rate if device-tree has the nvidia,fixed-parent-rate property.
--- sound/soc/tegra/tegra20_i2s.c | 49 +++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+)
sound/soc/tegra/tegra20_i2s.c +49 -0
@@ -262,10 +262,59 @@ static int tegra20_i2s_probe(struct snd_soc_dai *dai)return 0 ; } +static const unsigned int tegra20_i2s_rates[] = { +8000 ,11025 ,16000 ,22050 ,32000 ,44100 ,48000 ,64000 ,88200 ,96000 +}; + +static int tegra20_i2s_filter_rates (struct snd_pcm_hw_params *params, +struct snd_pcm_hw_rule *rule) +{ +struct snd_interval *r =hw_param_interval (params, rule->var); +struct snd_soc_dai *dai = rule->private; +struct tegra20_i2s *i2s =dev_get_drvdata (dai->dev); +struct clk *parent =clk_get_parent (i2s->clk_i2s); +long i, parent_rate, valid_rates =0 ; + + parent_rate =clk_get_rate (parent); +if (parent_rate <=0 ) { +dev_err (dai->dev,"Can't get parent clock rate: %ld\n" , + parent_rate); +return parent_rate ?: -EINVAL ; + } + +for (i =0 ; i <ARRAY_SIZE (tegra20_i2s_rates); i++) { +if (parent_rate % (tegra20_i2s_rates[i] *128 ) ==0 ) + valid_rates |=BIT (i); + } + +/* +* At least one rate must be valid, otherwise the parent clock isn't +* audio PLL. Nothing should be filtered in this case. +*/ +if (!valid_rates) + valid_rates =BIT (ARRAY_SIZE (tegra20_i2s_rates)) -1 ; + +return snd_interval_list (r,ARRAY_SIZE (tegra20_i2s_rates), + tegra20_i2s_rates, valid_rates); +} + +static int tegra20_i2s_startup (struct snd_pcm_substream *substream, +struct snd_soc_dai *dai) +{ +if (!device_property_read_bool (dai->dev,"nvidia,fixed-parent-rate" )) +return 0 ; + +return snd_pcm_hw_rule_add (substream->runtime,0 , +SNDRV_PCM_HW_PARAM_RATE , + tegra20_i2s_filter_rates, dai, +SNDRV_PCM_HW_PARAM_RATE ,-1 ); +} +static const struct snd_soc_dai_ops tegra20_i2s_dai_ops = { .set_fmt = tegra20_i2s_set_fmt, .hw_params = tegra20_i2s_hw_params, .trigger = tegra20_i2s_trigger, + .startup = tegra20_i2s_startup, };static const struct snd_soc_dai_driver tegra20_i2s_dai_template = {
Signature · 1 line
2.33.1
PATCH v3 14/20 drm/tegra: hdmi: Unwind tegra_hdmi_init() errors
In reply to Dmitry OsipenkoAdd missing error unwinding to tegra_hdmi_init(), for consistency.
--- drivers/gpu/drm/tegra/hdmi.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/gpu/drm/tegra/hdmi.c +12 -3
@@ -1456,22 +1456,31 @@ static int tegra_hdmi_init(struct host1x_client *client)if (err <0 ) {dev_err (client->dev,"failed to enable HDMI regulator: %d\n" , err); -return err; + goto output_exit; } err =regulator_enable (hdmi->pll);if (err <0 ) {dev_err (hdmi->dev,"failed to enable PLL regulator: %d\n" , err); -return err; + goto disable_hdmi; } err =regulator_enable (hdmi->vdd);if (err <0 ) {dev_err (hdmi->dev,"failed to enable VDD regulator: %d\n" , err); -return err; + goto disable_pll; }return 0 ; + +disable_pll: +regulator_disable (hdmi->pll); +disable_hdmi: +regulator_disable (hdmi->hdmi); +output_exit: +tegra_output_exit (&hdmi->output); + +return err; }static int tegra_hdmi_exit (struct host1x_client *client)
Signature · 1 line
2.33.1
PATCH v3 15/20 drm/tegra: hdmi: Register audio CODEC on Tegra20
In reply to Dmitry OsipenkoTegra20 SoC supports only S/PDIF source for HDMI audio. Register ASoC HDMI S/PDIF CODEC for Tegra20, it will be linked with the S/PDIF CPU DAI.
--- drivers/gpu/drm/tegra/Kconfig | 3 + drivers/gpu/drm/tegra/hdmi.c | 153 +++++++++++++++++++++++++++++++--- 2 files changed, 145 insertions(+), 11 deletions(-)
drivers/gpu/drm/tegra/Kconfig +3 -0
@@ -13,6 +13,9 @@ config DRM_TEGRA_ORIG select INTERCONNECT select IOMMU_IOVA select CEC_CORE if CEC_NOTIFIER + select SND_SIMPLE_CARD if SND_SOC_TEGRA20_SPDIF + select SND_SOC_HDMI_CODEC if SND_SOC_TEGRA20_SPDIF + select SND_AUDIO_GRAPH_CARD if SND_SOC_TEGRA20_SPDIF help Choose this option if you have an NVIDIA Tegra SoC.
drivers/gpu/drm/tegra/hdmi.c +142 -11
239 lines not on this page · raw message
Signature · 1 line
2.33.1
PATCH v3 16/20 ARM: tegra_defconfig: Enable S/PDIF driver
In reply to Dmitry OsipenkoEnable Tegra20 S/PDIF driver. It's a part of HDMI audio subsystem on Tegra.
--- arch/arm/configs/tegra_defconfig | 1 + 1 file changed, 1 insertion(+)
arch/arm/configs/tegra_defconfig +1 -0
@@ -239,6 +239,7 @@ CONFIG_SND_HDA_CODEC_HDMI=y CONFIG_SND_SOC=y CONFIG_SND_SOC_TEGRA=y CONFIG_SND_SOC_TEGRA20_I2S=y +CONFIG_SND_SOC_TEGRA20_SPDIF=y CONFIG_SND_SOC_TEGRA30_I2S=y CONFIG_SND_SOC_TEGRA_RT5640=y CONFIG_SND_SOC_TEGRA_WM8753=y
Signature · 1 line
2.33.1
PATCH v3 17/20 ARM: tegra: Add S/PDIF node to Tegra20 device-tree
In reply to Dmitry OsipenkoAdd S/PDIF node to Tegra20 device-tree. It's needed for enabling HDMI audio support.
--- arch/arm/boot/dts/tegra20.dtsi | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
arch/arm/boot/dts/tegra20.dtsi +18 -0
@@ -197,6 +197,7 @@ hdmi@54280000 { reset-names = "hdmi"; power-domains = <&pd_core>; operating-points-v2 = <&hdmi_dvfs_opp_table>; + #sound-dai-cells = <0>; status = "disabled"; };
@@ -396,6 +397,23 @@ tegra_ac97: ac97@70002000 { status = "disabled"; }; + tegra_spdif: spdif@70002400 { + compatible = "nvidia,tegra20-spdif"; + reg = <0x70002400 0x200>; + interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&tegra_car TEGRA20_CLK_SPDIF_OUT>, + <&tegra_car TEGRA20_CLK_SPDIF_IN>; + clock-names = "out", "in"; + resets = <&tegra_car 10>; + dmas = <&apbdma 3>, <&apbdma 3>; + dma-names = "rx", "tx"; + #sound-dai-cells = <0>; + status = "disabled"; + + assigned-clocks = <&tegra_car TEGRA20_CLK_SPDIF_OUT>; + assigned-clock-parents = <&tegra_car TEGRA20_CLK_PLL_A_OUT0>; + }; + tegra_i2s1: i2s@70002800 { compatible = "nvidia,tegra20-i2s"; reg = <0x70002800 0x200>;
Signature · 1 line
2.33.1
PATCH v3 18/20 ARM: tegra: Add HDMI audio graph to Tegra20 device-tree
In reply to Dmitry OsipenkoAdd HDMI audio graph to Tegra20 device-tree to enable HDMI audio on Tegra20 devices.
--- arch/arm/boot/dts/tegra20.dtsi | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-)
arch/arm/boot/dts/tegra20.dtsi +21 -1
@@ -186,7 +186,7 @@ rgb { }; }; - hdmi@54280000 { + tegra_hdmi: hdmi@54280000 { compatible = "nvidia,tegra20-hdmi"; reg = <0x54280000 0x00040000>; interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
@@ -1063,4 +1063,24 @@ pmu { interrupt-affinity = <&{/cpus/cpu@0}>, <&{/cpus/cpu@1}>; }; + + sound-hdmi { + compatible = "simple-audio-card"; + simple-audio-card,name = "NVIDIA Tegra20 HDMI"; + + #address-cells = <1>; + #size-cells = <0>; + + simple-audio-card,dai-link@0 { + reg = <0>; + + cpu { + sound-dai = <&tegra_spdif>; + }; + + codec { + sound-dai = <&tegra_hdmi>; + }; + }; + }; };
Signature · 1 line
2.33.1
PATCH v3 19/20 ARM: tegra: acer-a500: Enable S/PDIF and HDMI audio
In reply to Dmitry OsipenkoEnable S/PDIF controller to enable HDMI audio support on Acer A500. Use nvidia,fixed-parent-rate property that prevents audio rate conflict between S/PDIF and I2S.
--- arch/arm/boot/dts/tegra20-acer-a500-picasso.dts | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/arm/boot/dts/tegra20-acer-a500-picasso.dts +8 -0
@@ -376,8 +376,16 @@ pta { }; }; + tegra_spdif: spdif@70002400 { + status = "okay"; + + nvidia,fixed-parent-rate; + }; + tegra_i2s1: i2s@70002800 { status = "okay"; + + nvidia,fixed-parent-rate; }; uartb: serial@70006040 {
Signature · 1 line
2.33.1
PATCH v3 20/20 ARM: tegra: paz00: Enable S/PDIF and HDMI audio
In reply to Dmitry OsipenkoEnable S/PDIF controller to enable HDMI audio support on Toshiba AC100. Use nvidia,fixed-parent-rate property that prevents audio rate conflict between S/PDIF and I2S.
--- arch/arm/boot/dts/tegra20-paz00.dts | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/arm/boot/dts/tegra20-paz00.dts +8 -0
@@ -264,8 +264,16 @@ conf_ld17_0 { }; }; + spdif@70002400 { + status = "okay"; + + nvidia,fixed-parent-rate; + }; + i2s@70002800 { status = "okay"; + + nvidia,fixed-parent-rate; }; serial@70006000 {
Signature · 1 line
2.33.1