Skip to contentSkip to conversation

Adding support for esdhc on mx35/51

PATCH New Wolfram Sang 5 participants 19 messages Sep 21, 2010 – Sep 26, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover Adding support for esdhc on mx35/51

Hi,

this series adds basic support for the esdhc-controller found on mx35/51-cpus. It first extends the sdhci-pltfm-driver to have a runtime-structure for data (1/4), does a bit of cleanup (2/4), extracts a few parts which can be shared with the OF-version (3/4) and finally adds the driver (4/4).

Note that the support is basic at the moment. Still to be done are:

* ADMA support (Richard Zhu mentioned it has issues and knows the details)

* 8-Bit bus width (needs more research; it breaks some cards for me :( )

* voltage switching using a regulator (I don't have such hardware, hopefully Richard can pick this up)

* write_protect using a GPIO (we need to retrieve board-specific data for that; an RFC follows after this series)

Platform resources could be posted after write_protect issue has been sorted out.

Please review and/or give comments. Please let me also know if you intend to work on a missing bit.

Thanks,

Wolfram

===

Wolfram Sang (4):
mmc: sdhci-pltfm: Add structure for host-specific data
mmc: sdhci-pltfm: move .h-file into apropriate subdir
mmc: sdhci-of-esdhc: factor out common stuff
mmc: sdhci-pltfm: add pltfm-driver for imx35/51

 drivers/mmc/host/Kconfig          |    9 +++
 drivers/mmc/host/Makefile         |    1 +
 drivers/mmc/host/sdhci-cns3xxx.c  |    2 +-
 drivers/mmc/host/sdhci-esdhc.c    |  141 +++++++++++++++++++++++++++++++++++++
 drivers/mmc/host/sdhci-esdhc.h    |   81 +++++++++++++++++++++
 drivers/mmc/host/sdhci-of-esdhc.c |   70 ++----------------
 drivers/mmc/host/sdhci-pltfm.c    |   12 +++-
 drivers/mmc/host/sdhci-pltfm.h    |    8 ++-
 include/linux/mmc/sdhci-pltfm.h   |   35 +++++++++
 include/linux/sdhci-pltfm.h       |   35 ---------
 10 files changed, 292 insertions(+), 102 deletions(-)
 create mode 100644 drivers/mmc/host/sdhci-esdhc.c
 create mode 100644 drivers/mmc/host/sdhci-esdhc.h
 create mode 100644 include/linux/mmc/sdhci-pltfm.h
 delete mode 100644 include/linux/sdhci-pltfm.h
#1 lore raw

PATCH 1/4 mmc: sdhci-pltfm: Add structure for host-specific data

We need to carry some information per host, e.g. the clock. Add a structure for it and initialize it in the generic part.

---
 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
index e045e3c..bf522a1 100644
@@ -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
index 900f329..c393289 100644
@@ -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
#2 lore raw

PATCH 1/4 mmc: sdhci-pltfm: Add structure for host-specific data

Quoted 5 lines · Wolfram Sang

We need to carry some information per host, e.g. the clock. Add a structure for it and initialize it in the generic part.

---

[...]

drivers/mmc/host/sdhci-pltfm.h line 17

Quoted 10 lines
drivers/mmc/host/sdhci-pltfm.h +2 -0
index 900f329..c393289 100644
@@ -13,6 +13,11 @@
 
 #include <linux/sdhci-pltfm.h>
 
+struct sdhci_pltfm_host {
+	struct clk *clk;

Forward decl for struct clk is needed.

drivers/mmc/host/sdhci-pltfm.h line 18

Quoted 1 line
drivers/mmc/host/sdhci-pltfm.h +1 -0
+	u32 scratchpad; /* to handle quirks across io-accessor calls */

#include <linux/types.h> is needed for u32.

Thanks,

Signature · 3 lines
Anton Vorontsov
email: cbouatmailru at gmail.com
irc://irc.freenode.net/bd2
#3 lore raw

PATCH 1/4 mmc: sdhci-pltfm: Add structure for host-specific data

In reply to Wolfram Sang
Quoted 22 lines · Wolfram Sang

We need to carry some information per host, e.g. the clock. Add a structure for it and initialize it in the generic part.

---
?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 +1 -0
index e045e3c..bf522a1 100644
@@ -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;
 

drivers/mmc/host/sdhci-pltfm.c static int __devinit sdhci_pltfm_probe(struct platform_device *pdev) · line 76

Quoted 5 lines
drivers/mmc/host/sdhci-pltfm.c +1 -1
@@ -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));

Could you help clarify why pdev->dev.parent here, then mmc_dev(host->mmc) in child driver is platform, instead of specific driver itself, is this the design.

Quoted 23 lines

? ? ? ?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 +0 -0
index 900f329..c393289 100644
@@ -13,6 +13,11 @@
 

?#include <linux/sdhci-pltfm.h>

drivers/mmc/host/sdhci-pltfm.h line 20

Quoted 5 lines
drivers/mmc/host/sdhci-pltfm.h +5 -0
+struct sdhci_pltfm_host {
+ ? ? ? struct clk *clk;
+ ? ? ? u32 scratchpad; /* to handle quirks across io-accessor calls */
+};
+

How about move private data to child driver, and one call back function alloc_host, then child driver could alloc private data, including clk.

Quoted 11 lines

?extern struct sdhci_pltfm_data sdhci_cns3xxx_pdata;

?#endif /* _DRIVERS_MMC_SDHCI_PLTFM_H */
--
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo at vger.kernel.org
More majordomo info at ?http://vger.kernel.org/majordomo-info.html

#4 lore raw

PATCH 1/4 mmc: sdhci-pltfm: Add structure for host-specific data

Hello,

Quoted 6 lines · zhangfei gao
Quoted 5 lines · Wolfram Sang

+++ b/drivers/mmc/host/sdhci-pltfm.h

(quoted diff) +0 -0
@@ -13,6 +13,11 @@
 

?#include <linux/sdhci-pltfm.h>

Quoted 8 lines

drivers/mmc/host/sdhci-pltfm.h line 20

Quoted 5 lines
drivers/mmc/host/sdhci-pltfm.h +5 -0
+struct sdhci_pltfm_host {
+ ? ? ? struct clk *clk;
+ ? ? ? u32 scratchpad; /* to handle quirks across io-accessor calls */
+};
+

How about move private data to child driver, and one call back function alloc_host, then child driver could alloc private data, including clk.

IMHO, this sounds like a bit of overdesign/overcomplication.

Signature · 3 lines
Anton Vorontsov
email: cbouatmailru at gmail.com
irc://irc.freenode.net/bd2
#5 lore raw

PATCH 2/4 mmc: sdhci-pltfm: move .h-file into apropriate subdir

In reply to Wolfram Sang

Make use of the mmc-directory.

---
 drivers/mmc/host/sdhci-cns3xxx.c |    2 +-
 drivers/mmc/host/sdhci-pltfm.c   |    2 +-
 drivers/mmc/host/sdhci-pltfm.h   |    2 +-
 include/linux/mmc/sdhci-pltfm.h  |   35 +++++++++++++++++++++++++++++++++++
 include/linux/sdhci-pltfm.h      |   35 -----------------------------------
 5 files changed, 38 insertions(+), 38 deletions(-)
 create mode 100644 include/linux/mmc/sdhci-pltfm.h
 delete mode 100644 include/linux/sdhci-pltfm.h
drivers/mmc/host/sdhci-cns3xxx.c +1 -1
index b7050b3..9ebd1d7 100644
@@ -15,7 +15,7 @@
 #include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/mmc/host.h>
-#include <linux/sdhci-pltfm.h>
+#include <linux/mmc/sdhci-pltfm.h>
 #include <mach/cns3xxx.h>
 #include "sdhci.h"
 #include "sdhci-pltfm.h"
drivers/mmc/host/sdhci-pltfm.c +1 -1
index bf522a1..ff0271c 100644
@@ -30,7 +30,7 @@
 #include <linux/mmc/host.h>
 
 #include <linux/io.h>
-#include <linux/sdhci-pltfm.h>
+#include <linux/mmc/sdhci-pltfm.h>
 
 #include "sdhci.h"
 #include "sdhci-pltfm.h"
drivers/mmc/host/sdhci-pltfm.h +1 -1
index c393289..2b43ed5 100644
@@ -11,7 +11,7 @@
 #ifndef _DRIVERS_MMC_SDHCI_PLTFM_H
 #define _DRIVERS_MMC_SDHCI_PLTFM_H
 
-#include <linux/sdhci-pltfm.h>
+#include <linux/mmc/sdhci-pltfm.h>
 
 struct sdhci_pltfm_host {
 	struct clk *clk;
include/linux/mmc/sdhci-pltfm.h new file +35 -0
new file mode 100644
index 0000000..0239bd7
@@ -0,0 +1,35 @@
+/*
+ * Platform data declarations for the sdhci-pltfm driver.
+ *
+ * Copyright (c) 2010 MontaVista Software, LLC.
+ *
+ * Author: Anton Vorontsov <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ */
+
+#ifndef _SDHCI_PLTFM_H
+#define _SDHCI_PLTFM_H
+
+struct sdhci_ops;
+struct sdhci_host;
+
+/**
+ * struct sdhci_pltfm_data - SDHCI platform-specific information & hooks
+ * @ops: optional pointer to the platform-provided SDHCI ops
+ * @quirks: optional SDHCI quirks
+ * @init: optional hook that is called during device probe, before the
+ *        driver tries to access any SDHCI registers
+ * @exit: optional hook that is called during device removal
+ */
+struct sdhci_pltfm_data {
+	struct sdhci_ops *ops;
+	unsigned int quirks;
+	int (*init)(struct sdhci_host *host);
+	void (*exit)(struct sdhci_host *host);
+};
+
+#endif /* _SDHCI_PLTFM_H */
include/linux/sdhci-pltfm.h deleted +0 -35
deleted file mode 100644
index 0239bd7..0000000
@@ -1,35 +0,0 @@
-/*
- * Platform data declarations for the sdhci-pltfm driver.
- *
- * Copyright (c) 2010 MontaVista Software, LLC.
- *
- * Author: Anton Vorontsov <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- */
-
-#ifndef _SDHCI_PLTFM_H
-#define _SDHCI_PLTFM_H
-
-struct sdhci_ops;
-struct sdhci_host;
-
-/**
- * struct sdhci_pltfm_data - SDHCI platform-specific information & hooks
- * @ops: optional pointer to the platform-provided SDHCI ops
- * @quirks: optional SDHCI quirks
- * @init: optional hook that is called during device probe, before the
- *        driver tries to access any SDHCI registers
- * @exit: optional hook that is called during device removal
- */
-struct sdhci_pltfm_data {
-	struct sdhci_ops *ops;
-	unsigned int quirks;
-	int (*init)(struct sdhci_host *host);
-	void (*exit)(struct sdhci_host *host);
-};
-
-#endif /* _SDHCI_PLTFM_H */
Signature · 1 line
1.7.1
#7 lore raw

PATCH 2/4 mmc: sdhci-pltfm: move .h-file into apropriate subdir

In reply to Wolfram Sang
Quoted 9 lines · Wolfram Sang

Make use of the mmc-directory.

---
 drivers/mmc/host/sdhci-cns3xxx.c |    2 +-
 drivers/mmc/host/sdhci-pltfm.c   |    2 +-
 drivers/mmc/host/sdhci-pltfm.h   |    2 +-
 include/linux/mmc/sdhci-pltfm.h  |   35 +++++++++++++++++++++++++++++++++++
 include/linux/sdhci-pltfm.h      |   35 -----------------------------------

hmm, you lost rename detection... best enable it to make these diffs clearer.

Quoted 132 lines
 5 files changed, 38 insertions(+), 38 deletions(-)
 create mode 100644 include/linux/mmc/sdhci-pltfm.h
 delete mode 100644 include/linux/sdhci-pltfm.h
drivers/mmc/host/sdhci-cns3xxx.c +1 -1
index b7050b3..9ebd1d7 100644
@@ -15,7 +15,7 @@
 #include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/mmc/host.h>
-#include <linux/sdhci-pltfm.h>
+#include <linux/mmc/sdhci-pltfm.h>
 #include <mach/cns3xxx.h>
 #include "sdhci.h"
 #include "sdhci-pltfm.h"
drivers/mmc/host/sdhci-pltfm.c +1 -1
index bf522a1..ff0271c 100644
@@ -30,7 +30,7 @@
 #include <linux/mmc/host.h>
 
 #include <linux/io.h>
-#include <linux/sdhci-pltfm.h>
+#include <linux/mmc/sdhci-pltfm.h>
 
 #include "sdhci.h"
 #include "sdhci-pltfm.h"
drivers/mmc/host/sdhci-pltfm.h +1 -1
index c393289..2b43ed5 100644
@@ -11,7 +11,7 @@
 #ifndef _DRIVERS_MMC_SDHCI_PLTFM_H
 #define _DRIVERS_MMC_SDHCI_PLTFM_H
 
-#include <linux/sdhci-pltfm.h>
+#include <linux/mmc/sdhci-pltfm.h>
 
 struct sdhci_pltfm_host {
 	struct clk *clk;
include/linux/mmc/sdhci-pltfm.h new file +35 -0
new file mode 100644
index 0000000..0239bd7
@@ -0,0 +1,35 @@
+/*
+ * Platform data declarations for the sdhci-pltfm driver.
+ *
+ * Copyright (c) 2010 MontaVista Software, LLC.
+ *
+ * Author: Anton Vorontsov <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ */
+
+#ifndef _SDHCI_PLTFM_H
+#define _SDHCI_PLTFM_H
+
+struct sdhci_ops;
+struct sdhci_host;
+
+/**
+ * struct sdhci_pltfm_data - SDHCI platform-specific information & hooks
+ * @ops: optional pointer to the platform-provided SDHCI ops
+ * @quirks: optional SDHCI quirks
+ * @init: optional hook that is called during device probe, before the
+ *        driver tries to access any SDHCI registers
+ * @exit: optional hook that is called during device removal
+ */
+struct sdhci_pltfm_data {
+	struct sdhci_ops *ops;
+	unsigned int quirks;
+	int (*init)(struct sdhci_host *host);
+	void (*exit)(struct sdhci_host *host);
+};
+
+#endif /* _SDHCI_PLTFM_H */
include/linux/sdhci-pltfm.h deleted +0 -35
deleted file mode 100644
index 0239bd7..0000000
@@ -1,35 +0,0 @@
-/*
- * Platform data declarations for the sdhci-pltfm driver.
- *
- * Copyright (c) 2010 MontaVista Software, LLC.
- *
- * Author: Anton Vorontsov <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- */
-
-#ifndef _SDHCI_PLTFM_H
-#define _SDHCI_PLTFM_H
-
-struct sdhci_ops;
-struct sdhci_host;
-
-/**
- * struct sdhci_pltfm_data - SDHCI platform-specific information & hooks
- * @ops: optional pointer to the platform-provided SDHCI ops
- * @quirks: optional SDHCI quirks
- * @init: optional hook that is called during device probe, before the
- *        driver tries to access any SDHCI registers
- * @exit: optional hook that is called during device removal
- */
-struct sdhci_pltfm_data {
-	struct sdhci_ops *ops;
-	unsigned int quirks;
-	int (*init)(struct sdhci_host *host);
-	void (*exit)(struct sdhci_host *host);
-};
-
-#endif /* _SDHCI_PLTFM_H */
Signature · 6 lines
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Signature · 5 lines
-- 
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.
#8 lore raw

PATCH 2/4 mmc: sdhci-pltfm: move .h-file into apropriate subdir

Quoted 11 lines · Ben Dooks
Quoted 9 lines · Wolfram Sang

Make use of the mmc-directory.

---
 drivers/mmc/host/sdhci-cns3xxx.c |    2 +-
 drivers/mmc/host/sdhci-pltfm.c   |    2 +-
 drivers/mmc/host/sdhci-pltfm.h   |    2 +-
 include/linux/mmc/sdhci-pltfm.h  |   35 +++++++++++++++++++++++++++++++++++
 include/linux/sdhci-pltfm.h      |   35 -----------------------------------
Quoted 1 line

hmm, you lost rename detection... best enable it to make these diffs clearer.

Do you mean just for the diffstat or for the whole patch? I am reluctant to do the latter because you can't apply patches with plain 'patch' anymore. Or are git-patches considered standard meanwhile?

Regards,

Wolfram

Signature · 9 lines
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100922/2d2d5aa1/attachment.sig>
#9 lore raw

PATCH 3/4 mmc: sdhci-of-esdhc: factor out common stuff

In reply to Wolfram Sang

Put everything which can be shared between the OF and platform version of this driver into a local .h-file.

---
 drivers/mmc/host/sdhci-esdhc.h    |   81 +++++++++++++++++++++++++++++++++++++
 drivers/mmc/host/sdhci-of-esdhc.c |   70 ++++----------------------------
 2 files changed, 89 insertions(+), 62 deletions(-)
 create mode 100644 drivers/mmc/host/sdhci-esdhc.h
drivers/mmc/host/sdhci-esdhc.h new file +81 -0
new file mode 100644
index 0000000..cd30a63
@@ -0,0 +1,81 @@
+/*
+ * Freescale eSDHC controller driver generics for OF and pltfm.
+ *
+ * Copyright (c) 2007 Freescale Semiconductor, Inc.
+ * Copyright (c) 2009 MontaVista Software, Inc.
+ * Copyright (c) 2010 Pengutronix e.K.
+ *   Author: Wolfram Sang <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License.
+ */
+
+#ifndef _DRIVERS_MMC_SDHCI_ESDHC_H
+#define _DRIVERS_MMC_SDHCI_ESDHC_H
+
+/*
+ * Ops and quirks for the Freescale eSDHC controller.
+ */
+
+#define ESDHC_DEFAULT_QUIRKS	(SDHCI_QUIRK_FORCE_BLK_SZ_2048 | \
+				SDHCI_QUIRK_BROKEN_CARD_DETECTION | \
+				SDHCI_QUIRK_NO_BUSY_IRQ | \
+				SDHCI_QUIRK_NONSTANDARD_CLOCK | \
+				SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK | \
+				SDHCI_QUIRK_PIO_NEEDS_DELAY | \
+				SDHCI_QUIRK_RESTORE_IRQS_AFTER_RESET | \
+				SDHCI_QUIRK_NO_CARD_NO_RESET)
+
+#define ESDHC_SYSTEM_CONTROL	0x2c
+#define ESDHC_CLOCK_MASK	0x0000fff0
+#define ESDHC_PREDIV_SHIFT	8
+#define ESDHC_DIVIDER_SHIFT	4
+#define ESDHC_CLOCK_PEREN	0x00000004
+#define ESDHC_CLOCK_HCKEN	0x00000002
+#define ESDHC_CLOCK_IPGEN	0x00000001
+
+/* pltfm-specific */
+#define ESDHC_HOST_CONTROL_LE	0x20
+
+/* OF-specific */
+#define ESDHC_DMA_SYSCTL	0x40c
+#define ESDHC_DMA_SNOOP		0x00000040
+
+#define ESDHC_HOST_CONTROL_RES	0x05
+
+static void esdhc_set_clock(struct sdhci_host *host, unsigned int clock)
+{
+	int pre_div = 2;
+	int div = 1;
+	u32 temp;
+
+	temp = sdhci_readl(host, ESDHC_SYSTEM_CONTROL);
+	temp &= ~(ESDHC_CLOCK_IPGEN | ESDHC_CLOCK_HCKEN | ESDHC_CLOCK_PEREN | ESDHC_CLOCK_MASK);
+	sdhci_writel(host, temp, ESDHC_SYSTEM_CONTROL);
+
+	if (clock == 0)
+		goto out;
+
+	while (host->max_clk / pre_div / 16 > clock && pre_div < 256)
+		pre_div *= 2;
+
+	while (host->max_clk / pre_div / div > clock && div < 16)
+		div++;
+
+	dev_dbg(mmc_dev(host->mmc), "desired SD clock: %d, actual: %d\n",
+		clock, host->max_clk / pre_div / div);
+
+	pre_div >>= 1;
+	div--;
+
+	temp = sdhci_readl(host, ESDHC_SYSTEM_CONTROL);
+	temp |= (ESDHC_CLOCK_IPGEN | ESDHC_CLOCK_HCKEN | ESDHC_CLOCK_PEREN |
+		  (div << ESDHC_DIVIDER_SHIFT) | (pre_div << ESDHC_PREDIV_SHIFT));
+	sdhci_writel(host, temp, ESDHC_SYSTEM_CONTROL);
+	mdelay(100);
+out:
+	host->clock = clock;
+}
+
+#endif /* _DRIVERS_MMC_SDHCI_ESDHC_H */
drivers/mmc/host/sdhci-of-esdhc.c +8 -62

104 lines not on this page · raw message

Signature · 1 line
1.7.1
#10 lore raw

PATCH 3/4 mmc: sdhci-of-esdhc: factor out common stuff

Quoted 5 lines · Wolfram Sang

Put everything which can be shared between the OF and platform version of this driver into a local .h-file.

---

[...]

Quoted 24 lines
drivers/mmc/host/sdhci-esdhc.h new file +24 -0
+
+static void esdhc_set_clock(struct sdhci_host *host, unsigned int clock)
+{
+	int pre_div = 2;
+	int div = 1;
+	u32 temp;
+
+	temp = sdhci_readl(host, ESDHC_SYSTEM_CONTROL);
+	temp &= ~(ESDHC_CLOCK_IPGEN | ESDHC_CLOCK_HCKEN | ESDHC_CLOCK_PEREN | ESDHC_CLOCK_MASK);
+	sdhci_writel(host, temp, ESDHC_SYSTEM_CONTROL);
+
+	if (clock == 0)
+		goto out;
+
+	while (host->max_clk / pre_div / 16 > clock && pre_div < 256)
+		pre_div *= 2;
+
+	while (host->max_clk / pre_div / div > clock && div < 16)
+		div++;
+
+	dev_dbg(mmc_dev(host->mmc), "desired SD clock: %d, actual: %d\n",
+		clock, host->max_clk / pre_div / div);
+
+	pre_div >>= 1;

drivers/mmc/host/sdhci-esdhc.h line 79

Quoted 10 lines
drivers/mmc/host/sdhci-esdhc.h new file +10 -0
+	div--;
+
+	temp = sdhci_readl(host, ESDHC_SYSTEM_CONTROL);
+	temp |= (ESDHC_CLOCK_IPGEN | ESDHC_CLOCK_HCKEN | ESDHC_CLOCK_PEREN |
+		  (div << ESDHC_DIVIDER_SHIFT) | (pre_div << ESDHC_PREDIV_SHIFT));
+	sdhci_writel(host, temp, ESDHC_SYSTEM_CONTROL);
+	mdelay(100);
+out:
+	host->clock = clock;
+}

This function is too big for a header. How about moving it to sdhci-esdhc.c, which would hold common bits for eSDHC?

Thanks,

Signature · 3 lines
Anton Vorontsov
email: cbouatmailru at gmail.com
irc://irc.freenode.net/bd2
#11 lore raw

PATCH 4/4 mmc: sdhci-pltfm: add pltfm-driver for imx35/51

In reply to Wolfram Sang

This driver adds basic support for the esdhc-core found on e.g. imx35/51. It adds up to the pltfm-core.

---
 drivers/mmc/host/Kconfig       |    9 +++
 drivers/mmc/host/Makefile      |    1 +
 drivers/mmc/host/sdhci-esdhc.c |  141 ++++++++++++++++++++++++++++++++++++++++
 drivers/mmc/host/sdhci-pltfm.c |    3 +
 drivers/mmc/host/sdhci-pltfm.h |    1 +
 5 files changed, 155 insertions(+), 0 deletions(-)
 create mode 100644 drivers/mmc/host/sdhci-esdhc.c
drivers/mmc/host/Kconfig +9 -0
index 6f12d5d..20d03f5 100644
@@ -143,6 +143,15 @@ config MMC_SDHCI_MV
 
 	  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
index 697bbfe..445d1e5 100644
@@ -42,6 +42,7 @@ obj-$(CONFIG_MMC_USHC)		+= ushc.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 +141 -0

141 lines not on this page · raw message

drivers/mmc/host/sdhci-pltfm.c +3 -0
index ff0271c..6ba3f3d 100644
@@ -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
index 2b43ed5..deb4d27 100644
@@ -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
#12 lore raw

PATCH 4/4 mmc: sdhci-pltfm: add pltfm-driver for imx35/51

Quoted 8 lines · Wolfram Sang

This driver adds basic support for the esdhc-core found on e.g. imx35/51. It adds up to the pltfm-core.

---
 drivers/mmc/host/Kconfig       |    9 +++
 drivers/mmc/host/Makefile      |    1 +
 drivers/mmc/host/sdhci-esdhc.c |  141 ++++++++++++++++++++++++++++++++++++++++

I'd reserve that file for esdhc common code, and move IMX specific bits to sdhci-esdhc-imx.c.

Quoted 10 lines
 drivers/mmc/host/sdhci-pltfm.c |    3 +
 drivers/mmc/host/sdhci-pltfm.h |    1 +
 5 files changed, 155 insertions(+), 0 deletions(-)
 create mode 100644 drivers/mmc/host/sdhci-esdhc.c
drivers/mmc/host/Kconfig +0 -0
index 6f12d5d..20d03f5 100644

drivers/mmc/host/Kconfig config MMC_SDHCI_MV · line 147

Quoted 5 lines
drivers/mmc/host/Kconfig +2 -0
@@ -143,6 +143,15 @@ config MMC_SDHCI_MV
 
 	  If unsure, say N.
 
+config MMC_SDHCI_ESDHC
+	bool "SDHCI platform support for the Freescale eSDHC controller"

Maybe Freescale IMX eSDHC? Let's keep MPC and IMX eSDHC separate as it's quite possible that they may have different bugs and limitations.

[...]

drivers/mmc/host/Kconfig config MMC_SDHCI_MV

Quoted 13 lines
drivers/mmc/host/Kconfig +13 -0
+#include <linux/io.h>
+#include <linux/delay.h>
+#include <linux/err.h>
+#include <linux/clk.h>
+#include <linux/mmc/host.h>
+#include <linux/mmc/sdhci-pltfm.h>
+#include "sdhci.h"
+#include "sdhci-esdhc.h"
+#include "sdhci-pltfm.h"
+
+static inline void esdhc_clrset_le(struct sdhci_host *host, u32 mask, u32 val, int reg)
+{
+	void __iomem *base = host->ioaddr + (reg & ~0x3);

#include <linux/compiler.h> is needed for __iomem.

[...]

drivers/mmc/host/Kconfig

Quoted 3 lines
drivers/mmc/host/Kconfig +3 -0
+static unsigned int esdhc_pltfm_get_max_clock(struct sdhci_host *host)
+{
+	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);

Please put an empty line here.

drivers/mmc/host/Kconfig

Quoted 6 lines
drivers/mmc/host/Kconfig +6 -0
+	return clk_get_rate(pltfm_host->clk);
+}
+
+static unsigned int esdhc_pltfm_get_min_clock(struct sdhci_host *host)
+{
+	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);

Ditto.

Quoted 2 lines
drivers/mmc/host/Kconfig +2 -0
+	return clk_get_rate(pltfm_host->clk) / 256 / 16;
+}

[...]

drivers/mmc/host/Kconfig static const struct platform_device_id sdhci_pltfm_ids[] = { · line 168

Quoted 7 lines

+++ b/drivers/mmc/host/sdhci-pltfm.c

drivers/mmc/host/Kconfig +2 -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 },

sdhci-esdhc-imx, sdhci_esdhc_imx_pdata.

Signature · 3 lines
Anton Vorontsov
email: cbouatmailru at gmail.com
irc://irc.freenode.net/bd2
#13 lore raw

cover Adding support for esdhc on mx35/51

In reply to Wolfram Sang

Hi Wolfram:
I have the following a few common comments about these patches.

* About the share between i.MX and PPC eSDHC.
Why configure a few parts be shared between the i.MX eSDHC and PPC eSDHC? Can they be separated into two independent systems? It would bring the conveniences to maintain stuff in the future if we separate them.
And there is already one set of eSDHC driver for all the i.MX SOCs. As we know that i.MX and PPC are the disparate SOC families.

* About the driver name of i.MX eSDHC driver, I think that use the imx to identify it is better than esdhc.
As I know that the eSDHC name wouldn't be used anymore in next generation SOCs of i.MX family.
So the name of imx would be much clear and exact.

Best Regards,
Richard Zhu
Freescale Semiconductor
Tel: +86-021-28937189
Email:Hong-Xing.Zhu at freescale.com

-----Original Message-----
From: Wolfram Sang [mailto:w.sang at pengutronix.de]
Sent: Tuesday, 21 September, 2010 20:30
To: linux-mmc at vger.kernel.org
Cc: linux-arm-kernel at lists.infradead.org; Anton Vorontsov; Zhu Richard-R65037; Wolfram Sang
Subject: [PATCH 0/4] Adding support for esdhc on mx35/51

Hi,

this series adds basic support for the esdhc-controller found on mx35/51-cpus.
It first extends the sdhci-pltfm-driver to have a runtime-structure for data (1/4), does a bit of cleanup (2/4), extracts a few parts which can be shared with the OF-version (3/4) and finally adds the driver (4/4).

Note that the support is basic at the moment. Still to be done are:

* ADMA support (Richard Zhu mentioned it has issues and knows the details)

* 8-Bit bus width (needs more research; it breaks some cards for me :( )

* voltage switching using a regulator (I don't have such hardware, hopefully
Richard can pick this up)

* write_protect using a GPIO (we need to retrieve board-specific data for that;
an RFC follows after this series)

Platform resources could be posted after write_protect issue has been sorted out.

Please review and/or give comments. Please let me also know if you intend to work on a missing bit.

Thanks,

Wolfram

===

Wolfram Sang (4):
mmc: sdhci-pltfm: Add structure for host-specific data
mmc: sdhci-pltfm: move .h-file into apropriate subdir
mmc: sdhci-of-esdhc: factor out common stuff
mmc: sdhci-pltfm: add pltfm-driver for imx35/51

 drivers/mmc/host/Kconfig          |    9 +++
 drivers/mmc/host/Makefile         |    1 +
 drivers/mmc/host/sdhci-cns3xxx.c  |    2 +-
 drivers/mmc/host/sdhci-esdhc.c    |  141
+++++++++++++++++++++++++++++++++++++
 drivers/mmc/host/sdhci-esdhc.h    |   81 +++++++++++++++++++++
 drivers/mmc/host/sdhci-of-esdhc.c |   70 ++----------------
 drivers/mmc/host/sdhci-pltfm.c    |   12 +++-
 drivers/mmc/host/sdhci-pltfm.h    |    8 ++-
 include/linux/mmc/sdhci-pltfm.h   |   35 +++++++++
 include/linux/sdhci-pltfm.h       |   35 ---------
 10 files changed, 292 insertions(+), 102 deletions(-)  create mode

100644 drivers/mmc/host/sdhci-esdhc.c create mode 100644 drivers/mmc/host/sdhci-esdhc.h create mode 100644 include/linux/mmc/sdhci-pltfm.h delete mode 100644 include/linux/sdhci-pltfm.h

#14 lore raw

cover Adding support for esdhc on mx35/51

Hi Richard,

Quoted 3 lines

* About the share between i.MX and PPC eSDHC.
Why configure a few parts be shared between the i.MX eSDHC and PPC eSDHC? Can they be separated into two independent systems?

The rule of thumb is to avoid code-duplication. Assume the PPC driver gets fixed an off-by-one error in the freq-calculation, you surely want to have that fix on imx, too.

Quoted 2 lines

It would bring the conveniences to maintain stuff in the future if we separate them.

If you can name these conveniences and they are convincing, we can keep them seperate. At the moment, I don't see them (what doesn't mean they don't exist)

Quoted 1 line

And there is already one set of eSDHC driver for all the i.MX SOCs.

I am confused: which set do you mean?

Quoted 1 line

As we know that i.MX and PPC are the disparate SOC families.

Well, if the eSDHC-core itself is the same or very similar, that doesn't really matter IMO. Especially as the of-platform-bus might disappear somewhen in the future, the PPC and imx-drivers could become more similar.

Quoted 2 lines

* About the driver name of i.MX eSDHC driver, I think that use the imx to identify it is better than esdhc.

I picked up Anton's suggestion 'sdhci-esdhc-imx.c' so far. Although I am still not sure if 'sdhci-esdhc-pltfm.c' would be more precise.

Quoted 3 lines

As I know that the eSDHC name wouldn't be used anymore in next generation SOCs of i.MX family.
So the name of imx would be much clear and exact.

Not really, because all _existing_ implementations are called eSDHC, no? :) If some future incarnations have a different name, but behave the same or very similar, this is usually no problem. Check for example the I2C eeprom driver which is named 'at24' but support basically all EEPROMs and not only Atmel ones. Same goes for a couple of RTC-drivers, etc...

Kind regards,

Wolfram

Signature · 9 lines
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100924/b4783607/attachment.sig>
#15 lore raw

cover Adding support for esdhc on mx35/51

Hi Wolfram:
See my comments.

Best Regards,
Richard Zhu
Freescale Semiconductor
Tel: +86-021-28937189
Email:Hong-Xing.Zhu at freescale.com

-----Original Message-----
From: Wolfram Sang [mailto:w.sang at pengutronix.de]
Sent: Friday, 24 September, 2010 14:43
To: Zhu Richard-R65037
Cc: linux-mmc at vger.kernel.org; linux-arm-kernel at lists.infradead.org; Anton Vorontsov
Subject: Re: [PATCH 0/4] Adding support for esdhc on mx35/51

Hi Richard,

Quoted 3 lines

* About the share between i.MX and PPC eSDHC.
Why configure a few parts be shared between the i.MX eSDHC and PPC eSDHC? Can they be separated into two independent systems?

The rule of thumb is to avoid code-duplication. Assume the PPC driver gets fixed an off-by-one error in the freq-calculation, you surely want to have that fix on imx, too.

Quoted 2 lines

It would bring the conveniences to maintain stuff in the future if we separate them.

If you can name these conveniences and they are convincing, we can keep them seperate. At the moment, I don't see them (what doesn't mean they don't exist)
[<Zhu Richard-r65037>] As Anton's description different eSDHC IP on the i.MX and the PPC may have the different IC bugs or limitations. As I know that although in the i.MX SOC family, there are a few differences between different SOCs. And the behaviors of SW driver may be impacted by these differences.
I'm afraid that the differences of eSDHC IP module between i.MX and PPC maybe bigger and bigger in future.

BTW, the block size of the i.MX eSDHC is not forced to 2K size. Up to now, the default 512byes per sector is used in FSL i.MX Linux BSP.

Quoted 1 line

And there is already one set of eSDHC driver for all the i.MX SOCs.

I am confused: which set do you mean?
[<Zhu Richard-r65037>] The driver used for i.MX eSDHC. The one used by i.MX35 in Linux kernel now, and the coming MX51 and so on. It is better that one driver supports all i.MX SOC's eSDHC modules in future (MX25, MX35, MX51, MX53...).

Quoted 1 line

As we know that i.MX and PPC are the disparate SOC families.

Well, if the eSDHC-core itself is the same or very similar, that doesn't really matter IMO. Especially as the of-platform-bus might disappear somewhen in the future, the PPC and imx-drivers could become more similar.

Quoted 3 lines

* About the driver name of i.MX eSDHC driver, I think that use the imx

to identify it is better than esdhc.

I picked up Anton's suggestion 'sdhci-esdhc-imx.c' so far. Although I am still not sure if 'sdhci-esdhc-pltfm.c' would be more precise.

Quoted 3 lines

As I know that the eSDHC name wouldn't be used anymore in next generation SOCs of i.MX family.
So the name of imx would be much clear and exact.

Not really, because all _existing_ implementations are called eSDHC, no? :) If some future incarnations have a different name, but behave the same or very similar, this is usually no problem. Check for example the I2C eeprom driver which is named 'at24' but support basically all EEPROMs and not only Atmel ones. Same goes for a couple of RTC-drivers, etc...
[<Zhu Richard-r65037>] :), ok.

Kind regards,

Wolfram

Signature · 4 lines
Pengutronix e.K.                           | Wolfram Sang
|
Industrial Linux Solutions                 | http://www.pengutronix.de/
|
#16 lore raw

cover Adding support for esdhc on mx35/51

Quoted 2 lines · On Fri, Sep 24, 2010 at 03:08:52PM +0800, Zhu Richard-R65037 wrote:

Hi Wolfram:
See my comments.

BTW can't you get your mailer to quote like all others do? It is inconvenient to read this way.

Quoted 8 lines
Quoted 2 lines

It would bring the conveniences to maintain stuff in the future if we separate them.

If you can name these conveniences and they are convincing, we can keep them seperate. At the moment, I don't see them (what doesn't mean they don't exist)
[<Zhu Richard-r65037>] As Anton's description different eSDHC IP on the i.MX and the PPC may have the different IC bugs or limitations.

Sure thing. I don't see any problem with that as I don't want to merge them completely, but just to share the common parts. Fixups can be done in the specific part.

Quoted 3 lines

As I know that although in the i.MX SOC family, there are a few differences between different SOCs. And the behaviors of SW driver may be impacted by these differences.

If you have even more incarnations of a similar core in the future to come, that is another reason to share those parts which are in common. Smaller differences can easily be handled in sdhci-esdhc-imx.c, I think. For example, if stuff like

	if (cpu_is_mx35())
		quirks |= SDHCI_QUIRKS_NO_MULTIBLOCK;

will do, why would you want to duplicate all the code covering the non-standard register layouts? Check the imx-spi driver how to handle variations of a similar core.

Quoted 2 lines

I'm afraid that the differences of eSDHC IP module between i.MX and PPC maybe bigger and bigger in future.

If the core of a future IMX99 might be too different, we can have a custom driver then, but for now, I think a common driver is the way to go.

Quoted 2 lines

BTW, the block size of the i.MX eSDHC is not forced to 2K size. Up to now, the default 512byes per sector is used in FSL i.MX Linux BSP.

It is forced to 2K, because it would be otherwise set to 4K (according to the cap-register) which is not conform to the spec 2.0. What is the advantage of 512 byte?

Quoted 7 lines
Quoted 1 line

And there is already one set of eSDHC driver for all the i.MX SOCs.

I am confused: which set do you mean?
[<Zhu Richard-r65037>] The driver used for i.MX eSDHC. The one used by i.MX35 in Linux kernel now, and the coming MX51 and so on. It is better that one driver supports all i.MX SOC's eSDHC modules in future (MX25, MX35, MX51, MX53...).

? Now I am totally confused. That is what I am aiming for :D My driver was mainly tested on MX35 back then, but was clearly intended to be for MX51. It was clearly mentioned in the subject "[PATCH 0/4] Adding support for esdhc on mx35/51". Frankly, I was hoping for a patchset from you adding the stuff you need for you MX51-board on top of mine, and not a completely new series. Will have a look at that now...

Regards,

Wolfram

Signature · 9 lines
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100924/7479cd13/attachment-0001.sig>
#17 lore raw

cover Adding support for esdhc on mx35/51

Hi Wolfram:
Sorry to bring the confusions to you.
I will use your git repos and make up the missing bits (i.e:the HOST_CONROL and so on) and verify the func on MX51 BBG boards later. BTW, Is the URL of your git repos the following one?
git://git.pengutronix.de/git/wsa/linux-2.6.git

Best Regards,
Richard Zhu
Freescale Semiconductor
Tel: +86-021-28937189
Email:Hong-Xing.Zhu at freescale.com

-----Original Message-----
From: Wolfram Sang [mailto:w.sang at pengutronix.de]
Sent: Friday, 24 September, 2010 16:58
To: Zhu Richard-R65037
Cc: linux-mmc at vger.kernel.org; linux-arm-kernel at lists.infradead.org; Anton Vorontsov
Subject: Re: [PATCH 0/4] Adding support for esdhc on mx35/51

Quoted 2 lines · On Fri, Sep 24, 2010 at 03:08:52PM +0800, Zhu Richard-R65037 wrote:

Hi Wolfram:
See my comments.

BTW can't you get your mailer to quote like all others do? It is inconvenient to read this way.

Quoted 9 lines
Quoted 2 lines

It would bring the conveniences to maintain stuff in the future if we separate them.

If you can name these conveniences and they are convincing, we can keep them seperate. At the moment, I don't see them (what doesn't mean

they don't exist) [<Zhu Richard-r65037>] As Anton's description different eSDHC IP on the i.MX and the PPC may have the different IC bugs or limitations.

Sure thing. I don't see any problem with that as I don't want to merge them completely, but just to share the common parts. Fixups can be done in the specific part.

Quoted 4 lines

As I know that although in the i.MX SOC family, there are a few differences between different SOCs. And the behaviors of SW driver may

be impacted by these differences.

If you have even more incarnations of a similar core in the future to come, that is another reason to share those parts which are in common. Smaller differences can easily be handled in sdhci-esdhc-imx.c, I think. For example, if stuff like

	if (cpu_is_mx35())
		quirks |= SDHCI_QUIRKS_NO_MULTIBLOCK;

will do, why would you want to duplicate all the code covering the non-standard register layouts? Check the imx-spi driver how to handle variations of a similar core.

Quoted 2 lines

I'm afraid that the differences of eSDHC IP module between i.MX and PPC maybe bigger and bigger in future.

If the core of a future IMX99 might be too different, we can have a custom driver then, but for now, I think a common driver is the way to go.

Quoted 2 lines

BTW, the block size of the i.MX eSDHC is not forced to 2K size. Up to now, the default 512byes per sector is used in FSL i.MX Linux BSP.

It is forced to 2K, because it would be otherwise set to 4K (according to the cap-register) which is not conform to the spec 2.0. What is the advantage of 512 byte?

Quoted 7 lines
Quoted 1 line

And there is already one set of eSDHC driver for all the i.MX SOCs.

I am confused: which set do you mean?
[<Zhu Richard-r65037>] The driver used for i.MX eSDHC. The one used by i.MX35 in Linux kernel now, and the coming MX51 and so on. It is better that one driver supports all i.MX SOC's eSDHC modules in future (MX25, MX35, MX51, MX53...).

? Now I am totally confused. That is what I am aiming for :D My driver was mainly tested on MX35 back then, but was clearly intended to be for MX51. It was clearly mentioned in the subject "[PATCH 0/4] Adding support for esdhc on mx35/51". Frankly, I was hoping for a patchset from you adding the stuff you need for you MX51-board on top of mine, and not a completely new series. Will have a look at that now...

Regards,

Wolfram

Signature · 4 lines
Pengutronix e.K.                           | Wolfram Sang
|
Industrial Linux Solutions                 | http://www.pengutronix.de/
|
#18 lore raw

cover Adding support for esdhc on mx35/51

Quoted 2 lines · On Fri, Sep 24, 2010 at 05:40:15PM +0800, Zhu Richard-R65037 wrote:

Hi Wolfram:
Sorry to bring the confusions to you.

Well, no worries, maybe I was not clear as well. Hope we have everything clear now :)

Quoted 4 lines

I will use your git repos and make up the missing bits (i.e:the HOST_CONROL and so on) and verify the func on MX51 BBG boards later. BTW, Is the URL of your git repos the following one?
git://git.pengutronix.de/git/wsa/linux-2.6.git

Yes. I pushed out the current status of my branch, but I haven't implemented all requested changes from Anton yet. Will do on Monday. If you can't afford to wait for this updated branch, please keep your changes well separated to reduce merge conflicts.

Thanks!

Wolfram

Signature · 9 lines
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100924/7e0bbaf8/attachment.sig>