On Thursday 13 February 2014 12:15:39 Suman Anna wrote:
> From: Florian Vaussard <florian.vaussard@xxxxxxx>
>
> 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@xxxxxxxxx>
> Signed-off-by: Florian Vaussard <florian.vaussard@xxxxxxx>
> [s-anna@xxxxxx: revise commit log]
> Signed-off-by: Suman Anna <s-anna@xxxxxx>
Acked-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> ---
> arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 8 --------
> arch/arm/plat-omap/Kconfig | 3 ---
> 2 files changed, 11 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
> b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c index 4c3b1e6..81dd071 100644
> --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
> +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
> @@ -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
> };
>
> diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
> index 436ea97..02fc10d 100644
> --- a/arch/arm/plat-omap/Kconfig
> +++ b/arch/arm/plat-omap/Kconfig
> @@ -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
--
Regards,
Laurent Pinchart
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
