* [PATCH 1/2] ARM: OMAP3: hwmod_data: Rename the common irq for McBSP ports
@ 2012-03-19 15:12 ` Peter Ujfalusi
0 siblings, 0 replies; 10+ messages in thread
From: Peter Ujfalusi @ 2012-03-19 15:12 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Jarkko Nikula, Paul Walmsley, linux-omap, linux-arm-kernel
Use 'common' as name for the common irq number in hwmod data for the McBSP
ports. The same name already in use for OMAP2430, and the OMAP4 hwmod data
will be using the same name.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index 3c8dd92..af84276 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -2242,7 +2242,7 @@ static struct omap_hwmod_class omap3xxx_mcbsp_hwmod_class = {
/* mcbsp1 */
static struct omap_hwmod_irq_info omap3xxx_mcbsp1_irqs[] = {
- { .name = "irq", .irq = 16 },
+ { .name = "common", .irq = 16 },
{ .name = "tx", .irq = 59 },
{ .name = "rx", .irq = 60 },
{ .irq = -1 }
@@ -2293,7 +2293,7 @@ static struct omap_hwmod omap3xxx_mcbsp1_hwmod = {
/* mcbsp2 */
static struct omap_hwmod_irq_info omap3xxx_mcbsp2_irqs[] = {
- { .name = "irq", .irq = 17 },
+ { .name = "common", .irq = 17 },
{ .name = "tx", .irq = 62 },
{ .name = "rx", .irq = 63 },
{ .irq = -1 }
@@ -2349,7 +2349,7 @@ static struct omap_hwmod omap3xxx_mcbsp2_hwmod = {
/* mcbsp3 */
static struct omap_hwmod_irq_info omap3xxx_mcbsp3_irqs[] = {
- { .name = "irq", .irq = 22 },
+ { .name = "common", .irq = 22 },
{ .name = "tx", .irq = 89 },
{ .name = "rx", .irq = 90 },
{ .irq = -1 }
@@ -2405,7 +2405,7 @@ static struct omap_hwmod omap3xxx_mcbsp3_hwmod = {
/* mcbsp4 */
static struct omap_hwmod_irq_info omap3xxx_mcbsp4_irqs[] = {
- { .name = "irq", .irq = 23 },
+ { .name = "common", .irq = 23 },
{ .name = "tx", .irq = 54 },
{ .name = "rx", .irq = 55 },
{ .irq = -1 }
@@ -2462,7 +2462,7 @@ static struct omap_hwmod omap3xxx_mcbsp4_hwmod = {
/* mcbsp5 */
static struct omap_hwmod_irq_info omap3xxx_mcbsp5_irqs[] = {
- { .name = "irq", .irq = 27 },
+ { .name = "common", .irq = 27 },
{ .name = "tx", .irq = 81 },
{ .name = "rx", .irq = 82 },
{ .irq = -1 }
--
1.7.8.5
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 1/2] ARM: OMAP3: hwmod_data: Rename the common irq for McBSP ports
@ 2012-03-19 15:12 ` Peter Ujfalusi
0 siblings, 0 replies; 10+ messages in thread
From: Peter Ujfalusi @ 2012-03-19 15:12 UTC (permalink / raw)
To: linux-arm-kernel
Use 'common' as name for the common irq number in hwmod data for the McBSP
ports. The same name already in use for OMAP2430, and the OMAP4 hwmod data
will be using the same name.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index 3c8dd92..af84276 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -2242,7 +2242,7 @@ static struct omap_hwmod_class omap3xxx_mcbsp_hwmod_class = {
/* mcbsp1 */
static struct omap_hwmod_irq_info omap3xxx_mcbsp1_irqs[] = {
- { .name = "irq", .irq = 16 },
+ { .name = "common", .irq = 16 },
{ .name = "tx", .irq = 59 },
{ .name = "rx", .irq = 60 },
{ .irq = -1 }
@@ -2293,7 +2293,7 @@ static struct omap_hwmod omap3xxx_mcbsp1_hwmod = {
/* mcbsp2 */
static struct omap_hwmod_irq_info omap3xxx_mcbsp2_irqs[] = {
- { .name = "irq", .irq = 17 },
+ { .name = "common", .irq = 17 },
{ .name = "tx", .irq = 62 },
{ .name = "rx", .irq = 63 },
{ .irq = -1 }
@@ -2349,7 +2349,7 @@ static struct omap_hwmod omap3xxx_mcbsp2_hwmod = {
/* mcbsp3 */
static struct omap_hwmod_irq_info omap3xxx_mcbsp3_irqs[] = {
- { .name = "irq", .irq = 22 },
+ { .name = "common", .irq = 22 },
{ .name = "tx", .irq = 89 },
{ .name = "rx", .irq = 90 },
{ .irq = -1 }
@@ -2405,7 +2405,7 @@ static struct omap_hwmod omap3xxx_mcbsp3_hwmod = {
/* mcbsp4 */
static struct omap_hwmod_irq_info omap3xxx_mcbsp4_irqs[] = {
- { .name = "irq", .irq = 23 },
+ { .name = "common", .irq = 23 },
{ .name = "tx", .irq = 54 },
{ .name = "rx", .irq = 55 },
{ .irq = -1 }
@@ -2462,7 +2462,7 @@ static struct omap_hwmod omap3xxx_mcbsp4_hwmod = {
/* mcbsp5 */
static struct omap_hwmod_irq_info omap3xxx_mcbsp5_irqs[] = {
- { .name = "irq", .irq = 27 },
+ { .name = "common", .irq = 27 },
{ .name = "tx", .irq = 81 },
{ .name = "rx", .irq = 82 },
{ .irq = -1 }
--
1.7.8.5
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 2/2] ARM: OMAP4: hwmod_data: Name the common irq for McBSP ports
2012-03-19 15:12 ` Peter Ujfalusi
@ 2012-03-19 15:12 ` Peter Ujfalusi
-1 siblings, 0 replies; 10+ messages in thread
From: Peter Ujfalusi @ 2012-03-19 15:12 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Jarkko Nikula, Paul Walmsley, linux-omap, linux-arm-kernel
Use 'common' as name for the common irq number in hwmod data for the McBSP
ports. The same name already in use for OMAP2430, and OMAP3.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index ef0524c..f8058b7 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -2942,7 +2942,7 @@ static struct omap_hwmod_class omap44xx_mcbsp_hwmod_class = {
/* mcbsp1 */
static struct omap_hwmod omap44xx_mcbsp1_hwmod;
static struct omap_hwmod_irq_info omap44xx_mcbsp1_irqs[] = {
- { .irq = 17 + OMAP44XX_IRQ_GIC_START },
+ { .name = "common", .irq = 17 + OMAP44XX_IRQ_GIC_START },
{ .irq = -1 }
};
@@ -3017,7 +3017,7 @@ static struct omap_hwmod omap44xx_mcbsp1_hwmod = {
/* mcbsp2 */
static struct omap_hwmod omap44xx_mcbsp2_hwmod;
static struct omap_hwmod_irq_info omap44xx_mcbsp2_irqs[] = {
- { .irq = 22 + OMAP44XX_IRQ_GIC_START },
+ { .name = "common", .irq = 22 + OMAP44XX_IRQ_GIC_START },
{ .irq = -1 }
};
@@ -3092,7 +3092,7 @@ static struct omap_hwmod omap44xx_mcbsp2_hwmod = {
/* mcbsp3 */
static struct omap_hwmod omap44xx_mcbsp3_hwmod;
static struct omap_hwmod_irq_info omap44xx_mcbsp3_irqs[] = {
- { .irq = 23 + OMAP44XX_IRQ_GIC_START },
+ { .name = "common", .irq = 23 + OMAP44XX_IRQ_GIC_START },
{ .irq = -1 }
};
@@ -3167,7 +3167,7 @@ static struct omap_hwmod omap44xx_mcbsp3_hwmod = {
/* mcbsp4 */
static struct omap_hwmod omap44xx_mcbsp4_hwmod;
static struct omap_hwmod_irq_info omap44xx_mcbsp4_irqs[] = {
- { .irq = 16 + OMAP44XX_IRQ_GIC_START },
+ { .name = "common", .irq = 16 + OMAP44XX_IRQ_GIC_START },
{ .irq = -1 }
};
--
1.7.8.5
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 2/2] ARM: OMAP4: hwmod_data: Name the common irq for McBSP ports
@ 2012-03-19 15:12 ` Peter Ujfalusi
0 siblings, 0 replies; 10+ messages in thread
From: Peter Ujfalusi @ 2012-03-19 15:12 UTC (permalink / raw)
To: linux-arm-kernel
Use 'common' as name for the common irq number in hwmod data for the McBSP
ports. The same name already in use for OMAP2430, and OMAP3.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index ef0524c..f8058b7 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -2942,7 +2942,7 @@ static struct omap_hwmod_class omap44xx_mcbsp_hwmod_class = {
/* mcbsp1 */
static struct omap_hwmod omap44xx_mcbsp1_hwmod;
static struct omap_hwmod_irq_info omap44xx_mcbsp1_irqs[] = {
- { .irq = 17 + OMAP44XX_IRQ_GIC_START },
+ { .name = "common", .irq = 17 + OMAP44XX_IRQ_GIC_START },
{ .irq = -1 }
};
@@ -3017,7 +3017,7 @@ static struct omap_hwmod omap44xx_mcbsp1_hwmod = {
/* mcbsp2 */
static struct omap_hwmod omap44xx_mcbsp2_hwmod;
static struct omap_hwmod_irq_info omap44xx_mcbsp2_irqs[] = {
- { .irq = 22 + OMAP44XX_IRQ_GIC_START },
+ { .name = "common", .irq = 22 + OMAP44XX_IRQ_GIC_START },
{ .irq = -1 }
};
@@ -3092,7 +3092,7 @@ static struct omap_hwmod omap44xx_mcbsp2_hwmod = {
/* mcbsp3 */
static struct omap_hwmod omap44xx_mcbsp3_hwmod;
static struct omap_hwmod_irq_info omap44xx_mcbsp3_irqs[] = {
- { .irq = 23 + OMAP44XX_IRQ_GIC_START },
+ { .name = "common", .irq = 23 + OMAP44XX_IRQ_GIC_START },
{ .irq = -1 }
};
@@ -3167,7 +3167,7 @@ static struct omap_hwmod omap44xx_mcbsp3_hwmod = {
/* mcbsp4 */
static struct omap_hwmod omap44xx_mcbsp4_hwmod;
static struct omap_hwmod_irq_info omap44xx_mcbsp4_irqs[] = {
- { .irq = 16 + OMAP44XX_IRQ_GIC_START },
+ { .name = "common", .irq = 16 + OMAP44XX_IRQ_GIC_START },
{ .irq = -1 }
};
--
1.7.8.5
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH 2/2] ARM: OMAP4: hwmod_data: Name the common irq for McBSP ports
2012-03-19 15:12 ` Peter Ujfalusi
@ 2012-04-04 15:46 ` Paul Walmsley
-1 siblings, 0 replies; 10+ messages in thread
From: Paul Walmsley @ 2012-04-04 15:46 UTC (permalink / raw)
To: Peter Ujfalusi; +Cc: Tony Lindgren, Jarkko Nikula, linux-omap, linux-arm-kernel
[-- Attachment #1: Type: TEXT/PLAIN, Size: 2130 bytes --]
+ Benoît
Hi Benoît
On Mon, 19 Mar 2012, Peter Ujfalusi wrote:
> Use 'common' as name for the common irq number in hwmod data for the McBSP
> ports. The same name already in use for OMAP2430, and OMAP3.
>
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
care to Ack this one for 3.5?
- Paul
> ---
> arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
> index ef0524c..f8058b7 100644
> --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
> +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
> @@ -2942,7 +2942,7 @@ static struct omap_hwmod_class omap44xx_mcbsp_hwmod_class = {
> /* mcbsp1 */
> static struct omap_hwmod omap44xx_mcbsp1_hwmod;
> static struct omap_hwmod_irq_info omap44xx_mcbsp1_irqs[] = {
> - { .irq = 17 + OMAP44XX_IRQ_GIC_START },
> + { .name = "common", .irq = 17 + OMAP44XX_IRQ_GIC_START },
> { .irq = -1 }
> };
>
> @@ -3017,7 +3017,7 @@ static struct omap_hwmod omap44xx_mcbsp1_hwmod = {
> /* mcbsp2 */
> static struct omap_hwmod omap44xx_mcbsp2_hwmod;
> static struct omap_hwmod_irq_info omap44xx_mcbsp2_irqs[] = {
> - { .irq = 22 + OMAP44XX_IRQ_GIC_START },
> + { .name = "common", .irq = 22 + OMAP44XX_IRQ_GIC_START },
> { .irq = -1 }
> };
>
> @@ -3092,7 +3092,7 @@ static struct omap_hwmod omap44xx_mcbsp2_hwmod = {
> /* mcbsp3 */
> static struct omap_hwmod omap44xx_mcbsp3_hwmod;
> static struct omap_hwmod_irq_info omap44xx_mcbsp3_irqs[] = {
> - { .irq = 23 + OMAP44XX_IRQ_GIC_START },
> + { .name = "common", .irq = 23 + OMAP44XX_IRQ_GIC_START },
> { .irq = -1 }
> };
>
> @@ -3167,7 +3167,7 @@ static struct omap_hwmod omap44xx_mcbsp3_hwmod = {
> /* mcbsp4 */
> static struct omap_hwmod omap44xx_mcbsp4_hwmod;
> static struct omap_hwmod_irq_info omap44xx_mcbsp4_irqs[] = {
> - { .irq = 16 + OMAP44XX_IRQ_GIC_START },
> + { .name = "common", .irq = 16 + OMAP44XX_IRQ_GIC_START },
> { .irq = -1 }
> };
>
> --
> 1.7.8.5
>
- Paul
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 2/2] ARM: OMAP4: hwmod_data: Name the common irq for McBSP ports
@ 2012-04-04 15:46 ` Paul Walmsley
0 siblings, 0 replies; 10+ messages in thread
From: Paul Walmsley @ 2012-04-04 15:46 UTC (permalink / raw)
To: linux-arm-kernel
+ Beno?t
Hi Beno?t
On Mon, 19 Mar 2012, Peter Ujfalusi wrote:
> Use 'common' as name for the common irq number in hwmod data for the McBSP
> ports. The same name already in use for OMAP2430, and OMAP3.
>
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
care to Ack this one for 3.5?
- Paul
> ---
> arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
> index ef0524c..f8058b7 100644
> --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
> +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
> @@ -2942,7 +2942,7 @@ static struct omap_hwmod_class omap44xx_mcbsp_hwmod_class = {
> /* mcbsp1 */
> static struct omap_hwmod omap44xx_mcbsp1_hwmod;
> static struct omap_hwmod_irq_info omap44xx_mcbsp1_irqs[] = {
> - { .irq = 17 + OMAP44XX_IRQ_GIC_START },
> + { .name = "common", .irq = 17 + OMAP44XX_IRQ_GIC_START },
> { .irq = -1 }
> };
>
> @@ -3017,7 +3017,7 @@ static struct omap_hwmod omap44xx_mcbsp1_hwmod = {
> /* mcbsp2 */
> static struct omap_hwmod omap44xx_mcbsp2_hwmod;
> static struct omap_hwmod_irq_info omap44xx_mcbsp2_irqs[] = {
> - { .irq = 22 + OMAP44XX_IRQ_GIC_START },
> + { .name = "common", .irq = 22 + OMAP44XX_IRQ_GIC_START },
> { .irq = -1 }
> };
>
> @@ -3092,7 +3092,7 @@ static struct omap_hwmod omap44xx_mcbsp2_hwmod = {
> /* mcbsp3 */
> static struct omap_hwmod omap44xx_mcbsp3_hwmod;
> static struct omap_hwmod_irq_info omap44xx_mcbsp3_irqs[] = {
> - { .irq = 23 + OMAP44XX_IRQ_GIC_START },
> + { .name = "common", .irq = 23 + OMAP44XX_IRQ_GIC_START },
> { .irq = -1 }
> };
>
> @@ -3167,7 +3167,7 @@ static struct omap_hwmod omap44xx_mcbsp3_hwmod = {
> /* mcbsp4 */
> static struct omap_hwmod omap44xx_mcbsp4_hwmod;
> static struct omap_hwmod_irq_info omap44xx_mcbsp4_irqs[] = {
> - { .irq = 16 + OMAP44XX_IRQ_GIC_START },
> + { .name = "common", .irq = 16 + OMAP44XX_IRQ_GIC_START },
> { .irq = -1 }
> };
>
> --
> 1.7.8.5
>
- Paul
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH 2/2] ARM: OMAP4: hwmod_data: Name the common irq for McBSP ports
2012-04-04 15:46 ` Paul Walmsley
@ 2012-04-04 19:06 ` Cousson, Benoit
-1 siblings, 0 replies; 10+ messages in thread
From: Cousson, Benoit @ 2012-04-04 19:06 UTC (permalink / raw)
To: Paul Walmsley
Cc: Peter Ujfalusi, Tony Lindgren, Jarkko Nikula, linux-omap,
linux-arm-kernel
Hi Paul,
On 4/4/2012 5:46 PM, Paul Walmsley wrote:
> + Benoît
>
> Hi Benoît
>
> On Mon, 19 Mar 2012, Peter Ujfalusi wrote:
>
>> Use 'common' as name for the common irq number in hwmod data for the McBSP
>> ports. The same name already in use for OMAP2430, and OMAP3.
>>
>> Signed-off-by: Peter Ujfalusi<peter.ujfalusi@ti.com>
>
> care to Ack this one for 3.5?
That looks good to me.
Acked-by: Benoit Cousson <b-cousson@ti.com>
Regards,
Benoit
>
>
> - Paul
>
>
>> ---
>> arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 8 ++++----
>> 1 files changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
>> index ef0524c..f8058b7 100644
>> --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
>> +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
>> @@ -2942,7 +2942,7 @@ static struct omap_hwmod_class omap44xx_mcbsp_hwmod_class = {
>> /* mcbsp1 */
>> static struct omap_hwmod omap44xx_mcbsp1_hwmod;
>> static struct omap_hwmod_irq_info omap44xx_mcbsp1_irqs[] = {
>> - { .irq = 17 + OMAP44XX_IRQ_GIC_START },
>> + { .name = "common", .irq = 17 + OMAP44XX_IRQ_GIC_START },
>> { .irq = -1 }
>> };
>>
>> @@ -3017,7 +3017,7 @@ static struct omap_hwmod omap44xx_mcbsp1_hwmod = {
>> /* mcbsp2 */
>> static struct omap_hwmod omap44xx_mcbsp2_hwmod;
>> static struct omap_hwmod_irq_info omap44xx_mcbsp2_irqs[] = {
>> - { .irq = 22 + OMAP44XX_IRQ_GIC_START },
>> + { .name = "common", .irq = 22 + OMAP44XX_IRQ_GIC_START },
>> { .irq = -1 }
>> };
>>
>> @@ -3092,7 +3092,7 @@ static struct omap_hwmod omap44xx_mcbsp2_hwmod = {
>> /* mcbsp3 */
>> static struct omap_hwmod omap44xx_mcbsp3_hwmod;
>> static struct omap_hwmod_irq_info omap44xx_mcbsp3_irqs[] = {
>> - { .irq = 23 + OMAP44XX_IRQ_GIC_START },
>> + { .name = "common", .irq = 23 + OMAP44XX_IRQ_GIC_START },
>> { .irq = -1 }
>> };
>>
>> @@ -3167,7 +3167,7 @@ static struct omap_hwmod omap44xx_mcbsp3_hwmod = {
>> /* mcbsp4 */
>> static struct omap_hwmod omap44xx_mcbsp4_hwmod;
>> static struct omap_hwmod_irq_info omap44xx_mcbsp4_irqs[] = {
>> - { .irq = 16 + OMAP44XX_IRQ_GIC_START },
>> + { .name = "common", .irq = 16 + OMAP44XX_IRQ_GIC_START },
>> { .irq = -1 }
>> };
>>
>> --
>> 1.7.8.5
>>
>
>
> - Paul
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 2/2] ARM: OMAP4: hwmod_data: Name the common irq for McBSP ports
@ 2012-04-04 19:06 ` Cousson, Benoit
0 siblings, 0 replies; 10+ messages in thread
From: Cousson, Benoit @ 2012-04-04 19:06 UTC (permalink / raw)
To: linux-arm-kernel
Hi Paul,
On 4/4/2012 5:46 PM, Paul Walmsley wrote:
> + Beno?t
>
> Hi Beno?t
>
> On Mon, 19 Mar 2012, Peter Ujfalusi wrote:
>
>> Use 'common' as name for the common irq number in hwmod data for the McBSP
>> ports. The same name already in use for OMAP2430, and OMAP3.
>>
>> Signed-off-by: Peter Ujfalusi<peter.ujfalusi@ti.com>
>
> care to Ack this one for 3.5?
That looks good to me.
Acked-by: Benoit Cousson <b-cousson@ti.com>
Regards,
Benoit
>
>
> - Paul
>
>
>> ---
>> arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 8 ++++----
>> 1 files changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
>> index ef0524c..f8058b7 100644
>> --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
>> +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
>> @@ -2942,7 +2942,7 @@ static struct omap_hwmod_class omap44xx_mcbsp_hwmod_class = {
>> /* mcbsp1 */
>> static struct omap_hwmod omap44xx_mcbsp1_hwmod;
>> static struct omap_hwmod_irq_info omap44xx_mcbsp1_irqs[] = {
>> - { .irq = 17 + OMAP44XX_IRQ_GIC_START },
>> + { .name = "common", .irq = 17 + OMAP44XX_IRQ_GIC_START },
>> { .irq = -1 }
>> };
>>
>> @@ -3017,7 +3017,7 @@ static struct omap_hwmod omap44xx_mcbsp1_hwmod = {
>> /* mcbsp2 */
>> static struct omap_hwmod omap44xx_mcbsp2_hwmod;
>> static struct omap_hwmod_irq_info omap44xx_mcbsp2_irqs[] = {
>> - { .irq = 22 + OMAP44XX_IRQ_GIC_START },
>> + { .name = "common", .irq = 22 + OMAP44XX_IRQ_GIC_START },
>> { .irq = -1 }
>> };
>>
>> @@ -3092,7 +3092,7 @@ static struct omap_hwmod omap44xx_mcbsp2_hwmod = {
>> /* mcbsp3 */
>> static struct omap_hwmod omap44xx_mcbsp3_hwmod;
>> static struct omap_hwmod_irq_info omap44xx_mcbsp3_irqs[] = {
>> - { .irq = 23 + OMAP44XX_IRQ_GIC_START },
>> + { .name = "common", .irq = 23 + OMAP44XX_IRQ_GIC_START },
>> { .irq = -1 }
>> };
>>
>> @@ -3167,7 +3167,7 @@ static struct omap_hwmod omap44xx_mcbsp3_hwmod = {
>> /* mcbsp4 */
>> static struct omap_hwmod omap44xx_mcbsp4_hwmod;
>> static struct omap_hwmod_irq_info omap44xx_mcbsp4_irqs[] = {
>> - { .irq = 16 + OMAP44XX_IRQ_GIC_START },
>> + { .name = "common", .irq = 16 + OMAP44XX_IRQ_GIC_START },
>> { .irq = -1 }
>> };
>>
>> --
>> 1.7.8.5
>>
>
>
> - Paul
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/2] ARM: OMAP3: hwmod_data: Rename the common irq for McBSP ports
2012-03-19 15:12 ` Peter Ujfalusi
@ 2012-04-04 15:46 ` Paul Walmsley
-1 siblings, 0 replies; 10+ messages in thread
From: Paul Walmsley @ 2012-04-04 15:46 UTC (permalink / raw)
To: Peter Ujfalusi; +Cc: Tony Lindgren, Jarkko Nikula, linux-omap, linux-arm-kernel
On Mon, 19 Mar 2012, Peter Ujfalusi wrote:
> Use 'common' as name for the common irq number in hwmod data for the McBSP
> ports. The same name already in use for OMAP2430, and the OMAP4 hwmod data
> will be using the same name.
>
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Thanks, queued for 3.5.
- Paul
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2012-04-04 19:06 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-19 15:12 [PATCH 1/2] ARM: OMAP3: hwmod_data: Rename the common irq for McBSP ports Peter Ujfalusi
2012-03-19 15:12 ` Peter Ujfalusi
2012-03-19 15:12 ` [PATCH 2/2] ARM: OMAP4: hwmod_data: Name " Peter Ujfalusi
2012-03-19 15:12 ` Peter Ujfalusi
2012-04-04 15:46 ` Paul Walmsley
2012-04-04 15:46 ` Paul Walmsley
2012-04-04 19:06 ` Cousson, Benoit
2012-04-04 19:06 ` Cousson, Benoit
2012-04-04 15:46 ` [PATCH 1/2] ARM: OMAP3: hwmod_data: Rename " Paul Walmsley
2012-04-04 15:46 ` Paul Walmsley
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.