aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-01-15 23:09:42 +0000
committerMark Brown <broonie@linaro.org>2014-01-15 23:09:42 +0000
commit3dad43721441f1cf8ed1a3a975bc939007686589 (patch)
tree25f43db9fc1877a763d3668e0dc20117ece1bc17 /arch
parent17963158c5a1299783936ea10dbf0b0095071a1b (diff)
parent936b996b71a6f0985e0c5474bf20174197d445d0 (diff)
downloadlinaro-lsk-3dad43721441f1cf8ed1a3a975bc939007686589.tar.gz
Merge remote-tracking branch 'lsk/v3.10/topic/tc2' into linux-linaro-lsk
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/rtsm_ve-motherboard.dtsi7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/rtsm_ve-motherboard.dtsi b/arch/arm/boot/dts/rtsm_ve-motherboard.dtsi
index 6d125662612..a2d895ee5fa 100644
--- a/arch/arm/boot/dts/rtsm_ve-motherboard.dtsi
+++ b/arch/arm/boot/dts/rtsm_ve-motherboard.dtsi
@@ -167,6 +167,13 @@
use_dma = <0>;
framebuffer = <0x18000000 0x00180000>;
};
+
+ virtio_block@0130000 {
+ compatible = "virtio,mmio";
+ reg = <0x130000 0x200>;
+ interrupts = <42>;
+ };
+
};
v2m_fixed_3v3: fixedregulator@0 {