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>
raspberrypi · May 12, 2015 · 75f995b · 75f995b
1 parent db783a2
commit 75f995b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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