diff options
| author | Olof Johansson <olof@lixom.net> | 2019-04-07 18:18:41 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-04-07 18:18:41 -0400 |
| commit | fbe8758f931ff5468aaeb4b304fc3edb70c908d6 (patch) | |
| tree | 77ef0b2ae03e0ba048d2eb19cc5a6fe0d68a3e26 | |
| parent | c983f102c6dfe2cc9e4e937a33927fa914944bbf (diff) | |
Revert "ARM: dts: nomadik: Fix polarity of SPI CS"
This reverts commit fa9463564e77067df81b0b8dec91adbbbc47bfb4.
Per Linus Walleij:
Dear ARM SoC maintainers,
can you please revert this patch. It was the wrong solution to the
wrong problem, and I must have acted in stress. Andrey fixed the
real bug in a proper way in these commits:
commit e5545c94e43b8f6599ffc01df8d1aedf18ee912a
"gpio: of: Check propname before applying "cs-gpios" quirks"
commit 7ce40277bf848391705011ba37eac2e377cbd9e6
"gpio: of: Check for "spi-cs-high" in child instead of parent node"
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/boot/dts/ste-nomadik-nhk15.dts | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/ste-nomadik-nhk15.dts b/arch/arm/boot/dts/ste-nomadik-nhk15.dts index f2f6558a00f1..04066f9cb8a3 100644 --- a/arch/arm/boot/dts/ste-nomadik-nhk15.dts +++ b/arch/arm/boot/dts/ste-nomadik-nhk15.dts | |||
| @@ -213,13 +213,12 @@ | |||
| 213 | gpio-sck = <&gpio0 5 GPIO_ACTIVE_HIGH>; | 213 | gpio-sck = <&gpio0 5 GPIO_ACTIVE_HIGH>; |
| 214 | gpio-mosi = <&gpio0 4 GPIO_ACTIVE_HIGH>; | 214 | gpio-mosi = <&gpio0 4 GPIO_ACTIVE_HIGH>; |
| 215 | /* | 215 | /* |
| 216 | * This chipselect is active high. Just setting the flags | 216 | * It's not actually active high, but the frameworks assume |
| 217 | * to GPIO_ACTIVE_HIGH is not enough for the SPI DT bindings, | 217 | * the polarity of the passed-in GPIO is "normal" (active |
| 218 | * it will be ignored, only the special "spi-cs-high" flag | 218 | * high) then actively drives the line low to select the |
| 219 | * really counts. | 219 | * chip. |
| 220 | */ | 220 | */ |
| 221 | cs-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>; | 221 | cs-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>; |
| 222 | spi-cs-high; | ||
| 223 | num-chipselects = <1>; | 222 | num-chipselects = <1>; |
| 224 | 223 | ||
| 225 | /* | 224 | /* |
