From: Ohad Ben-Cohen <ohadb@xxxxxx> Add preliminary iva2 hwmod support to omap3. We do not include iva2_clk; that will be part of a separate hwmod, which will be controlled by iommu. Signed-off-by: Ohad Ben-Cohen <ohadb@xxxxxx> Signed-off-by: Hari Kanigeri <h-kanigeri2@xxxxxx> --- arch/arm/mach-omap2/omap_hwmod_34xx.h | 23 +++++++++++++++++++++++ arch/arm/plat-omap/include/plat/omap_hwmod.h | 1 + 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-omap2/omap_hwmod_34xx.h b/arch/arm/mach-omap2/omap_hwmod_34xx.h index b6076b9..d363a95 100644 --- a/arch/arm/mach-omap2/omap_hwmod_34xx.h +++ b/arch/arm/mach-omap2/omap_hwmod_34xx.h @@ -22,6 +22,7 @@ #include "prm-regbits-34xx.h" static struct omap_hwmod omap34xx_mpu_hwmod; +static struct omap_hwmod omap34xx_iva2_hwmod; static struct omap_hwmod omap34xx_l3_hwmod; static struct omap_hwmod omap34xx_l4_core_hwmod; static struct omap_hwmod omap34xx_l4_per_hwmod; @@ -47,9 +48,17 @@ static struct omap_hwmod_ocp_if omap34xx_mpu__l3 = { .user = OCP_USER_MPU, }; +/* IVA2 -> L3 interface */ +static struct omap_hwmod_ocp_if omap34xx_iva2__l3 = { + .master = &omap34xx_iva2_hwmod, + .slave = &omap34xx_l3_hwmod, + .user = OCP_USER_IVA2, +}; + /* Slave interfaces on the L3 interconnect */ static struct omap_hwmod_ocp_if *omap34xx_l3_slaves[] = { &omap34xx_mpu__l3, + &omap34xx_iva2__l3, }; /* Master interfaces on the L3 interconnect */ @@ -150,12 +159,26 @@ static struct omap_hwmod omap34xx_mpu_hwmod = { .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430), }; +/* Master interfaces on the IVA2 device */ +static struct omap_hwmod_ocp_if *omap34xx_iva2_masters[] = { + &omap34xx_iva2__l3, +}; + +/* IVA2 */ +static struct omap_hwmod omap34xx_iva2_hwmod = { + .name = "iva2_hwmod", + .masters = omap34xx_iva2_masters, + .masters_cnt = ARRAY_SIZE(omap34xx_iva2_masters), + .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430), +}; + static __initdata struct omap_hwmod *omap34xx_hwmods[] = { &omap34xx_l3_hwmod, &omap34xx_l4_core_hwmod, &omap34xx_l4_per_hwmod, &omap34xx_l4_wkup_hwmod, &omap34xx_mpu_hwmod, + &omap34xx_iva2_hwmod, NULL, }; diff --git a/arch/arm/plat-omap/include/plat/omap_hwmod.h b/arch/arm/plat-omap/include/plat/omap_hwmod.h index 3393325..5e64992 100644 --- a/arch/arm/plat-omap/include/plat/omap_hwmod.h +++ b/arch/arm/plat-omap/include/plat/omap_hwmod.h @@ -160,6 +160,7 @@ struct omap_hwmod_addr_space { */ #define OCP_USER_MPU (1 << 0) #define OCP_USER_SDMA (1 << 1) +#define OCP_USER_IVA2 (1 << 2) /* omap_hwmod_ocp_if.flags bits */ #define OCPIF_HAS_IDLEST (1 << 0) -- 1.7.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html