From patchwork Tue Jan 28 08:24:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaehoon Chung X-Patchwork-Id: 3545601 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 BE9FFC02DC for ; Tue, 28 Jan 2014 08:24:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BDD4620138 for ; Tue, 28 Jan 2014 08:24:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 63B222015A for ; Tue, 28 Jan 2014 08:24:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753822AbaA1IYY (ORCPT ); Tue, 28 Jan 2014 03:24:24 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:48723 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754054AbaA1IYW (ORCPT ); Tue, 28 Jan 2014 03:24:22 -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 <0N03000PGRCLLH80@mailout3.samsung.com> for linux-mmc@vger.kernel.org; Tue, 28 Jan 2014 17:24:21 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.112]) by epcpsbgr2.samsung.com (EPCPMTA) with SMTP id 74.58.09028.53967E25; Tue, 28 Jan 2014 17:24:21 +0900 (KST) X-AuditID: cbfee68e-b7f566d000002344-b3-52e769352cba Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id E5.8E.28157.53967E25; Tue, 28 Jan 2014 17:24:21 +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 <0N03001GSRCLC700@mmp2.samsung.com>; Tue, 28 Jan 2014 17:24:21 +0900 (KST) Message-id: <52E76954.1020507@samsung.com> Date: Tue, 28 Jan 2014 17:24:52 +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 , Seungwon Jeon , Arnd Bergmann , Ulf Hansson Subject: [PATCH v2 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+NgFprJIsWRmVeSWpSXmKPExsWyRsSkQNc083mQwcd9mhZ/Jx1jt5hweTuj xZH//YwWH+5fZLY4vjbcgdXj969JjB53ru1h87jxaiGTR9+WVYwenzfJBbBGcdmkpOZklqUW 6dslcGVc2bOaseAxb8W9/kNMDYwnubsYOTkkBEwkNm3uYYKwxSQu3FvPBmILCSxllLj6ygim 5sTKs+xdjFxA8emMEvMO7oJyXjNKrP28iB2kildAS6Jh6zmgSRwcLAKqEi8OBYCE2QR0JLZ/ Ow62QFQgTGLqiassEOWCEj8m32MBKRcRsJZo/i0LMpJZoI9Rou/ferCRwgI2EvN+z2cFsZmB 5uxvncYGYctLbF7zlhniuHXsEp/vgtksAgIS3yYfApspISArsekAVImkxMEVN1gmMIrMQrJ5 FpKps5BMXcDIvIpRNLUguaA4Kb3ISK84Mbe4NC9dLzk/dxMjMFpO/3vWt4Px5gHrQ4zJQCsn MkuJJucDoy2vJN7Q2MzIwtTE1NjI3NKMNGElcd5FD5OChATSE0tSs1NTC1KL4otKc1KLDzEy cXBKNTAWnxQISPyQYMbfmHNQZpZIT8uK/9WLow74lN9JebUo/Nvjxvw9t/7NC1NteHFHY3/Y Mg+9wH0WoXNZw+ZcdxDk3NAh1ud1feK5U/V/WwwYGC+3TZvmzeH5eZviuUmhnzbe47lzrWI1 7/I5mb8zHuRtyMquWva/dkMhr82KqxscTM6VH0wS3u2ixFKckWioxVxUnAgAOk0RdqwCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrBIsWRmVeSWpSXmKPExsVy+t9jQV3TzOdBBou3KFn8nXSM3WLC5e2M Fkf+9zNafLh/kdni+NpwB1aP378mMXrcubaHzePGq4VMHn1bVjF6fN4kF8Aa1cBok5GamJJa pJCal5yfkpmXbqvkHRzvHG9qZmCoa2hpYa6kkJeYm2qr5OIToOuWmQO0XEmhLDGnFCgUkFhc rKRvh2lCaIibrgVMY4Sub0gQXI+RARpIWMOYcWXPasaCx7wV9/oPMTUwnuTuYuTkkBAwkTix 8iw7hC0mceHeerYuRi4OIYHpjBLzDu5ih3BeM0qs/bwIrIpXQEuiYes5pi5GDg4WAVWJF4cC QMJsAjoS278dZwKxRQXCJKaeuMoCUS4o8WPyPRaQchEBa4nm37IgI5kF+hgl+v6tBxspLGAj Me/3fFYQmxlozv7WaWwQtrzE5jVvmScw8s1CMmoWkrJZSMoWMDKvYhRNLUguKE5KzzXSK07M LS7NS9dLzs/dxAiOx2fSOxhXNVgcYhTgYFTi4W1Mfh4kxJpYVlyZe4hRgoNZSYT37JRnQUK8 KYmVValF+fFFpTmpxYcYk4EencgsJZqcD0wVeSXxhsYmZkaWRuaGFkbG5qQJK4nzHmy1DhQS SE8sSc1OTS1ILYLZwsTBKdXAGKTnad++O0rT8va224ttxdtPhe9Kna51bM8Ef/biW68y7v2c Xjjltx236KTfvXU7v22MmbI76IXCdtln1wM3Brb9iLtoqf/m6LPv+yc9y8h7/n2fVvo+XsZz Zo/3lu8rqEy5uP/fxQnr6iOnTTy3fvrsAPHMVP6K0ANz1VyVW5Ysk5h22bMxKUGJpTgj0VCL uag4EQD+J7+XCwMAAA== 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 --- 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..5a82e81 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", NULL)) + host->caps2 |= MMC_CAP2_HS200_1_8V_SDR; + if (of_find_property(np, "mmc-hs200-1_2v", NULL)) + host->caps2 |= MMC_CAP2_HS200_1_2V_SDR; return 0;