Преглед на файлове

mvebu: replace espressobin spi patch with upstream one

For easier future kernel bumps replace spi patch with upstream version
slightly modified. The modification removes partition definitions which
has been diffrent for some U-Boot versions.
Also this removes unnecessary i2c definition which was in the old patch.

Signed-off-by: Tomasz Maciej Nowak <[email protected]>
Tomasz Maciej Nowak преди 7 години
родител
ревизия
f5bce268b0

+ 45 - 0
target/linux/mvebu/patches-4.14/521-arm64-dts-armada-3720-espressobin-wire-up-spi-flash.patch

@@ -0,0 +1,45 @@
+From bffed3d4abcd32ba6d492a9bd7ebe81dc92eaa9a Mon Sep 17 00:00:00 2001
+From: Ellie Reeves <[email protected]>
+Date: Sun, 25 Mar 2018 21:57:36 +0200
+Subject: [PATCH] arm64: dts: armada-3720-espressobin: wire up spi flash
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is the storage the machine boots from by default. The partitioning
+is taken from the U-Boot that is shipped with the board. There is some
+more space on the flash that isn't used.
+
+Tested-by: Gregory CLEMENT <[email protected]>
+Signed-off-by: Ellie Reeves <[email protected]>
+Signed-off-by: Uwe Kleine-König <[email protected]>
+Signed-off-by: Gregory CLEMENT <[email protected]>
+
+[drop partitions, not every U-Boot has same layout]
+Signed-off-by: Tomasz Maciej Nowak <[email protected]>
+---
+ .../dts/marvell/armada-3720-espressobin.dts   | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+--- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
++++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
+@@ -96,6 +96,19 @@
+ 	status = "okay";
+ };
+ 
++&spi0 {
++	status = "okay";
++
++	flash@0 {
++		#address-cells = <1>;
++		#size-cells = <1>;
++		reg = <0>;
++		compatible = "winbond,w25q32dw", "jedec,spi-flash";
++		spi-max-frequency = <104000000>;
++		m25p,fast-read;
++	};
++};
++
+ /* Exported on the micro USB connector J5 through an FTDI */
+ &uart0 {
+ 	status = "okay";

+ 0 - 29
target/linux/mvebu/patches-4.14/521-esporessobin-dt-enable-spi-nor-on-i2c.patch

@@ -1,29 +0,0 @@
---- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
-+++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
-@@ -111,6 +111,26 @@
- 	status = "okay";
- };
- 
-+&spi0 {
-+	status = "okay";
-+
-+	w25q32dw@0 {
-+		#address-cells = <1>;
-+		#size-cells = <1>;
-+		compatible = "jedec,spi-nor";
-+		reg = <0>;
-+		spi-max-frequency = <104000000>;
-+		m25,fast-read;
-+
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&spi_quad_pins>;
-+	};
-+};
-+
-+&i2c0 {
-+	status = "okay";
-+};
-+
- &mdio {
- 	switch0: switch0@1 {
- 		compatible = "marvell,mv88e6085";