From patchwork Mon Feb 3 11:15:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaehoon Chung X-Patchwork-Id: 3568831 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CA4C9C02DC for ; Mon, 3 Feb 2014 11:15:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B6208201C0 for ; Mon, 3 Feb 2014 11:15:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AC4BD201FE for ; Mon, 3 Feb 2014 11:15:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751863AbaBCLPj (ORCPT ); Mon, 3 Feb 2014 06:15:39 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:9422 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751344AbaBCLPi (ORCPT ); Mon, 3 Feb 2014 06:15:38 -0500 Received: from epcpsbgr2.samsung.com (u142.gpu120.samsung.co.kr [203.254.230.142]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N0F007PC39ZAZ30@mailout3.samsung.com> for linux-mmc@vger.kernel.org; Mon, 03 Feb 2014 20:15:35 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.114]) by epcpsbgr2.samsung.com (EPCPMTA) with SMTP id 30.4B.09028.75A7FE25; Mon, 03 Feb 2014 20:15:35 +0900 (KST) X-AuditID: cbfee68e-b7f566d000002344-b2-52ef7a57984d Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 06.80.28157.75A7FE25; Mon, 03 Feb 2014 20:15:35 +0900 (KST) Received: from [10.252.81.186] by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N0F001ZZ39YON40@mmp2.samsung.com>; Mon, 03 Feb 2014 20:15:35 +0900 (KST) Message-id: <52EF7A57.1020801@samsung.com> Date: Mon, 03 Feb 2014 20:15:35 +0900 From: Jaehoon Chung User-Agent: Mozilla/5.0 (X11; Linux i686; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 MIME-version: 1.0 To: "linux-mmc@vger.kernel.org" Cc: Chris Ball , Ulf Hansson , Seungwon Jeon , Olof Johansson Subject: [PATCH v3 1/8] mmc: core: add the property for hs200 Content-type: text/plain; charset=ISO-8859-1 Content-transfer-encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprNIsWRmVeSWpSXmKPExsWyRsSkSDe86n2QwZnz/BYTLm9ntDjyv5/R 4tT1z2wWH+5fZLY4vjbcgdXjzrU9bB5XTjSxetx4tZDJo2/LKkaPz5vkAlijuGxSUnMyy1KL 9O0SuDJa/s9jLJjGV3Hy7RamBsYP3F2MnBwSAiYSfU+WskLYYhIX7q1n62Lk4hASWMoosXHq GRaYoht/HjGC2EIC0xklju0QgCh6zSjR8qGFGSTBK6AlcffNPbAiFgFVian/F4HZbAI6Etu/ HWcCsUUFwiSmnrjKAlEvKPFj8j0gm4NDRMBaovm3LMhMZoEJjBKHTm8HqxEWsJU4fPECO4jN DDRnf+s0NghbXmLzmrfMIA0SAqvYJU4+Os0KsVhA4tvkQ2BDJQRkJTYdYIZ4QFLi4IobLBMY RWYhWT0LydhZSMYuYGRexSiaWpBcUJyUXmSkV5yYW1yal66XnJ+7iREYMaf/PevbwXjzgPUh xmSglROZpUST84ERl1cSb2hsZmRhamJqbGRuaUaasJI476KHSUFCAumJJanZqakFqUXxRaU5 qcWHGJk4OKUaGEPWHPq7av2imx2//Op1Epqfb9XsEr0XdcQiNbyyNfdMYveJvrWbveoDdzOG l7zlfPrBOoNZQeBZweknJa4TpJ8x/EtjrE2USN68Ivb1UzunzXfu38t5GXTyYu2RxFBT8V8R ufpXuJ26a46sdJK9JfmdZ6ZiyeLUHyJb9Z8a7o6ZvFLOk5W/WImlOCPRUIu5qDgRAI0khCqu AgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrBIsWRmVeSWpSXmKPExsVy+t9jQd3wqvdBBi8vcVhMuLyd0eLI/35G i1PXP7NZfLh/kdni+NpwB1aPO9f2sHlcOdHE6nHj1UImj74tqxg9Pm+SC2CNamC0yUhNTEkt UkjNS85PycxLt1XyDo53jjc1MzDUNbS0MFdSyEvMTbVVcvEJ0HXLzAFarqRQlphTChQKSCwu VtK3wzQhNMRN1wKmMULXNyQIrsfIAA0krGHMaPk/j7FgGl/FybdbmBoYP3B3MXJySAiYSNz4 84gRwhaTuHBvPRuILSQwnVHi2A6BLkYuIPs1o0TLhxZmkASvgJbE3Tf3wBpYBFQlpv5fBGaz CehIbP92nAnEFhUIk5h64ioLRL2gxI/J94BsDg4RAWuJ5t+yIDOZBSYwShw6vR2sRljAVuLw xQvsIDYz0Jz9rdPYIGx5ic1r3jJPYOSbhWTULCRls5CULWBkXsUomlqQXFCclJ5rpFecmFtc mpeul5yfu4kRHI/PpHcwrmqwOMQowMGoxMPbsfddkBBrYllxZe4hRgkOZiUR3r0V74OEeFMS K6tSi/Lji0pzUosPMSYDfTqRWUo0OR+YKvJK4g2NTcyMLI3MDS2MjM1JE1YS5z3Yah0oJJCe WJKanZpakFoEs4WJg1OqgVHvR0z+k8ifbv73T5R+2cN4+cJuOTun+Ct/7IVdvy2yF17em6cZ XyylU1Eoz8fyW15UbkZt4qNXrtt/MFznWtRSvWxpvr3zg1B26RmtWxWerDnMLfO1WMnW5/nN rlst3t3vwheF/HraqrSHda7ekZbtu+ft67/16oWDWkDqu5ZKgZcu06SuLVNiKc5INNRiLipO BACCS9QDCwMAAA== 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=-7.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 mmc-hs200-1.8v and mmc-hs200-1.2v can be used to the general capability. Signed-off-by: Jaehoon Chung Acked-by: Ulf Hansson --- Changelog V3: - Use the "len" instead of "NULL" Changelog V2: - Rename the mmc-hs200-1_8v/1_2v instead of "_caps2_" - Add the properties into Documentation/devicetree/bindings/mmc/mmc.txt Documentation/devicetree/bindings/mmc/mmc.txt | 2 ++ drivers/mmc/core/host.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/Documentation/devicetree/bindings/mmc/mmc.txt b/Documentation/devicetree/bindings/mmc/mmc.txt index 458b57f..4bb3894 100644 --- a/Documentation/devicetree/bindings/mmc/mmc.txt +++ b/Documentation/devicetree/bindings/mmc/mmc.txt @@ -29,6 +29,8 @@ Optional properties: - cap-power-off-card: powering off the card is safe - cap-sdio-irq: enable SDIO IRQ signalling on this interface - full-pwr-cycle: full power cycle of the card is supported +- mmc-hs200-1_8v: HS200 mode(1.8V I/O) is supported +- mmc-hs200-1_2v: HS200 mode(1.2V I/O) is supported *NOTE* on CD and WP polarity. To use common for all SD/MMC host controllers line polarity properties, we have to fix the meaning of the "normal" and "inverted" diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c index 49bc403..4b81c93 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c @@ -429,6 +429,10 @@ int mmc_of_parse(struct mmc_host *host) host->pm_caps |= MMC_PM_KEEP_POWER; if (of_find_property(np, "enable-sdio-wakeup", &len)) host->pm_caps |= MMC_PM_WAKE_SDIO_IRQ; + if (of_find_property(np, "mmc-hs200-1_8v", &len)) + host->caps2 |= MMC_CAP2_HS200_1_8V_SDR; + if (of_find_property(np, "mmc-hs200-1_2v", &len)) + host->caps2 |= MMC_CAP2_HS200_1_2V_SDR; return 0;