Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
arch
/
arm
/
boot
/
dts
/
armada-385-db-ap.dts
diff --git
a/kernel/arch/arm/boot/dts/armada-385-db-ap.dts
b/kernel/arch/arm/boot/dts/armada-385-db-ap.dts
index
7219ac3
..
acd5b15
100644
(file)
--- a/
kernel/arch/arm/boot/dts/armada-385-db-ap.dts
+++ b/
kernel/arch/arm/boot/dts/armada-385-db-ap.dts
@@
-46,7
+46,7
@@
/ {
model = "Marvell Armada 385 Access Point Development Board";
/ {
model = "Marvell Armada 385 Access Point Development Board";
- compatible = "marvell,a385-db-ap", "marvell,armada385", "marvell,armada38
x
";
+ compatible = "marvell,a385-db-ap", "marvell,armada385", "marvell,armada38
0
";
chosen {
stdout-path = "serial1:115200n8";
chosen {
stdout-path = "serial1:115200n8";
@@
-59,7
+59,9
@@
soc {
ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000
soc {
ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000
- MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000>;
+ MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000
+ MBUS_ID(0x09, 0x19) 0 0xf1100000 0x10000
+ MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000>;
internal-regs {
spi1: spi@10680 {
internal-regs {
spi1: spi@10680 {
@@
-70,7
+72,7
@@
spi-flash@0 {
#address-cells = <1>;
#size-cells = <1>;
spi-flash@0 {
#address-cells = <1>;
#size-cells = <1>;
- compatible = "st,m25p128";
+ compatible = "st,m25p128"
, "jedec,spi-nor"
;
reg = <0>; /* Chip select 0 */
spi-max-frequency = <54000000>;
};
reg = <0>; /* Chip select 0 */
spi-max-frequency = <54000000>;
};