Skip to contentSkip to conversation

Use generic MMC driver on remaining OMAP platforms

PATCH New Tom Rini 7 participants 19 messages Aug 22, 2011 – Sep 7, 2011 MMC, SD and SDIO

lore
Share & tools
lore

Tom Rini

author
#0 lore raw

cover Use generic MMC driver on remaining OMAP platforms

Hi all,

The following series changes the remaining users of drivers/mmc/omap3_mmc.c to using the newer omap_hsmmc.c driver and then removes the legacy driver. This series depends on the patches that Vaibhav Hiremath has posted to convert am3517evm and omap3 evm over.

Thanks!

--
Tom

author
#1 lore raw

PATCH 1/9 OMAP3: CM-T35: Use generic MMC driver

Switch from the legacy omap3 mmc driver to the new generic omap hsmmc driver. This patch is based on the work done for Beagle, etc.

Signed-off-by Tom Rini <[email protected]>
---
 board/cm_t35/cm_t35.c    |    8 ++++++++
 include/configs/cm_t35.h |    3 ++-
 2 files changed, 10 insertions(+), 1 deletions(-)
board/cm_t35/cm_t35.c +8 -0
index f82111b..420cd70 100644
@@ -313,6 +313,14 @@ void set_muxconf_regs(void)
 		cm_t3730_set_muxconf();
 }
 
+#ifdef CONFIG_GENERIC_MMC
+int board_mmc_init(bd_t *bis)
+{
+	omap_mmc_init(0);
+	return 0;
+}
+#endif
+
 /*
  * Routine: setup_net_chip_gmpc
  * Description: Setting up the configuration GPMC registers specific to the
include/configs/cm_t35.h +2 -1
index 16a5f5b..496a904 100644
@@ -108,8 +108,9 @@
 #define CONFIG_BAUDRATE			115200
 #define CONFIG_SYS_BAUDRATE_TABLE	{4800, 9600, 19200, 38400, 57600,\
 					115200}
+#define CONFIG_GENERIC_MMC		1
 #define CONFIG_MMC			1
-#define CONFIG_OMAP3_MMC		1
+#define CONFIG_OMAP_HSMMC		1
 #define CONFIG_DOS_PARTITION		1
 
 /* DDR - I use Micron DDR */
Signature · 1 line
1.7.0.4
#2 lore raw

PATCH 1/9 OMAP3: CM-T35: Use generic MMC driver

Quoted 4 lines · Tom Rini

Switch from the legacy omap3 mmc driver to the new generic omap hsmmc driver. This patch is based on the work done for Beagle, etc.

Signed-off-by Tom Rini <[email protected]>

It is a good practice to CC the board maintainer. Thanks.

Tested-by Igor Grinberg <[email protected]>
Quoted 39 lines
---
 board/cm_t35/cm_t35.c    |    8 ++++++++
 include/configs/cm_t35.h |    3 ++-
 2 files changed, 10 insertions(+), 1 deletions(-)
board/cm_t35/cm_t35.c +8 -0
index f82111b..420cd70 100644
@@ -313,6 +313,14 @@ void set_muxconf_regs(void)
 		cm_t3730_set_muxconf();
 }
 
+#ifdef CONFIG_GENERIC_MMC
+int board_mmc_init(bd_t *bis)
+{
+	omap_mmc_init(0);
+	return 0;
+}
+#endif
+
 /*
  * Routine: setup_net_chip_gmpc
  * Description: Setting up the configuration GPMC registers specific to the
include/configs/cm_t35.h +2 -1
index 16a5f5b..496a904 100644
@@ -108,8 +108,9 @@
 #define CONFIG_BAUDRATE			115200
 #define CONFIG_SYS_BAUDRATE_TABLE	{4800, 9600, 19200, 38400, 57600,\
 					115200}
+#define CONFIG_GENERIC_MMC		1
 #define CONFIG_MMC			1
-#define CONFIG_OMAP3_MMC		1
+#define CONFIG_OMAP_HSMMC		1
 #define CONFIG_DOS_PARTITION		1
 
 /* DDR - I use Micron DDR */
Signature · 2 lines
Regards,
Igor.
#3 lore raw

PATCH 1/9 OMAP3: CM-T35: Use generic MMC driver

Quoted 10 lines · Igor Grinberg
Quoted 4 lines · Tom Rini

Switch from the legacy omap3 mmc driver to the new generic omap hsmmc driver. ?This patch is based on the work done for Beagle, etc.

Signed-off-by Tom Rini <[email protected]>

It is a good practice to CC the board maintainer. Thanks.

Tested-by Igor Grinberg <[email protected]>

Apologies, thanks!

Signature · 1 line
Tom
author
#4 lore raw

PATCH 2/9 OMAP3: DIG297: Use generic MMC driver

In reply to Tom Rini

Switch from the legacy omap3 mmc driver to the new generic omap hsmmc driver. This patch is based on the work done for Beagle, etc.

Signed-off-by Tom Rini <[email protected]>
---
 board/comelit/dig297/dig297.c |    9 +++++++++
 include/configs/dig297.h      |    5 +++--
 2 files changed, 12 insertions(+), 2 deletions(-)
board/comelit/dig297/dig297.c +9 -0
index 0062f12..a7071cd 100644
@@ -37,6 +37,7 @@
 #include <netdev.h>
 #include <twl4030.h>
 #include <asm/io.h>
+#include <asm/arch/mmc_host_def.h>
 #include <asm/arch/omap3-regs.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/mem.h>

@@ -145,6 +146,14 @@ void set_muxconf_regs(void)
 	MUX_DIG297();
 }
 
+#ifdef CONFIG_GENERIC_MMC
+int board_mmc_init(bd_t *bis)
+{
+	omap_mmc_init(0);
+	return 0;
+}
+#endif
+
 #ifdef CONFIG_CMD_NET
 /*
  * Routine: setup_net_chip
include/configs/dig297.h +3 -2
index b68f073..0e05df3 100644
@@ -97,8 +97,9 @@
 #define CONFIG_BAUDRATE			115200
 #define CONFIG_SYS_BAUDRATE_TABLE	{4800, 9600, 19200, 38400, 57600,\
 					115200}
-#define CONFIG_MMC
-#define CONFIG_OMAP3_MMC
+#define CONFIG_GENERIC_MMC		1
+#define CONFIG_MMC			1
+#define CONFIG_OMAP_HSMMC		1
 #define CONFIG_DOS_PARTITION
 
 /* DDR - I use Micron DDR */
Signature · 1 line
1.7.0.4
#5 lore raw

PATCH 2/9 OMAP3: DIG297: Use generic MMC driver

Quoted 4 lines · Tom Rini

Switch from the legacy omap3 mmc driver to the new generic omap hsmmc driver. This patch is based on the work done for Beagle, etc.

Signed-off-by Tom Rini<[email protected]>

Again, please Cc: the board maintainers in the future, thanks.

Quoted 37 lines
---
  board/comelit/dig297/dig297.c |    9 +++++++++
  include/configs/dig297.h      |    5 +++--
  2 files changed, 12 insertions(+), 2 deletions(-)
board/comelit/dig297/dig297.c +9 -0
index 0062f12..a7071cd 100644
@@ -37,6 +37,7 @@
  #include<netdev.h>
  #include<twl4030.h>
  #include<asm/io.h>
+#include<asm/arch/mmc_host_def.h>
  #include<asm/arch/omap3-regs.h>
  #include<asm/arch/mux.h>
  #include<asm/arch/mem.h>

@@ -145,6 +146,14 @@ void set_muxconf_regs(void)
  	MUX_DIG297();
  }
 
+#ifdef CONFIG_GENERIC_MMC
+int board_mmc_init(bd_t *bis)
+{
+	omap_mmc_init(0);
+	return 0;
+}
+#endif
+
  #ifdef CONFIG_CMD_NET
  /*
   * Routine: setup_net_chip
include/configs/dig297.h +0 -0
index b68f073..0e05df3 100644

include/configs/dig297.h line 102

Quoted 8 lines
include/configs/dig297.h +3 -2
@@ -97,8 +97,9 @@
  #define CONFIG_BAUDRATE			115200
  #define CONFIG_SYS_BAUDRATE_TABLE	{4800, 9600, 19200, 38400, 57600,\
  					115200}
-#define CONFIG_MMC
-#define CONFIG_OMAP3_MMC
+#define CONFIG_GENERIC_MMC		1
+#define CONFIG_MMC			1
+#define CONFIG_OMAP_HSMMC		1

IIRC the coding style says you should define the y/n constants without a value, e.g.:
#define CONFIG_GENERIC_MMC
not:
#define CONFIG_GENERIC_MMC 1

Apart for this:

Tested-by Luca Ceresoli <[email protected]>

Luca

#6 lore raw

PATCH 2/9 OMAP3: DIG297: Use generic MMC driver

Quoted 7 lines · Luca Ceresoli
Quoted 4 lines · Tom Rini

Switch from the legacy omap3 mmc driver to the new generic omap hsmmc driver. ?This patch is based on the work done for Beagle, etc.

Signed-off-by Tom Rini<[email protected]>

Again, please Cc: the board maintainers in the future, thanks.

Oh, sorry, used to other lists where people complain about too many CCs.

[snip]

Quoted 20 lines

include/configs/dig297.h

Quoted 13 lines
include/configs/dig297.h +0 -0
index b68f073..0e05df3 100644
@@ -97,8 +97,9 @@

? #define CONFIG_BAUDRATE ? ? ? ? ? ? ? ? ? ? 115200
? #define CONFIG_SYS_BAUDRATE_TABLE ? {4800, 9600, 19200, 38400, 57600,\
? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? 115200}

include/configs/dig297.h +3 -2
-#define CONFIG_MMC
-#define CONFIG_OMAP3_MMC
+#define CONFIG_GENERIC_MMC ? ? ? ? ? 1
+#define CONFIG_MMC ? ? ? ? ? ? ? ? ? 1
+#define CONFIG_OMAP_HSMMC ? ? ? ? ? ?1

IIRC the coding style says you should define the y/n constants without a value, e.g.:
? #define CONFIG_GENERIC_MMC
not:
? #define CONFIG_GENERIC_MMC 1

Quoted 2 lines

Apart for this:

Tested-by Luca Ceresoli <[email protected]>

OK, thanks, I'll respin this patch (all of the other boards were doing the define CONFIG_FOO 1 everywhere) shortly.

Signature · 1 line
Tom
author
#7 lore raw

PATCH 1/1 OMAP3: DIG297: Use generic MMC driver

In reply to Tom Rini

Switch from the legacy omap3 mmc driver to the new generic omap hsmmc driver. This patch is based on the work done for Beagle, etc.

Tested-by Luca Ceresoli <[email protected]>
Signed-off-by Tom Rini <[email protected]>

---

V2 changes:
Follow board config format, just use #define CONFIG_GENERIC_MMC, etc)

---
 board/comelit/dig297/dig297.c |    9 +++++++++
 include/configs/dig297.h      |    3 ++-
 2 files changed, 11 insertions(+), 1 deletions(-)
board/comelit/dig297/dig297.c +9 -0
index 0062f12..a7071cd 100644
@@ -37,6 +37,7 @@
 #include <netdev.h>
 #include <twl4030.h>
 #include <asm/io.h>
+#include <asm/arch/mmc_host_def.h>
 #include <asm/arch/omap3-regs.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/mem.h>

@@ -145,6 +146,14 @@ void set_muxconf_regs(void)
 	MUX_DIG297();
 }
 
+#ifdef CONFIG_GENERIC_MMC
+int board_mmc_init(bd_t *bis)
+{
+	omap_mmc_init(0);
+	return 0;
+}
+#endif
+
 #ifdef CONFIG_CMD_NET
 /*
  * Routine: setup_net_chip
include/configs/dig297.h +2 -1
index b68f073..4186ab6 100644
@@ -97,8 +97,9 @@
 #define CONFIG_BAUDRATE			115200
 #define CONFIG_SYS_BAUDRATE_TABLE	{4800, 9600, 19200, 38400, 57600,\
 					115200}
+#define CONFIG_GENERIC_MMC
 #define CONFIG_MMC
-#define CONFIG_OMAP3_MMC
+#define CONFIG_OMAP_HSMMC
 #define CONFIG_DOS_PARTITION
 
 /* DDR - I use Micron DDR */
Signature · 1 line
1.7.0.4
author
#8 lore raw

PATCH 3/9 OMAP3: Zoom1: Use generic MMC driver

In reply to Tom Rini

Switch from the legacy omap3 mmc driver to the new generic omap hsmmc driver. This patch is based on the work done for Beagle, etc.

Signed-off-by Tom Rini <[email protected]>
---
 board/logicpd/zoom1/zoom1.c   |    9 +++++++++
 include/configs/omap3_zoom1.h |   10 ++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)
board/logicpd/zoom1/zoom1.c +9 -0
index 7ef13cc..dec0b26 100644
@@ -34,6 +34,7 @@
 #include <netdev.h>
 #include <twl4030.h>
 #include <asm/io.h>
+#include <asm/arch/mmc_host_def.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-types.h>

@@ -88,6 +89,14 @@ void set_muxconf_regs(void)
 	MUX_ZOOM1_MDK();
 }
 
+#ifdef CONFIG_GENERIC_MMC
+int board_mmc_init(bd_t *bis)
+{
+	omap_mmc_init(0);
+	return 0;
+}
+#endif
+
 #ifdef CONFIG_CMD_NET
 int board_eth_init(bd_t *bis)
 {
include/configs/omap3_zoom1.h +6 -4
index aeac7c7..4b095a1 100644
@@ -95,8 +95,9 @@
 #define CONFIG_BAUDRATE			115200
 #define CONFIG_SYS_BAUDRATE_TABLE	{4800, 9600, 19200, 38400, 57600,\
 					115200}
+#define CONFIG_GENERIC_MMC		1
 #define CONFIG_MMC			1
-#define CONFIG_OMAP3_MMC		1
+#define CONFIG_OMAP_HSMMC		1
 #define CONFIG_DOS_PARTITION		1
 
 /* DDR - I use Micron DDR */

@@ -178,6 +179,7 @@
 	"loadaddr=0x82000000\0" \
 	"usbtty=cdc_acm\0" \
 	"console=ttyS2,115200n8\0" \
+	"mmcdev=0\0" \
 	"videomode=1024x768 at 60,vxres=1024,vyres=768\0" \
 	"videospec=omapfb:vram:2M,vram:4M\0" \
 	"mmcargs=setenv bootargs console=${console} " \

@@ -188,10 +190,10 @@
 		"video=${videospec},mode:${videomode} " \
 		"root=/dev/mtdblock4 rw " \
 		"rootfstype=jffs2\0" \
-	"loadbootscript=fatload mmc 0 ${loadaddr} boot.scr\0" \
+	"loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
 	"bootscript=echo Running bootscript from mmc ...; " \
 		"source ${loadaddr}\0" \
-	"loaduimage=fatload mmc 0 ${loadaddr} uImage\0" \
+	"loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
 	"mmcboot=echo Booting from mmc ...; " \
 		"run mmcargs; " \
 		"bootm ${loadaddr}\0" \

@@ -201,7 +203,7 @@
 		"bootm ${loadaddr}\0" \
 
 #define CONFIG_BOOTCOMMAND \
-	"if mmc init; then " \
+	"if mmc rescan ${mmcdev}; then " \
 		"if run loadbootscript; then " \
 			"run bootscript; " \
 		"else " \
Signature · 1 line
1.7.0.4
author
#9 lore raw

PATCH 4/9 OMAP3: Zoom2: Use generic MMC driver

In reply to Tom Rini

Switch from the legacy omap3 mmc driver to the new generic omap hsmmc driver. This patch is based on the work done for Beagle, etc.

Signed-off-by Tom Rini <[email protected]>
---
 board/logicpd/zoom2/zoom2.c   |    9 +++++++++
 include/configs/omap3_zoom2.h |    3 ++-
 2 files changed, 11 insertions(+), 1 deletions(-)
board/logicpd/zoom2/zoom2.c +9 -0
index 76793e4..800113a 100644
@@ -35,6 +35,7 @@
 #endif
 #include <twl4030.h>
 #include <asm/io.h>
+#include <asm/arch/mmc_host_def.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/mux.h>

@@ -180,6 +181,14 @@ void set_muxconf_regs (void)
 	MUX_ZOOM2 ();
 }
 
+#ifdef CONFIG_GENERIC_MMC
+int board_mmc_init(bd_t *bis)
+{
+	omap_mmc_init(0);
+	return 0;
+}
+#endif
+
 #ifdef CONFIG_CMD_NET
 int board_eth_init(bd_t *bis)
 {
include/configs/omap3_zoom2.h +2 -1
index 2a56182..57b42da 100644
@@ -95,8 +95,9 @@
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 
+#define CONFIG_GENERIC_MMC		1
 #define CONFIG_MMC			1
-#define CONFIG_OMAP3_MMC		1
+#define CONFIG_OMAP_HSMMC		1
 #define CONFIG_DOS_PARTITION		1
 
 /* DDR - I use Micron DDR */
Signature · 1 line
1.7.0.4
author
#10 lore raw

PATCH 5/9 OMAP3: pandora: Use generic MMC driver

In reply to Tom Rini

Switch from the legacy omap3 mmc driver to the new generic omap hsmmc driver. This patch is based on the work done for Beagle, etc.

Signed-off-by Tom Rini <[email protected]>
---
 board/pandora/pandora.c         |    9 +++++++++
 include/configs/omap3_pandora.h |    5 +++--
 2 files changed, 12 insertions(+), 2 deletions(-)
board/pandora/pandora.c +9 -0
index 0df4570..58a676d 100644
@@ -32,6 +32,7 @@
 #include <common.h>
 #include <twl4030.h>
 #include <asm/io.h>
+#include <asm/arch/mmc_host_def.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/sys_proto.h>

@@ -103,3 +104,11 @@ void set_muxconf_regs(void)
 {
 	MUX_PANDORA();
 }
+
+#ifdef CONFIG_GENERIC_MMC
+int board_mmc_init(bd_t *bis)
+{
+	omap_mmc_init(0);
+	return 0;
+}
+#endif
include/configs/omap3_pandora.h +3 -2
index bd55abc..320cf64 100644
@@ -100,8 +100,9 @@
 #define CONFIG_BAUDRATE			115200
 #define CONFIG_SYS_BAUDRATE_TABLE	{4800, 9600, 19200, 38400, 57600, \
 					115200}
+#define CONFIG_GENERIC_MMC		1
 #define CONFIG_MMC			1
-#define CONFIG_OMAP3_MMC		1
+#define CONFIG_OMAP_HSMMC		1
 #define CONFIG_DOS_PARTITION		1
 
 /* DDR - I use Micron DDR */

@@ -182,7 +183,7 @@
 	"mtdparts=" MTDPARTS_DEFAULT "\0" \
 
 #define CONFIG_BOOTCOMMAND \
-	"if mmc init && fatload mmc1 0 ${loadaddr} autoboot.scr || " \
+	"if mmc rescan && fatload mmc1 0 ${loadaddr} autoboot.scr || " \
 			"ext2load mmc1 0 ${loadaddr} autoboot.scr; then " \
 		"source ${loadaddr}; " \
 	"fi; " \
Signature · 1 line
1.7.0.4
author
#11 lore raw

PATCH 6/9 AM3517 CraneBoard: Use generic MMC driver

In reply to Tom Rini

Switch from the legacy omap3 mmc driver to the new generic omap hsmmc driver. This patch is based on the work done for Beagle, etc.

Signed-off-by Tom Rini <[email protected]>
---
 board/ti/am3517crane/am3517crane.c |    9 +++++++++
 include/configs/am3517_crane.h     |   10 ++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)
board/ti/am3517crane/am3517crane.c +9 -0
index d007044..cd5683d 100644
@@ -24,6 +24,7 @@
 
 #include <common.h>
 #include <asm/io.h>
+#include <asm/arch/mmc_host_def.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/sys_proto.h>

@@ -73,3 +74,11 @@ void set_muxconf_regs(void)
 {
 	MUX_AM3517CRANE();
 }
+
+#ifdef CONFIG_GENERIC_MMC
+int board_mmc_init(bd_t *bis)
+{
+	omap_mmc_init(0);
+	return 0;
+}
+#endif
include/configs/am3517_crane.h +6 -4
index 743768e..e23ca45 100644
@@ -93,8 +93,9 @@
 #define CONFIG_BAUDRATE			115200
 #define CONFIG_SYS_BAUDRATE_TABLE	{4800, 9600, 19200, 38400, 57600,\
 					115200}
+#define CONFIG_GENERIC_MMC		1
 #define CONFIG_MMC			1
-#define CONFIG_OMAP3_MMC		1
+#define CONFIG_OMAP_HSMMC		1
 #define CONFIG_DOS_PARTITION		1
 
 /*

@@ -191,16 +192,17 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x82000000\0" \
 	"console=ttyS2,115200n8\0" \
+	"mmcdev=0\0" \
 	"mmcargs=setenv bootargs console=${console} " \
 		"root=/dev/mmcblk0p2 rw " \
 		"rootfstype=ext3 rootwait\0" \
 	"nandargs=setenv bootargs console=${console} " \
 		"root=/dev/mtdblock4 rw " \
 		"rootfstype=jffs2\0" \
-	"loadbootscript=fatload mmc 0 ${loadaddr} boot.scr\0" \
+	"loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
 	"bootscript=echo Running bootscript from mmc ...; " \
 		"source ${loadaddr}\0" \
-	"loaduimage=fatload mmc 0 ${loadaddr} uImage\0" \
+	"loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
 	"mmcboot=echo Booting from mmc ...; " \
 		"run mmcargs; " \
 		"bootm ${loadaddr}\0" \

@@ -210,7 +212,7 @@
 		"bootm ${loadaddr}\0" \
 
 #define CONFIG_BOOTCOMMAND \
-	"if mmc init; then " \
+	"if mmc rescan ${mmcdev}; then " \
 		"if run loadbootscript; then " \
 			"run bootscript; " \
 		"else " \
Signature · 1 line
1.7.0.4
author
#12 lore raw

PATCH 7/9 TI OMAP3 SDP3430: Use generic MMC driver

In reply to Tom Rini

Switch from the legacy omap3 mmc driver to the new generic omap hsmmc driver. This patch is based on the work done for Beagle, etc.

Signed-off-by Tom Rini <[email protected]>
---
 board/ti/sdp3430/sdp.c          |    9 +++++++++
 include/configs/omap3_sdp3430.h |    3 ++-
 2 files changed, 11 insertions(+), 1 deletions(-)
board/ti/sdp3430/sdp.c +9 -0
index 72f0984..d73f501 100644
@@ -25,6 +25,7 @@
 #include <netdev.h>
 #include <twl4030.h>
 #include <asm/io.h>
+#include <asm/arch/mmc_host_def.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/sys_proto.h>

@@ -204,3 +205,11 @@ void set_muxconf_regs(void)
 	/* platform specific muxes */
 	MUX_SDP3430();
 }
+
+#ifdef CONFIG_GENERIC_MMC
+int board_mmc_init(bd_t *bis)
+{
+	omap_mmc_init(0);
+	return 0;
+}
+#endif
include/configs/omap3_sdp3430.h +2 -1
index e1d8c78..17286d4 100644
@@ -189,8 +189,9 @@
  */
 
 #if defined(CONFIG_CMD_MMC)
+#define CONFIG_GENERIC_MMC		1
 #define CONFIG_MMC			1
-#define CONFIG_OMAP3_MMC		1
+#define CONFIG_OMAP_HSMMC		1
 #define CONFIG_DOS_PARTITION		1
 #endif
Signature · 1 line
1.7.0.4
author
#13 lore raw

PATCH 8/9 devkit8000: Use generic MMC driver

In reply to Tom Rini

Switch from the legacy omap3 mmc driver to the new generic omap hsmmc driver. This patch is based on the work done for Beagle, etc.

Signed-off-by Tom Rini <[email protected]>
---
 board/timll/devkit8000/devkit8000.c |    9 +++++++++
 include/configs/devkit8000.h        |   10 ++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)
board/timll/devkit8000/devkit8000.c +9 -0
index 95afaaa..533af5a 100644
@@ -35,6 +35,7 @@
 #include <common.h>
 #include <twl4030.h>
 #include <asm/io.h>
+#include <asm/arch/mmc_host_def.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mem.h>

@@ -119,6 +120,14 @@ void set_muxconf_regs(void)
 	MUX_DEVKIT8000();
 }
 
+#ifdef CONFIG_GENERIC_MMC
+int board_mmc_init(bd_t *bis)
+{
+	omap_mmc_init(0);
+	return 0;
+}
+#endif
+
 #ifdef CONFIG_DRIVER_DM9000
 /*
  * Routine: board_eth_init
include/configs/devkit8000.h +6 -4
index cf77606..710092d 100644
@@ -98,8 +98,9 @@
 					115200}
 
 /* MMC */
+#define CONFIG_GENERIC_MMC		1
 #define CONFIG_MMC			1
-#define CONFIG_OMAP3_MMC		1
+#define CONFIG_OMAP_HSMMC		1
 #define CONFIG_DOS_PARTITION		1
 
 /* I2C */

@@ -181,6 +182,7 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x82000000\0" \
 	"console=ttyS2,115200n8\0" \
+	"mmcdev=0\0" \
 	"vram=12M\0" \
 	"dvimode=1024x768MR-16 at 60\0" \
 	"defaultdisplay=dvi\0" \

@@ -213,10 +215,10 @@
 		"${kernelopts} " \
 		"dnsip1=${dnsip} " \
 		"dnsip2=${dnsip2}\0" \
-	"loadbootscript=fatload mmc 0 ${loadaddr} boot.scr\0" \
+	"loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
 	"bootscript=echo Running bootscript from mmc ...; " \
 		"source ${loadaddr}\0" \
-	"loaduimage=fatload mmc 0 ${loadaddr} uImage\0" \
+	"loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
 	"eraseenv=nand unlock 0x260000 0x20000; nand erase 0x260000 0x20000\0" \
 	"mmcboot=echo Booting from mmc ...; " \
 		"run mmcargs; " \

@@ -229,7 +231,7 @@
 		"dhcp ${loadaddr}; " \
 		"run netargs; " \
 		"bootm ${loadaddr}\0" \
-	"autoboot=if mmc init 0; then " \
+	"autoboot=if mmc rescan ${mmcdev}; then " \
 			"if run loadbootscript; then " \
 				"run bootscript; " \
 			"else " \
Signature · 1 line
1.7.0.4
author
#14 lore raw

PATCH 9/9 OMAP3: Remove legacy mmc driver

In reply to Tom Rini

Now that all platforms have been migrated to the new MMC driver, remove the old one.

Signed-off-by Tom Rini <[email protected]>
---
 drivers/mmc/Makefile    |    1 -
 drivers/mmc/omap3_mmc.c |  570 -----------------------------------------------
 drivers/mmc/omap3_mmc.h |  233 -------------------
 3 files changed, 0 insertions(+), 804 deletions(-)
 delete mode 100644 drivers/mmc/omap3_mmc.c
 delete mode 100644 drivers/mmc/omap3_mmc.h
drivers/mmc/Makefile +0 -1
index 3968c14..e5ca121 100644
@@ -35,7 +35,6 @@ COBJS-$(CONFIG_MMC_SPI) += mmc_spi.o
 COBJS-$(CONFIG_ARM_PL180_MMCI) += arm_pl180_mmci.o
 COBJS-$(CONFIG_MV_SDHCI) += mv_sdhci.o
 COBJS-$(CONFIG_MXC_MMC) += mxcmmc.o
-COBJS-$(CONFIG_OMAP3_MMC) += omap3_mmc.o
 COBJS-$(CONFIG_OMAP_HSMMC) += omap_hsmmc.o
 COBJS-$(CONFIG_PXA_MMC) += pxa_mmc.o
 COBJS-$(CONFIG_S5P_MMC) += s5p_mmc.o
drivers/mmc/omap3_mmc.c deleted +0 -570

570 lines not on this page · raw message

drivers/mmc/omap3_mmc.h deleted +0 -233

233 lines not on this page · raw message

Signature · 1 line
1.7.0.4
#15 lore raw

PATCH 9/9 OMAP3: Remove legacy mmc driver

Quoted 12 lines

-----Original Message-----
From: u-boot-bounces at lists.denx.de [mailto:u-boot-bounces at lists.denx.de] On Behalf Of Rini, Tom
Sent: Tuesday, August 23, 2011 3:44 AM
To: u-boot at lists.denx.de
Subject: [U-Boot] [PATCH 9/9] OMAP3: Remove legacy mmc driver

Now that all platforms have been migrated to the new MMC driver, remove
the old one.

Signed-off-by Tom Rini <[email protected]>
Quoted 9 lines
---
 drivers/mmc/Makefile    |    1 -
 drivers/mmc/omap3_mmc.c |  570 
-----------------------------------------------
 drivers/mmc/omap3_mmc.h |  233 -------------------
 3 files changed, 0 insertions(+), 804 deletions(-)
 delete mode 100644 drivers/mmc/omap3_mmc.c
 delete mode 100644 drivers/mmc/omap3_mmc.h

Similar patch was posted earlier in the month:
http://marc.info/?l=u-boot&m=131220851719468&w=2

You may still want to keep the "legacy" mmc driver. Should help the new boards during early development.

~sanjeev

#16 lore raw

PATCH 9/9 OMAP3: Remove legacy mmc driver

Quoted 24 lines · Sanjeev
Quoted 17 lines

-----Original Message-----
From: u-boot-bounces at lists.denx.de [mailto:u-boot-bounces at lists.denx.de] On Behalf Of Rini, Tom
Sent: Tuesday, August 23, 2011 3:44 AM
To: u-boot at lists.denx.de
Subject: [U-Boot] [PATCH 9/9] OMAP3: Remove legacy mmc driver

Now that all platforms have been migrated to the new MMC driver, remove
the old one.

Signed-off-by Tom Rini <[email protected]>

---

 drivers/mmc/Makefile    |    1 -
 drivers/mmc/omap3_mmc.c |  570
Quoted 6 lines

-----------------------------------------------

 drivers/mmc/omap3_mmc.h |  233 -------------------
 3 files changed, 0 insertions(+), 804 deletions(-)
 delete mode 100644 drivers/mmc/omap3_mmc.c
 delete mode 100644 drivers/mmc/omap3_mmc.h
Quoted 5 lines

Similar patch was posted earlier in the month:
http://marc.info/?l=u-boot&m=131220851719468&w=2

You may still want to keep the "legacy" mmc driver. Should help the new boards during early development.

How? Really, protecting legacy stuff won't help anyone ... and if those people want it, they can pull it from git history.

Cheers

Quoted 6 lines

~sanjeev
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

#17 lore raw

PATCH 9/9 OMAP3: Remove legacy mmc driver

Quoted 6 lines · Marek Vasut
Quoted 6 lines
Quoted 5 lines

?drivers/mmc/omap3_mmc.h | ?233 ------------------- ?3 files changed, 0 insertions(+), 804 deletions(-) ?delete mode 100644 drivers/mmc/omap3_mmc.c ?delete mode 100644 drivers/mmc/omap3_mmc.h

Quoted 8 lines
Quoted 5 lines

Similar patch was posted earlier in the month:
http://marc.info/?l=u-boot&m=131220851719468&w=2

You may still want to keep the "legacy" mmc driver. Should help the new boards during early development.

How? Really, protecting legacy stuff won't help anyone ... and if those people want it, they can pull it from git history.

Agreed. I'd be happy to apply this once the patches changing the drivers over have been committed. I can do that, if the many board maintainers don't object. Otherwise, I'll just wait. :)

Andy

#18 lore raw

PATCH 9/9 OMAP3: Remove legacy mmc driver

In reply to Marek Vasut

<Playing some post-vacation catch-up>

I just want to address this point real quick. Take a look at the board conversion patches, it's not a big deal to hook in to this, it's just a matter of calling the init function, on top of any "normal" hook up work you had to do.

Signature · 8 lines
Tom

________________________________________
From: Marek Vasut [marek.vasut at gmail.com]
Sent: Tuesday, August 30, 2011 12:19 AM
To: u-boot at lists.denx.de
Cc: Premi, Sanjeev; Rini, Tom
Subject: Re: [U-Boot] [PATCH 9/9] OMAP3: Remove legacy mmc driver
Quoted 24 lines · Sanjeev
Quoted 17 lines

-----Original Message-----
From: u-boot-bounces at lists.denx.de [mailto:u-boot-bounces at lists.denx.de] On Behalf Of Rini, Tom
Sent: Tuesday, August 23, 2011 3:44 AM
To: u-boot at lists.denx.de
Subject: [U-Boot] [PATCH 9/9] OMAP3: Remove legacy mmc driver

Now that all platforms have been migrated to the new MMC driver, remove
the old one.

Signed-off-by Tom Rini <[email protected]>

---

 drivers/mmc/Makefile    |    1 -
 drivers/mmc/omap3_mmc.c |  570
Quoted 6 lines

-----------------------------------------------

 drivers/mmc/omap3_mmc.h |  233 -------------------
 3 files changed, 0 insertions(+), 804 deletions(-)
 delete mode 100644 drivers/mmc/omap3_mmc.c
 delete mode 100644 drivers/mmc/omap3_mmc.h
Quoted 5 lines

Similar patch was posted earlier in the month:
http://marc.info/?l=u-boot&m=131220851719468&w=2

You may still want to keep the "legacy" mmc driver. Should help the new boards during early development.

How? Really, protecting legacy stuff won't help anyone ... and if those people want it, they can pull it from git history.

Cheers

Quoted 6 lines

~sanjeev
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot