From patchwork Fri Mar 21 12:14:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 26814 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pb0-f69.google.com (mail-pb0-f69.google.com [209.85.160.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 69EEE203AB for ; Fri, 21 Mar 2014 12:15:01 +0000 (UTC) Received: by mail-pb0-f69.google.com with SMTP id md12sf5620914pbc.0 for ; Fri, 21 Mar 2014 05:15:00 -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=gEC4FB8hY+QVfD6rBc/VjgH5A6jyLe8bX3omPaDiL34=; b=fZm7BpZ0OAx/rz/kzb2JdxhL8aSwfsTsZZm8Jk1oRLH9/jMlDNk+sW9thBHYuB3sKt iV96ENEecwe+Da8hx/aBoDcau+qTVJkWpMTpY4Tm/Y9MH67riXtTFdZiA4UOJrsiUdKm kWEOCnOajekr8ZwfLMiwCwFbFY2nCqbr6oIDQQL3CpyA8ZF2mEqHghSSxPmVZ9n+dqnx eYHwiaGac3fAsF0GNdFr1lOSjvfEkq4aw0tu77usYdL7wcPmHroY7wO550BFZ6B/YUOC p8Hc1RZVrPKTiRaqWSOWv+7yqu9QP9FdPfEFR+YPwRAJcQt1iNQdTOM7V1iZ8PbiQ9+n muuw== X-Gm-Message-State: ALoCoQlerVVLOdabmjvjbdvcVH2cG3C2xUGozH4igHFtyqQvonENyoCjbu3DNYlbbQakdvDHnvXa X-Received: by 10.68.201.134 with SMTP id ka6mr19757138pbc.4.1395404100813; Fri, 21 Mar 2014 05:15:00 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.101.12 with SMTP id t12ls671124qge.1.gmail; Fri, 21 Mar 2014 05:15:00 -0700 (PDT) X-Received: by 10.221.29.196 with SMTP id rz4mr37293178vcb.8.1395404100704; Fri, 21 Mar 2014 05:15:00 -0700 (PDT) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id xt10si1081651veb.166.2014.03.21.05.15.00 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Mar 2014 05:15:00 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.169 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.169; Received: by mail-vc0-f169.google.com with SMTP id ik5so2530600vcb.28 for ; Fri, 21 Mar 2014 05:15:00 -0700 (PDT) X-Received: by 10.52.65.165 with SMTP id y5mr3316292vds.51.1395404100639; Fri, 21 Mar 2014 05:15:00 -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 i9csp25979vck; Fri, 21 Mar 2014 05:15:00 -0700 (PDT) X-Received: by 10.112.61.199 with SMTP id s7mr3610280lbr.25.1395404099677; Fri, 21 Mar 2014 05:14:59 -0700 (PDT) Received: from mail-lb0-f178.google.com (mail-lb0-f178.google.com [209.85.217.178]) by mx.google.com with ESMTPS id c1si3910277lbp.44.2014.03.21.05.14.59 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Mar 2014 05:14:59 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.217.178 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=209.85.217.178; Received: by mail-lb0-f178.google.com with SMTP id s7so1554627lbd.23 for ; Fri, 21 Mar 2014 05:14:59 -0700 (PDT) X-Received: by 10.152.170.137 with SMTP id am9mr34119070lac.15.1395404099025; Fri, 21 Mar 2014 05:14:59 -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.57 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Mar 2014 05:14:58 -0700 (PDT) From: Ulf Hansson To: linux-arm-kernel@lists.infradead.org, Russell King , Linus Walleij Cc: devicetree@vger.kernel.org, Ulf Hansson , Alessandro Rubini Subject: [PATCH 09/20] ARM: nomadik: Convert to the common mmc DT bindings for highspeed mode Date: Fri, 21 Mar 2014 13:14:06 +0100 Message-Id: <1395404057-27835-10-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.169 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";