From patchwork Fri Sep 13 10:09:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sekhar Nori X-Patchwork-Id: 2882881 Return-Path: X-Original-To: patchwork-linux-omap@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 37DBBBFF0B for ; Fri, 13 Sep 2013 10:10:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 95E742039C for ; Fri, 13 Sep 2013 10:10:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 23103203E9 for ; Fri, 13 Sep 2013 10:10:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755584Ab3IMKKX (ORCPT ); Fri, 13 Sep 2013 06:10:23 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:43714 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755475Ab3IMKKS (ORCPT ); Fri, 13 Sep 2013 06:10:18 -0400 Received: from dbdlxv05.itg.ti.com ([172.24.171.60]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id r8DAACqA006112; Fri, 13 Sep 2013 05:10:13 -0500 Received: from DBDE72.ent.ti.com (dbde72.ent.ti.com [172.24.171.97]) by dbdlxv05.itg.ti.com (8.14.3/8.13.8) with ESMTP id r8DAA35v010129; Fri, 13 Sep 2013 05:10:11 -0500 Received: from dbdp33.itg.ti.com (172.24.170.252) by DBDE72.ent.ti.com (172.24.171.97) with Microsoft SMTP Server id 14.2.342.3; Fri, 13 Sep 2013 18:10:07 +0800 Received: from psplinux063.india.ti.com (smtpvbd.itg.ti.com [172.24.170.250]) by dbdp33.itg.ti.com (8.13.8/8.13.8) with ESMTP id r8DA9vgW024620; Fri, 13 Sep 2013 15:40:07 +0530 From: Sekhar Nori To: Chris Ball , Benoit Cousson CC: Grant Likely , Rob Herring , Device Tree Mailing List , Linux OMAP Mailing List , Koen Kooi , Linux MMC Mailing List , Sekhar Nori Subject: [PATCH 1/3] mmc: omap_hsmmc: remove TI specific DT binding for non removable cards Date: Fri, 13 Sep 2013 15:39:44 +0530 Message-ID: X-Mailer: git-send-email 1.7.10.1 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-7.8 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 Remove the vendor specific "ti,non-removable" DT binding and support the generic binding "non-removable" instead. Signed-off-by: Sekhar Nori --- Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt | 5 ++--- drivers/mmc/host/omap_hsmmc.c | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt index 8c8908a..0d463b8 100644 --- a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt +++ b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt @@ -17,7 +17,6 @@ Optional properties: ti,dual-volt: boolean, supports dual voltage cards -supply: phandle to the regulator device tree node "supply-name" examples are "vmmc", "vmmc_aux" etc -ti,non-removable: non-removable slot (like eMMC) ti,needs-special-reset: Requires a special softreset sequence ti,needs-special-hs-handling: HSMMC IP needs special setting for handling High Speed dmas: List of DMA specifiers with the controller specific format @@ -38,7 +37,7 @@ Examples: ti,dual-volt; bus-width = <4>; vmmc-supply = <&vmmc>; /* phandle to regulator node */ - ti,non-removable; + non-removable; }; [generic DMA request binding] @@ -50,7 +49,7 @@ Examples: ti,dual-volt; bus-width = <4>; vmmc-supply = <&vmmc>; /* phandle to regulator node */ - ti,non-removable; + non-removable; dmas = <&edma 24 &edma 25>; dma-names = "tx", "rx"; diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index 6ac63df..0cb06ff 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -1738,7 +1738,7 @@ static struct omap_mmc_platform_data *of_get_hsmmc_pdata(struct device *dev) pdata->slots[0].switch_pin = cd_gpio; pdata->slots[0].gpio_wp = wp_gpio; - if (of_find_property(np, "ti,non-removable", NULL)) { + if (of_find_property(np, "non-removable", NULL)) { pdata->slots[0].nonremovable = true; pdata->slots[0].no_regulator_off_init = true; }