Re: [PATCH v2 4/9] OMAP2430: hwmod data: add system DMA

2010-12-18 Thread Paul Walmsley 
On Fri, 17 Dec 2010, G, Manjunath Kondaiah wrote:

 Add OMAP2430 DMA hwmod data and also add required
 DMA device attributes.
 
 Signed-off-by: G, Manjunath Kondaiah manj...@ti.com
 ---
  arch/arm/mach-omap2/omap_hwmod_2430_data.c |   87 
 
  arch/arm/plat-omap/include/plat/dma.h  |1 +
  2 files changed, 88 insertions(+), 0 deletions(-)
 
 diff --git a/arch/arm/mach-omap2/omap_hwmod_2430_data.c 
 b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
 index f68409e..b52ba66 100644
 --- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c
 +++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
 @@ -43,6 +43,7 @@ static struct omap_hwmod omap2430_gpio2_hwmod;
  static struct omap_hwmod omap2430_gpio3_hwmod;
  static struct omap_hwmod omap2430_gpio4_hwmod;
  static struct omap_hwmod omap2430_gpio5_hwmod;
 +static struct omap_hwmod omap2430_dma_system_hwmod;
  
  /* L3 - L4_CORE interface */
  static struct omap_hwmod_ocp_if omap2430_l3_main__l4_core = {
 @@ -840,6 +841,89 @@ static struct omap_hwmod omap2430_gpio5_hwmod = {
   .omap_chip  = OMAP_CHIP_INIT(CHIP_IS_OMAP2430),
  };
  
 +/* dma_system */
 +static struct omap_hwmod_class_sysconfig omap2430_dma_sysc = {
 + .rev_offs   = 0x,
 + .sysc_offs  = 0x002c,
 + .syss_offs  = 0x0028,
 + .sysc_flags = (SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET |

The OMAP2430 TRM Silicon Rev. 2.1 [Rev. Z] [SWPU090Z] Table 9-25 
'DMA4_OCP_SYSCONFIG' does not list a SIDLEMODE register bitfield for this 
IP block.  Is there a reason why you list one?

 +SYSC_HAS_MIDLEMODE | SYSC_HAS_CLOCKACTIVITY |
 +SYSC_HAS_EMUFREE | SYSC_HAS_AUTOIDLE),
 + .idlemodes  = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |

If there is no SIDLEMODE register bitfield, then none of these SIDLE_* 
modes should be included.

 +MSTANDBY_FORCE | MSTANDBY_NO | MSTANDBY_SMART),
 + .sysc_fields= omap_hwmod_sysc_type1,
 +};
 +
 +static struct omap_hwmod_class omap2430_dma_hwmod_class = {
 + .name = dma,
 + .sysc = omap2430_dma_sysc,
 +};
 +
 +/* dma attributes */
 +static struct omap_dma_dev_attr dma_dev_attr = {
 + .dev_caps  = RESERVE_CHANNEL | DMA_LINKED_LCH | GLOBAL_PRIORITY |
 + IS_CSSA_32 | IS_CDSA_32 | IS_RW_PRIORITY,
 + .lch_count = 32,
 +};
 +
 +static struct omap_hwmod_irq_info omap2430_dma_system_irqs[] = {
 + { .name = 0, .irq = 12 }, /* INT_24XX_SDMA_IRQ0 */
 + { .name = 1, .irq = 13 }, /* INT_24XX_SDMA_IRQ1 */
 + { .name = 2, .irq = 14 }, /* INT_24XX_SDMA_IRQ2 */
 + { .name = 3, .irq = 15 }, /* INT_24XX_SDMA_IRQ3 */
 +};
 +
 +static struct omap_hwmod_addr_space omap2430_dma_system_addrs[] = {
 + {
 + .pa_start   = 0x48056000,
 + .pa_end = 0x4a0560ff,
 + .flags  = ADDR_TYPE_RT
 + },
 +};
 +
 +/* dma_system - L3 */
 +static struct omap_hwmod_ocp_if omap2430_dma_system__l3 = {
 + .master = omap2430_dma_system_hwmod,
 + .slave  = omap2430_l3_main_hwmod,
 + .clk= core_l3_ck,
 + .user   = OCP_USER_MPU | OCP_USER_SDMA,
 +};
 +
 +/* dma_system master ports */
 +static struct omap_hwmod_ocp_if *omap2430_dma_system_masters[] = {
 + omap2430_dma_system__l3,
 +};
 +
 +/* l4_cfg - dma_system */

l4_cfg should be l4_core.

 +static struct omap_hwmod_ocp_if omap2430_l4_core__dma_system = {
 + .master = omap2430_l4_core_hwmod,
 + .slave  = omap2430_dma_system_hwmod,
 + .clk= sdma_ick,
 + .addr   = omap2430_dma_system_addrs,
 + .addr_cnt   = ARRAY_SIZE(omap2430_dma_system_addrs),
 + .user   = OCP_USER_MPU | OCP_USER_SDMA,
 +};
 +
 +/* dma_system slave ports */
 +static struct omap_hwmod_ocp_if *omap2430_dma_system_slaves[] = {
 + omap2430_l4_core__dma_system,
 +};
 +
 +static struct omap_hwmod omap2430_dma_system_hwmod = {
 + .name   = dma,
 + .class  = omap2430_dma_hwmod_class,
 + .mpu_irqs   = omap2430_dma_system_irqs,
 + .mpu_irqs_cnt   = ARRAY_SIZE(omap2430_dma_system_irqs),
 + .main_clk   = core_l3_ck,
 + .slaves = omap2430_dma_system_slaves,
 + .slaves_cnt = ARRAY_SIZE(omap2430_dma_system_slaves),
 + .masters= omap2430_dma_system_masters,
 + .masters_cnt= ARRAY_SIZE(omap2430_dma_system_masters),
 + .dev_attr   = dma_dev_attr,
 + .omap_chip  = OMAP_CHIP_INIT(CHIP_IS_OMAP2430),
 + .flags  = HWMOD_NO_IDLEST,
 +};
 +
  static __initdata struct omap_hwmod *omap2430_hwmods[] = {
   omap2430_l3_main_hwmod,
   omap2430_l4_core_hwmod,
 @@ -859,6 +943,9 @@ static __initdata struct omap_hwmod *omap2430_hwmods[] = {
   omap2430_gpio3_hwmod,
   omap2430_gpio4_hwmod,
   omap2430_gpio5_hwmod,
 +
 + /* dma_system class*/
 + omap2430_dma_system_hwmod,
   NULL,
  };
  
 diff --git

Re: [PATCH v2 4/9] OMAP2430: hwmod data: add system DMA

2010-12-18 Thread Russell King - ARM Linux 
On Sat, Dec 18, 2010 at 02:11:50AM -0700, Paul Walmsley wrote:
 On Fri, 17 Dec 2010, G, Manjunath Kondaiah wrote:
 
  Add OMAP2430 DMA hwmod data and also add required
  DMA device attributes.
  
  Signed-off-by: G, Manjunath Kondaiah manj...@ti.com
  ---
   arch/arm/mach-omap2/omap_hwmod_2430_data.c |   87 
  
   arch/arm/plat-omap/include/plat/dma.h  |1 +
   2 files changed, 88 insertions(+), 0 deletions(-)
  
  diff --git a/arch/arm/mach-omap2/omap_hwmod_2430_data.c 
  b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
  index f68409e..b52ba66 100644
  --- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c
  +++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
  @@ -43,6 +43,7 @@ static struct omap_hwmod omap2430_gpio2_hwmod;
   static struct omap_hwmod omap2430_gpio3_hwmod;
   static struct omap_hwmod omap2430_gpio4_hwmod;
   static struct omap_hwmod omap2430_gpio5_hwmod;
  +static struct omap_hwmod omap2430_dma_system_hwmod;
   
   /* L3 - L4_CORE interface */
   static struct omap_hwmod_ocp_if omap2430_l3_main__l4_core = {
  @@ -840,6 +841,89 @@ static struct omap_hwmod omap2430_gpio5_hwmod = {
  .omap_chip  = OMAP_CHIP_INIT(CHIP_IS_OMAP2430),
   };
   
  +/* dma_system */
  +static struct omap_hwmod_class_sysconfig omap2430_dma_sysc = {
  +   .rev_offs   = 0x,
  +   .sysc_offs  = 0x002c,
  +   .syss_offs  = 0x0028,
  +   .sysc_flags = (SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET |
 
 The OMAP2430 TRM Silicon Rev. 2.1 [Rev. Z] [SWPU090Z] Table 9-25 
 'DMA4_OCP_SYSCONFIG' does not list a SIDLEMODE register bitfield for this 
 IP block.  Is there a reason why you list one?
 
  +  SYSC_HAS_MIDLEMODE | SYSC_HAS_CLOCKACTIVITY |
  +  SYSC_HAS_EMUFREE | SYSC_HAS_AUTOIDLE),
  +   .idlemodes  = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
 
 If there is no SIDLEMODE register bitfield, then none of these SIDLE_* 
 modes should be included.

I'm confused.  I thought the whole point of hwmod was that the data for
it was generated from a TI database of how the chip is actually setup.

However, from all the patching which seems to be going on, it looks to
me like that's not the case - and if that's true, hwmod was mis-sold.
It's just moved the problem rather than solving anything.

What's going on?
--
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 v2 4/9] OMAP2430: hwmod data: add system DMA

2010-12-18 Thread Paul Walmsley 
On Sat, 18 Dec 2010, Russell King - ARM Linux wrote:

 I'm confused.  I thought the whole point of hwmod was that the data for
 it was generated from a TI database of how the chip is actually setup.
 
 However, from all the patching which seems to be going on, it looks to
 me like that's not the case - and if that's true, hwmod was mis-sold.
 It's just moved the problem rather than solving anything.
 
 What's going on?

OMAP4 and beyond data is being generated from the TI hardware database.  
However, apparently that is not possible with the OMAP2 and OMAP3 data.


- Paul
--
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 v2 4/9] OMAP2430: hwmod data: add system DMA

2010-12-18 Thread G, Manjunath Kondaiah 
On Sat, Dec 18, 2010 at 02:11:50AM -0700, Paul Walmsley wrote:
 On Fri, 17 Dec 2010, G, Manjunath Kondaiah wrote:
 
  Add OMAP2430 DMA hwmod data and also add required
  DMA device attributes.
  
  Signed-off-by: G, Manjunath Kondaiah manj...@ti.com
  ---
   arch/arm/mach-omap2/omap_hwmod_2430_data.c |   87 
  
   arch/arm/plat-omap/include/plat/dma.h  |1 +
   2 files changed, 88 insertions(+), 0 deletions(-)
  
  diff --git a/arch/arm/mach-omap2/omap_hwmod_2430_data.c 
  b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
  index f68409e..b52ba66 100644
  --- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c
  +++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
  @@ -43,6 +43,7 @@ static struct omap_hwmod omap2430_gpio2_hwmod;
   static struct omap_hwmod omap2430_gpio3_hwmod;
   static struct omap_hwmod omap2430_gpio4_hwmod;
   static struct omap_hwmod omap2430_gpio5_hwmod;
  +static struct omap_hwmod omap2430_dma_system_hwmod;
   
   /* L3 - L4_CORE interface */
   static struct omap_hwmod_ocp_if omap2430_l3_main__l4_core = {
  @@ -840,6 +841,89 @@ static struct omap_hwmod omap2430_gpio5_hwmod = {
  .omap_chip  = OMAP_CHIP_INIT(CHIP_IS_OMAP2430),
   };
   
  +/* dma_system */
  +static struct omap_hwmod_class_sysconfig omap2430_dma_sysc = {
  +   .rev_offs   = 0x,
  +   .sysc_offs  = 0x002c,
  +   .syss_offs  = 0x0028,
  +   .sysc_flags = (SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET |
 
 The OMAP2430 TRM Silicon Rev. 2.1 [Rev. Z] [SWPU090Z] Table 9-25 
 'DMA4_OCP_SYSCONFIG' does not list a SIDLEMODE register bitfield for this 
 IP block.  Is there a reason why you list one?
You are right. This has been corrected now.
 
  +  SYSC_HAS_MIDLEMODE | SYSC_HAS_CLOCKACTIVITY |
  +  SYSC_HAS_EMUFREE | SYSC_HAS_AUTOIDLE),
  +   .idlemodes  = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
 
 If there is no SIDLEMODE register bitfield, then none of these SIDLE_* 
 modes should be included.
ok.
 
  +  MSTANDBY_FORCE | MSTANDBY_NO | MSTANDBY_SMART),
  +   .sysc_fields= omap_hwmod_sysc_type1,
  +};
  +
  +static struct omap_hwmod_class omap2430_dma_hwmod_class = {
  +   .name = dma,
  +   .sysc = omap2430_dma_sysc,
  +};
  +
  +/* dma attributes */
  +static struct omap_dma_dev_attr dma_dev_attr = {
  +   .dev_caps  = RESERVE_CHANNEL | DMA_LINKED_LCH | GLOBAL_PRIORITY |
  +   IS_CSSA_32 | IS_CDSA_32 | IS_RW_PRIORITY,
  +   .lch_count = 32,
  +};
  +
  +static struct omap_hwmod_irq_info omap2430_dma_system_irqs[] = {
  +   { .name = 0, .irq = 12 }, /* INT_24XX_SDMA_IRQ0 */
  +   { .name = 1, .irq = 13 }, /* INT_24XX_SDMA_IRQ1 */
  +   { .name = 2, .irq = 14 }, /* INT_24XX_SDMA_IRQ2 */
  +   { .name = 3, .irq = 15 }, /* INT_24XX_SDMA_IRQ3 */
  +};
  +
  +static struct omap_hwmod_addr_space omap2430_dma_system_addrs[] = {
  +   {
  +   .pa_start   = 0x48056000,
  +   .pa_end = 0x4a0560ff,
  +   .flags  = ADDR_TYPE_RT
  +   },
  +};
  +
  +/* dma_system - L3 */
  +static struct omap_hwmod_ocp_if omap2430_dma_system__l3 = {
  +   .master = omap2430_dma_system_hwmod,
  +   .slave  = omap2430_l3_main_hwmod,
  +   .clk= core_l3_ck,
  +   .user   = OCP_USER_MPU | OCP_USER_SDMA,
  +};
  +
  +/* dma_system master ports */
  +static struct omap_hwmod_ocp_if *omap2430_dma_system_masters[] = {
  +   omap2430_dma_system__l3,
  +};
  +
  +/* l4_cfg - dma_system */
 
 l4_cfg should be l4_core.
ok.
 
  +static struct omap_hwmod_ocp_if omap2430_l4_core__dma_system = {
  +   .master = omap2430_l4_core_hwmod,
  +   .slave  = omap2430_dma_system_hwmod,
  +   .clk= sdma_ick,
  +   .addr   = omap2430_dma_system_addrs,
  +   .addr_cnt   = ARRAY_SIZE(omap2430_dma_system_addrs),
  +   .user   = OCP_USER_MPU | OCP_USER_SDMA,
  +};
  +
  +/* dma_system slave ports */
  +static struct omap_hwmod_ocp_if *omap2430_dma_system_slaves[] = {
  +   omap2430_l4_core__dma_system,
  +};
  +
  +static struct omap_hwmod omap2430_dma_system_hwmod = {
  +   .name   = dma,
  +   .class  = omap2430_dma_hwmod_class,
  +   .mpu_irqs   = omap2430_dma_system_irqs,
  +   .mpu_irqs_cnt   = ARRAY_SIZE(omap2430_dma_system_irqs),
  +   .main_clk   = core_l3_ck,
  +   .slaves = omap2430_dma_system_slaves,
  +   .slaves_cnt = ARRAY_SIZE(omap2430_dma_system_slaves),
  +   .masters= omap2430_dma_system_masters,
  +   .masters_cnt= ARRAY_SIZE(omap2430_dma_system_masters),
  +   .dev_attr   = dma_dev_attr,
  +   .omap_chip  = OMAP_CHIP_INIT(CHIP_IS_OMAP2430),
  +   .flags  = HWMOD_NO_IDLEST,
  +};
  +
   static __initdata struct omap_hwmod *omap2430_hwmods[] = {
  omap2430_l3_main_hwmod,
  omap2430_l4_core_hwmod,
  @@ -859,6 +943,9 @@ static __initdata struct omap_hwmod *omap2430_hwmods[] 
  = {
  omap2430_gpio3_hwmod,
  omap2430_gpio4_hwmod,

[PATCH v2 4/9] OMAP2430: hwmod data: add system DMA

2010-12-17 Thread G, Manjunath Kondaiah 
Add OMAP2430 DMA hwmod data and also add required
DMA device attributes.

Signed-off-by: G, Manjunath Kondaiah manj...@ti.com
---
 arch/arm/mach-omap2/omap_hwmod_2430_data.c |   87 
 arch/arm/plat-omap/include/plat/dma.h  |1 +
 2 files changed, 88 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap2/omap_hwmod_2430_data.c 
b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
index f68409e..b52ba66 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
@@ -43,6 +43,7 @@ static struct omap_hwmod omap2430_gpio2_hwmod;
 static struct omap_hwmod omap2430_gpio3_hwmod;
 static struct omap_hwmod omap2430_gpio4_hwmod;
 static struct omap_hwmod omap2430_gpio5_hwmod;
+static struct omap_hwmod omap2430_dma_system_hwmod;
 
 /* L3 - L4_CORE interface */
 static struct omap_hwmod_ocp_if omap2430_l3_main__l4_core = {
@@ -840,6 +841,89 @@ static struct omap_hwmod omap2430_gpio5_hwmod = {
.omap_chip  = OMAP_CHIP_INIT(CHIP_IS_OMAP2430),
 };
 
+/* dma_system */
+static struct omap_hwmod_class_sysconfig omap2430_dma_sysc = {
+   .rev_offs   = 0x,
+   .sysc_offs  = 0x002c,
+   .syss_offs  = 0x0028,
+   .sysc_flags = (SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET |
+  SYSC_HAS_MIDLEMODE | SYSC_HAS_CLOCKACTIVITY |
+  SYSC_HAS_EMUFREE | SYSC_HAS_AUTOIDLE),
+   .idlemodes  = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
+  MSTANDBY_FORCE | MSTANDBY_NO | MSTANDBY_SMART),
+   .sysc_fields= omap_hwmod_sysc_type1,
+};
+
+static struct omap_hwmod_class omap2430_dma_hwmod_class = {
+   .name = dma,
+   .sysc = omap2430_dma_sysc,
+};
+
+/* dma attributes */
+static struct omap_dma_dev_attr dma_dev_attr = {
+   .dev_caps  = RESERVE_CHANNEL | DMA_LINKED_LCH | GLOBAL_PRIORITY |
+   IS_CSSA_32 | IS_CDSA_32 | IS_RW_PRIORITY,
+   .lch_count = 32,
+};
+
+static struct omap_hwmod_irq_info omap2430_dma_system_irqs[] = {
+   { .name = 0, .irq = 12 }, /* INT_24XX_SDMA_IRQ0 */
+   { .name = 1, .irq = 13 }, /* INT_24XX_SDMA_IRQ1 */
+   { .name = 2, .irq = 14 }, /* INT_24XX_SDMA_IRQ2 */
+   { .name = 3, .irq = 15 }, /* INT_24XX_SDMA_IRQ3 */
+};
+
+static struct omap_hwmod_addr_space omap2430_dma_system_addrs[] = {
+   {
+   .pa_start   = 0x48056000,
+   .pa_end = 0x4a0560ff,
+   .flags  = ADDR_TYPE_RT
+   },
+};
+
+/* dma_system - L3 */
+static struct omap_hwmod_ocp_if omap2430_dma_system__l3 = {
+   .master = omap2430_dma_system_hwmod,
+   .slave  = omap2430_l3_main_hwmod,
+   .clk= core_l3_ck,
+   .user   = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* dma_system master ports */
+static struct omap_hwmod_ocp_if *omap2430_dma_system_masters[] = {
+   omap2430_dma_system__l3,
+};
+
+/* l4_cfg - dma_system */
+static struct omap_hwmod_ocp_if omap2430_l4_core__dma_system = {
+   .master = omap2430_l4_core_hwmod,
+   .slave  = omap2430_dma_system_hwmod,
+   .clk= sdma_ick,
+   .addr   = omap2430_dma_system_addrs,
+   .addr_cnt   = ARRAY_SIZE(omap2430_dma_system_addrs),
+   .user   = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* dma_system slave ports */
+static struct omap_hwmod_ocp_if *omap2430_dma_system_slaves[] = {
+   omap2430_l4_core__dma_system,
+};
+
+static struct omap_hwmod omap2430_dma_system_hwmod = {
+   .name   = dma,
+   .class  = omap2430_dma_hwmod_class,
+   .mpu_irqs   = omap2430_dma_system_irqs,
+   .mpu_irqs_cnt   = ARRAY_SIZE(omap2430_dma_system_irqs),
+   .main_clk   = core_l3_ck,
+   .slaves = omap2430_dma_system_slaves,
+   .slaves_cnt = ARRAY_SIZE(omap2430_dma_system_slaves),
+   .masters= omap2430_dma_system_masters,
+   .masters_cnt= ARRAY_SIZE(omap2430_dma_system_masters),
+   .dev_attr   = dma_dev_attr,
+   .omap_chip  = OMAP_CHIP_INIT(CHIP_IS_OMAP2430),
+   .flags  = HWMOD_NO_IDLEST,
+};
+
 static __initdata struct omap_hwmod *omap2430_hwmods[] = {
omap2430_l3_main_hwmod,
omap2430_l4_core_hwmod,
@@ -859,6 +943,9 @@ static __initdata struct omap_hwmod *omap2430_hwmods[] = {
omap2430_gpio3_hwmod,
omap2430_gpio4_hwmod,
omap2430_gpio5_hwmod,
+
+   /* dma_system class*/
+   omap2430_dma_system_hwmod,
NULL,
 };
 
diff --git a/arch/arm/plat-omap/include/plat/dma.h 
b/arch/arm/plat-omap/include/plat/dma.h
index c466566..4b51d2b 100644
--- a/arch/arm/plat-omap/include/plat/dma.h
+++ b/arch/arm/plat-omap/include/plat/dma.h
@@ -301,6 +301,7 @@
 #define RESERVE_CHANNELBIT(0x2)
 #define IS_CSSA_32 BIT(0x3)
 #define IS_CDSA_32 BIT(0x4)
+#define IS_RW_PRIORITY