linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Russell King <rmk@arm.linux.org.uk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Daniel Mack <daniel@caiaq.de>,
	Mark Brown <broonie@opensource.wolfsonmicro.com>,
	Eric Miao <eric.y.miao@gmail.com>
Subject: linux-next: manual merge of the arm tree with Linus' tree
Date: Thu, 4 Mar 2010 10:49:58 +1100	[thread overview]
Message-ID: <20100304104958.8f9b1513.sfr@canb.auug.org.au> (raw)

Hi Russell,

Today's linux-next merge of the arm tree got a conflict in
sound/soc/pxa/pxa-ssp.c between commit
026384d614b827f368834860c9b623ce08439b7e ("ASoC: fix PXA SSP port
resume") from Linus' tree and commit
f9efc9df94fd126f7d585339e64edec0c03e904b ("ASoC: Remove legacy SSP API
usage from pxa-ssp.c") from the arm tree.

I fixed it up (see below - it should be checked) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc sound/soc/pxa/pxa-ssp.c
index e69397f,cf00df9..0000000
--- a/sound/soc/pxa/pxa-ssp.c
+++ b/sound/soc/pxa/pxa-ssp.c
@@@ -133,28 -152,39 +152,41 @@@ static void pxa_ssp_shutdown(struct snd
  static int pxa_ssp_suspend(struct snd_soc_dai *cpu_dai)
  {
  	struct ssp_priv *priv = cpu_dai->private_data;
+ 	struct ssp_device *ssp = priv->ssp;
  
  	if (!cpu_dai->active)
 -		return 0;
 +		clk_enable(priv->dev.ssp->clk);
  
- 	ssp_save_state(&priv->dev, &priv->state);
- 	clk_disable(priv->dev.ssp->clk);
+ 	priv->cr0 = __raw_readl(ssp->mmio_base + SSCR0);
+ 	priv->cr1 = __raw_readl(ssp->mmio_base + SSCR1);
+ 	priv->to  = __raw_readl(ssp->mmio_base + SSTO);
+ 	priv->psp = __raw_readl(ssp->mmio_base + SSPSP);
+ 
+ 	ssp_disable(ssp);
+ 	clk_disable(ssp->clk);
 +
  	return 0;
  }
  
  static int pxa_ssp_resume(struct snd_soc_dai *cpu_dai)
  {
  	struct ssp_priv *priv = cpu_dai->private_data;
+ 	struct ssp_device *ssp = priv->ssp;
+ 	uint32_t sssr = SSSR_ROR | SSSR_TUR | SSSR_BCE;
  
- 	clk_enable(priv->dev.ssp->clk);
- 	ssp_restore_state(&priv->dev, &priv->state);
 -	if (!cpu_dai->active)
 -		return 0;
 -
+ 	clk_enable(ssp->clk);
  
- 	if (cpu_dai->active)
- 		ssp_enable(&priv->dev);
- 	else
- 		clk_disable(priv->dev.ssp->clk);
 -	__raw_writel(sssr, ssp->mmio_base + SSSR);
++	if (cpu_dai->active) {
++		__raw_writel(sssr, ssp->mmio_base + SSSR);
++
++		__raw_writel(priv->cr0 & ~SSCR0_SSE, ssp->mmio_base + SSCR0);
++		__raw_writel(priv->cr1, ssp->mmio_base + SSCR1);
++		__raw_writel(priv->to,  ssp->mmio_base + SSTO);
++		__raw_writel(priv->psp, ssp->mmio_base + SSPSP);
++		__raw_writel(priv->cr0 | SSCR0_SSE, ssp->mmio_base + SSCR0);
++	} else
++		clk_disable(ssp->clk);
  
 -	__raw_writel(priv->cr0 & ~SSCR0_SSE, ssp->mmio_base + SSCR0);
 -	__raw_writel(priv->cr1, ssp->mmio_base + SSCR1);
 -	__raw_writel(priv->to,  ssp->mmio_base + SSTO);
 -	__raw_writel(priv->psp, ssp->mmio_base + SSPSP);
 -	__raw_writel(priv->cr0 | SSCR0_SSE, ssp->mmio_base + SSCR0);
  	return 0;
  }
  

             reply	other threads:[~2010-03-03 23:50 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-03 23:49 Stephen Rothwell [this message]
2010-03-04  1:16 ` linux-next: manual merge of the arm tree with Linus' tree Eric Miao
  -- strict thread matches above, loose matches on Subject: below --
2022-03-08 22:35 Stephen Rothwell
2020-05-27 23:09 Stephen Rothwell
2020-05-27 23:22 ` Russell King - ARM Linux admin
2020-05-28  7:01   ` Ard Biesheuvel
2020-05-30  8:41     ` Russell King - ARM Linux admin
2020-05-30  8:51       ` Ard Biesheuvel
2020-05-30  9:17         ` Russell King - ARM Linux admin
2020-05-30  9:53           ` Stephen Rothwell
2020-05-30 10:25           ` Ard Biesheuvel
2016-06-01  0:07 Stephen Rothwell
2016-06-01  8:52 ` Russell King
2012-03-30  0:11 Stephen Rothwell
2012-03-26  0:05 Stephen Rothwell
2012-03-13  0:08 Stephen Rothwell
2012-03-13  6:16 ` Ingo Molnar
2012-03-13  8:33   ` Russell King
2012-03-13  8:36     ` Ingo Molnar
2012-03-13  8:47       ` Russell King
2012-03-13  8:56         ` Ingo Molnar
2012-03-13  9:00           ` Russell King
2012-03-13  8:48     ` Ingo Molnar
2012-03-13  8:58       ` Russell King
2012-03-13  9:06         ` Ingo Molnar
2012-03-13  9:09           ` Russell King
2012-03-13  9:11           ` Russell King
2012-01-29 23:38 Stephen Rothwell
2012-01-08 23:53 Stephen Rothwell
2012-01-08 23:53 linux-next: manual merge of the arm tree with Linus tree Stephen Rothwell
2012-01-08 23:53 linux-next: manual merge of the arm tree with Linus' tree Stephen Rothwell
2011-12-20 23:08 Stephen Rothwell
2011-09-21  0:33 Stephen Rothwell
2011-09-21  9:31 ` Linus Walleij
2010-07-13  0:51 Stephen Rothwell
2010-03-03 23:33 Stephen Rothwell
2009-07-31  0:33 Stephen Rothwell
2009-07-31  0:41 ` H Hartley Sweeten

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=20100304104958.8f9b1513.sfr@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=daniel@caiaq.de \
    --cc=eric.y.miao@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=rmk@arm.linux.org.uk \
    /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;
as well as URLs for NNTP newsgroup(s).