Patchwork [U-Boot,1/2] mmc: pxa: Flip over the remaining boards to pxa_mmc_generic

login
register
mail settings
Submitter Marek Vasut
Date Sept. 30, 2012, 8:09 p.m.
Message ID <1349035791-6959-1-git-send-email-marex@denx.de>
Download mbox | patch
Permalink /patch/188197/
State Accepted, archived
Delegated to: Andy Fleming
Headers show

Comments

Marek Vasut - Sept. 30, 2012, 8:09 p.m.
Some of the boards still used the old PXA_MMC driver instead of the
new generic one. Use the new one instead so the old can be removed
and the generic MMC framework can be properly used.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Andy Fleming <afleming@freescale.com>
---
 board/lubbock/lubbock.c      |    9 +++++++++
 board/palmtc/palmtc.c        |    9 +++++++++
 board/pxa255_idp/pxa_idp.c   |    9 +++++++++
 board/trizepsiv/conxs.c      |    9 +++++++++
 include/configs/lubbock.h    |    3 ++-
 include/configs/palmtc.h     |    3 ++-
 include/configs/pxa255_idp.h |    3 ++-
 include/configs/trizepsiv.h  |    3 ++-
 8 files changed, 44 insertions(+), 4 deletions(-)
Andy Fleming - Oct. 15, 2012, 8:37 p.m.
On Sun, Sep 30, 2012 at 3:09 PM, Marek Vasut <marex@denx.de> wrote:
> Some of the boards still used the old PXA_MMC driver instead of the
> new generic one. Use the new one instead so the old can be removed
> and the generic MMC framework can be properly used.
>
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Andy Fleming <afleming@freescale.com>
> ---
>  board/lubbock/lubbock.c      |    9 +++++++++
>  board/palmtc/palmtc.c        |    9 +++++++++
>  board/pxa255_idp/pxa_idp.c   |    9 +++++++++
>  board/trizepsiv/conxs.c      |    9 +++++++++
>  include/configs/lubbock.h    |    3 ++-
>  include/configs/palmtc.h     |    3 ++-
>  include/configs/pxa255_idp.h |    3 ++-
>  include/configs/trizepsiv.h  |    3 ++-
>  8 files changed, 44 insertions(+), 4 deletions(-)
>
> diff --git a/board/lubbock/lubbock.c b/board/lubbock/lubbock.c
> index 3527b38..ef2cc24 100644
> --- a/board/lubbock/lubbock.c
> +++ b/board/lubbock/lubbock.c
> @@ -29,6 +29,7 @@
>  #include <netdev.h>
>  #include <asm/arch/pxa.h>
>  #include <asm/arch/pxa-regs.h>
> +#include <asm/arch/regs-mmc.h>
>  #include <asm/io.h>
>
>  DECLARE_GLOBAL_DATA_PTR;
> @@ -56,6 +57,14 @@ int board_init (void)
>         return 0;
>  }
>
> +#ifdef CONFIG_CMD_MMC


Do we want to use CONFIG_CMD_MMC for this?

That technically just means that the mmc *command* exists, but there
are other reasons to enable the MMC driver (such as storing the
environment or other behind-the-scenes mmc uses).

It looks like this was done a handful of other places. I'm thinking we
should use CONFIG_MMC, instead. If you update your patch, I'll submit
a patch which fixes the others.

Andy
Marek Vasut - Oct. 15, 2012, 8:54 p.m.
Dear Andy Fleming,

> On Sun, Sep 30, 2012 at 3:09 PM, Marek Vasut <marex@denx.de> wrote:
> > Some of the boards still used the old PXA_MMC driver instead of the
> > new generic one. Use the new one instead so the old can be removed
> > and the generic MMC framework can be properly used.
> > 
> > Signed-off-by: Marek Vasut <marex@denx.de>
> > Cc: Andy Fleming <afleming@freescale.com>
> > ---
> > 
> >  board/lubbock/lubbock.c      |    9 +++++++++
> >  board/palmtc/palmtc.c        |    9 +++++++++
> >  board/pxa255_idp/pxa_idp.c   |    9 +++++++++
> >  board/trizepsiv/conxs.c      |    9 +++++++++
> >  include/configs/lubbock.h    |    3 ++-
> >  include/configs/palmtc.h     |    3 ++-
> >  include/configs/pxa255_idp.h |    3 ++-
> >  include/configs/trizepsiv.h  |    3 ++-
> >  8 files changed, 44 insertions(+), 4 deletions(-)
> > 
> > diff --git a/board/lubbock/lubbock.c b/board/lubbock/lubbock.c
> > index 3527b38..ef2cc24 100644
> > --- a/board/lubbock/lubbock.c
> > +++ b/board/lubbock/lubbock.c
> > @@ -29,6 +29,7 @@
> > 
> >  #include <netdev.h>
> >  #include <asm/arch/pxa.h>
> >  #include <asm/arch/pxa-regs.h>
> > 
> > +#include <asm/arch/regs-mmc.h>
> > 
> >  #include <asm/io.h>
> >  
> >  DECLARE_GLOBAL_DATA_PTR;
> > 
> > @@ -56,6 +57,14 @@ int board_init (void)
> > 
> >         return 0;
> >  
> >  }
> > 
> > +#ifdef CONFIG_CMD_MMC
> 
> Do we want to use CONFIG_CMD_MMC for this?

No we don't ... but that's what other boards do use, so ...

> That technically just means that the mmc *command* exists, but there
> are other reasons to enable the MMC driver (such as storing the
> environment or other behind-the-scenes mmc uses).

Agreed.

> It looks like this was done a handful of other places. I'm thinking we
> should use CONFIG_MMC, instead. If you update your patch, I'll submit
> a patch which fixes the others.

Can you just apply this and then fix them all please?

> Andy

Best regards,
Marek Vasut

Patch

diff --git a/board/lubbock/lubbock.c b/board/lubbock/lubbock.c
index 3527b38..ef2cc24 100644
--- a/board/lubbock/lubbock.c
+++ b/board/lubbock/lubbock.c
@@ -29,6 +29,7 @@ 
 #include <netdev.h>
 #include <asm/arch/pxa.h>
 #include <asm/arch/pxa-regs.h>
+#include <asm/arch/regs-mmc.h>
 #include <asm/io.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -56,6 +57,14 @@  int board_init (void)
 	return 0;
 }
 
+#ifdef CONFIG_CMD_MMC
+int board_mmc_init(bd_t *bis)
+{
+	pxa_mmc_register(0);
+	return 0;
+}
+#endif
+
 int board_late_init(void)
 {
 	setenv("stdout", "serial");
diff --git a/board/palmtc/palmtc.c b/board/palmtc/palmtc.c
index 4adf152..c850cf9 100644
--- a/board/palmtc/palmtc.c
+++ b/board/palmtc/palmtc.c
@@ -24,6 +24,7 @@ 
 #include <serial.h>
 #include <asm/io.h>
 #include <asm/arch/pxa.h>
+#include <asm/arch/regs-mmc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -51,6 +52,14 @@  int board_init(void)
 	return 0;
 }
 
+#ifdef CONFIG_CMD_MMC
+int board_mmc_init(bd_t *bis)
+{
+	pxa_mmc_register(0);
+	return 0;
+}
+#endif
+
 struct serial_device *default_serial_console(void)
 {
 	return &serial_ffuart_device;
diff --git a/board/pxa255_idp/pxa_idp.c b/board/pxa255_idp/pxa_idp.c
index 877e8d9..9931efd 100644
--- a/board/pxa255_idp/pxa_idp.c
+++ b/board/pxa255_idp/pxa_idp.c
@@ -35,6 +35,7 @@ 
 #include <command.h>
 #include <asm/io.h>
 #include <asm/arch/pxa.h>
+#include <asm/arch/regs-mmc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -77,6 +78,14 @@  int board_init (void)
 	return 0;
 }
 
+#ifdef CONFIG_CMD_MMC
+int board_mmc_init(bd_t *bis)
+{
+	pxa_mmc_register(0);
+	return 0;
+}
+#endif
+
 int board_late_init(void)
 {
 	setenv("stdout", "serial");
diff --git a/board/trizepsiv/conxs.c b/board/trizepsiv/conxs.c
index 1291195..af6fe25 100644
--- a/board/trizepsiv/conxs.c
+++ b/board/trizepsiv/conxs.c
@@ -34,6 +34,7 @@ 
 #include <common.h>
 #include <asm/arch/pxa-regs.h>
 #include <asm/arch/pxa.h>
+#include <asm/arch/regs-mmc.h>
 #include <netdev.h>
 #include <asm/io.h>
 
@@ -159,3 +160,11 @@  int board_eth_init(bd_t *bis)
 	return dm9000_initialize(bis);
 }
 #endif
+
+#ifdef CONFIG_CMD_MMC
+int board_mmc_init(bd_t *bis)
+{
+	pxa_mmc_register(0);
+	return 0;
+}
+#endif
diff --git a/include/configs/lubbock.h b/include/configs/lubbock.h
index 0a1d1e0..59515f5 100644
--- a/include/configs/lubbock.h
+++ b/include/configs/lubbock.h
@@ -129,7 +129,8 @@ 
 #define CONFIG_SYS_CPUSPEED		0x161		/* set core clock to 400/200/100 MHz */
 
 #ifdef CONFIG_MMC
-#define CONFIG_PXA_MMC
+#define	CONFIG_GENERIC_MMC
+#define	CONFIG_PXA_MMC_GENERIC
 #define CONFIG_CMD_MMC
 #define CONFIG_SYS_MMC_BASE		0xF0000000
 #endif
diff --git a/include/configs/palmtc.h b/include/configs/palmtc.h
index bc88354..699b39f 100644
--- a/include/configs/palmtc.h
+++ b/include/configs/palmtc.h
@@ -76,7 +76,8 @@ 
  */
 #ifdef	CONFIG_CMD_MMC
 #define	CONFIG_MMC
-#define	CONFIG_PXA_MMC
+#define	CONFIG_GENERIC_MMC
+#define	CONFIG_PXA_MMC_GENERIC
 #define	CONFIG_SYS_MMC_BASE		0xF0000000
 #define	CONFIG_CMD_FAT
 #define	CONFIG_CMD_EXT2
diff --git a/include/configs/pxa255_idp.h b/include/configs/pxa255_idp.h
index ce9e7d1..d0d88c8 100644
--- a/include/configs/pxa255_idp.h
+++ b/include/configs/pxa255_idp.h
@@ -244,7 +244,8 @@ 
 #define RTC	1				/* enable 32KHz osc */
 
 #ifdef CONFIG_MMC
-#define CONFIG_PXA_MMC
+#define	CONFIG_GENERIC_MMC
+#define	CONFIG_PXA_MMC_GENERIC
 #define CONFIG_CMD_MMC
 #define CONFIG_SYS_MMC_BASE		0xF0000000
 #endif
diff --git a/include/configs/trizepsiv.h b/include/configs/trizepsiv.h
index 151059a..52bc973 100644
--- a/include/configs/trizepsiv.h
+++ b/include/configs/trizepsiv.h
@@ -170,7 +170,8 @@ 
 #define CONFIG_SYS_CPUSPEED		0x207		/* need to look more closely, I think this is Turbo = 2x, L=91Mhz */
 
 #ifdef CONFIG_MMC
-#define CONFIG_PXA_MMC
+#define	CONFIG_GENERIC_MMC
+#define	CONFIG_PXA_MMC_GENERIC
 #define CONFIG_CMD_MMC
 #define CONFIG_SYS_MMC_BASE		0xF0000000
 #endif