git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorri...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
bcm2835-rpi.dtsi
diff --git
a/arch/arm/boot/dts/bcm2835-rpi.dtsi
b/arch/arm/boot/dts/bcm2835-rpi.dtsi
index cb2d6d78a7fbf5d9a1ef3f70563fcb94f2ce8bef..29f970f864dc1d42a7fb9204cae7e649c1c68560 100644
(file)
--- a/
arch/arm/boot/dts/bcm2835-rpi.dtsi
+++ b/
arch/arm/boot/dts/bcm2835-rpi.dtsi
@@
-30,9
+30,9
@@
#power-domain-cells = <1>;
};
- mailbox@7e00b840 {
+
vchiq:
mailbox@7e00b840 {
compatible = "brcm,bcm2835-vchiq";
- reg = <0x7e00b840 0x
f
>;
+ reg = <0x7e00b840 0x
3c
>;
interrupts = <0 2>;
};
};