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: Douglas Anderson X-Patchwork-Id: 4642321 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 5677AC0338 for ; Tue, 29 Jul 2014 20:33:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 821D120142 for ; Tue, 29 Jul 2014 20:33:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 795FF2012D for ; Tue, 29 Jul 2014 20:33:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754153AbaG2Udr (ORCPT ); Tue, 29 Jul 2014 16:33:47 -0400 Received: from mail-yk0-f201.google.com ([209.85.160.201]:58554 "EHLO mail-yk0-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754188AbaG2UdL (ORCPT ); Tue, 29 Jul 2014 16:33:11 -0400 Received: by mail-yk0-f201.google.com with SMTP id 142so10953ykq.0 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=hbg2mhKGfMw5UcsaXCIqY/yYLxQon27yoHcd2/BX3a91lm0mK9HcNOjwtUNpnHMQyJ /d7jD/kTcXtkshxspdIXTZCvTEamIza7cEwQ567SSQnpzEK3qoInMuMF7RO4UH62ctF+ amR0DbvSJ4Vggi6oXx1/CMmLVYaYW398Am8QGCh5KNghDoPeJ4Yb9n3c/0ZiJQQj0x4a Ho8Kz5eLPZuxoO+o1omuSGrT8ABWPu57lcBMATolgfc3qrZ2TiqlH2SILcGOHr8m4s5m 2NeFSPsVfHtpWYyq83U3EHu861BPYPUwvIbfugzP3G45y7tRaiuSb2jDO35UIlv1IZTo QAfA== X-Gm-Message-State: ALoCoQm1ln8cyT7bV1OBjPQQBpR3Bau/vI0pvWtvarXvzDOsl/NeivRsAHyV/WMN0MNcrSytMSGx 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 Cc: Addy Ke , Kever Yang , Sonny Rao , linux-arm-kernel@lists.infradead.org, linux-mmc@vger.kernel.org, Doug Anderson , robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com, ijc+devicetree@hellion.org.uk, galak@codeaurora.org, linux@arm.linux.org.uk, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org 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> 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.6 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 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 {