Merge branch 'for-next/imx'

6 files changed, 117 insertions, 3 deletions

diff --git a/arch/arm/boards/zii-vf610-dev/board.c b/arch/arm/boards/zii-vf610-dev/board.c
index 0697a1660e..1d10f12f63 100644
--- a/arch/arm/boards/zii-vf610-dev/board.c
+++ b/arch/arm/boards/zii-vf610-dev/board.c
@@ -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"))
diff --git a/arch/arm/dts/imx8mq-zii-ultra.dtsi b/arch/arm/dts/imx8mq-zii-ultra.dtsi
index 53679b0d3c..6e41e820b8 100644
--- a/arch/arm/dts/imx8mq-zii-ultra.dtsi
+++ b/arch/arm/dts/imx8mq-zii-ultra.dtsi
@@ -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";
diff --git a/arch/arm/dts/vf610-zii-cfu1.dts b/arch/arm/dts/vf610-zii-cfu1.dts
index 1de9ee9ad2..0f1ee140e1 100644
--- a/arch/arm/dts/vf610-zii-cfu1.dts
+++ b/arch/arm/dts/vf610-zii-cfu1.dts
@@ -16,5 +16,20 @@
 		* fact to create a desirable naming
 		*/
 		switch-eeprom = &switch0;
+		fiber-eeprom0 = &fiber_eeprom0;
+	};
+
+	gpio-leds {
+		led-status {
+			linux,default-trigger = "heartbeat";
+		};
+	};
+};
+
+&i2c0 {
+	fiber_eeprom0: eeprom@50 {
+		compatible = "atmel,24c04";
+		reg = <0x50>;
+		label = "fiber0";
 	};
 };
diff --git a/arch/arm/dts/vf610-zii-dev-rev-b.dts b/arch/arm/dts/vf610-zii-dev-rev-b.dts
index c90af91a9f..abc5237080 100644
--- a/arch/arm/dts/vf610-zii-dev-rev-b.dts
+++ b/arch/arm/dts/vf610-zii-dev-rev-b.dts
@@ -10,7 +10,7 @@
 
 / {
 	spi0 {
-		m25p128@0 {
+		flash@0 {
 			#address-cells = <1>;
 			#size-cells = <0>;
 
diff --git a/arch/arm/dts/vf610-zii-dev-rev-c.dts b/arch/arm/dts/vf610-zii-dev-rev-c.dts
index ecec0b1830..62c70c8905 100644
--- a/arch/arm/dts/vf610-zii-dev-rev-c.dts
+++ b/arch/arm/dts/vf610-zii-dev-rev-c.dts
@@ -21,7 +21,7 @@
 };
 
 &dspi0 {
-	m25p128@0 {
+	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <0>;
 
diff --git a/arch/arm/dts/vf610-zii-scu4-aib.dts b/arch/arm/dts/vf610-zii-scu4-aib.dts
index abe9e14fd7..43a13e243d 100644
--- a/arch/arm/dts/vf610-zii-scu4-aib.dts
+++ b/arch/arm/dts/vf610-zii-scu4-aib.dts
@@ -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";
 	};
 };