[RFC PATCH 01/10] PCMCIA: soc_common: convert to a stand alone module
Convert soc_common.c to be a stand alone module, rather than wrapping
it up into the individual SoC specific base modules. In doing this,
we need to add init/exit functions for soc_common to register/remove
the cpufreq notifier.
Signed-off-by: Russell King
---
drivers/pcmcia/Kconfig |6 ++
drivers/pcmcia/Makefile | 10 --
drivers/pcmcia/soc_common.c | 16 +++-
3 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index fbf965b..092866f 100644
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -192,9 +192,13 @@ config PCMCIA_AU1X00
tristate "Au1x00 pcmcia support"
depends on SOC_AU1X00 && PCMCIA
+config PCMCIA_SOC_COMMON
+ bool
+
config PCMCIA_SA1100
tristate "SA1100 support"
depends on ARM && ARCH_SA1100 && PCMCIA
+ select PCMCIA_SOC_COMMON
help
Say Y here to include support for SA11x0-based PCMCIA or CF
sockets, found on HP iPAQs, Yopy, and other StrongARM(R)/
@@ -205,6 +209,7 @@ config PCMCIA_SA1100
config PCMCIA_SA
tristate "SA support"
depends on ARM && ARCH_SA1100 && SA && PCMCIA
+ select PCMCIA_SOC_COMMON
help
Say Y here to include support for SA-based PCMCIA or CF
sockets, found on the Jornada 720, Graphicsmaster and other
@@ -218,6 +223,7 @@ config PCMCIA_PXA2XX
depends on (ARCH_LUBBOCK || MACH_MAINSTONE || PXA_SHARPSL \
|| MACH_ARMCORE || ARCH_PXA_PALM || TRIZEPS_PCMCIA \
|| ARCH_VIPER || ARCH_PXA_ESERIES || MACH_STARGATE2)
+ select PCMCIA_SOC_COMMON
help
Say Y here to include support for the PXA2xx PCMCIA controller
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile
index 047394d..3895869 100644
--- a/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@ -22,8 +22,9 @@ obj-$(CONFIG_I82365) += i82365.o
obj-$(CONFIG_I82092) += i82092.o
obj-$(CONFIG_TCIC) += tcic.o
obj-$(CONFIG_PCMCIA_M8XX) += m8xx_pcmcia.o
-obj-$(CONFIG_PCMCIA_SA1100)+= sa11xx_core.o sa1100_cs.o
-obj-$(CONFIG_PCMCIA_SA)+= sa11xx_core.o sa_cs.o
+obj-$(CONFIG_PCMCIA_SOC_COMMON)+= soc_common.o
+obj-$(CONFIG_PCMCIA_SA1100)+= sa11xx_base.o sa1100_cs.o
+obj-$(CONFIG_PCMCIA_SA)+= sa11xx_base.o sa_cs.o
obj-$(CONFIG_M32R_PCC) += m32r_pcc.o
obj-$(CONFIG_M32R_CFC) += m32r_cfc.o
obj-$(CONFIG_PCMCIA_AU1X00)+= au1x00_ss.o
@@ -34,9 +35,6 @@ obj-$(CONFIG_BFIN_CFPCMCIA) +=
bfin_cf_pcmcia.o
obj-$(CONFIG_AT91_CF) += at91_cf.o
obj-$(CONFIG_ELECTRA_CF) += electra_cf.o
-sa11xx_core-y += soc_common.o sa11xx_base.o
-pxa2xx_core-y += soc_common.o pxa2xx_base.o
-
au1x00_ss-y+= au1000_generic.o
au1x00_ss-$(CONFIG_MIPS_PB1000)+= au1000_pb1x00.o
au1x00_ss-$(CONFIG_MIPS_PB1100)+= au1000_pb1x00.o
@@ -75,4 +73,4 @@ pxa2xx-obj-$(CONFIG_MACH_PALMLD) +=
pxa2xx_palmld.o
pxa2xx-obj-$(CONFIG_MACH_E740) += pxa2xx_e740.o
pxa2xx-obj-$(CONFIG_MACH_STARGATE2)+= pxa2xx_stargate2.o
-obj-$(CONFIG_PCMCIA_PXA2XX)+= pxa2xx_core.o $(pxa2xx-obj-y)
+obj-$(CONFIG_PCMCIA_PXA2XX)+= pxa2xx_base.o $(pxa2xx-obj-y)
diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c
index 163cf98..38c5484 100644
--- a/drivers/pcmcia/soc_common.c
+++ b/drivers/pcmcia/soc_common.c
@@ -608,15 +608,14 @@ static int soc_pcmcia_cpufreq_register(void)
"notifier for PCMCIA (%d)\n", ret);
return ret;
}
+fs_initcall(soc_pcmcia_cpufreq_register);
static void soc_pcmcia_cpufreq_unregister(void)
{
cpufreq_unregister_notifier(&soc_pcmcia_notifier_block,
CPUFREQ_TRANSITION_NOTIFIER);
}
+module_exit(soc_pcmcia_cpufreq_unregister);
-#else
-static int soc_pcmcia_cpufreq_register(void) { return 0; }
-static void soc_pcmcia_cpufreq_unregister(void) {}
#endif
int soc_common_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level
*ops,
@@ -667,9 +666,6 @@ int soc_common_drv_pcmcia_probe(struct device *dev, struct
pcmcia_low_level *ops
goto out_err_5;
}
- if (list_empty(&soc_pcmcia_sockets))
- soc_pcmcia_cpufreq_register();
-
list_add(&skt->node, &soc_pcmcia_sockets);
/*
@@ -742,6 +738,7 @@ int soc_common_drv_pcmcia_probe(struct device *dev, struct
pcmcia_low_level *ops
mutex_unlock(&soc_pcmcia
[RFC PATCH 01/10] PCMCIA: soc_common: convert to a stand alone module
Convert soc_common.c to be a stand alone module, rather than wrapping
it up into the individual SoC specific base modules. In doing this,
we need to add init/exit functions for soc_common to register/remove
the cpufreq notifier.
Signed-off-by: Russell King
---
drivers/pcmcia/Kconfig |6 ++
drivers/pcmcia/Makefile | 10 --
drivers/pcmcia/soc_common.c | 16 +++-
3 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index 17f38a7..0b82493 100644
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -196,9 +196,13 @@ config PCMCIA_BCM63XX
tristate "bcm63xx pcmcia support"
depends on BCM63XX && PCMCIA
+config PCMCIA_SOC_COMMON
+ bool
+
config PCMCIA_SA1100
tristate "SA1100 support"
depends on ARM && ARCH_SA1100 && PCMCIA
+ select PCMCIA_SOC_COMMON
help
Say Y here to include support for SA11x0-based PCMCIA or CF
sockets, found on HP iPAQs, Yopy, and other StrongARM(R)/
@@ -209,6 +213,7 @@ config PCMCIA_SA1100
config PCMCIA_SA
tristate "SA support"
depends on ARM && ARCH_SA1100 && SA && PCMCIA
+ select PCMCIA_SOC_COMMON
help
Say Y here to include support for SA-based PCMCIA or CF
sockets, found on the Jornada 720, Graphicsmaster and other
@@ -222,6 +227,7 @@ config PCMCIA_PXA2XX
depends on (ARCH_LUBBOCK || MACH_MAINSTONE || PXA_SHARPSL \
|| MACH_ARMCORE || ARCH_PXA_PALM || TRIZEPS_PCMCIA \
|| ARCH_VIPER || ARCH_PXA_ESERIES || MACH_STARGATE2)
+ select PCMCIA_SOC_COMMON
help
Say Y here to include support for the PXA2xx PCMCIA controller
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile
index a03a38a..3829383 100644
--- a/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@ -22,8 +22,9 @@ obj-$(CONFIG_I82365) += i82365.o
obj-$(CONFIG_I82092) += i82092.o
obj-$(CONFIG_TCIC) += tcic.o
obj-$(CONFIG_PCMCIA_M8XX) += m8xx_pcmcia.o
-obj-$(CONFIG_PCMCIA_SA1100)+= sa11xx_core.o sa1100_cs.o
-obj-$(CONFIG_PCMCIA_SA)+= sa11xx_core.o sa_cs.o
+obj-$(CONFIG_PCMCIA_SOC_COMMON)+= soc_common.o
+obj-$(CONFIG_PCMCIA_SA1100)+= sa11xx_base.o sa1100_cs.o
+obj-$(CONFIG_PCMCIA_SA)+= sa11xx_base.o sa_cs.o
obj-$(CONFIG_M32R_PCC) += m32r_pcc.o
obj-$(CONFIG_M32R_CFC) += m32r_cfc.o
obj-$(CONFIG_PCMCIA_AU1X00)+= au1x00_ss.o
@@ -35,9 +36,6 @@ obj-$(CONFIG_BFIN_CFPCMCIA) +=
bfin_cf_pcmcia.o
obj-$(CONFIG_AT91_CF) += at91_cf.o
obj-$(CONFIG_ELECTRA_CF) += electra_cf.o
-sa11xx_core-y += soc_common.o sa11xx_base.o
-pxa2xx_core-y += soc_common.o pxa2xx_base.o
-
au1x00_ss-y+= au1000_generic.o
au1x00_ss-$(CONFIG_MIPS_PB1000)+= au1000_pb1x00.o
au1x00_ss-$(CONFIG_MIPS_PB1100)+= au1000_pb1x00.o
@@ -77,4 +75,4 @@ pxa2xx-obj-$(CONFIG_MACH_PALMLD) +=
pxa2xx_palmld.o
pxa2xx-obj-$(CONFIG_MACH_E740) += pxa2xx_e740.o
pxa2xx-obj-$(CONFIG_MACH_STARGATE2)+= pxa2xx_stargate2.o
-obj-$(CONFIG_PCMCIA_PXA2XX)+= pxa2xx_core.o $(pxa2xx-obj-y)
+obj-$(CONFIG_PCMCIA_PXA2XX)+= pxa2xx_base.o $(pxa2xx-obj-y)
diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c
index 163cf98..38c5484 100644
--- a/drivers/pcmcia/soc_common.c
+++ b/drivers/pcmcia/soc_common.c
@@ -608,15 +608,14 @@ static int soc_pcmcia_cpufreq_register(void)
"notifier for PCMCIA (%d)\n", ret);
return ret;
}
+fs_initcall(soc_pcmcia_cpufreq_register);
static void soc_pcmcia_cpufreq_unregister(void)
{
cpufreq_unregister_notifier(&soc_pcmcia_notifier_block,
CPUFREQ_TRANSITION_NOTIFIER);
}
+module_exit(soc_pcmcia_cpufreq_unregister);
-#else
-static int soc_pcmcia_cpufreq_register(void) { return 0; }
-static void soc_pcmcia_cpufreq_unregister(void) {}
#endif
int soc_common_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level
*ops,
@@ -667,9 +666,6 @@ int soc_common_drv_pcmcia_probe(struct device *dev, struct
pcmcia_low_level *ops
goto out_err_5;
}
- if (list_empty(&soc_pcmcia_sockets))
- soc_pcmcia_cpufreq_register();
-
list_add(&skt->node, &soc_pcmcia_sockets);
/*
@@ -742,6 +738,7 @@ int soc_common_drv_pcmcia_probe(struct device *dev, struct
pcmcia_low_level *ops
mutex_unlock(&soc_pcmcia_
Re: [RFC PATCH 01/10] PCMCIA: soc_common: convert to a stand alone module
Hi Russell, This one is causing me some build problems. As things currently stand I can't build the pxa2xx support for pcmcia with a stargate2 as a module. It's fine if built in. Note by this I meant building with the whole pcmcia subsytem as modules. As module get a load of undefined symbols: ERROR: "soc_pcmcia_request_irqs" [drivers/pcmcia/pxa2xx_stargate2.ko] undefined! ERROR: "soc_pcmcia_free_irqs" [drivers/pcmcia/pxa2xx_stargate2.ko] undefined! ERROR: "soc_pcmcia_enable_irqs" [drivers/pcmcia/pxa2xx_stargate2.ko] undefined! ERROR: "soc_pcmcia_disable_irqs" [drivers/pcmcia/pxa2xx_stargate2.ko] undefined! ERROR: "soc_pcmcia_add_one" [drivers/pcmcia/pxa2xx_base.ko] undefined! ERROR: "soc_common_pcmcia_get_timing" [drivers/pcmcia/pxa2xx_base.ko] undefined! ERROR: "soc_pcmcia_remove_one" [drivers/pcmcia/pxa2xx_base.ko] undefined! make[1]: *** [__modpost] Error 1 make: *** [modules] Error 2 Relevant bits of .config # Bus support # # CONFIG_PCI_SYSCALL is not set # CONFIG_ARCH_SUPPORTS_MSI is not set CONFIG_PCCARD=m CONFIG_PCMCIA=m CONFIG_PCMCIA_LOAD_CIS=y CONFIG_PCMCIA_IOCTL=y # # PC-card bridges # CONFIG_PCMCIA_SOC_COMMON=y CONFIG_PCMCIA_PXA2XX=m # CONFIG_PCMCIA_DEBUG is not set I think the fix is: diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig index 518b5ef..a02a135 100644 --- a/drivers/pcmcia/Kconfig +++ b/drivers/pcmcia/Kconfig @@ -200,7 +200,7 @@ config PCMCIA_BCM63XX depends on BCM63XX && PCMCIA config PCMCIA_SOC_COMMON - bool + tristate config PCMCIA_SA1100 tristate "SA1100 support" > Convert soc_common.c to be a stand alone module, rather than wrapping > it up into the individual SoC specific base modules. In doing this, > we need to add init/exit functions for soc_common to register/remove > the cpufreq notifier. > > Signed-off-by: Russell King > --- > drivers/pcmcia/Kconfig |6 ++ > drivers/pcmcia/Makefile | 10 -- > drivers/pcmcia/soc_common.c | 16 +++- > 3 files changed, 17 insertions(+), 15 deletions(-) > > diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig > index 17f38a7..0b82493 100644 > --- a/drivers/pcmcia/Kconfig > +++ b/drivers/pcmcia/Kconfig > @@ -196,9 +196,13 @@ config PCMCIA_BCM63XX > tristate "bcm63xx pcmcia support" > depends on BCM63XX && PCMCIA > > +config PCMCIA_SOC_COMMON > + bool > + > config PCMCIA_SA1100 > tristate "SA1100 support" > depends on ARM && ARCH_SA1100 && PCMCIA > + select PCMCIA_SOC_COMMON > help > Say Y here to include support for SA11x0-based PCMCIA or CF > sockets, found on HP iPAQs, Yopy, and other StrongARM(R)/ > @@ -209,6 +213,7 @@ config PCMCIA_SA1100 > config PCMCIA_SA > tristate "SA support" > depends on ARM && ARCH_SA1100 && SA && PCMCIA > + select PCMCIA_SOC_COMMON > help > Say Y here to include support for SA-based PCMCIA or CF > sockets, found on the Jornada 720, Graphicsmaster and other > @@ -222,6 +227,7 @@ config PCMCIA_PXA2XX > depends on (ARCH_LUBBOCK || MACH_MAINSTONE || PXA_SHARPSL \ > || MACH_ARMCORE || ARCH_PXA_PALM || TRIZEPS_PCMCIA \ > || ARCH_VIPER || ARCH_PXA_ESERIES || MACH_STARGATE2) > + select PCMCIA_SOC_COMMON > help > Say Y here to include support for the PXA2xx PCMCIA controller > > diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile > index a03a38a..3829383 100644 > --- a/drivers/pcmcia/Makefile > +++ b/drivers/pcmcia/Makefile > @@ -22,8 +22,9 @@ obj-$(CONFIG_I82365)+= > i82365.o > obj-$(CONFIG_I82092) += i82092.o > obj-$(CONFIG_TCIC) += tcic.o > obj-$(CONFIG_PCMCIA_M8XX)+= m8xx_pcmcia.o > -obj-$(CONFIG_PCMCIA_SA1100) += sa11xx_core.o sa1100_cs.o > -obj-$(CONFIG_PCMCIA_SA) += sa11xx_core.o sa_cs.o > +obj-$(CONFIG_PCMCIA_SOC_COMMON) += soc_common.o > +obj-$(CONFIG_PCMCIA_SA1100) += sa11xx_base.o sa1100_cs.o > +obj-$(CONFIG_PCMCIA_SA) += sa11xx_base.o sa_cs.o > obj-$(CONFIG_M32R_PCC) += m32r_pcc.o > obj-$(CONFIG_M32R_CFC) += m32r_cfc.o > obj-$(CONFIG_PCMCIA_AU1X00) += au1x00_ss.o > @@ -35,9 +36,6 @@ obj-$(CONFIG_BFIN_CFPCMCIA) += > bfin_cf_pcmcia.o > obj-$(CONFIG_AT91_CF)+= at91_cf.o > obj-$(CONFIG_ELECTRA_CF) += electra_cf.o > > -sa11xx_core-y+= soc_common.o > sa11xx_base.o > -pxa2xx_core-y+= soc_common.o > pxa2xx_base.o > - > au1x00_ss-y += au1000_generic.o > au1x00_ss-$(CONFIG_MIPS_PB1000) += au1000_pb1x00.o > au1x00_ss-$(CONFIG_MIPS_PB1100)
Re: [RFC PATCH 01/10] PCMCIA: soc_common: convert to a stand alone module
On Fri, Dec 04, 2009 at 05:18:16PM +, Jonathan Cameron wrote: > Hi Russell, > > This one is causing me some build problems. Well, I've no idea what's happened to Dominik. While I may be the author of these patches, I didn't commit them, so they're out of my control. There are some outstanding merge issues which SFR identified, and so far Dominik has been quiet on them. For the time being, I'll merge your patch into my git tree, but unless Dominik hands my patches back to me for merging, it will be lost. ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: [RFC PATCH 01/10] PCMCIA: soc_common: convert to a stand alone module
Russell, On Fri, Dec 04, 2009 at 05:24:17PM +, Russell King - ARM Linux wrote: > For the time being, I'll merge your patch into my git tree, but unless > Dominik hands my patches back to me for merging, it will be lost. your patches -- which you asked me to merge and push upstream -- are on their way to Linus. I'll merge this bugfix to your patch later and push it upstream, too, unless you prefer to do that independently. Best, Dominik ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: [RFC PATCH 01/10] PCMCIA: soc_common: convert to a stand alone module
On Sat, Dec 05, 2009 at 10:56:33AM +0100, Dominik Brodowski wrote:
> Russell,
>
> On Fri, Dec 04, 2009 at 05:24:17PM +, Russell King - ARM Linux wrote:
> > For the time being, I'll merge your patch into my git tree, but unless
> > Dominik hands my patches back to me for merging, it will be lost.
>
> your patches -- which you asked me to merge and push upstream -- are on
> their way to Linus. I'll merge this bugfix to your patch later and push it
> upstream, too, unless you prefer to do that independently.
Yes I did at the time, but things change. Since you've been totally silent
on the merge conflicts between your PCMCIA tree and my tree which SFR
reported on December 1st:
| Hi Dominik,
|
| Today's linux-next merge of the pcmcia tree got a conflict in
| drivers/pcmcia/sa1100_h3600.c between commit
| 6ce8f65e71f0d80ee23b543be09789dd865a99be ("ARM: 5811/1: pcmcia: convert
| sa1100_h3600 driver to gpiolib") from the arm 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. Please
| check the fix below.
...
To which there was this reply:
| Fix looks good to me, and testing next-20091201 on real device (h3600)
| shows no problems with pcmcia.
|
| Perhaps this merge conflict can be avoided by merging Russell's PCMCIA
| patches through arm tree. But, anyway, it's Russell and Dominik
| to decide.
And a reply from me agreeing that it would probably make more sense in
light of this for my patches to go through my tree.
This is no longer possible, so I'm going to kick out the conflicting code
for the time being. The conflicting stuff can be merged at some later
date once this kind of issue is solved.
___
Linux PCMCIA reimplementation list
http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: [RFC PATCH 01/10] PCMCIA: soc_common: convert to a stand alone module
Russell,
On Sat, Dec 05, 2009 at 10:28:16AM +, Russell King - ARM Linux wrote:
> On Sat, Dec 05, 2009 at 10:56:33AM +0100, Dominik Brodowski wrote:
> > Russell,
> >
> > On Fri, Dec 04, 2009 at 05:24:17PM +, Russell King - ARM Linux wrote:
> > > For the time being, I'll merge your patch into my git tree, but unless
> > > Dominik hands my patches back to me for merging, it will be lost.
> >
> > your patches -- which you asked me to merge and push upstream -- are on
> > their way to Linus. I'll merge this bugfix to your patch later and push it
> > upstream, too, unless you prefer to do that independently.
>
> Yes I did at the time, but things change. Since you've been totally silent
> on the merge conflicts between your PCMCIA tree and my tree which SFR
> reported on December 1st:
Well, as this was an addition through your tree, I didn't consider it
neccessary to comment on it.
> | Hi Dominik,
> |
> | Today's linux-next merge of the pcmcia tree got a conflict in
> | drivers/pcmcia/sa1100_h3600.c between commit
> | 6ce8f65e71f0d80ee23b543be09789dd865a99be ("ARM: 5811/1: pcmcia: convert
> | sa1100_h3600 driver to gpiolib") from the arm 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. Please
> | check the fix below.
> ...
>
> To which there was this reply:
> | Fix looks good to me, and testing next-20091201 on real device (h3600)
> | shows no problems with pcmcia.
> |
> | Perhaps this merge conflict can be avoided by merging Russell's PCMCIA
> | patches through arm tree. But, anyway, it's Russell and Dominik
> | to decide.
>
> And a reply from me agreeing that it would probably make more sense in
> light of this for my patches to go through my tree.
Well, another option would have been to merge the other changes to
drivers/pcmcia/ via PCMCIA -- something which has not even been suggested.
More and more I think some if not all PCMCIA socket drivers should reside in
subdirectories to drivers/pcmcia/ .
> This is no longer possible, so I'm going to kick out the conflicting code
> for the time being. The conflicting stuff can be merged at some later
> date once this kind of issue is solved.
That's one option, yes.
Best,
Dominik
___
Linux PCMCIA reimplementation list
http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: [RFC PATCH 01/10] PCMCIA: soc_common: convert to a stand alone module
On Sat, Dec 05, 2009 at 12:04:17PM +0100, Dominik Brodowski wrote:
> Russell,
>
> On Sat, Dec 05, 2009 at 10:28:16AM +, Russell King - ARM Linux wrote:
> > On Sat, Dec 05, 2009 at 10:56:33AM +0100, Dominik Brodowski wrote:
> > > Russell,
> > >
> > > On Fri, Dec 04, 2009 at 05:24:17PM +, Russell King - ARM Linux wrote:
> > > > For the time being, I'll merge your patch into my git tree, but unless
> > > > Dominik hands my patches back to me for merging, it will be lost.
> > >
> > > your patches -- which you asked me to merge and push upstream -- are on
> > > their way to Linus. I'll merge this bugfix to your patch later and push it
> > > upstream, too, unless you prefer to do that independently.
> >
> > Yes I did at the time, but things change. Since you've been totally silent
> > on the merge conflicts between your PCMCIA tree and my tree which SFR
> > reported on December 1st:
>
> Well, as this was an addition through your tree, I didn't consider it
> neccessary to comment on it.
Which, in spite of the discussion surrounding the conflict, and the
resulting fall-out from it, would seem to have been the wrong decision.
>
> > | Hi Dominik,
> > |
> > | Today's linux-next merge of the pcmcia tree got a conflict in
> > | drivers/pcmcia/sa1100_h3600.c between commit
> > | 6ce8f65e71f0d80ee23b543be09789dd865a99be ("ARM: 5811/1: pcmcia: convert
> > | sa1100_h3600 driver to gpiolib") from the arm 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. Please
> > | check the fix below.
> > ...
> >
> > To which there was this reply:
> > | Fix looks good to me, and testing next-20091201 on real device (h3600)
> > | shows no problems with pcmcia.
> > |
> > | Perhaps this merge conflict can be avoided by merging Russell's PCMCIA
> > | patches through arm tree. But, anyway, it's Russell and Dominik
> > | to decide.
> >
> > And a reply from me agreeing that it would probably make more sense in
> > light of this for my patches to go through my tree.
>
> Well, another option would have been to merge the other changes to
> drivers/pcmcia/ via PCMCIA -- something which has not even been suggested.
That would mean merging a bunch of other non-PCMCIA related changes
through your tree as well.
Do you want all the non-PCMCIA related changes in your tree as well?
> More and more I think some if not all PCMCIA socket drivers should reside in
> subdirectories to drivers/pcmcia/ .
That's a completely separate issue.
___
Linux PCMCIA reimplementation list
http://lists.infradead.org/mailman/listinfo/linux-pcmcia
