mmc: sdhci: change sdhci-pltfm into a module

There are a couple of problems left from the sdhci pltfm and OF
consolidation changes.

* When building more than one sdhci-pltfm based drivers in the same
  image, linker will give multiple definition error on the sdhci-pltfm
  helper functions.  For example right now, building sdhci-of-esdhc
  and sdhci-of-hlwd together is a valid combination from Kconfig view.

* With the current build method, there is error with building the
  drivers as module, but module installation fails with modprobe.

The patch fixes above problems by changing sdhci-pltfm into a module.
To avoid EXPORT_SYMBOL on so many big endian IO accessors, it moves
these accessors into sdhci-pltfm.h as the 'static inline' functions.
As a result, sdhci.h needs to be included in sdhci-pltfm.h, and in
turn can be removed from individual drivers which already include
sdhci-pltfm.h.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>

1 files changed, 1 insertions, 6 deletions

diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile
index cbd89c310146..bf479ab5d33d 100644
--- a/drivers/mmc/host/Makefile
+++ b/drivers/mmc/host/Makefile
@@ -44,18 +44,13 @@ obj-$(CONFIG_MMC_JZ4740)	+= jz4740_mmc.o
 obj-$(CONFIG_MMC_VUB300)        += vub300.o
 obj-$(CONFIG_MMC_USHC)          += ushc.o
 
+obj-$(CONFIG_MMC_SDHCI_PLTFM)           += sdhci-pltfm.o
 obj-$(CONFIG_MMC_SDHCI_CNS3XXX)         += sdhci-cns3xxx.o
-sdhci-cns3xxx-objs                      := sdhci-pltfm.o
 obj-$(CONFIG_MMC_SDHCI_ESDHC_IMX)       += sdhci-esdhc-imx.o
-sdhci-esdhc-imx-objs                    := sdhci-pltfm.o
 obj-$(CONFIG_MMC_SDHCI_DOVE)            += sdhci-dove.o
-sdhci-dove-objs                         := sdhci-pltfm.o
 obj-$(CONFIG_MMC_SDHCI_TEGRA)           += sdhci-tegra.o
-sdhci-tegra-objs                        := sdhci-pltfm.o
 obj-$(CONFIG_MMC_SDHCI_OF_ESDHC)        += sdhci-of-esdhc.o
-sdhci-of-esdhc-objs                     := sdhci-pltfm.o
 obj-$(CONFIG_MMC_SDHCI_OF_HLWD)         += sdhci-of-hlwd.o
-sdhci-of-hlwd-objs                      := sdhci-pltfm.o
 
 ifeq ($(CONFIG_CB710_DEBUG),y)
         CFLAGS-cb710-mmc        += -DDEBUG