Skip to content

Commit

Permalink
ARM: SAMSUNG: Remove unused register offset definition
Browse files Browse the repository at this point in the history
This 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".

Signed-off-by: Pankaj Dubey <pankaj.dubey@samsung.com>
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
  • Loading branch information
Pankaj Dubey authored and Krzysztof Kozlowski committed Feb 25, 2016
1 parent a478144 commit ce7f8ce
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 28 deletions.
9 changes: 1 addition & 8 deletions arch/arm/mach-exynos/include/mach/map.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -30,7 +24,6 @@
#define EXYNOS4_PA_DMC1 0x10410000

#define EXYNOS4_PA_COREPERI 0x10500000
#define EXYNOS4_PA_L2CC 0x10502000

#define EXYNOS4_PA_SROMC 0x12570000
#define EXYNOS5_PA_SROMC 0x12250000
Expand Down
11 changes: 0 additions & 11 deletions arch/arm/mach-s3c24xx/include/mach/map.h
Original file line number Diff line number Diff line change
Expand Up @@ -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>

/*
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions arch/arm/plat-samsung/include/plat/map-s3c.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
Expand Down
5 changes: 0 additions & 5 deletions arch/arm/plat-samsung/include/plat/map-s5p.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,13 @@
#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)
#define VA_VIC1 VA_VIC(1)
#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 */

0 comments on commit ce7f8ce

Please sign in to comment.