[PATCH] ARM: EXYNOS: Add I2S SFR base addresses

Padmavathi Venna padma.v at samsung.com
Wed Jul 25 08:05:38 EDT 2012


The base address of I2S 0 controller is similar in exynos4 and exynos5
platforms. So this patch defines a common macro for the I2S controller
0 base address in both the platforms and use the same macro.

This patch also defines the I2S controller 1,2 base addresses in exynos5
and correct the I2S controller 1 base address in exynos4

Signed-off-by: Padmavathi Venna <padma.v at samsung.com>
---
 arch/arm/mach-exynos/dev-audio.c        |    2 +-
 arch/arm/mach-exynos/include/mach/map.h |    6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-exynos/dev-audio.c b/arch/arm/mach-exynos/dev-audio.c
index b33a5b6..5dbc9a2 100644
--- a/arch/arm/mach-exynos/dev-audio.c
+++ b/arch/arm/mach-exynos/dev-audio.c
@@ -62,7 +62,7 @@ static struct s3c_audio_pdata i2sv5_pdata = {
 };
 
 static struct resource exynos4_i2s0_resource[] = {
-	[0] = DEFINE_RES_MEM(EXYNOS4_PA_I2S0, SZ_256),
+	[0] = DEFINE_RES_MEM(EXYNOS_PA_I2S0, SZ_256),
 	[1] = DEFINE_RES_DMA(DMACH_I2S0_TX),
 	[2] = DEFINE_RES_DMA(DMACH_I2S0_RX),
 	[3] = DEFINE_RES_DMA(DMACH_I2S0S_TX),
diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-exynos/include/mach/map.h
index c72b675..5cf7d91 100644
--- a/arch/arm/mach-exynos/include/mach/map.h
+++ b/arch/arm/mach-exynos/include/mach/map.h
@@ -39,9 +39,11 @@
 
 #define EXYNOS4_PA_G2D			0x12800000
 
-#define EXYNOS4_PA_I2S0			0x03830000
-#define EXYNOS4_PA_I2S1			0xE3100000
+#define EXYNOS_PA_I2S0			0x03830000
+#define EXYNOS4_PA_I2S1			0xE2100000
 #define EXYNOS4_PA_I2S2			0xE2A00000
+#define EXYNOS5_PA_I2S1			0x12D60000
+#define EXYNOS5_PA_I2S2			0x12D70000
 
 #define EXYNOS4_PA_PCM0			0x03840000
 #define EXYNOS4_PA_PCM1			0x13980000
-- 
1.7.4.4




More information about the linux-arm-kernel mailing list