leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mmc: host: atmel-mci: Add support for non-removable slots

Browse Source 
Add support for non-removable slots which have no card detection GPIO
and which should not be polled for a card change.

Signed-off-by: Timo Kokkonen <timo.kokkonen@offcode.fi>
Acked-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Timo Kokkonen 2014-11-03 13:12:59 +02:00 committed by Ulf Hansson
parent 0654bb3cdd
commit 76d5556428
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/mmc/host/atmel-mci.c
View File

@ -560,6 +560,9 @@ atmci_of_init(struct platform_device *pdev)
pdata->slot[slot_id].detect_is_active_high = pdata->slot[slot_id].detect_is_active_high =
of_property_read_bool(cnp, "cd-inverted"); of_property_read_bool(cnp, "cd-inverted");
pdata->slot[slot_id].non_removable =
of_property_read_bool(cnp, "non-removable");
pdata->slot[slot_id].wp_pin = pdata->slot[slot_id].wp_pin =
of_get_named_gpio(cnp, "wp-gpios", 0); of_get_named_gpio(cnp, "wp-gpios", 0);
} }
@ -2206,8 +2209,12 @@ static int __init atmci_init_slot(struct atmel_mci *host,
} }
} }
if (!gpio_is_valid(slot->detect_pin)) if (!gpio_is_valid(slot->detect_pin)) {
mmc->caps |= MMC_CAP_NEEDS_POLL; if (slot_data->non_removable)
mmc->caps |= MMC_CAP_NONREMOVABLE;
else
mmc->caps |= MMC_CAP_NEEDS_POLL;
}
if (gpio_is_valid(slot->wp_pin)) { if (gpio_is_valid(slot->wp_pin)) {
if (devm_gpio_request(&host->pdev->dev, slot->wp_pin, if (devm_gpio_request(&host->pdev->dev, slot->wp_pin,

2
include/linux/atmel-mci.h
View File

@ -11,6 +11,7 @@
* @detect_pin: GPIO pin wired to the card detect switch * @detect_pin: GPIO pin wired to the card detect switch
* @wp_pin: GPIO pin wired to the write protect sensor * @wp_pin: GPIO pin wired to the write protect sensor
* @detect_is_active_high: The state of the detect pin when it is active * @detect_is_active_high: The state of the detect pin when it is active
* @non_removable: The slot is not removable, only detect once
* *
* If a given slot is not present on the board, @bus_width should be * If a given slot is not present on the board, @bus_width should be
* set to 0. The other fields are ignored in this case. * set to 0. The other fields are ignored in this case.
@ -26,6 +27,7 @@ struct mci_slot_pdata {
int detect_pin; int detect_pin;
int wp_pin; int wp_pin;
bool detect_is_active_high; bool detect_is_active_high;
bool non_removable;
}; };
/** /**