|
@@ -39,6 +39,7 @@
|
|
|
#include <linux/regulator/consumer.h>
|
|
|
#include <linux/module.h>
|
|
|
#include <linux/fsl/mxs-dma.h>
|
|
|
+#include <linux/pinctrl/consumer.h>
|
|
|
|
|
|
#include <mach/mxs.h>
|
|
|
#include <mach/common.h>
|
|
@@ -682,6 +683,7 @@ static int mxs_mmc_probe(struct platform_device *pdev)
|
|
|
struct mmc_host *mmc;
|
|
|
struct resource *iores, *dmares, *r;
|
|
|
struct mxs_mmc_platform_data *pdata;
|
|
|
+ struct pinctrl *pinctrl;
|
|
|
int ret = 0, irq_err, irq_dma;
|
|
|
dma_cap_mask_t mask;
|
|
|
|
|
@@ -719,6 +721,12 @@ static int mxs_mmc_probe(struct platform_device *pdev)
|
|
|
host->irq = irq_err;
|
|
|
host->sdio_irq_en = 0;
|
|
|
|
|
|
+ pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
|
|
|
+ if (IS_ERR(pinctrl)) {
|
|
|
+ ret = PTR_ERR(pinctrl);
|
|
|
+ goto out_iounmap;
|
|
|
+ }
|
|
|
+
|
|
|
host->clk = clk_get(&pdev->dev, NULL);
|
|
|
if (IS_ERR(host->clk)) {
|
|
|
ret = PTR_ERR(host->clk);
|