* [PATCH 0/3] Add device tree probe for sdhci-esdhc-imx
@ 2011-07-03 8:30 Shawn Guo
2011-07-03 8:30 ` [PATCH 1/3] mmc: sdhci-esdhc-imx: get rid of the uses of cpu_is_mx() Shawn Guo
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Shawn Guo @ 2011-07-03 8:30 UTC (permalink / raw)
To: linux-arm-kernel
The first patch removes the uses of cpu_is_mx(), and can be merged
right away when review gets done.
The second patch makes an independent fix on sdhci-pltfm.c which can
be merged if it looks right to the gate keeper.
The third patch adds device tree probe. It uses the newly added dt
api of_property_read_string which is sitting on Grant's devicetree/next
branch with the out_string 'const' thing as a question mark.
Shawn Guo (3):
mmc: sdhci-esdhc-imx: get rid of the uses of cpu_is_mx()
mmc: sdhci-pltfm: dt device does not pass parent to sdhci_alloc_host
mmc: sdhci-esdhc-imx: add device tree probe support
.../devicetree/bindings/mmc/fsl-imx-esdhc.txt | 40 ++++++
arch/arm/mach-imx/clock-imx25.c | 4 +-
arch/arm/mach-imx/clock-imx35.c | 6 +-
arch/arm/mach-mx5/clock-mx51-mx53.c | 16 +-
arch/arm/mach-mx5/mx51_efika.c | 4 +-
.../plat-mxc/devices/platform-sdhci-esdhc-imx.c | 17 ++-
arch/arm/plat-mxc/include/mach/devices-common.h | 1 +
drivers/mmc/host/sdhci-esdhc-imx.c | 144 ++++++++++++++++++--
drivers/mmc/host/sdhci-pltfm.c | 3 +-
9 files changed, 202 insertions(+), 33 deletions(-)
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 1/3] mmc: sdhci-esdhc-imx: get rid of the uses of cpu_is_mx() 2011-07-03 8:30 [PATCH 0/3] Add device tree probe for sdhci-esdhc-imx Shawn Guo @ 2011-07-03 8:30 ` Shawn Guo 2011-07-04 6:21 ` Grant Likely 2011-07-03 8:30 ` [PATCH 2/3] mmc: sdhci-pltfm: dt device does not pass parent to sdhci_alloc_host Shawn Guo 2011-07-03 8:30 ` [PATCH 3/3] mmc: sdhci-esdhc-imx: add device tree probe support Shawn Guo 2 siblings, 1 reply; 9+ messages in thread From: Shawn Guo @ 2011-07-03 8:30 UTC (permalink / raw) To: linux-arm-kernel The patch removes all the uses of cpu_is_mx(). Instead, it utilizes platform_device_id to distinguish the esdhc differences among SoCs. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Cc: Wolfram Sang <w.sang@pengutronix.de> Cc: Chris Ball <cjb@laptop.org> --- arch/arm/mach-imx/clock-imx25.c | 4 +- arch/arm/mach-imx/clock-imx35.c | 6 +- arch/arm/mach-mx5/clock-mx51-mx53.c | 16 ++++---- arch/arm/mach-mx5/mx51_efika.c | 4 +- .../plat-mxc/devices/platform-sdhci-esdhc-imx.c | 17 ++++---- arch/arm/plat-mxc/include/mach/devices-common.h | 1 + drivers/mmc/host/sdhci-esdhc-imx.c | 45 ++++++++++++++++++-- 7 files changed, 66 insertions(+), 27 deletions(-) diff --git a/arch/arm/mach-imx/clock-imx25.c b/arch/arm/mach-imx/clock-imx25.c index a65838f..2955afa 100644 --- a/arch/arm/mach-imx/clock-imx25.c +++ b/arch/arm/mach-imx/clock-imx25.c @@ -300,8 +300,8 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK("imx2-wdt.0", NULL, wdt_clk) _REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk) _REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk) - _REGISTER_CLOCK("sdhci-esdhc-imx.0", NULL, esdhc1_clk) - _REGISTER_CLOCK("sdhci-esdhc-imx.1", NULL, esdhc2_clk) + _REGISTER_CLOCK("sdhci-esdhc-imx25.0", NULL, esdhc1_clk) + _REGISTER_CLOCK("sdhci-esdhc-imx25.1", NULL, esdhc2_clk) _REGISTER_CLOCK("mx2-camera.0", NULL, csi_clk) _REGISTER_CLOCK(NULL, "audmux", audmux_clk) _REGISTER_CLOCK("flexcan.0", NULL, can1_clk) diff --git a/arch/arm/mach-imx/clock-imx35.c b/arch/arm/mach-imx/clock-imx35.c index 5a4cc1e..2f80f14 100644 --- a/arch/arm/mach-imx/clock-imx35.c +++ b/arch/arm/mach-imx/clock-imx35.c @@ -458,9 +458,9 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK("imx-epit.0", NULL, epit1_clk) _REGISTER_CLOCK("imx-epit.1", NULL, epit2_clk) _REGISTER_CLOCK(NULL, "esai", esai_clk) - _REGISTER_CLOCK("sdhci-esdhc-imx.0", NULL, esdhc1_clk) - _REGISTER_CLOCK("sdhci-esdhc-imx.1", NULL, esdhc2_clk) - _REGISTER_CLOCK("sdhci-esdhc-imx.2", NULL, esdhc3_clk) + _REGISTER_CLOCK("sdhci-esdhc-imx35.0", NULL, esdhc1_clk) + _REGISTER_CLOCK("sdhci-esdhc-imx35.1", NULL, esdhc2_clk) + _REGISTER_CLOCK("sdhci-esdhc-imx35.2", NULL, esdhc3_clk) _REGISTER_CLOCK("fec.0", NULL, fec_clk) _REGISTER_CLOCK(NULL, "gpio", gpio1_clk) _REGISTER_CLOCK(NULL, "gpio", gpio2_clk) diff --git a/arch/arm/mach-mx5/clock-mx51-mx53.c b/arch/arm/mach-mx5/clock-mx51-mx53.c index 699b0d2..fd60e2c 100644 --- a/arch/arm/mach-mx5/clock-mx51-mx53.c +++ b/arch/arm/mach-mx5/clock-mx51-mx53.c @@ -1453,10 +1453,10 @@ static struct clk_lookup mx51_lookups[] = { _REGISTER_CLOCK("imx51-ecspi.0", NULL, ecspi1_clk) _REGISTER_CLOCK("imx51-ecspi.1", NULL, ecspi2_clk) _REGISTER_CLOCK("imx51-cspi.0", NULL, cspi_clk) - _REGISTER_CLOCK("sdhci-esdhc-imx.0", NULL, esdhc1_clk) - _REGISTER_CLOCK("sdhci-esdhc-imx.1", NULL, esdhc2_clk) - _REGISTER_CLOCK("sdhci-esdhc-imx.2", NULL, esdhc3_clk) - _REGISTER_CLOCK("sdhci-esdhc-imx.3", NULL, esdhc4_clk) + _REGISTER_CLOCK("sdhci-esdhc-imx51.0", NULL, esdhc1_clk) + _REGISTER_CLOCK("sdhci-esdhc-imx51.1", NULL, esdhc2_clk) + _REGISTER_CLOCK("sdhci-esdhc-imx51.2", NULL, esdhc3_clk) + _REGISTER_CLOCK("sdhci-esdhc-imx51.3", NULL, esdhc4_clk) _REGISTER_CLOCK(NULL, "cpu_clk", cpu_clk) _REGISTER_CLOCK(NULL, "iim_clk", iim_clk) _REGISTER_CLOCK("imx2-wdt.0", NULL, dummy_clk) @@ -1480,10 +1480,10 @@ static struct clk_lookup mx53_lookups[] = { _REGISTER_CLOCK("imx-i2c.0", NULL, i2c1_clk) _REGISTER_CLOCK("imx-i2c.1", NULL, i2c2_clk) _REGISTER_CLOCK("imx-i2c.2", NULL, i2c3_mx53_clk) - _REGISTER_CLOCK("sdhci-esdhc-imx.0", NULL, esdhc1_clk) - _REGISTER_CLOCK("sdhci-esdhc-imx.1", NULL, esdhc2_mx53_clk) - _REGISTER_CLOCK("sdhci-esdhc-imx.2", NULL, esdhc3_mx53_clk) - _REGISTER_CLOCK("sdhci-esdhc-imx.3", NULL, esdhc4_mx53_clk) + _REGISTER_CLOCK("sdhci-esdhc-imx53.0", NULL, esdhc1_clk) + _REGISTER_CLOCK("sdhci-esdhc-imx53.1", NULL, esdhc2_mx53_clk) + _REGISTER_CLOCK("sdhci-esdhc-imx53.2", NULL, esdhc3_mx53_clk) + _REGISTER_CLOCK("sdhci-esdhc-imx53.3", NULL, esdhc4_mx53_clk) _REGISTER_CLOCK("imx53-ecspi.0", NULL, ecspi1_clk) _REGISTER_CLOCK("imx53-ecspi.1", NULL, ecspi2_clk) _REGISTER_CLOCK("imx53-cspi.0", NULL, cspi_clk) diff --git a/arch/arm/mach-mx5/mx51_efika.c b/arch/arm/mach-mx5/mx51_efika.c index 56739c2..4435e03 100644 --- a/arch/arm/mach-mx5/mx51_efika.c +++ b/arch/arm/mach-mx5/mx51_efika.c @@ -260,8 +260,8 @@ static struct regulator_consumer_supply vvideo_consumers[] = { }; static struct regulator_consumer_supply vsd_consumers[] = { - REGULATOR_SUPPLY("vmmc", "sdhci-esdhc-imx.0"), - REGULATOR_SUPPLY("vmmc", "sdhci-esdhc-imx.1"), + REGULATOR_SUPPLY("vmmc", "sdhci-esdhc-imx51.0"), + REGULATOR_SUPPLY("vmmc", "sdhci-esdhc-imx51.1"), }; static struct regulator_consumer_supply pwgt1_consumer[] = { diff --git a/arch/arm/plat-mxc/devices/platform-sdhci-esdhc-imx.c b/arch/arm/plat-mxc/devices/platform-sdhci-esdhc-imx.c index 79d6d71..5955f5d 100644 --- a/arch/arm/plat-mxc/devices/platform-sdhci-esdhc-imx.c +++ b/arch/arm/plat-mxc/devices/platform-sdhci-esdhc-imx.c @@ -10,21 +10,22 @@ #include <mach/devices-common.h> #include <mach/esdhc.h> -#define imx_sdhci_esdhc_imx_data_entry_single(soc, _id, hwid) \ +#define imx_sdhci_esdhc_imx_data_entry_single(soc, _devid, _id, hwid) \ { \ + .devid = _devid, \ .id = _id, \ .iobase = soc ## _ESDHC ## hwid ## _BASE_ADDR, \ .irq = soc ## _INT_ESDHC ## hwid, \ } -#define imx_sdhci_esdhc_imx_data_entry(soc, id, hwid) \ - [id] = imx_sdhci_esdhc_imx_data_entry_single(soc, id, hwid) +#define imx_sdhci_esdhc_imx_data_entry(soc, devid, id, hwid) \ + [id] = imx_sdhci_esdhc_imx_data_entry_single(soc, devid, id, hwid) #ifdef CONFIG_SOC_IMX25 const struct imx_sdhci_esdhc_imx_data imx25_sdhci_esdhc_imx_data[] __initconst = { #define imx25_sdhci_esdhc_imx_data_entry(_id, _hwid) \ - imx_sdhci_esdhc_imx_data_entry(MX25, _id, _hwid) + imx_sdhci_esdhc_imx_data_entry(MX25, "sdhci-esdhc-imx25", _id, _hwid) imx25_sdhci_esdhc_imx_data_entry(0, 1), imx25_sdhci_esdhc_imx_data_entry(1, 2), }; @@ -34,7 +35,7 @@ imx25_sdhci_esdhc_imx_data[] __initconst = { const struct imx_sdhci_esdhc_imx_data imx35_sdhci_esdhc_imx_data[] __initconst = { #define imx35_sdhci_esdhc_imx_data_entry(_id, _hwid) \ - imx_sdhci_esdhc_imx_data_entry(MX35, _id, _hwid) + imx_sdhci_esdhc_imx_data_entry(MX35, "sdhci-esdhc-imx35", _id, _hwid) imx35_sdhci_esdhc_imx_data_entry(0, 1), imx35_sdhci_esdhc_imx_data_entry(1, 2), imx35_sdhci_esdhc_imx_data_entry(2, 3), @@ -45,7 +46,7 @@ imx35_sdhci_esdhc_imx_data[] __initconst = { const struct imx_sdhci_esdhc_imx_data imx51_sdhci_esdhc_imx_data[] __initconst = { #define imx51_sdhci_esdhc_imx_data_entry(_id, _hwid) \ - imx_sdhci_esdhc_imx_data_entry(MX51, _id, _hwid) + imx_sdhci_esdhc_imx_data_entry(MX51, "sdhci-esdhc-imx51", _id, _hwid) imx51_sdhci_esdhc_imx_data_entry(0, 1), imx51_sdhci_esdhc_imx_data_entry(1, 2), imx51_sdhci_esdhc_imx_data_entry(2, 3), @@ -57,7 +58,7 @@ imx51_sdhci_esdhc_imx_data[] __initconst = { const struct imx_sdhci_esdhc_imx_data imx53_sdhci_esdhc_imx_data[] __initconst = { #define imx53_sdhci_esdhc_imx_data_entry(_id, _hwid) \ - imx_sdhci_esdhc_imx_data_entry(MX53, _id, _hwid) + imx_sdhci_esdhc_imx_data_entry(MX53, "sdhci-esdhc-imx53", _id, _hwid) imx53_sdhci_esdhc_imx_data_entry(0, 1), imx53_sdhci_esdhc_imx_data_entry(1, 2), imx53_sdhci_esdhc_imx_data_entry(2, 3), @@ -93,6 +94,6 @@ struct platform_device *__init imx_add_sdhci_esdhc_imx( if (!pdata) pdata = &default_esdhc_pdata; - return imx_add_platform_device("sdhci-esdhc-imx", data->id, res, + return imx_add_platform_device(data->devid, data->id, res, ARRAY_SIZE(res), pdata, sizeof(*pdata)); } diff --git a/arch/arm/plat-mxc/include/mach/devices-common.h b/arch/arm/plat-mxc/include/mach/devices-common.h index bf93820..c9e7b66 100644 --- a/arch/arm/plat-mxc/include/mach/devices-common.h +++ b/arch/arm/plat-mxc/include/mach/devices-common.h @@ -276,6 +276,7 @@ struct platform_device *__init imx_add_mxc_w1( #include <mach/esdhc.h> struct imx_sdhci_esdhc_imx_data { + const char *devid; int id; resource_size_t iobase; resource_size_t irq; diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index 3cc6f61..705d670 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -20,7 +20,6 @@ #include <linux/mmc/host.h> #include <linux/mmc/mmc.h> #include <linux/mmc/sdio.h> -#include <mach/hardware.h> #include <mach/esdhc.h> #include "sdhci-pltfm.h" #include "sdhci-esdhc.h" @@ -42,10 +41,42 @@ */ #define ESDHC_FLAG_MULTIBLK_NO_INT (1 << 1) +enum imx_esdhc_type { + IMX25_ESDHC, + IMX35_ESDHC, + IMX51_ESDHC, + IMX53_ESDHC, +}; + struct pltfm_imx_data { int flags; u32 scratchpad; + enum imx_esdhc_type devtype; +}; + +#define IS_IMX25_ESDHC() (imx_data->devtype == IMX25_ESDHC) +#define IS_IMX35_ESDHC() (imx_data->devtype == IMX35_ESDHC) +#define IS_IMX51_ESDHC() (imx_data->devtype == IMX51_ESDHC) +#define IS_IMX53_ESDHC() (imx_data->devtype == IMX53_ESDHC) + +static struct platform_device_id imx_esdhc_devtype[] = { + { + .name = "sdhci-esdhc-imx25", + .driver_data = IMX25_ESDHC, + }, { + .name = "sdhci-esdhc-imx35", + .driver_data = IMX35_ESDHC, + }, { + .name = "sdhci-esdhc-imx51", + .driver_data = IMX51_ESDHC, + }, { + .name = "sdhci-esdhc-imx53", + .driver_data = IMX53_ESDHC, + }, { + /* sentinel */ + } }; +MODULE_DEVICE_TABLE(platform, imx_esdhc_devtype); static unsigned int esdhc_pltfm_get_max_blk_size(struct sdhci_host *host) { @@ -55,8 +86,11 @@ static unsigned int esdhc_pltfm_get_max_blk_size(struct sdhci_host *host) static unsigned int esdhc_pltfm_get_max_blk_count(struct sdhci_host *host) { + struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); + struct pltfm_imx_data *imx_data = pltfm_host->priv; + /* Fix errata ENGcm07207 which is present on i.MX25 and i.MX35 */ - return (cpu_is_mx25() || cpu_is_mx35()) ? 1 : 65535; + return (IS_IMX25_ESDHC() || IS_IMX35_ESDHC()) ? 1 : 65535; } static inline void esdhc_clrset_le(struct sdhci_host *host, u32 mask, u32 val, int reg) @@ -274,6 +308,8 @@ static int __devinit sdhci_esdhc_imx_probe(struct platform_device *pdev) imx_data = kzalloc(sizeof(struct pltfm_imx_data), GFP_KERNEL); if (!imx_data) return -ENOMEM; + + imx_data->devtype = pdev->id_entry->driver_data; pltfm_host->priv = imx_data; clk = clk_get(mmc_dev(host->mmc), NULL); @@ -285,10 +321,10 @@ static int __devinit sdhci_esdhc_imx_probe(struct platform_device *pdev) clk_enable(clk); pltfm_host->clk = clk; - if (!cpu_is_mx25()) + if (!IS_IMX25_ESDHC()) host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL; - if (!(cpu_is_mx25() || cpu_is_mx35() || cpu_is_mx51())) + if (IS_IMX53_ESDHC()) imx_data->flags |= ESDHC_FLAG_MULTIBLK_NO_INT; boarddata = host->mmc->parent->platform_data; @@ -401,6 +437,7 @@ static struct platform_driver sdhci_esdhc_imx_driver = { .name = "sdhci-esdhc-imx", .owner = THIS_MODULE, }, + .id_table = imx_esdhc_devtype, .probe = sdhci_esdhc_imx_probe, .remove = __devexit_p(sdhci_esdhc_imx_remove), #ifdef CONFIG_PM -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 1/3] mmc: sdhci-esdhc-imx: get rid of the uses of cpu_is_mx() 2011-07-03 8:30 ` [PATCH 1/3] mmc: sdhci-esdhc-imx: get rid of the uses of cpu_is_mx() Shawn Guo @ 2011-07-04 6:21 ` Grant Likely 0 siblings, 0 replies; 9+ messages in thread From: Grant Likely @ 2011-07-04 6:21 UTC (permalink / raw) To: linux-arm-kernel On Sun, Jul 03, 2011 at 04:30:49PM +0800, Shawn Guo wrote: > The patch removes all the uses of cpu_is_mx(). Instead, it utilizes > platform_device_id to distinguish the esdhc differences among SoCs. > > Signed-off-by: Shawn Guo <shawn.guo@linaro.org> > Cc: Wolfram Sang <w.sang@pengutronix.de> > Cc: Chris Ball <cjb@laptop.org> Same comments apply to this patch as on the others. Minor implementation detail comments that I won't bother repeating, but in general I like the approach. g. > --- > arch/arm/mach-imx/clock-imx25.c | 4 +- > arch/arm/mach-imx/clock-imx35.c | 6 +- > arch/arm/mach-mx5/clock-mx51-mx53.c | 16 ++++---- > arch/arm/mach-mx5/mx51_efika.c | 4 +- > .../plat-mxc/devices/platform-sdhci-esdhc-imx.c | 17 ++++---- > arch/arm/plat-mxc/include/mach/devices-common.h | 1 + > drivers/mmc/host/sdhci-esdhc-imx.c | 45 ++++++++++++++++++-- > 7 files changed, 66 insertions(+), 27 deletions(-) > > diff --git a/arch/arm/mach-imx/clock-imx25.c b/arch/arm/mach-imx/clock-imx25.c > index a65838f..2955afa 100644 > --- a/arch/arm/mach-imx/clock-imx25.c > +++ b/arch/arm/mach-imx/clock-imx25.c > @@ -300,8 +300,8 @@ static struct clk_lookup lookups[] = { > _REGISTER_CLOCK("imx2-wdt.0", NULL, wdt_clk) > _REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk) > _REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk) > - _REGISTER_CLOCK("sdhci-esdhc-imx.0", NULL, esdhc1_clk) > - _REGISTER_CLOCK("sdhci-esdhc-imx.1", NULL, esdhc2_clk) > + _REGISTER_CLOCK("sdhci-esdhc-imx25.0", NULL, esdhc1_clk) > + _REGISTER_CLOCK("sdhci-esdhc-imx25.1", NULL, esdhc2_clk) > _REGISTER_CLOCK("mx2-camera.0", NULL, csi_clk) > _REGISTER_CLOCK(NULL, "audmux", audmux_clk) > _REGISTER_CLOCK("flexcan.0", NULL, can1_clk) > diff --git a/arch/arm/mach-imx/clock-imx35.c b/arch/arm/mach-imx/clock-imx35.c > index 5a4cc1e..2f80f14 100644 > --- a/arch/arm/mach-imx/clock-imx35.c > +++ b/arch/arm/mach-imx/clock-imx35.c > @@ -458,9 +458,9 @@ static struct clk_lookup lookups[] = { > _REGISTER_CLOCK("imx-epit.0", NULL, epit1_clk) > _REGISTER_CLOCK("imx-epit.1", NULL, epit2_clk) > _REGISTER_CLOCK(NULL, "esai", esai_clk) > - _REGISTER_CLOCK("sdhci-esdhc-imx.0", NULL, esdhc1_clk) > - _REGISTER_CLOCK("sdhci-esdhc-imx.1", NULL, esdhc2_clk) > - _REGISTER_CLOCK("sdhci-esdhc-imx.2", NULL, esdhc3_clk) > + _REGISTER_CLOCK("sdhci-esdhc-imx35.0", NULL, esdhc1_clk) > + _REGISTER_CLOCK("sdhci-esdhc-imx35.1", NULL, esdhc2_clk) > + _REGISTER_CLOCK("sdhci-esdhc-imx35.2", NULL, esdhc3_clk) > _REGISTER_CLOCK("fec.0", NULL, fec_clk) > _REGISTER_CLOCK(NULL, "gpio", gpio1_clk) > _REGISTER_CLOCK(NULL, "gpio", gpio2_clk) > diff --git a/arch/arm/mach-mx5/clock-mx51-mx53.c b/arch/arm/mach-mx5/clock-mx51-mx53.c > index 699b0d2..fd60e2c 100644 > --- a/arch/arm/mach-mx5/clock-mx51-mx53.c > +++ b/arch/arm/mach-mx5/clock-mx51-mx53.c > @@ -1453,10 +1453,10 @@ static struct clk_lookup mx51_lookups[] = { > _REGISTER_CLOCK("imx51-ecspi.0", NULL, ecspi1_clk) > _REGISTER_CLOCK("imx51-ecspi.1", NULL, ecspi2_clk) > _REGISTER_CLOCK("imx51-cspi.0", NULL, cspi_clk) > - _REGISTER_CLOCK("sdhci-esdhc-imx.0", NULL, esdhc1_clk) > - _REGISTER_CLOCK("sdhci-esdhc-imx.1", NULL, esdhc2_clk) > - _REGISTER_CLOCK("sdhci-esdhc-imx.2", NULL, esdhc3_clk) > - _REGISTER_CLOCK("sdhci-esdhc-imx.3", NULL, esdhc4_clk) > + _REGISTER_CLOCK("sdhci-esdhc-imx51.0", NULL, esdhc1_clk) > + _REGISTER_CLOCK("sdhci-esdhc-imx51.1", NULL, esdhc2_clk) > + _REGISTER_CLOCK("sdhci-esdhc-imx51.2", NULL, esdhc3_clk) > + _REGISTER_CLOCK("sdhci-esdhc-imx51.3", NULL, esdhc4_clk) > _REGISTER_CLOCK(NULL, "cpu_clk", cpu_clk) > _REGISTER_CLOCK(NULL, "iim_clk", iim_clk) > _REGISTER_CLOCK("imx2-wdt.0", NULL, dummy_clk) > @@ -1480,10 +1480,10 @@ static struct clk_lookup mx53_lookups[] = { > _REGISTER_CLOCK("imx-i2c.0", NULL, i2c1_clk) > _REGISTER_CLOCK("imx-i2c.1", NULL, i2c2_clk) > _REGISTER_CLOCK("imx-i2c.2", NULL, i2c3_mx53_clk) > - _REGISTER_CLOCK("sdhci-esdhc-imx.0", NULL, esdhc1_clk) > - _REGISTER_CLOCK("sdhci-esdhc-imx.1", NULL, esdhc2_mx53_clk) > - _REGISTER_CLOCK("sdhci-esdhc-imx.2", NULL, esdhc3_mx53_clk) > - _REGISTER_CLOCK("sdhci-esdhc-imx.3", NULL, esdhc4_mx53_clk) > + _REGISTER_CLOCK("sdhci-esdhc-imx53.0", NULL, esdhc1_clk) > + _REGISTER_CLOCK("sdhci-esdhc-imx53.1", NULL, esdhc2_mx53_clk) > + _REGISTER_CLOCK("sdhci-esdhc-imx53.2", NULL, esdhc3_mx53_clk) > + _REGISTER_CLOCK("sdhci-esdhc-imx53.3", NULL, esdhc4_mx53_clk) > _REGISTER_CLOCK("imx53-ecspi.0", NULL, ecspi1_clk) > _REGISTER_CLOCK("imx53-ecspi.1", NULL, ecspi2_clk) > _REGISTER_CLOCK("imx53-cspi.0", NULL, cspi_clk) > diff --git a/arch/arm/mach-mx5/mx51_efika.c b/arch/arm/mach-mx5/mx51_efika.c > index 56739c2..4435e03 100644 > --- a/arch/arm/mach-mx5/mx51_efika.c > +++ b/arch/arm/mach-mx5/mx51_efika.c > @@ -260,8 +260,8 @@ static struct regulator_consumer_supply vvideo_consumers[] = { > }; > > static struct regulator_consumer_supply vsd_consumers[] = { > - REGULATOR_SUPPLY("vmmc", "sdhci-esdhc-imx.0"), > - REGULATOR_SUPPLY("vmmc", "sdhci-esdhc-imx.1"), > + REGULATOR_SUPPLY("vmmc", "sdhci-esdhc-imx51.0"), > + REGULATOR_SUPPLY("vmmc", "sdhci-esdhc-imx51.1"), > }; > > static struct regulator_consumer_supply pwgt1_consumer[] = { > diff --git a/arch/arm/plat-mxc/devices/platform-sdhci-esdhc-imx.c b/arch/arm/plat-mxc/devices/platform-sdhci-esdhc-imx.c > index 79d6d71..5955f5d 100644 > --- a/arch/arm/plat-mxc/devices/platform-sdhci-esdhc-imx.c > +++ b/arch/arm/plat-mxc/devices/platform-sdhci-esdhc-imx.c > @@ -10,21 +10,22 @@ > #include <mach/devices-common.h> > #include <mach/esdhc.h> > > -#define imx_sdhci_esdhc_imx_data_entry_single(soc, _id, hwid) \ > +#define imx_sdhci_esdhc_imx_data_entry_single(soc, _devid, _id, hwid) \ > { \ > + .devid = _devid, \ > .id = _id, \ > .iobase = soc ## _ESDHC ## hwid ## _BASE_ADDR, \ > .irq = soc ## _INT_ESDHC ## hwid, \ > } > > -#define imx_sdhci_esdhc_imx_data_entry(soc, id, hwid) \ > - [id] = imx_sdhci_esdhc_imx_data_entry_single(soc, id, hwid) > +#define imx_sdhci_esdhc_imx_data_entry(soc, devid, id, hwid) \ > + [id] = imx_sdhci_esdhc_imx_data_entry_single(soc, devid, id, hwid) > > #ifdef CONFIG_SOC_IMX25 > const struct imx_sdhci_esdhc_imx_data > imx25_sdhci_esdhc_imx_data[] __initconst = { > #define imx25_sdhci_esdhc_imx_data_entry(_id, _hwid) \ > - imx_sdhci_esdhc_imx_data_entry(MX25, _id, _hwid) > + imx_sdhci_esdhc_imx_data_entry(MX25, "sdhci-esdhc-imx25", _id, _hwid) > imx25_sdhci_esdhc_imx_data_entry(0, 1), > imx25_sdhci_esdhc_imx_data_entry(1, 2), > }; > @@ -34,7 +35,7 @@ imx25_sdhci_esdhc_imx_data[] __initconst = { > const struct imx_sdhci_esdhc_imx_data > imx35_sdhci_esdhc_imx_data[] __initconst = { > #define imx35_sdhci_esdhc_imx_data_entry(_id, _hwid) \ > - imx_sdhci_esdhc_imx_data_entry(MX35, _id, _hwid) > + imx_sdhci_esdhc_imx_data_entry(MX35, "sdhci-esdhc-imx35", _id, _hwid) > imx35_sdhci_esdhc_imx_data_entry(0, 1), > imx35_sdhci_esdhc_imx_data_entry(1, 2), > imx35_sdhci_esdhc_imx_data_entry(2, 3), > @@ -45,7 +46,7 @@ imx35_sdhci_esdhc_imx_data[] __initconst = { > const struct imx_sdhci_esdhc_imx_data > imx51_sdhci_esdhc_imx_data[] __initconst = { > #define imx51_sdhci_esdhc_imx_data_entry(_id, _hwid) \ > - imx_sdhci_esdhc_imx_data_entry(MX51, _id, _hwid) > + imx_sdhci_esdhc_imx_data_entry(MX51, "sdhci-esdhc-imx51", _id, _hwid) > imx51_sdhci_esdhc_imx_data_entry(0, 1), > imx51_sdhci_esdhc_imx_data_entry(1, 2), > imx51_sdhci_esdhc_imx_data_entry(2, 3), > @@ -57,7 +58,7 @@ imx51_sdhci_esdhc_imx_data[] __initconst = { > const struct imx_sdhci_esdhc_imx_data > imx53_sdhci_esdhc_imx_data[] __initconst = { > #define imx53_sdhci_esdhc_imx_data_entry(_id, _hwid) \ > - imx_sdhci_esdhc_imx_data_entry(MX53, _id, _hwid) > + imx_sdhci_esdhc_imx_data_entry(MX53, "sdhci-esdhc-imx53", _id, _hwid) > imx53_sdhci_esdhc_imx_data_entry(0, 1), > imx53_sdhci_esdhc_imx_data_entry(1, 2), > imx53_sdhci_esdhc_imx_data_entry(2, 3), > @@ -93,6 +94,6 @@ struct platform_device *__init imx_add_sdhci_esdhc_imx( > if (!pdata) > pdata = &default_esdhc_pdata; > > - return imx_add_platform_device("sdhci-esdhc-imx", data->id, res, > + return imx_add_platform_device(data->devid, data->id, res, > ARRAY_SIZE(res), pdata, sizeof(*pdata)); > } > diff --git a/arch/arm/plat-mxc/include/mach/devices-common.h b/arch/arm/plat-mxc/include/mach/devices-common.h > index bf93820..c9e7b66 100644 > --- a/arch/arm/plat-mxc/include/mach/devices-common.h > +++ b/arch/arm/plat-mxc/include/mach/devices-common.h > @@ -276,6 +276,7 @@ struct platform_device *__init imx_add_mxc_w1( > > #include <mach/esdhc.h> > struct imx_sdhci_esdhc_imx_data { > + const char *devid; > int id; > resource_size_t iobase; > resource_size_t irq; > diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c > index 3cc6f61..705d670 100644 > --- a/drivers/mmc/host/sdhci-esdhc-imx.c > +++ b/drivers/mmc/host/sdhci-esdhc-imx.c > @@ -20,7 +20,6 @@ > #include <linux/mmc/host.h> > #include <linux/mmc/mmc.h> > #include <linux/mmc/sdio.h> > -#include <mach/hardware.h> > #include <mach/esdhc.h> > #include "sdhci-pltfm.h" > #include "sdhci-esdhc.h" > @@ -42,10 +41,42 @@ > */ > #define ESDHC_FLAG_MULTIBLK_NO_INT (1 << 1) > > +enum imx_esdhc_type { > + IMX25_ESDHC, > + IMX35_ESDHC, > + IMX51_ESDHC, > + IMX53_ESDHC, > +}; > + > struct pltfm_imx_data { > int flags; > u32 scratchpad; > + enum imx_esdhc_type devtype; > +}; > + > +#define IS_IMX25_ESDHC() (imx_data->devtype == IMX25_ESDHC) > +#define IS_IMX35_ESDHC() (imx_data->devtype == IMX35_ESDHC) > +#define IS_IMX51_ESDHC() (imx_data->devtype == IMX51_ESDHC) > +#define IS_IMX53_ESDHC() (imx_data->devtype == IMX53_ESDHC) > + > +static struct platform_device_id imx_esdhc_devtype[] = { > + { > + .name = "sdhci-esdhc-imx25", > + .driver_data = IMX25_ESDHC, > + }, { > + .name = "sdhci-esdhc-imx35", > + .driver_data = IMX35_ESDHC, > + }, { > + .name = "sdhci-esdhc-imx51", > + .driver_data = IMX51_ESDHC, > + }, { > + .name = "sdhci-esdhc-imx53", > + .driver_data = IMX53_ESDHC, > + }, { > + /* sentinel */ > + } > }; > +MODULE_DEVICE_TABLE(platform, imx_esdhc_devtype); > > static unsigned int esdhc_pltfm_get_max_blk_size(struct sdhci_host *host) > { > @@ -55,8 +86,11 @@ static unsigned int esdhc_pltfm_get_max_blk_size(struct sdhci_host *host) > > static unsigned int esdhc_pltfm_get_max_blk_count(struct sdhci_host *host) > { > + struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); > + struct pltfm_imx_data *imx_data = pltfm_host->priv; > + > /* Fix errata ENGcm07207 which is present on i.MX25 and i.MX35 */ > - return (cpu_is_mx25() || cpu_is_mx35()) ? 1 : 65535; > + return (IS_IMX25_ESDHC() || IS_IMX35_ESDHC()) ? 1 : 65535; > } > > static inline void esdhc_clrset_le(struct sdhci_host *host, u32 mask, u32 val, int reg) > @@ -274,6 +308,8 @@ static int __devinit sdhci_esdhc_imx_probe(struct platform_device *pdev) > imx_data = kzalloc(sizeof(struct pltfm_imx_data), GFP_KERNEL); > if (!imx_data) > return -ENOMEM; > + > + imx_data->devtype = pdev->id_entry->driver_data; > pltfm_host->priv = imx_data; > > clk = clk_get(mmc_dev(host->mmc), NULL); > @@ -285,10 +321,10 @@ static int __devinit sdhci_esdhc_imx_probe(struct platform_device *pdev) > clk_enable(clk); > pltfm_host->clk = clk; > > - if (!cpu_is_mx25()) > + if (!IS_IMX25_ESDHC()) > host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL; > > - if (!(cpu_is_mx25() || cpu_is_mx35() || cpu_is_mx51())) > + if (IS_IMX53_ESDHC()) > imx_data->flags |= ESDHC_FLAG_MULTIBLK_NO_INT; > > boarddata = host->mmc->parent->platform_data; > @@ -401,6 +437,7 @@ static struct platform_driver sdhci_esdhc_imx_driver = { > .name = "sdhci-esdhc-imx", > .owner = THIS_MODULE, > }, > + .id_table = imx_esdhc_devtype, > .probe = sdhci_esdhc_imx_probe, > .remove = __devexit_p(sdhci_esdhc_imx_remove), > #ifdef CONFIG_PM > -- > 1.7.4.1 > > _______________________________________________ > devicetree-discuss mailing list > devicetree-discuss at lists.ozlabs.org > https://lists.ozlabs.org/listinfo/devicetree-discuss ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 2/3] mmc: sdhci-pltfm: dt device does not pass parent to sdhci_alloc_host 2011-07-03 8:30 [PATCH 0/3] Add device tree probe for sdhci-esdhc-imx Shawn Guo 2011-07-03 8:30 ` [PATCH 1/3] mmc: sdhci-esdhc-imx: get rid of the uses of cpu_is_mx() Shawn Guo @ 2011-07-03 8:30 ` Shawn Guo 2011-07-04 6:22 ` Grant Likely 2011-07-03 8:30 ` [PATCH 3/3] mmc: sdhci-esdhc-imx: add device tree probe support Shawn Guo 2 siblings, 1 reply; 9+ messages in thread From: Shawn Guo @ 2011-07-03 8:30 UTC (permalink / raw) To: linux-arm-kernel Neither platform based nor dt based device needs to pass the parent to sdhci_alloc_host. There is no difference between platform and dt on this point. The patch makes the change to pass device itself than its parent to sdhci_alloc_host for dt case too. Otherwise the probe function of sdhci based drivers which is shared between platform and dt will fail on dt case. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Cc: Chris Ball <cjb@laptop.org> Cc: Grant Likely <grant.likely@secretlab.ca> --- drivers/mmc/host/sdhci-pltfm.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c index 71c0ce1..6414efe 100644 --- a/drivers/mmc/host/sdhci-pltfm.c +++ b/drivers/mmc/host/sdhci-pltfm.c @@ -85,6 +85,7 @@ struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev, { struct sdhci_host *host; struct sdhci_pltfm_host *pltfm_host; + struct device_node *np = pdev->dev.of_node; struct resource *iomem; int ret; @@ -98,7 +99,7 @@ struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev, dev_err(&pdev->dev, "Invalid iomem size!\n"); /* Some PCI-based MFD need the parent here */ - if (pdev->dev.parent != &platform_bus) + if (pdev->dev.parent != &platform_bus && !np) host = sdhci_alloc_host(pdev->dev.parent, sizeof(*pltfm_host)); else host = sdhci_alloc_host(&pdev->dev, sizeof(*pltfm_host)); -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/3] mmc: sdhci-pltfm: dt device does not pass parent to sdhci_alloc_host 2011-07-03 8:30 ` [PATCH 2/3] mmc: sdhci-pltfm: dt device does not pass parent to sdhci_alloc_host Shawn Guo @ 2011-07-04 6:22 ` Grant Likely 0 siblings, 0 replies; 9+ messages in thread From: Grant Likely @ 2011-07-04 6:22 UTC (permalink / raw) To: linux-arm-kernel On Sun, Jul 03, 2011 at 04:30:50PM +0800, Shawn Guo wrote: > Neither platform based nor dt based device needs to pass the parent > to sdhci_alloc_host. There is no difference between platform and dt > on this point. > > The patch makes the change to pass device itself than its parent to > sdhci_alloc_host for dt case too. Otherwise the probe function of > sdhci based drivers which is shared between platform and dt will > fail on dt case. > > Signed-off-by: Shawn Guo <shawn.guo@linaro.org> > Cc: Chris Ball <cjb@laptop.org> > Cc: Grant Likely <grant.likely@secretlab.ca> Acked-by: Grant Likely <grant.likely@secretlab.ca> > --- > drivers/mmc/host/sdhci-pltfm.c | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c > index 71c0ce1..6414efe 100644 > --- a/drivers/mmc/host/sdhci-pltfm.c > +++ b/drivers/mmc/host/sdhci-pltfm.c > @@ -85,6 +85,7 @@ struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev, > { > struct sdhci_host *host; > struct sdhci_pltfm_host *pltfm_host; > + struct device_node *np = pdev->dev.of_node; > struct resource *iomem; > int ret; > > @@ -98,7 +99,7 @@ struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev, > dev_err(&pdev->dev, "Invalid iomem size!\n"); > > /* Some PCI-based MFD need the parent here */ > - if (pdev->dev.parent != &platform_bus) > + if (pdev->dev.parent != &platform_bus && !np) > host = sdhci_alloc_host(pdev->dev.parent, sizeof(*pltfm_host)); > else > host = sdhci_alloc_host(&pdev->dev, sizeof(*pltfm_host)); > -- > 1.7.4.1 > ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 3/3] mmc: sdhci-esdhc-imx: add device tree probe support 2011-07-03 8:30 [PATCH 0/3] Add device tree probe for sdhci-esdhc-imx Shawn Guo 2011-07-03 8:30 ` [PATCH 1/3] mmc: sdhci-esdhc-imx: get rid of the uses of cpu_is_mx() Shawn Guo 2011-07-03 8:30 ` [PATCH 2/3] mmc: sdhci-pltfm: dt device does not pass parent to sdhci_alloc_host Shawn Guo @ 2011-07-03 8:30 ` Shawn Guo 2011-07-04 6:25 ` Grant Likely 2 siblings, 1 reply; 9+ messages in thread From: Shawn Guo @ 2011-07-03 8:30 UTC (permalink / raw) To: linux-arm-kernel The patch adds device tree probe support for sdhci-esdhc-imx driver. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Cc: Wolfram Sang <w.sang@pengutronix.de> Cc: Chris Ball <cjb@laptop.org> Cc: Grant Likely <grant.likely@secretlab.ca> --- .../devicetree/bindings/mmc/fsl-imx-esdhc.txt | 40 ++++++++ drivers/mmc/host/sdhci-esdhc-imx.c | 99 +++++++++++++++++++- 2 files changed, 134 insertions(+), 5 deletions(-) create mode 100644 Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt diff --git a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt new file mode 100644 index 0000000..e182e7c --- /dev/null +++ b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt @@ -0,0 +1,40 @@ +* Freescale Enhanced Secure Digital Host Controller (eSDHC) for i.MX + +The Enhanced Secure Digital Host Controller on Freescale i.MX family +provides an interface for MMC, SD, and SDIO types of memory cards. + +Required properties: +- compatible : Should be "fsl,<chip>-esdhc" +- reg : Should contain eSDHC registers location and length +- interrupts : Should contain eSDHC interrupt +- cd-type : String, card detection (CD) method. Supported values are: + "none" : No CD + "controller" : Uses eSDHC controller internal CD signal + "gpio" : Uses GPIO pin for CD + "permanent" : No CD because card is permanently wired to host +- wp-type : String, write protection (WP) method. Supported values are: + "none" : No WP + "controller" : Uses eSDHC controller internal WP signal + "gpio" : Uses GPIO pin for WP +- gpios : Should specify GPIOs in this order: CD GPIO, WP GPIO, if + properties cd-type and wp-type are "gpio". + +Examples: + +esdhc at 70004000 { + compatible = "fsl,imx51-esdhc"; + reg = <0x70004000 0x4000>; + interrupts = <1>; + cd-type = "controller"; + wp-type = "controller"; +}; + +esdhc at 70008000 { + compatible = "fsl,imx51-esdhc"; + reg = <0x70008000 0x4000>; + interrupts = <2>; + cd-type = "gpio"; + wp-type = "gpio"; + gpios = <&gpio0 6 0>, /* CD, GPIO1_6 */ + <&gpio0 5 0>; /* WP, GPIO1_5 */ +}; diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index 705d670..57793e3 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -20,6 +20,9 @@ #include <linux/mmc/host.h> #include <linux/mmc/mmc.h> #include <linux/mmc/sdio.h> +#include <linux/of.h> +#include <linux/of_device.h> +#include <linux/of_gpio.h> #include <mach/esdhc.h> #include "sdhci-pltfm.h" #include "sdhci-esdhc.h" @@ -78,6 +81,14 @@ static struct platform_device_id imx_esdhc_devtype[] = { }; MODULE_DEVICE_TABLE(platform, imx_esdhc_devtype); +static const struct of_device_id imx_esdhc_dt_ids[] = { + { .compatible = "fsl,imx25-esdhc", .data = &imx_esdhc_devtype[IMX25_ESDHC], }, + { .compatible = "fsl,imx35-esdhc", .data = &imx_esdhc_devtype[IMX35_ESDHC], }, + { .compatible = "fsl,imx51-esdhc", .data = &imx_esdhc_devtype[IMX51_ESDHC], }, + { .compatible = "fsl,imx53-esdhc", .data = &imx_esdhc_devtype[IMX53_ESDHC], }, + { /* sentinel */ }, +}; + static unsigned int esdhc_pltfm_get_max_blk_size(struct sdhci_host *host) { /* Force 2048 bytes, which is the maximum supported size in SDHCI. */ @@ -290,24 +301,93 @@ static irqreturn_t cd_irq(int irq, void *data) return IRQ_HANDLED; }; +#ifdef CONFIG_OF +static int __devinit sdhci_esdhc_imx_probe_dt(struct platform_device *pdev) +{ + const struct of_device_id *of_id = + of_match_device(imx_esdhc_dt_ids, &pdev->dev); + struct device_node *np = pdev->dev.of_node; + struct esdhc_platform_data *boarddata; + int err, i; + const char *cd, *cd_types[] = { + [ESDHC_CD_NONE] = "none", + [ESDHC_CD_CONTROLLER] = "controller", + [ESDHC_CD_GPIO] = "gpio", + [ESDHC_CD_PERMANENT] = "permanent", + }; + const char *wp, *wp_types[] = { + [ESDHC_WP_NONE] = "none", + [ESDHC_WP_CONTROLLER] = "controller", + [ESDHC_WP_GPIO] = "gpio", + }; + + if (!np) + return -ENODEV; + + boarddata = kzalloc(sizeof(*boarddata), GFP_KERNEL); + if (!boarddata) + return -ENOMEM; + pdev->dev.platform_data = boarddata; + + err = of_property_read_string(np, "cd-type", &cd); + if (err) + return err; + for (i = 0; i < ARRAY_SIZE(cd_types); i++) + if (!strcasecmp(cd, cd_types[i])) { + boarddata->cd_type = i; + break; + } + + err = of_property_read_string(np, "wp-type", &wp); + if (err) + return err; + for (i = 0; i < ARRAY_SIZE(wp_types); i++) + if (!strcasecmp(wp, wp_types[i])) { + boarddata->wp_type = i; + break; + } + + boarddata->cd_gpio = of_get_gpio(np, 0); + boarddata->wp_gpio = of_get_gpio(np, 1); + + pdev->id_entry = (struct platform_device_id *) of_id->data; + + return 0; +} +#else +static inline int sdhci_esdhc_imx_probe_dt(struct platform_device *pdev) +{ + return 0; +} +#endif + static int __devinit sdhci_esdhc_imx_probe(struct platform_device *pdev) { + struct device_node *np = pdev->dev.of_node; struct sdhci_pltfm_host *pltfm_host; struct sdhci_host *host; - struct esdhc_platform_data *boarddata; + struct esdhc_platform_data *boarddata = NULL; struct clk *clk; int err; struct pltfm_imx_data *imx_data; + err = sdhci_esdhc_imx_probe_dt(pdev); + if (err) + return err; + host = sdhci_pltfm_init(pdev, &sdhci_esdhc_imx_pdata); - if (IS_ERR(host)) - return PTR_ERR(host); + if (IS_ERR(host)) { + err = PTR_ERR(host); + goto err_sdhci_pltfm; + } pltfm_host = sdhci_priv(host); imx_data = kzalloc(sizeof(struct pltfm_imx_data), GFP_KERNEL); - if (!imx_data) - return -ENOMEM; + if (!imx_data) { + err = -ENOMEM; + goto err_imx_data; + } imx_data->devtype = pdev->id_entry->driver_data; pltfm_host->priv = imx_data; @@ -401,12 +481,17 @@ no_board_data: clk_put(pltfm_host->clk); err_clk_get: kfree(imx_data); +err_imx_data: sdhci_pltfm_free(pdev); +err_sdhci_pltfm: + if (np) + kfree(boarddata); return err; } static int __devexit sdhci_esdhc_imx_remove(struct platform_device *pdev) { + struct device_node *np = pdev->dev.of_node; struct sdhci_host *host = platform_get_drvdata(pdev); struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); struct esdhc_platform_data *boarddata = host->mmc->parent->platform_data; @@ -429,6 +514,9 @@ static int __devexit sdhci_esdhc_imx_remove(struct platform_device *pdev) sdhci_pltfm_free(pdev); + if (np) + kfree(boarddata); + return 0; } @@ -436,6 +524,7 @@ static struct platform_driver sdhci_esdhc_imx_driver = { .driver = { .name = "sdhci-esdhc-imx", .owner = THIS_MODULE, + .of_match_table = imx_esdhc_dt_ids, }, .id_table = imx_esdhc_devtype, .probe = sdhci_esdhc_imx_probe, -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/3] mmc: sdhci-esdhc-imx: add device tree probe support 2011-07-03 8:30 ` [PATCH 3/3] mmc: sdhci-esdhc-imx: add device tree probe support Shawn Guo @ 2011-07-04 6:25 ` Grant Likely 2011-07-05 15:35 ` Shawn Guo 0 siblings, 1 reply; 9+ messages in thread From: Grant Likely @ 2011-07-04 6:25 UTC (permalink / raw) To: linux-arm-kernel On Sun, Jul 03, 2011 at 04:30:51PM +0800, Shawn Guo wrote: > The patch adds device tree probe support for sdhci-esdhc-imx driver. > > Signed-off-by: Shawn Guo <shawn.guo@linaro.org> > Cc: Wolfram Sang <w.sang@pengutronix.de> > Cc: Chris Ball <cjb@laptop.org> > Cc: Grant Likely <grant.likely@secretlab.ca> > --- > .../devicetree/bindings/mmc/fsl-imx-esdhc.txt | 40 ++++++++ > drivers/mmc/host/sdhci-esdhc-imx.c | 99 +++++++++++++++++++- > 2 files changed, 134 insertions(+), 5 deletions(-) > create mode 100644 Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt > > diff --git a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt > new file mode 100644 > index 0000000..e182e7c > --- /dev/null > +++ b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt > @@ -0,0 +1,40 @@ > +* Freescale Enhanced Secure Digital Host Controller (eSDHC) for i.MX > + > +The Enhanced Secure Digital Host Controller on Freescale i.MX family > +provides an interface for MMC, SD, and SDIO types of memory cards. > + > +Required properties: > +- compatible : Should be "fsl,<chip>-esdhc" > +- reg : Should contain eSDHC registers location and length > +- interrupts : Should contain eSDHC interrupt > +- cd-type : String, card detection (CD) method. Supported values are: Similar to previous comments, use the "fsl," prefix to this property name. > + "none" : No CD > + "controller" : Uses eSDHC controller internal CD signal > + "gpio" : Uses GPIO pin for CD I would say the presence of a "cd-gpios" property would implicitly mean gpio is to be used for the CD pin. > + "permanent" : No CD because card is permanently wired to host > +- wp-type : String, write protection (WP) method. Supported values are: > + "none" : No WP > + "controller" : Uses eSDHC controller internal WP signal > + "gpio" : Uses GPIO pin for WP Ditto comments here. > +- gpios : Should specify GPIOs in this order: CD GPIO, WP GPIO, if > + properties cd-type and wp-type are "gpio". The gpios binding has been extended to allow named gpios now. You can uses something like "cd-gpios" and "wp-gpios". > + > +Examples: > + > +esdhc at 70004000 { > + compatible = "fsl,imx51-esdhc"; > + reg = <0x70004000 0x4000>; > + interrupts = <1>; > + cd-type = "controller"; > + wp-type = "controller"; > +}; > + > +esdhc at 70008000 { > + compatible = "fsl,imx51-esdhc"; > + reg = <0x70008000 0x4000>; > + interrupts = <2>; > + cd-type = "gpio"; > + wp-type = "gpio"; > + gpios = <&gpio0 6 0>, /* CD, GPIO1_6 */ > + <&gpio0 5 0>; /* WP, GPIO1_5 */ > +}; > diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c > index 705d670..57793e3 100644 > --- a/drivers/mmc/host/sdhci-esdhc-imx.c > +++ b/drivers/mmc/host/sdhci-esdhc-imx.c > @@ -20,6 +20,9 @@ > #include <linux/mmc/host.h> > #include <linux/mmc/mmc.h> > #include <linux/mmc/sdio.h> > +#include <linux/of.h> > +#include <linux/of_device.h> > +#include <linux/of_gpio.h> > #include <mach/esdhc.h> > #include "sdhci-pltfm.h" > #include "sdhci-esdhc.h" > @@ -78,6 +81,14 @@ static struct platform_device_id imx_esdhc_devtype[] = { > }; > MODULE_DEVICE_TABLE(platform, imx_esdhc_devtype); > > +static const struct of_device_id imx_esdhc_dt_ids[] = { > + { .compatible = "fsl,imx25-esdhc", .data = &imx_esdhc_devtype[IMX25_ESDHC], }, > + { .compatible = "fsl,imx35-esdhc", .data = &imx_esdhc_devtype[IMX35_ESDHC], }, > + { .compatible = "fsl,imx51-esdhc", .data = &imx_esdhc_devtype[IMX51_ESDHC], }, > + { .compatible = "fsl,imx53-esdhc", .data = &imx_esdhc_devtype[IMX53_ESDHC], }, > + { /* sentinel */ }, > +}; > + > static unsigned int esdhc_pltfm_get_max_blk_size(struct sdhci_host *host) > { > /* Force 2048 bytes, which is the maximum supported size in SDHCI. */ > @@ -290,24 +301,93 @@ static irqreturn_t cd_irq(int irq, void *data) > return IRQ_HANDLED; > }; > > +#ifdef CONFIG_OF > +static int __devinit sdhci_esdhc_imx_probe_dt(struct platform_device *pdev) > +{ > + const struct of_device_id *of_id = > + of_match_device(imx_esdhc_dt_ids, &pdev->dev); > + struct device_node *np = pdev->dev.of_node; > + struct esdhc_platform_data *boarddata; > + int err, i; > + const char *cd, *cd_types[] = { > + [ESDHC_CD_NONE] = "none", > + [ESDHC_CD_CONTROLLER] = "controller", > + [ESDHC_CD_GPIO] = "gpio", > + [ESDHC_CD_PERMANENT] = "permanent", > + }; > + const char *wp, *wp_types[] = { > + [ESDHC_WP_NONE] = "none", > + [ESDHC_WP_CONTROLLER] = "controller", > + [ESDHC_WP_GPIO] = "gpio", > + }; > + > + if (!np) > + return -ENODEV; > + > + boarddata = kzalloc(sizeof(*boarddata), GFP_KERNEL); > + if (!boarddata) > + return -ENOMEM; > + pdev->dev.platform_data = boarddata; > + > + err = of_property_read_string(np, "cd-type", &cd); > + if (err) > + return err; > + for (i = 0; i < ARRAY_SIZE(cd_types); i++) > + if (!strcasecmp(cd, cd_types[i])) { > + boarddata->cd_type = i; > + break; > + } > + > + err = of_property_read_string(np, "wp-type", &wp); > + if (err) > + return err; > + for (i = 0; i < ARRAY_SIZE(wp_types); i++) > + if (!strcasecmp(wp, wp_types[i])) { > + boarddata->wp_type = i; > + break; > + } > + > + boarddata->cd_gpio = of_get_gpio(np, 0); > + boarddata->wp_gpio = of_get_gpio(np, 1); > + > + pdev->id_entry = (struct platform_device_id *) of_id->data; > + > + return 0; > +} > +#else > +static inline int sdhci_esdhc_imx_probe_dt(struct platform_device *pdev) > +{ > + return 0; > +} > +#endif > + > static int __devinit sdhci_esdhc_imx_probe(struct platform_device *pdev) > { > + struct device_node *np = pdev->dev.of_node; > struct sdhci_pltfm_host *pltfm_host; > struct sdhci_host *host; > - struct esdhc_platform_data *boarddata; > + struct esdhc_platform_data *boarddata = NULL; > struct clk *clk; > int err; > struct pltfm_imx_data *imx_data; > > + err = sdhci_esdhc_imx_probe_dt(pdev); > + if (err) > + return err; > + > host = sdhci_pltfm_init(pdev, &sdhci_esdhc_imx_pdata); > - if (IS_ERR(host)) > - return PTR_ERR(host); > + if (IS_ERR(host)) { > + err = PTR_ERR(host); > + goto err_sdhci_pltfm; > + } > > pltfm_host = sdhci_priv(host); > > imx_data = kzalloc(sizeof(struct pltfm_imx_data), GFP_KERNEL); > - if (!imx_data) > - return -ENOMEM; > + if (!imx_data) { > + err = -ENOMEM; > + goto err_imx_data; > + } > > imx_data->devtype = pdev->id_entry->driver_data; > pltfm_host->priv = imx_data; > @@ -401,12 +481,17 @@ no_board_data: > clk_put(pltfm_host->clk); > err_clk_get: > kfree(imx_data); > +err_imx_data: > sdhci_pltfm_free(pdev); > +err_sdhci_pltfm: > + if (np) > + kfree(boarddata); > return err; > } > > static int __devexit sdhci_esdhc_imx_remove(struct platform_device *pdev) > { > + struct device_node *np = pdev->dev.of_node; > struct sdhci_host *host = platform_get_drvdata(pdev); > struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); > struct esdhc_platform_data *boarddata = host->mmc->parent->platform_data; > @@ -429,6 +514,9 @@ static int __devexit sdhci_esdhc_imx_remove(struct platform_device *pdev) > > sdhci_pltfm_free(pdev); > > + if (np) > + kfree(boarddata); > + > return 0; > } > > @@ -436,6 +524,7 @@ static struct platform_driver sdhci_esdhc_imx_driver = { > .driver = { > .name = "sdhci-esdhc-imx", > .owner = THIS_MODULE, > + .of_match_table = imx_esdhc_dt_ids, > }, > .id_table = imx_esdhc_devtype, > .probe = sdhci_esdhc_imx_probe, > -- > 1.7.4.1 > ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 3/3] mmc: sdhci-esdhc-imx: add device tree probe support 2011-07-04 6:25 ` Grant Likely @ 2011-07-05 15:35 ` Shawn Guo 2011-07-05 17:20 ` Grant Likely 0 siblings, 1 reply; 9+ messages in thread From: Shawn Guo @ 2011-07-05 15:35 UTC (permalink / raw) To: linux-arm-kernel On Mon, Jul 04, 2011 at 12:25:48AM -0600, Grant Likely wrote: > On Sun, Jul 03, 2011 at 04:30:51PM +0800, Shawn Guo wrote: > > The patch adds device tree probe support for sdhci-esdhc-imx driver. > > > > Signed-off-by: Shawn Guo <shawn.guo@linaro.org> > > Cc: Wolfram Sang <w.sang@pengutronix.de> > > Cc: Chris Ball <cjb@laptop.org> > > Cc: Grant Likely <grant.likely@secretlab.ca> > > --- > > .../devicetree/bindings/mmc/fsl-imx-esdhc.txt | 40 ++++++++ > > drivers/mmc/host/sdhci-esdhc-imx.c | 99 +++++++++++++++++++- > > 2 files changed, 134 insertions(+), 5 deletions(-) > > create mode 100644 Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt > > > > diff --git a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt > > new file mode 100644 > > index 0000000..e182e7c > > --- /dev/null > > +++ b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt > > @@ -0,0 +1,40 @@ > > +* Freescale Enhanced Secure Digital Host Controller (eSDHC) for i.MX > > + > > +The Enhanced Secure Digital Host Controller on Freescale i.MX family > > +provides an interface for MMC, SD, and SDIO types of memory cards. > > + > > +Required properties: > > +- compatible : Should be "fsl,<chip>-esdhc" > > +- reg : Should contain eSDHC registers location and length > > +- interrupts : Should contain eSDHC interrupt > > +- cd-type : String, card detection (CD) method. Supported values are: > > Similar to previous comments, use the "fsl," prefix to this property name. > I did not know even property name could be written like this. I tried it and found it works :) > > + "none" : No CD > > + "controller" : Uses eSDHC controller internal CD signal > > + "gpio" : Uses GPIO pin for CD > > I would say the presence of a "cd-gpios" property would implicitly > mean gpio is to be used for the CD pin. > Yes, you are right. But I would say this is a direct translation of the existing platform_data. After all, we are sharing most of code path between platform and dt. -- Regards, Shawn ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 3/3] mmc: sdhci-esdhc-imx: add device tree probe support 2011-07-05 15:35 ` Shawn Guo @ 2011-07-05 17:20 ` Grant Likely 0 siblings, 0 replies; 9+ messages in thread From: Grant Likely @ 2011-07-05 17:20 UTC (permalink / raw) To: linux-arm-kernel On Tue, Jul 5, 2011 at 9:35 AM, Shawn Guo <shawn.guo@freescale.com> wrote: > On Mon, Jul 04, 2011 at 12:25:48AM -0600, Grant Likely wrote: >> > + ? ?"none" : No CD >> > + ? ?"controller" : Uses eSDHC controller internal CD signal >> > + ? ?"gpio" : Uses GPIO pin for CD >> >> I would say the presence of a "cd-gpios" property would implicitly >> mean gpio is to be used for the CD pin. >> > Yes, you are right. ?But I would say this is a direct translation of > the existing platform_data. ?After all, we are sharing most of code > path between platform and dt. Meh, that's just implementation detail and the DT bindings should *not* be focused on what Linux happens to currently do. Define a binding that makes sense first and foremost, and then make the driver use it. g. ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2011-07-05 17:20 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-07-03 8:30 [PATCH 0/3] Add device tree probe for sdhci-esdhc-imx Shawn Guo 2011-07-03 8:30 ` [PATCH 1/3] mmc: sdhci-esdhc-imx: get rid of the uses of cpu_is_mx() Shawn Guo 2011-07-04 6:21 ` Grant Likely 2011-07-03 8:30 ` [PATCH 2/3] mmc: sdhci-pltfm: dt device does not pass parent to sdhci_alloc_host Shawn Guo 2011-07-04 6:22 ` Grant Likely 2011-07-03 8:30 ` [PATCH 3/3] mmc: sdhci-esdhc-imx: add device tree probe support Shawn Guo 2011-07-04 6:25 ` Grant Likely 2011-07-05 15:35 ` Shawn Guo 2011-07-05 17:20 ` Grant Likely
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).