leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm: s3c: Unify the S3C24xx SDI structure

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

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>
Cc: Pantelis Antoniou <panto@antoniou-consulting.com>
Cc: Vladimir Zapolskiy <vz@mleia.com>
Acked-by: Pantelis Antoniou <panto@antoniou-consulting.com>
This commit is contained in:
Marek Vasut 2014-07-22 02:34:51 +02:00 committed by Pantelis Antoniou
parent 64973023df
commit 7eca6b6327
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/include/asm/arch-s3c24x0/s3c2410.h
View File

@ -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__*/

4
arch/arm/include/asm/arch-s3c24x0/s3c2440.h
View File

@ -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__*/

15
arch/arm/include/asm/arch-s3c24x0/s3c24x0.h
View File

@ -675,7 +675,7 @@ struct s3c2400_mmc {
/* SD INTERFACE (see S3C2410 manual chapter 19) */
struct s3c2410_sdi {
struct s3c24x0_sdi {
u32 sdicon;
u32 sdipre;
u32 sdicarg;
@ -691,14 +691,13 @@ struct s3c2410_sdi {
u32 sdidcnt;
u32 sdidsta;
u32 sdifsta;
#ifdef __BIG_ENDIAN
u8 res[3];
u8 sdidat;
#else
u8 sdidat;
u8 res[3];
#endif
#ifdef CONFIG_S3C2410
u32 sdidat;
u32 sdiimsk;
#else
u32 sdiimsk;
u32 sdidat;
#endif
};
#endif /*__S3C24X0_H__*/