Skip to contentSkip to conversation

ARM: dts: vf610-zii-dev-rev-b: Fix SPI flash node name

PATCH In review Andrey Smirnov 2 participants 8 messages Sep 8, 2019 – Sep 9, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/7 ARM: dts: vf610-zii-dev-rev-b: Fix SPI flash node name

Latest upstream DTS renamed the node to flash@0, so we need to follow suit.

---
 arch/arm/dts/vf610-zii-dev-rev-b.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/dts/vf610-zii-dev-rev-b.dts +1 -1
index c90af91a9f..abc5237080 100644
@@ -10,7 +10,7 @@
 
 / {
 	spi0 {
-		m25p128@0 {
+		flash@0 {
 			#address-cells = <1>;
 			#size-cells = <0>;
 
Signature · 7 lines
2.21.0


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#1 lore raw

PATCH 2/7 ARM: dts: vf610-zii-dev-rev-c: Fix DSPI flash node name

Latest upstream DTS renamed the node to flash@0, so we need to follow suit.

---
 arch/arm/dts/vf610-zii-dev-rev-c.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/dts/vf610-zii-dev-rev-c.dts +1 -1
index ecec0b1830..62c70c8905 100644
@@ -21,7 +21,7 @@
 };
 
 &dspi0 {
-	m25p128@0 {
+	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <0>;
 
Signature · 7 lines
2.21.0


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#2 lore raw

PATCH 3/7 ARM: dts: vf610-zii-cfu1: Configure "STATUS" LED as heartbeat

In reply to Andrey Smirnov

Configure "STATUS" LED as heartbeat in addition to "DEBUG" LED not exposed on the front panel. This way it becomes a bit easier to see what part of the boot process the device is at.

---
 arch/arm/dts/vf610-zii-cfu1.dts | 6 ++++++
 1 file changed, 6 insertions(+)
arch/arm/dts/vf610-zii-cfu1.dts +6 -0
index a9793adc3c..aace448e76 100644
@@ -17,4 +17,10 @@
 		 */
 		switch-eeprom = &switch0;
 	};
+
+	gpio-leds {
+		led-status {
+			linux,default-trigger = "heartbeat";
+		};
+	};
 };
Signature · 7 lines
2.21.0


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#3 lore raw

PATCH 4/7 ARM: dts: vf610-zii-cfu1: Expose fiber optic module EEPROM

In reply to Andrey Smirnov

EEPROM on a fiber optic module present on CFU1 can be exposed as a AT24 compatible device. Add corresponding DT node needed for that.

---
 arch/arm/dts/vf610-zii-cfu1.dts | 9 +++++++++
 1 file changed, 9 insertions(+)
arch/arm/dts/vf610-zii-cfu1.dts +9 -0
index aace448e76..70cd9d1ba9 100644
@@ -16,6 +16,7 @@
 		 * fact to create a desirable naming
 		 */
 		switch-eeprom = &switch0;
+		fiber-eeprom0 = &fiber_eeprom0;
 	};
 
 	gpio-leds {
@@ -24,3 +25,11 @@
 		};
 	};
 };
+
+&i2c0 {
+	fiber_eeprom0: eeprom@50 {
+		compatible = "atmel,24c04";
+		reg = <0x50>;
+		label = "fiber0";
+	};
+};
Signature · 7 lines
2.21.0


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#4 lore raw

PATCH 5/7 ARM: dts: vf610-zii-scu4-aib: Expose fiber EEPROM modules

In reply to Andrey Smirnov

EEPROM on a fiber optic modules present on SCU4 can be exposed as a AT24 compatible device. Add corresponding DT node needed for that.

---
 arch/arm/dts/vf610-zii-scu4-aib.dts | 90 +++++++++++++++++++++++++++++
 1 file changed, 90 insertions(+)
arch/arm/dts/vf610-zii-scu4-aib.dts +90 -0
index abe9e14fd7..43a13e243d 100644
@@ -17,5 +17,95 @@
 		switch1-eeprom = &switch1;
 		switch2-eeprom = &switch2;
 		switch3-eeprom = &switch3;
+		fiber-eeprom0 = &fiber_eeprom0;
+		fiber-eeprom1 = &fiber_eeprom1;
+		fiber-eeprom2 = &fiber_eeprom2;
+		fiber-eeprom3 = &fiber_eeprom3;
+		fiber-eeprom4 = &fiber_eeprom4;
+		fiber-eeprom5 = &fiber_eeprom5;
+		fiber-eeprom6 = &fiber_eeprom6;
+		fiber-eeprom7 = &fiber_eeprom7;
+		fiber-eeprom8 = &fiber_eeprom8;
+		fiber-eeprom9 = &fiber_eeprom9;
+	};
+};
+
+&sff0_i2c {
+	fiber_eeprom0: eeprom@50 {
+		compatible = "atmel,24c04";
+		reg = <0x50>;
+		label = "fiber0";
+	};
+};
+
+&sff1_i2c {
+	fiber_eeprom1: eeprom@50 {
+		compatible = "atmel,24c04";
+		reg = <0x50>;
+		label = "fiber1";
+	};
+};
+
+&sff2_i2c {
+	fiber_eeprom2: eeprom@50 {
+		compatible = "atmel,24c04";
+		reg = <0x50>;
+		label = "fiber2";
+	};
+};
+
+&sff3_i2c {
+	fiber_eeprom3: eeprom@50 {
+		compatible = "atmel,24c04";
+		reg = <0x50>;
+		label = "fiber3";
+	};
+};
+
+&sff4_i2c {
+	fiber_eeprom4: eeprom@50 {
+		compatible = "atmel,24c04";
+		reg = <0x50>;
+		label = "fiber4";
+	};
+};
+
+&sff5_i2c {
+	fiber_eeprom5: eeprom@50 {
+		compatible = "atmel,24c04";
+		reg = <0x50>;
+		label = "fiber5";
+	};
+};
+
+&sff6_i2c {
+	fiber_eeprom6: eeprom@50 {
+		compatible = "atmel,24c04";
+		reg = <0x50>;
+		label = "fiber6";
+	};
+};
+
+&sff7_i2c {
+	fiber_eeprom7: eeprom@50 {
+		compatible = "atmel,24c04";
+		reg = <0x50>;
+		label = "fiber7";
+	};
+};
+
+&sff8_i2c {
+	fiber_eeprom8: eeprom@50 {
+		compatible = "atmel,24c04";
+		reg = <0x50>;
+		label = "fiber8";
+	};
+};
+
+&sff9_i2c {
+	fiber_eeprom9: eeprom@50 {
+		compatible = "atmel,24c04";
+		reg = <0x50>;
+		label = "fiber9";
 	};
 };
Signature · 7 lines
2.21.0


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#5 lore raw

PATCH 6/7 ARM: dts: imx8mq-zii-ultra: Add switch EEPROM alias

In reply to Andrey Smirnov
---
 arch/arm/dts/imx8mq-zii-ultra.dtsi | 9 +++++++++
 1 file changed, 9 insertions(+)
arch/arm/dts/imx8mq-zii-ultra.dtsi +9 -0
index 53679b0d3c..6e41e820b8 100644
@@ -23,6 +23,15 @@
 		};
 	};
 
+	aliases {
+		/*
+		 * NVMEM device corresponding to EEPROM attached to
+		 * the switch shared DT node with it, so we use that
+		 * fact to create a desirable naming
+		 */
+		switch-eeprom = &switch;
+	};
+
 	mdio0: bitbang-mdio {
 		compatible = "virtual,mdio-gpio";
 		pinctrl-names = "default";
Signature · 7 lines
2.21.0


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#6 lore raw

PATCH 7/7 ARM: zii-vf610-dev: Re-align SCU4's hostname with upstream kernel

In reply to Andrey Smirnov
---
 arch/arm/boards/zii-vf610-dev/board.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boards/zii-vf610-dev/board.c +1 -1
index 0697a1660e..1d10f12f63 100644
@@ -128,7 +128,7 @@ static int zii_vf610_dev_set_hostname(void)
 		{ "zii,vf610cfu1", "cfu1" },
 		{ "zii,vf610dev-b", "dev-rev-b" },
 		{ "zii,vf610dev-c", "dev-rev-c" },
-		{ "zii,vf610scu4-aib-c", "scu4-aib-rev-c" },
+		{ "zii,vf610scu4-aib", "scu4-aib" },
 	};
 
 	if (!of_machine_is_compatible("zii,vf610dev"))
Signature · 7 lines
2.21.0


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
maintainer
#7 lore raw
In reply to Andrey Smirnov
Quoted 7 lines · Andrey Smirnov

Latest upstream DTS renamed the node to flash@0, so we need to follow suit.

---
 arch/arm/dts/vf610-zii-dev-rev-b.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks. Some of the patches didn't apply cleanly, please check the result.

Sascha

Signature · 9 lines
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox