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: 3916971 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 49B789F2B6 for ; Mon, 31 Mar 2014 17:25:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 765492039C for ; Mon, 31 Mar 2014 17:25:34 +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 45E162037B for ; Mon, 31 Mar 2014 17:25:33 +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 1WUeWs-0002ld-BX; Mon, 31 Mar 2014 15:53:43 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WUeW2-0006aT-T1; Mon, 31 Mar 2014 15:52:50 +0000 Received: from bombadil.infradead.org ([2001:1868:205::9]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WUeUh-0006S4-1S for linux-arm-kernel@merlin.infradead.org; Mon, 31 Mar 2014 15:51:27 +0000 Received: from mail-we0-f175.google.com ([74.125.82.175]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WUdzN-0007ys-H5 for linux-arm-kernel@lists.infradead.org; Mon, 31 Mar 2014 15:19:06 +0000 Received: by mail-we0-f175.google.com with SMTP id q58so4838789wes.6 for ; Mon, 31 Mar 2014 08:18:41 -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=i22QepfPlkUegHZheonmZNWFAtPjBHLn1pstzHbwj5U=; b=jZkUYloOsklWteYjcZeIk6d0owK2KxcLL1tJbBY0jJADRMMfj3j3HCx70Adu0OT/a0 5arffptF7GmtacjZQlJVKGyV4e4NolJbyQbcfr7hppSivhilwKGntlgkQB+OpQf5yGTx Lu2G7EqLk2ClUQ+Ad1X/voVXz39MinLH9caO5EFJOBu3b3NJx4QpYSL4RH8NMlaF16nh jDwGejvotKvc5d0HNO9h9w2FGFYH6q2Eae51as/UD5Y/ddnNL725O3anAqjtORXtcR+o Vx9VoPzpdmeo5/5RYocoyZlOVvMU7zS/HqmQ7CxLmqr/y6n9R0A/1XnKOeeHeEaG9xT2 eV+Q== X-Gm-Message-State: ALoCoQmZbb2U55l5yD/0z4c9GhgVq8vCsOXLbrlqMeVWEieQhEiyz78oje9jSBvAcuLeT1twdwDq 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 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140331_081905_715880_4D367423 X-CRM114-Status: GOOD ( 10.68 ) X-Spam-Score: -0.7 (/) Cc: devicetree@vger.kernel.org, Ulf Hansson , Rob Herring , Alessandro Rubini 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. 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";