diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2011-03-14 09:52:33 +0100 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2011-03-25 10:39:23 -0400 |
| commit | 42051e8a7bce76ebd3cd201704ee2427120636e1 (patch) | |
| tree | f62527fca5ea9d247faffa9bda2539d996b18068 /include/linux | |
| parent | 4fbc5ece430bc2890edc90a112c742844130f943 (diff) | |
| download | linux-42051e8a7bce76ebd3cd201704ee2427120636e1.tar.gz linux-42051e8a7bce76ebd3cd201704ee2427120636e1.tar.bz2 linux-42051e8a7bce76ebd3cd201704ee2427120636e1.zip | |
mmc: tmio: convert the SDHI MMC driver from MFD to a platform driver
On sh-mobile platforms the SDHI driver was using the tmio_mmc SD/SDIO
MFD cell driver. Now that the tmio_mmc driver has been split into a
core and a separate MFD glue, we can support SDHI natively without the
need to emulate an MFD controller. This also allows to support systems
with an on-SoC SDHI controller and a separate MFD with a TMIO core.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mfd/sh_mobile_sdhi.h | 19 | ||||
| -rw-r--r-- | include/linux/mmc/sh_mobile_sdhi.h | 16 |
2 files changed, 21 insertions, 14 deletions
diff --git a/include/linux/mfd/sh_mobile_sdhi.h b/include/linux/mfd/sh_mobile_sdhi.h index c981b959760f..10af7f901ebe 100644 --- a/include/linux/mfd/sh_mobile_sdhi.h +++ b/include/linux/mfd/sh_mobile_sdhi.h @@ -1,16 +1,7 @@ -#ifndef __SH_MOBILE_SDHI_H__ -#define __SH_MOBILE_SDHI_H__ +#ifndef MFD_SH_MOBILE_SDHI_H +#define MFD_SH_MOBILE_SDHI_H -#include <linux/types.h> +/* Compatibility header - will disappear once all platforms are converted */ +#include <linux/mmc/sh_mobile_sdhi.h> -struct sh_mobile_sdhi_info { - int dma_slave_tx; - int dma_slave_rx; - unsigned long tmio_flags; - unsigned long tmio_caps; - u32 tmio_ocr_mask; /* available MMC voltages */ - void (*set_pwr)(struct platform_device *pdev, int state); - int (*get_cd)(struct platform_device *pdev); -}; - -#endif /* __SH_MOBILE_SDHI_H__ */ +#endif /* MFD_SH_MOBILE_SDHI_H */ diff --git a/include/linux/mmc/sh_mobile_sdhi.h b/include/linux/mmc/sh_mobile_sdhi.h new file mode 100644 index 000000000000..c981b959760f --- /dev/null +++ b/include/linux/mmc/sh_mobile_sdhi.h @@ -0,0 +1,16 @@ +#ifndef __SH_MOBILE_SDHI_H__ +#define __SH_MOBILE_SDHI_H__ + +#include <linux/types.h> + +struct sh_mobile_sdhi_info { + int dma_slave_tx; + int dma_slave_rx; + unsigned long tmio_flags; + unsigned long tmio_caps; + u32 tmio_ocr_mask; /* available MMC voltages */ + void (*set_pwr)(struct platform_device *pdev, int state); + int (*get_cd)(struct platform_device *pdev); +}; + +#endif /* __SH_MOBILE_SDHI_H__ */ |