From bef5f8565ff87d048df352a891953805db84417c Mon Sep 17 00:00:00 2001
From: Chander Kashyap <chander.kashyap@linaro.org>
Date: Tue, 22 Mar 2011 01:29:38 +0000
Subject: [PATCH] ARMV7: S5P: Fixed register offset in mmc.h
The MMC registers are accessed through struct s5p_mmc member
variables. MMC controller "control4" register offset is set
to 0x8C as per data sheet. The size of struct s5p_mmc is also
corrected.
Signed-off-by: Chander Kashyap <chander.kashyap@linaro.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
---
arch/arm/include/asm/arch-s5pc1xx/mmc.h | 5 +++--
arch/arm/include/asm/arch-s5pc2xx/mmc.h | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/arch/arm/include/asm/arch-s5pc1xx/mmc.h b/arch/arm/include/asm/arch-s5pc1xx/mmc.h
index 48de64d9c3..d458d3bb8e 100644
--- a/arch/arm/include/asm/arch-s5pc1xx/mmc.h
+++ b/arch/arm/include/asm/arch-s5pc1xx/mmc.h
@@ -53,10 +53,11 @@ struct s5p_mmc {
unsigned char res3[0x34];
unsigned int control2;
unsigned int control3;
+ unsigned char res4[4];
unsigned int control4;
- unsigned char res4[0x6e];
+ unsigned char res5[0x6e];
unsigned short hcver;
- unsigned char res5[0xFFF02];
+ unsigned char res6[0xFFF00];
};
struct mmc_host {
diff --git a/arch/arm/include/asm/arch-s5pc2xx/mmc.h b/arch/arm/include/asm/arch-s5pc2xx/mmc.h
index 528150d755..04827cad75 100644
--- a/arch/arm/include/asm/arch-s5pc2xx/mmc.h
+++ b/arch/arm/include/asm/arch-s5pc2xx/mmc.h
@@ -53,10 +53,11 @@ struct s5p_mmc {
unsigned char res3[0x34];
unsigned int control2;
unsigned int control3;
+ unsigned char res4[4];
unsigned int control4;
- unsigned char res4[0x6e];
+ unsigned char res5[0x6e];
unsigned short hcver;
- unsigned char res5[0xFF02];
+ unsigned char res6[0xFF00];
};
struct mmc_host {
--
2.39.5