Re: [PATCH V2 03/11] ASoC: imx-audmux: add pinctrl support
On Friday 11 May 2012, Linus Walleij wrote: > On Fri, May 11, 2012 at 7:32 AM, Shawn Guo wrote: > > > pinctrl-mergebase-20120418 is not enough for me. I need mxs and dummy > > states support. So if your devel branch will never be rebased, we can > > simply ask Arnd and Olof to get that as the dependent branch? > > Hm, yes the devel branch is getting real stable now, so I will only add things > on top. > > Basically the for-next branch is supposed to be even more stable, > but right now it's a copy of devel. > > ARM SoC guys: how do you want the pinctrl deps? I can make > a tag today if that is preferred. No need for a signed tag, since we're not going to submit you changes upstream. Knowing that we can pull in the for-next branch is good enough, so we'll do that for anything that needs it. > Also: short-cut to another subject: how have you other guys managed > this? By e.g.: > > git fetch > > git checkout -b my-pinwork v3.4-rc4 > git merge pinctrl-tag > (develop develop) > > Or: > > git checkout -b my-pinwork pinctrl-tag > > ? > > I was a bit uncertain on how to do this for the pending Ux500 > stuff so better ask. I merged it for now but maybe it's better if > I just base the whole pullrequest on top of a stable pinctrl > branch? No strong preference on my side. I've seen both ways getting done. In arm-soc we try to do a 'git pull --log --no-ff' for all changes that are being pulled into one of the main next/* branches, just like torvalds does when he pulls in branches from maintainers. Arnd -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH V2 03/11] ASoC: imx-audmux: add pinctrl support
On Fri, May 11, 2012 at 7:32 AM, Shawn Guo wrote: > pinctrl-mergebase-20120418 is not enough for me. I need mxs and dummy > states support. So if your devel branch will never be rebased, we can > simply ask Arnd and Olof to get that as the dependent branch? Hm, yes the devel branch is getting real stable now, so I will only add things on top. Basically the for-next branch is supposed to be even more stable, but right now it's a copy of devel. ARM SoC guys: how do you want the pinctrl deps? I can make a tag today if that is preferred. Also: short-cut to another subject: how have you other guys managed this? By e.g.: git fetch git checkout -b my-pinwork v3.4-rc4 git merge pinctrl-tag (develop develop) Or: git checkout -b my-pinwork pinctrl-tag ? I was a bit uncertain on how to do this for the pending Ux500 stuff so better ask. I merged it for now but maybe it's better if I just base the whole pullrequest on top of a stable pinctrl branch? Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH V2 03/11] ASoC: imx-audmux: add pinctrl support
On Thu, May 10, 2012 at 02:26:31PM +0200, Linus Walleij wrote: > The tag pinctrl-mergebase-20120418 > contains the devm and other changes, Stephen is already using > that for Tegra stuff and it's solid as a rock. Newer patches are > put on top of this and since pinctrl has no deps in any directions > it will be requested for pull as soon as the merge window opens. > Hi Linus, pinctrl-mergebase-20120418 is not enough for me. I need mxs and dummy states support. So if your devel branch will never be rebased, we can simply ask Arnd and Olof to get that as the dependent branch? -- Regards, Shawn -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [alsa-devel] [PATCH V2 03/11] ASoC: imx-audmux: add pinctrl support
On 05/10/2012 03:05 AM, Richard Zhao wrote: > On Thu, May 10, 2012 at 09:44:04AM +0100, Mark Brown wrote: >> On Thu, May 10, 2012 at 02:39:06PM +0800, Shawn Guo wrote: >>> On Thu, May 10, 2012 at 08:35:33AM +0800, Richard Zhao wrote: >> It's based on your for-next. But for working, it depends on pinctl/for-next. >> >>> Mark, may I have your ack to have it go through arm-soc? I will ask >>> Arnd pull your sound/for-v3.5 branch into arm-soc as a dependency. >>> You need to ensure the branch will not be rebased. >> >> for-3.5 is the entire undifferentiated blob of ASoC stuff, it's not >> really suitable for merging elsewhere. It won't actually get rebased >> but the idea of merging it into other trees doesn't seem terribly >> clever, it'd make having topic branches in arm-soc a bit of a joke and >> if you pull it right now you'll get problems in -next due to the the >> ux500 stuff. >> >> What does "working" mean in this context - what happens without the >> pinctl changes? > devm_pinctrl_get_select_default function is added in below commit which > is in pinctrl/for-next. > > commit 6d4ca1fb467932773da7b808c52f3d7ef4461ba0 > Author: Stephen Warren > Date: Mon Apr 16 10:51:00 2012 -0600 > > pinctrl: implement devm_pinctrl_get()/put() > > These functions allow the driver core to automatically clean up any > allocations made by drivers, thus leading to simplified drivers. > > Signed-off-by: Stephen Warren > Signed-off-by: Linus Walleij > > > So it'll fail compile without pinctrl/for-next. I guess Linus may need > to prepare a non-rebase base for others to merge. (CCing Linus) There is one already. git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git tag pinctrl-mergebase-20120418 The commit is in for-next and devel branches, but not the tip of those. -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH V2 03/11] ASoC: imx-audmux: add pinctrl support
On Thu, May 10, 2012 at 3:41 PM, Richard Zhao wrote: >> Ref: >> git://git.linaro.org/people/triad/linux-pinctrl.git >> >> The tag pinctrl-mergebase-20120418 > I only find the tag at your kernel.org git tree. Linaro switched git > server again? strange. No it's me who is strange. I meant to link the kernel.org server but my browser cache wanted something else. This is the actual tag. http://git.kernel.org/?p=linux/kernel/git/linusw/linux-pinctrl.git;a=commit;h=dcb5dbc305b975cccf40942feba40964069541d3 Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH V2 03/11] ASoC: imx-audmux: add pinctrl support
On Thu, May 10, 2012 at 02:26:31PM +0200, Linus Walleij wrote: > On Thu, May 10, 2012 at 12:23 PM, Richard Zhao > wrote: > > On Thu, May 10, 2012 at 10:27:34AM +0100, Mark Brown wrote: > >> On Thu, May 10, 2012 at 05:05:00PM +0800, Richard Zhao wrote: > >> > >> > devm_pinctrl_get_select_default function is added in below commit which > >> > is in pinctrl/for-next. > >> > >> Oh, dear. That's unfortunate, I guess it's not on a branch in pinctl > >> which can be pulled separately (...) > > > > I prefer to have a non-rebase pinctrl branch. We can not defer pinctrl > > patch for all drivers. pinctrl will be so widely used. > > > > Hi Linus, > > > > Could you comment? > > You're lucky because a few ARM SoC:s wanted a stable tag to > use for pinctrl merges. > > Ref: > git://git.linaro.org/people/triad/linux-pinctrl.git > > The tag pinctrl-mergebase-20120418 I only find the tag at your kernel.org git tree. Linaro switched git server again? strange. Mark, Are you ok with that? Thanks Richard > contains the devm and other changes, Stephen is already using > that for Tegra stuff and it's solid as a rock. Newer patches are > put on top of this and since pinctrl has no deps in any directions > it will be requested for pull as soon as the merge window opens. > > Yours, > Linus Walleij > -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH V2 03/11] ASoC: imx-audmux: add pinctrl support
On Thu, May 10, 2012 at 10:25:36AM +0100, Mark Brown wrote: > On Thu, May 10, 2012 at 05:07:18PM +0800, Shawn Guo wrote: > > > Pulling it into arm-soc as a dependency only means we will have it as > > a base for other branches that depend on. It does not change anything > > about how the branch flows to Linus. Arnd will only send those arm-soc > > branches that depend on sound/for-3.5 after it gets merged by Linus. > > I don't see what difference that really makes to anything... exactly > who sends pull requests to Linus is pretty immaterial, really. Ok, since you do mind having sound branch pulled into arm-soc to help this patch go through arm-soc in the coming merge window, let's wait for the next. -- Regards, Shawn -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH V2 03/11] ASoC: imx-audmux: add pinctrl support
On Thu, May 10, 2012 at 12:23 PM, Richard Zhao wrote: > On Thu, May 10, 2012 at 10:27:34AM +0100, Mark Brown wrote: >> On Thu, May 10, 2012 at 05:05:00PM +0800, Richard Zhao wrote: >> >> > devm_pinctrl_get_select_default function is added in below commit which >> > is in pinctrl/for-next. >> >> Oh, dear. That's unfortunate, I guess it's not on a branch in pinctl >> which can be pulled separately (...) > > I prefer to have a non-rebase pinctrl branch. We can not defer pinctrl > patch for all drivers. pinctrl will be so widely used. > > Hi Linus, > > Could you comment? You're lucky because a few ARM SoC:s wanted a stable tag to use for pinctrl merges. Ref: git://git.linaro.org/people/triad/linux-pinctrl.git The tag pinctrl-mergebase-20120418 contains the devm and other changes, Stephen is already using that for Tegra stuff and it's solid as a rock. Newer patches are put on top of this and since pinctrl has no deps in any directions it will be requested for pull as soon as the merge window opens. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH V2 03/11] ASoC: imx-audmux: add pinctrl support
On Thu, May 10, 2012 at 11:07 AM, Shawn Guo wrote: > Pulling it into arm-soc as a dependency only means we will have it as > a base for other branches that depend on. It does not change anything > about how the branch flows to Linus. Arnd will only send those arm-soc > branches that depend on sound/for-3.5 after it gets merged by Linus. Oh... um... subject is about pinctrl ... but ... no.. Aha, he mean Torvalds! :-) return -ELINWAL; -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH V2 03/11] ASoC: imx-audmux: add pinctrl support
On Thu, May 10, 2012 at 10:27:34AM +0100, Mark Brown wrote: > On Thu, May 10, 2012 at 05:05:00PM +0800, Richard Zhao wrote: > > > devm_pinctrl_get_select_default function is added in below commit which > > is in pinctrl/for-next. > > Oh, dear. That's unfortunate, I guess it's not on a branch in pinctl > which can be pulled separately (this is what I've been doing with things > like regmap and regulator - creating new interfaces on easily mergeable > branches)? Looking at it from the other perspective, what goes wrong if > we defer this patch? I prefer to have a non-rebase pinctrl branch. We can not defer pinctrl patch for all drivers. pinctrl will be so widely used. Hi Linus, Could you comment? Thanks Richard -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH V2 03/11] ASoC: imx-audmux: add pinctrl support
On Thu, May 10, 2012 at 05:05:00PM +0800, Richard Zhao wrote: > devm_pinctrl_get_select_default function is added in below commit which > is in pinctrl/for-next. Oh, dear. That's unfortunate, I guess it's not on a branch in pinctl which can be pulled separately (this is what I've been doing with things like regmap and regulator - creating new interfaces on easily mergeable branches)? Looking at it from the other perspective, what goes wrong if we defer this patch? signature.asc Description: Digital signature
Re: [PATCH V2 03/11] ASoC: imx-audmux: add pinctrl support
On Thu, May 10, 2012 at 05:07:18PM +0800, Shawn Guo wrote: > Pulling it into arm-soc as a dependency only means we will have it as > a base for other branches that depend on. It does not change anything > about how the branch flows to Linus. Arnd will only send those arm-soc > branches that depend on sound/for-3.5 after it gets merged by Linus. I don't see what difference that really makes to anything... exactly who sends pull requests to Linus is pretty immaterial, really. signature.asc Description: Digital signature
Re: [PATCH V2 03/11] ASoC: imx-audmux: add pinctrl support
On Thu, May 10, 2012 at 09:44:04AM +0100, Mark Brown wrote: > On Thu, May 10, 2012 at 02:39:06PM +0800, Shawn Guo wrote: > > On Thu, May 10, 2012 at 08:35:33AM +0800, Richard Zhao wrote: > > > > It's based on your for-next. But for working, it depends on > > > pinctl/for-next. > > > Mark, may I have your ack to have it go through arm-soc? I will ask > > Arnd pull your sound/for-v3.5 branch into arm-soc as a dependency. > > You need to ensure the branch will not be rebased. > > for-3.5 is the entire undifferentiated blob of ASoC stuff, it's not > really suitable for merging elsewhere. It won't actually get rebased > but the idea of merging it into other trees doesn't seem terribly > clever, it'd make having topic branches in arm-soc a bit of a joke and > if you pull it right now you'll get problems in -next due to the the > ux500 stuff. > Pulling it into arm-soc as a dependency only means we will have it as a base for other branches that depend on. It does not change anything about how the branch flows to Linus. Arnd will only send those arm-soc branches that depend on sound/for-3.5 after it gets merged by Linus. > What does "working" mean in this context - what happens without the > pinctl changes? It will break all the imx-audmux users that haven't got any pinctrl states defined for imx-audmux. We have patches on imx (arm-soc) tree defining pinctrl states either in DT or dummy states in board files to make sure pinctrl API works fine for every imx-audmux users. -- Regards, Shawn -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH V2 03/11] ASoC: imx-audmux: add pinctrl support
On Thu, May 10, 2012 at 09:44:04AM +0100, Mark Brown wrote: > On Thu, May 10, 2012 at 02:39:06PM +0800, Shawn Guo wrote: > > On Thu, May 10, 2012 at 08:35:33AM +0800, Richard Zhao wrote: > > > > It's based on your for-next. But for working, it depends on > > > pinctl/for-next. > > > Mark, may I have your ack to have it go through arm-soc? I will ask > > Arnd pull your sound/for-v3.5 branch into arm-soc as a dependency. > > You need to ensure the branch will not be rebased. > > for-3.5 is the entire undifferentiated blob of ASoC stuff, it's not > really suitable for merging elsewhere. It won't actually get rebased > but the idea of merging it into other trees doesn't seem terribly > clever, it'd make having topic branches in arm-soc a bit of a joke and > if you pull it right now you'll get problems in -next due to the the > ux500 stuff. > > What does "working" mean in this context - what happens without the > pinctl changes? devm_pinctrl_get_select_default function is added in below commit which is in pinctrl/for-next. commit 6d4ca1fb467932773da7b808c52f3d7ef4461ba0 Author: Stephen Warren Date: Mon Apr 16 10:51:00 2012 -0600 pinctrl: implement devm_pinctrl_get()/put() These functions allow the driver core to automatically clean up any allocations made by drivers, thus leading to simplified drivers. Signed-off-by: Stephen Warren Signed-off-by: Linus Walleij So it'll fail compile without pinctrl/for-next. I guess Linus may need to prepare a non-rebase base for others to merge. Thanks Richard -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH V2 03/11] ASoC: imx-audmux: add pinctrl support
On Thu, May 10, 2012 at 02:39:06PM +0800, Shawn Guo wrote: > On Thu, May 10, 2012 at 08:35:33AM +0800, Richard Zhao wrote: > > It's based on your for-next. But for working, it depends on > > pinctl/for-next. > Mark, may I have your ack to have it go through arm-soc? I will ask > Arnd pull your sound/for-v3.5 branch into arm-soc as a dependency. > You need to ensure the branch will not be rebased. for-3.5 is the entire undifferentiated blob of ASoC stuff, it's not really suitable for merging elsewhere. It won't actually get rebased but the idea of merging it into other trees doesn't seem terribly clever, it'd make having topic branches in arm-soc a bit of a joke and if you pull it right now you'll get problems in -next due to the the ux500 stuff. What does "working" mean in this context - what happens without the pinctl changes? signature.asc Description: Digital signature
Re: [PATCH V2 03/11] ASoC: imx-audmux: add pinctrl support
On Thu, May 10, 2012 at 08:35:33AM +0800, Richard Zhao wrote: > On Wed, May 09, 2012 at 05:00:06PM +0100, Mark Brown wrote: > > On Wed, May 09, 2012 at 07:33:02PM +0800, Richard Zhao wrote: > > > Signed-off-by: Richard Zhao > > > > I guess this depends on some other tree and can't just be directly > > applied to ASoC? > It's based on your for-next. But for working, it depends on > pinctl/for-next. > Mark, may I have your ack to have it go through arm-soc? I will ask Arnd pull your sound/for-v3.5 branch into arm-soc as a dependency. You need to ensure the branch will not be rebased. -- Regards, Shawn -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH V2 03/11] ASoC: imx-audmux: add pinctrl support
On Wed, May 09, 2012 at 07:33:02PM +0800, Richard Zhao wrote:
> Signed-off-by: Richard Zhao
> ---
> sound/soc/fsl/imx-audmux.c |8
> 1 files changed, 8 insertions(+), 0 deletions(-)
>
Acked-by: Dong Aisheng
I guess you may want it to go through arm-soc tree which already has
a patch asking pinctrl to provide dummies or it may break the drivers.
Regards
Dong Aisheng
> diff --git a/sound/soc/fsl/imx-audmux.c b/sound/soc/fsl/imx-audmux.c
> index f237003..0803274 100644
> --- a/sound/soc/fsl/imx-audmux.c
> +++ b/sound/soc/fsl/imx-audmux.c
> @@ -26,6 +26,7 @@
> #include
> #include
> #include
> +#include
>
> #include "imx-audmux.h"
>
> @@ -249,6 +250,7 @@ EXPORT_SYMBOL_GPL(imx_audmux_v2_configure_port);
> static int __devinit imx_audmux_probe(struct platform_device *pdev)
> {
> struct resource *res;
> + struct pinctrl *pinctrl;
> const struct of_device_id *of_id =
> of_match_device(imx_audmux_dt_ids, &pdev->dev);
>
> @@ -257,6 +259,12 @@ static int __devinit imx_audmux_probe(struct
> platform_device *pdev)
> if (!audmux_base)
> return -EADDRNOTAVAIL;
>
> + pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
> + if (IS_ERR(pinctrl)) {
> + dev_err(&pdev->dev, "setup pinctrl failed!");
> + return PTR_ERR(pinctrl);
> + }
> +
> audmux_clk = clk_get(&pdev->dev, "audmux");
> if (IS_ERR(audmux_clk)) {
> dev_dbg(&pdev->dev, "cannot get clock: %ld\n",
> --
> 1.7.5.4
>
>
>
> ___
> linux-arm-kernel mailing list
> linux-arm-ker...@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH V2 03/11] ASoC: imx-audmux: add pinctrl support
On Wed, May 09, 2012 at 05:00:06PM +0100, Mark Brown wrote: > On Wed, May 09, 2012 at 07:33:02PM +0800, Richard Zhao wrote: > > Signed-off-by: Richard Zhao > > I guess this depends on some other tree and can't just be directly > applied to ASoC? It's based on your for-next. But for working, it depends on pinctl/for-next. Thanks Richard -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH V2 03/11] ASoC: imx-audmux: add pinctrl support
On Wed, May 09, 2012 at 07:33:02PM +0800, Richard Zhao wrote: > Signed-off-by: Richard Zhao I guess this depends on some other tree and can't just be directly applied to ASoC? signature.asc Description: Digital signature
[PATCH V2 03/11] ASoC: imx-audmux: add pinctrl support
Signed-off-by: Richard Zhao
---
sound/soc/fsl/imx-audmux.c |8
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/sound/soc/fsl/imx-audmux.c b/sound/soc/fsl/imx-audmux.c
index f237003..0803274 100644
--- a/sound/soc/fsl/imx-audmux.c
+++ b/sound/soc/fsl/imx-audmux.c
@@ -26,6 +26,7 @@
#include
#include
#include
+#include
#include "imx-audmux.h"
@@ -249,6 +250,7 @@ EXPORT_SYMBOL_GPL(imx_audmux_v2_configure_port);
static int __devinit imx_audmux_probe(struct platform_device *pdev)
{
struct resource *res;
+ struct pinctrl *pinctrl;
const struct of_device_id *of_id =
of_match_device(imx_audmux_dt_ids, &pdev->dev);
@@ -257,6 +259,12 @@ static int __devinit imx_audmux_probe(struct
platform_device *pdev)
if (!audmux_base)
return -EADDRNOTAVAIL;
+ pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
+ if (IS_ERR(pinctrl)) {
+ dev_err(&pdev->dev, "setup pinctrl failed!");
+ return PTR_ERR(pinctrl);
+ }
+
audmux_clk = clk_get(&pdev->dev, "audmux");
if (IS_ERR(audmux_clk)) {
dev_dbg(&pdev->dev, "cannot get clock: %ld\n",
--
1.7.5.4
--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
