public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH] ARM:OMAP3 Change mmc_init to mmc_legacy_init
@ 2009-02-19 22:45 Tom Rix
  2009-02-19 22:51 ` Wolfgang Denk
  0 siblings, 1 reply; 9+ messages in thread
From: Tom Rix @ 2009-02-19 22:45 UTC (permalink / raw)
  To: u-boot

omap3_mmc.c was changed to define mmc_legacy_init.
Remove unused functions.

Compile tested on all arm
Runtime tested on Zoom1.

Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
---
 drivers/mmc/omap3_mmc.c |   17 ++---------------
 1 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/drivers/mmc/omap3_mmc.c b/drivers/mmc/omap3_mmc.c
index 0148702..987adb0 100644
--- a/drivers/mmc/omap3_mmc.c
+++ b/drivers/mmc/omap3_mmc.c
@@ -28,6 +28,7 @@
 #include <mmc.h>
 #include <part.h>
 #include <i2c.h>
+#include <asm/arch/mmc.h>
 
 const unsigned short mmc_transspeed_val[15][4] = {
 	{CLKD(10, 1), CLKD(10, 10), CLKD(10, 100), CLKD(10, 1000)},
@@ -521,7 +522,7 @@ unsigned long mmc_bread(int dev_num, unsigned long blknr, lbaint_t blkcnt,
 	return 1;
 }
 
-int mmc_init(int verbose)
+int mmc_legacy_init(int verbose)
 {
 	if (configure_mmc(&cur_card_data) != 1)
 		return 1;
@@ -542,17 +543,3 @@ int mmc_init(int verbose)
 	return 0;
 }
 
-int mmc_read(ulong src, uchar *dst, int size)
-{
-	return 0;
-}
-
-int mmc_write(uchar *src, ulong dst, int size)
-{
-	return 0;
-}
-
-int mmc2info(ulong addr)
-{
-	return 0;
-}
-- 
1.6.0.5

^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [U-Boot] [PATCH] ARM:OMAP3 Change mmc_init to mmc_legacy_init
@ 2009-02-19 16:50 Tom Rix
  2009-02-19 17:22 ` Dirk Behme
  2009-02-19 21:51 ` Wolfgang Denk
  0 siblings, 2 replies; 9+ messages in thread
From: Tom Rix @ 2009-02-19 16:50 UTC (permalink / raw)
  To: u-boot

omap3_mmc.c was changed to define mmc_legacy_init.  Definition of mmc_read was
changed to match declaration in mmc.h

cmd_mmc.c ifndef was strengthened to disable use of generic mmc functions if
the generic mmc interface is not used.

Compile tested on all arm
Runtime tested on Zoom1.

Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
---
 common/cmd_mmc.c        |    5 ++++-
 drivers/mmc/omap3_mmc.c |    5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c
index 73ec7bf..111f169 100644
--- a/common/cmd_mmc.c
+++ b/common/cmd_mmc.c
@@ -40,7 +40,8 @@ U_BOOT_CMD(
 	"init mmc card",
 	NULL
 );
-#endif /* !CONFIG_GENERIC_MMC */
+
+#else
 
 static void print_mmcinfo(struct mmc *mmc)
 {
@@ -171,3 +172,5 @@ U_BOOT_CMD(
 	"mmc write <device num> addr blk# cnt\n"
 	"mmc rescan <device num>\n"
 	"mmc list - lists available devices\n");
+
+#endif
diff --git a/drivers/mmc/omap3_mmc.c b/drivers/mmc/omap3_mmc.c
index 0148702..dc9a9ed 100644
--- a/drivers/mmc/omap3_mmc.c
+++ b/drivers/mmc/omap3_mmc.c
@@ -28,6 +28,7 @@
 #include <mmc.h>
 #include <part.h>
 #include <i2c.h>
+#include <asm/arch/mmc.h>
 
 const unsigned short mmc_transspeed_val[15][4] = {
 	{CLKD(10, 1), CLKD(10, 10), CLKD(10, 100), CLKD(10, 1000)},
@@ -521,7 +522,7 @@ unsigned long mmc_bread(int dev_num, unsigned long blknr, lbaint_t blkcnt,
 	return 1;
 }
 
-int mmc_init(int verbose)
+int mmc_legacy_init(int verbose)
 {
 	if (configure_mmc(&cur_card_data) != 1)
 		return 1;
@@ -542,7 +543,7 @@ int mmc_init(int verbose)
 	return 0;
 }
 
-int mmc_read(ulong src, uchar *dst, int size)
+int mmc_read(struct mmc *mmc, u64 src, uchar *dst, int size)
 {
 	return 0;
 }
-- 
1.5.4.3

^ permalink raw reply related	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2009-02-20  2:22 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-02-19 22:45 [U-Boot] [PATCH] ARM:OMAP3 Change mmc_init to mmc_legacy_init Tom Rix
2009-02-19 22:51 ` Wolfgang Denk
2009-02-19 23:07   ` Wolfgang Denk
2009-02-20  0:48     ` Tom
2009-02-20  2:22     ` Tom
  -- strict thread matches above, loose matches on Subject: below --
2009-02-19 16:50 Tom Rix
2009-02-19 17:22 ` Dirk Behme
2009-02-19 20:25   ` Dirk Behme
2009-02-19 21:51 ` Wolfgang Denk

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox