Patchwork [U-Boot,V2] ARMV7: S5P: Fixed register offset in mmc.h

login
register
mail settings
Submitter Chander Kashyap
Date March 22, 2011, 11:29 a.m.
Message ID <1300793378-667-1-git-send-email-chander.kashyap@linaro.org>
Download mbox | patch
Permalink /patch/87897/
State Accepted
Commit bef5f8565ff87d048df352a891953805db84417c
Delegated to: Minkyu Kang
Headers show

Comments

Chander Kashyap - March 22, 2011, 11:29 a.m.
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>
---
 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(-)
Minkyu Kang - March 23, 2011, 1:57 a.m.
Dear Chander Kashyap,

On 22 March 2011 20:29, Chander Kashyap <chander.kashyap@linaro.org> wrote:
> 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>
> ---
>  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(-)
>

applied to u-boot-samsung.

Thanks
Minkyu Kang

Patch

diff --git a/arch/arm/include/asm/arch-s5pc1xx/mmc.h b/arch/arm/include/asm/arch-s5pc1xx/mmc.h
index 48de64d..d458d3b 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 528150d..04827ca 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 {