From patchwork Mon Mar 31 15:18:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 3916251 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 01CB99F2B6 for ; Mon, 31 Mar 2014 15:29:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 407A820204 for ; Mon, 31 Mar 2014 15:29:57 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4C8B7201C8 for ; Mon, 31 Mar 2014 15:29:56 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WUe7z-0002pu-IK; Mon, 31 Mar 2014 15:28:00 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WUe7T-0005AE-OH; Mon, 31 Mar 2014 15:27:27 +0000 Received: from mail-we0-f180.google.com ([74.125.82.180]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WUdzN-0004RH-8b for linux-arm-kernel@lists.infradead.org; Mon, 31 Mar 2014 15:19:40 +0000 Received: by mail-we0-f180.google.com with SMTP id p61so4809535wes.25 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:from:to:cc:subject:date:message-id:in-reply-to :references; bh=OTxHpc1uRzcsnLJgo8jphJHd6c63XuUv3xSo1evbdA8=; b=KSvO2V+bIHV9cXljCTzaOR93Bf8dxDLxjlzYb3A1t+0OBP40dlzxM94qu4dNXfbAZV upWXONpAC2Diqn+Q0u0UfB5faALyGpLncU37dyay6WAicfa5dubMdCucyPouKDVvWJRP 6TDHWl4LNzu9IJ+WPFwV3ELk6vQbSBHdZv5ZNc/s2YpSOuoDH+swfIencls6FoSRbN/e N1+PHtR9Xq8Aac57SWlTQop5s6pL77SfhMzikl0oUpmFg3ydHNPo+MhrFDFnjRJmYuX9 5KSwsXrFMlh9Zj+5VP+0fIOQEcfbcWtUvANSxoITMQcZqoMivsKMsW/UwS/qqyQ1NXfz B2PA== X-Gm-Message-State: ALoCoQm4mMn1dU+Y5VG0Ze/MHRvrhPUNBBTjoI7bysZfbVHZT4eWNsBpUFzoZ+NoE2R3hieYxaZV X-Received: by 10.180.12.14 with SMTP id u14mr13188441wib.0.1396279123388; Mon, 31 Mar 2014 08:18:43 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id wl6sm13547488wjb.3.2014.03.31.08.18.41 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 31 Mar 2014 08:18:42 -0700 (PDT) From: Ulf Hansson To: linux-arm-kernel@lists.infradead.org, Russell King , Linus Walleij Subject: [PATCH V2 10/19] ARM: u300: Convert to the common mmc DT bindings for highspeed mode Date: Mon, 31 Mar 2014 17:18:11 +0200 Message-Id: <1396279100-2920-11-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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140331_111905_478043_EA4FF422 X-CRM114-Status: GOOD ( 11.56 ) X-Spam-Score: -2.6 (--) Cc: devicetree@vger.kernel.org, Ulf Hansson , Rob Herring X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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>;