From owner-freebsd-arm@FreeBSD.ORG Wed Nov 19 07:00:13 2008 Return-Path: Delivered-To: freebsd-arm@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C812C106567B for ; Wed, 19 Nov 2008 07:00:13 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id A3F188FC1E for ; Wed, 19 Nov 2008 07:00:13 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id mAJ70Dov004144 for ; Wed, 19 Nov 2008 07:00:13 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id mAJ70Dp7004138; Wed, 19 Nov 2008 07:00:13 GMT (envelope-from gnats) Resent-Date: Wed, 19 Nov 2008 07:00:13 GMT Resent-Message-Id: <200811190700.mAJ70Dp7004138@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-arm@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Björn König Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5B56E106564A for ; Wed, 19 Nov 2008 06:59:36 +0000 (UTC) (envelope-from bkoenig@alpha-tierchen.de) Received: from mail.liberty-hosting.de (mail.smartterra.de [195.225.132.203]) by mx1.freebsd.org (Postfix) with ESMTP id 1E9BF8FC08 for ; Wed, 19 Nov 2008 06:59:35 +0000 (UTC) (envelope-from bkoenig@alpha-tierchen.de) Received: from home.alpha-tierchen.de (port-87-234-81-35.dynamic.qsc.de [87.234.81.35]) by mail.liberty-hosting.de (Postfix) with ESMTP id 4A3E13E950A for ; Wed, 19 Nov 2008 07:53:12 +0100 (CET) Received: by home.alpha-tierchen.de (Postfix, from userid 2000) id 1E5B328A19; Wed, 19 Nov 2008 07:59:32 +0100 (CET) Message-Id: <20081119065932.1E5B328A19@home.alpha-tierchen.de> Date: Wed, 19 Nov 2008 07:59:32 +0100 (CET) From: Björn König To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: arm/128987: [patch] Fix at91_mci and use 1-bit mode. X-BeenThere: freebsd-arm@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Björn König List-Id: Porting FreeBSD to the StrongARM Processor List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Nov 2008 07:00:13 -0000 >Number: 128987 >Category: arm >Synopsis: [patch] Fix at91_mci and use 1-bit mode. >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-arm >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Nov 19 07:00:13 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Björn König >Release: >Organization: >Environment: >Description: Currently SD Cards doesn't work with the at91_mci driver for AT91RM9200. These changes will make them work: - The 4-bit mode of the never worked. Disable it for now. - Return 'caps' ivar. Probably the 4-bit mode works for other AT91 controllers. Therefore it's necessary to find a better solution. >How-To-Repeat: >Fix: --- src-sys-arm-at91-at91_mci.c.diff begins here --- diff --git src/sys/arm/at91/at91_mci.c src/sys/arm/at91/at91_mci.c index 07efc71..8e1cdeb 100644 --- src/sys/arm/at91/at91_mci.c +++ src/sys/arm/at91/at91_mci.c @@ -200,7 +200,8 @@ at91_mci_attach(device_t dev) sc->host.f_min = 375000; sc->host.f_max = 30000000; sc->host.host_ocr = MMC_OCR_320_330 | MMC_OCR_330_340; - sc->host.caps = MMC_CAP_4_BIT_DATA; +// sc->host.caps = MMC_CAP_4_BIT_DATA; + sc->host.caps = 0; child = device_add_child(dev, "mmc", 0); device_set_ivars(dev, &sc->host); err = bus_generic_attach(dev); @@ -615,6 +616,9 @@ at91_mci_read_ivar(device_t bus, device_t child, int which, u_char *result) case MMCBR_IVAR_BUS_WIDTH: *(int *)result = sc->host.ios.bus_width; break; + case MMCBR_IVAR_CAPS: + *(int *)result = sc->host.caps; + break; case MMCBR_IVAR_CHIP_SELECT: *(int *)result = sc->host.ios.chip_select; break; --- src-sys-arm-at91-at91_mci.c.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: