[alsa-devel] [PATCH RESEND 0/9] Enable pinctrl support for mach-mxs
[Resend to have subsystem lists Cc-ed]
With pinctrl-mxs driver (DT only) applied on pinctrl tree, the mxs device tree conversion can start basing on that support. This series adopts pinctrl support for mxs device drivers with a dummy pinctrl state provided for non-DT boot, so that the pinctrl call in the device drivers will be bypassed for non-DT probe while it starts working for DT probe.
To ease the merge process, I would like to ask Arnd and Olof to pull pinctrl tree as a dependency in arm-soc and have this series go through arm-soc.
Regards, Shawn
Shawn Guo (9): ARM: mxs: enable pinctrl dummy states serial: amba-pl011: adopt pinctrl support serial: mxs-auart: adopt pinctrl support mmc: mxs-mmc: adopt pinctrl support mtd: nand: gpmi: adopt pinctrl support i2c: mxs: adopt pinctrl support ASoC: mxs-saif: adopt pinctrl support video: mxsfb: adopt pinctrl support ARM: mxs: enable pinctrl support
arch/arm/Kconfig | 1 + arch/arm/mach-mxs/Kconfig | 2 ++ arch/arm/mach-mxs/include/mach/common.h | 2 ++ arch/arm/mach-mxs/mach-apx4devkit.c | 2 ++ arch/arm/mach-mxs/mach-m28evk.c | 2 ++ arch/arm/mach-mxs/mach-mx23evk.c | 2 ++ arch/arm/mach-mxs/mach-mx28evk.c | 2 ++ arch/arm/mach-mxs/mach-stmp378x_devb.c | 2 ++ arch/arm/mach-mxs/mach-tx28.c | 2 ++ arch/arm/mach-mxs/mm.c | 11 +++++++++++ drivers/i2c/busses/i2c-mxs.c | 6 ++++++ drivers/mmc/host/mxs-mmc.c | 8 ++++++++ drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 9 +++++++++ drivers/tty/serial/amba-pl011.c | 8 ++++++++ drivers/tty/serial/mxs-auart.c | 8 ++++++++ drivers/video/mxsfb.c | 9 +++++++++ sound/soc/mxs/mxs-saif.c | 8 ++++++++ 17 files changed, 84 insertions(+), 0 deletions(-)
Cc: alsa-devel@alsa-project.org Cc: Mark Brown broonie@opensource.wolfsonmicro.com Signed-off-by: Shawn Guo shawn.guo@linaro.org --- sound/soc/mxs/mxs-saif.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c index 53f4fd8..7fd224b 100644 --- a/sound/soc/mxs/mxs-saif.c +++ b/sound/soc/mxs/mxs-saif.c @@ -25,6 +25,7 @@ #include <linux/delay.h> #include <linux/time.h> #include <linux/fsl/mxs-dma.h> +#include <linux/pinctrl/consumer.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h> @@ -625,6 +626,7 @@ static int mxs_saif_probe(struct platform_device *pdev) struct resource *iores, *dmares; struct mxs_saif *saif; struct mxs_saif_platform_data *pdata; + struct pinctrl *pinctrl; int ret = 0;
if (pdev->id >= ARRAY_SIZE(mxs_saif)) @@ -650,6 +652,12 @@ static int mxs_saif_probe(struct platform_device *pdev) saif->master_id = saif->id; }
+ pinctrl = devm_pinctrl_get_select_default(&pdev->dev); + if (IS_ERR(pinctrl)) { + ret = PTR_ERR(pinctrl); + return ret; + } + saif->clk = clk_get(&pdev->dev, NULL); if (IS_ERR(saif->clk)) { ret = PTR_ERR(saif->clk);
On Mon, May 07, 2012 at 09:16:12AM +0800, Shawn Guo wrote:
Cc: alsa-devel@alsa-project.org Cc: Mark Brown broonie@opensource.wolfsonmicro.com Signed-off-by: Shawn Guo shawn.guo@linaro.org
Acked-by: Mark Brown broonie@opensource.wolfsonmicro.com
On Mon, May 07, 2012 at 09:16:05AM +0800, Shawn Guo wrote:
[Resend to have subsystem lists Cc-ed]
With pinctrl-mxs driver (DT only) applied on pinctrl tree, the mxs device tree conversion can start basing on that support. This series adopts pinctrl support for mxs device drivers with a dummy pinctrl state provided for non-DT boot, so that the pinctrl call in the device drivers will be bypassed for non-DT probe while it starts working for DT probe.
To ease the merge process, I would like to ask Arnd and Olof to pull pinctrl tree as a dependency in arm-soc and have this series go through arm-soc.
As IMX, basically i'd prefer to add pinctrl states in dts file at the same time within the patch or using a separate patch to add them before this series to avoid breaking the exist platforms.
However i noted that for mxs, most drivers here are still not dt capable, so it may be ok to not add their pinctrl state at this time.
But for the patch "serial: amba-pl011: adopt pinctrl support" since it is dt capable, so with this patch applied, the mx28 dt boot will fail. Maybe we should at least add pinctrl states for amba-pl011 first.
Regards, Shawn
Shawn Guo (9): ARM: mxs: enable pinctrl dummy states serial: amba-pl011: adopt pinctrl support
BTW, will this one break other platforms using this driver?
serial: mxs-auart: adopt pinctrl support mmc: mxs-mmc: adopt pinctrl support mtd: nand: gpmi: adopt pinctrl support i2c: mxs: adopt pinctrl support ASoC: mxs-saif: adopt pinctrl support video: mxsfb: adopt pinctrl support ARM: mxs: enable pinctrl support
arch/arm/Kconfig | 1 + arch/arm/mach-mxs/Kconfig | 2 ++ arch/arm/mach-mxs/include/mach/common.h | 2 ++ arch/arm/mach-mxs/mach-apx4devkit.c | 2 ++ arch/arm/mach-mxs/mach-m28evk.c | 2 ++ arch/arm/mach-mxs/mach-mx23evk.c | 2 ++ arch/arm/mach-mxs/mach-mx28evk.c | 2 ++ arch/arm/mach-mxs/mach-stmp378x_devb.c | 2 ++ arch/arm/mach-mxs/mach-tx28.c | 2 ++ arch/arm/mach-mxs/mm.c | 11 +++++++++++ drivers/i2c/busses/i2c-mxs.c | 6 ++++++ drivers/mmc/host/mxs-mmc.c | 8 ++++++++ drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 9 +++++++++ drivers/tty/serial/amba-pl011.c | 8 ++++++++ drivers/tty/serial/mxs-auart.c | 8 ++++++++ drivers/video/mxsfb.c | 9 +++++++++ sound/soc/mxs/mxs-saif.c | 8 ++++++++ 17 files changed, 84 insertions(+), 0 deletions(-)
-- 1.7.5.4
Regards Dong Aisheng
On Mon, May 07, 2012 at 03:14:00PM +0800, Dong Aisheng wrote:
As IMX, basically i'd prefer to add pinctrl states in dts file at the same time within the patch or using a separate patch to add them before this series to avoid breaking the exist platforms.
However i noted that for mxs, most drivers here are still not dt capable, so it may be ok to not add their pinctrl state at this time.
There no mxs driver on mainline that has been DT aware of. What I'm going to do is to ask Arnd abandon the mxs/dt branch I sent him before and send him an updated one with the whole mxs DT support based on mxs common clk and pinctrl series.
But for the patch "serial: amba-pl011: adopt pinctrl support" since it is dt capable, so with this patch applied, the mx28 dt boot will fail. Maybe we should at least add pinctrl states for amba-pl011 first.
The updated mxs/dt will have pinctrl defined in dts for each device that is converted to DT.
Shawn Guo (9): ARM: mxs: enable pinctrl dummy states serial: amba-pl011: adopt pinctrl support
BTW, will this one break other platforms using this driver?
If the platforms do not turn on CONFIG_PINCTRL, they are fine. If they turn on the support, they should provide pinctrl state either dummy or real one.
On Mon, May 07, 2012 at 03:47:00PM +0800, Shawn Guo wrote:
On Mon, May 07, 2012 at 03:14:00PM +0800, Dong Aisheng wrote:
As IMX, basically i'd prefer to add pinctrl states in dts file at the same time within the patch or using a separate patch to add them before this series to avoid breaking the exist platforms.
However i noted that for mxs, most drivers here are still not dt capable, so it may be ok to not add their pinctrl state at this time.
There no mxs driver on mainline that has been DT aware of. What I'm going to do is to ask Arnd abandon the mxs/dt branch I sent him before and send him an updated one with the whole mxs DT support based on mxs common clk and pinctrl series.
But for the patch "serial: amba-pl011: adopt pinctrl support" since it is dt capable, so with this patch applied, the mx28 dt boot will fail. Maybe we should at least add pinctrl states for amba-pl011 first.
The updated mxs/dt will have pinctrl defined in dts for each device that is converted to DT.
Well, i did not see amba-pl011 pinctrl states defined in this patch. But it would be ok if you can get it done and applied before this patch.
Shawn Guo (9): ARM: mxs: enable pinctrl dummy states serial: amba-pl011: adopt pinctrl support
BTW, will this one break other platforms using this driver?
If the platforms do not turn on CONFIG_PINCTRL, they are fine. If they turn on the support, they should provide pinctrl state either dummy or real one.
Regards Dong Aisheng
participants (3)
-
Dong Aisheng -
Mark Brown -
Shawn Guo