Support for platform-esdhc-controller
Subsystems (4)
This is a patch series adding support for the esdhc-controller as a platform device which can be found on e.g. mx35/51. It was tested using a mx35-based Phytec pcm043. This is still a WIP! ADMA2 is not supported so far (mx35 just has ADMA1 which is not supported by the core?) I will see if I can grab a mx51-board later.
The following changes since commit 2bfc96a127bc1cc94d26bfaa40159966064f9c8c:
Linux 2.6.36-rc3 (2010-08-29 08:36:04 -0700)
are available in the git repository at:
git://git.pengutronix.de/git/wsa/linux-2.6.git pcm043-mmc
Wolfram Sang (3):
sdhci-pltfm: Add structure for host-specific data
mmc: add driver for imx35/51
pcm043: add resources for mmc
arch/arm/mach-mx3/mach-pcm043.c | 29 ++++++ drivers/mmc/host/Kconfig | 9 ++ drivers/mmc/host/Makefile | 1 + drivers/mmc/host/sdhci-esdhc.c | 194 +++++++++++++++++++++++++++++++++++++++ drivers/mmc/host/sdhci-pltfm.c | 10 ++- drivers/mmc/host/sdhci-pltfm.h | 6 + 6 files changed, 247 insertions(+), 2 deletions(-) create mode 100644 drivers/mmc/host/sdhci-esdhc.c
Regards,
Wolfram
RFC 1/3 sdhci-pltfm: Add structure for host-specific data
We need to carry some information per host, e.g. the clock.
--- drivers/mmc/host/sdhci-pltfm.c | 7 +++++-- drivers/mmc/host/sdhci-pltfm.h | 5 +++++ 2 files changed, 10 insertions(+), 2 deletions(-)
drivers/mmc/host/sdhci-pltfm.c +5 -2
@@ -55,6 +55,7 @@ static int __devinit sdhci_pltfm_probe(struct platform_device *pdev)struct sdhci_pltfm_data *pdata = pdev->dev.platform_data;const struct platform_device_id *platid =platform_get_device_id (pdev);struct sdhci_host *host; +struct sdhci_pltfm_host *pltfm_host;struct resource *iomem;int ret;
@@ -72,15 +73,17 @@ static int __devinit sdhci_pltfm_probe(struct platform_device *pdev) "experience problems.\n");if (pdev->dev.parent) - host =sdhci_alloc_host (pdev->dev.parent,0 ); + host =sdhci_alloc_host (pdev->dev.parent,sizeof (*pltfm_host));else - host =sdhci_alloc_host (&pdev->dev,0 ); + host =sdhci_alloc_host (&pdev->dev,sizeof (*pltfm_host));if (IS_ERR (host)) { ret =PTR_ERR (host); goto err; } + pltfm_host =sdhci_priv (host); + host->hw_name ="platform" ;if (pdata && pdata->ops) host->ops = pdata->ops;
drivers/mmc/host/sdhci-pltfm.h +5 -0
@@ -13,6 +13,11 @@#include <linux/sdhci-pltfm.h> +struct sdhci_pltfm_host { +struct clk *clk; +u32 scratchpad;/* to handle quirks across io-accessor calls */ +}; +extern struct sdhci_pltfm_data sdhci_cns3xxx_pdata;#endif /* _DRIVERS_MMC_SDHCI_PLTFM_H */
Signature · 1 line
1.7.1
RFC 2/3 mmc: add driver for imx35/51
In reply to Wolfram SangWIP!
--- drivers/mmc/host/Kconfig | 9 ++ drivers/mmc/host/Makefile | 1 + drivers/mmc/host/sdhci-esdhc.c | 194 ++++++++++++++++++++++++++++++++++++++++ drivers/mmc/host/sdhci-pltfm.c | 3 + drivers/mmc/host/sdhci-pltfm.h | 1 + 5 files changed, 208 insertions(+), 0 deletions(-) create mode 100644 drivers/mmc/host/sdhci-esdhc.c
drivers/mmc/host/Kconfig +9 -0
@@ -130,6 +130,15 @@ config MMC_SDHCI_CNS3XXX If unsure, say N. +config MMC_SDHCI_ESDHC + bool "SDHCI platform support for the Freescale eSDHC controller" + depends on MMC_SDHCI_PLTFM + select MMC_SDHCI_IO_ACCESSORS + help + This selects the Freescale eSDHC controller support. + + If unsure, say N. + config MMC_SDHCI_S3C tristate "SDHCI support on Samsung S3C SoC" depends on MMC_SDHCI && PLAT_SAMSUNG
drivers/mmc/host/Makefile +1 -0
@@ -40,6 +40,7 @@ obj-$(CONFIG_MMC_JZ4740) += jz4740_mmc.o obj-$(CONFIG_MMC_SDHCI_PLTFM) += sdhci-platform.o sdhci-platform-y := sdhci-pltfm.o sdhci-platform-$(CONFIG_MMC_SDHCI_CNS3XXX) += sdhci-cns3xxx.o +sdhci-platform-$(CONFIG_MMC_SDHCI_ESDHC) += sdhci-esdhc.o obj-$(CONFIG_MMC_SDHCI_OF) += sdhci-of.o sdhci-of-y := sdhci-of-core.o
drivers/mmc/host/sdhci-esdhc.c new file +194 -0
194 lines not on this page · raw message
drivers/mmc/host/sdhci-pltfm.c +3 -0
@@ -164,6 +164,9 @@ static const struct platform_device_id sdhci_pltfm_ids[] = { #ifdef CONFIG_MMC_SDHCI_CNS3XXX { "sdhci-cns3xxx", (kernel_ulong_t)&sdhci_cns3xxx_pdata }, #endif +#ifdef CONFIG_MMC_SDHCI_ESDHC + { "sdhci-esdhc", (kernel_ulong_t)&sdhci_esdhc_pdata }, +#endif { }, }; MODULE_DEVICE_TABLE(platform, sdhci_pltfm_ids);
drivers/mmc/host/sdhci-pltfm.h +1 -0
@@ -19,5 +19,6 @@ struct sdhci_pltfm_host { };extern struct sdhci_pltfm_data sdhci_cns3xxx_pdata; +extern struct sdhci_pltfm_data sdhci_esdhc_pdata;#endif /* _DRIVERS_MMC_SDHCI_PLTFM_H */
Signature · 1 line
1.7.1
RFC 3/3 pcm043: add resources for mmc
In reply to Wolfram Sang--- arch/arm/mach-mx3/mach-pcm043.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-)
arch/arm/mach-mx3/mach-pcm043.c +29 -0
@@ -28,6 +28,7 @@#include <linux/usb/otg.h> #include <linux/usb/ulpi.h> #include <linux/fsl_devices.h> +#include <linux/mmc/host.h> #include <asm/mach-types.h> #include <asm/mach/arch.h>
@@ -139,10 +140,31 @@ static struct i2c_board_info pcm043_i2c_devices[] = { };#endif +static struct resource sdhci_resources[] = { + { + .start =0x53fb4000 , + .end =0x53fb4000 +0xff , + .flags =IORESOURCE_MEM , + }, { + .start =MX35_INT_MMC_SDHC1 , + .end =MX35_INT_MMC_SDHC1 , + .flags =IORESOURCE_IRQ , + }, +}; + +static struct platform_device sdhci_device = { + .name ="sdhci-esdhc" , + .id =0 , + .num_resources =ARRAY_SIZE (sdhci_resources), + .resource = sdhci_resources, +}; + +static struct platform_device *devices[]__initdata = { &pcm043_flash, &mxc_fec_device, &imx_wdt_device0, + &sdhci_device, };static struct pad_desc pcm043_pads[] = {
@@ -217,6 +239,13 @@ static struct pad_desc pcm043_pads[] = {/* CAN2 */ MX35_PAD_TX5_RX0__CAN2_TXCAN ,MX35_PAD_TX4_RX1__CAN2_RXCAN , +/* esdhc */ +MX35_PAD_SD1_CMD__ESDHC1_CMD , +MX35_PAD_SD1_CLK__ESDHC1_CLK , +MX35_PAD_SD1_DATA0__ESDHC1_DAT0 , +MX35_PAD_SD1_DATA1__ESDHC1_DAT1 , +MX35_PAD_SD1_DATA2__ESDHC1_DAT2 , + MX35_PAD_SD1_DATA3__ESDHC1_DAT3, };#define AC97_GPIO_TXFS (1 * 32 + 31)
Signature · 1 line
1.7.1
RFC 3/3 pcm043: add resources for mmc
Hey Wolfram,
Quoted 51 lines · Wolfram Sang
Signed-off-by Wolfram Sang <[email protected]>--- arch/arm/mach-mx3/mach-pcm043.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-)arch/arm/mach-mx3/mach-pcm043.c +22
-0@@ -28,6 +28,7 @@#include <linux/usb/otg.h> #include <linux/usb/ulpi.h> #include <linux/fsl_devices.h> +#include <linux/mmc/host.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> @@ -139,10 +140,31 @@ static struct i2c_board_info pcm043_i2c_devices[] = { };#endif +static struct resource sdhci_resources[] = { + { + .start =0x53fb4000 , + .end =0x53fb4000 +0xff , + .flags =IORESOURCE_MEM , + }, { + .start =MX35_INT_MMC_SDHC1 , + .end =MX35_INT_MMC_SDHC1 , + .flags =IORESOURCE_IRQ , + }, +}; + +static struct platform_device sdhci_device = { + .name ="sdhci-esdhc" , + .id =0 , + .num_resources =ARRAY_SIZE (sdhci_resources), + .resource = sdhci_resources, +}; + +static struct platform_device *devices[]__initdata = { &pcm043_flash, &mxc_fec_device, &imx_wdt_device0, + &sdhci_device, };static struct pad_desc pcm043_pads[] = {@@ -217,6 +239,13 @@ static struct pad_desc pcm043_pads[] = {/* CAN2 */
arch/arm/mach-mx3/mach-pcm043.c static struct pad_desc pcm043_pads[] = { · line 249
Quoted 10 lines
arch/arm/mach-mx3/mach-pcm043.c +7
-0MX35_PAD_TX5_RX0__CAN2_TXCAN ,MX35_PAD_TX4_RX1__CAN2_RXCAN , +/* esdhc */ +MX35_PAD_SD1_CMD__ESDHC1_CMD , +MX35_PAD_SD1_CLK__ESDHC1_CLK , +MX35_PAD_SD1_DATA0__ESDHC1_DAT0 , +MX35_PAD_SD1_DATA1__ESDHC1_DAT1 , +MX35_PAD_SD1_DATA2__ESDHC1_DAT2 , + MX35_PAD_SD1_DATA3__ESDHC1_DAT3, };
Can you please rework this to look like
http://news.gmane.org/find-root.php?group=gmane.linux.ports.arm.kernel&article=89213
(i.e. put a function in arch/arm/plat-mxc/devices/platform-sdhci-esdhc.c that dynamically allocates the platform device.)
And then (maybe in a seperate patch) call this new function from the init routine of the pcm043.
Thanks
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |