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

dm: mmc: omap_hsmmc: Update to support of-platdata

Browse source 
This is to aid platforms that uses OF_PLATDATA.

Reviewed-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
This commit is contained in:
Lokesh Vutla 2017-04-26 13:37:05 +05:30 • committed by Tom Rini
parent a52cf086ac
commit 2558c04906
2 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -25,6 +25,8 @@
#ifndef OMAP_MMC_H_ #ifndef OMAP_MMC_H_
#define OMAP_MMC_H_ #define OMAP_MMC_H_
#include <mmc.h>
struct hsmmc { struct hsmmc {
unsigned char res1[0x10]; unsigned char res1[0x10];
unsigned int sysconfig; /* 0x10 */ unsigned int sysconfig; /* 0x10 */
@ -49,6 +51,13 @@ struct hsmmc {
unsigned int capa; /* 0x140 */ unsigned int capa; /* 0x140 */
}; };
struct omap_hsmmc_plat {
struct mmc_config cfg;
struct hsmmc *base_addr;
struct mmc mmc;
bool cd_inverted;
};
/* /*
* OMAP HS MMC Bit definitions * OMAP HS MMC Bit definitions
*/ */

24
drivers/mmc/omap_hsmmc.c
View file

@ -56,11 +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 omap_hsmmc_plat {
struct mmc_config cfg;
struct mmc mmc;
};
struct omap2_mmc_platform_config { struct omap2_mmc_platform_config {
u32 reg_offset; u32 reg_offset;
}; };
@ -777,9 +772,9 @@ int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max, int cd_gpio,
return 0; return 0;
} }
#else #else
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
static int omap_hsmmc_ofdata_to_platdata(struct udevice *dev) static int omap_hsmmc_ofdata_to_platdata(struct udevice *dev)
{ {
struct omap_hsmmc_data *priv = dev_get_priv(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 *data =
@ -788,7 +783,7 @@ static int omap_hsmmc_ofdata_to_platdata(struct udevice *dev)
int node = dev_of_offset(dev); int node = dev_of_offset(dev);
int val; int val;
priv->base_addr = map_physmem(dev_get_addr(dev), sizeof(struct hsmmc *), plat->base_addr = map_physmem(dev_get_addr(dev), sizeof(struct hsmmc *),
MAP_NOCACHE) + data->reg_offset; MAP_NOCACHE) + data->reg_offset;
cfg->host_caps = MMC_MODE_HS_52MHz | MMC_MODE_HS; cfg->host_caps = MMC_MODE_HS_52MHz | MMC_MODE_HS;
@ -815,11 +810,12 @@ static int omap_hsmmc_ofdata_to_platdata(struct udevice *dev)
cfg->b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT; cfg->b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT;
#ifdef OMAP_HSMMC_USE_GPIO #ifdef OMAP_HSMMC_USE_GPIO
priv->cd_inverted = fdtdec_get_bool(fdt, node, "cd-inverted"); plat->cd_inverted = fdtdec_get_bool(fdt, node, "cd-inverted");
#endif #endif
return 0; return 0;
} }
#endif
#ifdef CONFIG_BLK #ifdef CONFIG_BLK
@ -840,6 +836,10 @@ static int omap_hsmmc_probe(struct udevice *dev)
cfg->name = "OMAP SD/MMC"; cfg->name = "OMAP SD/MMC";
cfg->ops = &omap_hsmmc_ops; cfg->ops = &omap_hsmmc_ops;
priv->base_addr = plat->base_addr;
#ifdef OMAP_HSMMC_USE_GPIO
priv->cd_inverted = plat->cd_inverted;
#endif
#ifdef CONFIG_BLK #ifdef CONFIG_BLK
mmc = &plat->mmc; mmc = &plat->mmc;
@ -849,7 +849,7 @@ static int omap_hsmmc_probe(struct udevice *dev)
return -1; return -1;
#endif #endif
#ifdef OMAP_HSMMC_USE_GPIO #if defined(OMAP_HSMMC_USE_GPIO) && CONFIG_IS_ENABLED(OF_CONTROL)
gpio_request_by_name(dev, "cd-gpios", 0, &priv->cd_gpio, GPIOD_IS_IN); gpio_request_by_name(dev, "cd-gpios", 0, &priv->cd_gpio, GPIOD_IS_IN);
gpio_request_by_name(dev, "wp-gpios", 0, &priv->wp_gpio, GPIOD_IS_IN); gpio_request_by_name(dev, "wp-gpios", 0, &priv->wp_gpio, GPIOD_IS_IN);
#endif #endif
@ -860,6 +860,7 @@ static int omap_hsmmc_probe(struct udevice *dev)
return 0; return 0;
} }
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
static const struct omap2_mmc_platform_config omap3_mmc_pdata = { static const struct omap2_mmc_platform_config omap3_mmc_pdata = {
.reg_offset = 0, .reg_offset = 0,
}; };
@ -887,17 +888,20 @@ static const struct udevice_id omap_hsmmc_ids[] = {
}, },
{ } { }
}; };
#endif
U_BOOT_DRIVER(omap_hsmmc) = { U_BOOT_DRIVER(omap_hsmmc) = {
.name = "omap_hsmmc", .name = "omap_hsmmc",
.id = UCLASS_MMC, .id = UCLASS_MMC,
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
.of_match = omap_hsmmc_ids, .of_match = omap_hsmmc_ids,
.ofdata_to_platdata = omap_hsmmc_ofdata_to_platdata, .ofdata_to_platdata = omap_hsmmc_ofdata_to_platdata,
.platdata_auto_alloc_size = sizeof(struct omap_hsmmc_plat),
#endif
#ifdef CONFIG_BLK #ifdef CONFIG_BLK
.bind = omap_hsmmc_bind, .bind = omap_hsmmc_bind,
#endif #endif
.probe = omap_hsmmc_probe, .probe = omap_hsmmc_probe,
.priv_auto_alloc_size = sizeof(struct omap_hsmmc_data), .priv_auto_alloc_size = sizeof(struct omap_hsmmc_data),
.platdata_auto_alloc_size = sizeof(struct omap_hsmmc_plat),
}; };
#endif #endif