arm: dts: socfpga: Fix SPI aliases

The SPI aliases are completely wrong. First, they point to non-existing
/spi@.* nodes instead of the correct /soc/spi@.* nodes. Second, the use
ad-hoc string instead of a handle. Furthermore, they are copied multiple
times in each board DTS.

So fix it such that we move these into socfpga.dtsi and make them use
the usual handles.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>

diff --git a/arch/arm/dts/socfpga.dtsi b/arch/arm/dts/socfpga.dtsi
index 9b1242025dcec7e6a091ae40b93490779ea1928c..3a3fb4a9c9b4e75ffbceaccf6ba03492cda88f92 100644 (file)
--- a/arch/arm/dts/socfpga.dtsi
+++ b/arch/arm/dts/socfpga.dtsi
@@ -20,6 +20,9 @@
                timer1 = &timer1;
                timer2 = &timer2;
                timer3 = &timer3;
+               spi0 = &qspi;
+               spi1 = &spi0;
+               spi2 = &spi1;
        };
 
        cpus {

diff --git a/arch/arm/dts/socfpga_arria5_socdk.dts b/arch/arm/dts/socfpga_arria5_socdk.dts
index 1b8689787280a6cc9deb7f93b1e3625e6baf4e50..f2b5963f5943c48220031e99d4c417437a021d06 100644 (file)
--- a/arch/arm/dts/socfpga_arria5_socdk.dts
+++ b/arch/arm/dts/socfpga_arria5_socdk.dts
@@ -22,13 +22,9 @@
 
        aliases {
                /* this allow the ethaddr uboot environmnet variable contents
-               * to be added to the gmac1 device tree blob.
-               */
+                * to be added to the gmac1 device tree blob.
+                */
                ethernet0 = &gmac1;
-
-               spi0 = "/spi@ff705000";         /* QSPI */
-               spi1 = "/spi@fff00000";
-               spi2 = "/spi@fff01000";
        };
 
        regulator_3_3v: 3-3-v-regulator {

diff --git a/arch/arm/dts/socfpga_cyclone5_socdk.dts b/arch/arm/dts/socfpga_cyclone5_socdk.dts
index 0b300b92be0a3112ebc9207a74ca5ff53569343c..9650eb087775d289fe3ffcea4839108a9f942d60 100644 (file)
--- a/arch/arm/dts/socfpga_cyclone5_socdk.dts
+++ b/arch/arm/dts/socfpga_cyclone5_socdk.dts
@@ -25,10 +25,6 @@
                 * to be added to the gmac1 device tree blob.
                 */
                ethernet0 = &gmac1;
-
-               spi0 = "/spi@ff705000";         /* QSPI */
-               spi1 = "/spi@fff00000";
-               spi2 = "/spi@fff01000";
        };
 
        regulator_3_3v: 3-3-v-regulator {

diff --git a/arch/arm/dts/socfpga_cyclone5_socrates.dts b/arch/arm/dts/socfpga_cyclone5_socrates.dts
index ea30483e52fbc3d93b1438ef576cdf36bf1f4d18..00b1830485a098dcfd583a7af6ed63dea112899d 100644 (file)
--- a/arch/arm/dts/socfpga_cyclone5_socrates.dts
+++ b/arch/arm/dts/socfpga_cyclone5_socrates.dts
@@ -14,12 +14,6 @@
                bootargs = "console=ttyS0,115200";
        };
 
-       aliases {
-               spi0 = "/spi@ff705000";         /* QSPI */
-               spi1 = "/spi@fff00000";
-               spi2 = "/spi@fff01000";
-       };
-
        memory {
                name = "memory";
                device_type = "memory";