[RFC PATCH v2 4/4] mmc: sdhci-esdhc-imx: using pinmux subsystem
Sascha Hauer
s.hauer at pengutronix.de
Wed Dec 14 16:11:52 EST 2011
On Thu, Dec 15, 2011 at 12:03:42AM +0800, Dong Aisheng wrote:
> From: Dong Aisheng <dong.aisheng at linaro.org>
>
> Signed-off-by: Shawn Guo <shawn.guo at linaro.org>
> Signed-off-by: Dong Aisheng <dong.aisheng at linaro.org>
> Cc: Linus Walleij <linus.walleij at linaro.org>
> Cc: Chris Ball <cjb at laptop.org>
> Cc: Sascha Hauer <s.hauer at pengutronix.de>
> Cc: Wolfram Sang <w.sang at pengutronix.de>
> ---
> drivers/mmc/host/sdhci-esdhc-imx.c | 20 ++++++++++++++++++++
> 1 files changed, 20 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
> index 4b976f0..4504136 100644
> --- a/drivers/mmc/host/sdhci-esdhc-imx.c
> +++ b/drivers/mmc/host/sdhci-esdhc-imx.c
> @@ -24,6 +24,7 @@
> #include <linux/of.h>
> #include <linux/of_device.h>
> #include <linux/of_gpio.h>
> +#include <linux/pinctrl/pinmux.h>
> #include <mach/esdhc.h>
> #include "sdhci-pltfm.h"
> #include "sdhci-esdhc.h"
> @@ -68,6 +69,7 @@ struct pltfm_imx_data {
> int flags;
> u32 scratchpad;
> enum imx_esdhc_type devtype;
> + struct pinmux *pmx;
> struct esdhc_platform_data boarddata;
> };
>
> @@ -439,6 +441,7 @@ static int __devinit sdhci_esdhc_imx_probe(struct platform_device *pdev)
> struct clk *clk;
> int err;
> struct pltfm_imx_data *imx_data;
> + struct pinmux *pmx;
>
> host = sdhci_pltfm_init(pdev, &sdhci_esdhc_imx_pdata);
> if (IS_ERR(host))
> @@ -466,6 +469,16 @@ static int __devinit sdhci_esdhc_imx_probe(struct platform_device *pdev)
> clk_enable(clk);
> pltfm_host->clk = clk;
>
> + pmx = pinmux_get(&pdev->dev, NULL);
> + if (IS_ERR(pmx)) {
> + err = PTR_ERR(pmx);
> + goto err_pmx_get;
> + }
> + err = pinmux_enable(pmx);
> + if (err)
> + goto err_pmx_enable;
> + imx_data->pmx = pmx;
> +
Won't this break every i.MX except i.MX6?
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
More information about the linux-arm-kernel
mailing list