diff options
| author | Jesse Gilles <jgilles@multitech.com> | 2014-01-17 13:45:19 -0600 |
|---|---|---|
| committer | Jesse Gilles <jgilles@multitech.com> | 2014-01-17 13:45:19 -0600 |
| commit | 382a32756eaace2dd933426f5411cff4e111b70a (patch) | |
| tree | 5b3da2b007e814c89a33bdeed0ce30cf5956cfa9 /multitech/recipes/linux/linux-2.6.39-at91/linux-2.6.39.4-atmel-mci-force-detect.patch | |
| parent | 1e2d685cc07a2c3c8165662e7c0ebeb19cb1c16d (diff) | |
| parent | f88e1a39ae0758897f6c9680d27920d915c36952 (diff) | |
Merge branch 'mtocgd' into mtocgd-2.3.2
Conflicts:
multitech/recipes/images/corecdp-tftpboot.inc
multitech/recipes/linux/linux_2.6.39-at91.bb
Diffstat (limited to 'multitech/recipes/linux/linux-2.6.39-at91/linux-2.6.39.4-atmel-mci-force-detect.patch')
| -rw-r--r-- | multitech/recipes/linux/linux-2.6.39-at91/linux-2.6.39.4-atmel-mci-force-detect.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/multitech/recipes/linux/linux-2.6.39-at91/linux-2.6.39.4-atmel-mci-force-detect.patch b/multitech/recipes/linux/linux-2.6.39-at91/linux-2.6.39.4-atmel-mci-force-detect.patch new file mode 100644 index 0000000..d59a7cc --- /dev/null +++ b/multitech/recipes/linux/linux-2.6.39-at91/linux-2.6.39.4-atmel-mci-force-detect.patch @@ -0,0 +1,30 @@ +Index: linux-2.6.39.4/drivers/mmc/host/atmel-mci.c +=================================================================== +--- linux-2.6.39.4.orig/drivers/mmc/host/atmel-mci.c 2012-05-10 11:44:02.069173755 -0500 ++++ linux-2.6.39.4/drivers/mmc/host/atmel-mci.c 2012-05-11 11:21:42.119198300 -0500 +@@ -1059,6 +1059,10 @@ + dev_dbg(&mmc->class_dev, "card is %spresent\n", + present ? "" : "not "); + } ++ else { ++ // jjg - assume card is present if detect pin is unset ++ present = 1; ++ } + + return present; + } +@@ -1655,8 +1659,12 @@ + } + } + +- if (!gpio_is_valid(slot->detect_pin)) +- mmc->caps |= MMC_CAP_NEEDS_POLL; ++ // jjg - if detect pin isn't set, don't poll -- just assume device ++ // is there and mark it non-removable ++ if (!gpio_is_valid(slot->detect_pin)) { ++ dev_info(&host->pdev->dev,"No detect pin, marking non-removable and assuming device is present\n"); ++ mmc->caps |= MMC_CAP_NONREMOVABLE; ++ } + + if (gpio_is_valid(slot->wp_pin)) { + if (gpio_request(slot->wp_pin, "mmc_wp")) { |