From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752580AbcAPSgz (ORCPT ); Sat, 16 Jan 2016 13:36:55 -0500 Received: from unicorn.mansr.com ([81.2.72.234]:39612 "EHLO unicorn.mansr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752366AbcAPSgo (ORCPT ); Sat, 16 Jan 2016 13:36:44 -0500 From: Mans Rullgard To: Hans-Christian Egtvedt Cc: Jaroslav Kysela , Takashi Iwai , 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 Message-Id: <1452969349-9810-1-git-send-email-mans@mansr.com> X-Mailer: git-send-email 2.7.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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