You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
51 lines
1.5 KiB
Diff
51 lines
1.5 KiB
Diff
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";
|
|
};
|
|
};
|
|
|