diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-04-25 07:57:07 -0400 |
---|---|---|
committer | Chris Ball <chris@printf.net> | 2014-05-22 07:26:27 -0400 |
commit | 2317f56c055fcad524bf6a873df48a754e7ebc4d (patch) | |
tree | 7b98b1deb93326d1dd2a5410d35a054d497a4ec3 /drivers/mmc/host/sdhci-pxav2.c | |
parent | 5b4f1f6c496aa3a90b617d1319274bf2017e639d (diff) |
mmc: sdhci: convert generic bus width setup to library function
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Tested-by: Markus Pargmann <mpa@pengutronix.de>
Tested-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Chris Ball <chris@printf.net>
Diffstat (limited to 'drivers/mmc/host/sdhci-pxav2.c')
-rw-r--r-- | drivers/mmc/host/sdhci-pxav2.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/mmc/host/sdhci-pxav2.c b/drivers/mmc/host/sdhci-pxav2.c index d51e061ec576..d24c282e5eb8 100644 --- a/drivers/mmc/host/sdhci-pxav2.c +++ b/drivers/mmc/host/sdhci-pxav2.c | |||
@@ -88,7 +88,7 @@ static void pxav2_set_private_registers(struct sdhci_host *host, u8 mask) | |||
88 | } | 88 | } |
89 | } | 89 | } |
90 | 90 | ||
91 | static int pxav2_mmc_set_width(struct sdhci_host *host, int width) | 91 | static void pxav2_mmc_set_bus_width(struct sdhci_host *host, int width) |
92 | { | 92 | { |
93 | u8 ctrl; | 93 | u8 ctrl; |
94 | u16 tmp; | 94 | u16 tmp; |
@@ -107,14 +107,12 @@ static int pxav2_mmc_set_width(struct sdhci_host *host, int width) | |||
107 | } | 107 | } |
108 | writew(tmp, host->ioaddr + SD_CE_ATA_2); | 108 | writew(tmp, host->ioaddr + SD_CE_ATA_2); |
109 | writeb(ctrl, host->ioaddr + SDHCI_HOST_CONTROL); | 109 | writeb(ctrl, host->ioaddr + SDHCI_HOST_CONTROL); |
110 | |||
111 | return 0; | ||
112 | } | 110 | } |
113 | 111 | ||
114 | static const struct sdhci_ops pxav2_sdhci_ops = { | 112 | static const struct sdhci_ops pxav2_sdhci_ops = { |
115 | .get_max_clock = sdhci_pltfm_clk_get_max_clock, | 113 | .get_max_clock = sdhci_pltfm_clk_get_max_clock, |
116 | .platform_reset_exit = pxav2_set_private_registers, | 114 | .platform_reset_exit = pxav2_set_private_registers, |
117 | .platform_bus_width = pxav2_mmc_set_width, | 115 | .set_bus_width = pxav2_mmc_set_bus_width, |
118 | }; | 116 | }; |
119 | 117 | ||
120 | #ifdef CONFIG_OF | 118 | #ifdef CONFIG_OF |