[pm-wip/uart,3/6] Serial: Modify OMAP3 hwmod data file with uart data.

Commit Message

Govindraj.R May 20, 2010, 1:38 p.m. UTC

None

Patch

diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index 079a65e..580ca5b 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -350,8 +350,8 @@  static struct omap_hwmod_irq_info uart1_mpu_irqs[] = {
 };

 static struct omap_hwmod_dma_info uart1_sdma_chs[] = {
-	{ .name = "tx",	.dma_ch = OMAP24XX_DMA_UART1_TX, },
 	{ .name = "rx",	.dma_ch = OMAP24XX_DMA_UART1_RX, },
+	{ .name = "tx",	.dma_ch = OMAP24XX_DMA_UART1_TX, },
 };

 static struct omap_hwmod_ocp_if *omap3xxx_uart1_slaves[] = {
@@ -359,7 +359,7 @@  static struct omap_hwmod_ocp_if *omap3xxx_uart1_slaves[] = {
 };

 static struct omap_hwmod omap3xxx_uart1_hwmod = {
-	.name		= "uart1_hwmod",
+	.name		= "uart1",
 	.mpu_irqs	= uart1_mpu_irqs,
 	.mpu_irqs_cnt	= ARRAY_SIZE(uart1_mpu_irqs),
 	.sdma_chs	= uart1_sdma_chs,
@@ -384,8 +384,8 @@  static struct omap_hwmod_irq_info uart2_mpu_irqs[] = {
 };

 static struct omap_hwmod_dma_info uart2_sdma_chs[] = {
-	{ .name = "tx",	.dma_ch = OMAP24XX_DMA_UART2_TX, },
 	{ .name = "rx",	.dma_ch = OMAP24XX_DMA_UART2_RX, },
+	{ .name = "tx",	.dma_ch = OMAP24XX_DMA_UART2_TX, },
 };

 static struct omap_hwmod_ocp_if *omap3xxx_uart2_slaves[] = {
@@ -393,7 +393,7 @@  static struct omap_hwmod_ocp_if *omap3xxx_uart2_slaves[] = {
 };

 static struct omap_hwmod omap3xxx_uart2_hwmod = {
-	.name		= "uart2_hwmod",
+	.name		= "uart2",
 	.mpu_irqs	= uart2_mpu_irqs,
 	.mpu_irqs_cnt	= ARRAY_SIZE(uart2_mpu_irqs),
 	.sdma_chs	= uart2_sdma_chs,
@@ -418,8 +418,8 @@  static struct omap_hwmod_irq_info uart3_mpu_irqs[] = {
 };

 static struct omap_hwmod_dma_info uart3_sdma_chs[] = {
-	{ .name = "tx",	.dma_ch = OMAP24XX_DMA_UART3_TX, },
 	{ .name = "rx",	.dma_ch = OMAP24XX_DMA_UART3_RX, },
+	{ .name = "tx",	.dma_ch = OMAP24XX_DMA_UART3_TX, },
 };

 static struct omap_hwmod_ocp_if *omap3xxx_uart3_slaves[] = {
@@ -427,7 +427,7 @@  static struct omap_hwmod_ocp_if *omap3xxx_uart3_slaves[] = {
 };

 static struct omap_hwmod omap3xxx_uart3_hwmod = {
-	.name		= "uart3_hwmod",
+	.name		= "uart3",
 	.mpu_irqs	= uart3_mpu_irqs,
 	.mpu_irqs_cnt	= ARRAY_SIZE(uart3_mpu_irqs),
 	.sdma_chs	= uart3_sdma_chs,
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index 7d0dc3a..9b71c1e 100644
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -578,7 +578,7 @@  void __init omap_serial_early_init(void)
 		struct omap_uart_state *uart;

 		snprintf(oh_name, MAX_UART_HWMOD_NAME_LEN,
-			 "uart%d_hwmod", i + 1);
+			 "uart%d", i + 1);
 		oh = omap_hwmod_lookup(oh_name);
 		if (!oh)
 			break;