From patchwork Thu Apr 10 12:20:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 28173 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ig0-f199.google.com (mail-ig0-f199.google.com [209.85.213.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id DE65D20671 for ; Thu, 10 Apr 2014 12:21:29 +0000 (UTC) Received: by mail-ig0-f199.google.com with SMTP id c1sf10315323igq.6 for ; Thu, 10 Apr 2014 05:21:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=i22QepfPlkUegHZheonmZNWFAtPjBHLn1pstzHbwj5U=; b=LbJ4cGUp2PrB3YxCjudp5CrnFIFt8Nj/ik6kNQp/ktt9YiI0cYwwnUOluNWQmlNG2u 1tCOOImizZaMunc3cnf00Zf75mTmMT3caTs+c9OeqOCdrGgUHRGHV2RIaAOQYylza88i 1+KzTScdGvoDqm4CXBi3lT6eo+bRIDt8Lwzc0zqlK0gr4K1EmmM0Nwk6iGjXo5aOvySK iMEuJOwixJ3VhARePvrnOqih/15JlwpKHKlAcrrubyrCh8juJoEda2Npr450Jvc2F90e 34vwEjEFMuTqn6W29Qqr6b0QSOBZeZnlYSt54e+OAROSr8Qq5oN78G04BaezPCSFXEKN Ezsg== X-Gm-Message-State: ALoCoQksyqE3yhkMnPwNgmaXxTDOx70xXHbaIaDxX1Xp/6qqId54z0Y2oAF8kxuTRJFzQcrGvFFG X-Received: by 10.50.2.65 with SMTP id 1mr1617933igs.1.1397132489393; Thu, 10 Apr 2014 05:21:29 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.103.77 with SMTP id x71ls1122480qge.31.gmail; Thu, 10 Apr 2014 05:21:29 -0700 (PDT) X-Received: by 10.52.161.168 with SMTP id xt8mr11963318vdb.23.1397132489301; Thu, 10 Apr 2014 05:21:29 -0700 (PDT) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id eb17si657757veb.130.2014.04.10.05.21.29 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 10 Apr 2014 05:21:29 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.170; Received: by mail-vc0-f170.google.com with SMTP id hu19so3443751vcb.1 for ; Thu, 10 Apr 2014 05:21:29 -0700 (PDT) X-Received: by 10.58.23.6 with SMTP id i6mr13955268vef.12.1397132489231; Thu, 10 Apr 2014 05:21:29 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp54573vcb; Thu, 10 Apr 2014 05:21:28 -0700 (PDT) X-Received: by 10.194.133.1 with SMTP id oy1mr59131wjb.87.1397132488184; Thu, 10 Apr 2014 05:21:28 -0700 (PDT) Received: from mail-we0-f175.google.com (mail-we0-f175.google.com [74.125.82.175]) by mx.google.com with ESMTPS id pg6si1110691wjb.40.2014.04.10.05.21.27 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 10 Apr 2014 05:21:28 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.175 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=74.125.82.175; Received: by mail-we0-f175.google.com with SMTP id q58so3833871wes.20 for ; Thu, 10 Apr 2014 05:21:27 -0700 (PDT) X-Received: by 10.180.81.138 with SMTP id a10mr4015492wiy.53.1397132487791; Thu, 10 Apr 2014 05:21:27 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id ej7sm16437292wib.9.2014.04.10.05.21.26 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 10 Apr 2014 05:21:27 -0700 (PDT) From: Ulf Hansson To: linux-arm-kernel@lists.infradead.org, Russell King , Linus Walleij Cc: devicetree@vger.kernel.org, Rob Herring , Ulf Hansson , Alessandro Rubini Subject: [PATCH V3 09/19] ARM: nomadik: Convert to the common mmc DT bindings for highspeed mode Date: Thu, 10 Apr 2014 14:20:52 +0200 Message-Id: <1397132462-8005-10-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1397132462-8005-1-git-send-email-ulf.hansson@linaro.org> References: <1397132462-8005-1-git-send-email-ulf.hansson@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ulf.hansson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The mmci host driver supports the common mmc DT parser, which enables us to use the use common names instead. Cc: Alessandro Rubini Signed-off-by: Ulf Hansson Acked-by: Linus Walleij --- arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi index 5acc044..d316c95 100644 --- a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi +++ b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi @@ -840,8 +840,8 @@ interrupts = <22>; max-frequency = <48000000>; bus-width = <4>; - mmc-cap-mmc-highspeed; - mmc-cap-sd-highspeed; + cap-mmc-highspeed; + cap-sd-highspeed; cd-gpios = <&gpio3 15 0x1>; cd-inverted; pinctrl-names = "default";