diff options
| author | Olof Johansson <olof@lixom.net> | 2019-04-08 00:18:41 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-04-08 00:18:41 +0200 |
| commit | fbe8758f931ff5468aaeb4b304fc3edb70c908d6 (patch) | |
| tree | 77ef0b2ae03e0ba048d2eb19cc5a6fe0d68a3e26 /arch | |
| parent | Merge tag 'omap-for-v5.1/fixes-signed' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| download | linux-fbe8758f931ff5468aaeb4b304fc3edb70c908d6.tar.xz linux-fbe8758f931ff5468aaeb4b304fc3edb70c908d6.zip | |
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>
Diffstat (limited to 'arch')
| -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 @@ gpio-sck = <&gpio0 5 GPIO_ACTIVE_HIGH>; gpio-mosi = <&gpio0 4 GPIO_ACTIVE_HIGH>; /* - * This chipselect is active high. Just setting the flags - * to GPIO_ACTIVE_HIGH is not enough for the SPI DT bindings, - * it will be ignored, only the special "spi-cs-high" flag - * really counts. + * It's not actually active high, but the frameworks assume + * the polarity of the passed-in GPIO is "normal" (active + * high) then actively drives the line low to select the + * chip. */ cs-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>; - spi-cs-high; num-chipselects = <1>; /* |