author | Praneeth Bajjuri <praneeth@ti.com> | |
Tue, 11 Mar 2014 21:06:49 +0000 (16:06 -0500) | ||
committer | Praneeth Bajjuri <praneeth@ti.com> | |
Tue, 11 Mar 2014 21:06:49 +0000 (16:06 -0500) |
* 'ti2013.04.02-rpmsg-3.8.y' of git://git.ti.com/rpmsg/rpmsg:
ARM: OMAP2+: remoteproc: add the second MMUs to DRA7 DSPs
iommu/omap: add support to program multiple iommus
iommu/omap: change the attach detection logic
ARM: OMAP2+: devices: use sentinel terminated iommu archdata for ISP
ARM: DRA7: hwmod data: remove resets from MMU1 for DSPs
ARM: DRA7: hwmod data: add iommu index values to dev_attr data
iommu/omap: fix dra7 syscfg programming
iommu/omap: add a index field for each iommu
ARM: OMAP2+: remoteproc: use sentinel terminated iommu archdata
ARM: OMAP2+: remoteproc: split iommu archdata information
rpmsg: rpc: reset the current function counter on remove
Change-Id: I5ca00e04212e2258b41cc8ed7416898901be38a0
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
ARM: OMAP2+: remoteproc: add the second MMUs to DRA7 DSPs
iommu/omap: add support to program multiple iommus
iommu/omap: change the attach detection logic
ARM: OMAP2+: devices: use sentinel terminated iommu archdata for ISP
ARM: DRA7: hwmod data: remove resets from MMU1 for DSPs
ARM: DRA7: hwmod data: add iommu index values to dev_attr data
iommu/omap: fix dra7 syscfg programming
iommu/omap: add a index field for each iommu
ARM: OMAP2+: remoteproc: use sentinel terminated iommu archdata
ARM: OMAP2+: remoteproc: split iommu archdata information
rpmsg: rpc: reset the current function counter on remove
Change-Id: I5ca00e04212e2258b41cc8ed7416898901be38a0
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
diff --cc arch/arm/mach-omap2/devices.c
Simple merge
Simple merge
diff --cc arch/arm/mach-omap2/remoteproc.c
index 7da4451f205508230e9287a1f272469f9013dc25,3758d9a411c3e044e7e2be911a4b1be4660eb3dd..af368dbae07e47e70147f4797101a7a685b31205
continue;
}
- pdev->dev.archdata.iommu = &rproc_iommu[i];
+ pdev->dev.archdata.iommu = rproc_pdev_data[i].iommu;
+ /*
+ * Set custom dma ops whose .alloc doesn't zero memory.
+ * This is necessary for code/data memory that was early
+ * loaded, but may present a problem for vring buffers
+ * that might expect to be zeroed (vrings themselves are
+ * OK since they are specifically zero initialized).
+ */
+ if (rproc_data[i].late_attach)
+ set_dma_ops(&pdev->dev, &arm_dma_m_ops);
+
ret = omap_device_register(pdev);
if (ret) {
dev_err(&pdev->dev, "omap_device_register failed\n");