* [PATCH] ARM: S5P: Add 3 UART SoC support
@ 2010-01-24 23:43 Kukjin Kim
2010-01-25 0:33 ` Ben Dooks
0 siblings, 1 reply; 2+ messages in thread
From: Kukjin Kim @ 2010-01-24 23:43 UTC (permalink / raw)
To: linux-samsung-soc; +Cc: ben-linux, Kukjin Kim
This patch adds 3 UART S5P SoC support. It has UART0, UART1, and UART2.
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
---
arch/arm/plat-s5p/dev-uart.c | 2 ++
arch/arm/plat-s5p/irq.c | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/arch/arm/plat-s5p/dev-uart.c b/arch/arm/plat-s5p/dev-uart.c
index 23c7531..a89331e 100644
--- a/arch/arm/plat-s5p/dev-uart.c
+++ b/arch/arm/plat-s5p/dev-uart.c
@@ -95,6 +95,7 @@ static struct resource s5p_uart2_resource[] = {
};
static struct resource s5p_uart3_resource[] = {
+#if CONFIG_SERIAL_SAMSUNG_UARTS > 3
[0] = {
.start = S5P_PA_UART3,
.end = S5P_PA_UART3 + S5P_SZ_UART,
@@ -115,6 +116,7 @@ static struct resource s5p_uart3_resource[] = {
.end = IRQ_S5P_UART_ERR3,
.flags = IORESOURCE_IRQ,
},
+#endif
};
struct s3c24xx_uart_resources s5p_uart_resources[] __initdata = {
diff --git a/arch/arm/plat-s5p/irq.c b/arch/arm/plat-s5p/irq.c
index eada40d..9308f34 100644
--- a/arch/arm/plat-s5p/irq.c
+++ b/arch/arm/plat-s5p/irq.c
@@ -48,11 +48,13 @@ static struct s3c_uart_irq uart_irqs[] = {
.base_irq = IRQ_S5P_UART_BASE2,
.parent_irq = IRQ_UART2,
},
+#if CONFIG_SERIAL_SAMSUNG_UARTS > 3
[3] = {
.regs = S5P_VA_UART3,
.base_irq = IRQ_S5P_UART_BASE3,
.parent_irq = IRQ_UART3,
},
+#endif
};
void __init s5p_init_irq(u32 *vic, u32 num_vic)
--
1.6.2.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ARM: S5P: Add 3 UART SoC support
2010-01-24 23:43 [PATCH] ARM: S5P: Add 3 UART SoC support Kukjin Kim
@ 2010-01-25 0:33 ` Ben Dooks
0 siblings, 0 replies; 2+ messages in thread
From: Ben Dooks @ 2010-01-25 0:33 UTC (permalink / raw)
To: Kukjin Kim; +Cc: linux-samsung-soc, ben-linux
On Mon, Jan 25, 2010 at 08:43:45AM +0900, Kukjin Kim wrote:
> This patch adds 3 UART S5P SoC support. It has UART0, UART1, and UART2.
>
> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
> ---
> arch/arm/plat-s5p/dev-uart.c | 2 ++
> arch/arm/plat-s5p/irq.c | 2 ++
> 2 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/plat-s5p/dev-uart.c b/arch/arm/plat-s5p/dev-uart.c
> index 23c7531..a89331e 100644
> --- a/arch/arm/plat-s5p/dev-uart.c
> +++ b/arch/arm/plat-s5p/dev-uart.c
> @@ -95,6 +95,7 @@ static struct resource s5p_uart2_resource[] = {
> };
>
> static struct resource s5p_uart3_resource[] = {
> +#if CONFIG_SERIAL_SAMSUNG_UARTS > 3
> [0] = {
> .start = S5P_PA_UART3,
> .end = S5P_PA_UART3 + S5P_SZ_UART,
> @@ -115,6 +116,7 @@ static struct resource s5p_uart3_resource[] = {
> .end = IRQ_S5P_UART_ERR3,
> .flags = IORESOURCE_IRQ,
> },
> +#endif
> };
>
> struct s3c24xx_uart_resources s5p_uart_resources[] __initdata = {
> diff --git a/arch/arm/plat-s5p/irq.c b/arch/arm/plat-s5p/irq.c
> index eada40d..9308f34 100644
> --- a/arch/arm/plat-s5p/irq.c
> +++ b/arch/arm/plat-s5p/irq.c
> @@ -48,11 +48,13 @@ static struct s3c_uart_irq uart_irqs[] = {
> .base_irq = IRQ_S5P_UART_BASE2,
> .parent_irq = IRQ_UART2,
> },
> +#if CONFIG_SERIAL_SAMSUNG_UARTS > 3
> [3] = {
> .regs = S5P_VA_UART3,
> .base_irq = IRQ_S5P_UART_BASE3,
> .parent_irq = IRQ_UART3,
> },
> +#endif
> };
>
> void __init s5p_init_irq(u32 *vic, u32 num_vic)
> --
> 1.6.2.5
Hmm, although not strictly speaking necessary, it isn't going to hurt.
--
Ben
Q: What's a light-year?
A: One-third less calories than a regular year.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-01-25 0:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-24 23:43 [PATCH] ARM: S5P: Add 3 UART SoC support Kukjin Kim
2010-01-25 0:33 ` Ben Dooks
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.