Commit dbf35992 authored by Ben Dooks's avatar Ben Dooks

[ARM] S3C24XX: Add fourth UART definition for S3C2443

Add the fourth UART definition for the S3C2443, and at the
same time fixup the problems caused by the enlarging of the
UART array in the previous commits.
Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent bdd4915a
...@@ -162,6 +162,12 @@ ...@@ -162,6 +162,12 @@
#define NR_IRQS (IRQ_S3C2440_AC97+1) #define NR_IRQS (IRQ_S3C2440_AC97+1)
#endif #endif
/* compatibility define. */
#define IRQ_UART3 IRQ_S3C2443_UART3
#define IRQ_S3CUART_RX3 IRQ_S3C2443_RX3
#define IRQ_S3CUART_TX3 IRQ_S3C2443_TX3
#define IRQ_S3CUART_ERR3 IRQ_S3C2443_ERR3
/* Our FIQs are routable from IRQ_EINT0 to IRQ_ADCPARENT */ /* Our FIQs are routable from IRQ_EINT0 to IRQ_ADCPARENT */
#define FIQ_START IRQ_EINT0 #define FIQ_START IRQ_EINT0
......
...@@ -238,7 +238,7 @@ struct s3c2410_uartcfg { ...@@ -238,7 +238,7 @@ struct s3c2410_uartcfg {
* or platform_add_device() before the console_initcall() * or platform_add_device() before the console_initcall()
*/ */
extern struct platform_device *s3c24xx_uart_devs[3]; extern struct platform_device *s3c24xx_uart_devs[4];
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
......
...@@ -76,6 +76,19 @@ static struct resource s3c2410_uart2_resource[] = { ...@@ -76,6 +76,19 @@ static struct resource s3c2410_uart2_resource[] = {
} }
}; };
static struct resource s3c2410_uart3_resource[] = {
[0] = {
.start = S3C2443_PA_UART3,
.end = S3C2443_PA_UART3 + 0x3fff,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = IRQ_S3CUART_RX3,
.end = IRQ_S3CUART_ERR3,
.flags = IORESOURCE_IRQ,
},
};
struct s3c24xx_uart_resources s3c2410_uart_resources[] __initdata = { struct s3c24xx_uart_resources s3c2410_uart_resources[] __initdata = {
[0] = { [0] = {
.resources = s3c2410_uart0_resource, .resources = s3c2410_uart0_resource,
...@@ -89,6 +102,10 @@ struct s3c24xx_uart_resources s3c2410_uart_resources[] __initdata = { ...@@ -89,6 +102,10 @@ struct s3c24xx_uart_resources s3c2410_uart_resources[] __initdata = {
.resources = s3c2410_uart2_resource, .resources = s3c2410_uart2_resource,
.nr_resources = ARRAY_SIZE(s3c2410_uart2_resource), .nr_resources = ARRAY_SIZE(s3c2410_uart2_resource),
}, },
[3] = {
.resources = s3c2410_uart3_resource,
.nr_resources = ARRAY_SIZE(s3c2410_uart3_resource),
},
}; };
/* yart devices */ /* yart devices */
...@@ -105,13 +122,18 @@ static struct platform_device s3c24xx_uart_device2 = { ...@@ -105,13 +122,18 @@ static struct platform_device s3c24xx_uart_device2 = {
.id = 2, .id = 2,
}; };
struct platform_device *s3c24xx_uart_src[3] = { static struct platform_device s3c24xx_uart_device3 = {
.id = 3,
};
struct platform_device *s3c24xx_uart_src[4] = {
&s3c24xx_uart_device0, &s3c24xx_uart_device0,
&s3c24xx_uart_device1, &s3c24xx_uart_device1,
&s3c24xx_uart_device2, &s3c24xx_uart_device2,
&s3c24xx_uart_device3,
}; };
struct platform_device *s3c24xx_uart_devs[3] = { struct platform_device *s3c24xx_uart_devs[4] = {
}; };
/* USB Host Controller */ /* USB Host Controller */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment