Commit 895a9613 authored by Florian Vaussard's avatar Florian Vaussard Committed by Tony Lindgren
Browse files

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: default avatarFlorian Vaussard <florian.vaussard@epfl.ch>
[s-anna@ti.com: revise commit log]
Signed-off-by: default avatarSuman Anna <s-anna@ti.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Acked-by: default avatarPaul Walmsley <paul@pwsan.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 18c49af3

arch/arm/mach-omap2/omap_hwmod_3xxx_data.c

+0 −8
Original line number Diff line number Diff line
@@ -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

};

arch/arm/plat-omap/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE