From patchwork Tue Nov 25 12:22:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 5378151 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8FC639F39D for ; Tue, 25 Nov 2014 12:22:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B692020145 for ; Tue, 25 Nov 2014 12:22:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CCAEF20142 for ; Tue, 25 Nov 2014 12:22:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752493AbaKYMW2 (ORCPT ); Tue, 25 Nov 2014 07:22:28 -0500 Received: from mail-la0-f52.google.com ([209.85.215.52]:40937 "EHLO mail-la0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753390AbaKYMW0 (ORCPT ); Tue, 25 Nov 2014 07:22:26 -0500 Received: by mail-la0-f52.google.com with SMTP id q1so395471lam.39 for ; Tue, 25 Nov 2014 04:22:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Gsqpl9hLe4M8Qy00PY4kJyM9ABUUW8y8DYOR+g9YHHA=; b=RIAFX6FVsVywcgedylbnqWGm8m00E0T+/SjhghzmpIOv3HPIkxaPOOlUnot9uIiO2F rqxTXzC66yS+77qoRW87HKKkrovAJIS+wPtV4RlWCEvct2X2Tvt5klnIo1BbhlVTuRXF Nt+nnoce9ckwM6PuLgLk9g8EncgER6ARCRxTpMcI0MAr5OPGDchVSPCRgM75PRADKISn 6Bp6zIEchf9SRTVpJllhU9E42HDVwT21debDPkWJKaiDiINx5G515htyL0773QQcqEtW 5U9Fa/sRvply0Ko+RaEcxEhtBR+W/A4avjIuSfZ+FLNTca+Q0CKzIJWnX86zAiYEJS2k jkIQ== X-Gm-Message-State: ALoCoQkn8vX5lK7/kX9sQ3hzGgqw34jZtYEbYvlapgIMtOgTKCYkPjPpnHPZQwrTAHlg00R+OTGD X-Received: by 10.152.204.9 with SMTP id ku9mr26143938lac.55.1416918144496; Tue, 25 Nov 2014 04:22:24 -0800 (PST) Received: from uffe-Latitude-E6430s.lan (90-231-160-185-no158.tbcn.telia.com. [90.231.160.185]) by mx.google.com with ESMTPSA id n4sm296741lan.39.2014.11.25.04.22.22 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 25 Nov 2014 04:22:23 -0800 (PST) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson , Chris Ball Cc: Seungwon Jeon Subject: [PATCH] mmc: omap_hsmmc: Fix UHS card with DDR50 support Date: Tue, 25 Nov 2014 13:22:20 +0100 Message-Id: <1416918140-24385-1-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The commit, mmc: omap: clarify DDR timing mode between SD-UHS and eMMC, switched omap_hsmmc to support MMC DDR mode instead of UHS DDR50 mode. Add UHS DDR50 mode again and this time let's also keep the MMC DDR mode. Fixes: 5438ad95a57c (mmc: omap: clarify DDR timing mode between SD-UHS and eMMC) Reported-by: Kishon Vijay Abraham I Signed-off-by: Ulf Hansson --- drivers/mmc/host/omap_hsmmc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index 82b40b8..7c71dcd 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -628,6 +628,7 @@ static void omap_hsmmc_set_clock(struct omap_hsmmc_host *host) */ if ((mmc_pdata(host)->features & HSMMC_HAS_HSPE_SUPPORT) && (ios->timing != MMC_TIMING_MMC_DDR52) && + (ios->timing != MMC_TIMING_UHS_DDR50) && ((OMAP_HSMMC_READ(host->base, CAPA) & HSS) == HSS)) { regval = OMAP_HSMMC_READ(host->base, HCTL); if (clkdiv && (clk_get_rate(host->fclk)/clkdiv) > 25000000) @@ -647,7 +648,8 @@ static void omap_hsmmc_set_bus_width(struct omap_hsmmc_host *host) u32 con; con = OMAP_HSMMC_READ(host->base, CON); - if (ios->timing == MMC_TIMING_MMC_DDR52) + if (ios->timing == MMC_TIMING_MMC_DDR52 || + ios->timing == MMC_TIMING_UHS_DDR50) con |= DDR; /* configure in DDR mode */ else con &= ~DDR;