aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorJoel Johnson <mrjoel@lixil.net>2020-03-27 11:31:37 -0600
committerHauke Mehrtens <hauke@hauke-m.de>2020-04-18 00:18:13 +0200
commitd8e0b015e82324dbb7ea701a1008babbf97fffe0 (patch)
tree4b4bdb31bc213ea74225953fd67b9c4d41e8f3af /target
parent0232f57e1af6580542c0ed1ce1d76c7cd4084613 (diff)
downloadupstream-d8e0b015e82324dbb7ea701a1008babbf97fffe0.tar.gz
upstream-d8e0b015e82324dbb7ea701a1008babbf97fffe0.tar.bz2
upstream-d8e0b015e82324dbb7ea701a1008babbf97fffe0.zip
mvebu: backport ClearFog SPI enablement
Backport Device Tree change first added in kernel 4.19 to enable the SPI device on ClearFog devices by default. This is tested and working in snapshot builds with kernel 5.4+, include the change in future 19.07 patch releases. Signed-off-by: Joel Johnson <mrjoel@lixil.net>
Diffstat (limited to 'target')
-rw-r--r--target/linux/mvebu/patches-4.14/529-armada388-clearfog-enable-spi-flash.patch50
1 files changed, 50 insertions, 0 deletions
diff --git a/target/linux/mvebu/patches-4.14/529-armada388-clearfog-enable-spi-flash.patch b/target/linux/mvebu/patches-4.14/529-armada388-clearfog-enable-spi-flash.patch
new file mode 100644
index 0000000000..7ec5b01947
--- /dev/null
+++ b/target/linux/mvebu/patches-4.14/529-armada388-clearfog-enable-spi-flash.patch
@@ -0,0 +1,50 @@
+From bb683d7ad9d53442586cfdd0a79a6d6c1fec344e Mon Sep 17 00:00:00 2001
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Thu, 28 Jun 2018 10:13:35 +0300
+Subject: [PATCH] ARM: dts: armada388-clearfog: enable spi flash
+
+The SolidRun Armada 388 SOM has the SPI flash populated by default
+unless the customer explicitly asks otherwise. Enable support by
+default.
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+Acked-by: Russell King <rmk+kernel@armlinux.org.uk>
+Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
+---
+ arch/arm/boot/dts/armada-388-clearfog.dts | 2 +-
+ arch/arm/boot/dts/armada-388-clearfog.dtsi | 2 +-
+ arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi | 1 -
+ 3 files changed, 2 insertions(+), 3 deletions(-)
+
+--- a/arch/arm/boot/dts/armada-388-clearfog.dts
++++ b/arch/arm/boot/dts/armada-388-clearfog.dts
+@@ -284,7 +284,7 @@
+ &spi1 {
+ /*
+ * Add SPI CS pins for clearfog:
+- * CS0: W25Q32 (not populated on uSOM)
++ * CS0: W25Q32
+ * CS1:
+ * CS2: mikrobus
+ */
+--- a/arch/arm/boot/dts/armada-388-clearfog.dtsi
++++ b/arch/arm/boot/dts/armada-388-clearfog.dtsi
+@@ -265,7 +265,7 @@
+ &spi1 {
+ /*
+ * Add SPI CS pins for clearfog:
+- * CS0: W25Q32 (not populated on uSOM)
++ * CS0: W25Q32
+ * CS1: PIC microcontroller (Pro models)
+ * CS2: mikrobus
+ */
+--- a/arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi
++++ b/arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi
+@@ -135,7 +135,6 @@
+ compatible = "w25q32", "jedec,spi-nor";
+ reg = <0>; /* Chip select 0 */
+ spi-max-frequency = <3000000>;
+- status = "disabled";
+ };
+ };
+