[PATCH v4] Samsung: add new card detection methods in s3c-sdhci driver (platform part)

[Marek Szyprowski]

Hello,

On Friday, July 23, 2010 2:32 AM Kukjin Kim wrote:

> Marek Szyprowski wrote:
> >
> > On some Samsung SoCs not all SDHCI controllers have card detect (CD)
> > line. For some embedded designs it is not even needed, because ususally
> > the device (like SDIO flash memory or wifi controller) is permanently
> > wired to the controller. There are also systems which have a card detect
> > line connected to some of the external interrupt lines or the presence
> > of the card depends on some other actions (like enabling a power
> > regulator).
> >
> > This patch adds all required changes to platform support code, so
> > another patch, which extends the driver with support for the new card
> > detection methods can be applied.
> >
> > Signed-off-by: Marek Szyprowski <m.szyprowski at samsung.com>
> > Signed-off-by: Kyungmin Park <kyungmin.park at samsung.com>
> > ---
> >
> > This a resend of the previous patch.
> >
> > I hope these changes to platform specific code gets merged soon, so the
> > changes to the driver can be merged as well.
> >
> > The patch has been prepared against linux-next kernel tree from 20100722.
> >
> > Changes since V3:
> > - renamed patch to avoid confusion with the patch for the s3c-sdhci
> driver
> >   itself - added "(platform part)" in subject
> >
> > Changes since V2:
> > - added support for HSMMC3 device
> >
> > Changes since V1:
> > - added support for gpio external interrupt card based detect method
> >   directly to sdhci-s3c driver
> > - removed s3c64xx compilation fix patch from the series
> >
> > Best regards
> > --
> > Marek Szyprowski
> > Samsung Poland R&D Center
> >
> > ---
> >
> >  arch/arm/mach-s3c64xx/setup-sdhci-gpio.c   |   14 +++++++++---
> >  arch/arm/mach-s5pc100/setup-sdhci-gpio.c   |   21 ++++++++++++++-----
> >  arch/arm/mach-s5pv210/setup-sdhci-gpio.c   |   22 +++++++++++++++-----
> >  arch/arm/plat-samsung/dev-hsmmc.c          |    5 ++++
> >  arch/arm/plat-samsung/dev-hsmmc1.c         |    5 ++++
> >  arch/arm/plat-samsung/dev-hsmmc2.c         |    5 ++++
> >  arch/arm/plat-samsung/dev-hsmmc3.c         |    5 ++++
> >  arch/arm/plat-samsung/include/plat/sdhci.h |   29
> > ++++++++++++++++++++++++++++
> >  8 files changed, 90 insertions(+), 16 deletions(-)
> >
> 
> Marek,
> 
> Following is build error with this patch.
> 
> /home/kgene/linux/linux-2.6-mainline-dev/arch/arm/mach-s5pc100/setup-sdhci-
> g
> pio.c: In function 's5pc100_setup_sdhci0_cfg_gpio':
> /home/kgene/linux/linux-2.6-mainline-dev/arch/arm/mach-s5pc100/setup-sdhci-
> g
> pio.c:51: error: dereferencing pointer to incomplete type
> /home/kgene/linux/linux-2.6-mainline-dev/arch/arm/mach-s5pc100/setup-sdhci-
> g
> pio.c:51: error: 'S3C_SDHCI_CD_INTERNAL' undeclared (first use in
> /home/kgene/linux/linux-2.6-mainline-dev/arch/arm/mach-s5pc100/setup-sdhci-
> g
> pio.c:51: error: (Each undeclared identifier is reported only once
> /home/kgene/linux/linux-2.6-mainline-dev/arch/arm/mach-s5pc100/setup-sdhci-
> g
> pio.c:51: error: for each function it appears in.)
> /home/kgene/linux/linux-2.6-mainline-dev/arch/arm/mach-s5pc100/setup-sdhci-
> g
> pio.c: In function 's5pc100_setup_sdhci1_cfg_gpio':
> /home/kgene/linux/linux-2.6-mainline-dev/arch/arm/mach-s5pc100/setup-sdhci-
> g
> pio.c:71: error: dereferencing pointer to incomplete type
> /home/kgene/linux/linux-2.6-mainline-dev/arch/arm/mach-s5pc100/setup-sdhci-
> g
> pio.c:71: error: 'S3C_SDHCI_CD_INTERNAL' undeclared (first use in
> /home/kgene/linux/linux-2.6-mainline-dev/arch/arm/mach-s5pc100/setup-sdhci-
> g
> pio.c: In function 's5pc100_setup_sdhci2_cfg_gpio':
> /home/kgene/linux/linux-2.6-mainline-dev/arch/arm/mach-s5pc100/setup-sdhci-
> g
> pio.c:91: error: dereferencing pointer to incomplete type
> /home/kgene/linux/linux-2.6-mainline-dev/arch/arm/mach-s5pc100/setup-sdhci-
> g
> pio.c:91: error: 'S3C_SDHCI_CD_INTERNAL' undeclared (first use in
> make[2]: *** [arch/arm/mach-s5pc100/setup-sdhci-gpio.o] Error 1
> 
> and s3c64xx also.
> 
> ...we need inclusion <plat/sdhci.h> into the ..s3c64xx/setup-sdhci-gpio.c
> and ..s5pc100/setup-sdhci-gpio.c.
> 
> Will apply with build fix.

Ok, thank you for merging the patch fixing this issue.

Best regards
--
Marek Szyprowski
Samsung Poland R&D Center