From patchwork Fri Mar 21 12:14:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 26815 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f199.google.com (mail-ob0-f199.google.com [209.85.214.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id F0CA1203AB for ; Fri, 21 Mar 2014 12:15:03 +0000 (UTC) Received: by mail-ob0-f199.google.com with SMTP id wo20sf8587949obc.2 for ; Fri, 21 Mar 2014 05:15:02 -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=jk278wL67Ywinn9qwDBug4FwJL9MQzlilVPiRRsIV/Q=; b=LsGpMd4FJnw0kmz1D2A+M7IhjHAyqNsmnwCP2qmp0StbAnoaBee/lKTm5QHs73RZJe tpE6R7YU+S1a6RgOtYhfUint5i0JZdZnUFa7KEmD9gMTFwvynPEDqKjSmJZ18bRZOE48 fvNjsW5gasYwUkF4bUckgCFOVuJiOuf4UPeAgSZay3RcrYHefrMrBcvVfK0+MBLVUuoV zPG++KVB7ynD8DGArsgq5rRYo0/PevJz9MU8G+4yn+4d1SThUVhEHypuWwwfgX7LfuuV T7lLjQlITnTOpMJjsbi1h0dbRGqarDv/qJVZy3o4YZTFnu0oK4H5jwDVmPLZ1FplAHzM lRCw== X-Gm-Message-State: ALoCoQnLiJfyqQ0ZCpNUDQFs6oIC+98iXnabARAsgwN/+LrJxpU5IGeqQ8W9J7k2vD8AHrmIxdqW X-Received: by 10.182.24.134 with SMTP id u6mr5836730obf.24.1395404102931; Fri, 21 Mar 2014 05:15:02 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.23.233 with SMTP id 96ls620708qgp.61.gmail; Fri, 21 Mar 2014 05:15:02 -0700 (PDT) X-Received: by 10.58.252.8 with SMTP id zo8mr87498vec.55.1395404102739; Fri, 21 Mar 2014 05:15:02 -0700 (PDT) Received: from mail-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) by mx.google.com with ESMTPS id tr5si1110304vdc.144.2014.03.21.05.15.02 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Mar 2014 05:15:02 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.176 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.176; Received: by mail-vc0-f176.google.com with SMTP id lc6so2420810vcb.7 for ; Fri, 21 Mar 2014 05:15:02 -0700 (PDT) X-Received: by 10.52.134.136 with SMTP id pk8mr22350vdb.70.1395404102673; Fri, 21 Mar 2014 05:15:02 -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.78.9 with SMTP id i9csp25982vck; Fri, 21 Mar 2014 05:15:02 -0700 (PDT) X-Received: by 10.112.160.200 with SMTP id xm8mr32029243lbb.24.1395404101432; Fri, 21 Mar 2014 05:15:01 -0700 (PDT) Received: from mail-la0-f42.google.com (mail-la0-f42.google.com [209.85.215.42]) by mx.google.com with ESMTPS id on7si3903948lbb.95.2014.03.21.05.15.00 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Mar 2014 05:15:01 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.215.42 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=209.85.215.42; Received: by mail-la0-f42.google.com with SMTP id ec20so1599869lab.15 for ; Fri, 21 Mar 2014 05:15:00 -0700 (PDT) X-Received: by 10.152.29.8 with SMTP id f8mr33873030lah.11.1395404100884; Fri, 21 Mar 2014 05:15:00 -0700 (PDT) Received: from linaro-ulf.lan (90-231-160-185-no158.tbcn.telia.com. [90.231.160.185]) by mx.google.com with ESMTPSA id tq9sm3255263lbb.10.2014.03.21.05.14.59 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Mar 2014 05:15:00 -0700 (PDT) From: Ulf Hansson To: linux-arm-kernel@lists.infradead.org, Russell King , Linus Walleij Cc: devicetree@vger.kernel.org, Ulf Hansson Subject: [PATCH 10/20] ARM: u300: Convert to the common mmc DT bindings for highspeed mode Date: Fri, 21 Mar 2014 13:14:07 +0100 Message-Id: <1395404057-27835-11-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1395404057-27835-1-git-send-email-ulf.hansson@linaro.org> References: <1395404057-27835-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.176 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. Signed-off-by: Ulf Hansson Acked-by: Linus Walleij --- arch/arm/boot/dts/ste-u300.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/ste-u300.dts b/arch/arm/boot/dts/ste-u300.dts index 6fe688e..82a6616 100644 --- a/arch/arm/boot/dts/ste-u300.dts +++ b/arch/arm/boot/dts/ste-u300.dts @@ -442,8 +442,8 @@ clock-names = "apb_pclk", "mclk"; max-frequency = <24000000>; bus-width = <4>; // SD-card slot - mmc-cap-mmc-highspeed; - mmc-cap-sd-highspeed; + cap-mmc-highspeed; + cap-sd-highspeed; cd-gpios = <&gpio 12 0x4>; cd-inverted; vmmc-supply = <&ab3100_ldo_g_reg>;