OSDN Git Service

ARM: OMAP4: hwmod_data: Name the common irq for McBSP ports
authorPeter Ujfalusi <peter.ujfalusi@ti.com>
Tue, 8 May 2012 17:34:29 +0000 (11:34 -0600)
committerPaul Walmsley <paul@pwsan.com>
Tue, 8 May 2012 23:25:36 +0000 (17:25 -0600)
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>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
arch/arm/mach-omap2/omap_hwmod_44xx_data.c

index 3a67ed0..c997c97 100644 (file)
@@ -1912,7 +1912,7 @@ static struct omap_hwmod_class omap44xx_mcbsp_hwmod_class = {
 
 /* mcbsp1 */
 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 }
 };
 
@@ -1947,7 +1947,7 @@ static struct omap_hwmod omap44xx_mcbsp1_hwmod = {
 
 /* mcbsp2 */
 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 }
 };
 
@@ -1982,7 +1982,7 @@ static struct omap_hwmod omap44xx_mcbsp2_hwmod = {
 
 /* mcbsp3 */
 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 }
 };
 
@@ -2017,7 +2017,7 @@ static struct omap_hwmod omap44xx_mcbsp3_hwmod = {
 
 /* mcbsp4 */
 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 }
 };