mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 02:39:48 +00:00
mmc: dw_mmc: use slot-gpio to handle cd pin
Suggested by Jaehoon: Use slot-gpio to handle cd-gpio Add function dw_mci_of_get_cd_gpio to check "cd-gpios" from dts. mmc_gpio_request_cd and mmc_gpio_get_cd are used to handle cd pin Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org> Acked-by: Jaehoon Chung <jh80.chung@samsung.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Chris Ball <chris@printf.net>
This commit is contained in:
parent
01acf6917a
commit
bf626e5550
1 changed files with 35 additions and 13 deletions
|
@ -36,6 +36,7 @@
|
||||||
#include <linux/workqueue.h>
|
#include <linux/workqueue.h>
|
||||||
#include <linux/of.h>
|
#include <linux/of.h>
|
||||||
#include <linux/of_gpio.h>
|
#include <linux/of_gpio.h>
|
||||||
|
#include <linux/mmc/slot-gpio.h>
|
||||||
|
|
||||||
#include "dw_mmc.h"
|
#include "dw_mmc.h"
|
||||||
|
|
||||||
|
@ -1032,20 +1033,26 @@ static int dw_mci_get_cd(struct mmc_host *mmc)
|
||||||
int present;
|
int present;
|
||||||
struct dw_mci_slot *slot = mmc_priv(mmc);
|
struct dw_mci_slot *slot = mmc_priv(mmc);
|
||||||
struct dw_mci_board *brd = slot->host->pdata;
|
struct dw_mci_board *brd = slot->host->pdata;
|
||||||
|
int gpio_cd = !mmc_gpio_get_cd(mmc);
|
||||||
|
|
||||||
/* Use platform get_cd function, else try onboard card detect */
|
/* Use platform get_cd function, else try onboard card detect */
|
||||||
if (brd->quirks & DW_MCI_QUIRK_BROKEN_CARD_DETECTION)
|
if (brd->quirks & DW_MCI_QUIRK_BROKEN_CARD_DETECTION)
|
||||||
present = 1;
|
present = 1;
|
||||||
else if (brd->get_cd)
|
else if (brd->get_cd)
|
||||||
present = !brd->get_cd(slot->id);
|
present = !brd->get_cd(slot->id);
|
||||||
|
else if (!IS_ERR_VALUE(gpio_cd))
|
||||||
|
present = !!gpio_cd;
|
||||||
else
|
else
|
||||||
present = (mci_readl(slot->host, CDETECT) & (1 << slot->id))
|
present = (mci_readl(slot->host, CDETECT) & (1 << slot->id))
|
||||||
== 0 ? 1 : 0;
|
== 0 ? 1 : 0;
|
||||||
|
|
||||||
if (present)
|
if (present) {
|
||||||
|
set_bit(DW_MMC_CARD_PRESENT, &slot->flags);
|
||||||
dev_dbg(&mmc->class_dev, "card is present\n");
|
dev_dbg(&mmc->class_dev, "card is present\n");
|
||||||
else
|
} else {
|
||||||
|
clear_bit(DW_MMC_CARD_PRESENT, &slot->flags);
|
||||||
dev_dbg(&mmc->class_dev, "card is not present\n");
|
dev_dbg(&mmc->class_dev, "card is not present\n");
|
||||||
|
}
|
||||||
|
|
||||||
return present;
|
return present;
|
||||||
}
|
}
|
||||||
|
@ -1926,10 +1933,6 @@ static void dw_mci_work_routine_card(struct work_struct *work)
|
||||||
/* Card change detected */
|
/* Card change detected */
|
||||||
slot->last_detect_state = present;
|
slot->last_detect_state = present;
|
||||||
|
|
||||||
/* Mark card as present if applicable */
|
|
||||||
if (present != 0)
|
|
||||||
set_bit(DW_MMC_CARD_PRESENT, &slot->flags);
|
|
||||||
|
|
||||||
/* Clean up queue if present */
|
/* Clean up queue if present */
|
||||||
mrq = slot->mrq;
|
mrq = slot->mrq;
|
||||||
if (mrq) {
|
if (mrq) {
|
||||||
|
@ -1977,8 +1980,6 @@ static void dw_mci_work_routine_card(struct work_struct *work)
|
||||||
|
|
||||||
/* Power down slot */
|
/* Power down slot */
|
||||||
if (present == 0) {
|
if (present == 0) {
|
||||||
clear_bit(DW_MMC_CARD_PRESENT, &slot->flags);
|
|
||||||
|
|
||||||
/* Clear down the FIFO */
|
/* Clear down the FIFO */
|
||||||
dw_mci_fifo_reset(host);
|
dw_mci_fifo_reset(host);
|
||||||
#ifdef CONFIG_MMC_DW_IDMAC
|
#ifdef CONFIG_MMC_DW_IDMAC
|
||||||
|
@ -2079,6 +2080,26 @@ static int dw_mci_of_get_wp_gpio(struct device *dev, u8 slot)
|
||||||
|
|
||||||
return gpio;
|
return gpio;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* find the cd gpio for a given slot; or -1 if none specified */
|
||||||
|
static void dw_mci_of_get_cd_gpio(struct device *dev, u8 slot,
|
||||||
|
struct mmc_host *mmc)
|
||||||
|
{
|
||||||
|
struct device_node *np = dw_mci_of_find_slot_node(dev, slot);
|
||||||
|
int gpio;
|
||||||
|
|
||||||
|
if (!np)
|
||||||
|
return;
|
||||||
|
|
||||||
|
gpio = of_get_named_gpio(np, "cd-gpios", 0);
|
||||||
|
|
||||||
|
/* Having a missing entry is valid; return silently */
|
||||||
|
if (!gpio_is_valid(gpio))
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (mmc_gpio_request_cd(mmc, gpio, 0))
|
||||||
|
dev_warn(dev, "gpio [%d] request failed\n", gpio);
|
||||||
|
}
|
||||||
#else /* CONFIG_OF */
|
#else /* CONFIG_OF */
|
||||||
static int dw_mci_of_get_slot_quirks(struct device *dev, u8 slot)
|
static int dw_mci_of_get_slot_quirks(struct device *dev, u8 slot)
|
||||||
{
|
{
|
||||||
|
@ -2096,6 +2117,11 @@ static int dw_mci_of_get_wp_gpio(struct device *dev, u8 slot)
|
||||||
{
|
{
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
static void dw_mci_of_get_cd_gpio(struct device *dev, u8 slot,
|
||||||
|
struct mmc_host *mmc)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
#endif /* CONFIG_OF */
|
#endif /* CONFIG_OF */
|
||||||
|
|
||||||
static int dw_mci_init_slot(struct dw_mci *host, unsigned int id)
|
static int dw_mci_init_slot(struct dw_mci *host, unsigned int id)
|
||||||
|
@ -2197,12 +2223,8 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id)
|
||||||
#endif /* CONFIG_MMC_DW_IDMAC */
|
#endif /* CONFIG_MMC_DW_IDMAC */
|
||||||
}
|
}
|
||||||
|
|
||||||
if (dw_mci_get_cd(mmc))
|
|
||||||
set_bit(DW_MMC_CARD_PRESENT, &slot->flags);
|
|
||||||
else
|
|
||||||
clear_bit(DW_MMC_CARD_PRESENT, &slot->flags);
|
|
||||||
|
|
||||||
slot->wp_gpio = dw_mci_of_get_wp_gpio(host->dev, slot->id);
|
slot->wp_gpio = dw_mci_of_get_wp_gpio(host->dev, slot->id);
|
||||||
|
dw_mci_of_get_cd_gpio(host->dev, slot->id, mmc);
|
||||||
|
|
||||||
ret = mmc_add_host(mmc);
|
ret = mmc_add_host(mmc);
|
||||||
if (ret)
|
if (ret)
|
||||||
|
|
Loading…
Reference in a new issue