projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'ceph-for-4.9-rc1' of git://github.com/ceph/ceph-client
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
armada-xp-axpwifiap.dts
diff --git
a/arch/arm/boot/dts/armada-xp-axpwifiap.dts
b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
index
5c21b23
..
ce15271
100644
(file)
--- a/
arch/arm/boot/dts/armada-xp-axpwifiap.dts
+++ b/
arch/arm/boot/dts/armada-xp-axpwifiap.dts
@@
-135,18
+135,6
@@
phy = <&phy1>;
phy-mode = "rgmii-id";
};
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>;
- };
- };
};
};
};
};
@@
-179,3
+167,15
@@
marvell,function = "gpio";
};
};
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>;
+ };
+};