From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758287AbYESIHL (ORCPT ); Mon, 19 May 2008 04:07:11 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758118AbYESIGb (ORCPT ); Mon, 19 May 2008 04:06:31 -0400 Received: from fnoeppeil48.netpark.at ([217.175.205.176]:59636 "EHLO roarinelk.homelinux.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756823AbYESIGa (ORCPT ); Mon, 19 May 2008 04:06:30 -0400 Date: Mon, 19 May 2008 10:06:28 +0200 From: Manuel Lauss To: linux-mips@linux-mips.org, linux-kernel@vger.kernel.org, drzeus@drzeus.cx, sshtylyov@ru.mvista.com Subject: [PATCH 5/9] au1xmmc: enable 4 bit transfer mode Message-ID: <20080519080628.GF21985@roarinelk.homelinux.net> References: <20080519080339.GA21985@roarinelk.homelinux.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20080519080339.GA21985@roarinelk.homelinux.net> User-Agent: Mutt/1.5.16 (2007-06-09) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org >>From 552bf7fadf935bfdac19b505ff4bd3ab8b280727 Mon Sep 17 00:00:00 2001 From: Manuel Lauss Date: Sat, 17 May 2008 17:53:57 +0200 Subject: [PATCH] au1xmmc: enable 4 bit transfer mode Signed-off-by: Manuel Lauss --- drivers/mmc/host/au1xmmc.c | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/drivers/mmc/host/au1xmmc.c b/drivers/mmc/host/au1xmmc.c index 9036677..234f324 100644 --- a/drivers/mmc/host/au1xmmc.c +++ b/drivers/mmc/host/au1xmmc.c @@ -94,14 +94,13 @@ static inline void IRQ_OFF(struct au1xmmc_host *host, u32 mask) static inline void SEND_STOP(struct au1xmmc_host *host) { - - /* We know the value of CONFIG2, so avoid a read we don't need */ - u32 mask = SD_CONFIG2_EN; + u32 config2; WARN_ON(host->status != HOST_S_DATA); host->status = HOST_S_STOP; - au_writel(mask | SD_CONFIG2_DF, HOST_CONFIG2(host)); + config2 = au_readl(HOST_CONFIG2(host)); + au_writel(config2 | SD_CONFIG2_DF, HOST_CONFIG2(host)); au_sync(); /* Send the stop commmand */ @@ -689,6 +688,7 @@ static void au1xmmc_reset_controller(struct au1xmmc_host *host) static void au1xmmc_set_ios(struct mmc_host* mmc, struct mmc_ios* ios) { struct au1xmmc_host *host = mmc_priv(mmc); + u32 config2; if (ios->power_mode == MMC_POWER_OFF) au1xmmc_set_power(host, 0); @@ -700,6 +700,18 @@ static void au1xmmc_set_ios(struct mmc_host* mmc, struct mmc_ios* ios) au1xmmc_set_clock(host, ios->clock); host->clock = ios->clock; } + + config2 = au_readl(HOST_CONFIG2(host)); + switch (ios->bus_width) { + case MMC_BUS_WIDTH_4: + config2 |= SD_CONFIG2_WB; + break; + case MMC_BUS_WIDTH_1: + config2 &= ~SD_CONFIG2_WB; + break; + } + au_writel(config2, HOST_CONFIG2(host)); + au_sync(); } static void au1xmmc_dma_callback(int irq, void *dev_id) @@ -945,7 +957,7 @@ static int __devinit au1xmmc_probe(struct platform_device *pdev) mmc->max_blk_count = 512; mmc->ocr_avail = AU1XMMC_OCR; - mmc->caps = 0; + mmc->caps = MMC_CAP_4_BIT_DATA; host->status = HOST_S_IDLE; -- 1.5.5.1