diff options
| author | Takashi Iwai <tiwai@suse.de> | 2019-09-10 14:03:08 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-09-10 14:03:08 +0300 |
| commit | 7711fb7dac1ab77fd1b4d948f4647a569e4a1ae2 (patch) | |
| tree | dd35ad21e0eb13572757dab279ae41f6d953baed /sound/soc/sunxi/sun8i-codec.c | |
| parent | 789492f0c86505e63369907bcb1afdf52dec9366 (diff) | |
| parent | bb831786117519fc16dfd3eaa7b84e4f6bbb8d99 (diff) | |
| download | linux-7711fb7dac1ab77fd1b4d948f4647a569e4a1ae2.tar.xz | |
Merge tag 'asoc-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v5.4
Quite a big update this time around, particularly in the core
where we've had a lot of cleanups from Morimoto-san - there's
not much functional change but quite a bit of modernization
going on. We've also seen a lot of driver work, a lot of it
cleanups but also some particular drivers.
- Lots and lots of cleanups from Morimoto-san and Yue Haibing.
- Lots of cleanups and enhancements to the Freescale, sunxi dnd
Intel rivers.
- Initial Sound Open Firmware suppot for i.MX8.
- Removal of w90x900 and nuc900 drivers as the platforms are
being removed.
- New support for Cirrus Logic CS47L15 and CS47L92, Freescale
i.MX 7ULP and 8MQ, Meson G12A and NXP UDA1334
Diffstat (limited to 'sound/soc/sunxi/sun8i-codec.c')
| -rw-r--r-- | sound/soc/sunxi/sun8i-codec.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c index 0e0e8ebaa571..55798bc8eae2 100644 --- a/sound/soc/sunxi/sun8i-codec.c +++ b/sound/soc/sunxi/sun8i-codec.c @@ -533,7 +533,6 @@ static const struct regmap_config sun8i_codec_regmap_config = { static int sun8i_codec_probe(struct platform_device *pdev) { - struct resource *res_base; struct sun8i_codec *scodec; void __iomem *base; int ret; @@ -556,8 +555,7 @@ static int sun8i_codec_probe(struct platform_device *pdev) return PTR_ERR(scodec->clk_bus); } - res_base = platform_get_resource(pdev, IORESOURCE_MEM, 0); - base = devm_ioremap_resource(&pdev->dev, res_base); + base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(base)) { dev_err(&pdev->dev, "Failed to map the registers\n"); return PTR_ERR(base); |