From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Babic Date: Mon, 14 Nov 2011 10:06:58 +0100 Subject: [U-Boot] [PATCH 5/6] i.mx: fsl_esdhc: add the i.mx6q support In-Reply-To: <1321094190-8108-6-git-send-email-jason.hui@linaro.org> References: <1321094190-8108-1-git-send-email-jason.hui@linaro.org> <1321094190-8108-6-git-send-email-jason.hui@linaro.org> Message-ID: <4EC0DA32.6090603@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 11/12/2011 11:36 AM, Jason Liu wrote: > The mmc host controller on the i.mx6q is called usdhc which > is redesigned based on the freescale esdhc controller. > > The usdhc controller is almost compatible with esdhc except > it adds one misc control register from user using experience. > > Signed-off-by: Jason Liu > --- Hi Jason, I put Andy in CC (MMC custodian). > drivers/mmc/fsl_esdhc.c | 14 +++++++++++++- > 1 files changed, 13 insertions(+), 1 deletions(-) > > diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c > index ec953f0..cd17ef2 100644 > --- a/drivers/mmc/fsl_esdhc.c > +++ b/drivers/mmc/fsl_esdhc.c > @@ -58,7 +58,12 @@ struct fsl_esdhc { > uint autoc12err; > uint hostcapblt; > uint wml; > - char reserved1[8]; > +#if defined(CONFIG_FSL_USDHC) > + uint mixctrl; > + char reserved1[4]; > +#else > + char reserved1[8]; > +#endif > uint fevt; > char reserved2[168]; > uint hostver; > @@ -298,6 +303,9 @@ esdhc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data) > > /* Send the command */ > esdhc_write32(®s->cmdarg, cmd->cmdarg); > +#if defined(CONFIG_FSL_USDHC) > + esdhc_write32(®s->mixctrl, xfertyp & 0xFFFF); > +#endif > esdhc_write32(®s->xfertyp, xfertyp); > > /* Wait for the command to complete */ > @@ -482,7 +490,11 @@ int fsl_esdhc_initialize(bd_t *bis, struct fsl_esdhc_cfg *cfg) > > mmc = malloc(sizeof(struct mmc)); > > +#if defined(CONFIG_FSL_USDHC) > + sprintf(mmc->name, "FSL_USDHC"); > +#else > sprintf(mmc->name, "FSL_ESDHC"); > +#endif Acked-by: Stefano Babic Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de =====================================================================