From patchwork Mon Mar 31 15:18:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 27468 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f197.google.com (mail-pd0-f197.google.com [209.85.192.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 39083202E0 for ; Mon, 31 Mar 2014 15:18:47 +0000 (UTC) Received: by mail-pd0-f197.google.com with SMTP id fp1sf20338501pdb.4 for ; Mon, 31 Mar 2014 08:18:46 -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:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=ZaQIxRZCn50aDFgGOUvmbCYY6eMdfzL9wlh0zVhJdqk=; b=ZvirJCy6+egfGwfxzE+IPGjRyxdOaOQNU6WwiikgDE4Hx40aEZicOr5i0IXZ1RdTmM 2uHkyJZImFrLtxIjLmxa20tKnx86zcNAHHsxZhVajQSixS02VPpsB+/MQMYludhP0yf3 gDqCl6Jj555Zqw9pgjUK88Tk1iUqzv9cWYwSG8DASk4qQr/t+K5evIW/3nWyObzMwsfS tHMAaNY9ftsbvG+T7+59Putvz+MjR7oNs9gr9qAN2AFx08zKUxFqY0mjCXnP+FhgMWMZ YPwbw9sk2IC1CHR0+sNB4JhkyNNFkjMETS4Mnh+J8cFPIN64lSrZZcMFhxlwn1GDD7wL +giA== X-Gm-Message-State: ALoCoQmUPBhwqdn4ZpJ1L1ByklVYTYtBOg0JEiKGdOqAMzcOrijXfyQbZuf5ZmzWaoAG5BcPTQhG X-Received: by 10.68.216.230 with SMTP id ot6mr10325062pbc.3.1396279126364; Mon, 31 Mar 2014 08:18:46 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.21.213 with SMTP id 79ls2337596qgl.35.gmail; Mon, 31 Mar 2014 08:18:46 -0700 (PDT) X-Received: by 10.220.104.210 with SMTP id q18mr24047855vco.9.1396279126220; Mon, 31 Mar 2014 08:18:46 -0700 (PDT) Received: from mail-vc0-f171.google.com (mail-vc0-f171.google.com [209.85.220.171]) by mx.google.com with ESMTPS id ie18si3020635vec.175.2014.03.31.08.18.46 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 31 Mar 2014 08:18:46 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.171 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.171; Received: by mail-vc0-f171.google.com with SMTP id lg15so8445586vcb.16 for ; Mon, 31 Mar 2014 08:18:46 -0700 (PDT) X-Received: by 10.52.78.231 with SMTP id e7mr1137699vdx.28.1396279126096; Mon, 31 Mar 2014 08:18:46 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.12.8 with SMTP id v8csp150791vcv; Mon, 31 Mar 2014 08:18:45 -0700 (PDT) X-Received: by 10.68.229.106 with SMTP id sp10mr25931322pbc.23.1396279125098; Mon, 31 Mar 2014 08:18:45 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id uc9si9326144pac.458.2014.03.31.08.18.44; Mon, 31 Mar 2014 08:18:44 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753907AbaCaPSm (ORCPT + 9 others); Mon, 31 Mar 2014 11:18:42 -0400 Received: from mail-we0-f175.google.com ([74.125.82.175]:50544 "EHLO mail-we0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753561AbaCaPSl (ORCPT ); Mon, 31 Mar 2014 11:18:41 -0400 Received: by mail-we0-f175.google.com with SMTP id q58so4838757wes.6 for ; Mon, 31 Mar 2014 08:18:40 -0700 (PDT) X-Received: by 10.180.187.16 with SMTP id fo16mr13104517wic.26.1396279120452; Mon, 31 Mar 2014 08:18:40 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id wl6sm13547488wjb.3.2014.03.31.08.18.39 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 31 Mar 2014 08:18:39 -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 Subject: [PATCH V2 08/19] ARM: ux500: Convert to the common mmc DT bindings for highspeed mode Date: Mon, 31 Mar 2014 17:18:09 +0200 Message-Id: <1396279100-2920-9-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> Sender: devicetree-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: devicetree@vger.kernel.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.171 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 Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org 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-ccu9540.dts | 6 +++--- arch/arm/boot/dts/ste-href.dtsi | 8 ++++---- arch/arm/boot/dts/ste-snowball.dts | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/ste-ccu9540.dts b/arch/arm/boot/dts/ste-ccu9540.dts index 2295087..651c56d 100644 --- a/arch/arm/boot/dts/ste-ccu9540.dts +++ b/arch/arm/boot/dts/ste-ccu9540.dts @@ -38,8 +38,8 @@ arm,primecell-periphid = <0x10480180>; max-frequency = <100000000>; bus-width = <4>; - mmc-cap-sd-highspeed; - mmc-cap-mmc-highspeed; + cap-sd-highspeed; + cap-mmc-highspeed; vmmc-supply = <&ab8500_ldo_aux3_reg>; cd-gpios = <&gpio7 6 0x4>; // 230 @@ -63,7 +63,7 @@ arm,primecell-periphid = <0x10480180>; max-frequency = <100000000>; bus-width = <8>; - mmc-cap-mmc-highspeed; + cap-mmc-highspeed; vmmc-supply = <&ab8500_ldo_aux2_reg>; status = "okay"; diff --git a/arch/arm/boot/dts/ste-href.dtsi b/arch/arm/boot/dts/ste-href.dtsi index 46dce42..3f07c58 100644 --- a/arch/arm/boot/dts/ste-href.dtsi +++ b/arch/arm/boot/dts/ste-href.dtsi @@ -116,8 +116,8 @@ arm,primecell-periphid = <0x10480180>; max-frequency = <100000000>; bus-width = <4>; - mmc-cap-sd-highspeed; - mmc-cap-mmc-highspeed; + cap-sd-highspeed; + cap-mmc-highspeed; st,sig-dir-dat0; st,sig-dir-dat2; st,sig-dir-cmd; @@ -148,7 +148,7 @@ arm,primecell-periphid = <0x10480180>; max-frequency = <100000000>; bus-width = <8>; - mmc-cap-mmc-highspeed; + cap-mmc-highspeed; pinctrl-names = "default", "sleep"; pinctrl-0 = <&sdi2_default_mode>; pinctrl-1 = <&sdi2_sleep_mode>; @@ -161,7 +161,7 @@ arm,primecell-periphid = <0x10480180>; max-frequency = <100000000>; bus-width = <8>; - mmc-cap-mmc-highspeed; + cap-mmc-highspeed; vmmc-supply = <&ab8500_ldo_aux2_reg>; pinctrl-names = "default", "sleep"; pinctrl-0 = <&sdi4_default_mode>; diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts index a2f632d..474ef832 100644 --- a/arch/arm/boot/dts/ste-snowball.dts +++ b/arch/arm/boot/dts/ste-snowball.dts @@ -156,7 +156,7 @@ arm,primecell-periphid = <0x10480180>; max-frequency = <100000000>; bus-width = <4>; - mmc-cap-mmc-highspeed; + cap-mmc-highspeed; vmmc-supply = <&ab8500_ldo_aux3_reg>; vqmmc-supply = <&vmmci>; pinctrl-names = "default", "sleep"; @@ -195,7 +195,7 @@ arm,primecell-periphid = <0x10480180>; max-frequency = <100000000>; bus-width = <8>; - mmc-cap-mmc-highspeed; + cap-mmc-highspeed; vmmc-supply = <&ab8500_ldo_aux2_reg>; pinctrl-names = "default", "sleep"; pinctrl-0 = <&sdi4_default_mode>;