OMAP2+: remove unused UART base addresses from omap_globals
diff mbox

Message ID 20110124074520.GB16582@m-desktop
State Rejected
Delegated to: Kevin Hilman
Headers show

Commit Message

manjugk manjugk Jan. 24, 2011, 7:45 a.m. UTC
None

Patch
diff mbox

diff --git a/arch/arm/mach-omap2/omap_hwmod_2420_data.c
b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
index b85c630..7347bbc 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2420_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
@@ -366,8 +366,8 @@  static struct omap_hwmod_irq_info uart1_mpu_irqs[] =
{
 };
 
 static struct omap_hwmod_dma_info uart1_sdma_reqs[] = {
-	{ .name = "rx",	.dma_req = OMAP24XX_DMA_UART1_RX, },
-	{ .name = "tx",	.dma_req = OMAP24XX_DMA_UART1_TX, },
+	{ .name = "rx",	.dma_req = 50, },
+	{ .name = "tx",	.dma_req = 49, },
 };
 
 static struct omap_hwmod_ocp_if *omap2420_uart1_slaves[] = {
@@ -403,8 +403,8 @@  static struct omap_hwmod_irq_info uart2_mpu_irqs[] =
{
 };
 
 static struct omap_hwmod_dma_info uart2_sdma_reqs[] = {
-	{ .name = "rx",	.dma_req = OMAP24XX_DMA_UART2_RX, },
-	{ .name = "tx",	.dma_req = OMAP24XX_DMA_UART2_TX, },
+	{ .name = "rx",	.dma_req = 52, },
+	{ .name = "tx",	.dma_req = 51, },
 };
 
 static struct omap_hwmod_ocp_if *omap2420_uart2_slaves[] = {
@@ -440,8 +440,8 @@  static struct omap_hwmod_irq_info uart3_mpu_irqs[] =
{
 };
 
 static struct omap_hwmod_dma_info uart3_sdma_reqs[] = {
-	{ .name = "rx",	.dma_req = OMAP24XX_DMA_UART3_RX, },
-	{ .name = "tx",	.dma_req = OMAP24XX_DMA_UART3_TX, },
+	{ .name = "rx",	.dma_req = 54, },
+	{ .name = "tx",	.dma_req = 53, },
 };
 
 static struct omap_hwmod_ocp_if *omap2420_uart3_slaves[] = {
diff --git a/arch/arm/mach-omap2/omap_hwmod_2430_data.c
b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
index 8ecfbcd..1d8c391 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
@@ -365,8 +365,8 @@  static struct omap_hwmod_irq_info uart1_mpu_irqs[] =
{
 };
 
 static struct omap_hwmod_dma_info uart1_sdma_reqs[] = {
-	{ .name = "rx",	.dma_req = OMAP24XX_DMA_UART1_RX, },
-	{ .name = "tx",	.dma_req = OMAP24XX_DMA_UART1_TX, },
+	{ .name = "rx",	.dma_req = 50, },
+	{ .name = "tx",	.dma_req = 49, },
 };
 
 static struct omap_hwmod_ocp_if *omap2430_uart1_slaves[] = {
@@ -402,8 +402,8 @@  static struct omap_hwmod_irq_info uart2_mpu_irqs[] =
{
 };
 
 static struct omap_hwmod_dma_info uart2_sdma_reqs[] = {
-	{ .name = "rx",	.dma_req = OMAP24XX_DMA_UART2_RX, },
-	{ .name = "tx",	.dma_req = OMAP24XX_DMA_UART2_TX, },
+	{ .name = "rx",	.dma_req = 52, },
+	{ .name = "tx",	.dma_req = 51, },
 };
 
 static struct omap_hwmod_ocp_if *omap2430_uart2_slaves[] = {
@@ -439,8 +439,8 @@  static struct omap_hwmod_irq_info uart3_mpu_irqs[] =
{
 };
 
 static struct omap_hwmod_dma_info uart3_sdma_reqs[] = {
-	{ .name = "rx",	.dma_req = OMAP24XX_DMA_UART3_RX, },
-	{ .name = "tx",	.dma_req = OMAP24XX_DMA_UART3_TX, },
+	{ .name = "rx",	.dma_req = 54, },
+	{ .name = "tx",	.dma_req = 53, },
 };
 
 static struct omap_hwmod_ocp_if *omap2430_uart3_slaves[] = {
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index 8d81813..1595cc0 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -518,8 +518,8 @@  static struct omap_hwmod_irq_info uart1_mpu_irqs[] =
{
 };
 
 static struct omap_hwmod_dma_info uart1_sdma_reqs[] = {
-	{ .name = "tx",	.dma_req = OMAP24XX_DMA_UART1_TX, },
-	{ .name = "rx",	.dma_req = OMAP24XX_DMA_UART1_RX, },
+	{ .name = "tx",	.dma_req = 49, },
+	{ .name = "rx",	.dma_req = 50, },
 };