diff options
| -rw-r--r-- | drivers/mmc/host/mmci.c | 17 | ||||
| -rw-r--r-- | drivers/mmc/host/mmci.h | 4 |
2 files changed, 0 insertions, 21 deletions
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index c3785edc0e92..5dffbbd57663 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c | |||
| @@ -1510,23 +1510,6 @@ static int mmci_probe(struct amba_device *dev, | |||
| 1510 | mmc->f_max = min(host->mclk, fmax); | 1510 | mmc->f_max = min(host->mclk, fmax); |
| 1511 | dev_dbg(mmc_dev(mmc), "clocking block at %u Hz\n", mmc->f_max); | 1511 | dev_dbg(mmc_dev(mmc), "clocking block at %u Hz\n", mmc->f_max); |
| 1512 | 1512 | ||
| 1513 | host->pinctrl = devm_pinctrl_get(&dev->dev); | ||
| 1514 | if (IS_ERR(host->pinctrl)) { | ||
| 1515 | ret = PTR_ERR(host->pinctrl); | ||
| 1516 | goto clk_disable; | ||
| 1517 | } | ||
| 1518 | |||
| 1519 | host->pins_default = pinctrl_lookup_state(host->pinctrl, | ||
| 1520 | PINCTRL_STATE_DEFAULT); | ||
| 1521 | |||
| 1522 | /* enable pins to be muxed in and configured */ | ||
| 1523 | if (!IS_ERR(host->pins_default)) { | ||
| 1524 | ret = pinctrl_select_state(host->pinctrl, host->pins_default); | ||
| 1525 | if (ret) | ||
| 1526 | dev_warn(&dev->dev, "could not set default pins\n"); | ||
| 1527 | } else | ||
| 1528 | dev_warn(&dev->dev, "could not get default pinstate\n"); | ||
| 1529 | |||
| 1530 | /* Get regulators and the supported OCR mask */ | 1513 | /* Get regulators and the supported OCR mask */ |
| 1531 | mmc_regulator_get_supply(mmc); | 1514 | mmc_regulator_get_supply(mmc); |
| 1532 | if (!mmc->ocr_avail) | 1515 | if (!mmc->ocr_avail) |
diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h index 69080fab6375..168bc72f7a94 100644 --- a/drivers/mmc/host/mmci.h +++ b/drivers/mmc/host/mmci.h | |||
| @@ -200,10 +200,6 @@ struct mmci_host { | |||
| 200 | struct sg_mapping_iter sg_miter; | 200 | struct sg_mapping_iter sg_miter; |
| 201 | unsigned int size; | 201 | unsigned int size; |
| 202 | 202 | ||
| 203 | /* pinctrl handles */ | ||
| 204 | struct pinctrl *pinctrl; | ||
| 205 | struct pinctrl_state *pins_default; | ||
| 206 | |||
| 207 | #ifdef CONFIG_DMA_ENGINE | 203 | #ifdef CONFIG_DMA_ENGINE |
| 208 | /* DMA stuff */ | 204 | /* DMA stuff */ |
| 209 | struct dma_chan *dma_current; | 205 | struct dma_chan *dma_current; |
