aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/spi
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2012-08-03 11:26:07 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-08-17 17:52:31 -0400
commit600a991f98d94c97f72870f85df687c517c3af53 (patch)
treeb807fd2032e1a8e6d150629d3eff61ad3801c560 /include/linux/spi
parent8be3d3b2ac87955455c7ce852e0d489cb04fff59 (diff)
mmc: spi: Rename IMX2[38]_MMC to IMX2[38]_SSP
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>
Diffstat (limited to 'include/linux/spi')
-rw-r--r--include/linux/spi/mxs-spi.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/spi/mxs-spi.h b/include/linux/spi/mxs-spi.h
index b7ccd577f758..c08aef57c7ce 100644
--- a/include/linux/spi/mxs-spi.h
+++ b/include/linux/spi/mxs-spi.h
@@ -24,7 +24,7 @@
24#ifndef __LINUX_SPI_MXS_SPI_H__ 24#ifndef __LINUX_SPI_MXS_SPI_H__
25#define __LINUX_SPI_MXS_SPI_H__ 25#define __LINUX_SPI_MXS_SPI_H__
26 26
27#define ssp_is_old(host) ((host)->devid == IMX23_MMC) 27#define ssp_is_old(host) ((host)->devid == IMX23_SSP)
28 28
29/* SSP registers */ 29/* SSP registers */
30#define HW_SSP_CTRL0 0x000 30#define HW_SSP_CTRL0 0x000
@@ -101,9 +101,9 @@
101 101
102#define SSP_PIO_NUM 3 102#define SSP_PIO_NUM 3
103 103
104enum mxs_mmc_id { 104enum mxs_ssp_id {
105 IMX23_MMC, 105 IMX23_SSP,
106 IMX28_MMC, 106 IMX28_SSP,
107}; 107};
108 108
109#endif /* __LINUX_SPI_MXS_SPI_H__ */ 109#endif /* __LINUX_SPI_MXS_SPI_H__ */