1 files changed, 8 insertions, 52 deletions
diff --git a/arch/arm/mach-s3c64xx/dev-uart.c b/arch/arm/mach-s3c64xx/dev-uart.c
index f797f748b999..c681b99eda08 100644
--- a/arch/arm/mach-s3c64xx/dev-uart.c
+++ b/arch/arm/mach-s3c64xx/dev-uart.c
@@ -37,21 +37,10 @@ static struct resource s3c64xx_uart0_resource[] = {
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
-                .start  = IRQ_S3CUART_RX0,
+                .start  = IRQ_UART0,
-                .end    = IRQ_S3CUART_RX0,
+                .end    = IRQ_UART0,
                .flags  = IORESOURCE_IRQ,
        },
-        [2] = {
-                .start  = IRQ_S3CUART_TX0,
-                .end    = IRQ_S3CUART_TX0,
-                .flags  = IORESOURCE_IRQ,
-        },
-        [3] = {
-                .start  = IRQ_S3CUART_ERR0,
-                .end    = IRQ_S3CUART_ERR0,
-                .flags  = IORESOURCE_IRQ,
-        }
 };
 static struct resource s3c64xx_uart1_resource[] = {
@@ -61,19 +50,8 @@ static struct resource s3c64xx_uart1_resource[] = {
                .flags = IORESOURCE_MEM,
        },
        [1] = {
-                .start  = IRQ_S3CUART_RX1,
+                .start  = IRQ_UART1,
-                .end    = IRQ_S3CUART_RX1,
+                .end    = IRQ_UART1,
-                .flags  = IORESOURCE_IRQ,
-        },
-        [2] = {
-                .start  = IRQ_S3CUART_TX1,
-                .end    = IRQ_S3CUART_TX1,
-                .flags  = IORESOURCE_IRQ,
-        },
-        [3] = {
-                .start  = IRQ_S3CUART_ERR1,
-                .end    = IRQ_S3CUART_ERR1,
                .flags  = IORESOURCE_IRQ,
        },
 };
@@ -85,19 +63,8 @@ static struct resource s3c6xx_uart2_resource[] = {
                .flags = IORESOURCE_MEM,
        },
        [1] = {
-                .start  = IRQ_S3CUART_RX2,
+                .start  = IRQ_UART2,
-                .end    = IRQ_S3CUART_RX2,
+                .end    = IRQ_UART2,
-                .flags  = IORESOURCE_IRQ,
-        },
-        [2] = {
-                .start  = IRQ_S3CUART_TX2,
-                .end    = IRQ_S3CUART_TX2,
-                .flags  = IORESOURCE_IRQ,
-        },
-        [3] = {
-                .start  = IRQ_S3CUART_ERR2,
-                .end    = IRQ_S3CUART_ERR2,
                .flags  = IORESOURCE_IRQ,
        },
 };
@@ -109,19 +76,8 @@ static struct resource s3c64xx_uart3_resource[] = {
                .flags = IORESOURCE_MEM,
        },
        [1] = {
-                .start  = IRQ_S3CUART_RX3,
+                .start  = IRQ_UART3,
-                .end    = IRQ_S3CUART_RX3,
+                .end    = IRQ_UART3,
-                .flags  = IORESOURCE_IRQ,
-        },
-        [2] = {
-                .start  = IRQ_S3CUART_TX3,
-                .end    = IRQ_S3CUART_TX3,
-                .flags  = IORESOURCE_IRQ,
-        },
-        [3] = {
-                .start  = IRQ_S3CUART_ERR3,
-                .end    = IRQ_S3CUART_ERR3,
                .flags  = IORESOURCE_IRQ,
        },
 };

diff --git a/arch/arm/mach-s3c64xx/dev-uart.c b/arch/arm/mach-s3c64xx/dev-uart.c index f797f748b999..c681b99eda08 100644 --- a/arch/arm/mach-s3c64xx/dev-uart.c +++ b/arch/arm/mach-s3c64xx/dev-uart.c
@@ -37,21 +37,10 @@ static struct resource s3c64xx_uart0_resource[] = {
37	.flags = IORESOURCE_MEM,	37	.flags = IORESOURCE_MEM,
38	},	38	},
39	[1] = {	39	[1] = {
40	.start = IRQ_S3CUART_RX0,	40	.start = IRQ_UART0,
41	.end = IRQ_S3CUART_RX0,	41	.end = IRQ_UART0,
42	.flags = IORESOURCE_IRQ,	42	.flags = IORESOURCE_IRQ,
43	},	43	},
44	[2] = {
45	.start = IRQ_S3CUART_TX0,
46	.end = IRQ_S3CUART_TX0,
47	.flags = IORESOURCE_IRQ,
48
49	},
50	[3] = {
51	.start = IRQ_S3CUART_ERR0,
52	.end = IRQ_S3CUART_ERR0,
53	.flags = IORESOURCE_IRQ,
54	}
55	};	44	};
56		45
57	static struct resource s3c64xx_uart1_resource[] = {	46	static struct resource s3c64xx_uart1_resource[] = {
@@ -61,19 +50,8 @@ static struct resource s3c64xx_uart1_resource[] = {
61	.flags = IORESOURCE_MEM,	50	.flags = IORESOURCE_MEM,
62	},	51	},
63	[1] = {	52	[1] = {
64	.start = IRQ_S3CUART_RX1,	53	.start = IRQ_UART1,
65	.end = IRQ_S3CUART_RX1,	54	.end = IRQ_UART1,
66	.flags = IORESOURCE_IRQ,
67	},
68	[2] = {
69	.start = IRQ_S3CUART_TX1,
70	.end = IRQ_S3CUART_TX1,
71	.flags = IORESOURCE_IRQ,
72
73	},
74	[3] = {
75	.start = IRQ_S3CUART_ERR1,
76	.end = IRQ_S3CUART_ERR1,
77	.flags = IORESOURCE_IRQ,	55	.flags = IORESOURCE_IRQ,
78	},	56	},
79	};	57	};
@@ -85,19 +63,8 @@ static struct resource s3c6xx_uart2_resource[] = {
85	.flags = IORESOURCE_MEM,	63	.flags = IORESOURCE_MEM,
86	},	64	},
87	[1] = {	65	[1] = {
88	.start = IRQ_S3CUART_RX2,	66	.start = IRQ_UART2,
89	.end = IRQ_S3CUART_RX2,	67	.end = IRQ_UART2,
90	.flags = IORESOURCE_IRQ,
91	},
92	[2] = {
93	.start = IRQ_S3CUART_TX2,
94	.end = IRQ_S3CUART_TX2,
95	.flags = IORESOURCE_IRQ,
96
97	},
98	[3] = {
99	.start = IRQ_S3CUART_ERR2,
100	.end = IRQ_S3CUART_ERR2,
101	.flags = IORESOURCE_IRQ,	68	.flags = IORESOURCE_IRQ,
102	},	69	},
103	};	70	};
@@ -109,19 +76,8 @@ static struct resource s3c64xx_uart3_resource[] = {
109	.flags = IORESOURCE_MEM,	76	.flags = IORESOURCE_MEM,
110	},	77	},
111	[1] = {	78	[1] = {
112	.start = IRQ_S3CUART_RX3,	79	.start = IRQ_UART3,
113	.end = IRQ_S3CUART_RX3,	80	.end = IRQ_UART3,
114	.flags = IORESOURCE_IRQ,
115	},
116	[2] = {
117	.start = IRQ_S3CUART_TX3,
118	.end = IRQ_S3CUART_TX3,
119	.flags = IORESOURCE_IRQ,
120
121	},
122	[3] = {
123	.start = IRQ_S3CUART_ERR3,
124	.end = IRQ_S3CUART_ERR3,
125	.flags = IORESOURCE_IRQ,	81	.flags = IORESOURCE_IRQ,
126	},	82	},
127	};	83	};