alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
From: Markus Pargmann <mpa@pengutronix.de>
To: Shawn Guo <shawn.guo@linaro.org>
Cc: alsa-devel@alsa-project.org, Liam Girdwood <lgirdwood@gmail.com>,
	Timur Tabi <timur@tabi.org>, Mark Brown <broonie@kernel.org>,
	kernel@pengutronix.de, Fabio Estevam <festevam@gmail.com>,
	linux-arm-kernel@lists.infradead.org
Subject: Re: [RFC 9/9] ARM: DTS: imx5* imx6*, use imx50-ssi
Date: Mon, 18 Nov 2013 14:42:26 +0100	[thread overview]
Message-ID: <20131118134226.GM30263@pengutronix.de> (raw)
In-Reply-To: <20131118020233.GN11014@S2101-09.ap.freescale.net>

Hi Shawn,

On Mon, Nov 18, 2013 at 10:02:35AM +0800, Shawn Guo wrote:
> On Fri, Nov 15, 2013 at 04:49:44PM +0100, Markus Pargmann wrote:
> > imx50-ssi and imx21-ssi are different IPs. imx50-ssi supports online
> > reconfiguration and needs this for correct interaction with SDMA. Move
> > from imx21-ssi to imx50-ssi for all imx5/imx6 SoCs.
> > 
> > Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
> > ---
> >  arch/arm/boot/dts/imx51.dtsi   | 6 +++---
> >  arch/arm/boot/dts/imx53.dtsi   | 6 +++---
> >  arch/arm/boot/dts/imx6qdl.dtsi | 6 +++---
> >  arch/arm/boot/dts/imx6sl.dtsi  | 6 +++---
> >  4 files changed, 12 insertions(+), 12 deletions(-)
> > 
> > diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
> > index 54cee65..22d4dbe 100644
> > --- a/arch/arm/boot/dts/imx51.dtsi
> > +++ b/arch/arm/boot/dts/imx51.dtsi
> > @@ -150,7 +150,7 @@
> >  				};
> >  
> >  				ssi2: ssi@70014000 {
> > -					compatible = "fsl,imx51-ssi", "fsl,imx21-ssi";
> > +					compatible = "fsl,imx51-ssi", "fsl,imx50-ssi";
> 
> Instead of replacing "fsl,imx21-ssi" with "fsl,imx50-ssi", we may want
> to just add "fsl,imx50-ssi" in the middle to maintain the compatible
> history.  Note, it only works with the change I suggested on
> of_device_id table order.  The bonus point of doing so is that we will
> not have git bisect issue to worry about with merging this patch and
> others in the series via different tree.

Thanks, I changed the id table order and added imx21-ssi as compatible
again.

Regards,

Markus


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

      reply	other threads:[~2013-11-18 13:42 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-15 15:49 [RFC 0/9] ASoC: fsl-ssi: offline/online configuration and cleanups Markus Pargmann
2013-11-15 15:49 ` [RFC 1/9] ASoC: fsl-ssi: Drop AC97 debug register usage Markus Pargmann
2013-11-15 15:49 ` [RFC 2/9] ASoC: fsl-ssi: Move ac97 specific setup to seperate function Markus Pargmann
2013-11-15 15:49 ` [RFC 3/9] ASoC: fsl-ssi: Move sysfs stats to debugfs Markus Pargmann
2013-11-15 15:49 ` [RFC 4/9] ASoC: fsl-ssi: Add imx50-ssi and of_device_id matching Markus Pargmann
2013-11-18  1:38   ` Shawn Guo
2013-11-15 15:49 ` [RFC 5/9] ASoC: fsl-ssi: Add offline_config flag Markus Pargmann
2013-11-15 15:49 ` [RFC 6/9] ASoC: fsl-ssi: Add configuration helper functions Markus Pargmann
2013-11-15 15:49 ` [RFC 7/9] ASoC: fsl-ssi: Move RX/TX configuration to seperate functions Markus Pargmann
2013-11-15 15:49 ` [RFC 8/9] ASoC: fsl-ssi: Drop ac97 specific trigger function Markus Pargmann
2013-11-15 15:49 ` [RFC 9/9] ARM: DTS: imx5* imx6*, use imx50-ssi Markus Pargmann
2013-11-18  2:02   ` Shawn Guo
2013-11-18 13:42     ` Markus Pargmann [this message]

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=20131118134226.GM30263@pengutronix.de \
    --to=mpa@pengutronix.de \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=festevam@gmail.com \
    --cc=kernel@pengutronix.de \
    --cc=lgirdwood@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=shawn.guo@linaro.org \
    --cc=timur@tabi.org \
    /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).