Skip to contentSkip to conversation

PXA: New MMC driver

PATCH New Marek Vasut 2 participants 2 messages Aug 5, 2010 MMC, SD and SDIO

lore
Share & tools
lore

Marek Vasut

author
#0 lore raw

PATCH 1/1 PXA: New MMC driver

The new driver is a complete rewrite. It uses the MMC framework and should support both pxa2xx and pxa3xx.

Tested on:
- Palm Tungsten|C PXA255
- Aeronix ZipitZ2 PXA270
- Marvell Zylonite 300 PXA300

This driver needs testing though.

Signed-off-by Marek Vasut <[email protected]>
---
 drivers/mmc/Makefile      |    1 +
 drivers/mmc/pxa_mmc.h     |   21 +++
 drivers/mmc/pxa_mmc_gen.c |  333 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 355 insertions(+), 0 deletions(-)
 create mode 100644 drivers/mmc/pxa_mmc_gen.c
drivers/mmc/Makefile +1 -0
index 6fa04b8..01338a4 100644
@@ -32,6 +32,7 @@ COBJS-$(CONFIG_OMAP3_MMC) += omap3_mmc.o
 COBJS-$(CONFIG_FSL_ESDHC) += fsl_esdhc.o
 COBJS-$(CONFIG_MXC_MMC) += mxcmmc.o
 COBJS-$(CONFIG_PXA_MMC) += pxa_mmc.o
+COBJS-$(CONFIG_PXA_MMC_GENERIC) += pxa_mmc_gen.o
 
 COBJS	:= $(COBJS-y)
 SRCS	:= $(COBJS:.o=.c)
drivers/mmc/pxa_mmc.h +21 -0
index 6fa4268..c993651 100644
@@ -135,4 +135,25 @@
 #define MMC_R1B_ADDR_ERR		0x2000
 #define MMC_R1B_PARAM_ERR		0x4000
 
+/* PXAMMC Generic default config for various CPUs */
+#if defined(CONFIG_PXA250)
+	#define	PXAMMC_FIFO_SIZE	1
+	#define	PXAMMC_MIN_SPEED	312500
+	#define	PXAMMC_MAX_SPEED	20000000
+	#define	PXAMMC_HOST_CAPS	(0)
+#elif defined(CONFIG_PXA27X)
+	#define	PXAMMC_CRC_SKIP
+	#define	PXAMMC_FIFO_SIZE	32
+	#define	PXAMMC_MIN_SPEED	304000
+	#define	PXAMMC_MAX_SPEED	19500000
+	#define	PXAMMC_HOST_CAPS	(MMC_MODE_4BIT)
+#elif defined(CONFIG_CPU_MONAHANS)
+	#define	PXAMMC_FIFO_SIZE	32
+	#define	PXAMMC_MIN_SPEED	304000
+	#define	PXAMMC_MAX_SPEED	26000000
+	#define	PXAMMC_HOST_CAPS	(MMC_MODE_4BIT | MMC_MODE_HS)
+#else
+#error	"Unknown CPU for PXAMMC"
+#endif
+
 #endif /* __MMC_PXA_P_H__ */
drivers/mmc/pxa_mmc_gen.c new file +333 -0

333 lines not on this page · raw message

Signature · 1 line
1.7.1
#1 lore raw

PATCH 1/1 PXA: New MMC driver

Dear Marek Vasut,

Quoted 2 lines · In message <[email protected]> you wrote:

The new driver is a complete rewrite. It uses the MMC framework and should support both pxa2xx and pxa3xx.

Thanks.

Quoted 7 lines
drivers/mmc/pxa_mmc.h +7 -0
+/* PXAMMC Generic default config for various CPUs */
+#if defined(CONFIG_PXA250)
+	#define	PXAMMC_FIFO_SIZE	1
+	#define	PXAMMC_MIN_SPEED	312500
+	#define	PXAMMC_MAX_SPEED	20000000
+	#define	PXAMMC_HOST_CAPS	(0)
+#elif defined(CONFIG_PXA27X)

drivers/mmc/pxa_mmc.h line 154

Quoted 10 lines
drivers/mmc/pxa_mmc.h +10 -0
+	#define	PXAMMC_CRC_SKIP
+	#define	PXAMMC_FIFO_SIZE	32
+	#define	PXAMMC_MIN_SPEED	304000
+	#define	PXAMMC_MAX_SPEED	19500000
+	#define	PXAMMC_HOST_CAPS	(MMC_MODE_4BIT)
+#elif defined(CONFIG_CPU_MONAHANS)
+	#define	PXAMMC_FIFO_SIZE	32
+	#define	PXAMMC_MIN_SPEED	304000
+	#define	PXAMMC_MAX_SPEED	26000000
+	#define	PXAMMC_HOST_CAPS	(MMC_MODE_4BIT | MMC_MODE_HS)

Please put the '#' always in column 1.

Quoted 33 lines
drivers/mmc/pxa_mmc.h +4 -0
+#else
+#error	"Unknown CPU for PXAMMC"
+#endif
+
 #endif /* __MMC_PXA_P_H__ */
drivers/mmc/pxa_mmc_gen.c new file +22 -0
new file mode 100644
index 0000000..b50ded6
@@ -0,0 +1,333 @@
+/*
+ * Copyright (C) 2010 Marek Vasut <[email protected]>
+ *
+ * Loosely based on the old code and Linux's PXA MMC driver
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <config.h>

drivers/mmc/pxa_mmc_gen.c line 32

Quoted 10 lines
drivers/mmc/pxa_mmc_gen.c new file +10 -0
+#include <common.h>
+#include <malloc.h>
+
+#include <mmc.h>
+#include <asm/errno.h>
+#include <asm/arch/hardware.h>
+
+#include "pxa_mmc.h"
+
+#define	PXA_MMC_TIMEOUT	100

Please add a comment about the unit (10 us?)

drivers/mmc/pxa_mmc_gen.c line 38

Quoted 5 lines
drivers/mmc/pxa_mmc_gen.c new file +5 -0
+static int pxa_mmc_stop_clock(void)
+{
+	int timeout = PXA_MMC_TIMEOUT;
+
+	/* If the clock aren't running, exit */

"clock isn't" or "clocks aren't" ?

drivers/mmc/pxa_mmc_gen.c line 94

Quoted 6 lines
drivers/mmc/pxa_mmc_gen.c new file +6 -0
+	while (!(MMC_STAT & MMC_STAT_CLK_EN) && --timeout)
+		udelay(10);
+
+	/* The clock didn't start, we have a problem */
+	if (!timeout)
+		return -ETIMEDOUT;

This block repeats. Make it a (inline?) function (with the mask as param)? Also include the "int timeout = PXA_MMC_TIMEOUT;" part.

drivers/mmc/pxa_mmc_gen.c line 166

Quoted 6 lines
drivers/mmc/pxa_mmc_gen.c new file +6 -0
+	/* Wait for the transmission-done interrupt */
+	while (!(MMC_STAT & MMC_STAT_DATA_TRAN_DONE) && --timeout)
+		udelay(10);
+
+	if (!timeout)
+		return -ETIMEDOUT;

Third time the same code.

drivers/mmc/pxa_mmc_gen.c line 166

Quoted 6 lines
drivers/mmc/pxa_mmc_gen.c new file +6 -0
+	/* Wait for the transmission-done interrupt */
+	while (!(MMC_STAT & MMC_STAT_DATA_TRAN_DONE) && --timeout)
+		udelay(10);
+
+	if (!timeout)
+		return -ETIMEDOUT;

# 4.

drivers/mmc/pxa_mmc_gen.c line 210

Quoted 7 lines
drivers/mmc/pxa_mmc_gen.c new file +7 -0
+	/* Wait until the data are really written to the card */
+	timeout = PXA_MMC_TIMEOUT;
+	while (!(MMC_STAT & MMC_STAT_PRG_DONE) && --timeout)
+		udelay(10);
+
+	if (!timeout)
+		return -ETIMEDOUT;

# 5.

drivers/mmc/pxa_mmc_gen.c line 253

Quoted 7 lines
drivers/mmc/pxa_mmc_gen.c new file +7 -0
+	/* Wait until the command completes */
+	while (!(MMC_STAT & MMC_STAT_END_CMD_RES) && --timeout)
+		udelay(10);
+
+	/* If the command doesn't complete, die */
+	if (!timeout)
+		return -ETIMEDOUT;

# 6.

drivers/mmc/pxa_mmc_gen.c line 310

Quoted 3 lines
drivers/mmc/pxa_mmc_gen.c new file +3 -0
+int pxa_mmc_init(bd_t *bis)
+{
+	struct mmc *mmc = NULL;

Drop the "= NULL" - it makes no sense given the next line is this:

drivers/mmc/pxa_mmc_gen.c line 312

Quoted 1 line
drivers/mmc/pxa_mmc_gen.c new file +1 -0
+	mmc = malloc(sizeof(struct mmc));

Best regards,

Wolfgang Denk

Signature · 9 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
The Empire didn't encourage its subjects to go far away, in case they
saw things that might disturb them. For the same reason it had  built
a  wall  around  the  entire country, patrolled by the Heavenly Guard
whose main function was to tread heavily on the fingers of any  inha-
bitants who felt they might like to step outside for five minutes for
a breath of fresh air.                      - Terry Pratchett, _Mort_