Re: [PATCH 04/14] MMC: OMAP: Power functions modified to MMC multislot support

[Tony Lindgren <tony@atomide.com>]

Hi,

* Carlos Aguiar <carlos.aguiar@indt.org.br> [071016 09:17]:
> From: Juha Yrjola <juha.yrjola@solidboot.com>
> 
> Modifications at power functions to MMC multislot support. This patch
> also move board-specific code out of MMC OMAP driver.

<snip>

> @@ -1090,23 +1063,30 @@ static void mmc_omap_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
>  	int i, dsor;
>  
>  	dsor = mmc_omap_calc_divisor(mmc, ios);
> -	host->bus_mode = ios->bus_mode;
> -	host->hw_bus_mode = host->bus_mode;
> +
> +	mmc_omap_select_slot(slot, 0);
> +
> +	if (ios->vdd != slot->vdd)
> +		slot->vdd = ios->vdd;
>  
>  	switch (ios->power_mode) {
>  	case MMC_POWER_OFF:
> -		mmc_omap_power(host, 0);
> +		mmc_omap_set_power(slot, 0, ios->vdd);
>  		break;
>  	case MMC_POWER_UP:
>  		/* Cannot touch dsor yet, just power up MMC */
> -		mmc_omap_power(host, 1);
> -		return;
> +		mmc_omap_set_power(slot, 1, ios->vdd);
>  	case MMC_POWER_ON:
>  		dsor |= 1 << 11;
>  		break;
>  	}
>  
> -	clk_enable(host->fclk);
> +	if (slot->bus_mode != ios->bus_mode) {
> +		if (slot->pdata->set_bus_mode != NULL)
> +			slot->pdata->set_bus_mode(mmc_dev(mmc), slot->id,
> +						  ios->bus_mode);
> +		slot->bus_mode = ios->bus_mode;
> +	}
>  
>  	/* On insanely high arm_per frequencies something sometimes
>  	 * goes somehow out of sync, and the POW bit is not being set,

The above still changes behaviour, you've left out return after
MMC_POWER_UP. That is not supposed to do anything except power
up the slot and return as mentioned in the comment.

Tony