From patchwork Tue Jun 10 09:00:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naveen Krishna Chatradhi X-Patchwork-Id: 4327191 Return-Path: X-Original-To: patchwork-linux-samsung-soc@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 25DD5BEEE9 for ; Tue, 10 Jun 2014 09:03:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 335EF202C8 for ; Tue, 10 Jun 2014 09:03:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E7007202AE for ; Tue, 10 Jun 2014 09:03:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751317AbaFJJD4 (ORCPT ); Tue, 10 Jun 2014 05:03:56 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:11845 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751058AbaFJJDz (ORCPT ); Tue, 10 Jun 2014 05:03:55 -0400 Received: from epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N6Y00ALZ3UAEY10@mailout4.samsung.com> for linux-samsung-soc@vger.kernel.org; Tue, 10 Jun 2014 18:03:47 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.124]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id FA.83.13369.2F9C6935; Tue, 10 Jun 2014 18:03:46 +0900 (KST) X-AuditID: cbfee690-b7fb56d000003439-7e-5396c9f2d2cb Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id B3.F0.07139.2F9C6935; Tue, 10 Jun 2014 18:03:46 +0900 (KST) Received: from chnaveen-ubuntu.sisodomain.com ([107.108.83.161]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N6Y001LS3TZFN20@mmp1.samsung.com>; Tue, 10 Jun 2014 18:03:46 +0900 (KST) From: Naveen Krishna Chatradhi To: linux-arm-kernel@lists.infradead.org, spi-devel-general@lists.sourceforge.net, linux-samsung-soc@vger.kernel.org Cc: naveenkrishna.ch@gmail.com, broonie@kernel.org, grant.likely@secretlab.ca, jaswinder.singh@linaro.org, kgene.kim@samsung.com, cpgs@samsung.com, Javier Martinez Canillas , Doug Anderson Subject: [PATCH 3/3] ARM: DTS: move "cs-gpio" from "controller-data" to under spi node Date: Tue, 10 Jun 2014 14:30:59 +0530 Message-id: <1402390859-28287-4-git-send-email-ch.naveen@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1402390859-28287-1-git-send-email-ch.naveen@samsung.com> References: <1402390859-28287-1-git-send-email-ch.naveen@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprPIsWRmVeSWpSXmKPExsWyRsSkRvfTyWnBBk3nTS2mPnzCZvHykKbF 2WUH2SxendnIZjF5031Gi6O/Cyx6F1xls9j0+BqrxYzz+5gsFm37z2xxZEojuwO3x+yGiywe f59fZ/HYOesuu8emVZ1sHneu7WHz2Lyk3mP3gs9MHn1bVjF6/Hyp4/F5k1wAVxSXTUpqTmZZ apG+XQJXxpFN89kLFgpWbHt0mrWB8RVvFyMnh4SAicTkCx0sELaYxIV769m6GLk4hASWMko0 7f3EBlM0YeZcZojEIkaJHRPuMUI4/UwSW6c3M4FUsQmYSRxctJq9i5GDQ0SgTGLehDqQGmaB 34wSZ+8dApskLBAh0bygiRHEZhFQlVh58BTYal4BV4l7N/cwgvRKCChIzJlkAxLmFHCT2HXt Cth4IaCS5s1T2UFmSgg8YpeY0d7NCjFHQOLb5EMsEL2yEpsOMEMcLSlxcMUNlgmMwgsYGVYx iqYWJBcUJ6UXmegVJ+YWl+al6yXn525iBEbO6X/PJuxgvHfA+hBjMtC4icxSosn5wMjLK4k3 NDYzsjA1MTU2Mrc0I01YSZxX7VFSkJBAemJJanZqakFqUXxRaU5q8SFGJg5OqQZGIZVUz+Mc 75/MP3JN1PFK454vC6YZftQyv375/53JJ7enR5fGftjlFO94Npr/3hTb3buC9W32Xqj5+pzh UftHUd6j4n4pDvOWLf3Jutd8iuD6y3NW129qt73KsEwxJYL/l3Nxec6lnftEIp2uz9B78+34 m6vv6u35Ux48b7w6h3vXhmYG91U6a5VYijMSDbWYi4oTAVtgPeqyAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrDIsWRmVeSWpSXmKPExsVy+t9jAd1PJ6cFGxxbo2sx9eETNouXhzQt zi47yGbx6sxGNovJm+4zWhz9XWDRu+Aqm8Wmx9dYLWac38dksWjbf2aLI1Ma2R24PWY3XGTx +Pv8OovHzll32T02repk87hzbQ+bx+Yl9R67F3xm8ujbsorR4+dLHY/Pm+QCuKIaGG0yUhNT UosUUvOS81My89JtlbyD453jTc0MDHUNLS3MlRTyEnNTbZVcfAJ03TJzgA5WUihLzCkFCgUk Fhcr6dthmhAa4qZrAdMYoesbEgTXY2SABhLWMGYc2TSfvWChYMW2R6dZGxhf8XYxcnJICJhI TJg5lxnCFpO4cG89WxcjF4eQwCJGiR0T7jFCOP1MElunNzOBVLEJmEkcXLSavYuRg0NEoExi 3oQ6kBpmgd+MEmfvHWIDqREWiJBoXtDECGKzCKhKrDx4igXE5hVwlbh3cw8jSK+EgILEnEk2 IGFOATeJXdeugI0XAipp3jyVfQIj7wJGhlWMoqkFyQXFSem5RnrFibnFpXnpesn5uZsYwXH5 THoH46oGi0OMAhyMSjy8FgemBguxJpYVV+YeYpTgYFYS4b27bVqwEG9KYmVValF+fFFpTmrx IcZkoKMmMkuJJucDU0ZeSbyhsYm5qbGppYmFiZklacJK4rwHW60DhQTSE0tSs1NTC1KLYLYw cXBKNTBO42wy/Vn2/3Zfge+bJTM4syKMOFjiVsQn8utdufHgf5BKL7/+Eptfp5clSa2sedZ7 J/hYcupHtdjTc9eFPrBf/azmdcabQ79tjGz2NvYvvxBv/9Pi6N6TMS2ZJ2tu7G87J/2+q8zX 4c0u9buhZsF/o3Yd8E4R2cl7UnrF1mjt99fjVvxQ//9aiaU4I9FQi7moOBEAHNQDlA8DAAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@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 This patch moves the "cs-gpio" field from "controller-data" child node to under the spi device node. Respective changes are preposed to spi-s3c64xx.c driver. Signed-off-by: Naveen Krishna Chatradhi Cc: Javier Martinez Canillas Cc: Doug Anderson --- arch/arm/boot/dts/exynos4210-smdkv310.dts | 2 +- arch/arm/boot/dts/exynos4412-trats2.dts | 2 +- arch/arm/boot/dts/exynos5250-smdk5250.dts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/exynos4210-smdkv310.dts b/arch/arm/boot/dts/exynos4210-smdkv310.dts index 636d166..9191491 100644 --- a/arch/arm/boot/dts/exynos4210-smdkv310.dts +++ b/arch/arm/boot/dts/exynos4210-smdkv310.dts @@ -169,6 +169,7 @@ spi_2: spi@13940000 { status = "okay"; + cs-gpios = <&gpc1 2 0>; w25x80@0 { #address-cells = <1>; @@ -178,7 +179,6 @@ spi-max-frequency = <1000000>; controller-data { - cs-gpio = <&gpc1 2 0>; samsung,spi-feedback-delay = <0>; }; diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts index 8a558b7..204b0de 100644 --- a/arch/arm/boot/dts/exynos4412-trats2.dts +++ b/arch/arm/boot/dts/exynos4412-trats2.dts @@ -512,6 +512,7 @@ spi_1: spi@13930000 { pinctrl-names = "default"; pinctrl-0 = <&spi1_bus>; + cs-gpios = <&gpb 5 0>; status = "okay"; s5c73m3_spi: s5c73m3 { @@ -519,7 +520,6 @@ spi-max-frequency = <50000000>; reg = <0>; controller-data { - cs-gpio = <&gpb 5 0>; samsung,spi-feedback-delay = <2>; }; }; diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts index a794a70..0c6433a 100644 --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts @@ -316,6 +316,7 @@ }; spi_1: spi@12d30000 { + cs-gpios = <&gpa2 5 0>; status = "okay"; w25q80bw@0 { @@ -326,7 +327,6 @@ spi-max-frequency = <1000000>; controller-data { - cs-gpio = <&gpa2 5 0>; samsung,spi-feedback-delay = <0>; };