From patchwork Mon Oct 7 17:32:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 2998341 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 2E0D9BF924 for ; Mon, 7 Oct 2013 17:37:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DCD25201EA for ; Mon, 7 Oct 2013 17:37:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B74F3201EF for ; Mon, 7 Oct 2013 17:37:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756481Ab3JGRgq (ORCPT ); Mon, 7 Oct 2013 13:36:46 -0400 Received: from ch1ehsobe003.messaging.microsoft.com ([216.32.181.183]:11535 "EHLO ch1outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756475Ab3JGRgo (ORCPT ); Mon, 7 Oct 2013 13:36:44 -0400 Received: from mail222-ch1-R.bigfish.com (10.43.68.231) by CH1EHSOBE020.bigfish.com (10.43.70.77) with Microsoft SMTP Server id 14.1.225.22; Mon, 7 Oct 2013 17:36:43 +0000 Received: from mail222-ch1 (localhost [127.0.0.1]) by mail222-ch1-R.bigfish.com (Postfix) with ESMTP id 53EC91A0068; Mon, 7 Oct 2013 17:36:43 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: -1 X-BigFish: VS-1(zz1102Izz1f42h208ch1ee6h1de0h1fdah2073h1202h1e76h1d1ah1d2ah1fc6hzz1de098h1de097h8275bh8275dhz2dh2a8h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1b2fh1fb3h1d0ch1d2eh1d3fh1dfeh1dffh1e23h1fe8h1ff5h1155h) Received: from mail222-ch1 (localhost.localdomain [127.0.0.1]) by mail222-ch1 (MessageSwitch) id 1381167401807960_12734; Mon, 7 Oct 2013 17:36:41 +0000 (UTC) Received: from CH1EHSMHS043.bigfish.com (snatpool2.int.messaging.microsoft.com [10.43.68.234]) by mail222-ch1.bigfish.com (Postfix) with ESMTP id BFDDC40115; Mon, 7 Oct 2013 17:36:41 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CH1EHSMHS043.bigfish.com (10.43.69.252) with Microsoft SMTP Server (TLS) id 14.16.227.3; Mon, 7 Oct 2013 17:36:38 +0000 Received: from az84smr01.freescale.net (10.64.34.197) by 039-SN1MMR1-004.039d.mgd.msft.net (10.84.1.14) with Microsoft SMTP Server (TLS) id 14.3.158.2; Mon, 7 Oct 2013 17:36:38 +0000 Received: from fabio-OptiPlex-7010.am.freescale.net ([10.29.244.68]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id r97HaY1V006850; Mon, 7 Oct 2013 10:36:36 -0700 From: Fabio Estevam To: CC: , Fabio Estevam , Chris Ball , Subject: [PATCH 2/2] mmc: sdhci-esdhc-imx: Remove custom properties Date: Mon, 7 Oct 2013 14:32:24 -0300 Message-ID: <1381167144-18098-2-git-send-email-fabio.estevam@freescale.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1381167144-18098-1-git-send-email-fabio.estevam@freescale.com> References: <1381167144-18098-1-git-send-email-fabio.estevam@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-FOPE-CONNECTOR: Id%0$Dn%*$RO%0$TLS%0$FQDN%$TlsDn% 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.1 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 According to Documentation/devicetree/bindings/mmc/mmc.txt: "Card detection: If no property below is supplied, host native card detect is used. Only one of the properties in this section should be supplied: - broken-cd: There is no card detection available; polling must be used. - cd-gpios: Specify GPIOs for card detection, see gpio binding - non-removable: non-removable slot (like eMMC); assume always present. " So remove the custom fsl,cd-controller and fsl,wp-controller properties, as the mmc core can take care of it. Tested on mx51babbage, mx53qsb boards and mx6qsabresd boards. Cc: Chris Ball Cc: Signed-off-by: Fabio Estevam --- Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt | 6 ------ drivers/mmc/host/sdhci-esdhc-imx.c | 6 ------ 2 files changed, 12 deletions(-) diff --git a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt index 1dd6225..5da8ab0 100644 --- a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt +++ b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt @@ -9,18 +9,12 @@ by mmc.txt and the properties used by the sdhci-esdhc-imx driver. Required properties: - compatible : Should be "fsl,-esdhc" -Optional properties: -- fsl,cd-controller : Indicate to use controller internal card detection -- fsl,wp-controller : Indicate to use controller internal write protection - Examples: esdhc@70004000 { compatible = "fsl,imx51-esdhc"; reg = <0x70004000 0x4000>; interrupts = <1>; - fsl,cd-controller; - fsl,wp-controller; }; esdhc@70008000 { diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index b9899e9..07662d1 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -796,12 +796,6 @@ sdhci_esdhc_imx_probe_dt(struct platform_device *pdev, if (of_get_property(np, "non-removable", NULL)) boarddata->cd_type = ESDHC_CD_PERMANENT; - if (of_get_property(np, "fsl,cd-controller", NULL)) - boarddata->cd_type = ESDHC_CD_CONTROLLER; - - if (of_get_property(np, "fsl,wp-controller", NULL)) - boarddata->wp_type = ESDHC_WP_CONTROLLER; - boarddata->cd_gpio = of_get_named_gpio(np, "cd-gpios", 0); if (gpio_is_valid(boarddata->cd_gpio)) boarddata->cd_type = ESDHC_CD_GPIO;