mmc: spi: Rename IMX2[38]_MMC to IMX2[38]_SSP (600a991f) · Commits · 戴 / test

drivers/mmc/host/mxs-mmc.c

+9 −9

Original line number	Diff line number	Diff line
		@@ -78,7 +78,7 @@ struct mxs_mmc_host {
		enum dma_transfer_direction slave_dirn;
		u32 ssp_pio_words[SSP_PIO_NUM];

		enum mxs_mmc_id devid;
		enum mxs_ssp_id devid;
		unsigned char bus_width;
		spinlock_t lock;
		int sdio_irq_en;
		@@ -601,22 +601,22 @@ static bool mxs_mmc_dma_filter(struct dma_chan chan, void param)
		return true;
		}

		static struct platform_device_id mxs_mmc_ids[] = {
		static struct platform_device_id mxs_ssp_ids[] = {
		{
		.name = "imx23-mmc",
		.driver_data = IMX23_MMC,
		.driver_data = IMX23_SSP,
		}, {
		.name = "imx28-mmc",
		.driver_data = IMX28_MMC,
		.driver_data = IMX28_SSP,
		}, {
		/* 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[] = {
		{ .compatible = "fsl,imx23-mmc", .data = (void *) IMX23_MMC, },
		{ .compatible = "fsl,imx28-mmc", .data = (void *) IMX28_MMC, },
		{ .compatible = "fsl,imx23-mmc", .data = (void *) IMX23_SSP, },
		{ .compatible = "fsl,imx28-mmc", .data = (void *) IMX28_SSP, },
		{ /* sentinel */ }
		};
		MODULE_DEVICE_TABLE(of, mxs_mmc_dt_ids);
		@@ -655,7 +655,7 @@ static int mxs_mmc_probe(struct platform_device *pdev)
		}

		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
		* 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 = {
		.probe = mxs_mmc_probe,
		.remove = mxs_mmc_remove,
		.id_table = mxs_mmc_ids,
		.id_table = mxs_ssp_ids,
		.driver = {
		.name = DRIVER_NAME,
		.owner = THIS_MODULE,

include/linux/spi/mxs-spi.h

+4 −4

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@
		#ifndef __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 */
		#define HW_SSP_CTRL0 0x000
		@@ -101,9 +101,9 @@

		#define SSP_PIO_NUM 3

		enum mxs_mmc_id {
		IMX23_MMC,
		IMX28_MMC,
		enum mxs_ssp_id {
		IMX23_SSP,
		IMX28_SSP,
		};

		#endif /* __LINUX_SPI_MXS_SPI_H__ */

Admin message