ARM: EXYNOS: Trivial cleanup samsung mach files
v2 cover ARM: EXYNOS: Trivial cleanup samsung mach files
This patch series cleans up mach-exynos, mach-s3c24xx, plat-samsung include header files with resepct to unused header file inclusion, removes redundant register offset definition. Also corrects comment section at few places.
Changes since v1:
- Keeping back inclusion of header "platform_device.h" in exynos.c.
- Removing all unused instances of S3C_UART_OFFSET from mach-exynos, mach-s3c24xx, and plat-samsung, in single patch.
- Patch 1/3 is already merged in maintainer tree so not included in v2.
Pankaj Dubey (2):
ARM: EXYNOS: cleanup header files inclusion
ARM: SAMSUNG: remove unused register offset definition
arch/arm/mach-exynos/common.h | 1 - arch/arm/mach-exynos/exynos.c | 4 ---- arch/arm/mach-exynos/firmware.c | 2 -- arch/arm/mach-exynos/include/mach/map.h | 9 +-------- arch/arm/mach-exynos/platsmp.c | 1 - arch/arm/mach-exynos/pm.c | 4 +--- arch/arm/mach-exynos/s5p-dev-mfc.c | 1 - arch/arm/mach-s3c24xx/include/mach/map.h | 11 ----------- arch/arm/plat-samsung/include/plat/map-s3c.h | 4 ---- arch/arm/plat-samsung/include/plat/map-s5p.h | 5 ----- 10 files changed, 2 insertions(+), 40 deletions(-)
Signature · 1 line
2.4.5
PATCH v2 1/2 ARM: EXYNOS: cleanup header files inclusion
This includes trivial cleanup in exynos files such as
- remove unused header files inclusion from exynos.c, s5p-dev-mfc.c, firmware.c, pm.c.
- move inclusion of of.h from common.h to pm.c where it is really required
--- arch/arm/mach-exynos/common.h | 1 - arch/arm/mach-exynos/exynos.c | 4 ---- arch/arm/mach-exynos/firmware.c | 2 -- arch/arm/mach-exynos/platsmp.c | 1 - arch/arm/mach-exynos/pm.c | 4 +--- arch/arm/mach-exynos/s5p-dev-mfc.c | 1 - 6 files changed, 1 insertion(+), 12 deletions(-)
arch/arm/mach-exynos/common.h +0 -1
@@ -12,7 +12,6 @@#ifndef __ARCH_ARM_MACH_EXYNOS_COMMON_H#define __ARCH_ARM_MACH_EXYNOS_COMMON_H -#include <linux/of.h> #include <linux/platform_data/cpuidle-exynos.h> #define EXYNOS3250_SOC_ID 0xE3472000
arch/arm/mach-exynos/exynos.c +0 -4
@@ -11,14 +11,11 @@#include <linux/init.h> #include <linux/io.h> -#include <linux/kernel.h> -#include <linux/serial_s3c.h> #include <linux/of.h> #include <linux/of_address.h> #include <linux/of_fdt.h> #include <linux/of_platform.h> #include <linux/platform_device.h> -#include <linux/pm_domain.h> #include <linux/irqchip.h> #include <linux/soc/samsung/exynos-regs-pmu.h>
@@ -26,7 +23,6 @@#include <asm/hardware/cache-l2x0.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <asm/memory.h> #include <mach/map.h>
arch/arm/mach-exynos/firmware.c +0 -2
@@ -20,8 +20,6 @@#include <asm/hardware/cache-l2x0.h> #include <asm/suspend.h> -#include <mach/map.h> -#include "common.h" #include "smc.h"
arch/arm/mach-exynos/platsmp.c +0 -1
@@ -15,7 +15,6 @@#include <linux/init.h> #include <linux/errno.h> #include <linux/delay.h> -#include <linux/device.h> #include <linux/jiffies.h> #include <linux/smp.h> #include <linux/io.h>
arch/arm/mach-exynos/pm.c +1 -3
@@ -17,7 +17,7 @@#include <linux/suspend.h> #include <linux/cpu_pm.h> #include <linux/io.h> -#include <linux/err.h> +#include <linux/of.h> #include <linux/soc/samsung/exynos-regs-pmu.h> #include <linux/soc/samsung/exynos-pmu.h>
@@ -28,8 +28,6 @@#include <mach/map.h> -#include <plat/pm-common.h> -#include "common.h" static inline void __iomem *exynos_boot_vector_addr (void )
arch/arm/mach-exynos/s5p-dev-mfc.c +0 -1
@@ -9,7 +9,6 @@*/ #include <linux/kernel.h> -#include <linux/interrupt.h> #include <linux/platform_device.h> #include <linux/dma-mapping.h> #include <linux/memblock.h>
Signature · 1 line
2.4.5
PATCH v2 2/2 ARM: SAMSUNG: remove unused register offset definition
In reply to Pankaj DubeyThis patch cleans up various map.h under mach-exynos, mach-s3c24xx and plat-samsung by removing unused register offset. This patch also does a minor nitpick of changing EXYNOS4 to EXYNOS from comment section of header file "mach-exynos/include/mach/map.h".
--- arch/arm/mach-exynos/include/mach/map.h | 9 +-------- arch/arm/mach-s3c24xx/include/mach/map.h | 11 ----------- arch/arm/plat-samsung/include/plat/map-s3c.h | 4 ---- arch/arm/plat-samsung/include/plat/map-s5p.h | 5 ----- 4 files changed, 1 insertion(+), 28 deletions(-)
arch/arm/mach-exynos/include/mach/map.h +1 -8
@@ -2,7 +2,7 @@* Copyright (c) 2010-2011 Samsung Electronics Co., Ltd. * http://www.samsung.com/ * -* EXYNOS4 - Memory map definitions +* EXYNOS - Memory map definitions * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as
@@ -14,12 +14,6 @@#include <plat/map-base.h> -/* -* EXYNOS4 UART offset is 0x10000 but the older S5P SoCs are 0x400. -* So need to define it, and here is to avoid redefinition warning. -*/ -#define S3C_UART_OFFSET (0x10000) -#include <plat/map-s5p.h> #define EXYNOS_PA_CHIPID 0x10000000
@@ -30,6 +24,5 @@#define EXYNOS4_PA_DMC1 0x10410000#define EXYNOS4_PA_COREPERI 0x10500000 -#define EXYNOS4_PA_L2CC 0x10502000#endif /* __ASM_ARCH_MAP_H */
arch/arm/mach-s3c24xx/include/mach/map.h +0 -11
@@ -14,13 +14,6 @@#define __ASM_ARCH_MAP_H#include <plat/map-base.h> - -/* -* S3C2410 UART offset is 0x4000 but the other SoCs are 0x400. -* So need to define it, and here is to avoid redefinition warning. -*/ -#define S3C_UART_OFFSET (0x4000) -#include <plat/map-s3c.h> /*
@@ -34,9 +27,6 @@#define S3C2410_PA_MEMCTRL (0x48000000)#define S3C24XX_SZ_MEMCTRL SZ_1M -/* UARTs */ -#define S3C_VA_UARTx (uart) (S3C_VA_UART + ((uart * S3C_UART_OFFSET))) -/* Timers */ #define S3C2410_PA_TIMER (0x51000000)#define S3C24XX_SZ_TIMER SZ_1M
@@ -157,7 +147,6 @@#define S3C_PA_FB S3C2443_PA_FB#define S3C_PA_IIC S3C2410_PA_IIC -#define S3C_PA_UART S3C24XX_PA_UART#define S3C_PA_USBHOST S3C2410_PA_USBHOST#define S3C_PA_HSMMC0 S3C2416_PA_HSMMC0#define S3C_PA_HSMMC1 S3C2443_PA_HSMMC
arch/arm/plat-samsung/include/plat/map-s3c.h +0 -4
@@ -27,10 +27,6 @@#define S3C2410_PA_UART (0x50000000)#define S3C24XX_PA_UART S3C2410_PA_UART -#ifndef S3C_UART_OFFSET -#define S3C_UART_OFFSET (0x400) -#endif -/* * GPIO ports *
arch/arm/plat-samsung/include/plat/map-s5p.h +0 -5
@@ -22,7 +22,6 @@#define S5P_VA_COREPERI_BASE S3C_ADDR(0x02800000)#define S5P_VA_COREPERI (x) (S5P_VA_COREPERI_BASE + (x))#define S5P_VA_SCU S5P_VA_COREPERI(0x0) -#define S5P_VA_TWD S5P_VA_COREPERI(0x600)#define VA_VIC (x) (S3C_VA_IRQ + ((x) * 0x10000))#define VA_VIC0 VA_VIC(0)
@@ -30,10 +29,6 @@#define VA_VIC2 VA_VIC(2)#define VA_VIC3 VA_VIC(3) -#ifndef S3C_UART_OFFSET -#define S3C_UART_OFFSET (0x400) -#endif -#include <plat/map-s3c.h> #endif /* __ASM_PLAT_MAP_S5P_H */
Signature · 1 line
2.4.5
v2 cover ARM: EXYNOS: Trivial cleanup samsung mach files
In reply to Pankaj DubeyQuoted 9 lines · Pankaj Dubey
This patch series cleans up mach-exynos, mach-s3c24xx, plat-samsung include header files with resepct to unused header file inclusion, removes redundant register offset definition. Also corrects comment section at few places.
Changes since v1:
- Keeping back inclusion of header "platform_device.h" inexynos.c.
- Removing all unused instances ofS3C_UART_OFFSETfrom mach-exynos, mach-s3c24xx, and plat-samsung, in single patch.
- Patch 1/3 is already merged in maintainer tree so not included in v2.
Thanks for the changes. I appreciate that!
Applied both patches.
Best regards,
Krzysztof