ARM: mvebu: helios4 dts changes to enable SPI

Move all aliases defintions into the main dts file
Add u-boot definiton to i2c0 based on clearfog
set spi1 status to okay

Signed-off-by: Dennis Gilmore <dennis@ausil.us>

diff --git a/arch/arm/dts/armada-388-helios4-u-boot.dtsi b/arch/arm/dts/armada-388-helios4-u-boot.dtsi
index 07538898545700e8d570dcbea49b07074d1c8f7c..1047c1af2330413ab8e92bedf1dc86bddafb8cea 100644 (file)
--- a/arch/arm/dts/armada-388-helios4-u-boot.dtsi
+++ b/arch/arm/dts/armada-388-helios4-u-boot.dtsi
@@ -1,13 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0+
 
-/ {
-       aliases {
-               i2c0 = &i2c0;
-               i2c1 = &i2c1;
-               spi1 = &spi1;
-       };
-};
-
 &eth0 {
        phy-reset-gpios = <&gpio0 19 GPIO_ACTIVE_LOW>;
 };
@@ -20,7 +12,6 @@
 };
 
 &w25q32 {
-       status = "okay";
        u-boot,dm-spl;
 };
 
@@ -37,5 +28,17 @@
 };
 
 &sdhci {
-       u-boot,dm-spl;
+       u-boot,dm-spl;
+};
+
+&i2c0 {
+       u-boot,dm-spl;
+
+       eeprom@52 {
+               u-boot,dm-spl;
+       };
+
+       eeprom@53 {
+               u-boot,dm-spl;
+       };
 };

diff --git a/arch/arm/dts/armada-388-helios4.dts b/arch/arm/dts/armada-388-helios4.dts
index fb49df2a3bce7b02169dae13551dd5eb5f7befba..cbc296a46c9b307772c1c59630155b9d68f0bd1a 100644 (file)
--- a/arch/arm/dts/armada-388-helios4.dts
+++ b/arch/arm/dts/armada-388-helios4.dts
@@ -22,10 +22,14 @@
        };
 
        aliases {
-               /* So that mvebu u-boot can update the MAC addresses */
+               /* So that mvebu u-boot can update the MAC address */
                ethernet1 = &eth0;
+               spi1 = &spi1;
+               i2c0 = &i2c0;
+               i2c1 = &i2c1;
        };
 
+
        chosen {
                stdout-path = "serial0:115200n8";
        };
@@ -306,3 +310,11 @@
                };
        };
 };
+
+&w25q32 {
+       status = "okay";
+};
+
+&spi1 {
+       status = "okay";
+};