]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ARM: dts: mvebu: A37x/XP/38x/39x: Move SPI controller nodes into 'soc' node
authorStefan Roese <sr@denx.de>
Wed, 13 Jul 2016 09:55:18 +0000 (11:55 +0200)
committerGregory CLEMENT <gregory.clement@free-electrons.com>
Mon, 8 Aug 2016 14:16:31 +0000 (16:16 +0200)
This patch moves all Armada 370/XP/38x/39x SPI controller nodes from the
'internal-regs' node down into the 'soc' node. This is in preparation
to enable the usage of the SPI direct access mode. A follow-up patch
will add the static MBus mappings for the SPI devices into the 'reg'
property of the SPI controller DT node.

By moving these SPI controller nodes, this patch also makes use of
the labels rather than keeping the tree structure.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Gregory CLEMENT <gregory.clement@free-electrons.com>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Mark Brown <broonie@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
20 files changed:
arch/arm/boot/dts/armada-370-db.dts
arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi
arch/arm/boot/dts/armada-370-synology-ds213j.dts
arch/arm/boot/dts/armada-370-xp.dtsi
arch/arm/boot/dts/armada-370.dtsi
arch/arm/boot/dts/armada-385-db-ap.dts
arch/arm/boot/dts/armada-385-linksys.dtsi
arch/arm/boot/dts/armada-388-clearfog.dts
arch/arm/boot/dts/armada-388-db.dts
arch/arm/boot/dts/armada-388-gp.dts
arch/arm/boot/dts/armada-388-rd.dts
arch/arm/boot/dts/armada-38x.dtsi
arch/arm/boot/dts/armada-398-db.dts
arch/arm/boot/dts/armada-39x.dtsi
arch/arm/boot/dts/armada-xp-axpwifiap.dts
arch/arm/boot/dts/armada-xp-db.dts
arch/arm/boot/dts/armada-xp-gp.dts
arch/arm/boot/dts/armada-xp-linksys-mamba.dts
arch/arm/boot/dts/armada-xp-synology-ds414.dts
arch/arm/boot/dts/armada-xp.dtsi

index 2364fc56ae13904dafc50ea25c9c3aa4c4063c0d..033fa63544f7932e543dd7dc3aaa26694e0f2673 100644 (file)
                                status = "okay";
                        };
 
-                       spi0: spi@10600 {
-                               pinctrl-0 = <&spi0_pins2>;
-                               pinctrl-names = "default";
-                               status = "okay";
-
-                               spi-flash@0 {
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-                                       compatible = "mx25l25635e", "jedec,spi-nor";
-                                       reg = <0>; /* Chip select 0 */
-                                       spi-max-frequency = <50000000>;
-                               };
-                       };
-
                        nand@d0000 {
                                status = "okay";
                                num-cs = <1>;
                compatible = "linux,spdif-dir";
        };
 };
+
+&spi0 {
+       pinctrl-0 = <&spi0_pins2>;
+       pinctrl-names = "default";
+       status = "okay";
+
+       spi-flash@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "mx25l25635e", "jedec,spi-nor";
+               reg = <0>; /* Chip select 0 */
+               spi-max-frequency = <50000000>;
+       };
+};
+
index 1aba08e4377c34212bad023497792c031714b8f3..01cded310cbc576a63252de2614763274fac9ef4 100644 (file)
                                phy-mode = "rgmii-id";
                        };
 
-                       spi@10600 {
-                               status = "okay";
-                               pinctrl-0 = <&spi0_pins2>;
-                               pinctrl-names = "default";
-
-                               spi-flash@0 {
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-                                       /* MX25L8006E */
-                                       compatible = "mxicy,mx25l8005", "jedec,spi-nor";
-                                       reg = <0>; /* Chip select 0 */
-                                       spi-max-frequency = <50000000>;
-
-                                       partition@0 {
-                                               label = "u-boot";
-                                               reg = <0x0 0x100000>;
-                                       };
-                               };
-                       };
-
                        usb@50000 {
                                status = "okay";
                        };
                marvell,function = "gpio";
        };
 };
+
+&spi0 {
+       status = "okay";
+       pinctrl-0 = <&spi0_pins2>;
+       pinctrl-names = "default";
+
+       spi-flash@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               /* MX25L8006E */
+               compatible = "mxicy,mx25l8005", "jedec,spi-nor";
+               reg = <0>; /* Chip select 0 */
+               spi-max-frequency = <50000000>;
+
+               partition@0 {
+                       label = "u-boot";
+                       reg = <0x0 0x100000>;
+               };
+       };
+};
index 8ca7a4340c0ff8301a80b1d6e75b52770cfdeebd..a9cc427768745cd39502aced36e36bc1448b143d 100644 (file)
                                status = "disabled";
                        };
 
-                       spi0: spi@10600 {
-                               status = "okay";
-
-                               spi-flash@0 {
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-                                       compatible = "micron,n25q064", "jedec,spi-nor";
-                                       reg = <0>; /* Chip select 0 */
-                                       spi-max-frequency = <20000000>;
-
-                                       /*
-                                        * Warning!
-                                        *
-                                        * Synology u-boot uses its compiled-in environment
-                                        * and it seems Synology did not care to change u-boot
-                                        * default configuration in order to allow saving a
-                                        * modified environment at a sensible location. So,
-                                        * if you do a 'saveenv' under u-boot, your modified
-                                        * environment will be saved at 1MB after the start
-                                        * of the flash, i.e. in the middle of the uImage.
-                                        * For that reason, it is strongly advised not to
-                                        * change the default environment, unless you know
-                                        * what you are doing.
-                                        */
-                                       partition@00000000 { /* u-boot */
-                                               label = "RedBoot";
-                                               reg = <0x00000000 0x000c0000>; /* 768KB */
-                                       };
-
-                                       partition@000c0000 { /* uImage */
-                                               label = "zImage";
-                                               reg = <0x000c0000 0x002d0000>; /* 2880KB */
-                                       };
-
-                                       partition@00390000 { /* uInitramfs */
-                                               label = "rd.gz";
-                                               reg = <0x00390000 0x00440000>; /* 4250KB */
-                                       };
-
-                                       partition@007d0000 { /* MAC address and serial number */
-                                               label = "vendor";
-                                               reg = <0x007d0000 0x00010000>; /* 64KB */
-                                       };
-
-                                       partition@007e0000 {
-                                               label = "RedBoot config";
-                                               reg = <0x007e0000 0x00010000>; /* 64KB */
-                                       };
-
-                                       partition@007f0000 {
-                                               label = "FIS directory";
-                                               reg = <0x007f0000 0x00010000>; /* 64KB */
-                                       };
-                               };
-                       };
-
                        i2c@11000 {
                                compatible = "marvell,mv64xxx-i2c";
                                pinctrl-0 = <&i2c0_pins>;
                marvell,function = "gpio";
        };
 };
+
+&spi0 {
+       status = "okay";
+
+       spi-flash@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "micron,n25q064", "jedec,spi-nor";
+               reg = <0>; /* Chip select 0 */
+               spi-max-frequency = <20000000>;
+
+               /*
+                * Warning!
+                *
+                * Synology u-boot uses its compiled-in environment
+                * and it seems Synology did not care to change u-boot
+                * default configuration in order to allow saving a
+                * modified environment at a sensible location. So,
+                * if you do a 'saveenv' under u-boot, your modified
+                * environment will be saved at 1MB after the start
+                * of the flash, i.e. in the middle of the uImage.
+                * For that reason, it is strongly advised not to
+                * change the default environment, unless you know
+                * what you are doing.
+                */
+               partition@00000000 { /* u-boot */
+                       label = "RedBoot";
+                       reg = <0x00000000 0x000c0000>; /* 768KB */
+               };
+
+               partition@000c0000 { /* uImage */
+                       label = "zImage";
+                       reg = <0x000c0000 0x002d0000>; /* 2880KB */
+               };
+
+               partition@00390000 { /* uInitramfs */
+                       label = "rd.gz";
+                       reg = <0x00390000 0x00440000>; /* 4250KB */
+               };
+
+               partition@007d0000 { /* MAC address and serial number */
+                       label = "vendor";
+                       reg = <0x007d0000 0x00010000>; /* 64KB */
+               };
+
+               partition@007e0000 {
+                       label = "RedBoot config";
+                       reg = <0x007e0000 0x00010000>; /* 64KB */
+               };
+
+               partition@007f0000 {
+                       label = "FIS directory";
+                       reg = <0x007f0000 0x00010000>; /* 64KB */
+               };
+       };
+};
index a718866ba52d8e827653c7cbcb3341778f480b83..a0903cd9c8c8979048496fd50eeac4d72e220e7d 100644 (file)
                                interrupts = <50>;
                        };
 
-                       spi0: spi@10600 {
-                               reg = <0x10600 0x28>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                               cell-index = <0>;
-                               interrupts = <30>;
-                               clocks = <&coreclk 0>;
-                               status = "disabled";
-                       };
-
-                       spi1: spi@10680 {
-                               reg = <0x10680 0x28>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                               cell-index = <1>;
-                               interrupts = <92>;
-                               clocks = <&coreclk 0>;
-                               status = "disabled";
-                       };
-
                        i2c0: i2c@11000 {
                                compatible = "marvell,mv64xxx-i2c";
                                #address-cells = <1>;
                                status = "disabled";
                        };
                };
+
+               spi0: spi@10600 {
+                       reg = <MBUS_ID(0xf0, 0x01) 0x10600 0x28>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       cell-index = <0>;
+                       interrupts = <30>;
+                       clocks = <&coreclk 0>;
+                       status = "disabled";
+               };
+
+               spi1: spi@10680 {
+                       reg = <MBUS_ID(0xf0, 0x01) 0x10680 0x28>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       cell-index = <1>;
+                       interrupts = <92>;
+                       clocks = <&coreclk 0>;
+                       status = "disabled";
+               };
        };
 
        clocks {
index 3b06aa835448084b04e5a4ddaf647110c3a87909..b4258105e91f090c0230e7932fbebacd185af4aa 100644 (file)
                                wt-override;
                        };
 
-                       /*
-                        * Default SPI pinctrl setting, can be overwritten on
-                        * board level if a different configuration is used.
-                        */
-                       spi0: spi@10600 {
-                               compatible = "marvell,armada-370-spi",
-                                               "marvell,orion-spi";
-                               pinctrl-0 = <&spi0_pins1>;
-                               pinctrl-names = "default";
-                       };
-
-                       spi1: spi@10680 {
-                               compatible = "marvell,armada-370-spi",
-                                               "marvell,orion-spi";
-                               pinctrl-0 = <&spi1_pins>;
-                               pinctrl-names = "default";
-                       };
-
                        i2c0: i2c@11000 {
                                reg = <0x11000 0x20>;
                        };
                marvell,function = "ge1";
        };
 };
+
+/*
+ * Default SPI pinctrl setting, can be overwritten on
+ * board level if a different configuration is used.
+ */
+&spi0 {
+       compatible = "marvell,armada-370-spi", "marvell,orion-spi";
+       pinctrl-0 = <&spi0_pins1>;
+       pinctrl-names = "default";
+};
+
+&spi1 {
+       compatible = "marvell,armada-370-spi", "marvell,orion-spi";
+       pinctrl-0 = <&spi1_pins>;
+       pinctrl-names = "default";
+};
index 2d3fd6e76e2c3028101d7e042bcb1e1b09c0f6c1..ca38200a4f0d5f820e9b2d09c5cd7f5bb6e4e73b 100644 (file)
                          MBUS_ID(0x0c, 0x04) 0 0xf1200000 0x100000>;
 
                internal-regs {
-                       spi1: spi@10680 {
-                               pinctrl-names = "default";
-                               pinctrl-0 = <&spi1_pins>;
-                               status = "okay";
-
-                               spi-flash@0 {
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-                                       compatible = "st,m25p128", "jedec,spi-nor";
-                                       reg = <0>; /* Chip select 0 */
-                                       spi-max-frequency = <54000000>;
-                               };
-                       };
-
                        i2c0: i2c@11000 {
                                pinctrl-names = "default";
                                pinctrl-0 = <&i2c0_pins>;
                gpio = <&gpio1 12 GPIO_ACTIVE_HIGH>;
        };
 };
+
+&spi1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&spi1_pins>;
+       status = "okay";
+
+       spi-flash@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "st,m25p128", "jedec,spi-nor";
+               reg = <0>; /* Chip select 0 */
+               spi-max-frequency = <54000000>;
+       };
+};
index 22f7a13e20b40e094611a10953180fd1679636cd..8f0e508f64aed54436090a9dc714958f16edfd85 100644 (file)
                          MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000>;
 
                internal-regs {
-
-                       spi@10600 {
-                               status = "disabled";
-                       };
-
                        i2c@11000 {
                                pinctrl-names = "default";
                                pinctrl-0 = <&i2c0_pins>;
                marvell,function = "gpio";
        };
 };
+
+&spi0 {
+       status = "disabled";
+};
index 2e0556af6e5eef508fe29f7ec9cdc91452253455..2d2593023fd0c7c592f9e7fe5dedfd911747a2b8 100644 (file)
                                status = "okay";
                        };
 
-                       spi@10680 {
-                               /*
-                                * We don't seem to have the W25Q32 on the
-                                * A1 Rev 2.0 boards, so disable SPI.
-                                * CS0: W25Q32 (doesn't appear to be present)
-                                * CS1:
-                                * CS2: mikrobus
-                                */
-                               pinctrl-0 = <&spi1_pins
-                                            &clearfog_spi1_cs_pins
-                                            &mikro_spi_pins>;
-                               pinctrl-names = "default";
-                               status = "okay";
-
-                               spi-flash@0 {
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
-                                       compatible = "w25q32", "jedec,spi-nor";
-                                       reg = <0>; /* Chip select 0 */
-                                       spi-max-frequency = <3000000>;
-                                       status = "disabled";
-                               };
-                       };
-
                        usb@58000 {
                                /* CON3, nearest  power. */
                                status = "okay";
                };
        };
 };
+
+&spi1 {
+       /*
+        * We don't seem to have the W25Q32 on the
+        * A1 Rev 2.0 boards, so disable SPI.
+        * CS0: W25Q32 (doesn't appear to be present)
+        * CS1:
+        * CS2: mikrobus
+        */
+       pinctrl-0 = <&spi1_pins
+                    &clearfog_spi1_cs_pins
+                    &mikro_spi_pins>;
+       pinctrl-names = "default";
+       status = "okay";
+
+       spi-flash@0 {
+               #address-cells = <1>;
+               #size-cells = <0>;
+               compatible = "w25q32", "jedec,spi-nor";
+               reg = <0>; /* Chip select 0 */
+               spi-max-frequency = <3000000>;
+               status = "disabled";
+       };
+};
index ea93ed727030883354d397609f21388a11bb48c2..de26c762239cb5c41dc11d708c8c979a3cb30219 100644 (file)
                          MBUS_ID(0x0c, 0x04) 0 0xf1200000 0x100000>;
 
                internal-regs {
-                       spi@10600 {
-                               status = "okay";
-
-                               spi-flash@0 {
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-                                       compatible = "w25q32", "jedec,spi-nor";
-                                       reg = <0>; /* Chip select 0 */
-                                       spi-max-frequency = <108000000>;
-                               };
-                       };
-
                        i2c@11000 {
                                status = "okay";
                                clock-frequency = <100000>;
                };
        };
 };
+
+&spi0 {
+       status = "okay";
+
+       spi-flash@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "w25q32", "jedec,spi-nor";
+               reg = <0>; /* Chip select 0 */
+               spi-max-frequency = <108000000>;
+       };
+};
+
index fd75e5e9550fc2bc17d63d052a0f5e2263d219fa..895fa6cfa15a9ee1c56c5827f5f5fe2f8e512196 100644 (file)
                          MBUS_ID(0x0c, 0x04) 0 0xf1200000 0x100000>;
 
                internal-regs {
-                       spi@10600 {
-                               pinctrl-names = "default";
-                               pinctrl-0 = <&spi0_pins>;
-                               status = "okay";
-
-                               spi-flash@0 {
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-                                       compatible = "st,m25p128", "jedec,spi-nor";
-                                       reg = <0>; /* Chip select 0 */
-                                       spi-max-frequency = <50000000>;
-                                       m25p,fast-read;
-                               };
-                       };
-
                        i2c@11000 {
                                pinctrl-names = "default";
                                pinctrl-0 = <&i2c0_pins>;
                marvell,function = "gpio";
        };
 };
+
+&spi0 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&spi0_pins>;
+       status = "okay";
+
+       spi-flash@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "st,m25p128", "jedec,spi-nor";
+               reg = <0>; /* Chip select 0 */
+               spi-max-frequency = <50000000>;
+               m25p,fast-read;
+       };
+};
index 853f9735cc706a6858a2f95fca1f4e88e7bcf958..dd3462ddb6b996401d06c4b3cf36eb6a93a46a34 100644 (file)
                          MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000>;
 
                internal-regs {
-                       spi@10600 {
-                               status = "okay";
-
-                               spi-flash@0 {
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-                                       compatible = "st,m25p128", "jedec,spi-nor";
-                                       reg = <0>; /* Chip select 0 */
-                                       spi-max-frequency = <108000000>;
-                               };
-                       };
-
                        i2c@11000 {
                                status = "okay";
                                clock-frequency = <100000>;
                };
        };
 };
+
+&spi0 {
+       status = "okay";
+
+       spi-flash@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "st,m25p128", "jedec,spi-nor";
+               reg = <0>; /* Chip select 0 */
+               spi-max-frequency = <108000000>;
+       };
+};
+
index 3312be6c82cc6aac4cd98f0a1ebb03b1404c2763..c065ecd8d36b18b9e4682e5bce2a36fbb37c4479 100644 (file)
                                      <0xc100 0x100>;
                        };
 
-                       spi0: spi@10600 {
-                               compatible = "marvell,armada-380-spi",
-                                               "marvell,orion-spi";
-                               reg = <0x10600 0x50>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                               cell-index = <0>;
-                               interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
-                               clocks = <&coreclk 0>;
-                               status = "disabled";
-                       };
-
-                       spi1: spi@10680 {
-                               compatible = "marvell,armada-380-spi",
-                                               "marvell,orion-spi";
-                               reg = <0x10680 0x50>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                               cell-index = <1>;
-                               interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;
-                               clocks = <&coreclk 0>;
-                               status = "disabled";
-                       };
-
                        i2c0: i2c@11000 {
                                compatible = "marvell,mv64xxx-i2c";
                                reg = <0x11000 0x20>;
                        no-memory-wc;
                        status = "disabled";
                };
+
+               spi0: spi@10600 {
+                       compatible = "marvell,armada-380-spi",
+                                       "marvell,orion-spi";
+                       reg = <MBUS_ID(0xf0, 0x01) 0x10600 0x50>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       cell-index = <0>;
+                       interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&coreclk 0>;
+                       status = "disabled";
+               };
+
+               spi1: spi@10680 {
+                       compatible = "marvell,armada-380-spi",
+                                       "marvell,orion-spi";
+                       reg = <MBUS_ID(0xf0, 0x01) 0x10680 0x50>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       cell-index = <1>;
+                       interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&coreclk 0>;
+                       status = "disabled";
+               };
        };
 
        clocks {
index 788c3badb681ca99c3942ee6e8a4d47162e8601d..c5f14a767bce22cd5c6d3c0296d0f22c0f38db6a 100644 (file)
                          MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000>;
 
                internal-regs {
-                       spi@10680 {
-                               status = "okay";
-                               pinctrl-0 = <&spi1_pins>;
-                               pinctrl-names = "default";
-
-                               spi-flash@0 {
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
-                                       compatible = "n25q128a13", "jedec,spi-nor";
-                                       reg = <0>;
-                                       spi-max-frequency = <108000000>;
-
-                                       partition@0 {
-                                               label = "U-Boot";
-                                               reg = <0 0x400000>;
-                                       };
-
-                                       partition@400000 {
-                                               label = "Filesystem";
-                                               reg = <0x400000 0x1000000>;
-                                       };
-                               };
-                       };
-
                        i2c@11000 {
                                pinctrl-0 = <&i2c0_pins>;
                                pinctrl-names = "default";
                };
        };
 };
+
+&spi1 {
+       status = "okay";
+       pinctrl-0 = <&spi1_pins>;
+       pinctrl-names = "default";
+
+       spi-flash@0 {
+               #address-cells = <1>;
+               #size-cells = <0>;
+               compatible = "n25q128a13", "jedec,spi-nor";
+               reg = <0>;
+               spi-max-frequency = <108000000>;
+
+               partition@0 {
+                       label = "U-Boot";
+                       reg = <0 0x400000>;
+               };
+
+               partition@400000 {
+                       label = "Filesystem";
+                       reg = <0x400000 0x1000000>;
+               };
+       };
+};
index dc6efd386dbcb00db09c5e8171f15f83beb1dd09..251a2b6799d554a49aa24de955dc94dc000d00ce 100644 (file)
                                      <0xc100 0x100>;
                        };
 
-                       spi0: spi@10600 {
-                               compatible = "marvell,armada-390-spi",
-                                               "marvell,orion-spi";
-                               reg = <0x10600 0x50>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                               cell-index = <0>;
-                               interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
-                               clocks = <&coreclk 0>;
-                               status = "disabled";
-                       };
-
-                       spi1: spi@10680 {
-                               compatible = "marvell,armada-390-spi",
-                                               "marvell,orion-spi";
-                               reg = <0x10680 0x50>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                               cell-index = <1>;
-                               interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;
-                               clocks = <&coreclk 0>;
-                               status = "disabled";
-                       };
-
                        i2c0: i2c@11000 {
                                compatible = "marvell,mv64xxx-i2c";
                                reg = <0x11000 0x20>;
                                status = "disabled";
                        };
                };
+
+               spi0: spi@10600 {
+                       compatible = "marvell,armada-390-spi",
+                                       "marvell,orion-spi";
+                       reg = <MBUS_ID(0xf0, 0x01) 0x10600 0x50>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       cell-index = <0>;
+                       interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&coreclk 0>;
+                       status = "disabled";
+               };
+
+               spi1: spi@10680 {
+                       compatible = "marvell,armada-390-spi",
+                                       "marvell,orion-spi";
+                       reg = <MBUS_ID(0xf0, 0x01) 0x10680 0x50>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       cell-index = <1>;
+                       interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&coreclk 0>;
+                       status = "disabled";
+               };
        };
 
        clocks {
index 5c21b236721fcb9d6e2b5055cbc89ae9527df7f1..ce152719bc28fade6a34291f6525f5a4c69a6b02 100644 (file)
                                phy = <&phy1>;
                                phy-mode = "rgmii-id";
                        };
-
-                       spi0: spi@10600 {
-                               status = "okay";
-
-                               spi-flash@0 {
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-                                       compatible = "n25q128a13", "jedec,spi-nor";
-                                       reg = <0>; /* Chip select 0 */
-                                       spi-max-frequency = <108000000>;
-                               };
-                       };
                };
        };
 
                marvell,function = "gpio";
        };
 };
+
+&spi0 {
+       status = "okay";
+
+       spi-flash@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "n25q128a13", "jedec,spi-nor";
+               reg = <0>; /* Chip select 0 */
+               spi-max-frequency = <108000000>;
+       };
+};
index 62422a90aeb25a640eef04c74051d664db4bb7b9..075120bc3ec41cb40a06a23bf64e6deb9fd31609 100644 (file)
                                status = "okay";
                        };
 
-                       spi0: spi@10600 {
-                               status = "okay";
-
-                               spi-flash@0 {
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-                                       compatible = "m25p64", "jedec,spi-nor";
-                                       reg = <0>; /* Chip select 0 */
-                                       spi-max-frequency = <20000000>;
-                               };
-                       };
-
                        nand@d0000 {
                                status = "okay";
                                num-cs = <1>;
                };
        };
 };
+
+&spi0 {
+       status = "okay";
+
+       spi-flash@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "m25p64", "jedec,spi-nor";
+               reg = <0>; /* Chip select 0 */
+               spi-max-frequency = <20000000>;
+       };
+};
index 061f4237760e7c917d11056b97b5971bcd4680b5..190e4eccb180c7fae4691d6ab8362ce49957294f 100644 (file)
                                status = "okay";
                        };
 
-                       spi0: spi@10600 {
-                               status = "okay";
-
-                               spi-flash@0 {
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-                                       compatible = "n25q128a13", "jedec,spi-nor";
-                                       reg = <0>; /* Chip select 0 */
-                                       spi-max-frequency = <108000000>;
-                               };
-                       };
-
                        bm@c0000 {
                                status = "okay";
                        };
                };
        };
 };
+
+&spi0 {
+       status = "okay";
+
+       spi-flash@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "n25q128a13", "jedec,spi-nor";
+               reg = <0>; /* Chip select 0 */
+               spi-max-frequency = <108000000>;
+       };
+};
index 7a461541ce506c9353c751bf8d14a080e80d2787..076f27f22c3bc151a539669a491ea2cf296a03f1 100644 (file)
                                        reg = <0x180000 0x780000>;   /* 7.5MB */
                                };
                        };
-
-                       spi0: spi@10600 {
-                               status = "okay";
-
-                               spi-flash@0 {
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-                                       compatible = "everspin,mr25h256";
-                                       reg = <0>; /* Chip select 0 */
-                                       spi-max-frequency = <40000000>;
-                               };
-                       };
                };
        };
 
                marvell,function = "gpio";
        };
 };
+
+&spi0 {
+       status = "okay";
+
+       spi-flash@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "everspin,mr25h256";
+               reg = <0>; /* Chip select 0 */
+               spi-max-frequency = <40000000>;
+       };
+};
index d17dab0a6f513e9c04ff2675f5f9d44d7f6953b3..ae286736b90a6dca87d238c6fc5b23803da66323 100644 (file)
                                status = "disabled";
                        };
 
-                       spi0: spi@10600 {
-                               status = "okay";
-
-                               spi-flash@0 {
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-                                       compatible = "micron,n25q064", "jedec,spi-nor";
-                                       reg = <0>; /* Chip select 0 */
-                                       spi-max-frequency = <20000000>;
-
-                                       /*
-                                        * Warning!
-                                        *
-                                        * Synology u-boot uses its compiled-in environment
-                                        * and it seems Synology did not care to change u-boot
-                                        * default configuration in order to allow saving a
-                                        * modified environment at a sensible location. So,
-                                        * if you do a 'saveenv' under u-boot, your modified
-                                        * environment will be saved at 1MB after the start
-                                        * of the flash, i.e. in the middle of the uImage.
-                                        * For that reason, it is strongly advised not to
-                                        * change the default environment, unless you know
-                                        * what you are doing.
-                                        */
-                                       partition@00000000 { /* u-boot */
-                                               label = "RedBoot";
-                                               reg = <0x00000000 0x000d0000>; /* 832KB */
-                                       };
-
-                                       partition@000c0000 { /* uImage */
-                                               label = "zImage";
-                                               reg = <0x000d0000 0x002d0000>; /* 2880KB */
-                                       };
-
-                                       partition@003a0000 { /* uInitramfs */
-                                               label = "rd.gz";
-                                               reg = <0x003a0000 0x00430000>; /* 4250KB */
-                                       };
-
-                                       partition@007d0000 { /* MAC address and serial number */
-                                               label = "vendor";
-                                               reg = <0x007d0000 0x00010000>; /* 64KB */
-                                       };
-
-                                       partition@007e0000 {
-                                               label = "RedBoot config";
-                                               reg = <0x007e0000 0x00010000>; /* 64KB */
-                                       };
-
-                                       partition@007f0000 {
-                                               label = "FIS directory";
-                                               reg = <0x007f0000 0x00010000>; /* 64KB */
-                                       };
-                               };
-                       };
-
                        i2c@11000 {
                                clock-frequency = <400000>;
                                status = "okay";
                marvell,function = "gpio";
        };
 };
+
+&spi0 {
+       status = "okay";
+
+       spi-flash@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "micron,n25q064", "jedec,spi-nor";
+               reg = <0>; /* Chip select 0 */
+               spi-max-frequency = <20000000>;
+
+               /*
+                * Warning!
+                *
+                * Synology u-boot uses its compiled-in environment
+                * and it seems Synology did not care to change u-boot
+                * default configuration in order to allow saving a
+                * modified environment at a sensible location. So,
+                * if you do a 'saveenv' under u-boot, your modified
+                * environment will be saved at 1MB after the start
+                * of the flash, i.e. in the middle of the uImage.
+                * For that reason, it is strongly advised not to
+                * change the default environment, unless you know
+                * what you are doing.
+                */
+               partition@00000000 { /* u-boot */
+                       label = "RedBoot";
+                       reg = <0x00000000 0x000d0000>; /* 832KB */
+               };
+
+               partition@000c0000 { /* uImage */
+                       label = "zImage";
+                       reg = <0x000d0000 0x002d0000>; /* 2880KB */
+               };
+
+               partition@003a0000 { /* uInitramfs */
+                       label = "rd.gz";
+                       reg = <0x003a0000 0x00430000>; /* 4250KB */
+               };
+
+               partition@007d0000 { /* MAC address and serial number */
+                       label = "vendor";
+                       reg = <0x007d0000 0x00010000>; /* 64KB */
+               };
+
+               partition@007e0000 {
+                       label = "RedBoot config";
+                       reg = <0x007e0000 0x00010000>; /* 64KB */
+               };
+
+               partition@007f0000 {
+                       label = "FIS directory";
+                       reg = <0x007f0000 0x00010000>; /* 64KB */
+               };
+       };
+};
index 40337909ac4c35d64291a29931bc3a04e31b4ea4..4a5f99e65b512e1e1d9d77f6ae62fab9ef6c8415 100644 (file)
                                wt-override;
                        };
 
-                       spi0: spi@10600 {
-                               compatible = "marvell,armada-xp-spi",
-                                               "marvell,orion-spi";
-                               pinctrl-0 = <&spi0_pins>;
-                               pinctrl-names = "default";
-                       };
-
-                       spi1: spi@10680 {
-                               compatible = "marvell,armada-xp-spi",
-                                               "marvell,orion-spi";
-                               pinctrl-0 = <&spi1_pins>;
-                               pinctrl-names = "default";
-                       };
-
-
                        i2c0: i2c@11000 {
                                compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";
                                reg = <0x11000 0x100>;
                marvell,function = "uart3";
        };
 };
+
+&spi0 {
+       compatible = "marvell,armada-xp-spi", "marvell,orion-spi";
+       pinctrl-0 = <&spi0_pins>;
+       pinctrl-names = "default";
+};
+
+&spi1 {
+       compatible = "marvell,armada-xp-spi", "marvell,orion-spi";
+       pinctrl-0 = <&spi1_pins>;
+       pinctrl-names = "default";
+};