diff options
Diffstat (limited to 'drivers/mmc')
-rw-r--r-- | drivers/mmc/host/Kconfig | 4 | ||||
-rw-r--r-- | drivers/mmc/host/sdhci-of-core.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index d618e8673996..e960a9300eb2 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig | |||
@@ -83,7 +83,7 @@ config MMC_RICOH_MMC | |||
83 | 83 | ||
84 | config MMC_SDHCI_OF | 84 | config MMC_SDHCI_OF |
85 | tristate "SDHCI support on OpenFirmware platforms" | 85 | tristate "SDHCI support on OpenFirmware platforms" |
86 | depends on MMC_SDHCI && PPC_OF | 86 | depends on MMC_SDHCI && OF |
87 | help | 87 | help |
88 | This selects the OF support for Secure Digital Host Controller | 88 | This selects the OF support for Secure Digital Host Controller |
89 | Interfaces. | 89 | Interfaces. |
@@ -93,6 +93,7 @@ config MMC_SDHCI_OF | |||
93 | config MMC_SDHCI_OF_ESDHC | 93 | config MMC_SDHCI_OF_ESDHC |
94 | bool "SDHCI OF support for the Freescale eSDHC controller" | 94 | bool "SDHCI OF support for the Freescale eSDHC controller" |
95 | depends on MMC_SDHCI_OF | 95 | depends on MMC_SDHCI_OF |
96 | depends on PPC_OF | ||
96 | select MMC_SDHCI_BIG_ENDIAN_32BIT_BYTE_SWAPPER | 97 | select MMC_SDHCI_BIG_ENDIAN_32BIT_BYTE_SWAPPER |
97 | help | 98 | help |
98 | This selects the Freescale eSDHC controller support. | 99 | This selects the Freescale eSDHC controller support. |
@@ -102,6 +103,7 @@ config MMC_SDHCI_OF_ESDHC | |||
102 | config MMC_SDHCI_OF_HLWD | 103 | config MMC_SDHCI_OF_HLWD |
103 | bool "SDHCI OF support for the Nintendo Wii SDHCI controllers" | 104 | bool "SDHCI OF support for the Nintendo Wii SDHCI controllers" |
104 | depends on MMC_SDHCI_OF | 105 | depends on MMC_SDHCI_OF |
106 | depends on PPC_OF | ||
105 | select MMC_SDHCI_BIG_ENDIAN_32BIT_BYTE_SWAPPER | 107 | select MMC_SDHCI_BIG_ENDIAN_32BIT_BYTE_SWAPPER |
106 | help | 108 | help |
107 | This selects the Secure Digital Host Controller Interface (SDHCI) | 109 | This selects the Secure Digital Host Controller Interface (SDHCI) |
diff --git a/drivers/mmc/host/sdhci-of-core.c b/drivers/mmc/host/sdhci-of-core.c index c51b71174c1d..fa19d849a920 100644 --- a/drivers/mmc/host/sdhci-of-core.c +++ b/drivers/mmc/host/sdhci-of-core.c | |||
@@ -122,7 +122,7 @@ static int __devinit sdhci_of_probe(struct platform_device *ofdev, | |||
122 | struct sdhci_of_data *sdhci_of_data = match->data; | 122 | struct sdhci_of_data *sdhci_of_data = match->data; |
123 | struct sdhci_host *host; | 123 | struct sdhci_host *host; |
124 | struct sdhci_of_host *of_host; | 124 | struct sdhci_of_host *of_host; |
125 | const u32 *clk; | 125 | const __be32 *clk; |
126 | int size; | 126 | int size; |
127 | int ret; | 127 | int ret; |
128 | 128 | ||
@@ -166,7 +166,7 @@ static int __devinit sdhci_of_probe(struct platform_device *ofdev, | |||
166 | 166 | ||
167 | clk = of_get_property(np, "clock-frequency", &size); | 167 | clk = of_get_property(np, "clock-frequency", &size); |
168 | if (clk && size == sizeof(*clk) && *clk) | 168 | if (clk && size == sizeof(*clk) && *clk) |
169 | of_host->clock = *clk; | 169 | of_host->clock = be32_to_cpup(clk); |
170 | 170 | ||
171 | ret = sdhci_add_host(host); | 171 | ret = sdhci_add_host(host); |
172 | if (ret) | 172 | if (ret) |