Commit 65bbe3f ("ARM: dts: Clean up exynos5250-smdk5250") improved
the smdk5250 DTS but the patch was rebased due conflicting changes
and the merge resolution added a regression of the bug fixed in commit
e138d43 ("ARM: dts: fix the chip select gpios definition in the SPI nodes").
This patch fixes the issue by removing the old cs-gpio and using
the generic cs-gpios property.
Signed-off-by: Javier Martinez Canillas <javier.marti...@collabora.co.uk>
---
arch/arm/boot/dts/exynos5250-smdk5250.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts
b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index e17c02c..bc27cc2 100644
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -385,6 +385,7 @@
&spi_1 {
status = "okay";
+ cs-gpios = <&gpa2 5 GPIO_ACTIVE_HIGH>;
w25q80bw@0 {
#address-cells = <1>;
@@ -394,7 +395,6 @@
spi-max-frequency = <1000000>;
controller-data {
- cs-gpio = <&gpa2 5 GPIO_ACTIVE_HIGH>;
samsung,spi-feedback-delay = <0>;
};
--
2.1.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
