[PATCH 2/2] ARM: AM33XX: hwmod: Add OMAP_INTC_START offset to all module int nos

2012-09-12 Thread Vaibhav Hiremath 
With recent migration of omap architectures to SPARSE_IRQ framework,
it is important to add OMAP_INTC_START to all interrupt numbers
which will be eventually requested by drivers.

This is required in order to get AM33XX boot functionality.

Signed-off-by: Vaibhav Hiremath hvaib...@ti.com
Cc: Paul Walmsley p...@pwsan.com
---
 arch/arm/mach-omap2/omap_hwmod_33xx_data.c |  168 ++--
 1 files changed, 84 insertions(+), 84 deletions(-)

diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c 
b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
index 7b7ed08..3c320f4 100644
--- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
@@ -72,7 +72,7 @@ static struct omap_hwmod_class am33xx_emif_hwmod_class = {
 };
 
 static struct omap_hwmod_irq_info am33xx_emif_irqs[] = {
-   { .name = ddrerr0, .irq = 101 },
+   { .name = ddrerr0, .irq = 101 + OMAP_INTC_START },
{ .irq = -1 }
 };
 
@@ -102,8 +102,8 @@ static struct omap_hwmod_class am33xx_l3_hwmod_class = {
 
 /* l3_main (l3_fast) */
 static struct omap_hwmod_irq_info am33xx_l3_main_irqs[] = {
-   { .name = l3debug, .irq = 9 },
-   { .name = l3appint, .irq = 10 },
+   { .name = l3debug, .irq = 9 + OMAP_INTC_START },
+   { .name = l3appint, .irq = 10 + OMAP_INTC_START },
{ .irq = -1 }
 };
 
@@ -220,10 +220,10 @@ static struct omap_hwmod_class am33xx_mpu_hwmod_class = {
 
 /* mpu */
 static struct omap_hwmod_irq_info am33xx_mpu_irqs[] = {
-   { .name = emuint, .irq = 0 },
-   { .name = commtx, .irq = 1 },
-   { .name = commrx, .irq = 2 },
-   { .name = bench, .irq = 3 },
+   { .name = emuint, .irq = 0 + OMAP_INTC_START },
+   { .name = commtx, .irq = 1 + OMAP_INTC_START },
+   { .name = commrx, .irq = 2 + OMAP_INTC_START },
+   { .name = bench, .irq = 3 + OMAP_INTC_START },
{ .irq = -1 }
 };
 
@@ -255,7 +255,7 @@ static struct omap_hwmod_rst_info am33xx_wkup_m3_resets[] = 
{
 };
 
 static struct omap_hwmod_irq_info am33xx_wkup_m3_irqs[] = {
-   { .name = txev, .irq = 78 },
+   { .name = txev, .irq = 78 + OMAP_INTC_START },
{ .irq = -1 }
 };
 
@@ -291,14 +291,14 @@ static struct omap_hwmod_rst_info am33xx_pruss_resets[] = 
{
 };
 
 static struct omap_hwmod_irq_info am33xx_pruss_irqs[] = {
-   { .name = evtout0, .irq = 20 },
-   { .name = evtout1, .irq = 21 },
-   { .name = evtout2, .irq = 22 },
-   { .name = evtout3, .irq = 23 },
-   { .name = evtout4, .irq = 24 },
-   { .name = evtout5, .irq = 25 },
-   { .name = evtout6, .irq = 26 },
-   { .name = evtout7, .irq = 27 },
+   { .name = evtout0, .irq = 20 + OMAP_INTC_START },
+   { .name = evtout1, .irq = 21 + OMAP_INTC_START },
+   { .name = evtout2, .irq = 22 + OMAP_INTC_START },
+   { .name = evtout3, .irq = 23 + OMAP_INTC_START },
+   { .name = evtout4, .irq = 24 + OMAP_INTC_START },
+   { .name = evtout5, .irq = 25 + OMAP_INTC_START },
+   { .name = evtout6, .irq = 26 + OMAP_INTC_START },
+   { .name = evtout7, .irq = 27 + OMAP_INTC_START },
{ .irq = -1 }
 };
 
@@ -332,7 +332,7 @@ static struct omap_hwmod_rst_info am33xx_gfx_resets[] = {
 };
 
 static struct omap_hwmod_irq_info am33xx_gfx_irqs[] = {
-   { .name = gfxint, .irq = 37 },
+   { .name = gfxint, .irq = 37 + OMAP_INTC_START },
{ .irq = -1 }
 };
 
@@ -387,7 +387,7 @@ static struct omap_hwmod_class am33xx_adc_tsc_hwmod_class = 
{
 };
 
 static struct omap_hwmod_irq_info am33xx_adc_tsc_irqs[] = {
-   { .irq = 16 },
+   { .irq = 16 + OMAP_INTC_START },
{ .irq = -1 }
 };
 
@@ -528,7 +528,7 @@ static struct omap_hwmod_class am33xx_aes_hwmod_class = {
 };
 
 static struct omap_hwmod_irq_info am33xx_aes0_irqs[] = {
-   { .irq = 102 },
+   { .irq = 102 + OMAP_INTC_START },
{ .irq = -1 }
 };
 
@@ -552,7 +552,7 @@ static struct omap_hwmod_class am33xx_sha0_hwmod_class = {
 };
 
 static struct omap_hwmod_irq_info am33xx_sha0_irqs[] = {
-   { .irq = 108 },
+   { .irq = 108 + OMAP_INTC_START },
{ .irq = -1 }
 };
 
@@ -579,7 +579,7 @@ static struct omap_hwmod_class 
am33xx_smartreflex_hwmod_class = {
 
 /* smartreflex0 */
 static struct omap_hwmod_irq_info am33xx_smartreflex0_irqs[] = {
-   { .irq = 120 },
+   { .irq = 120 + OMAP_INTC_START },
{ .irq = -1 }
 };
 
@@ -599,7 +599,7 @@ static struct omap_hwmod am33xx_smartreflex0_hwmod = {
 
 /* smartreflex1 */
 static struct omap_hwmod_irq_info am33xx_smartreflex1_irqs[] = {
-   { .irq = 121 },
+   { .irq = 121 + OMAP_INTC_START },
{ .irq = -1 }
 };
 
@@ -625,7 +625,7 @@ static struct omap_hwmod_class am33xx_control_hwmod_class = 
{
 };
 
 static struct omap_hwmod_irq_info am33xx_control_irqs[] = {
-   { .irq = 8 },
+   { .irq = 8 + OMAP_INTC_START },
{ .irq = -1 }
 };
 
@@ -665,10 +665,10 @@ static struct omap_hwmod_class am33xx_cpgmac0_hwmod_class 
= {
 };
 
 static struct

Re: [PATCH 2/2] ARM: AM33XX: hwmod: Add OMAP_INTC_START offset to all module int nos

2012-09-12 Thread Tony Lindgren 
* Vaibhav Hiremath hvaib...@ti.com [120912 14:17]:
 With recent migration of omap architectures to SPARSE_IRQ framework,
 it is important to add OMAP_INTC_START to all interrupt numbers
 which will be eventually requested by drivers.
 
 This is required in order to get AM33XX boot functionality.
 
 Signed-off-by: Vaibhav Hiremath hvaib...@ti.com
 Cc: Paul Walmsley p...@pwsan.com
 ---
  arch/arm/mach-omap2/omap_hwmod_33xx_data.c |  168 
 ++--
  1 files changed, 84 insertions(+), 84 deletions(-)
 
 diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c 
 b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
 index 7b7ed08..3c320f4 100644
 --- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
 +++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c

You should just have on top of this file:

#define OMAP_INTC_START 0

Then Paul can apply this, and while merging with the sparseirq
changes, the above can be removed.

 @@ -72,7 +72,7 @@ static struct omap_hwmod_class am33xx_emif_hwmod_class = {
  };
  
  static struct omap_hwmod_irq_info am33xx_emif_irqs[] = {
 - { .name = ddrerr0, .irq = 101 },
 + { .name = ddrerr0, .irq = 101 + OMAP_INTC_START },
   { .irq = -1 }
  };
  

Then these should be fixed up to have trailing commas
as requested by Russell earlier on several occasions.

Regards,

Tony

--
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 2/2] ARM: AM33XX: hwmod: Add OMAP_INTC_START offset to all module int nos

2012-09-12 Thread Hiremath, Vaibhav 
On Thu, Sep 13, 2012 at 03:22:32, Tony Lindgren wrote:
 * Vaibhav Hiremath hvaib...@ti.com [120912 14:17]:
  With recent migration of omap architectures to SPARSE_IRQ framework,
  it is important to add OMAP_INTC_START to all interrupt numbers
  which will be eventually requested by drivers.
  
  This is required in order to get AM33XX boot functionality.
  
  Signed-off-by: Vaibhav Hiremath hvaib...@ti.com
  Cc: Paul Walmsley p...@pwsan.com
  ---
   arch/arm/mach-omap2/omap_hwmod_33xx_data.c |  168 
  ++--
   1 files changed, 84 insertions(+), 84 deletions(-)
  
  diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c 
  b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
  index 7b7ed08..3c320f4 100644
  --- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
  +++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
 
 You should just have on top of this file:
 
 #define OMAP_INTC_START   0
 
 Then Paul can apply this, and while merging with the sparseirq
 changes, the above can be removed.
 

Ok, I will add this at the top of the file and resend this patch.


  @@ -72,7 +72,7 @@ static struct omap_hwmod_class am33xx_emif_hwmod_class = {
   };
   
   static struct omap_hwmod_irq_info am33xx_emif_irqs[] = {
  -   { .name = ddrerr0, .irq = 101 },
  +   { .name = ddrerr0, .irq = 101 + OMAP_INTC_START },
  { .irq = -1 }
   };
   
 
 Then these should be fixed up to have trailing commas
 as requested by Russell earlier on several occasions.
 

Ok, I will fix this and all other places as well and resend.

Thanks,
Vaibhav

--
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 2/2] ARM: AM33XX: hwmod: Add OMAP_INTC_START offset to all module int nos

2012-09-12 Thread Paul Walmsley 
Hi

On Wed, 12 Sep 2012, Tony Lindgren wrote:

 * Vaibhav Hiremath hvaib...@ti.com [120912 14:17]:
  With recent migration of omap architectures to SPARSE_IRQ framework,
  it is important to add OMAP_INTC_START to all interrupt numbers
  which will be eventually requested by drivers.
  
  This is required in order to get AM33XX boot functionality.
  
  Signed-off-by: Vaibhav Hiremath hvaib...@ti.com
  Cc: Paul Walmsley p...@pwsan.com
  ---
   arch/arm/mach-omap2/omap_hwmod_33xx_data.c |  168 
  ++--
   1 files changed, 84 insertions(+), 84 deletions(-)
  
  diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c 
  b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
  index 7b7ed08..3c320f4 100644
  --- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
  +++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
 
 You should just have on top of this file:
 
 #define OMAP_INTC_START   0
 
 Then Paul can apply this, and while merging with the sparseirq
 changes, the above can be removed.

This change has been made.

 Then these should be fixed up to have trailing commas
 as requested by Russell earlier on several occasions.

I've taken the script you sent and run it on the data file - thanks for 
the script - and will send the updated pull request shortly.  Sounds like 
Russell should send patches for Documentation/CodingStyle and 
scripts/checkpatch.pl so it can be agreed as a kernel-wide policy.


- 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