From patchwork Thu Jul 31 16:13:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 4657541 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B074F9F36A for ; Thu, 31 Jul 2014 16:16:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DD3E120149 for ; Thu, 31 Jul 2014 16:16:16 +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 0979A20145 for ; Thu, 31 Jul 2014 16:16:16 +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 1XCszp-0000PR-QW; Thu, 31 Jul 2014 16:14:25 +0000 Received: from mail-oi0-f74.google.com ([209.85.218.74]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XCszB-00089S-DZ for linux-arm-kernel@lists.infradead.org; Thu, 31 Jul 2014 16:13:45 +0000 Received: by mail-oi0-f74.google.com with SMTP id a141so833674oig.1 for ; Thu, 31 Jul 2014 09:13:23 -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=fbtAooo6iWA4fHB1gfFgLj9L+XFgogV4/vXp6A8i5t0=; b=RxFd06LFy/vMnjDImZ16fef9O2W788+bUKJGYCRM3I5c5RpHZmIlghnuSuWqmp9qfd VQb99Ea6I+IuWOc5ua681drx3gfxsF/FjXBxqPO23PmvBUdlTryqPZUdxHAH2rxEqCrv 1u8hVA9U22GVpuy6195mol9xWZewU41HKL+RrECsWlsZ2NxJFsypaltN+GkY/awKTus7 dwUdm4OrNE+jgCepqRqfGRXkAKwdQmbg0AzRgbvwqUjG97ZSp2+n/lwb1+1GtS+oA+uA s1x7Bcd8h/GhStfZxKlr0QLZFtTP8TpKhE48jqOzC+LyLWTyW/jVwBuSEzvxGuJfx0oV XIyQ== X-Gm-Message-State: ALoCoQnYz52h2CImVW89HJE8p1tgHh99OUyke2eXdKL8PnRvLjCrYeOQ7N9XGhExP0oSVzem8OZK X-Received: by 10.50.25.41 with SMTP id z9mr13360855igf.2.1406823202937; Thu, 31 Jul 2014 09:13:22 -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 y50si367327yhk.4.2014.07.31.09.13.22 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 31 Jul 2014 09:13:22 -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 B3F5D5A44C3; Thu, 31 Jul 2014 09:13:22 -0700 (PDT) Received: by tictac.mtv.corp.google.com (Postfix, from userid 121310) id 613E580A95; Thu, 31 Jul 2014 09:13:22 -0700 (PDT) From: Doug Anderson To: Heiko Stuebner , Seungwon Jeon , Jaehoon Chung , Chris Ball , Ulf Hansson Subject: [PATCH v2 3/4] ARM: dts: Take the mmc slot node out of rk3288-evb Date: Thu, 31 Jul 2014 09:13:19 -0700 Message-Id: <1406823200-20911-4-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 2.0.0.526.g5318336 In-Reply-To: <1406823200-20911-1-git-send-email-dianders@chromium.org> References: <1406823200-20911-1-git-send-email-dianders@chromium.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140731_091345_525042_80593FBC X-CRM114-Status: GOOD ( 10.31 ) 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, Arnd Bergmann , 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: Slot quirk "disable-wp" is deprecated) 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 Acked-by: Arnd Bergmann --- Changes in v2: - Refer to the new title of Jaehoon's patch 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 {