author | Suman Anna <s-anna@ti.com> | |
Sat, 30 May 2015 00:41:21 +0000 (19:41 -0500) | ||
committer | Suman Anna <s-anna@ti.com> | |
Sat, 30 May 2015 00:41:21 +0000 (19:41 -0500) |
Merge in the updated iommu feature branch into remoteproc tree to
pull in the necessary support to fix the DRA7 IPU1 boot issue when
integrated with PM tree.
* 'iommu-linux-3.14.y' of git://git.ti.com/rpmsg/iommu:
ARM: OMAP2+: use separate IOMMU pdata to fix DRA7 IPU1 boot
iommu/omap: fix boot issue on remoteprocs with AMMU/Unicache
iommu/omap: add pdata ops for setting powerdomain constraint
Signed-off-by: Suman Anna <s-anna@ti.com>
pull in the necessary support to fix the DRA7 IPU1 boot issue when
integrated with PM tree.
* 'iommu-linux-3.14.y' of git://git.ti.com/rpmsg/iommu:
ARM: OMAP2+: use separate IOMMU pdata to fix DRA7 IPU1 boot
iommu/omap: fix boot issue on remoteprocs with AMMU/Unicache
iommu/omap: add pdata ops for setting powerdomain constraint
Signed-off-by: Suman Anna <s-anna@ti.com>
1 | 2 | |||
---|---|---|---|---|
arch/arm/mach-omap2/pdata-quirks.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc arch/arm/mach-omap2/pdata-quirks.c
index 9bb61bec9251b3fc73577067782ddd6b82ff2a7d,1d4dd1212678d16e58e59c581771f74fa5bf8cf6..4537214b06d9963d98f46d1511df5df53abd560e
.device_idle = omap_device_idle,
};
+ static struct iommu_platform_data dra7_ipu1_iommu_pdata = {
+ .reset_name = "mmu_cache",
+ .assert_reset = omap_device_assert_hardreset,
+ .deassert_reset = omap_device_deassert_hardreset,
+ .device_enable = omap_device_enable,
+ .device_idle = omap_device_idle,
+ .set_pwrdm_constraint = omap_iommu_set_pwrdm_constraint,
+ };
++
+static struct omap_rproc_pdata dra7_dsp1_pdata = {
+ .device_enable = omap_rproc_device_enable,
+ .device_shutdown = omap_rproc_device_shutdown,
+ .set_bootaddr = dra7_ctrl_write_dsp1_boot_addr,
+ .timer_ops = &omap_rproc_dmtimer_ops,
+};
+
+static struct omap_rproc_pdata dra7_dsp2_pdata = {
+ .device_enable = omap_rproc_device_enable,
+ .device_shutdown = omap_rproc_device_shutdown,
+ .set_bootaddr = dra7_ctrl_write_dsp2_boot_addr,
+ .timer_ops = &omap_rproc_dmtimer_ops,
+};
#endif
#ifdef CONFIG_SOC_AM33XX
OF_DEV_AUXDATA("ti,dra7-iommu", 0x55082000, "55082000.mmu",
&omap4_iommu_pdata),
OF_DEV_AUXDATA("ti,dra7-iommu", 0x58882000, "58882000.mmu",
- &omap4_iommu_pdata),
+ &dra7_ipu1_iommu_pdata),
+ OF_DEV_AUXDATA("ti,dra7-rproc-ipu", 0x55020000, "55020000.ipu",
+ &omap4_ipu_pdata),
+ OF_DEV_AUXDATA("ti,dra7-rproc-ipu", 0x58820000, "58820000.ipu",
+ &omap4_ipu_pdata),
+ OF_DEV_AUXDATA("ti,dra7-rproc-dsp", 0x40800000, "40800000.dsp",
+ &dra7_dsp1_pdata),
+ OF_DEV_AUXDATA("ti,dra7-rproc-dsp", 0x41000000, "41000000.dsp",
+ &dra7_dsp2_pdata),
#endif
{ /* sentinel */ },
};