diff options
| author | Tom Rini <trini@ti.com> | 2014-10-26 14:13:24 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-10-26 14:13:24 -0400 |
| commit | d0796defbe8eff6fc3c27c893dcbc47af59d4764 (patch) | |
| tree | d24f8d1617534954e807047dcdd5cec054847bb3 /arch/arm/include/asm/arch-sunxi/mmc.h | |
| parent | 1fba907f9a8d178eee960294ecffc8ee8bc6b00d (diff) | |
| parent | accc9e446be6c3bd129315a0c5830bddccfa16da (diff) | |
| download | blackbird-obmc-uboot-d0796defbe8eff6fc3c27c893dcbc47af59d4764.tar.gz blackbird-obmc-uboot-d0796defbe8eff6fc3c27c893dcbc47af59d4764.zip | |
Merge http://git.denx.de/u-boot-sunxi
Diffstat (limited to 'arch/arm/include/asm/arch-sunxi/mmc.h')
| -rw-r--r-- | arch/arm/include/asm/arch-sunxi/mmc.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/include/asm/arch-sunxi/mmc.h b/arch/arm/include/asm/arch-sunxi/mmc.h index 53196e3b02..8a216740a7 100644 --- a/arch/arm/include/asm/arch-sunxi/mmc.h +++ b/arch/arm/include/asm/arch-sunxi/mmc.h @@ -43,7 +43,10 @@ struct sunxi_mmc { u32 chda; /* 0x90 */ u32 cbda; /* 0x94 */ u32 res1[26]; - u32 fifo; /* 0x100 FIFO access address */ +#if defined(CONFIG_SUN6I) || defined(CONFIG_SUN8I) + u32 res2[64]; +#endif + u32 fifo; /* 0x100 (0x200 on sun6i) FIFO access address */ }; #define SUNXI_MMC_CLK_POWERSAVE (0x1 << 17) @@ -120,5 +123,5 @@ struct sunxi_mmc { #define SUNXI_MMC_IDIE_TXIRQ (0x1 << 0) #define SUNXI_MMC_IDIE_RXIRQ (0x1 << 1) -int sunxi_mmc_init(int sdc_no); +struct mmc *sunxi_mmc_init(int sdc_no); #endif /* _SUNXI_MMC_H */ |
