summaryrefslogtreecommitdiffstats
path: root/arch/arm/dts/zynq-zc770-xm010.dts
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2016-04-07 13:04:15 +0200
committerMichal Simek <michal.simek@xilinx.com>2016-04-13 18:29:02 +0200
commita95d54b49074985e2429f2af42c6d746c63285c0 (patch)
tree406c61c73af424f6fca31a407ddae5e7ad66f61a /arch/arm/dts/zynq-zc770-xm010.dts
parentac2c40749037acbeafcc5329194e6776450e870b (diff)
downloadtalos-obmc-uboot-a95d54b49074985e2429f2af42c6d746c63285c0.tar.gz
talos-obmc-uboot-a95d54b49074985e2429f2af42c6d746c63285c0.zip
ARM: zynq: Align spi and qspi node locations
Keep nodes alphabelitally sorted. Signed-off-by: Michal Simek <michal.simek@xilinx.com> Reviewed-by: Nathan Rossi <nathan@nathanrossi.com>
Diffstat (limited to 'arch/arm/dts/zynq-zc770-xm010.dts')
-rw-r--r--arch/arm/dts/zynq-zc770-xm010.dts42
1 files changed, 21 insertions, 21 deletions
diff --git a/arch/arm/dts/zynq-zc770-xm010.dts b/arch/arm/dts/zynq-zc770-xm010.dts
index 6dc7c89ddb..33524cb6de 100644
--- a/arch/arm/dts/zynq-zc770-xm010.dts
+++ b/arch/arm/dts/zynq-zc770-xm010.dts
@@ -36,27 +36,6 @@
};
};
-&spi1 {
- status = "okay";
- num-cs = <4>;
- is-decoded-cs = <0>;
- flash@0 {
- compatible = "sst25wf080";
- reg = <1>;
- spi-max-frequency = <1000000>;
- #address-cells = <1>;
- #size-cells = <1>;
- partition@test {
- label = "spi-flash";
- reg = <0x0 0x100000>;
- };
- };
-};
-
-&qspi {
- status = "okay";
-};
-
&can0 {
status = "okay";
};
@@ -82,10 +61,31 @@
};
+&qspi {
+ status = "okay";
+};
+
&sdhci0 {
status = "okay";
};
+&spi1 {
+ status = "okay";
+ num-cs = <4>;
+ is-decoded-cs = <0>;
+ flash@0 {
+ compatible = "sst25wf080";
+ reg = <1>;
+ spi-max-frequency = <1000000>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+ partition@test {
+ label = "spi-flash";
+ reg = <0x0 0x100000>;
+ };
+ };
+};
+
&uart1 {
u-boot,dm-pre-reloc;
status = "okay";
OpenPOWER on IntegriCloud