From patchwork Mon Mar 31 15:18:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 27464 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f200.google.com (mail-qc0-f200.google.com [209.85.216.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B0310202E0 for ; Mon, 31 Mar 2014 15:18:43 +0000 (UTC) Received: by mail-qc0-f200.google.com with SMTP id i17sf19272764qcy.11 for ; Mon, 31 Mar 2014 08:18:43 -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=FXMtW8HEwAg9VGyyXzUgQHzqOUXp6jHOQ6BC90bdtEdfvr58UI5RWLcBZWAEpczwQj m2pmrgKSP8gETCQMraBNpvki35wFZ3bgPZuoyOIIvTHoUUVMsrxJmAFk0vTUqeHRZj4b 31NqZ+CazbW7zErt5NEwpw2DzDNHYhdzqpI7Kk2wulEnDJBqN+XwinXL7fPhgMa1C7iw qTSf3DYUp/0sEugayJBwG4rgcLmjS+/SUrwEQ6dD1X7n2D8lyc61U4/M0LwIA02Dz1XX PGBdv32K/j2xYNBbSmg2IXIE8h3aqtJp0fDL6Y7E/Q42NvkIg8/15tVmaJ/T4Aik/fRn x4/g== X-Gm-Message-State: ALoCoQlGGaOHEn6+vmjLjsVGt2I99jrAX1LZ0fh3HsgPtMTOH2tP5lqP1mK3KPwYgudIKS8eX+Uz X-Received: by 10.236.197.39 with SMTP id s27mr9510536yhn.36.1396279123429; Mon, 31 Mar 2014 08:18:43 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.94.68 with SMTP id f62ls1000244qge.8.gmail; Mon, 31 Mar 2014 08:18:43 -0700 (PDT) X-Received: by 10.221.63.1 with SMTP id xc1mr174908vcb.35.1396279123354; Mon, 31 Mar 2014 08:18:43 -0700 (PDT) Received: from mail-vc0-f174.google.com (mail-vc0-f174.google.com [209.85.220.174]) by mx.google.com with ESMTPS id kj3si3018159vdb.123.2014.03.31.08.18.43 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 31 Mar 2014 08:18:43 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.174 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.174; Received: by mail-vc0-f174.google.com with SMTP id ld13so8169792vcb.5 for ; Mon, 31 Mar 2014 08:18:43 -0700 (PDT) X-Received: by 10.220.48.194 with SMTP id s2mr45756vcf.43.1396279123282; Mon, 31 Mar 2014 08:18:43 -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.12.8 with SMTP id v8csp150784vcv; Mon, 31 Mar 2014 08:18:42 -0700 (PDT) X-Received: by 10.180.91.164 with SMTP id cf4mr13111643wib.37.1396279122419; Mon, 31 Mar 2014 08:18:42 -0700 (PDT) Received: from mail-wg0-f44.google.com (mail-wg0-f44.google.com [74.125.82.44]) by mx.google.com with ESMTPS id gc2si7723087wic.110.2014.03.31.08.18.41 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 31 Mar 2014 08:18:42 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.44 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=74.125.82.44; Received: by mail-wg0-f44.google.com with SMTP id m15so6127503wgh.27 for ; Mon, 31 Mar 2014 08:18:41 -0700 (PDT) X-Received: by 10.180.87.164 with SMTP id az4mr13094665wib.2.1396279121882; Mon, 31 Mar 2014 08:18:41 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id wl6sm13547488wjb.3.2014.03.31.08.18.40 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 31 Mar 2014 08:18:41 -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 V2 09/19] ARM: nomadik: Convert to the common mmc DT bindings for highspeed mode Date: Mon, 31 Mar 2014 17:18:10 +0200 Message-Id: <1396279100-2920-10-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1396279100-2920-1-git-send-email-ulf.hansson@linaro.org> References: <1396279100-2920-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.174 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";