linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: daniel@caiaq.de (Daniel Mack)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/5] ARM: MX3: add SPI functions for lilly1131-db
Date: Fri, 30 Oct 2009 11:30:51 +0100	[thread overview]
Message-ID: <20091030103051.GY14091@buzzloop.caiaq.de> (raw)
In-Reply-To: <20091030102827.GE11014@pengutronix.de>

On Fri, Oct 30, 2009 at 11:28:27AM +0100, Sascha Hauer wrote:
> On Fri, Oct 30, 2009 at 01:38:22AM +0100, Daniel Mack wrote:
> > Hi Sascha,
> > 
> > did you pull this series already? I'm asking because after a recent
> > rebase (Linus pulled the ARM bits just now), this one patch below breaks
> > the build as the SPI device names appear to have changed. The other
> > patches in these series are not affected.
> > 
> > I can either send a new version or a fixup patch, whatever makes more
> > sense.
> 
> Yes, I already pulled it. I amended the following into this patch:
> 
> 
> commit acc8e6f7e1ace45b45229ac252ba72cc14061e6f
> Author: Sascha Hauer <s.hauer@pengutronix.de>
> Date:   Fri Oct 30 11:24:02 2009 +0100
> 
>     add to 15419f65df1eddddd2afe3430f8dd8a9044a4dcc
>     
>     Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> 
> diff --git a/arch/arm/mach-mx3/mx31lilly.c b/arch/arm/mach-mx3/mx31lilly.c
> index 59b3526..f593a62 100644
> --- a/arch/arm/mach-mx3/mx31lilly.c
> +++ b/arch/arm/mach-mx3/mx31lilly.c
> @@ -162,8 +162,8 @@ static void __init mx31lilly_board_init(void)
>  	mxc_iomux_alloc_pin(MX31_PIN_CSPI2_SS1__SS1, "SPI2_SS1");
>  	mxc_iomux_alloc_pin(MX31_PIN_CSPI2_SS2__SS2, "SPI2_SS2");
>  
> -	mxc_register_device(&imx_spi_device0, &spi0_pdata);
> -	mxc_register_device(&imx_spi_device1, &spi1_pdata);
> +	mxc_register_device(&mxc_spi_device0, &spi0_pdata);
> +	mxc_register_device(&mxc_spi_device1, &spi1_pdata);
>  
>  	platform_add_devices(devices, ARRAY_SIZE(devices));
>  }
> 
> Is this ok or missed I something?

No, perfect. That would have been my fixup patch :)

Thanks!
Daniel

      reply	other threads:[~2009-10-30 10:30 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-10-26 10:55 MX3: SPI/MMC/I2C fixes for lilly-1131 modules Daniel Mack
2009-10-26 10:55 ` [PATCH 1/5] ARM: MX3: remove I2C defintions from mx31lilly.c Daniel Mack
2009-10-26 10:55   ` [PATCH 2/5] ARM: MX3: add SPI functions for lilly1131-db Daniel Mack
2009-10-26 10:55     ` [PATCH 3/5] ARM: MX3: add support for mc13783 on lilly-db Daniel Mack
2009-10-26 10:55       ` [PATCH 4/5] ARM: MX3: Add pad config for MMC pins " Daniel Mack
2009-10-26 10:55         ` [PATCH 5/5] ARM: MX3: add MX3X_UART1_BASE_ADDR for uncompression on lilly1131 Daniel Mack
2009-10-30  0:38     ` [PATCH 2/5] ARM: MX3: add SPI functions for lilly1131-db Daniel Mack
2009-10-30 10:28       ` Sascha Hauer
2009-10-30 10:30         ` Daniel Mack [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=20091030103051.GY14091@buzzloop.caiaq.de \
    --to=daniel@caiaq.de \
    --cc=linux-arm-kernel@lists.infradead.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).