diff mbox series

[15/15] ARM: dts: mmp3-dell-ariel: Fix the SPI devices

Message ID 20200419171157.672999-16-lkundrak@v3.sk (mailing list archive)
State Mainlined, archived
Headers show
Series ARM: dts: Marvell SoC Device Tree updates (for 5.8) | expand

Commit Message

Lubomir Rintel April 19, 2020, 5:11 p.m. UTC 
I've managed to get about everything wrong while digging these out of
OEM's board file.

Correct the bus numbers, the exact model of the NOR flash, polarity of
the chip selects and align the SPI frequency with the data sheet.

Tested that it works now, with a slight fix to the PXA SSP driver.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Cc: <stable@vger.kernel.org>
---
 arch/arm/boot/dts/mmp3-dell-ariel.dts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Comments

Sasha Levin April 21, 2020, 7:56 p.m. UTC | #1 
Hi

[This is an automated email]

This commit has been processed because it contains a -stable tag.
The stable tag indicates that it's relevant for the following trees: all

The bot has tested the following trees: v5.6.5, v5.5.18, v5.4.33, v4.19.116, v4.14.176, v4.9.219, v4.4.219.

v5.6.5: Build OK!
v5.5.18: Build OK!
v5.4.33: Failed to apply! Possible dependencies:
    044393a7b331 ("ARM: dts: mmp3: add Dell Wyse 3020 machine")

v4.19.116: Failed to apply! Possible dependencies:
    044393a7b331 ("ARM: dts: mmp3: add Dell Wyse 3020 machine")
    548d52bcc070 ("ARM: dts: mmp2: add OLPC XO 1.75 machine")

v4.14.176: Failed to apply! Possible dependencies:
    044393a7b331 ("ARM: dts: mmp3: add Dell Wyse 3020 machine")
    548d52bcc070 ("ARM: dts: mmp2: add OLPC XO 1.75 machine")

v4.9.219: Failed to apply! Possible dependencies:
    044393a7b331 ("ARM: dts: mmp3: add Dell Wyse 3020 machine")
    548d52bcc070 ("ARM: dts: mmp2: add OLPC XO 1.75 machine")

v4.4.219: Failed to apply! Possible dependencies:
    044393a7b331 ("ARM: dts: mmp3: add Dell Wyse 3020 machine")
    1fb75865d8b8 ("ARM: dts: introduce MPS2 AN399/AN400")
    548d52bcc070 ("ARM: dts: mmp2: add OLPC XO 1.75 machine")
    f915ea5e7fd9 ("ARM: dts: introduce MPS2 AN385/AN386")


NOTE: The patch will not be queued to stable trees until it is upstream.

How should we proceed with this patch?
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/mmp3-dell-ariel.dts b/arch/arm/boot/dts/mmp3-dell-ariel.dts
index 15449c72c042b..b0ec14c421641 100644
--- a/arch/arm/boot/dts/mmp3-dell-ariel.dts
+++ b/arch/arm/boot/dts/mmp3-dell-ariel.dts
@@ -98,19 +98,19 @@  &twsi4 {
 	status = "okay";
 };
 
-&ssp3 {
+&ssp1 {
 	status = "okay";
-	cs-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;
+	cs-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
 
 	firmware-flash@0 {
-		compatible = "st,m25p80", "jedec,spi-nor";
+		compatible = "winbond,w25q32", "jedec,spi-nor";
 		reg = <0>;
-		spi-max-frequency = <40000000>;
+		spi-max-frequency = <104000000>;
 		m25p,fast-read;
 	};
 };
 
-&ssp4 {
-	cs-gpios = <&gpio 56 GPIO_ACTIVE_HIGH>;
+&ssp2 {
+	cs-gpios = <&gpio 56 GPIO_ACTIVE_LOW>;
 	status = "okay";
 };