aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNaveen Krishna Chatradhi <ch.naveen@samsung.com>2014-07-16 11:19:10 -0400
committerMark Brown <broonie@linaro.org>2014-07-17 14:37:50 -0400
commite138d4333aa02a3daa12c04192bc5c842bffee74 (patch)
treefc3de7fa9263fe45ca1173ea54e6c4fbdde99036
parent797bf3a204ef5d7e451fe5fbeb61650e1efc7917 (diff)
ARM: dts: fix the chip select gpios definition in the SPI nodes
This patch replaces the "cs-gpio" from "controller-data" node as was specified in the old binding and uses the standard "cs-gpios" property expected by the SPI core as is defined now in the spi-s3c64xx driver DT binding. Signed-off-by: Naveen Krishna Chatradhi <ch.naveen@samsung.com> Reviewed-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> Reviewed-by: Tomasz Figa <t.figa@samsung.com> Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--arch/arm/boot/dts/exynos4210-smdkv310.dts2
-rw-r--r--arch/arm/boot/dts/exynos4412-trats2.dts2
-rw-r--r--arch/arm/boot/dts/exynos5250-smdk5250.dts2
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 636d16684750..676e6e0c8cf3 100644
--- a/arch/arm/boot/dts/exynos4210-smdkv310.dts
+++ b/arch/arm/boot/dts/exynos4210-smdkv310.dts
@@ -168,6 +168,7 @@
168 }; 168 };
169 169
170 spi_2: spi@13940000 { 170 spi_2: spi@13940000 {
171 cs-gpios = <&gpc1 2 0>;
171 status = "okay"; 172 status = "okay";
172 173
173 w25x80@0 { 174 w25x80@0 {
@@ -178,7 +179,6 @@
178 spi-max-frequency = <1000000>; 179 spi-max-frequency = <1000000>;
179 180
180 controller-data { 181 controller-data {
181 cs-gpio = <&gpc1 2 0>;
182 samsung,spi-feedback-delay = <0>; 182 samsung,spi-feedback-delay = <0>;
183 }; 183 };
184 184
diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts
index 77878447b312..11967f4561e0 100644
--- a/arch/arm/boot/dts/exynos4412-trats2.dts
+++ b/arch/arm/boot/dts/exynos4412-trats2.dts
@@ -589,6 +589,7 @@
589 spi_1: spi@13930000 { 589 spi_1: spi@13930000 {
590 pinctrl-names = "default"; 590 pinctrl-names = "default";
591 pinctrl-0 = <&spi1_bus>; 591 pinctrl-0 = <&spi1_bus>;
592 cs-gpios = <&gpb 5 0>;
592 status = "okay"; 593 status = "okay";
593 594
594 s5c73m3_spi: s5c73m3 { 595 s5c73m3_spi: s5c73m3 {
@@ -596,7 +597,6 @@
596 spi-max-frequency = <50000000>; 597 spi-max-frequency = <50000000>;
597 reg = <0>; 598 reg = <0>;
598 controller-data { 599 controller-data {
599 cs-gpio = <&gpb 5 0>;
600 samsung,spi-feedback-delay = <2>; 600 samsung,spi-feedback-delay = <2>;
601 }; 601 };
602 }; 602 };
diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index a794a705d404..0c6433ae63ac 100644
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -316,6 +316,7 @@
316 }; 316 };
317 317
318 spi_1: spi@12d30000 { 318 spi_1: spi@12d30000 {
319 cs-gpios = <&gpa2 5 0>;
319 status = "okay"; 320 status = "okay";
320 321
321 w25q80bw@0 { 322 w25q80bw@0 {
@@ -326,7 +327,6 @@
326 spi-max-frequency = <1000000>; 327 spi-max-frequency = <1000000>;
327 328
328 controller-data { 329 controller-data {
329 cs-gpio = <&gpa2 5 0>;
330 samsung,spi-feedback-delay = <0>; 330 samsung,spi-feedback-delay = <0>;
331 }; 331 };
332 332