dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-02 09:12:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

mmc: atmel: Implement proper private data

Browse Source 
Instead of passing just the register area as a private data, introduce
a proper struct atmel_mci_priv structure instead. This will become useful
in the subsequent patch, where we eliminate the global variable from this
driver.

Signed-off-by: Marek Vasut <marex@denx.de>
Reviewed-by: Andreas Bießmann <andreas.devel@googlemail.com>
[fix free()]
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
This commit is contained in:
Marek Vasut
2015-10-23 20:46:30 +02:00
committed by Andreas Bießmann
parent ecfb0ff812
commit 6b75d35949
1 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/mmc/gen_atmel_mci.c
View File

@@ -32,6 +32,11 @@
# define MCI_BUS 0 # define MCI_BUS 0
#endif #endif
struct atmel_mci_priv {
struct mmc_config cfg;
struct atmel_mci *mci;
};
static int initialized = 0; static int initialized = 0;
/* Read Atmel MCI IP version */ /* Read Atmel MCI IP version */
@@ -55,7 +60,8 @@ static void dump_cmd(u32 cmdr, u32 arg, u32 status, const char* msg)
/* Setup for MCI Clock and Block Size */ /* Setup for MCI Clock and Block Size */
static void mci_set_mode(struct mmc *mmc, u32 hz, u32 blklen) static void mci_set_mode(struct mmc *mmc, u32 hz, u32 blklen)
{ {
atmel_mci_t *mci = mmc->priv; struct atmel_mci_priv *priv = mmc->priv;
atmel_mci_t *mci = priv->mci;
u32 bus_hz = get_mci_clk_rate(); u32 bus_hz = get_mci_clk_rate();
u32 clkdiv = 255; u32 clkdiv = 255;
unsigned int version = atmel_mci_get_version(mci); unsigned int version = atmel_mci_get_version(mci);
@@ -198,7 +204,8 @@ io_fail:
static int static int
mci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data) mci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data)
{ {
atmel_mci_t *mci = mmc->priv; struct atmel_mci_priv *priv = mmc->priv;
atmel_mci_t *mci = priv->mci;
u32 cmdr; u32 cmdr;
u32 error_flags = 0; u32 error_flags = 0;
u32 status; u32 status;
@@ -323,7 +330,8 @@ mci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data)
/* Entered into mmc structure during driver init */ /* Entered into mmc structure during driver init */
static void mci_set_ios(struct mmc *mmc) static void mci_set_ios(struct mmc *mmc)
{ {
atmel_mci_t *mci = mmc->priv; struct atmel_mci_priv *priv = mmc->priv;
atmel_mci_t *mci = priv->mci;
int bus_width = mmc->bus_width; int bus_width = mmc->bus_width;
unsigned int version = atmel_mci_get_version(mci); unsigned int version = atmel_mci_get_version(mci);
int busw; int busw;
@@ -359,7 +367,8 @@ static void mci_set_ios(struct mmc *mmc)
/* Entered into mmc structure during driver init */ /* Entered into mmc structure during driver init */
static int mci_init(struct mmc *mmc) static int mci_init(struct mmc *mmc)
{ {
atmel_mci_t *mci = mmc->priv; struct atmel_mci_priv *priv = mmc->priv;
atmel_mci_t *mci = priv->mci;
/* Initialize controller */ /* Initialize controller */
writel(MMCI_BIT(SWRST), &mci->cr); /* soft reset */ writel(MMCI_BIT(SWRST), &mci->cr); /* soft reset */
@@ -393,22 +402,23 @@ int atmel_mci_init(void *regs)
{ {
struct mmc *mmc; struct mmc *mmc;
struct mmc_config *cfg; struct mmc_config *cfg;
struct atmel_mci *mci; struct atmel_mci_priv *priv;
unsigned int version; unsigned int version;
cfg = malloc(sizeof(*cfg)); priv = calloc(1, sizeof(*priv));
if (cfg == NULL) if (!priv)
return -1; return -ENOMEM;
memset(cfg, 0, sizeof(*cfg));
mci = (struct atmel_mci *)regs; cfg = &priv->cfg;
cfg->name = "mci"; cfg->name = "mci";
cfg->ops = &atmel_mci_ops; cfg->ops = &atmel_mci_ops;
priv->mci = (struct atmel_mci *)regs;
/* need to be able to pass these in on a board by board basis */ /* need to be able to pass these in on a board by board basis */
cfg->voltages = MMC_VDD_32_33 | MMC_VDD_33_34; cfg->voltages = MMC_VDD_32_33 | MMC_VDD_33_34;
version = atmel_mci_get_version(mci); version = atmel_mci_get_version(priv->mci);
if ((version & 0xf00) >= 0x300) { if ((version & 0xf00) >= 0x300) {
cfg->host_caps = MMC_MODE_8BIT; cfg->host_caps = MMC_MODE_8BIT;
cfg->host_caps |= MMC_MODE_HS | MMC_MODE_HS_52MHz; cfg->host_caps |= MMC_MODE_HS | MMC_MODE_HS_52MHz;
@@ -425,13 +435,13 @@ int atmel_mci_init(void *regs)
cfg->b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT; cfg->b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT;
mmc = mmc_create(cfg, regs); mmc = mmc_create(cfg, priv);
if (mmc == NULL) { if (mmc == NULL) {
free(cfg); free(priv);
return -1; return -ENODEV;
} }
/* NOTE: possibly leaking the cfg structure */ /* NOTE: possibly leaking the priv structure */
return 0; return 0;
} }