Merge branch 'fix/sunxi' of... (184f22d9) · Commits · e / devices / android_kernel_fairphone_FP4

sound/soc/sunxi/sun4i-codec.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -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;