summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoralf Trønnes <noralf@tronnes.org>2015-05-01 23:00:15 +0200
committerpopcornmix <popcornmix@gmail.com>2015-05-18 14:13:13 +0100
commit85b2c766c10405776349f518e1a1b28d5f4a3829 (patch)
tree75a1109cef881269cf1796d291a3342ba6d260ae
parentef87af464eb2110d3564a54dae8deac0edfc8ed4 (diff)
downloadlinux-85b2c766c10405776349f518e1a1b28d5f4a3829.tar.gz
BCM270x_DT: Add mailbox bcm2708-vcio
Add bcm2708-vcio to Device Tree and don't add the platform device when booting in DT mode. Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
-rw-r--r--arch/arm/boot/dts/bcm2708_common.dtsi6
-rw-r--r--arch/arm/mach-bcm2708/bcm2708.c2
-rw-r--r--arch/arm/mach-bcm2709/bcm2709.c2
3 files changed, 8 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/bcm2708_common.dtsi b/arch/arm/boot/dts/bcm2708_common.dtsi
index 065a4244bc78..1c8c1af9a1ff 100644
--- a/arch/arm/boot/dts/bcm2708_common.dtsi
+++ b/arch/arm/boot/dts/bcm2708_common.dtsi
@@ -36,6 +36,12 @@
#interrupt-cells = <2>;
};
+ mailbox: mailbox@7e00b800 {
+ compatible = "brcm,bcm2708-vcio";
+ reg = <0x7e00b880 0x40>;
+ interrupts = <0 1>;
+ };
+
gpio: gpio {
compatible = "brcm,bcm2835-gpio";
reg = <0x7e200000 0xb4>;
diff --git a/arch/arm/mach-bcm2708/bcm2708.c b/arch/arm/mach-bcm2708/bcm2708.c
index 51f8efa1363a..7cc47c1fdb71 100644
--- a/arch/arm/mach-bcm2708/bcm2708.c
+++ b/arch/arm/mach-bcm2708/bcm2708.c
@@ -908,7 +908,7 @@ void __init bcm2708_init(void)
bcm2708_dt_init();
bcm_register_device_dt(&bcm2708_dmaengine_device);
- bcm_register_device(&bcm2708_vcio_device);
+ bcm_register_device_dt(&bcm2708_vcio_device);
#ifdef CONFIG_BCM2708_GPIO
bcm_register_device_dt(&bcm2708_gpio_device);
#endif
diff --git a/arch/arm/mach-bcm2709/bcm2709.c b/arch/arm/mach-bcm2709/bcm2709.c
index 8ed88b4a5c37..2c0a664825f0 100644
--- a/arch/arm/mach-bcm2709/bcm2709.c
+++ b/arch/arm/mach-bcm2709/bcm2709.c
@@ -929,7 +929,7 @@ void __init bcm2709_init(void)
bcm2709_dt_init();
bcm_register_device_dt(&bcm2708_dmaengine_device);
- bcm_register_device(&bcm2708_vcio_device);
+ bcm_register_device_dt(&bcm2708_vcio_device);
#ifdef CONFIG_BCM2708_GPIO
bcm_register_device_dt(&bcm2708_gpio_device);
#endif