aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Tivy <rtivy@ti.com>2013-03-28 21:41:47 -0400
committerSekhar Nori <nsekhar@ti.com>2013-04-17 12:30:09 -0400
commit5428813499ea1302f032e0063e4e2d4a56b36221 (patch)
treee8ff06c51f8e8d245bf569e82e1584d6f80cf7bd
parent215a084dc5cb8d814aeb7a2b5192af20aec8209f (diff)
ARM: davinci: da850 board: add remoteproc support
Add .reserve function for reserving CMA memory block to MACHINE_START. Add call to remoteproc platform device registration function during init. Signed-off-by: Robert Tivy <rtivy@ti.com> Signed-off-by: Sekhar Nori <nsekhar@ti.com>
-rw-r--r--arch/arm/mach-davinci/board-da850-evm.c6
-rw-r--r--arch/arm/mach-davinci/board-omapl138-hawk.c6
2 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index dcc8710936a5..7d1721d4ba18 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -1577,6 +1577,11 @@ static __init void da850_evm_init(void)
1577 pr_warn("%s: SATA registration failed: %d\n", __func__, ret); 1577 pr_warn("%s: SATA registration failed: %d\n", __func__, ret);
1578 1578
1579 da850_evm_setup_mac_addr(); 1579 da850_evm_setup_mac_addr();
1580
1581 ret = da8xx_register_rproc();
1582 if (ret)
1583 pr_warn("%s: dsp/rproc registration failed: %d\n",
1584 __func__, ret);
1580} 1585}
1581 1586
1582#ifdef CONFIG_SERIAL_8250_CONSOLE 1587#ifdef CONFIG_SERIAL_8250_CONSOLE
@@ -1604,4 +1609,5 @@ MACHINE_START(DAVINCI_DA850_EVM, "DaVinci DA850/OMAP-L138/AM18x EVM")
1604 .init_late = davinci_init_late, 1609 .init_late = davinci_init_late,
1605 .dma_zone_size = SZ_128M, 1610 .dma_zone_size = SZ_128M,
1606 .restart = da8xx_restart, 1611 .restart = da8xx_restart,
1612 .reserve = da8xx_rproc_reserve_cma,
1607MACHINE_END 1613MACHINE_END
diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c
index 328dbd8a37f5..b8c20de10ca2 100644
--- a/arch/arm/mach-davinci/board-omapl138-hawk.c
+++ b/arch/arm/mach-davinci/board-omapl138-hawk.c
@@ -310,6 +310,11 @@ static __init void omapl138_hawk_init(void)
310 if (ret) 310 if (ret)
311 pr_warn("%s: watchdog registration failed: %d\n", 311 pr_warn("%s: watchdog registration failed: %d\n",
312 __func__, ret); 312 __func__, ret);
313
314 ret = da8xx_register_rproc();
315 if (ret)
316 pr_warn("%s: dsp/rproc registration failed: %d\n",
317 __func__, ret);
313} 318}
314 319
315#ifdef CONFIG_SERIAL_8250_CONSOLE 320#ifdef CONFIG_SERIAL_8250_CONSOLE
@@ -337,4 +342,5 @@ MACHINE_START(OMAPL138_HAWKBOARD, "AM18x/OMAP-L138 Hawkboard")
337 .init_late = davinci_init_late, 342 .init_late = davinci_init_late,
338 .dma_zone_size = SZ_128M, 343 .dma_zone_size = SZ_128M,
339 .restart = da8xx_restart, 344 .restart = da8xx_restart,
345 .reserve = da8xx_rproc_reserve_cma,
340MACHINE_END 346MACHINE_END