mirror of https://gitee.com/openkylin/linux.git
ARM: OMAP3: remove deprecated CONFIG_OMAP_IOMMU_IVA2
CONFIG_OMAP_IOMMU_IVA2 was defined originally to avoid conflicting usage by tidspbridge and other iommu users. The same can be achieved by marking the DT node disabled, so remove this obsolete flag and the corresponding hwmod data can be enabled. Cc: Paul Walmsley <paul@pwsan.com> Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch> [s-anna@ti.com: revise commit log] Signed-off-by: Suman Anna <s-anna@ti.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Tony Lindgren <tony@atomide.com> Acked-by: Paul Walmsley <paul@pwsan.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
parent
18c49af3ee
commit
895a9613a1
|
@ -3029,8 +3029,6 @@ static struct omap_hwmod omap3xxx_mmu_isp_hwmod = {
|
|||
.flags = HWMOD_NO_IDLEST,
|
||||
};
|
||||
|
||||
#ifdef CONFIG_OMAP_IOMMU_IVA2
|
||||
|
||||
/* mmu iva */
|
||||
|
||||
static struct omap_mmu_dev_attr mmu_iva_dev_attr = {
|
||||
|
@ -3082,8 +3080,6 @@ static struct omap_hwmod omap3xxx_mmu_iva_hwmod = {
|
|||
.flags = HWMOD_NO_IDLEST,
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
/* l4_per -> gpio4 */
|
||||
static struct omap_hwmod_addr_space omap3xxx_gpio4_addrs[] = {
|
||||
{
|
||||
|
@ -3855,9 +3851,7 @@ static struct omap_hwmod_ocp_if *omap34xx_hwmod_ocp_ifs[] __initdata = {
|
|||
&omap3xxx_l4_core__hdq1w,
|
||||
&omap3xxx_sad2d__l3,
|
||||
&omap3xxx_l4_core__mmu_isp,
|
||||
#ifdef CONFIG_OMAP_IOMMU_IVA2
|
||||
&omap3xxx_l3_main__mmu_iva,
|
||||
#endif
|
||||
&omap34xx_l4_core__ssi,
|
||||
NULL
|
||||
};
|
||||
|
@ -3881,9 +3875,7 @@ static struct omap_hwmod_ocp_if *omap36xx_hwmod_ocp_ifs[] __initdata = {
|
|||
&omap3xxx_l4_core__hdq1w,
|
||||
&omap3xxx_sad2d__l3,
|
||||
&omap3xxx_l4_core__mmu_isp,
|
||||
#ifdef CONFIG_OMAP_IOMMU_IVA2
|
||||
&omap3xxx_l3_main__mmu_iva,
|
||||
#endif
|
||||
NULL
|
||||
};
|
||||
|
||||
|
|
|
@ -86,9 +86,6 @@ config OMAP_MUX_WARNINGS
|
|||
to change the pin multiplexing setup. When there are no warnings
|
||||
printed, it's safe to deselect OMAP_MUX for your product.
|
||||
|
||||
config OMAP_IOMMU_IVA2
|
||||
bool
|
||||
|
||||
config OMAP_MPU_TIMER
|
||||
bool "Use mpu timer"
|
||||
depends on ARCH_OMAP1
|
||||
|
|
Loading…
Reference in New Issue