From patchwork Fri Mar 7 13:31:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seungwon Jeon X-Patchwork-Id: 3791421 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 203929F369 for ; Fri, 7 Mar 2014 13:31:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 16E65202B8 for ; Fri, 7 Mar 2014 13:31:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0F068202B4 for ; Fri, 7 Mar 2014 13:31:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753266AbaCGNbQ (ORCPT ); Fri, 7 Mar 2014 08:31:16 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:13754 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752932AbaCGNbP (ORCPT ); Fri, 7 Mar 2014 08:31:15 -0500 Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N2200KO7IW2C480@mailout3.samsung.com> for linux-mmc@vger.kernel.org; Fri, 07 Mar 2014 22:31:14 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.47]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id B8.40.14803.22AC9135; Fri, 07 Mar 2014 22:31:14 +0900 (KST) X-AuditID: cbfee691-b7efc6d0000039d3-ac-5319ca2233c3 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 5C.C6.29263.22AC9135; Fri, 07 Mar 2014 22:31:14 +0900 (KST) Received: from DOTGIHJUN01 ([12.36.185.168]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N22007C8IW2LQ10@mmp2.samsung.com>; Fri, 07 Mar 2014 22:31:14 +0900 (KST) From: Seungwon Jeon To: linux-mmc@vger.kernel.org Cc: 'Chris Ball' , 'Jaehoon Chung' References: <1383653403-10049-1-git-send-email-ulf.hansson@linaro.org> <006501cf2a57$881b0ff0$98512fd0$%jun@samsung.com> In-reply-to: <006501cf2a57$881b0ff0$98512fd0$%jun@samsung.com> Subject: [PATCH v3 6/7] mmc: dw_mmc: clarify DDR timing mode between SD-UHS and eMMC Date: Fri, 07 Mar 2014 22:31:14 +0900 Message-id: <002e01cf3a09$832d3b50$8987b1f0$%jun@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-transfer-encoding: 7bit X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac7aH/uUm1J6MxFOSyaXb4Fx/nx/rAABnFmgDfJZ22AGGaDjEAPssJ/w Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrIIsWRmVeSWpSXmKPExsVy+t8zfV2lU5LBBnvemFlMuLyd0eLGrzZW iyP/+xkdmD1uvFrI5NG3ZRWjx+dNcgHMUVw2Kak5mWWpRfp2CVwZJ7+kFhznq9j4cSNjA+NE ni5GTg4JAROJbxeWMEPYYhIX7q1n62Lk4hASWMYo8WpNFwtMUWfPNSaIxHRGiR+7HrJCOH8Y Jdb+fwtWxSagJfH3zRuwUSICshI//1xgA7GZBXwlFnyfzgRiCwlUSVy6NY0RxOYUsJN4ev8I K4gtLBAmsfDtf7A5LAKqErt/rAPr5RWwlVjddIIZwhaU+DH5HlANB9BMdYkpU3IhxstLbF7z lhkkLAEUfvRXF+ICN4njO1ugLhCR2PfiHSPIyRIC+9gllnz4wAixSkDi2+RDLBC9shKbDkAD QlLi4IobLBMYJWYhWTwLYfEsJItnIdmwgJFlFaNoakFyQXFSepGpXnFibnFpXrpecn7uJkZI 9E3cwXj/gPUhxmSg7ROZpUST84HRm1cSb2hsZmRhamJqbGRuaUaasJI4b/qjpCAhgfTEktTs 1NSC1KL4otKc1OJDjEwcnFINjIzBHhq73+hfNotzjWzJXRTaebU7/EPUj8bCUoXbf52rl//M inQ6tPTYtq87rrlMU9p9WycudbPDz+37TbLc3ad1nv6TKxbZqpsRZjG/N7M5gH3rk32V7/uX 3H0vKHlCaUHpfTahm79t2FecfNJrfbGdcaP3/RMnOi2026NLg0/4l77w+mV4W4mlOCPRUIu5 qDgRAKhcajrUAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprHKsWRmVeSWpSXmKPExsVy+t9jQV2lU5LBBpemG1tMuLyd0eLGrzZW iyP/+xkdmD1uvFrI5NG3ZRWjx+dNcgHMUQ2MNhmpiSmpRQqpecn5KZl56bZK3sHxzvGmZgaG uoaWFuZKCnmJuam2Si4+AbpumTlAm5QUyhJzSoFCAYnFxUr6dpgmhIa46VrANEbo+oYEwfUY GaCBhHWMGSe/pBYc56vY+HEjYwPjRJ4uRk4OCQETic6ea0wQtpjEhXvr2boYuTiEBKYzSvzY 9ZAVwvnDKLH2/1sWkCo2AS2Jv2/eMIPYIgKyEj//XGADsZkFfCUWfJ8ONklIoEri0q1pjCA2 p4CdxNP7R1hBbGGBMImFb/+DzWERUJXY/WMdWC+vgK3E6qYTzBC2oMSPyfeAajiAZqpLTJmS CzFeXmLzmrfMIGEJoPCjv7oQF7hJHN/ZAnWBiMS+F+8YJzAKzUIyaBbCoFlIBs1C0rGAkWUV o2hqQXJBcVJ6rqFecWJucWleul5yfu4mRnBsP5PawbiyweIQowAHoxIPb8ciiWAh1sSy4src Q4wSHMxKIrw8qyWDhXhTEiurUovy44tKc1KLDzEmA705kVlKNDkfmHbySuINjU3MjCyNzCyM TMzNSRNWEuc90GodKCSQnliSmp2aWpBaBLOFiYNTqoGR8593j+idv2Yh7ZcfisvNkN7Rc/hx yPLDc43/92dnFcyPXnB6kWFfTNf1AHPhfcKzdP+yBM6z0mBbIXRij8rJVbrhYhGpCsdlCufu FrGw+6eXuWHtJUfdy823uVgyw/y+PVfZIXXyXk7rFY1nrZOUGhb8WrZny9SSRCPTvcH6c7ZX fIl03ntViaU4I9FQi7moOBEAMKbwqjEDAAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected 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=unavailable 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 Replaced UHS_DDR50 with MMC_DDR52. And MMC_CAP_UHS_DDR50 is removed because of non-implementation of UHS signaling. Signed-off-by: Seungwon Jeon Reviewed-by: Ulf Hansson Acked-by: Jaehoon Chung --- drivers/mmc/host/dw_mmc-exynos.c | 5 ++--- drivers/mmc/host/dw_mmc.c | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/host/dw_mmc-exynos.c b/drivers/mmc/host/dw_mmc-exynos.c index 3423c5e..a67e784 100644 --- a/drivers/mmc/host/dw_mmc-exynos.c +++ b/drivers/mmc/host/dw_mmc-exynos.c @@ -187,7 +187,7 @@ static void dw_mci_exynos_set_ios(struct dw_mci *host, struct mmc_ios *ios) unsigned long actual; u8 div = priv->ciu_div + 1; - if (ios->timing == MMC_TIMING_UHS_DDR50) { + if (ios->timing == MMC_TIMING_MMC_DDR52) { mci_writel(host, CLKSEL, priv->ddr_timing); /* Should be double rate for DDR mode */ if (ios->bus_width == MMC_BUS_WIDTH_8) @@ -386,8 +386,7 @@ static int dw_mci_exynos_execute_tuning(struct dw_mci_slot *slot, u32 opcode, /* Common capabilities of Exynos4/Exynos5 SoC */ static unsigned long exynos_dwmmc_caps[4] = { - MMC_CAP_UHS_DDR50 | MMC_CAP_1_8V_DDR | - MMC_CAP_8_BIT_DATA | MMC_CAP_CMD23, + MMC_CAP_1_8V_DDR | MMC_CAP_8_BIT_DATA | MMC_CAP_CMD23, MMC_CAP_CMD23, MMC_CAP_CMD23, MMC_CAP_CMD23, diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 0c56faa..ab704d9 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -962,7 +962,7 @@ static void dw_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) regs = mci_readl(slot->host, UHS_REG); /* DDR mode set */ - if (ios->timing == MMC_TIMING_UHS_DDR50) + if (ios->timing == MMC_TIMING_MMC_DDR52) regs |= ((0x1 << slot->id) << 16); else regs &= ~((0x1 << slot->id) << 16);