build/patch/kernel/mvebu64-dev/adjust-espresso-dts.patch
Igor Pečovnik d4332b5c66
Move Mvebu64 / Espressobin dev kernel to 5.4.y (#1635)
* Espressobin (mvebu64) moving to 5.4.y
2019-11-26 22:52:23 +01:00

91 lines
1.8 KiB
Diff

diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
index cd5fbfa38..a81391164 100644
--- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
@@ -41,6 +41,16 @@
3300000 0x0>;
enable-active-high;
};
+
+ leds {
+ compatible = "gpio-leds";
+
+ red {
+ label = "espressobin:red:usr";
+ gpios = <&gpionb 2 GPIO_ACTIVE_LOW>;
+ };
+ };
+
};
/* J9 */
@@ -95,19 +105,35 @@
flash@0 {
reg = <0>;
+ /*
+ * Originally "winbond,w25q32dw", but since the manufacturer is known
+ * to have replaced the part with "macronix,mx25u3235f" in some board
+ * batches, just use the generic "jedec,spi-nor" and let the actual
+ * chip type be probed. The partition table still depends on the chip
+ * being 4 MiB in size.
+ */
compatible = "jedec,spi-nor";
spi-max-frequency = <104000000>;
m25p,fast-read;
- };
-};
+ status = "okay";
+
+ partitions {
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
-&sdhci0 {
- non-removable;
- bus-width = <8>;
- mmc-ddr-1_8v;
- mmc-hs400-1_8v;
- marvell,pad-type = "fixed-1-8v";
- status = "okay";
+ partition@0 {
+ label = "uboot";
+ reg = <0 0x3f0000>;
+ };
+
+ partition@180000 {
+ label = "ubootenv";
+ reg = <0x3f0000 0x10000>;
+ };
+ };
+
+ };
};
/* Exported on the micro USB connector J5 through an FTDI */
@@ -137,11 +163,6 @@
status = "okay";
};
-/* J8 */
-&usb2 {
- status = "okay";
-};
-
&mdio {
switch0: switch0@1 {
compatible = "marvell,mv88e6085";
@@ -199,12 +220,6 @@
switch0phy2: switch0phy2@13 {
reg = <0x13>;
};
-
- partition@190000 {
- label = "Linux";
- reg = <0x190000 0xDF0000>;
- };
-
};
};
};