Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-26 07:17:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "omap_hsmmc: update struct hsmmc to accommodate omap3 from DT"

Browse source 
This reverts commit 46831c1a4c.
This reserved area at the beginning of struct hsmm, will be used later to
support ADMA

Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Jean-Jacques Hiblot 2017-09-21 16:51:32 +02:00 • committed by Tom Rini
parent 086ebcd40e
commit 741726ae4c
2 changed files with 7 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
arch/arm/include/asm/omap_mmc.h
View file

@ -28,6 +28,9 @@
#include <mmc.h> #include <mmc.h>
struct hsmmc { struct hsmmc {
#ifdef CONFIG_DM_MMC
unsigned char res0[0x100];
#endif
unsigned char res1[0x10]; unsigned char res1[0x10];
unsigned int sysconfig; /* 0x10 */ unsigned int sysconfig; /* 0x10 */
unsigned int sysstatus; /* 0x14 */ unsigned int sysstatus; /* 0x14 */

35
drivers/mmc/omap_hsmmc.c
View file

@ -56,10 +56,6 @@ DECLARE_GLOBAL_DATA_PTR;
#define SYSCTL_SRC (1 << 25) #define SYSCTL_SRC (1 << 25)
#define SYSCTL_SRD (1 << 26) #define SYSCTL_SRD (1 << 26)
struct omap2_mmc_platform_config {
u32 reg_offset;
};
struct omap_hsmmc_data { struct omap_hsmmc_data {
struct hsmmc *base_addr; struct hsmmc *base_addr;
#if !CONFIG_IS_ENABLED(DM_MMC) #if !CONFIG_IS_ENABLED(DM_MMC)
@ -802,15 +798,13 @@ static int omap_hsmmc_ofdata_to_platdata(struct udevice *dev)
{ {
struct omap_hsmmc_plat *plat = dev_get_platdata(dev); struct omap_hsmmc_plat *plat = dev_get_platdata(dev);
struct mmc_config *cfg = &plat->cfg; struct mmc_config *cfg = &plat->cfg;
struct omap2_mmc_platform_config *data =
(struct omap2_mmc_platform_config *)dev_get_driver_data(dev);
const void *fdt = gd->fdt_blob; const void *fdt = gd->fdt_blob;
int node = dev_of_offset(dev); int node = dev_of_offset(dev);
int val; int val;
plat->base_addr = map_physmem(devfdt_get_addr(dev), plat->base_addr = map_physmem(devfdt_get_addr(dev),
sizeof(struct hsmmc *), sizeof(struct hsmmc *),
MAP_NOCACHE) + data->reg_offset; MAP_NOCACHE);
cfg->host_caps = MMC_MODE_HS_52MHz | MMC_MODE_HS; cfg->host_caps = MMC_MODE_HS_52MHz | MMC_MODE_HS;
val = fdtdec_get_int(fdt, node, "bus-width", -1); val = fdtdec_get_int(fdt, node, "bus-width", -1);
@ -886,31 +880,10 @@ static int omap_hsmmc_probe(struct udevice *dev)
} }
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
static const struct omap2_mmc_platform_config omap3_mmc_pdata = {
.reg_offset = 0,
};
static const struct omap2_mmc_platform_config am33xx_mmc_pdata = {
.reg_offset = 0x100,
};
static const struct omap2_mmc_platform_config omap4_mmc_pdata = {
.reg_offset = 0x100,
};
static const struct udevice_id omap_hsmmc_ids[] = { static const struct udevice_id omap_hsmmc_ids[] = {
{ { .compatible = "ti,omap3-hsmmc" },
.compatible = "ti,omap3-hsmmc", { .compatible = "ti,omap4-hsmmc" },
.data = (ulong)&omap3_mmc_pdata { .compatible = "ti,am33xx-hsmmc" },
},
{
.compatible = "ti,omap4-hsmmc",
.data = (ulong)&omap4_mmc_pdata
},
{
.compatible = "ti,am33xx-hsmmc",
.data = (ulong)&am33xx_mmc_pdata
},
{ } { }
}; };
#endif #endif