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 <tome...@o2.pl>
---
...a-3720-espressobin-wire-up-spi-flash.patch | 45 +++++++++++++++++++
...sporessobin-dt-enable-spi-nor-on-i2c.patch | 29 ------------
2 files changed, 45 insertions(+), 29 deletions(-)
create mode 100644
target/linux/mvebu/patches-4.14/521-arm64-dts-armada-3720-espressobin-wire-up-spi-flash.patch
delete mode 100644
target/linux/mvebu/patches-4.14/521-esporessobin-dt-enable-spi-nor-on-i2c.patch
diff --git
a/target/linux/mvebu/patches-4.14/521-arm64-dts-armada-3720-espressobin-wire-up-spi-flash.patch
b/target/linux/mvebu/patches-4.14/521-arm64-dts-armada-3720-espressobin-wire-up-spi-flash.patch
new file mode 100644
index 0000000000..fb80db7e89
--- /dev/null
+++
b/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 <ellierev...@gmail.com>
+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 <gregory.clem...@bootlin.com>
+Signed-off-by: Ellie Reeves <ellierev...@gmail.com>
+Signed-off-by: Uwe Kleine-König <u.kleine-koe...@pengutronix.de>
+Signed-off-by: Gregory CLEMENT <gregory.clem...@bootlin.com>
+
+[drop partitions, not every U-Boot has same layout]
+Signed-off-by: Tomasz Maciej Nowak <tome...@o2.pl>
+---
+ .../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";
diff --git
a/target/linux/mvebu/patches-4.14/521-esporessobin-dt-enable-spi-nor-on-i2c.patch
b/target/linux/mvebu/patches-4.14/521-esporessobin-dt-enable-spi-nor-on-i2c.patch
deleted file mode 100644
index 3cabaa7a01..0000000000
---
a/target/linux/mvebu/patches-4.14/521-esporessobin-dt-enable-spi-nor-on-i2c.patch
+++ /dev/null
@@ -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";
--
2.17.1
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/listinfo/openwrt-devel
