From patchwork Thu May 20 13:38:37 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Govindraj.R" X-Patchwork-Id: 101190 X-Patchwork-Delegate: khilman@deeprootsystems.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4KDceJD006804 for ; Thu, 20 May 2010 13:38:40 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754272Ab0ETNik (ORCPT ); Thu, 20 May 2010 09:38:40 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:36656 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753220Ab0ETNij (ORCPT ); Thu, 20 May 2010 09:38:39 -0400 Received: from dlep35.itg.ti.com ([157.170.170.118]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id o4KDccDH021388 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 20 May 2010 08:38:38 -0500 Received: from webmail.ti.com (localhost [127.0.0.1]) by dlep35.itg.ti.com (8.13.7/8.13.7) with ESMTP id o4KDcaHn010247; Thu, 20 May 2010 08:38:37 -0500 (CDT) Received: from 192.168.10.88 (proxying for 10.24.255.17) (SquirrelMail authenticated user x0100947); by dbdmail.itg.ti.com with HTTP; Thu, 20 May 2010 19:08:37 +0530 (IST) Message-ID: <48121.192.168.10.88.1274362717.squirrel@dbdmail.itg.ti.com> Date: Thu, 20 May 2010 19:08:37 +0530 (IST) Subject: [pm-wip/uart][PATCH 3/6] Serial: Modify OMAP3 hwmod data file with uart data. From: "Govindraj.R" To: linux-omap@vger.kernel.org Cc: "Kevin Hilman" User-Agent: SquirrelMail/1.4.3a X-Mailer: SquirrelMail/1.4.3a MIME-Version: 1.0 X-Priority: 3 (Normal) Importance: Normal Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 20 May 2010 13:38:40 +0000 (UTC) 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;