projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux...
[firefly-linux-kernel-4.4.55.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 23fc670c0427710168ce41ef012f9e37b8218eb6..5c21b236721fcb9d6e2b5055cbc89ae9527df7f1 100644
(file)
--- a/
arch/arm/boot/dts/armada-xp-axpwifiap.dts
+++ b/
arch/arm/boot/dts/armada-xp-axpwifiap.dts
@@
-70,8
+70,8
@@
soc {
ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
soc {
ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
- MBUS_ID(0x09, 0x09) 0 0 0xf
8
100000 0x10000
- MBUS_ID(0x09, 0x05) 0 0 0xf
8
110000 0x10000>;
+ MBUS_ID(0x09, 0x09) 0 0 0xf
1
100000 0x10000
+ MBUS_ID(0x09, 0x05) 0 0 0xf
1
110000 0x10000>;
pcie-controller {
status = "okay";
pcie-controller {
status = "okay";