From patchwork Thu Apr 4 16:37:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 2393941 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id AABFCDF25A for ; Thu, 4 Apr 2013 16:38:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763114Ab3DDQia (ORCPT ); Thu, 4 Apr 2013 12:38:30 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:52997 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762995Ab3DDQi3 (ORCPT ); Thu, 4 Apr 2013 12:38:29 -0400 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MKQ0048YOW4SGP0@mailout1.samsung.com> for linux-samsung-soc@vger.kernel.org; Fri, 05 Apr 2013 01:38:28 +0900 (KST) X-AuditID: cbfee61a-b7fa86d0000045ae-39-515dac832e46 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 67.68.17838.38CAD515; Fri, 05 Apr 2013 01:38:28 +0900 (KST) Received: from mcdsrvbld02.digital.local ([106.116.37.23]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MKQ00F2OOU1P170@mmp1.samsung.com>; Fri, 05 Apr 2013 01:38:27 +0900 (KST) From: Tomasz Figa To: linux-arm-kernel@lists.infradead.org Cc: devicetree-discuss@lists.ozlabs.org, linux-samsung-soc@vger.kernel.org, sameo@linux.intel.com, kgene.kim@samsung.com, kyungmin.park@samsung.com, linux@simtec.co.uk, broonie@opensource.wolfsonmicro.com, kwangwoo.lee@gmail.com, jacmet@sunsite.dk, augulis.darius@gmail.com, mcuelenaere@gmail.com, linux@arm.linux.org.uk, sylvester.nawrocki@gmail.com, buserror@gmail.com, christer@weinigel.se, jekhor@gmail.com, ghcstop@gmail.com, mark.rutland@arm.com, tomasz.figa@gmail.com, heiko@sntech.de, robherring2@gmail.com, m.szyprowski@samsung.com, arnd@arndb.de, john.stultz@linaro.org, tglx@linutronix.de, Tomasz Figa Subject: [PATCH v4 05/14] ARM: SAMSUNG: Unify base address definitions of timer block Date: Thu, 04 Apr 2013 18:37:02 +0200 Message-id: <1365093431-30621-6-git-send-email-t.figa@samsung.com> X-Mailer: git-send-email 1.7.10 In-reply-to: <1365093431-30621-1-git-send-email-t.figa@samsung.com> References: <1365093431-30621-1-git-send-email-t.figa@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAAzXRW0hTYRwA8H3buW20OCy10wyFRRcCNaHLJ4ZIQZynaD2kFFJTD050c2wq KVjTNGiZueF0aaxpWU5m4uYsLcOGSnmbWq6VmbV1oWYXmS1oteWU3n7/+8Of4AjMiJDIlxcz SrmkUITxkPGQl0yotmSJ9wzbNsK/ulEcDn4NARhqGcPgK78Hhz3mZQwOtbxD4UhtGgx7fCgc n3UB+PhuOwonggnwimkOgx32aQROVi3h0Op1odDgfMSG88/4MNhXicCu4QUctr+YYcNZYxUC fwUCGBy/jEKjv58Nuw0+BNqseg7sHPgD0mNpi9EC6OoLtRgd/K0DdH/zAk6/dj3E6G9TUzht fCqmbbfO005DK6A/a4MYXdfbCWjnkh6h77mMHLrR58RovzWO9rlbwDHyJO9gLlOYX8ook9LO 8KRP2lZwhX3L2Qa7HlWD5hgN4BIUuZey+bX4umOo6TfdmAbwCAHZBij/mBdfDzRsqiY4j0S6 MHIH5Vd7sIijyF1Ug8a7Ns0hL6HUQFNUxJvIDMpUP4ZGjJDbqZ6OUU7EfPIQZVr0I+vX4qkP i3Vre7jkYSo8+YMdsWC152LQAeoB3wRYnSCaUeQoVNl5suRElUSmKpHnJeYUyaxg7YEfhfeB WQ0dgCSAaANfWpclFqCSUlWZzAEogiOK4o9Ur6b4uZKyckZZdFpZUsioHCCWQESb+UM1qWIB mScpZgoYRsEo/1fZBFeoBonskomCB/ppk/W2gWp3NMbpuZn228yIeWsgNeFq5lI448ROd8Wc sPVl17Auu/eUvqIxLbd7ZuYn2yOuYKUE3mptQnlfrPuT+/s+6XHd3PO48vQCgfhouHLgSxMa 7Ug+J195H7JMsWJu2Fn7D8Rv6006MmhNuVmeob1+rWv5jghRSSXJuzlKleQfi6iPgbwCAAA= Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org This patch makes all defintions of timer block base address use the same prefix to allow using the common name to define platform device resource. Signed-off-by: Tomasz Figa Signed-off-by: Kyungmin Park --- arch/arm/mach-exynos/include/mach/map.h | 1 + arch/arm/mach-s3c24xx/include/mach/map.h | 2 ++ arch/arm/mach-s3c64xx/include/mach/map.h | 1 + arch/arm/mach-s5p64x0/include/mach/map.h | 1 + arch/arm/mach-s5pc100/include/mach/map.h | 1 + arch/arm/mach-s5pv210/include/mach/map.h | 1 + 6 files changed, 7 insertions(+) diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-exynos/include/mach/map.h index 99e0a79..7167aba 100644 --- a/arch/arm/mach-exynos/include/mach/map.h +++ b/arch/arm/mach-exynos/include/mach/map.h @@ -272,6 +272,7 @@ #define SAMSUNG_PA_ADC EXYNOS4_PA_ADC #define SAMSUNG_PA_ADC1 EXYNOS4_PA_ADC1 #define SAMSUNG_PA_KEYPAD EXYNOS4_PA_KEYPAD +#define SAMSUNG_PA_TIMER EXYNOS4_PA_TIMER /* Compatibility UART */ diff --git a/arch/arm/mach-s3c24xx/include/mach/map.h b/arch/arm/mach-s3c24xx/include/mach/map.h index 8ba381f..444793f 100644 --- a/arch/arm/mach-s3c24xx/include/mach/map.h +++ b/arch/arm/mach-s3c24xx/include/mach/map.h @@ -167,4 +167,6 @@ #define S3C_PA_SPI0 S3C2443_PA_SPI0 #define S3C_PA_SPI1 S3C2443_PA_SPI1 +#define SAMSUNG_PA_TIMER S3C2410_PA_TIMER + #endif /* __ASM_ARCH_MAP_H */ diff --git a/arch/arm/mach-s3c64xx/include/mach/map.h b/arch/arm/mach-s3c64xx/include/mach/map.h index 8e2097b..f55ccb1 100644 --- a/arch/arm/mach-s3c64xx/include/mach/map.h +++ b/arch/arm/mach-s3c64xx/include/mach/map.h @@ -121,5 +121,6 @@ #define SAMSUNG_PA_ADC S3C64XX_PA_ADC #define SAMSUNG_PA_CFCON S3C64XX_PA_CFCON #define SAMSUNG_PA_KEYPAD S3C64XX_PA_KEYPAD +#define SAMSUNG_PA_TIMER S3C64XX_PA_TIMER #endif /* __ASM_ARCH_6400_MAP_H */ diff --git a/arch/arm/mach-s5p64x0/include/mach/map.h b/arch/arm/mach-s5p64x0/include/mach/map.h index 0c0175d..50a6e96 100644 --- a/arch/arm/mach-s5p64x0/include/mach/map.h +++ b/arch/arm/mach-s5p64x0/include/mach/map.h @@ -76,6 +76,7 @@ #define S5P_PA_TIMER S5P64X0_PA_TIMER #define SAMSUNG_PA_ADC S5P64X0_PA_ADC +#define SAMSUNG_PA_TIMER S5P64X0_PA_TIMER /* UART */ diff --git a/arch/arm/mach-s5pc100/include/mach/map.h b/arch/arm/mach-s5pc100/include/mach/map.h index 54bc4f8..2550b61 100644 --- a/arch/arm/mach-s5pc100/include/mach/map.h +++ b/arch/arm/mach-s5pc100/include/mach/map.h @@ -116,6 +116,7 @@ #define SAMSUNG_PA_ADC S5PC100_PA_TSADC #define SAMSUNG_PA_CFCON S5PC100_PA_CFCON #define SAMSUNG_PA_KEYPAD S5PC100_PA_KEYPAD +#define SAMSUNG_PA_TIMER S5PC100_PA_TIMER #define S5PC100_VA_OTHERS (S3C_VA_SYS + 0x10000) diff --git a/arch/arm/mach-s5pv210/include/mach/map.h b/arch/arm/mach-s5pv210/include/mach/map.h index b7c8a19..763929a 100644 --- a/arch/arm/mach-s5pv210/include/mach/map.h +++ b/arch/arm/mach-s5pv210/include/mach/map.h @@ -139,6 +139,7 @@ #define SAMSUNG_PA_ADC S5PV210_PA_ADC #define SAMSUNG_PA_CFCON S5PV210_PA_CFCON #define SAMSUNG_PA_KEYPAD S5PV210_PA_KEYPAD +#define SAMSUNG_PA_TIMER S5PV210_PA_TIMER /* UART */