aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2012-05-08 13:34:28 -0400
committerPaul Walmsley <paul@pwsan.com>2012-05-08 19:25:36 -0400
commit1c2badc1617661632034d8be5d22c8637b626cb7 (patch)
treea8c32b03f02a626ab5f1ba1e9f7e2a7b9f569b48 /arch/arm/mach-omap2
parentf32bd7787561ceb887e45d81ca41d6c7a903751f (diff)
ARM: OMAP3: hwmod_data: Rename the common irq for McBSP ports
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> Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r--arch/arm/mach-omap2/omap_hwmod_3xxx_data.c10
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 97c65973ae7f..87742e20cd5f 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -1075,7 +1075,7 @@ static struct omap_hwmod_class omap3xxx_mcbsp_hwmod_class = {
1075 1075
1076/* mcbsp1 */ 1076/* mcbsp1 */
1077static struct omap_hwmod_irq_info omap3xxx_mcbsp1_irqs[] = { 1077static struct omap_hwmod_irq_info omap3xxx_mcbsp1_irqs[] = {
1078 { .name = "irq", .irq = 16 }, 1078 { .name = "common", .irq = 16 },
1079 { .name = "tx", .irq = 59 }, 1079 { .name = "tx", .irq = 59 },
1080 { .name = "rx", .irq = 60 }, 1080 { .name = "rx", .irq = 60 },
1081 { .irq = -1 } 1081 { .irq = -1 }
@@ -1100,7 +1100,7 @@ static struct omap_hwmod omap3xxx_mcbsp1_hwmod = {
1100 1100
1101/* mcbsp2 */ 1101/* mcbsp2 */
1102static struct omap_hwmod_irq_info omap3xxx_mcbsp2_irqs[] = { 1102static struct omap_hwmod_irq_info omap3xxx_mcbsp2_irqs[] = {
1103 { .name = "irq", .irq = 17 }, 1103 { .name = "common", .irq = 17 },
1104 { .name = "tx", .irq = 62 }, 1104 { .name = "tx", .irq = 62 },
1105 { .name = "rx", .irq = 63 }, 1105 { .name = "rx", .irq = 63 },
1106 { .irq = -1 } 1106 { .irq = -1 }
@@ -1130,7 +1130,7 @@ static struct omap_hwmod omap3xxx_mcbsp2_hwmod = {
1130 1130
1131/* mcbsp3 */ 1131/* mcbsp3 */
1132static struct omap_hwmod_irq_info omap3xxx_mcbsp3_irqs[] = { 1132static struct omap_hwmod_irq_info omap3xxx_mcbsp3_irqs[] = {
1133 { .name = "irq", .irq = 22 }, 1133 { .name = "common", .irq = 22 },
1134 { .name = "tx", .irq = 89 }, 1134 { .name = "tx", .irq = 89 },
1135 { .name = "rx", .irq = 90 }, 1135 { .name = "rx", .irq = 90 },
1136 { .irq = -1 } 1136 { .irq = -1 }
@@ -1160,7 +1160,7 @@ static struct omap_hwmod omap3xxx_mcbsp3_hwmod = {
1160 1160
1161/* mcbsp4 */ 1161/* mcbsp4 */
1162static struct omap_hwmod_irq_info omap3xxx_mcbsp4_irqs[] = { 1162static struct omap_hwmod_irq_info omap3xxx_mcbsp4_irqs[] = {
1163 { .name = "irq", .irq = 23 }, 1163 { .name = "common", .irq = 23 },
1164 { .name = "tx", .irq = 54 }, 1164 { .name = "tx", .irq = 54 },
1165 { .name = "rx", .irq = 55 }, 1165 { .name = "rx", .irq = 55 },
1166 { .irq = -1 } 1166 { .irq = -1 }
@@ -1191,7 +1191,7 @@ static struct omap_hwmod omap3xxx_mcbsp4_hwmod = {
1191 1191
1192/* mcbsp5 */ 1192/* mcbsp5 */
1193static struct omap_hwmod_irq_info omap3xxx_mcbsp5_irqs[] = { 1193static struct omap_hwmod_irq_info omap3xxx_mcbsp5_irqs[] = {
1194 { .name = "irq", .irq = 27 }, 1194 { .name = "common", .irq = 27 },
1195 { .name = "tx", .irq = 81 }, 1195 { .name = "tx", .irq = 81 },
1196 { .name = "rx", .irq = 82 }, 1196 { .name = "rx", .irq = 82 },
1197 { .irq = -1 } 1197 { .irq = -1 }