[U-Boot] [PATCH 10/12] arm: s3c: Unify the S3C24xx SDI structure

[Marek Vasut]

Unify the register structure so they can be easily used across all
of S3C24xx lineup.

Signed-off-by: Marek Vasut <ma...@denx.de>
Cc: Kyungmin Park <kyungmin.p...@samsung.com>
Cc: Lukasz Majewski <l.majew...@samsung.com>
Cc: Minkyu Kang <mk7.k...@samsung.com>
Cc: Pantelis Antoniou <pa...@antoniou-consulting.com>
Cc: Vladimir Zapolskiy <v...@mleia.com>
---
 arch/arm/include/asm/arch-s3c24x0/s3c2410.h |  4 ++--
 arch/arm/include/asm/arch-s3c24x0/s3c2440.h |  4 ++--
 arch/arm/include/asm/arch-s3c24x0/s3c24x0.h | 13 ++++++-------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/arch/arm/include/asm/arch-s3c24x0/s3c2410.h 
b/arch/arm/include/asm/arch-s3c24x0/s3c2410.h
index 1a925fb..8773ce3 100644
--- a/arch/arm/include/asm/arch-s3c24x0/s3c2410.h
+++ b/arch/arm/include/asm/arch-s3c24x0/s3c2410.h
@@ -139,9 +139,9 @@ static inline struct s3c24x0_spi *s3c24x0_get_base_spi(void)
        return (struct s3c24x0_spi *)S3C24X0_SPI_BASE;
 }
 
-static inline struct s3c2410_sdi *s3c2410_get_base_sdi(void)
+static inline struct s3c24x0_sdi *s3c24x0_get_base_sdi(void)
 {
-       return (struct s3c2410_sdi *)S3C2410_SDI_BASE;
+       return (struct s3c24x0_sdi *)S3C2410_SDI_BASE;
 }
 
 #endif /*__S3C2410_H__*/
diff --git a/arch/arm/include/asm/arch-s3c24x0/s3c2440.h 
b/arch/arm/include/asm/arch-s3c24x0/s3c2440.h
index bf21bb9..7a525f2 100644
--- a/arch/arm/include/asm/arch-s3c24x0/s3c2440.h
+++ b/arch/arm/include/asm/arch-s3c24x0/s3c2440.h
@@ -137,9 +137,9 @@ static inline struct s3c24x0_spi *s3c24x0_get_base_spi(void)
        return (struct s3c24x0_spi *)S3C24X0_SPI_BASE;
 }
 
-static inline struct s3c2440_sdi *s3c2440_get_base_sdi(void)
+static inline struct s3c24x0_sdi *s3c24x0_get_base_sdi(void)
 {
-       return (struct s3c2440_sdi *)S3C2440_SDI_BASE;
+       return (struct s3c24x0_sdi *)S3C2440_SDI_BASE;
 }
 
 #endif /*__S3C2440_H__*/
diff --git a/arch/arm/include/asm/arch-s3c24x0/s3c24x0.h 
b/arch/arm/include/asm/arch-s3c24x0/s3c24x0.h
index 0621e16..b9f752d 100644
--- a/arch/arm/include/asm/arch-s3c24x0/s3c24x0.h
+++ b/arch/arm/include/asm/arch-s3c24x0/s3c24x0.h
@@ -674,7 +674,7 @@ struct s3c2400_mmc {
 
 
 /* SD INTERFACE (see S3C2410 manual chapter 19) */
-struct s3c2410_sdi {
+struct s3c24x0_sdi {
        u32     sdicon;
        u32     sdipre;
        u32     sdicarg;
@@ -690,14 +690,13 @@ struct s3c2410_sdi {
        u32     sdidcnt;
        u32     sdidsta;
        u32     sdifsta;
-#ifdef __BIG_ENDIAN
-       u8      res[3];
-       u8      sdidat;
+#ifdef CONFIG_S3C2410
+       u32     sdidat;
+       u32     sdiimsk;
 #else
-       u8      sdidat;
-       u8      res[3];
-#endif
        u32     sdiimsk;
+       u32     sdidat;
+#endif
 };
 
 #endif /*__S3C24X0_H__*/
-- 
2.0.0.rc2

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot