From patchwork Fri Mar 21 12:14:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 3873691 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 832A5BF540 for ; Fri, 21 Mar 2014 12:33:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C10A620279 for ; Fri, 21 Mar 2014 12:33:27 +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 8BBFF2026C for ; Fri, 21 Mar 2014 12:33:26 +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 1WQyO3-0007j2-7R; Fri, 21 Mar 2014 12:17:24 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQyNL-0003R1-H5; Fri, 21 Mar 2014 12:16:39 +0000 Received: from mail-la0-f51.google.com ([209.85.215.51]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQyM4-0003GD-LZ for linux-arm-kernel@lists.infradead.org; Fri, 21 Mar 2014 12:15:22 +0000 Received: by mail-la0-f51.google.com with SMTP id pv20so1563826lab.24 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:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jk278wL67Ywinn9qwDBug4FwJL9MQzlilVPiRRsIV/Q=; b=TUL4fucqiaxCO6j3eNIsMHb8FMZnVFxs4+d+3DltVgnJfl4ytCNozU/A6ssJm9bkBC gDo7VSTRsnExRqnbX1hTBAdb3Mb58EhyjgydARTPRJrz7uau92TpRWAlL1snr5Z0VhWn S6UsSaVFhvOOLveORxunXotTLpAdq9JOa7+Q3NPTEyR7Hl3iLLJp8r/KVvLnfIKHag72 D1pj57g95P2fg8CUs2MLA/CevMHZe5xzne7ac63J2enolEvF/4LuBqduL9UQEMlWgEL4 xoXO9B1QqCJBx8bgTa00bS65VdZD200/lKN1VbAbimoSk3+ENCtNJgF4Wt8wx9bledqO z/9g== X-Gm-Message-State: ALoCoQlyhXNHio8U1F2bNYHTGuqEJXfodcZEWOq9d/nVtQuEzw64sI7MRR2+sRHSHowkpir0hw+/ X-Received: by 10.152.29.8 with SMTP id f8mr33873030lah.11.1395404100884; Fri, 21 Mar 2014 05:15:00 -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.59 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Mar 2014 05:15:00 -0700 (PDT) From: Ulf Hansson To: linux-arm-kernel@lists.infradead.org, Russell King , Linus Walleij Subject: [PATCH 10/20] ARM: u300: Convert to the common mmc DT bindings for highspeed mode Date: Fri, 21 Mar 2014 13:14:07 +0100 Message-Id: <1395404057-27835-11-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_081520_901227_FBF951FB X-CRM114-Status: GOOD ( 11.20 ) X-Spam-Score: -2.6 (--) Cc: devicetree@vger.kernel.org, Ulf Hansson 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. 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>;