| Message ID | 1397051478-4113-5-git-send-email-boris.brezillon@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Apr 9, 2014 at 3:51 PM, Boris BREZILLON <boris.brezillon@free-electrons.com> wrote: > Specify base pio clk name when retrieving it using the CCF. > This way we will avoid conflicts when introducing a second clk for the A31 > SoC. > > Signed-off-by: Boris BREZILLON <boris.brezillon@free-electrons.com> Are you merging all these through ARM SoC? In that case Acked-by: Linus Walleij <linus.walleij@linaro.org> If it's OK to merge stand-alone tell me and I'll apply it to the pinctrl tree. Yours, Linus Walleij
On Thu, Apr 10, 2014 at 8:14 PM, Linus Walleij <linus.walleij@linaro.org> wrote: > On Wed, Apr 9, 2014 at 3:51 PM, Boris BREZILLON > <boris.brezillon@free-electrons.com> wrote: > >> Specify base pio clk name when retrieving it using the CCF. >> This way we will avoid conflicts when introducing a second clk for the A31 >> SoC. >> >> Signed-off-by: Boris BREZILLON <boris.brezillon@free-electrons.com> > > Are you merging all these through ARM SoC? > > In that case > Acked-by: Linus Walleij <linus.walleij@linaro.org> > > If it's OK to merge stand-alone tell me and I'll apply it to > the pinctrl tree. Hm there seems to be quite a few patches to pinctrl here... May I apply this and the others to the pinctrl tree simply? As DTS files should be maintained separately I don't think it's important to keep driver and DTS file changes together. Yours, Linus Walleij
Hello Linus, On 10/04/2014 20:16, Linus Walleij wrote: > On Thu, Apr 10, 2014 at 8:14 PM, Linus Walleij <linus.walleij@linaro.org> wrote: >> On Wed, Apr 9, 2014 at 3:51 PM, Boris BREZILLON >> <boris.brezillon@free-electrons.com> wrote: >> >>> Specify base pio clk name when retrieving it using the CCF. >>> This way we will avoid conflicts when introducing a second clk for the A31 >>> SoC. >>> >>> Signed-off-by: Boris BREZILLON <boris.brezillon@free-electrons.com> >> Are you merging all these through ARM SoC? >> >> In that case >> Acked-by: Linus Walleij <linus.walleij@linaro.org> >> >> If it's OK to merge stand-alone tell me and I'll apply it to >> the pinctrl tree. > Hm there seems to be quite a few patches to pinctrl here... > > May I apply this and the others to the pinctrl tree simply? Actually I made a v2 (and then a v3 https://lkml.org/lkml/2014/4/10/320 :-)) of this series, in which I removed all DT related stuff. So, if you agree with these changes, I guess you can take them through you tree. Best Regards, Boris > > As DTS files should be maintained separately I don't think > it's important to keep driver and DTS file changes together. > > Yours, > Linus Walleij
diff --git a/drivers/pinctrl/pinctrl-sunxi.c b/drivers/pinctrl/pinctrl-sunxi.c index f9fabe9..ef16311 100644 --- a/drivers/pinctrl/pinctrl-sunxi.c +++ b/drivers/pinctrl/pinctrl-sunxi.c @@ -878,7 +878,7 @@ static int sunxi_pinctrl_probe(struct platform_device *pdev) goto gpiochip_error; } - clk = devm_clk_get(&pdev->dev, NULL); + clk = devm_clk_get(&pdev->dev, "pio_clk"); if (IS_ERR(clk)) { ret = PTR_ERR(clk); goto gpiochip_error;
Specify base pio clk name when retrieving it using the CCF. This way we will avoid conflicts when introducing a second clk for the A31 SoC. Signed-off-by: Boris BREZILLON <boris.brezillon@free-electrons.com> --- drivers/pinctrl/pinctrl-sunxi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)