From patchwork Thu Jan 21 11:16:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Lin X-Patchwork-Id: 8080191 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 204869F96D for ; Thu, 21 Jan 2016 11:23:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4AE652053A for ; Thu, 21 Jan 2016 11:23:54 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 704182045E for ; Thu, 21 Jan 2016 11:23:53 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aMDJg-0000Bi-OX; Thu, 21 Jan 2016 11:22:16 +0000 Received: from lucky1.263xmail.com ([211.157.147.132]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aMDJd-00006h-Lk for linux-arm-kernel@lists.infradead.org; Thu, 21 Jan 2016 11:22:14 +0000 Received: from shawn.lin?rock-chips.com (unknown [192.168.167.105]) by lucky1.263xmail.com (Postfix) with SMTP id 6C81C5D182; Thu, 21 Jan 2016 19:21:46 +0800 (CST) X-263anti-spam: KSV:0; X-MAIL-GRAY: 1 X-MAIL-DELIVERY: 0 X-KSVirus-check: 0 X-ABS-CHECKED: 4 X-ADDR-CHECKED: 0 Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.263.net (Postfix) with ESMTP id DA13320055; Thu, 21 Jan 2016 19:21:41 +0800 (CST) X-RL-SENDER: shawn.lin@rock-chips.com X-FST-TO: jun.nie@linaro.org X-SENDER-IP: 58.22.7.114 X-LOGIN-NAME: shawn.lin@rock-chips.com X-UNIQUE-TAG: X-ATTACHMENT-NUM: 0 X-SENDER: lintao@rock-chips.com X-DNS-TYPE: 0 Received: from localhost.localdomain (unknown [58.22.7.114]) by smtp.263.net (Postfix) whith ESMTP id 48508NZAWJ; Thu, 21 Jan 2016 19:21:42 +0800 (CST) From: Shawn Lin To: Jun Nie , Kevin Hilman Subject: [PATCH v2] ARM: zx296702-ad1: remove deprecated usage of mmc Date: Thu, 21 Jan 2016 19:16:51 +0800 Message-Id: <1453375011-548-1-git-send-email-shawn.lin@rock-chips.com> X-Mailer: git-send-email 1.8.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160121_032213_892189_0CF73B8C X-CRM114-Status: UNSURE ( 6.62 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Arnd Bergmann , Shawn Lin , Jaehoon Chung , Rob Herring , linux-arm-kernel@lists.infradead.org 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, 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 supports-highspeed property and slot are deprecated for dw_mmc, this patch remove slot node and replace supports-highspeed with cap-sd-highspeed and cap-mmc-highspeed. Cc: Jaehoon Chung Signed-off-by: Shawn Lin Reviewed-by: Jun Nie --- Changes in v2: - remove slot suggested by Jaehoon arch/arm/boot/dts/zx296702-ad1.dts | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/arch/arm/boot/dts/zx296702-ad1.dts b/arch/arm/boot/dts/zx296702-ad1.dts index 081f980..c2ffa9d 100644 --- a/arch/arm/boot/dts/zx296702-ad1.dts +++ b/arch/arm/boot/dts/zx296702-ad1.dts @@ -19,28 +19,22 @@ &mmc0 { num-slots = <1>; - supports-highspeed; + bus-width = <4>; + cap-sd-highspeed; + cap-mmc-highspeed; non-removable; disable-wp; status = "okay"; - - slot@0 { - reg = <0>; - bus-width = <4>; - }; }; &mmc1 { num-slots = <1>; - supports-highspeed; + bus-width = <8>; + cap-sd-highspeed; + cap-mmc-highspeed; non-removable; disable-wp; status = "okay"; - - slot@0 { - reg = <0>; - bus-width = <8>; - }; }; &uart0 {