The Linux Kernel Mailing List
 help / color / mirror / Atom feed
From: Mans Rullgard <mans@mansr.com>
To: Hans-Christian Egtvedt <egtvedt@samfundet.no>
Cc: Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
	alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org
Subject: [PATCH] ALSA: at73c213: manage SSC clock
Date: Sat, 16 Jan 2016 18:35:49 +0000	[thread overview]
Message-ID: <1452969349-9810-1-git-send-email-mans@mansr.com> (raw)

Since commit 49af54ff0fc7 ("misc: atmel-ssc: prepare clock only when
request") the SSC driver expects clients to manage the SSC clock.
Update this driver accordingly.

Signed-off-by: Mans Rullgard <mans@mansr.com>
---
 sound/spi/at73c213.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/sound/spi/at73c213.c b/sound/spi/at73c213.c
index 39522367897c..3b2d0b2be421 100644
--- a/sound/spi/at73c213.c
+++ b/sound/spi/at73c213.c
@@ -981,6 +981,8 @@ static int snd_at73c213_probe(struct spi_device *spi)
 		goto out_card;
 	}
 
+	clk_enable(chip->ssc->clk);
+
 	retval = snd_at73c213_dev_init(card, spi);
 	if (retval)
 		goto out_ssc;
@@ -998,6 +1000,7 @@ static int snd_at73c213_probe(struct spi_device *spi)
 	goto out;
 
 out_ssc:
+	clk_disable(chip->ssc->clk);
 	ssc_free(chip->ssc);
 out_card:
 	snd_card_free(card);
@@ -1066,6 +1069,9 @@ out:
 	/* Stop DAC master clock. */
 	clk_disable(chip->board->dac_clk);
 
+	/* Stop SSC clock. */
+	clk_disable(chip->ssc->clk);
+
 	ssc_free(chip->ssc);
 	snd_card_free(card);
 
@@ -1080,6 +1086,7 @@ static int snd_at73c213_suspend(struct device *dev)
 	struct snd_at73c213 *chip = card->private_data;
 
 	ssc_writel(chip->ssc->regs, CR, SSC_BIT(CR_TXDIS));
+	clk_disable(chip->ssc->clk);
 	clk_disable(chip->board->dac_clk);
 
 	return 0;
@@ -1091,6 +1098,7 @@ static int snd_at73c213_resume(struct device *dev)
 	struct snd_at73c213 *chip = card->private_data;
 
 	clk_enable(chip->board->dac_clk);
+	clk_enable(chip->ssc->clk);
 	ssc_writel(chip->ssc->regs, CR, SSC_BIT(CR_TXEN));
 
 	return 0;
-- 
2.7.0

             reply	other threads:[~2016-01-16 18:36 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-16 18:35 Mans Rullgard [this message]
2016-01-17 14:43 ` [PATCH] ALSA: at73c213: manage SSC clock Måns Rullgård
2016-01-17 21:34 ` Hans-Christian Noren Egtvedt
2016-01-17 21:44   ` Måns Rullgård

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1452969349-9810-1-git-send-email-mans@mansr.com \
    --to=mans@mansr.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=egtvedt@samfundet.no \
    --cc=linux-kernel@vger.kernel.org \
    --cc=perex@perex.cz \
    --cc=tiwai@suse.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox