[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1556804888.28808.6.camel@mtksdaap41>
Date: Thu, 2 May 2019 21:48:08 +0800
From: Yingjoe Chen <yingjoe.chen@...iatek.com>
To: Nicolas Boichat <drinkcat@...omium.org>
CC: <linux-mediatek@...ts.infradead.org>,
Chuanjia Liu <Chuanjia.Liu@...iatek.com>,
Linus Walleij <linus.walleij@...aro.org>,
Sean Wang <sean.wang@...nel.org>,
<linux-kernel@...r.kernel.org>, <evgreen@...omium.org>,
<swboyd@...omium.org>, <linux-gpio@...r.kernel.org>,
Matthias Brugger <matthias.bgg@...il.com>,
<linux-arm-kernel@...ts.infradead.org>
Subject: Re: [PATCH 1/2] pinctrl: mediatek: Add mtk_eint_pm_ops to common-v2
On Mon, 2019-04-29 at 11:25 +0800, Nicolas Boichat wrote:
> pinctrl variants that include pinctrl-mtk-common-v2.h (and not
> pinctrl-mtk-common.h) also need to use mtk_eint_pm_ops to setup
> wake mask properly, so copy over the pm_ops to v2.
>
> It is not easy to merge the 2 copies (or move
> mtk_eint_suspend/resume to mtk-eint.c), as we need to
> dereference pctrl->eint, and struct mtk_pinctrl *pctl has a
> different structure definition for v1 and v2.
>
> Signed-off-by: Nicolas Boichat <drinkcat@...omium.org>
> Reviewed-by: Chuanjia Liu <Chuanjia.Liu@...iatek.com>
> ---
> .../pinctrl/mediatek/pinctrl-mtk-common-v2.c | 19 +++++++++++++++++++
> .../pinctrl/mediatek/pinctrl-mtk-common-v2.h | 1 +
> 2 files changed, 20 insertions(+)
>
> diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c
> index 20e1c890e73b30c..7e19b5a4748eafe 100644
> --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c
> +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c
> @@ -723,3 +723,22 @@ int mtk_pinconf_adv_drive_get(struct mtk_pinctrl *hw,
>
> return 0;
> }
> +
> +static int mtk_eint_suspend(struct device *device)
> +{
> + struct mtk_pinctrl *pctl = dev_get_drvdata(device);
> +
> + return mtk_eint_do_suspend(pctl->eint);
> +}
> +
> +static int mtk_eint_resume(struct device *device)
> +{
> + struct mtk_pinctrl *pctl = dev_get_drvdata(device);
> +
> + return mtk_eint_do_resume(pctl->eint);
> +}
> +
> +const struct dev_pm_ops mtk_eint_pm_ops = {
> + .suspend_noirq = mtk_eint_suspend,
> + .resume_noirq = mtk_eint_resume,
> +};
This is identical to the one in pinctrl-mtk-common.c and will have name
clash if both pinctrl-mtk-common.c and pinctrl-mtk-common-v2.c are
built.
It would be better if we try to merge both version into mtk-eint.c, this
way we could also remove some global functions.
Joe.C
Powered by blists - more mailing lists