[v5,3/5] ARM: mediatek: Add Pinctrl/GPIO driver for mt8135.

Commit Message

Hongzhou Yang Feb. 11, 2015, 8:42 a.m. UTC

On Tue, 2015-02-10 at 16:17 +0800, Linus Walleij wrote:
> On Wed, Jan 21, 2015 at 1:28 PM, Hongzhou Yang
> <[e-mail]> wrote:
> 
> > From: Hongzhou Yang <[e-mail]>
> >
> > The mediatek SoCs have GPIO controller that handle both the muxing and GPIOs.
> >
> > The GPIO controller have pinmux, pull enable, pull select, direction and output high/low control.
> >
> > This driver include common driver and mt8135 part.
> > The common driver include the pinctrl driver and GPIO driver.
> > The mt8135 part contain its special device data.
> >
> > Signed-off-by: Hongzhou Yang <[e-mail]>
> 
> I have merged this patch for v3.21, except:
> 
> >  arch/arm/mach-mediatek/Kconfig                |    1 +
> (...)
>  --- a/arch/arm/mach-mediatek/Kconfig
> > +++ b/arch/arm/mach-mediatek/Kconfig
> > @@ -1,6 +1,7 @@
> >  menuconfig ARCH_MEDIATEK
> >         bool "Mediatek MT65xx & MT81xx SoC" if ARCH_MULTI_V7
> >         select ARM_GIC
> > +       select PINCTRL
> >         select MTK_TIMER
> >         help
> >           Support for Mediatek MT65xx & MT81xx SoCs
> 
> This, which should come in through the ARM SoC tree. It's not
> dependent on this series anyway.
> 
> This will appear after the merge window as we start the v3.21 cycle.
> 
> Yours,
> Linus Walleij

Hi Linus,

Due to pinconf relate API changed at kernel-3.20, a build error
happened.
Do I need to send patch v6?
Thanks.

        if (num_configs)
                has_config = 1;

@@ -716,7 +716,7 @@ int mtk_pctrl_init(struct platform_device *pdev,

        prop = of_find_property(np, "pins-are-numbered", NULL);
        if (!prop) {
-               dev_err(&pdev->dev, "only support pins-are-numbered
format\n", ret);
+               dev_err(&pdev->dev, "only support pins-are-numbered
format\n");
                return -EINVAL;
        }

Yours,
Hongzhou

Comments

Linus Walleij Feb. 11, 2015, 2:45 p.m. UTC | #1

On Wed, Feb 11, 2015 at 4:42 PM, Hongzhou Yang
<[e-mail]> wrote:

> Due to pinconf relate API changed at kernel-3.20, a build error
> happened.
> Do I need to send patch v6?

I discussed with your colleagues and I think it's simplest just to make
a small fix patch on top of what is found on the mtk-staging branch
and I'll apply it there.

Yours,
Linus Walleij

Hongzhou Yang Feb. 11, 2015, 8:18 p.m. UTC | #2

On Wed, 2015-02-11 at 22:45 +0800, Linus Walleij wrote:
> On Wed, Feb 11, 2015 at 4:42 PM, Hongzhou Yang
> <[e-mail]> wrote:
> 
> > Due to pinconf relate API changed at kernel-3.20, a build error
> > happened.
> > Do I need to send patch v6?
> 
> I discussed with your colleagues and I think it's simplest just to make
> a small fix patch on top of what is found on the mtk-staging branch
> and I'll apply it there.
> 
> Yours,
> Linus Walleij

Ok, thank you.

Yours,
Hongzhou

Patch

diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
index 721f429..83f474b
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
@@ -391,7 +391,7 @@  static int mtk_pctrl_dt_subnode_to_map(struct
pinctrl_dev *pctldev,
                return -EINVAL;
        }

-       err = pinconf_generic_parse_dt_config(node, &configs,
&num_configs);
+       err = pinconf_generic_parse_dt_config(node, pctldev, &configs,
&num_configs);