ARM: Exynos5: Remove unused static uart resource information
Subsystems (3)
PATCH 1/1 ARM: Exynos5: Remove unused static uart resource information
All supported Exynos5 platforms are device tree enabled and hence the unused static uart resource information is removed.
Signed-off-by Thomas Abraham <[email protected]>
--- arch/arm/mach-exynos/common.c | 6 +----- arch/arm/mach-exynos/dev-uart.c | 24 ------------------------ arch/arm/mach-exynos/include/mach/irqs.h | 5 ----- arch/arm/mach-exynos/include/mach/map.h | 1 - 4 files changed, 1 insertions(+), 35 deletions(-)
arch/arm/mach-exynos/common.c +1 -5
@@ -96,7 +96,6 @@ static struct cpu_table cpu_ids[] __initdata = { .idmask = EXYNOS5_SOC_MASK, .map_io = exynos5_map_io, .init_clocks = exynos5_init_clocks, - .init_uarts = exynos_init_uarts, .init = exynos_init, .name = name_exynos5250, },
@@ -735,10 +734,7 @@ static void __init exynos_init_uarts(struct s3c2410_uartcfg *cfg, int no)for (ucnt =0 ; ucnt < no; ucnt++, tcfg++) tcfg->has_fracval =1 ; -if (soc_is_exynos5250 ()) -s3c24xx_init_uartdevs ("exynos4210-uart" , exynos5_uart_resources, cfg, no); -else -s3c24xx_init_uartdevs ("exynos4210-uart" , exynos4_uart_resources, cfg, no); +s3c24xx_init_uartdevs ("exynos4210-uart" , exynos4_uart_resources, cfg, no); }static void __iomem *exynos_eint_base;
arch/arm/mach-exynos/dev-uart.c +0 -24
@@ -52,27 +52,3 @@ struct s3c24xx_uart_resources exynos4_uart_resources[] __initdata = { .nr_resources = ARRAY_SIZE(exynos4_uart3_resource), }, }; - -EXYNOS_UART_RESOURCE(5, 0) -EXYNOS_UART_RESOURCE(5, 1) -EXYNOS_UART_RESOURCE(5, 2) -EXYNOS_UART_RESOURCE(5, 3) - -struct s3c24xx_uart_resources exynos5_uart_resources[]__initdata = { - [0 ] = { - .resources = exynos5_uart0_resource, - .nr_resources =ARRAY_SIZE (exynos5_uart0_resource), - }, - [1 ] = { - .resources = exynos5_uart1_resource, - .nr_resources =ARRAY_SIZE (exynos5_uart0_resource), - }, - [2 ] = { - .resources = exynos5_uart2_resource, - .nr_resources =ARRAY_SIZE (exynos5_uart2_resource), - }, - [3 ] = { - .resources = exynos5_uart3_resource, - .nr_resources =ARRAY_SIZE (exynos5_uart3_resource), - }, -};
arch/arm/mach-exynos/include/mach/irqs.h +0 -5
@@ -259,11 +259,6 @@#define EXYNOS5_IRQ_IEM_IEC IRQ_SPI(48)#define EXYNOS5_IRQ_IEM_APC IRQ_SPI(49)#define EXYNOS5_IRQ_GPIO_C2C IRQ_SPI(50) -#define EXYNOS5_IRQ_UART0 IRQ_SPI(51) -#define EXYNOS5_IRQ_UART1 IRQ_SPI(52) -#define EXYNOS5_IRQ_UART2 IRQ_SPI(53) -#define EXYNOS5_IRQ_UART3 IRQ_SPI(54) -#define EXYNOS5_IRQ_UART4 IRQ_SPI(55)#define EXYNOS5_IRQ_IIC IRQ_SPI(56)#define EXYNOS5_IRQ_IIC1 IRQ_SPI(57)#define EXYNOS5_IRQ_IIC2 IRQ_SPI(58)
arch/arm/mach-exynos/include/mach/map.h +0 -1
@@ -279,7 +279,6 @@#define EXYNOS5_PA_UART1 0x12C10000#define EXYNOS5_PA_UART2 0x12C20000#define EXYNOS5_PA_UART3 0x12C30000 -#define EXYNOS5_SZ_UART SZ_256#define S3C_VA_UARTx (x) (S3C_VA_UART + ((x) * S3C_UART_OFFSET))
Signature · 1 line
1.6.6.rc2
PATCH 1/1 ARM: Exynos5: Remove unused static uart resource information
Quoted 88 lines · Thomas Abraham
All supported Exynos5 platforms are device tree enabled and hence the unused static uart resource information is removed.
Signed-off-by Thomas Abraham<[email protected]>--- arch/arm/mach-exynos/common.c | 6 +----- arch/arm/mach-exynos/dev-uart.c | 24 ------------------------ arch/arm/mach-exynos/include/mach/irqs.h | 5 ----- arch/arm/mach-exynos/include/mach/map.h | 1 - 4 files changed, 1 insertions(+), 35 deletions(-)arch/arm/mach-exynos/common.c +1
-5@@ -96,7 +96,6 @@ static struct cpu_table cpu_ids[] __initdata = { .idmask = EXYNOS5_SOC_MASK, .map_io = exynos5_map_io, .init_clocks = exynos5_init_clocks, - .init_uarts = exynos_init_uarts, .init = exynos_init, .name = name_exynos5250, },@@ -735,10 +734,7 @@ static void __init exynos_init_uarts(struct s3c2410_uartcfg *cfg, int no)for (ucnt =0 ; ucnt< no; ucnt++, tcfg++) tcfg->has_fracval =1 ; -if (soc_is_exynos5250 ()) -s3c24xx_init_uartdevs ("exynos4210-uart" , exynos5_uart_resources, cfg, no); -else -s3c24xx_init_uartdevs ("exynos4210-uart" , exynos4_uart_resources, cfg, no); +s3c24xx_init_uartdevs ("exynos4210-uart" , exynos4_uart_resources, cfg, no); }static void __iomem *exynos_eint_base;arch/arm/mach-exynos/dev-uart.c +0
-24@@ -52,27 +52,3 @@ struct s3c24xx_uart_resources exynos4_uart_resources[] __initdata = { .nr_resources = ARRAY_SIZE(exynos4_uart3_resource), }, }; - -EXYNOS_UART_RESOURCE(5, 0) -EXYNOS_UART_RESOURCE(5, 1) -EXYNOS_UART_RESOURCE(5, 2) -EXYNOS_UART_RESOURCE(5, 3) - -struct s3c24xx_uart_resources exynos5_uart_resources[]__initdata = { - [0 ] = { - .resources = exynos5_uart0_resource, - .nr_resources =ARRAY_SIZE (exynos5_uart0_resource), - }, - [1 ] = { - .resources = exynos5_uart1_resource, - .nr_resources =ARRAY_SIZE (exynos5_uart0_resource), - }, - [2 ] = { - .resources = exynos5_uart2_resource, - .nr_resources =ARRAY_SIZE (exynos5_uart2_resource), - }, - [3 ] = { - .resources = exynos5_uart3_resource, - .nr_resources =ARRAY_SIZE (exynos5_uart3_resource), - }, -};arch/arm/mach-exynos/include/mach/irqs.h +0
-5@@ -259,11 +259,6 @@#define EXYNOS5_IRQ_IEM_IEC IRQ_SPI(48)#define EXYNOS5_IRQ_IEM_APC IRQ_SPI(49)#define EXYNOS5_IRQ_GPIO_C2C IRQ_SPI(50) -#define EXYNOS5_IRQ_UART0 IRQ_SPI(51) -#define EXYNOS5_IRQ_UART1 IRQ_SPI(52) -#define EXYNOS5_IRQ_UART2 IRQ_SPI(53) -#define EXYNOS5_IRQ_UART3 IRQ_SPI(54) -#define EXYNOS5_IRQ_UART4 IRQ_SPI(55)#define EXYNOS5_IRQ_IIC IRQ_SPI(56)#define EXYNOS5_IRQ_IIC1 IRQ_SPI(57)#define EXYNOS5_IRQ_IIC2 IRQ_SPI(58)arch/arm/mach-exynos/include/mach/map.h +0
-0
arch/arm/mach-exynos/include/mach/map.h line 284
Quoted 7 lines
arch/arm/mach-exynos/include/mach/map.h +0
-1@@ -279,7 +279,6 @@#define EXYNOS5_PA_UART1 0x12C10000#define EXYNOS5_PA_UART2 0x12C20000#define EXYNOS5_PA_UART3 0x12C30000 -#define EXYNOS5_SZ_UART SZ_256#define S3C_VA_UARTx (x) (S3C_VA_UART + ((x) * S3C_UART_OFFSET))
Yes, right. And I think, the function name, exynos_init_uarts() can be changed to exynos4_init_uarts() clearly with this...so I did when I applied this.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.