| Message ID | 1314051236-21740-3-git-send-email-trini@ti.com |
|---|---|
| State | Accepted, archived |
| Commit | eaff60d7386bfd247cb1f9054d02da0990cf5abd |
| Headers | show |
Tom Rini wrote: > 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<trini@ti.com> Again, please Cc: the board maintainers in the future, thanks. > --- > board/comelit/dig297/dig297.c | 9 +++++++++ > include/configs/dig297.h | 5 +++-- > 2 files changed, 12 insertions(+), 2 deletions(-) > > diff --git a/board/comelit/dig297/dig297.c b/board/comelit/dig297/dig297.c > index 0062f12..a7071cd 100644 > --- a/board/comelit/dig297/dig297.c > +++ b/board/comelit/dig297/dig297.c > @@ -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 > diff --git a/include/configs/dig297.h b/include/configs/dig297.h > index b68f073..0e05df3 100644 > --- a/include/configs/dig297.h > +++ b/include/configs/dig297.h > @@ -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 <luca.ceresoli@comelit.it> Luca
On Wed, Aug 24, 2011 at 6:43 AM, Luca Ceresoli <luca.ceresoli@comelit.it> wrote: > Tom Rini wrote: >> 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<trini@ti.com> > > Again, please Cc: the board maintainers in the future, thanks. Oh, sorry, used to other lists where people complain about too many CCs. [snip] >> diff --git a/include/configs/dig297.h b/include/configs/dig297.h >> index b68f073..0e05df3 100644 >> --- a/include/configs/dig297.h >> +++ b/include/configs/dig297.h >> @@ -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 <luca.ceresoli@comelit.it> OK, thanks, I'll respin this patch (all of the other boards were doing the define CONFIG_FOO 1 everywhere) shortly.
diff --git a/board/comelit/dig297/dig297.c b/board/comelit/dig297/dig297.c index 0062f12..a7071cd 100644 --- a/board/comelit/dig297/dig297.c +++ b/board/comelit/dig297/dig297.c @@ -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 diff --git a/include/configs/dig297.h b/include/configs/dig297.h index b68f073..0e05df3 100644 --- a/include/configs/dig297.h +++ b/include/configs/dig297.h @@ -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 */
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 <trini@ti.com> --- board/comelit/dig297/dig297.c | 9 +++++++++ include/configs/dig297.h | 5 +++-- 2 files changed, 12 insertions(+), 2 deletions(-)