From patchwork Wed Jul 22 12:53:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dong Aisheng X-Patchwork-Id: 6844181 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8970B9F457 for ; Wed, 22 Jul 2015 14:03:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A760A2058C for ; Wed, 22 Jul 2015 14:03:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9DF31206C7 for ; Wed, 22 Jul 2015 14:03:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965184AbbGVODt (ORCPT ); Wed, 22 Jul 2015 10:03:49 -0400 Received: from mail-bl2on0141.outbound.protection.outlook.com ([65.55.169.141]:53906 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965133AbbGVODr (ORCPT ); Wed, 22 Jul 2015 10:03:47 -0400 Received: from BLUPR0301CA0039.namprd03.prod.outlook.com (10.162.113.177) by CY1PR03MB1423.namprd03.prod.outlook.com (10.163.17.145) with Microsoft SMTP Server (TLS) id 15.1.213.14; Wed, 22 Jul 2015 14:03:44 +0000 Received: from BL2FFO11FD035.protection.gbl (2a01:111:f400:7c09::199) by BLUPR0301CA0039.outlook.office365.com (2a01:111:e400:5259::49) with Microsoft SMTP Server (TLS) id 15.1.225.19 via Frontend Transport; Wed, 22 Jul 2015 14:03:44 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; gmail.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BL2FFO11FD035.mail.protection.outlook.com (10.173.161.131) with Microsoft SMTP Server (TLS) id 15.1.213.8 via Frontend Transport; Wed, 22 Jul 2015 14:03:43 +0000 Received: from shlinux2.ap.freescale.net (shlinux2.ap.freescale.net [10.192.224.44]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id t6ME2iY7019637; Wed, 22 Jul 2015 07:03:38 -0700 From: Dong Aisheng To: CC: , , , , , , , , , , , , , , , , , , , , Subject: [PATCH V2 09/11] mmc: sdhci-esdhc-imx: remove duplicated dts parsing Date: Wed, 22 Jul 2015 20:53:08 +0800 Message-ID: <1437569590-5228-10-git-send-email-aisheng.dong@freescale.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1437569590-5228-1-git-send-email-aisheng.dong@freescale.com> References: <1437569590-5228-1-git-send-email-aisheng.dong@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD035; 1:ZcQcUznUxVDwfWOSY8a3Hjq9TIgm7FkAK/ztbIMqlTqh0bYeVxTM14VHRJC39zLYRP1uQotCd///5C8Ya8zlk4N/jCa0+rmnH2Pot+Sh9yJVK0EyWbYTzu7YWZOyJHXFUi3HZIo3T81SWi4mj1iR9uVDq/BuhrtxMErAuSpUfZHUOmrnVqFw+s3nRHJcInihAvUJy6HAni2jKFsTdhS53pzvQDjkWY+MagnS7B9sLWYUdKSxAzTdLnTbu2s9Gw2n0sS++aJ+AoeABuEPgN8iyRC5pg3tNxWc+BOg1Kop1+FMQUvEvHdCmrdsxTwQ1v8o59cVXe+ImuBTKXc1SWiU1ksJIIY+RhSMNLgdXv5i5BmIzyh0ysWnJe0phNlJmVRIcMla2NM56P9stJ/QXwYl59tGxl9UOyJAmeS/AYaLUPJfcSfcOgeCanJMSU3/WyYI X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(339900001)(189002)(199003)(77096005)(33646002)(2351001)(46102003)(230783001)(77156002)(2950100001)(189998001)(62966003)(5003940100001)(5001960100002)(36756003)(50466002)(76176999)(104016003)(110136002)(50226001)(92566002)(47776003)(229853001)(85426001)(6806004)(19580405001)(86362001)(19580395003)(50986999)(575784001)(87936001)(105606002)(48376002)(106466001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR03MB1423; H:az84smr01.freescale.net; FPR:; SPF:Fail; MLV:sfv; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB1423; 2:cxxpi2igQgim15JjjLBtofF5S9z3/MYEp9D6twdeVsR7r0FIHHfLNHZ3qZmo2S3t; 3:tZQJfkeUM+g68XK4pMgo9DF40+UD1Es/wlNPURTIA2MgcZRPOlH+pojygnN8yLE40WpTArsUxtoy6GfZEg9qnySQsx/daKzTO8rQuKWt1WQKIbkZoRSYGf2KrNqTr74bmOwBOMhTj5G0QOZ998mjTWT3A4uDew2tKTQ7rqgU/x7scyLr4Pqs5RpW0VXJSpAiqZzCBKmLVygbrHHZS35RRIIPMBGicf8DODsKKqJ7IYY=; 25:LZjW9h6SZy08VpeVC3SJEjum81ZmDiMfKZuKskdGrVVqPcxxDOI2bwqZTC2vlA7eugWCl8YPRXC7yJIxgz5Er7iBzsm6EQif/D8l+bpSuYYMAoOFwWH1p5xpfCkUjRIzOiuczMKW2bqRgYuBjgyLgpOufSmZq7zlcxtAxmjluEeznSFT536ENxkVaOnFS6oMknna1AHxmn8lNztP4Wvp3WdKvWoDtYSDdjDO6g/pG4x89AIT+VWHyvQ2CqwWVvec; 20:5ZLCq48y2lAHEbSSUzJPt0cgL0UApD/XVq8GhreNenO2h/gaFEfOON6nntLvK2j21TC2xxbanaLBgXfVX4q4vIBaghE/0qUrzyA7JMG5lON3qzQxFS7wQcFjHFXLsUwxwPPc7OuLNK6GpR+0cH9GrU2OWngtcnFg6wuNDxupOgbL+tfTw3foWPsInZpOXk1sXufnq1k8TmacS/yDGRxUwuUyeUTUrESDJlwr101coZ/CDFOwmADamKcs5FwWgPPZTMXu82SlRDTO+VUyqG+aZCas+0n8n3ZYboLfdvI+0sHP1x3Qw0w6smMFGkb8or3zzmzr6NMVwdR+p3UdVtlrv6GJUMVUjCQzPmgaZ65hr4U= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR03MB1423; CY1PR03MB1423: X-MS-Exchange-Organization-RulesExecuted X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:CY1PR03MB1423; BCL:0; PCL:0; RULEID:; SRVR:CY1PR03MB1423; X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB1423; 4:QUfMes878CLR0j/HN2skf992/QgUHwVcDH+KeizNGnGgh+3rwxy7hdzRPAwFHKmF6ISgbWP3EJPvxsab9DOz+8kEndlEpN3jqGGjXwdOJfYFPuoll+ovXF2eL7wvRWnBfAm16ROs6kxsyZj8vzUYFaaYHJkBRS7Nkh99tQk0cUBo/DckYgqDJ0H0dhjefKu/duXMcAVGcA8ES6ir6pNg7w+ESntc/R4kYNg7H/8FC+nBRsaZeIFGFSdpawgFnw1iZxh4m/brHlp1mZMmAljcmamxl7tlFPa+RVifi6KPrk0= X-Forefront-PRVS: 0645BEB7AA X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB1423; 23:gLxzv7Vb9S14ZOOR4JLTv7SbeQG4X3uSXODOuddTnrogLyi0VQzPQbn+M4x/7Y+An5iRYIKxMa8vA92Q7btsJo/ACxv3m/yXEF7KTujO0oonQKRRChiJpqwsxgKqqNz9NnUm3rYpy6J1c0KtKo6cLeJfMjaKR0/1AOnVaAXH3TC/KCCxvPwn8FzTJmaJGp/HxUOLZ6lGJCxxM4dTP+caJtQxatVQCNpLQWrZbHZ8lbaXlXkhAvOW1F3MIrqBRuabEwVrnoU0ozPIiwRyzmZHdXzFZ0tN4BNlXosHS/93Pho8aKEERbjQ+4pR6+xSElv9+YsszFojJczth9MhBnfPoR9n9EAgzT6h3uRPY6v7Q3DSWu9N/wLxSuFIKNATp1ZSA19/SnK1U/BgMfrmNJQkkjx67IbPhEhqE/R822fjkHD2cWIzRPFB2iPX+rXrNwtyAd9msPSMJq4oTtLk7m0uHTai79nNeNXIoTzzcR+x/rS8J559tlRDop0S2C2SKUqTmUFVJj46OCTbLQof4qSRQRZu2QxjvSJu9xh8aqhTvz9NYiaYesIQbY8HfnWgnjcfmUmceHxI17gpHHGdhaaki/KLSpN4UFHH7ijTeEo+eLwPAu3uqojluo0+oabYY+i3yUGyDXt3I+6KDwl2dqb00tW072aVwaaPIyydjAJz4e0vWEDOXxNfJuDV6QrbNFokr2uEmPi0aaxWaQi0UQLea1utIeyTFmL+KY+AoNQfS2TUPEsbAFKsrSZ73VnBbeRyBSnxLjLnuU/A6vL/cmYig8ZszZsOHq5lD77BzZh8xL9r3gTmsWSoFMIqAi3XhMIBhmapes0UqkKlus9xe9TPL54QgqFs2NQaCj6DcMd+53eXit0zfZAYMkqo7mEZe8yF0nEvEpDIQumwkYzIXc8E8UC3QbWzRVoFJ/EWdMBZZ LVQFBWZVdMdgPtRKlfkRff2 X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB1423; 5:H7+9ZZMu9y3P/7wEZiJSnXTvErnJuJek7uqM0tuWQyXZs6EdEb4U06O5VdArWuWA3WjPM6KS4mRLBdFDN9O9LSHJWP61WVKScJZIsdsTjlpKIJtWs3dG90Kep2qsablkHRMxbsEnSI9bvGn3jqW+sw==; 24:XHDNOTkNN90WPMN7lowaoe2syDaNuVnhxEMK+SRm69j77L7kyMbhbcR8OeYZK9eCcfQVknvOj1be5KHqJ7OLevnjxY2vdmQyN+cARlTLtS8=; 20:WpMQEPhXAfK8JaQpPudxlRw76k7qODKgceAV2VJUvsdivjKwJi0uVtf5jTWnqpsWgGn6JLPU3R7iA/2kboyYwA== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jul 2015 14:03:43.6926 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR03MB1423 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-8.1 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 After commit 8d86e4fcccf6 ("mmc: sdhci-esdhc-imx: Call mmc_of_parse()"), we do not need those duplicated parsing anymore. Note: fsl,cd-controller is also deleted due to the driver does not support controller card detection anymore after switch to runtime pm. And there's no user of it right now in device tree. wp-gpios is kept because we're still support fsl,wp-controller, so we need a way to check if it's gpio wp or controller wp. Signed-off-by: Dong Aisheng --- drivers/mmc/host/sdhci-esdhc-imx.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index 10f03ee..1b0e618 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -884,27 +884,13 @@ sdhci_esdhc_imx_probe_dt(struct platform_device *pdev, struct esdhc_platform_data *boarddata = &imx_data->boarddata; int ret; - 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; - boarddata->wp_gpio = of_get_named_gpio(np, "wp-gpios", 0); if (gpio_is_valid(boarddata->wp_gpio)) boarddata->wp_type = ESDHC_WP_GPIO; - of_property_read_u32(np, "bus-width", &boarddata->max_bus_width); - - of_property_read_u32(np, "max-frequency", &boarddata->f_max); - if (of_find_property(np, "no-1-8-v", NULL)) boarddata->support_vsel = false; else