summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/bcm2708.dtsi5
-rw-r--r--arch/arm/boot/dts/bcm2709.dtsi5
-rw-r--r--arch/arm/mach-bcm2708/bcm2708.c2
-rw-r--r--arch/arm/mach-bcm2709/bcm2709.c2
4 files changed, 12 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/bcm2708.dtsi b/arch/arm/boot/dts/bcm2708.dtsi
index 0713a1edbe7e..846f148a8892 100644
--- a/arch/arm/boot/dts/bcm2708.dtsi
+++ b/arch/arm/boot/dts/bcm2708.dtsi
@@ -17,6 +17,11 @@
#size-cells = <1>;
ranges = <0x7e000000 0x20000000 0x01000000>;
+ dma: dma@7e007000 {
+ compatible = "brcm,bcm2835-dma";
+ #dma-cells = <1>;
+ };
+
intc: interrupt-controller {
compatible = "brcm,bcm2708-armctrl-ic";
reg = <0x7e00b200 0x200>;
diff --git a/arch/arm/boot/dts/bcm2709.dtsi b/arch/arm/boot/dts/bcm2709.dtsi
index 34d2226aba62..d46836398639 100644
--- a/arch/arm/boot/dts/bcm2709.dtsi
+++ b/arch/arm/boot/dts/bcm2709.dtsi
@@ -17,6 +17,11 @@
#size-cells = <1>;
ranges = <0x7e000000 0x3f000000 0x01000000>;
+ dma: dma@7e007000 {
+ compatible = "brcm,bcm2835-dma";
+ #dma-cells = <1>;
+ };
+
intc: interrupt-controller {
compatible = "brcm,bcm2708-armctrl-ic";
reg = <0x7e00b200 0x200>;
diff --git a/arch/arm/mach-bcm2708/bcm2708.c b/arch/arm/mach-bcm2708/bcm2708.c
index c8aea5bd22fd..6a08e955ec04 100644
--- a/arch/arm/mach-bcm2708/bcm2708.c
+++ b/arch/arm/mach-bcm2708/bcm2708.c
@@ -857,7 +857,7 @@ void __init bcm2708_init(void)
bcm2708_dt_init();
bcm_register_device(&bcm2708_dmaman_device);
- bcm_register_device(&bcm2708_dmaengine_device);
+ bcm_register_device_dt(&bcm2708_dmaengine_device);
bcm_register_device(&bcm2708_vcio_device);
#ifdef CONFIG_BCM2708_GPIO
bcm_register_device_dt(&bcm2708_gpio_device);
diff --git a/arch/arm/mach-bcm2709/bcm2709.c b/arch/arm/mach-bcm2709/bcm2709.c
index 259d5521dcf9..3c1c1dccc2f0 100644
--- a/arch/arm/mach-bcm2709/bcm2709.c
+++ b/arch/arm/mach-bcm2709/bcm2709.c
@@ -879,7 +879,7 @@ void __init bcm2709_init(void)
bcm2709_dt_init();
bcm_register_device(&bcm2708_dmaman_device);
- bcm_register_device(&bcm2708_dmaengine_device);
+ bcm_register_device_dt(&bcm2708_dmaengine_device);
bcm_register_device(&bcm2708_vcio_device);
#ifdef CONFIG_BCM2708_GPIO
bcm_register_device_dt(&bcm2708_gpio_device);