From patchwork Wed Jun 17 18:05:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dong Aisheng X-Patchwork-Id: 6627541 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 79CCAC0020 for ; Wed, 17 Jun 2015 18:11:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9B0AC20858 for ; Wed, 17 Jun 2015 18:11:36 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 680E12085A for ; Wed, 17 Jun 2015 18:11:35 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Z5Hm0-0007LX-N8; Wed, 17 Jun 2015 18:09:16 +0000 Received: from mail-bl2on0124.outbound.protection.outlook.com ([65.55.169.124] helo=na01-bl2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Z5HlP-0006tv-67 for linux-arm-kernel@lists.infradead.org; Wed, 17 Jun 2015 18:08:40 +0000 Received: from DM2PR03CA0007.namprd03.prod.outlook.com (10.141.96.17) by BL2PR03MB241.namprd03.prod.outlook.com (10.255.231.15) with Microsoft SMTP Server (TLS) id 15.1.195.6; Wed, 17 Jun 2015 18:08:16 +0000 Received: from BN1AFFO11FD049.protection.gbl (2a01:111:f400:7c10::178) by DM2PR03CA0007.outlook.office365.com (2a01:111:e400:2428::17) with Microsoft SMTP Server (TLS) id 15.1.195.15 via Frontend Transport; Wed, 17 Jun 2015 18:08:16 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; lists.infradead.org; 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 BN1AFFO11FD049.mail.protection.outlook.com (10.58.53.64) with Microsoft SMTP Server (TLS) id 15.1.190.9 via Frontend Transport; Wed, 17 Jun 2015 18:08:15 +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 t5HI7jAe003611; Wed, 17 Jun 2015 11:08:09 -0700 From: Dong Aisheng To: Subject: [PATCH 4/6] mmc: sdhci-esdhc-imx: remove duplicated dts parsing Date: Thu, 18 Jun 2015 02:05:35 +0800 Message-ID: <1434564337-24720-5-git-send-email-aisheng.dong@freescale.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1434564337-24720-1-git-send-email-aisheng.dong@freescale.com> References: <1434564337-24720-1-git-send-email-aisheng.dong@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD049; 1:fT8ap0EreBBrmrP0jNljecQ9u7ljD+O4Xlf2uGYpoETjwa8zNhn7RVz36jmFTOclXCCDsC7dj+zzeOTeovUAuvCQ2ngeiC+CQgUMB5U9URLrJPn9n5ebfUnAze2lTcVsKknwuHmLlZLXJ9FBF/0NRFi8lQNA23n73JxiRDsjSHqhw96k5dA4stBLnnAbgXm0zjTnEALXIbnUix+Z4t8rAiINOa8Jigaf4mIOO4IthIVRrDtzkMw7hQWAFzJ3aHuKIBoI0yC7rIvw+SrtgZgaKa2s0GwhMxZy5N3PzNmjpGtsnmhJYsWZ/CKkP7sLlIEUu3N5aDM0h/2tLd4I8SZ0aKC4UPxy1rV5TqOZvZaioTA= X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(339900001)(199003)(189002)(86362001)(575784001)(19580405001)(19580395003)(81156007)(48376002)(50466002)(5001960100002)(110136002)(189998001)(62966003)(77156002)(230783001)(229853001)(36756003)(104016003)(2351001)(33646002)(50986999)(76176999)(106466001)(46102003)(77096005)(105606002)(50226001)(92566002)(6806004)(2950100001)(85426001)(47776003)(87936001); DIR:OUT; SFP:1102; SCL:1; SRVR:BL2PR03MB241; H:az84smr01.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; A:1; MX:1; PTR:InfoDomainNonexistent; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB241; 2:0W8t+sbqcOinCGPOK8CMrSCHocOIJ3eW96VeMl7UT/CyV/9eqhy/6M3gaLAe4AHS; 3:vXkOGpuG7I4ecz7p7s0nAzNeAqG114Rhfy8SKqlFPBrBeMcCFyEp3p3ipfI0xxTRlI92ghy/f4lSnweClzhcSSTy7Q088SWhx9E9OHzCO+AN/PHKAAxoKF09uh1UEAB/f4ojB/mMTETzOUX/VgEVaLekBMrMomLP0vOVOs+7h3NrRn25dDI4FX3al4lyOdHy1Nk2Np5HUrSf820OGtaO28vfhqwrjhuorcYbTW9nH90=; 20:JL2bpoDf7opgaL3Zavs4pzldAnAHpv+GaWZ6RjK15qZnWsOBjiMOVRskkxczxGzlHvEqsc672Res2M1w0smwn2jFqXYfSnqlGO1+09S2BiH7x45zkzP36rV0t8l7OFUI32Y4VWncyIDoJ4jZbsLuUBCTCaqa2+U77PJcgHPMBH2Y42AoWkFjFXnvPgOc8v60EJMZGI0mRU8lWF2LvnEt77Lmvk07qjwFtkuZRTFaX99M31GSqSs1oWR/HwJtZtfoXife9vTcOlseQ6Q2jomwbAq+9MJrM/lgv4rWjOtEjQIbF/WbUckAVma9nEePOHLZZiHzl4KnTJTF914mSt8eq7JI/sIbkXfGtfZrDJEEL7k=; 4:+p3N0Vu0uzQX3lkBATch0l/oC8/3q2feXD4VSD6lZh9k9VDDMMDGH+8E5QofQGw7w5/JbciaR4HE+nI9QJArSpbWPWRaaGYOxjDlla7CeeSmR7ScJbvLqXRocsKKiSt7n30DShQMI5u+1Rj1a2YysyBHEcBp+MSjIQhBqPmc29NXXWs6ezE+Avz0YgXBpZQxzSmM/MjAuomHBNpMWp8wQWVc3KvU7EDeATWa6UM2KTy77znzUzwVm7sWV3CwTUCptSv7JEmTxF/aH28qQMNtloCqG+1LRcaM2lNviSWjXUk= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BL2PR03MB241; 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:BL2PR03MB241; BCL:0; PCL:0; RULEID:; SRVR:BL2PR03MB241; X-Forefront-PRVS: 0610D16BBE X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB241; 23:Gw1zDbWJ6CAbLRMmbopZf+sVRp42TLL6ZNKERje0sqlqJjwMD6/3V8VLWzTam6+GKuEAdvqofNF3x/WKfrSA156wBd9D42Hc/B0FBQlQIe6WEx8BMOxs98b+6Fwc4WizgPo4H/SSM0Nn+SkgtkIw3W9a/XT7N7tlsVg650x5X1ELLK4r0Ck613xBWNIJDg8pjo+no2OXz6Hk3LThYq6tMUe7QzWhOUUyad+WR9gqFkWoFGhNsqpoSR0o1Yz4YvlL8+EZCN2xgUzAqOHhbR/MY7TmhEWemeZ5AjP8K3Gat5KZMFCuflPZl6LHYRNlbjnI2WVjurloy+Ly3+4XEKSxQr3esA5ZhPgh/4fXmXAqs3ueo0KgynuDnh6qh+b3gyy1oAHb9yYGZ09uxisUZ/2ITVDGGIE+CdpUDImylDHM8crtSoKp6Db1sbNoql4zUVElGzOd+wCUWanGPqswrAX4brR9ZXH33dFuO+qXSZG2Tg+sZLIilCbuQ7L2pu+j8LKurPeEyNG6K4QJ0lBV7+8ZYCGHrmx8q2zQhCodch+BJUvHgN46OJa895/tFuSeJNBeMcWxY+spS0JQstvEX91phYdEiPhXdR6w89W2OdX3WSbIHpXF0rcldcQ7XDai59ebrsi6UjqeiwbOAkyeEY2P0/I6shYmz42opoDtrndJ9Bznq8Wl7KRuIDbbCDD+tUKaW2IUN5quuUcvDtkkLtQ2dcDBmxGYYB1vd7PpybdXLMsCI4RP20ex8g+PvciahIVj5pzPBIAQY7cFMX9X0YNdpAvY3G+4dptvKQWmfGgsEju4SMsRbb11QVvKzMqGE/dP8+/iSTu/D35+muSVk8Y5y4dvHV4ObxqXdAAvAeB/8xJATTWmt5SS8sL/GObRNf5fQssY7Tmi3B9wSuQ+OopEszsFdOiwnHWxBznkisClfFPQQ2Myx/u53l+mKyBU2zPw X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB241; 5:9ccN7F/Vcg0eZxhe+zDRrGLm8FgfivGMwUNs9ppdQnvYTERjjFc/iR9a8SEiYdaDgxtXq9FR9V6JjWG9LbjtEu0Me9BeInfdM2Ato/y5MiD7OCylY42udz1cnQJZWLtbTpQSHef/M2QMea5hIyB3JQ==; 24:AuUU0g1AArsKOkNpqBLph0LV0eyawFuHBkAiskLnt72ZAVnKhNe2oxw0Ao9/ir227MFjHxSP6JUf9FIhP+ezB8CaHvomCOLeapEf77BOKOc=; 20:6XFMn2Jrv/TuGM4qzRuXqAysrt0IdFgMaizaaMqu/RyP9clEXCsLl4p5d0uL/Jse8GdoaZJkoj17qMssa8PHaA== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jun 2015 18:08:15.6939 (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: BL2PR03MB241 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150617_110839_585088_09FDE443 X-CRM114-Status: UNSURE ( 6.32 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) Cc: fabio.estevam@freescale.com, marex@denx.de, ulf.hansson@linaro.org, s.trumtrar@pengutronix.de, smoch@web.de, linux-arm-kernel@lists.infradead.org, robertcnelson@gmail.com, s.hauer@pengutronix.de, chris@printf.net, rabeeh@solid-run.com, troy.kisky@boundarydevices.com, lisovy@gmail.com, hs@denx.de, gwenhael.goavec-merou@armadeus.com, p.zabel@pengutronix.de, rmk+kernel@arm.linux.org.uk, shawn.guo@linaro.org, b29396@freescale.com, tharvey@gateworks.com, LW@KARO-electronics.de, ipaton0@gmail.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 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 Signed-off-by: Sascha Hauer Signed-off-by: Shawn Guo --- 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