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: 3873521 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3AE33BF540 for ; Fri, 21 Mar 2014 12:18:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 73C6520279 for ; Fri, 21 Mar 2014 12:18:43 +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 3A49420274 for ; Fri, 21 Mar 2014 12:18:41 +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 1WQyNT-0007SC-87; Fri, 21 Mar 2014 12:16:48 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQyN0-0003Pc-5Y; Fri, 21 Mar 2014 12:16:18 +0000 Received: from mail-la0-f48.google.com ([209.85.215.48]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQyM3-0003G7-92 for linux-arm-kernel@lists.infradead.org; Fri, 21 Mar 2014 12:15:21 +0000 Received: by mail-la0-f48.google.com with SMTP id gf5so1567594lab.7 for ; Fri, 21 Mar 2014 05:14:59 -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=gEC4FB8hY+QVfD6rBc/VjgH5A6jyLe8bX3omPaDiL34=; b=M0yC258X/iAQtVZT3cUl/y9qzoYsGP/VguPihYWEoH4jbdtl14S2ruDJk30Ya3O6TR ctKm5TCGwOnzpeK7HiyiGiRbw0FmJ8rV1V8BeHOrkYKNvOq7bujzQ05ZuZqI27/BpqRJ lmaJMJE1AtTj36mLpgYhBUs2zscZ5R8ZV7OmjezIHXkpz4S5jH9rFII2laE5mrhGwvyi 4laHj7GjHU8jzCgvw3MDlO+ruebB5aGWiF4zKHAUia2rIl6pyi6jvq20n1NSjy3AR1Mc +cXPVfdvE6SVuiv3eBulMyNb9CIM2+VsKlmPzBaOsnNe6hsdxDvaoEc2xi+keXRZVNSf /mbg== X-Gm-Message-State: ALoCoQmucv7j87x8g/tgJAiEsx7POXQwVoRK6uDwHetUC0FTazIgyOsr2m99vlqfW6bcSvPw/I8J 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 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140321_081519_554594_D1CE4595 X-CRM114-Status: GOOD ( 11.25 ) X-Spam-Score: -2.6 (--) Cc: devicetree@vger.kernel.org, Ulf Hansson , 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.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_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";