Commit a2b14dc9 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Paul Mundt
Browse files

mmc: let MFD's provide supported Vdd card voltages to tmio_mmc 



Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: default avatarIan Molton <ian@mnementh.co.uk>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 8f4b3036

drivers/mmc/host/tmio_mmc.c

+4 −1
Original line number Diff line number Diff line
@@ -847,6 +847,9 @@ static int __devinit tmio_mmc_probe(struct platform_device *dev) 
	mmc->caps |= pdata->capabilities;

	mmc->f_max = pdata->hclk;

	mmc->f_min = mmc->f_max / 512;

	if (pdata->ocr_mask)

		mmc->ocr_avail = pdata->ocr_mask;

	else

		mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;



	/* Tell the MFD core we are ready to be enabled */

include/linux/mfd/tmio.h

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ struct tmio_mmc_data { 
	unsigned int			hclk;

	unsigned long			capabilities;

	unsigned long			flags;

	u32				ocr_mask;	/* available voltages */

	struct tmio_mmc_dma		*dma;

	void (*set_pwr)(struct platform_device *host, int state);

	void (*set_clk_div)(struct platform_device *host, int state);