Re: [PATCH 13/13] OMAP3: hwmod data: add data for OMAP3 IVA2

2010-06-24 Thread Cousson, Benoit 

On 6/24/2010 10:43 PM, Kevin Hilman wrote:

Kevin Hilman  writes:


Add hwmod data for DSP on OMAP3 (a.k.a. IVA2.)

Cc: Paul Walmsley
Signed-off-by: Kevin Hilman


Also changing the name here from "dsp" to "iva2".


You should just name it iva. The 2 is a version information.
That's why we renamed as well ivahd -> iva in OMAP4.

In theory the dsp should be captured as a submodule of the iva in that case.

Benoit



Kevin


---
  arch/arm/mach-omap2/omap_hwmod_3xxx_data.c |   31 
  1 files changed, 31 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c 
b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index ec6a5f8..fe41089 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -32,6 +32,7 @@
   */

  static struct omap_hwmod omap3xxx_mpu_hwmod;
+static struct omap_hwmod omap3xxx_iva2_hwmod;
  static struct omap_hwmod omap3xxx_l3_hwmod;
  static struct omap_hwmod omap3xxx_l4_core_hwmod;
  static struct omap_hwmod omap3xxx_l4_per_hwmod;
@@ -168,12 +169,42 @@ static struct omap_hwmod omap3xxx_mpu_hwmod = {
.omap_chip  = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
  };

+/*
+ * IVA2_2 interface data
+ */
+
+/* IVA2<- L3 interface */
+static struct omap_hwmod_ocp_if omap3xxx_l3__iva2 = {
+   .master =&omap3xxx_l3_hwmod,
+   .slave  =&omap3xxx_iva2_hwmod,
+   .clk= "iva2_ck",
+   .user   = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+static struct omap_hwmod_ocp_if *omap3xxx_iva2_masters[] = {
+   &omap3xxx_l3__iva2,
+};
+
+/*
+ * IVA2 (IVA2)
+ */
+
+static struct omap_hwmod omap3xxx_iva2_hwmod = {
+   .name   = "dsp",
+   .class  =&dsp_hwmod_class,
+   .main_clk   = "iva2_ck",
+   .masters= omap3xxx_iva2_masters,
+   .masters_cnt= ARRAY_SIZE(omap3xxx_iva2_masters),
+   .omap_chip  = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
+};
+
  static __initdata struct omap_hwmod *omap3xxx_hwmods[] = {
&omap3xxx_l3_hwmod,
&omap3xxx_l4_core_hwmod,
&omap3xxx_l4_per_hwmod,
&omap3xxx_l4_wkup_hwmod,
&omap3xxx_mpu_hwmod,
+   &omap3xxx_iva2_hwmod,
NULL,
  };

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 13/13] OMAP3: hwmod data: add data for OMAP3 IVA2

2010-06-24 Thread Kevin Hilman 
Kevin Hilman  writes:

> Add hwmod data for DSP on OMAP3 (a.k.a. IVA2.)
>
> Cc: Paul Walmsley 
> Signed-off-by: Kevin Hilman 

Also changing the name here from "dsp" to "iva2".

Kevin

> ---
>  arch/arm/mach-omap2/omap_hwmod_3xxx_data.c |   31 
> 
>  1 files changed, 31 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c 
> b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
> index ec6a5f8..fe41089 100644
> --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
> +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
> @@ -32,6 +32,7 @@
>   */
>  
>  static struct omap_hwmod omap3xxx_mpu_hwmod;
> +static struct omap_hwmod omap3xxx_iva2_hwmod;
>  static struct omap_hwmod omap3xxx_l3_hwmod;
>  static struct omap_hwmod omap3xxx_l4_core_hwmod;
>  static struct omap_hwmod omap3xxx_l4_per_hwmod;
> @@ -168,12 +169,42 @@ static struct omap_hwmod omap3xxx_mpu_hwmod = {
>   .omap_chip  = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
>  };
>  
> +/*
> + * IVA2_2 interface data
> + */
> +
> +/* IVA2 <- L3 interface */
> +static struct omap_hwmod_ocp_if omap3xxx_l3__iva2 = {
> + .master = &omap3xxx_l3_hwmod,
> + .slave  = &omap3xxx_iva2_hwmod,
> + .clk= "iva2_ck",
> + .user   = OCP_USER_MPU | OCP_USER_SDMA,
> +};
> +
> +static struct omap_hwmod_ocp_if *omap3xxx_iva2_masters[] = {
> + &omap3xxx_l3__iva2,
> +};
> +
> +/*
> + * IVA2 (IVA2)
> + */
> +
> +static struct omap_hwmod omap3xxx_iva2_hwmod = {
> + .name   = "dsp",
> + .class  = &dsp_hwmod_class,
> + .main_clk   = "iva2_ck",
> + .masters= omap3xxx_iva2_masters,
> + .masters_cnt= ARRAY_SIZE(omap3xxx_iva2_masters),
> + .omap_chip  = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
> +};
> +
>  static __initdata struct omap_hwmod *omap3xxx_hwmods[] = {
>   &omap3xxx_l3_hwmod,
>   &omap3xxx_l4_core_hwmod,
>   &omap3xxx_l4_per_hwmod,
>   &omap3xxx_l4_wkup_hwmod,
>   &omap3xxx_mpu_hwmod,
> + &omap3xxx_iva2_hwmod,
>   NULL,
>  };
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 13/13] OMAP3: hwmod data: add data for OMAP3 IVA2

2010-06-23 Thread Kevin Hilman 
Add hwmod data for DSP on OMAP3 (a.k.a. IVA2.)

Cc: Paul Walmsley 
Signed-off-by: Kevin Hilman 
---
 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c |   31 
 1 files changed, 31 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c 
b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index ec6a5f8..fe41089 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -32,6 +32,7 @@
  */
 
 static struct omap_hwmod omap3xxx_mpu_hwmod;
+static struct omap_hwmod omap3xxx_iva2_hwmod;
 static struct omap_hwmod omap3xxx_l3_hwmod;
 static struct omap_hwmod omap3xxx_l4_core_hwmod;
 static struct omap_hwmod omap3xxx_l4_per_hwmod;
@@ -168,12 +169,42 @@ static struct omap_hwmod omap3xxx_mpu_hwmod = {
.omap_chip  = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
 };
 
+/*
+ * IVA2_2 interface data
+ */
+
+/* IVA2 <- L3 interface */
+static struct omap_hwmod_ocp_if omap3xxx_l3__iva2 = {
+   .master = &omap3xxx_l3_hwmod,
+   .slave  = &omap3xxx_iva2_hwmod,
+   .clk= "iva2_ck",
+   .user   = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+static struct omap_hwmod_ocp_if *omap3xxx_iva2_masters[] = {
+   &omap3xxx_l3__iva2,
+};
+
+/*
+ * IVA2 (IVA2)
+ */
+
+static struct omap_hwmod omap3xxx_iva2_hwmod = {
+   .name   = "dsp",
+   .class  = &dsp_hwmod_class,
+   .main_clk   = "iva2_ck",
+   .masters= omap3xxx_iva2_masters,
+   .masters_cnt= ARRAY_SIZE(omap3xxx_iva2_masters),
+   .omap_chip  = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
+};
+
 static __initdata struct omap_hwmod *omap3xxx_hwmods[] = {
&omap3xxx_l3_hwmod,
&omap3xxx_l4_core_hwmod,
&omap3xxx_l4_per_hwmod,
&omap3xxx_l4_wkup_hwmod,
&omap3xxx_mpu_hwmod,
+   &omap3xxx_iva2_hwmod,
NULL,
 };
 
-- 
1.7.0.2

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html