Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mmc: spi: Rename IMX2[38]_MMC to IMX2[38]_SSP

Browse source 
Since the SSP controller can act as both SPI and MMC host,
renaming the enum to properly reflect the naming seems
appropriate.

Based on previous attempt by:
Fabio Estevam <fabio.estevam@freescale.com>

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Marek Vasut <marex@denx.de>
Acked-by: Chris Ball <cjb@laptop.org>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Marek Vasut 2012-08-03 17:26:07 +02:00 committed by Mark Brown
parent 8be3d3b2ac
commit 600a991f98
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/mmc/host/mxs-mmc.c
View file

@ -78,7 +78,7 @@ struct mxs_mmc_host {
enum dma_transfer_direction slave_dirn; enum dma_transfer_direction slave_dirn;
u32 ssp_pio_words[SSP_PIO_NUM]; u32 ssp_pio_words[SSP_PIO_NUM];
enum mxs_mmc_id devid; enum mxs_ssp_id devid;
unsigned char bus_width; unsigned char bus_width;
spinlock_t lock; spinlock_t lock;
int sdio_irq_en; int sdio_irq_en;
@ -601,22 +601,22 @@ static bool mxs_mmc_dma_filter(struct dma_chan *chan, void *param)
return true; return true;
} }
static struct platform_device_id mxs_mmc_ids[] = { static struct platform_device_id mxs_ssp_ids[] = {
{ {
.name = "imx23-mmc", .name = "imx23-mmc",
.driver_data = IMX23_MMC, .driver_data = IMX23_SSP,
}, { }, {
.name = "imx28-mmc", .name = "imx28-mmc",
.driver_data = IMX28_MMC, .driver_data = IMX28_SSP,
}, { }, {
/* sentinel */ /* sentinel */
} }
}; };
MODULE_DEVICE_TABLE(platform, mxs_mmc_ids); MODULE_DEVICE_TABLE(platform, mxs_ssp_ids);
static const struct of_device_id mxs_mmc_dt_ids[] = { static const struct of_device_id mxs_mmc_dt_ids[] = {
{ .compatible = "fsl,imx23-mmc", .data = (void *) IMX23_MMC, }, { .compatible = "fsl,imx23-mmc", .data = (void *) IMX23_SSP, },
{ .compatible = "fsl,imx28-mmc", .data = (void *) IMX28_MMC, }, { .compatible = "fsl,imx28-mmc", .data = (void *) IMX28_SSP, },
{ /* sentinel */ } { /* sentinel */ }
}; };
MODULE_DEVICE_TABLE(of, mxs_mmc_dt_ids); MODULE_DEVICE_TABLE(of, mxs_mmc_dt_ids);
@ -655,7 +655,7 @@ static int mxs_mmc_probe(struct platform_device *pdev)
} }
if (np) { if (np) {
host->devid = (enum mxs_mmc_id) of_id->data; host->devid = (enum mxs_ssp_id) of_id->data;
/* /*
* TODO: This is a temporary solution and should be changed * TODO: This is a temporary solution and should be changed
* to use generic DMA binding later when the helpers get in. * to use generic DMA binding later when the helpers get in.
@ -829,7 +829,7 @@ static const struct dev_pm_ops mxs_mmc_pm_ops = {
static struct platform_driver mxs_mmc_driver = { static struct platform_driver mxs_mmc_driver = {
.probe = mxs_mmc_probe, .probe = mxs_mmc_probe,
.remove = mxs_mmc_remove, .remove = mxs_mmc_remove,
.id_table = mxs_mmc_ids, .id_table = mxs_ssp_ids,
.driver = { .driver = {
.name = DRIVER_NAME, .name = DRIVER_NAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,

8
include/linux/spi/mxs-spi.h
View file

@ -24,7 +24,7 @@
#ifndef __LINUX_SPI_MXS_SPI_H__ #ifndef __LINUX_SPI_MXS_SPI_H__
#define __LINUX_SPI_MXS_SPI_H__ #define __LINUX_SPI_MXS_SPI_H__
#define ssp_is_old(host) ((host)->devid == IMX23_MMC) #define ssp_is_old(host) ((host)->devid == IMX23_SSP)
/* SSP registers */ /* SSP registers */
#define HW_SSP_CTRL0 0x000 #define HW_SSP_CTRL0 0x000
@ -101,9 +101,9 @@
#define SSP_PIO_NUM 3 #define SSP_PIO_NUM 3
enum mxs_mmc_id { enum mxs_ssp_id {
IMX23_MMC, IMX23_SSP,
IMX28_MMC, IMX28_SSP,
}; };
#endif /* __LINUX_SPI_MXS_SPI_H__ */ #endif /* __LINUX_SPI_MXS_SPI_H__ */