From patchwork Thu Oct 5 10:49:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 9986841 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E0E9460247 for ; Thu, 5 Oct 2017 11:02:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E689B22AFC for ; Thu, 5 Oct 2017 11:02:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D810628C68; Thu, 5 Oct 2017 11:02:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6D63C22AFC for ; Thu, 5 Oct 2017 11:01:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=d2eYU+1SXph3fr/qeRyNHiFQDMwsvTuBbloPUxQWzYs=; b=O0N5YnV9SMlunIOxclaHHjI6wA jBDMKr3xeDJV710IUmDIJmAC6ET5W8Ftz17PiEMQE6Ig7uZUhRJU1J0Xd4SIgMoi1w3oJ+a9m9ypV IM42s3cnTRk0A+hm0aFIZHYFpYbItNyWPmiUQZXVW41T0N95X9Z2bH9KsQdalIA2KanJZw/9RUZQQ L9C9JUM/Rf3WQJ2XNGLMDc6PisC2nS1eBxc/20rBRxAK7B77GjVu8wTBvq4PnqFlOEljf60z/r+Pw gixUfzSC9OTdEjNN+6Ccah++QSUuJqFiuV6VP5n2+db88GlPlxEvKdO5YnU5Ih7pB/cyRCt/NsaHo q+WpHueQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1e03ua-0008RI-Kr; Thu, 05 Oct 2017 11:01:52 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e03u1-0005he-HY for linux-arm-kernel@bombadil.infradead.org; Thu, 05 Oct 2017 11:01:17 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=vLoCVr9M89DiHELD8gcS94JAl9Hk9hoyerDibfdrlbU=; b=cACU4s7kuIKFe3Szm6QV8+uGF GdmioHvLE7yOlCiLNf+FefSYh03+tEs2dFAlBtG3ER4hy9aOT+RgA9S82Oh/qrab4V9CxEVWPzY6i JXZ2mKKtAfvdVbvUyKPPYNsU+UFodBSGs1b/OWqILdmXMAVtwvvvz81q7z7bSzWmETBZ0zvIKMoXT I+Q2NizoledJRu53vBzcdtLTXDh89ejGf9MwT4D/E7imQnN8Lhrg9S9BPddUHeCQ0RDdyK/DRSeSc NqGx2gQl9ePIuNgFPudJT3B/apxGEcn2XgMORqBL1c/YM+D/jYWoxxjzQs03Q79HfSLP62do83GFv 6tdvCIM+Q==; Received: from mail.free-electrons.com ([62.4.15.54]) by casper.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1e03kN-0002KU-4M for linux-arm-kernel@lists.infradead.org; Thu, 05 Oct 2017 10:51:20 +0000 Received: by mail.free-electrons.com (Postfix, from userid 110) id 2969F20994; Thu, 5 Oct 2017 12:50:35 +0200 (CEST) Received: from localhost (unknown [185.94.189.189]) by mail.free-electrons.com (Postfix) with ESMTPSA id 1827E207C3; Thu, 5 Oct 2017 12:50:33 +0200 (CEST) From: Maxime Ripard To: Chen-Yu Tsai , Maxime Ripard , Mark Rutland , Rob Herring Subject: [PATCH 17/20] ARM: dts: sun9i: optimus: Remove card detect pull-up Date: Thu, 5 Oct 2017 12:49:52 +0200 Message-Id: <62c6ed04912e6b3ea3f7e37a09d0e102033b00e6.1507198895.git-series.maxime.ripard@free-electrons.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: References: In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171005_115119_252282_6C9347C9 X-CRM114-Status: GOOD ( 11.86 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The board has an external pull-up on the card-detect signal, so there's no need to add another one. This also removes a DTC warning. Signed-off-by: Maxime Ripard Acked-by: Chen-Yu Tsai --- arch/arm/boot/dts/sun9i-a80-optimus.dts | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/sun9i-a80-optimus.dts b/arch/arm/boot/dts/sun9i-a80-optimus.dts index 199777e1c5ea..ba62e814f4b8 100644 --- a/arch/arm/boot/dts/sun9i-a80-optimus.dts +++ b/arch/arm/boot/dts/sun9i-a80-optimus.dts @@ -122,7 +122,7 @@ &mmc0 { pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins>, <&mmc0_cd_pin_optimus>; + pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_dcdc1>; bus-width = <4>; cd-gpios = <&pio 7 18 GPIO_ACTIVE_HIGH>; /* PH8 */ @@ -173,14 +173,6 @@ clocks = <&ac100_rtc 0>; }; -&pio { - mmc0_cd_pin_optimus: mmc0_cd_pin@0 { - pins = "PH18"; - function = "gpio_in"; - bias-pull-up; - }; -}; - &r_ir { status = "okay"; };