From: Eric Miao <eric.y.miao@gmail•com>
To: Marc Zyngier <maz@misterjones•org>,
Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Dominik Brodowski <linux@dominikbrodowski•net>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Russell King - ARM Linux <linux@arm•linux.org.uk>
Subject: Re: linux-next: manual merge of the pcmcia tree with the pxa tree
Date: Mon, 30 Nov 2009 11:17:08 +0800 [thread overview]
Message-ID: <f17812d70911291917y2aeebbberbf31775491f0df4f@mail.gmail.com> (raw)
In-Reply-To: <20091130131627.8ccc6033.sfr@canb.auug.org.au>
Hi Marc,
Could you take a look into this, I wonder you may need to rebase
against Russell's
PCMCIA generalization stuffs. Let me know if you want me to drop this patch.
- eric
On Mon, Nov 30, 2009 at 10:16 AM, Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> Hi Dominik,
>
> Today's linux-next merge of the pcmcia tree got a conflict in drivers/pcmcia/pxa2xx_viper.c between commit c9b74a4489db7e6fe03fbee11f406b9641baae55 ("[ARM] pxa/zeus: make Viper pcmcia support more generic to support Zeus") from the pxa tree and commit 66024db57d5b9011e274b314affad68f370c0d6f ("PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket") from the pcmcia tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
> --
> Cheers,
> Stephen Rothwell sfr@canb•auug.org.au
>
> diff --cc drivers/pcmcia/pxa2xx_viper.c
> index 7a16ae9,27be2e1..0000000
> --- a/drivers/pcmcia/pxa2xx_viper.c
> +++ b/drivers/pcmcia/pxa2xx_viper.c
> @@@ -30,35 -32,23 +30,35 @@@
> #include "soc_common.h"
> #include "pxa2xx_base.h"
>
> +static struct platform_device *arcom_pcmcia_dev;
> +
> static struct pcmcia_irqs irqs[] = {
> - { 0, gpio_to_irq(VIPER_CF_CD_GPIO), "PCMCIA_CD" }
> + {
> + .sock = 0,
> + .str = "PCMCIA_CD",
> + },
> };
>
> +static inline struct arcom_pcmcia_pdata *viper_get_pdata(void)
> +{
> + return arcom_pcmcia_dev->dev.platform_data;
> +}
> +
> static int viper_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
> {
> + struct arcom_pcmcia_pdata *pdata = viper_get_pdata();
> unsigned long flags;
>
> - skt->irq = gpio_to_irq(pdata->rdy_gpio);
> - skt->socket.pci_irq = gpio_to_irq(VIPER_CF_RDY_GPIO);
> ++ skt->socket.pci_irq = gpio_to_irq(pdata->rdy_gpio);
> + irqs[0].irq = gpio_to_irq(pdata->cd_gpio);
>
> - if (gpio_request(VIPER_CF_CD_GPIO, "CF detect"))
> + if (gpio_request(pdata->cd_gpio, "CF detect"))
> goto err_request_cd;
>
> - if (gpio_request(VIPER_CF_RDY_GPIO, "CF ready"))
> + if (gpio_request(pdata->rdy_gpio, "CF ready"))
> goto err_request_rdy;
>
> - if (gpio_request(VIPER_CF_POWER_GPIO, "CF power"))
> + if (gpio_request(pdata->pwr_gpio, "CF power"))
> goto err_request_pwr;
>
> local_irq_save(flags);
>
next prev parent reply other threads:[~2009-11-30 3:17 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-30 2:16 linux-next: manual merge of the pcmcia tree with the pxa tree Stephen Rothwell
2009-11-30 3:17 ` Eric Miao [this message]
2009-11-30 8:10 ` Marc Zyngier
2009-11-30 8:16 ` Eric Miao
2009-11-30 9:24 ` Marc Zyngier
2009-11-30 9:48 ` Russell King - ARM Linux
2009-12-06 9:49 ` Marc Zyngier
-- strict thread matches above, loose matches on Subject: below --
2009-11-30 2:16 Stephen Rothwell
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=f17812d70911291917y2aeebbberbf31775491f0df4f@mail.gmail.com \
--to=eric.y.miao@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux@arm$(echo .)linux.org.uk \
--cc=linux@dominikbrodowski$(echo .)net \
--cc=maz@misterjones$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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