Re: linux-next: manual merge of the pcmcia tree with the pxa tree

[Eric Miao]

On Mon, Nov 30, 2009 at 4:10 PM, Marc Zyngier <maz@xxxxxxxxxxxxxxx> wrote:
> On Mon, 30 Nov 2009 11:17:08 +0800
> Eric Miao <eric.y.miao@xxxxxxxxx> wrote:
>
> Hi Eric,
>
>> 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.
>
> Patch looks good. I'm more worried about creating dependencies between
> trees:
>
> - Stephen fix depends on Russell's changes, which are in Dominik's tree,
> - My patch depends on Zeus support, which is in your tree,
> - Rebasing Zeus PCMCIA support against Dominik's tree is just another
> Âdependency between the two trees.
>
> Should we drop my PCMCIA changes until both Russell's changes and main
> Zeus support are merged?
>

I'd propose to postpone your patches until dependency is resolved, will
send a second git pull til then. Sounds OK to you?

> I'm opened to any suggestion.
>
> Â Â Â ÂM.
>
>>
>> On Mon, Nov 30, 2009 at 10:16 AM, Stephen Rothwell
>> <sfr@xxxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxx
>> >
>> > 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);
>> >
>>
>
>
> --
> And if you don't know where you're going, any road will take you
> there...
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/