From patchwork Tue Jul 29 20:31:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 4642801 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A8A70C0338 for ; Tue, 29 Jul 2014 20:36:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E0F7920145 for ; Tue, 29 Jul 2014 20:36:41 +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 0DA5B2012D for ; Tue, 29 Jul 2014 20:36:41 +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 1XCE5X-0004ze-05; Tue, 29 Jul 2014 20:33:35 +0000 Received: from mail-yk0-f202.google.com ([209.85.160.202]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XCE5U-0004yA-Io for linux-arm-kernel@lists.infradead.org; Tue, 29 Jul 2014 20:33:32 +0000 Received: by mail-yk0-f202.google.com with SMTP id q9so10753ykb.3 for ; Tue, 29 Jul 2014 13:33:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=FxtLffkrWWL34Hg/gSlHyfqhODYCgj3cBp/Rg8Qic8s=; b=GYttYFBcEjVYFcmz7DH/Y506TtseQ0DyAvI1dH+AngxO7YeYKJHcb3WAoo69P4LBkT yRE9VSTqWJ/Ao54t4dLSLIfJuWy+fmKmQIo11FaoFWzeYpAp09AGMZDS3HHjukq128FT 4wbm+/UvI/1UfqY3cE9AWbrkd5LMNf1oQ7OQ+ZqPhA1hCSGyODGAixjJ/SXdRxJy33FP EtRsoB22OIWpX9Nd0ABZVJaQ/s+BsP1L1Y7DNaCccEkjHobM1h5QVr4+z31rtoXm0Gmw cF8dMXfeGBvgWVgITThbs+dBjHefpufUx6BaRXY3Jy4Xtb0EnNpkYZY2EF8EBrfX+0Na slEQ== X-Gm-Message-State: ALoCoQkSIvRB3FmhwyTZR5AQiByr6n3T8WrpiPIpY5y0tzOLFMpyoDzwT6qUV11iJNqOeVqSwM+X X-Received: by 10.52.231.97 with SMTP id tf1mr1551835vdc.3.1406665990758; Tue, 29 Jul 2014 13:33:10 -0700 (PDT) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id o69si1744yhp.6.2014.07.29.13.33.10 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Jul 2014 13:33:10 -0700 (PDT) Received: from tictac.mtv.corp.google.com (tictac.mtv.corp.google.com [172.22.162.15]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id 97B3F5A410D; Tue, 29 Jul 2014 13:33:10 -0700 (PDT) Received: by tictac.mtv.corp.google.com (Postfix, from userid 121310) id 4948D80AD8; Tue, 29 Jul 2014 13:33:10 -0700 (PDT) From: Doug Anderson To: Heiko Stuebner , Seungwon Jeon , Jaehoon Chung , Chris Ball , Ulf Hansson Subject: [PATCH 4/5] ARM: dts: Take the mmc slot node out of rk3288-evb Date: Tue, 29 Jul 2014 13:31:55 -0700 Message-Id: <1406665916-23396-5-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 2.0.0.526.g5318336 In-Reply-To: <1406665916-23396-1-git-send-email-dianders@chromium.org> References: <1406665916-23396-1-git-send-email-dianders@chromium.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140729_133332_690302_74DB73A4 X-CRM114-Status: UNSURE ( 9.72 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.4 (-) Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, Addy Ke , linux@arm.linux.org.uk, pawel.moll@arm.com, ijc+devicetree@hellion.org.uk, linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, Kever Yang , Doug Anderson , robh+dt@kernel.org, galak@codeaurora.org, Sonny Rao , linux-arm-kernel@lists.infradead.org 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,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 In Jaehoon's (mmc: dw_mmc: replace "disable-wp" from slot's quirk to host's quirk) the slot node is no longer used. Remove it. Note that if Jaehoon's patch lands before my (ARM: dts: Enable emmc and sdmmc on the rk3288-evb boards) then this could be squashed into the later. Signed-off-by: Doug Anderson --- arch/arm/boot/dts/rk3288-evb.dtsi | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/dts/rk3288-evb.dtsi b/arch/arm/boot/dts/rk3288-evb.dtsi index ec580fa..b69008f 100644 --- a/arch/arm/boot/dts/rk3288-evb.dtsi +++ b/arch/arm/boot/dts/rk3288-evb.dtsi @@ -41,17 +41,13 @@ broken-cd; bus-width = <8>; cap-mmc-highspeed; + disable-wp; mmc-ddr-1_8v; non-removable; num-slots = <1>; pinctrl-names = "default"; pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_pwr &emmc_bus8>; status = "okay"; - - slot@0 { - reg = <0>; - disable-wp; - }; }; &sdmmc { @@ -59,15 +55,11 @@ cap-mmc-highspeed; cap-sd-highspeed; card-detect-delay = <200>; + disable-wp; /* wp not hooked up */ num-slots = <1>; pinctrl-names = "default"; pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>; status = "okay"; - - slot@0 { - reg = <0>; - disable-wp; /* wp not hooked up */ - }; }; &i2c0 {