Re: [U-Boot] [PATCH RFC v2] OMAP: mmc: add support for second and third mmc channels
On Fri, May 14, 2010 at 11:29 AM, Andy Fleming wrote: > On Thu, Apr 29, 2010 at 3:26 PM, Steve Sakoman wrote: >> This patch adds support for the second and third mmc channels on OMAP3 >> processors >> >> Boards wishing to use this feature should define CONFIG_SYS_MMC_SET_DEV >> >> Tested on Overo >> >> Signed-off-by: Steve Sakoman > > Applied, thanks! I can't seem to find which branch this has been applied to! I have a new patch series which depends on this. Do I need to resubmit? Regards, Steve ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH RFC v2] OMAP: mmc: add support for second and third mmc channels
On Thu, Apr 29, 2010 at 3:26 PM, Steve Sakoman wrote: > This patch adds support for the second and third mmc channels on OMAP3 > processors > > Boards wishing to use this feature should define CONFIG_SYS_MMC_SET_DEV > > Tested on Overo > > Signed-off-by: Steve Sakoman Applied, thanks! ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH RFC v2] OMAP: mmc: add support for second and third mmc channels
On 04/29/2010 04:26 PM, Steve Sakoman wrote:
> This patch adds support for the second and third mmc channels on OMAP3
> processors
>
> Boards wishing to use this feature should define CONFIG_SYS_MMC_SET_DEV
>
> Tested on Overo
>
> Signed-off-by: Steve Sakoman
Tested-by: Philip Balister
Works with mmc3 connected to an over via the TXS0206 level shifter chip.
Philip
> ---
>
> diff --git a/arch/arm/include/asm/arch-omap3/mmc_host_def.h
> b/arch/arm/include/asm/arch-omap3/mmc_host_def.h
> index aa751c9..f081b43 100644
> --- a/arch/arm/include/asm/arch-omap3/mmc_host_def.h
> +++ b/arch/arm/include/asm/arch-omap3/mmc_host_def.h
> @@ -31,11 +31,18 @@
> typedef struct t2 {
> unsigned char res1[0x274];
> unsigned int devconf0; /* 0x274 */
> - unsigned char res2[0x2A8];
> + unsigned char res2[0x060];
> + unsigned int devconf1; /* 0x2D8 */
> + unsigned char res3[0x244];
> unsigned int pbias_lite;/* 0x520 */
> } t2_t;
>
> #define MMCSDIO1ADPCLKISEL (1<< 24)
> +#define MMCSDIO2ADPCLKISEL (1<< 6)
> +
> +#define EN_MMC1 (1<< 24)
> +#define EN_MMC2 (1<< 25)
> +#define EN_MMC3 (1<< 30)
>
> #define PBIASLITEPWRDNZ0(1<< 1)
> #define PBIASSPEEDCTRL0 (1<< 2)
> @@ -44,7 +51,9 @@ typedef struct t2 {
> /*
>* OMAP HSMMC register definitions
>*/
> -#define OMAP_HSMMC_BASE 0x4809C000
> +#define OMAP_HSMMC1_BASE 0x4809C000
> +#define OMAP_HSMMC2_BASE 0x480B4000
> +#define OMAP_HSMMC3_BASE 0x480AD000
>
> typedef struct hsmmc {
> unsigned char res1[0x10];
> diff --git a/drivers/mmc/omap3_mmc.c b/drivers/mmc/omap3_mmc.c
> index 96c0e65..bf650ba 100644
> --- a/drivers/mmc/omap3_mmc.c
> +++ b/drivers/mmc/omap3_mmc.c
> @@ -52,7 +52,27 @@ const unsigned short mmc_transspeed_val[15][4] = {
>
> mmc_card_data cur_card_data;
> static block_dev_desc_t mmc_blk_dev;
> -static hsmmc_t *mmc_base = (hsmmc_t *)OMAP_HSMMC_BASE;
> +static hsmmc_t *mmc_base = (hsmmc_t *)OMAP_HSMMC1_BASE;
> +
> +unsigned char mmc_set_dev(int dev)
> +{
> + switch (dev) {
> + case 1:
> + mmc_base = (hsmmc_t *)OMAP_HSMMC1_BASE;
> + break;
> + case 2:
> + mmc_base = (hsmmc_t *)OMAP_HSMMC2_BASE;
> + break;
> + case 3:
> + mmc_base = (hsmmc_t *)OMAP_HSMMC3_BASE;
> + break;
> + default:
> + mmc_base = (hsmmc_t *)OMAP_HSMMC1_BASE;
> + return 1;
> + }
> +
> + return 0;
> +}
>
> block_dev_desc_t *mmc_get_dev(int dev)
> {
> @@ -62,6 +82,7 @@ block_dev_desc_t *mmc_get_dev(int dev)
> unsigned char mmc_board_init(void)
> {
> t2_t *t2_base = (t2_t *)T2_BASE;
> + struct prcm *prcm_base = (struct prcm *)PRCM_BASE;
>
> #if defined(CONFIG_TWL4030_POWER)
> twl4030_power_mmc_init();
> @@ -74,6 +95,17 @@ unsigned char mmc_board_init(void)
> writel(readl(&t2_base->devconf0) | MMCSDIO1ADPCLKISEL,
> &t2_base->devconf0);
>
> + writel(readl(&t2_base->devconf1) | MMCSDIO2ADPCLKISEL,
> + &t2_base->devconf1);
> +
> + writel(readl(&prcm_base->fclken1_core) |
> + EN_MMC1 | EN_MMC2 | EN_MMC3,
> + &prcm_base->fclken1_core);
> +
> + writel(readl(&prcm_base->iclken1_core) |
> + EN_MMC1 | EN_MMC2 | EN_MMC3,
> + &prcm_base->iclken1_core);
> +
> return 1;
> }
>
> @@ -512,8 +544,11 @@ unsigned long mmc_bread(int dev_num, unsigned
> long blknr, lbaint_t blkcnt,
> return 1;
> }
>
> -int mmc_legacy_init(int verbose)
> +int mmc_legacy_init(int dev)
> {
> + if (mmc_set_dev(dev) != 0)
> + return 1;
> +
> if (configure_mmc(&cur_card_data) != 1)
> return 1;
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH RFC v2] OMAP: mmc: add support for second and third mmc channels
On Thu, Apr 29, 2010 at 1:38 PM, Andy Fleming wrote:
> On Thu, Apr 29, 2010 at 3:26 PM, Steve Sakoman wrote:
>> This patch adds support for the second and third mmc channels on OMAP3
>> processors
>>
>> Boards wishing to use this feature should define CONFIG_SYS_MMC_SET_DEV
>>
>> Tested on Overo
>>
>> Signed-off-by: Steve Sakoman
>> ---
>>
>> diff --git a/arch/arm/include/asm/arch-omap3/mmc_host_def.h
>> b/arch/arm/include/asm/arch-omap3/mmc_host_def.h
>> index aa751c9..f081b43 100644
>> --- a/arch/arm/include/asm/arch-omap3/mmc_host_def.h
>> +++ b/arch/arm/include/asm/arch-omap3/mmc_host_def.h
>> @@ -31,11 +31,18 @@
>> typedef struct t2 {
>> unsigned char res1[0x274];
>> unsigned int devconf0; /* 0x274 */
>> - unsigned char res2[0x2A8];
>> + unsigned char res2[0x060];
>> + unsigned int devconf1; /* 0x2D8 */
>> + unsigned char res3[0x244];
>> unsigned int pbias_lite; /* 0x520 */
>> } t2_t;
>
>
> Errr...just to make sure, you *meant* to move devconf1, too, right?
Yes! It is used one time to set a "magic" bit that makes the mmc2
channel work. That is why my testing didn't pick up this error --
mmc2 is not available on my hardware, only mmc1 and mmc3. The error
with pbias_lite seemed to have no negative effect in my testing!
At any rate, both registers now seem to be correct :-)
Steve
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH RFC v2] OMAP: mmc: add support for second and third mmc channels
This patch adds support for the second and third mmc channels on OMAP3
processors
Boards wishing to use this feature should define CONFIG_SYS_MMC_SET_DEV
Tested on Overo
Signed-off-by: Steve Sakoman
---
diff --git a/arch/arm/include/asm/arch-omap3/mmc_host_def.h
b/arch/arm/include/asm/arch-omap3/mmc_host_def.h
index aa751c9..f081b43 100644
--- a/arch/arm/include/asm/arch-omap3/mmc_host_def.h
+++ b/arch/arm/include/asm/arch-omap3/mmc_host_def.h
@@ -31,11 +31,18 @@
typedef struct t2 {
unsigned char res1[0x274];
unsigned int devconf0; /* 0x274 */
- unsigned char res2[0x2A8];
+ unsigned char res2[0x060];
+ unsigned int devconf1; /* 0x2D8 */
+ unsigned char res3[0x244];
unsigned int pbias_lite;/* 0x520 */
} t2_t;
#define MMCSDIO1ADPCLKISEL (1 << 24)
+#define MMCSDIO2ADPCLKISEL (1 << 6)
+
+#define EN_MMC1(1 << 24)
+#define EN_MMC2(1 << 25)
+#define EN_MMC3(1 << 30)
#define PBIASLITEPWRDNZ0 (1 << 1)
#define PBIASSPEEDCTRL0(1 << 2)
@@ -44,7 +51,9 @@ typedef struct t2 {
/*
* OMAP HSMMC register definitions
*/
-#define OMAP_HSMMC_BASE0x4809C000
+#define OMAP_HSMMC1_BASE 0x4809C000
+#define OMAP_HSMMC2_BASE 0x480B4000
+#define OMAP_HSMMC3_BASE 0x480AD000
typedef struct hsmmc {
unsigned char res1[0x10];
diff --git a/drivers/mmc/omap3_mmc.c b/drivers/mmc/omap3_mmc.c
index 96c0e65..bf650ba 100644
--- a/drivers/mmc/omap3_mmc.c
+++ b/drivers/mmc/omap3_mmc.c
@@ -52,7 +52,27 @@ const unsigned short mmc_transspeed_val[15][4] = {
mmc_card_data cur_card_data;
static block_dev_desc_t mmc_blk_dev;
-static hsmmc_t *mmc_base = (hsmmc_t *)OMAP_HSMMC_BASE;
+static hsmmc_t *mmc_base = (hsmmc_t *)OMAP_HSMMC1_BASE;
+
+unsigned char mmc_set_dev(int dev)
+{
+ switch (dev) {
+ case 1:
+ mmc_base = (hsmmc_t *)OMAP_HSMMC1_BASE;
+ break;
+ case 2:
+ mmc_base = (hsmmc_t *)OMAP_HSMMC2_BASE;
+ break;
+ case 3:
+ mmc_base = (hsmmc_t *)OMAP_HSMMC3_BASE;
+ break;
+ default:
+ mmc_base = (hsmmc_t *)OMAP_HSMMC1_BASE;
+ return 1;
+ }
+
+ return 0;
+}
block_dev_desc_t *mmc_get_dev(int dev)
{
@@ -62,6 +82,7 @@ block_dev_desc_t *mmc_get_dev(int dev)
unsigned char mmc_board_init(void)
{
t2_t *t2_base = (t2_t *)T2_BASE;
+ struct prcm *prcm_base = (struct prcm *)PRCM_BASE;
#if defined(CONFIG_TWL4030_POWER)
twl4030_power_mmc_init();
@@ -74,6 +95,17 @@ unsigned char mmc_board_init(void)
writel(readl(&t2_base->devconf0) | MMCSDIO1ADPCLKISEL,
&t2_base->devconf0);
+ writel(readl(&t2_base->devconf1) | MMCSDIO2ADPCLKISEL,
+ &t2_base->devconf1);
+
+ writel(readl(&prcm_base->fclken1_core) |
+ EN_MMC1 | EN_MMC2 | EN_MMC3,
+ &prcm_base->fclken1_core);
+
+ writel(readl(&prcm_base->iclken1_core) |
+ EN_MMC1 | EN_MMC2 | EN_MMC3,
+ &prcm_base->iclken1_core);
+
return 1;
}
@@ -512,8 +544,11 @@ unsigned long mmc_bread(int dev_num, unsigned
long blknr, lbaint_t blkcnt,
return 1;
}
-int mmc_legacy_init(int verbose)
+int mmc_legacy_init(int dev)
{
+ if (mmc_set_dev(dev) != 0)
+ return 1;
+
if (configure_mmc(&cur_card_data) != 1)
return 1;
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
