Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06b753d6 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next

parents 9912b30f 6f0d9479

drivers/misc/atmel-ssc.c

+4 −4
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ struct ssc_device *ssc_request(unsigned int ssc_num) 
	ssc->user++;

	spin_unlock(&user_lock);



	clk_enable(ssc->clk);

	clk_prepare_enable(ssc->clk);



	return ssc;

}
@@ -69,7 +69,7 @@ void ssc_free(struct ssc_device *ssc) 
	spin_lock(&user_lock);

	if (ssc->user) {

		ssc->user--;

		clk_disable(ssc->clk);

		clk_disable_unprepare(ssc->clk);

	} else {

		dev_dbg(&ssc->pdev->dev, "device already free\n");

	}
@@ -167,10 +167,10 @@ static int ssc_probe(struct platform_device *pdev) 
	}



	/* disable all interrupts */

	clk_enable(ssc->clk);

	clk_prepare_enable(ssc->clk);

	ssc_writel(ssc->regs, IDR, -1);

	ssc_readl(ssc->regs, SR);

	clk_disable(ssc->clk);

	clk_disable_unprepare(ssc->clk);



	ssc->irq = platform_get_irq(pdev, 0);

	if (!ssc->irq) {

sound/soc/atmel/sam9g20_wm8731.c

+0 −9
Original line number Diff line number Diff line
@@ -38,8 +38,6 @@ 
#include <linux/platform_device.h>

#include <linux/i2c.h>



#include <linux/pinctrl/consumer.h>



#include <linux/atmel-ssc.h>



#include <sound/core.h>
@@ -203,15 +201,8 @@ static int at91sam9g20ek_audio_probe(struct platform_device *pdev) 
	struct device_node *codec_np, *cpu_np;

	struct clk *pllb;

	struct snd_soc_card *card = &snd_soc_at91sam9g20ek;

	struct pinctrl *pinctrl;

	int ret;



	pinctrl = devm_pinctrl_get_select_default(&pdev->dev);

	if (IS_ERR(pinctrl)) {

		dev_err(&pdev->dev, "Failed to request pinctrl for mck\n");

		return PTR_ERR(pinctrl);

	}



	if (!np) {

		if (!(machine_is_at91sam9g20ek() ||

			machine_is_at91sam9g20ek_2mmc()))