diff options
| author |   Mark Brown <broonie@kernel.org> | 2016-11-03 14:28:20 -0600 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-11-03 14:28:20 -0600 |
| commit | 184f22d9b8b2b0614d922f9825cf1a68094d5217 (patch) | |
| tree | 064bf425cb7a24bf5130c67e060849bd4873cc7c /sound/soc/sunxi | |
| parent | ASoC: sun4i-codec: Revise comments for register definition macros (diff) | |
| parent | ASoC: sun4i-codec: Enable bus clock after getting GPIO (diff) | |
| download | wireguard-linux-184f22d9b8b2b0614d922f9825cf1a68094d5217.tar.xz wireguard-linux-184f22d9b8b2b0614d922f9825cf1a68094d5217.zip | |
Merge branch 'fix/sunxi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-sunxi
Diffstat (limited to 'sound/soc/sunxi')
| -rw-r--r-- | sound/soc/sunxi/sun4i-codec.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c index 969d86b4cd44..5ff071fd4996 100644 --- a/sound/soc/sunxi/sun4i-codec.c +++ b/sound/soc/sunxi/sun4i-codec.c @@ -837,12 +837,6 @@ static int sun4i_codec_probe(struct platform_device *pdev) return PTR_ERR(scodec->clk_module); } - /* Enable the bus clock */ - if (clk_prepare_enable(scodec->clk_apb)) { - dev_err(&pdev->dev, "Failed to enable the APB clock\n"); - return -EINVAL; - } - scodec->gpio_pa = devm_gpiod_get_optional(&pdev->dev, "allwinner,pa", GPIOD_OUT_LOW); if (IS_ERR(scodec->gpio_pa)) { @@ -852,6 +846,12 @@ static int sun4i_codec_probe(struct platform_device *pdev) return ret; } + /* Enable the bus clock */ + if (clk_prepare_enable(scodec->clk_apb)) { + dev_err(&pdev->dev, "Failed to enable the APB clock\n"); + return -EINVAL; + } + /* DMA configuration for TX FIFO */ scodec->playback_dma_data.addr = res->start + SUN4I_CODEC_DAC_TXDATA; scodec->playback_dma_data.maxburst = 4; |