diff options
| author | Takashi Iwai <tiwai@suse.de> | 2021-07-01 08:36:12 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-07-01 08:36:12 +0200 |
| commit | 50de417b7a5bfe8ab5c571427703f67c934736dc (patch) | |
| tree | c791889f8e1c325e286eea593743cc4a24732e07 /sound/soc/tegra/tegra210_admaif.c | |
| parent | 459d2320dc21bd69533589d2f0a37ca942edefb7 (diff) | |
| parent | 192664528154a84fab4e6d820f9cb2e2e0835544 (diff) | |
| download | linux-50de417b7a5bfe8ab5c571427703f67c934736dc.tar.gz linux-50de417b7a5bfe8ab5c571427703f67c934736dc.tar.bz2 linux-50de417b7a5bfe8ab5c571427703f67c934736dc.zip | |
Merge tag 'asoc-v5.14' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v5.14
This release sees a nice new feature in the core from Morimoto-san,
support for automatic negotiation of DAI formats between the components
on the link. Otherwise the big highlight was the merging of the Tegra
machine drivers into a single driver avoiding a bunch of duplication.
- Support for automatic negotiation of DAI formats.
- Accessory detection support for several Qualcomm parts.
- Support for IEC958 control with hdmi-codec.
- Merging of Tegra machine drivers into a single driver.
- Support for AmLogic SM1 TOACODEC, Intel AlderLake-M, several NXP
i.MX8 variants, NXP TFA1 and TDF9897, Rockchip RK817, Qualcomm
Quinary MI2S, Texas Instruments TAS2505
Diffstat (limited to 'sound/soc/tegra/tegra210_admaif.c')
| -rw-r--r-- | sound/soc/tegra/tegra210_admaif.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/tegra/tegra210_admaif.c b/sound/soc/tegra/tegra210_admaif.c index 1268046b345d..0f9beef429a2 100644 --- a/sound/soc/tegra/tegra210_admaif.c +++ b/sound/soc/tegra/tegra210_admaif.c @@ -706,9 +706,7 @@ static int tegra_admaif_probe(struct platform_device *pdev) return -ENOMEM; } - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - - regs = devm_ioremap_resource(&pdev->dev, res); + regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res); if (IS_ERR(regs)) return PTR_ERR(regs); |