diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-06 16:34:43 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-06 16:34:43 -0400 |
commit | 44598f98b98e54beca34dc836b38eaea40be1abf (patch) | |
tree | 42a498e0267b23289ffe240907fd9bacb9156a2c /drivers/mmc | |
parent | b4b50fd78b1e31989940dfc647e64453d0f7176a (diff) | |
parent | 4e5f67fa538ded704c904157e3ca23ceef9c7e64 (diff) |
Merge tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC board updates from Olof Johansson:
"Board updates for 3.12. Again, a bit of domain overlap with SoC and
DT branches, but most of this is around legacy code and board support.
We've found that platform maintainers have a hard time separating all
of these out and might move towards fewer branches for next release.
- Removal of a number of Marvell Kirkwood board files, since contents
is now common and mostly configured via DT.
- Device-tree updates for Marvell Dove, including irqchip and
clocksource setup.
- Defconfig updates. Gotta go somewhere. One new one for Renesas
Lager.
- New backlight drivers for backlights used on Renesas shmobile
platforms.
- Removal of Renesas leds driver.
- Shuffling of some of the new Broadcom platforms to give room for
others in the same mach directory. More in 3.13"
* tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (67 commits)
mmc: sdhci-bcm-kona: Staticize sdhci_bcm_kona_card_event
mmc: sdhci-bcm-kona: Remove unneeded version.h inclusion
ARM: bcm: Make secure API call optional
ARM: DT: binding fixup to align with vendor-prefixes.txt (drivers)
ARM: mmc: fix NONREMOVABLE test in sdhci-bcm-kona
ARM: bcm: Rename board_bcm
mmc: sdhci-bcm-kona: make linker-section warning go away
ARM: tegra: defconfig updates
ARM: dove: add initial DT file for Globalscale D2Plug
ARM: dove: add GPIO IR receiver node to SolidRun CuBox
ARM: dove: add common pinmux functions to DT
ARM: dove: add cpu device tree node
ARM: dove: update dove_defconfig with SI5351, PCI, and xHCI
arch/arm/mach-kirkwood: Avoid using ARRAY_AND_SIZE(e) as a function argument
ARM: kirkwood: fix DT building and update defconfig
ARM: kirkwood: Remove all remaining trace of DNS-320/325 platform code
ARM: configs: disable DEBUG_LL in bcm_defconfig
ARM: bcm281xx: Board specific reboot code
ARM bcm281xx: Turn on socket & network support.
ARM: bcm281xx: Turn on L2 cache.
...
Diffstat (limited to 'drivers/mmc')
-rw-r--r-- | drivers/mmc/host/sdhci-bcm-kona.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/mmc/host/sdhci-bcm-kona.c b/drivers/mmc/host/sdhci-bcm-kona.c index 87175f9817c2..85472d3fd37f 100644 --- a/drivers/mmc/host/sdhci-bcm-kona.c +++ b/drivers/mmc/host/sdhci-bcm-kona.c | |||
@@ -24,7 +24,6 @@ | |||
24 | #include <linux/of.h> | 24 | #include <linux/of.h> |
25 | #include <linux/of_device.h> | 25 | #include <linux/of_device.h> |
26 | #include <linux/of_gpio.h> | 26 | #include <linux/of_gpio.h> |
27 | #include <linux/version.h> | ||
28 | #include <linux/mmc/slot-gpio.h> | 27 | #include <linux/mmc/slot-gpio.h> |
29 | 28 | ||
30 | #include "sdhci-pltfm.h" | 29 | #include "sdhci-pltfm.h" |
@@ -162,7 +161,7 @@ static int sdhci_bcm_kona_sd_card_emulate(struct sdhci_host *host, int insert) | |||
162 | /* | 161 | /* |
163 | * SD card interrupt event callback | 162 | * SD card interrupt event callback |
164 | */ | 163 | */ |
165 | void sdhci_bcm_kona_card_event(struct sdhci_host *host) | 164 | static void sdhci_bcm_kona_card_event(struct sdhci_host *host) |
166 | { | 165 | { |
167 | if (mmc_gpio_get_cd(host->mmc) > 0) { | 166 | if (mmc_gpio_get_cd(host->mmc) > 0) { |
168 | dev_dbg(mmc_dev(host->mmc), | 167 | dev_dbg(mmc_dev(host->mmc), |
@@ -221,13 +220,14 @@ static struct sdhci_pltfm_data sdhci_pltfm_data_kona = { | |||
221 | SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN, | 220 | SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN, |
222 | }; | 221 | }; |
223 | 222 | ||
224 | static const struct of_device_id sdhci_bcm_kona_of_match[] __initdata = { | 223 | static struct __initconst of_device_id sdhci_bcm_kona_of_match[] = { |
225 | { .compatible = "bcm,kona-sdhci"}, | 224 | { .compatible = "brcm,kona-sdhci"}, |
225 | { .compatible = "bcm,kona-sdhci"}, /* deprecated name */ | ||
226 | {} | 226 | {} |
227 | }; | 227 | }; |
228 | MODULE_DEVICE_TABLE(of, sdhci_bcm_kona_of_match); | 228 | MODULE_DEVICE_TABLE(of, sdhci_bcm_kona_of_match); |
229 | 229 | ||
230 | static int __init sdhci_bcm_kona_probe(struct platform_device *pdev) | 230 | static int sdhci_bcm_kona_probe(struct platform_device *pdev) |
231 | { | 231 | { |
232 | struct sdhci_bcm_kona_dev *kona_dev = NULL; | 232 | struct sdhci_bcm_kona_dev *kona_dev = NULL; |
233 | struct sdhci_pltfm_host *pltfm_priv; | 233 | struct sdhci_pltfm_host *pltfm_priv; |
@@ -263,7 +263,7 @@ static int __init sdhci_bcm_kona_probe(struct platform_device *pdev) | |||
263 | (mmc_gpio_get_cd(host->mmc) != -ENOSYS) ? 'Y' : 'N', | 263 | (mmc_gpio_get_cd(host->mmc) != -ENOSYS) ? 'Y' : 'N', |
264 | (mmc_gpio_get_ro(host->mmc) != -ENOSYS) ? 'Y' : 'N'); | 264 | (mmc_gpio_get_ro(host->mmc) != -ENOSYS) ? 'Y' : 'N'); |
265 | 265 | ||
266 | if (host->mmc->caps | MMC_CAP_NONREMOVABLE) | 266 | if (host->mmc->caps & MMC_CAP_NONREMOVABLE) |
267 | host->quirks |= SDHCI_QUIRK_BROKEN_CARD_DETECTION; | 267 | host->quirks |= SDHCI_QUIRK_BROKEN_CARD_DETECTION; |
268 | 268 | ||
269 | dev_dbg(dev, "is_8bit=%c\n", | 269 | dev_dbg(dev, "is_8bit=%c\n", |
@@ -282,7 +282,7 @@ static int __init sdhci_bcm_kona_probe(struct platform_device *pdev) | |||
282 | } | 282 | } |
283 | 283 | ||
284 | /* if device is eMMC, emulate card insert right here */ | 284 | /* if device is eMMC, emulate card insert right here */ |
285 | if (host->mmc->caps | MMC_CAP_NONREMOVABLE) { | 285 | if (host->mmc->caps & MMC_CAP_NONREMOVABLE) { |
286 | ret = sdhci_bcm_kona_sd_card_emulate(host, 1); | 286 | ret = sdhci_bcm_kona_sd_card_emulate(host, 1); |
287 | if (ret) { | 287 | if (ret) { |
288 | dev_err(dev, | 288 | dev_err(dev, |
@@ -336,10 +336,10 @@ static struct platform_driver sdhci_bcm_kona_driver = { | |||
336 | .name = "sdhci-kona", | 336 | .name = "sdhci-kona", |
337 | .owner = THIS_MODULE, | 337 | .owner = THIS_MODULE, |
338 | .pm = SDHCI_PLTFM_PMOPS, | 338 | .pm = SDHCI_PLTFM_PMOPS, |
339 | .of_match_table = of_match_ptr(sdhci_bcm_kona_of_match), | 339 | .of_match_table = sdhci_bcm_kona_of_match, |
340 | }, | 340 | }, |
341 | .probe = sdhci_bcm_kona_probe, | 341 | .probe = sdhci_bcm_kona_probe, |
342 | .remove = __exit_p(sdhci_bcm_kona_remove), | 342 | .remove = sdhci_bcm_kona_remove, |
343 | }; | 343 | }; |
344 | module_platform_driver(sdhci_bcm_kona_driver); | 344 | module_platform_driver(sdhci_bcm_kona_driver); |
345 | 345 | ||