From patchwork Mon May 26 11:35:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaehoon Chung X-Patchwork-Id: 4241591 Return-Path: X-Original-To: patchwork-linux-mmc@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 D7CA29F32B for ; Mon, 26 May 2014 11:35:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D23FC201F5 for ; Mon, 26 May 2014 11:35:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B7934201FA for ; Mon, 26 May 2014 11:35:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752092AbaEZLfV (ORCPT ); Mon, 26 May 2014 07:35:21 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:60905 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752110AbaEZLfP (ORCPT ); Mon, 26 May 2014 07:35:15 -0400 Received: from epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N66002YXIUP7J10@mailout2.samsung.com>; Mon, 26 May 2014 20:35:13 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.113]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id 1C.00.13369.1F623835; Mon, 26 May 2014 20:35:13 +0900 (KST) X-AuditID: cbfee690-b7fb56d000003439-3d-538326f1e0d6 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 02.47.08203.1F623835; Mon, 26 May 2014 20:35:13 +0900 (KST) Received: from localhost.localdomain ([10.252.81.186]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N66006CJIUPY670@mmp2.samsung.com>; Mon, 26 May 2014 20:35:13 +0900 (KST) From: Jaehoon Chung To: linux-mmc@vger.kernel.org Cc: chris@printf.net, ulf.hansson@linaro.org, ludovic.desroches@atmel.com, tgih.jun@samsung.com, devicetree@vger.kernel.org, linux-samsung-soc@vger.kernel.org, Jaehoon Chung Subject: [PATCHv2 3/3] ARM: dts: replace the broken-cd property into slot node for dwmmc. Date: Mon, 26 May 2014 20:35:07 +0900 Message-id: <1401104107-17651-4-git-send-email-jh80.chung@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1401104107-17651-1-git-send-email-jh80.chung@samsung.com> References: <1401104107-17651-1-git-send-email-jh80.chung@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrBLMWRmVeSWpSXmKPExsWyRsSkUPejWnOwwakvOhYTLm9ntJh/5Byr xY1fbawWR/73M1rMOL+PyeLQzGSLD/cvMlscXxvuwOGx4NdWFo871/awedx4tZDJo2/LKkaP z5vkAlijuGxSUnMyy1KL9O0SuDLWLb7BXrDCpOLytE2MDYw/NLoYOTkkBEwkXs1fyQRhi0lc uLeeDcQWEljKKLFlQz1MzeTvB4FquIDi0xklFu4FKQJx2pgk9j45zw5SxSagI7H923GwSSIC shI//1wAK2IWOMUo0dvRxQqSEBaIlvgyaRMziM0ioCqx7dUKsDivgJvEtG87gGwOoHUKEnMm 2YCEOQXcJZaveckOEhYCKjnZ6AgyUkJgEbvEp+unGCHGCEh8m3yIBaJVVmLTAWaIoyUlDq64 wTKBUXgBI8MqRtHUguSC4qT0IhO94sTc4tK8dL3k/NxNjMBQP/3v2YQdjPcOWB9iTAYaN5FZ SjQ5HxgreSXxhsZmRhamJqbGRuaWZqQJK4nzqj1KChISSE8sSc1OTS1ILYovKs1JLT7EyMTB KdXAaOrW/1r6mgWPRpHLN+WJ6lcXaId3u9TO5/rC3bbc6ucEzuPGnPyC/xeGzxJNuVb2Ku34 wk+au27euuMfs/Opwd7yRPYQnYltq59Xvlf4evhek0+t5HQRvh2iMhF9Ez0vOjRtn1I/zZCV uetURQh3qVhjjP1PR5efusxZN+9xven1jBS5t4NHiaU4I9FQi7moOBEA8Cf8AYsCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrGIsWRmVeSWpSXmKPExsVy+t9jQd2Pas3BBgcuKFtMuLyd0WL+kXOs Fjd+tbFaHPnfz2gx4/w+JotDM5MtPty/yGxxfG24A4fHgl9bWTzuXNvD5nHj1UImj74tqxg9 Pm+SC2CNamC0yUhNTEktUkjNS85PycxLt1XyDo53jjc1MzDUNbS0MFdSyEvMTbVVcvEJ0HXL zAE6RUmhLDGnFCgUkFhcrKRvh2lCaIibrgVMY4Sub0gQXI+RARpIWMOYsW7xDfaCFSYVl6dt Ymxg/KHRxcjJISFgIjH5+0EmCFtM4sK99WxdjFwcQgLTGSUW7oVx2pgk9j45zw5SxSagI7H9 23GwDhEBWYmffy6AFTELnGKU6O3oYgVJCAtES3yZtIkZxGYRUJXY9moFWJxXwE1i2rcdQDYH 0DoFiTmTbEDCnALuEsvXvGQHCQsBlZxsdJzAyLuAkWEVo2hqQXJBcVJ6rqFecWJucWleul5y fu4mRnAsPZPawbiyweIQowAHoxIP7wHvpmAh1sSy4srcQ4wSHMxKIrxanM3BQrwpiZVVqUX5 8UWlOanFhxiTgW6ayCwlmpwPjPO8knhDYxMzI0sjc0MLI2Nz0oSVxHkPtFoHCgmkJ5akZqem FqQWwWxh4uCUamA0/vpRM0lZkN9Ac17bkYC0fW+mnon6V5sexclqFiJuoXDRhevoPhvGp5nv lB37SuZU1+kni0VUPzul+yL54fT1gY2/Uw+Lmq6S2fdw4rUbkz2nhKUerJ/KdnhCQvPBO5v3 brLka7n8qbwkfEPPeQHL48cyRDwVC013il1z223oWGGvEbVH4IMSS3FGoqEWc1FxIgBw6/Te 6QIAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 dw-mmc controller can be support the multiple slot. So each slot's property can be difference. Signed-off-by: Jaehoon Chung --- Changelog V2: - None arch/arm/boot/dts/exynos4412-odroidx.dts | 2 +- arch/arm/boot/dts/exynos4412-origen.dts | 2 +- arch/arm/boot/dts/exynos4412-trats2.dts | 4 ++-- arch/arm/boot/dts/exynos5250-arndale.dts | 2 +- arch/arm/boot/dts/exynos5250-cros-common.dtsi | 4 ++-- arch/arm/boot/dts/exynos5250-smdk5250.dts | 2 +- arch/arm/boot/dts/exynos5420-arndale-octa.dts | 2 +- arch/arm/boot/dts/rk3066a-bqcurie2.dts | 2 +- arch/arm/boot/dts/socfpga_arria5.dtsi | 2 +- arch/arm/boot/dts/socfpga_cyclone5.dtsi | 2 +- arch/arm/boot/dts/socfpga_vt.dts | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/arch/arm/boot/dts/exynos4412-odroidx.dts b/arch/arm/boot/dts/exynos4412-odroidx.dts index 31db28a..24ec351 100644 --- a/arch/arm/boot/dts/exynos4412-odroidx.dts +++ b/arch/arm/boot/dts/exynos4412-odroidx.dts @@ -46,7 +46,6 @@ num-slots = <1>; supports-highspeed; - broken-cd; card-detect-delay = <200>; samsung,dw-mshc-ciu-div = <3>; samsung,dw-mshc-sdr-timing = <2 3>; @@ -55,6 +54,7 @@ slot@0 { reg = <0>; bus-width = <8>; + broken-cd; }; }; diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts index e2c0dca..ed712a6 100644 --- a/arch/arm/boot/dts/exynos4412-origen.dts +++ b/arch/arm/boot/dts/exynos4412-origen.dts @@ -129,7 +129,6 @@ num-slots = <1>; supports-highspeed; - broken-cd; card-detect-delay = <200>; samsung,dw-mshc-ciu-div = <3>; samsung,dw-mshc-sdr-timing = <2 3>; @@ -138,6 +137,7 @@ slot@0 { reg = <0>; bus-width = <8>; + broken-cd; }; }; diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts index 73be464..37c3cb3 100644 --- a/arch/arm/boot/dts/exynos4412-trats2.dts +++ b/arch/arm/boot/dts/exynos4412-trats2.dts @@ -460,8 +460,6 @@ mmc@12550000 { num-slots = <1>; supports-highspeed; - broken-cd; - non-removable; card-detect-delay = <200>; vmmc-supply = <&vemmc_reg>; clock-frequency = <400000000>; @@ -475,6 +473,8 @@ slot@0 { reg = <0>; bus-width = <8>; + non-removable; + broken-cd; }; }; diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts index 090f983..0c9a7da 100644 --- a/arch/arm/boot/dts/exynos5250-arndale.dts +++ b/arch/arm/boot/dts/exynos5250-arndale.dts @@ -400,7 +400,6 @@ status = "okay"; num-slots = <1>; supports-highspeed; - broken-cd; card-detect-delay = <200>; samsung,dw-mshc-ciu-div = <3>; samsung,dw-mshc-sdr-timing = <2 3>; @@ -412,6 +411,7 @@ slot@0 { reg = <0>; bus-width = <8>; + broken-cd; }; }; diff --git a/arch/arm/boot/dts/exynos5250-cros-common.dtsi b/arch/arm/boot/dts/exynos5250-cros-common.dtsi index 2c1560d..7ab3b94 100644 --- a/arch/arm/boot/dts/exynos5250-cros-common.dtsi +++ b/arch/arm/boot/dts/exynos5250-cros-common.dtsi @@ -249,7 +249,6 @@ mmc@12200000 { num-slots = <1>; supports-highspeed; - broken-cd; card-detect-delay = <200>; samsung,dw-mshc-ciu-div = <3>; samsung,dw-mshc-sdr-timing = <2 3>; @@ -260,6 +259,7 @@ slot@0 { reg = <0>; bus-width = <8>; + broken-cd; }; }; @@ -283,7 +283,6 @@ mmc@12230000 { num-slots = <1>; supports-highspeed; - broken-cd; card-detect-delay = <200>; samsung,dw-mshc-ciu-div = <3>; samsung,dw-mshc-sdr-timing = <2 3>; @@ -293,6 +292,7 @@ slot@0 { reg = <0>; bus-width = <4>; + broken-cd; }; }; diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts index a794a70..feffe24 100644 --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts @@ -283,7 +283,6 @@ status = "okay"; num-slots = <1>; supports-highspeed; - broken-cd; card-detect-delay = <200>; samsung,dw-mshc-ciu-div = <3>; samsung,dw-mshc-sdr-timing = <2 3>; @@ -294,6 +293,7 @@ slot@0 { reg = <0>; bus-width = <8>; + broken-cd; }; }; diff --git a/arch/arm/boot/dts/exynos5420-arndale-octa.dts b/arch/arm/boot/dts/exynos5420-arndale-octa.dts index 80a3bf4..0d3b467 100644 --- a/arch/arm/boot/dts/exynos5420-arndale-octa.dts +++ b/arch/arm/boot/dts/exynos5420-arndale-octa.dts @@ -39,7 +39,6 @@ mmc@12200000 { status = "okay"; - broken-cd; supports-highspeed; card-detect-delay = <200>; samsung,dw-mshc-ciu-div = <3>; @@ -52,6 +51,7 @@ slot@0 { reg = <0>; bus-width = <8>; + broken-cd; }; }; diff --git a/arch/arm/boot/dts/rk3066a-bqcurie2.dts b/arch/arm/boot/dts/rk3066a-bqcurie2.dts index 035df40..62c7484 100644 --- a/arch/arm/boot/dts/rk3066a-bqcurie2.dts +++ b/arch/arm/boot/dts/rk3066a-bqcurie2.dts @@ -69,7 +69,6 @@ dwmmc@10218000 { /* wifi */ num-slots = <1>; status = "okay"; - non-removable; pinctrl-names = "default"; pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_bus4>; @@ -78,6 +77,7 @@ reg = <0>; bus-width = <4>; disable-wp; + non-removable; }; }; diff --git a/arch/arm/boot/dts/socfpga_arria5.dtsi b/arch/arm/boot/dts/socfpga_arria5.dtsi index 6c87b70..9c2b933 100644 --- a/arch/arm/boot/dts/socfpga_arria5.dtsi +++ b/arch/arm/boot/dts/socfpga_arria5.dtsi @@ -30,11 +30,11 @@ dwmmc0@ff704000 { num-slots = <1>; supports-highspeed; - broken-cd; slot@0 { reg = <0>; bus-width = <4>; + broken-cd; }; }; diff --git a/arch/arm/boot/dts/socfpga_cyclone5.dtsi b/arch/arm/boot/dts/socfpga_cyclone5.dtsi index ca41b0e..c5c7b5f 100644 --- a/arch/arm/boot/dts/socfpga_cyclone5.dtsi +++ b/arch/arm/boot/dts/socfpga_cyclone5.dtsi @@ -31,11 +31,11 @@ dwmmc0@ff704000 { num-slots = <1>; supports-highspeed; - broken-cd; slot@0 { reg = <0>; bus-width = <4>; + broken-cd; }; }; diff --git a/arch/arm/boot/dts/socfpga_vt.dts b/arch/arm/boot/dts/socfpga_vt.dts index 87d6f75..ff1111e 100644 --- a/arch/arm/boot/dts/socfpga_vt.dts +++ b/arch/arm/boot/dts/socfpga_vt.dts @@ -44,11 +44,11 @@ dwmmc0@ff704000 { num-slots = <1>; supports-highspeed; - broken-cd; slot@0 { reg = <0>; bus-width = <4>; + broken-cd; }; };