Revert "staging: tidspbridge: remove dw_dmmu_base from cfg_hostres struct"
This reverts commit b5a4493923
.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com>
This commit is contained in:
parent
a28903501c
commit
9d4f81a722
|
@ -845,6 +845,8 @@ static int bridge_dev_destroy(struct bridge_dev_context *dev_ctxt)
|
|||
iounmap((void *)host_res->dw_mem_base[3]);
|
||||
if (host_res->dw_mem_base[4])
|
||||
iounmap((void *)host_res->dw_mem_base[4]);
|
||||
if (host_res->dw_dmmu_base)
|
||||
iounmap(host_res->dw_dmmu_base);
|
||||
if (host_res->dw_per_base)
|
||||
iounmap(host_res->dw_per_base);
|
||||
if (host_res->dw_per_pm_base)
|
||||
|
@ -858,6 +860,7 @@ static int bridge_dev_destroy(struct bridge_dev_context *dev_ctxt)
|
|||
host_res->dw_mem_base[2] = (u32) NULL;
|
||||
host_res->dw_mem_base[3] = (u32) NULL;
|
||||
host_res->dw_mem_base[4] = (u32) NULL;
|
||||
host_res->dw_dmmu_base = NULL;
|
||||
host_res->dw_sys_ctrl_base = NULL;
|
||||
|
||||
kfree(host_res);
|
||||
|
|
|
@ -393,6 +393,7 @@ int sm_interrupt_dsp(struct bridge_dev_context *dev_context, u16 mb_val)
|
|||
omap_dspbridge_dev->dev.platform_data;
|
||||
struct cfg_hostres *resources = dev_context->resources;
|
||||
int status = 0;
|
||||
u32 temp;
|
||||
|
||||
if (!dev_context->mbox)
|
||||
return 0;
|
||||
|
@ -436,7 +437,7 @@ int sm_interrupt_dsp(struct bridge_dev_context *dev_context, u16 mb_val)
|
|||
omap_mbox_restore_ctx(dev_context->mbox);
|
||||
|
||||
/* Access MMU SYS CONFIG register to generate a short wakeup */
|
||||
iommu_read_reg(dev_context->dsp_mmu, MMU_SYSCONFIG);
|
||||
temp = readl(resources->dw_dmmu_base + 0x10);
|
||||
|
||||
dev_context->dw_brd_state = BRD_RUNNING;
|
||||
} else if (dev_context->dw_brd_state == BRD_RETENTION) {
|
||||
|
|
|
@ -68,6 +68,7 @@ struct cfg_hostres {
|
|||
void __iomem *dw_per_base;
|
||||
u32 dw_per_pm_base;
|
||||
u32 dw_core_pm_base;
|
||||
void __iomem *dw_dmmu_base;
|
||||
void __iomem *dw_sys_ctrl_base;
|
||||
};
|
||||
|
||||
|
|
|
@ -743,6 +743,7 @@ static int request_bridge_resources(struct cfg_hostres *res)
|
|||
host_res->dw_sys_ctrl_base = ioremap(OMAP_SYSC_BASE, OMAP_SYSC_SIZE);
|
||||
dev_dbg(bridge, "dw_mem_base[0] 0x%x\n", host_res->dw_mem_base[0]);
|
||||
dev_dbg(bridge, "dw_mem_base[3] 0x%x\n", host_res->dw_mem_base[3]);
|
||||
dev_dbg(bridge, "dw_dmmu_base %p\n", host_res->dw_dmmu_base);
|
||||
|
||||
/* for 24xx base port is not mapping the mamory for DSP
|
||||
* internal memory TODO Do a ioremap here */
|
||||
|
@ -796,6 +797,8 @@ int drv_request_bridge_res_dsp(void **phost_resources)
|
|||
OMAP_PER_PRM_SIZE);
|
||||
host_res->dw_core_pm_base = (u32) ioremap(OMAP_CORE_PRM_BASE,
|
||||
OMAP_CORE_PRM_SIZE);
|
||||
host_res->dw_dmmu_base = ioremap(OMAP_DMMU_BASE,
|
||||
OMAP_DMMU_SIZE);
|
||||
|
||||
dev_dbg(bridge, "dw_mem_base[0] 0x%x\n",
|
||||
host_res->dw_mem_base[0]);
|
||||
|
@ -807,6 +810,7 @@ int drv_request_bridge_res_dsp(void **phost_resources)
|
|||
host_res->dw_mem_base[3]);
|
||||
dev_dbg(bridge, "dw_mem_base[4] 0x%x\n",
|
||||
host_res->dw_mem_base[4]);
|
||||
dev_dbg(bridge, "dw_dmmu_base %p\n", host_res->dw_dmmu_base);
|
||||
|
||||
shm_size = drv_datap->shm_size;
|
||||
if (shm_size >= 0x10000) {
|
||||
|
|
Loading…
Reference in a new issue