Commit d6ed91af authored by Fabio Estevam's avatar Fabio Estevam Committed by Chris Ball
Browse files

mmc: mxs-mmc: Remove platform data 



All MXS users have been converted to device tree and the board files have
been removed.

No need to keep platform data in the driver.

Also move bus_width declaration in the beggining of mxs_mmc_probe() to
avoid: 'warning: ISO C90 forbids mixed declarations and code'.

Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Acked-by: default avatarShawn Guo <shawn.guo@linaro.org>
Acked-by: default avatarMarek Vasut <marex@denx.de>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 968a64ea

drivers/mmc/host/mxs-mmc.c

+10 −21
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ 
#include <linux/module.h>

#include <linux/pinctrl/consumer.h>

#include <linux/stmp_device.h>

#include <linux/mmc/mxs-mmc.h>

#include <linux/spi/mxs-spi.h>



#define DRIVER_NAME	"mxs-mmc"
@@ -593,13 +592,13 @@ static int mxs_mmc_probe(struct platform_device *pdev) 
	struct mxs_mmc_host *host;

	struct mmc_host *mmc;

	struct resource *iores, *dmares;

	struct mxs_mmc_platform_data *pdata;

	struct pinctrl *pinctrl;

	int ret = 0, irq_err, irq_dma;

	dma_cap_mask_t mask;

	struct regulator *reg_vmmc;

	enum of_gpio_flags flags;

	struct mxs_ssp *ssp;

	u32 bus_width = 0;



	iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	dmares = platform_get_resource(pdev, IORESOURCE_DMA, 0);
@@ -682,25 +681,15 @@ static int mxs_mmc_probe(struct platform_device *pdev) 
	mmc->caps = MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED |

		    MMC_CAP_SDIO_IRQ | MMC_CAP_NEEDS_POLL;



	pdata =	mmc_dev(host->mmc)->platform_data;

	if (!pdata) {

		u32 bus_width = 0;

	of_property_read_u32(np, "bus-width", &bus_width);

	if (bus_width == 4)

		mmc->caps |= MMC_CAP_4_BIT_DATA;

	else if (bus_width == 8)

		mmc->caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA;

		host->wp_gpio = of_get_named_gpio_flags(np, "wp-gpios", 0,

							&flags);

	host->wp_gpio = of_get_named_gpio_flags(np, "wp-gpios", 0, &flags);



	if (flags & OF_GPIO_ACTIVE_LOW)

		host->wp_inverted = 1;

	} else {

		if (pdata->flags & SLOTF_8_BIT_CAPABLE)

			mmc->caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA;

		if (pdata->flags & SLOTF_4_BIT_CAPABLE)

			mmc->caps |= MMC_CAP_4_BIT_DATA;

		host->wp_gpio = pdata->wp_gpio;

	}



	mmc->f_min = 400000;

	mmc->f_max = 288000000;

include/linux/mmc/mxs-mmc.h

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
/*

 * Copyright 2011 Freescale Semiconductor, Inc. All Rights Reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#ifndef __LINUX_MMC_MXS_MMC_H__

#define __LINUX_MMC_MXS_MMC_H__



struct mxs_mmc_platform_data {

	int wp_gpio;	/* write protect pin */

	unsigned int flags;

#define SLOTF_4_BIT_CAPABLE	(1 << 0)

#define SLOTF_8_BIT_CAPABLE	(1 << 1)

};



#endif /* __LINUX_MMC_MXS_MMC_H__ */