| Message ID | 20210317065359.3109394-4-xiaoning.wang@nxp.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | i2c: imx-lpi2c: New features and bug fixes | expand |
> From: Clark Wang <xiaoning.wang@nxp.com> > Sent: Wednesday, March 17, 2021 2:54 PM > > The lpi2c IP needs two clks: ipg clk and per clk. The old lpi2c driver missed ipg > clk. This patch adds ipg clk for lpi2c driver. > Pleas also update dt-binding and sent along with this patchset.(before this one) > Signed-off-by: Gao Pan <pandy.gao@nxp.com> > Signed-off-by: Clark Wang <xiaoning.wang@nxp.com> > Acked-by: Fugang Duan <fugang.duan@nxp.com> You can drop the Ack tag if the patch was changed > --- > drivers/i2c/busses/i2c-imx-lpi2c.c | 28 +++++++++++++++++++++------- > 1 file changed, 21 insertions(+), 7 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-imx-lpi2c.c > b/drivers/i2c/busses/i2c-imx-lpi2c.c > index 1e920e7ac7c1..664fcc0dba51 100644 > --- a/drivers/i2c/busses/i2c-imx-lpi2c.c > +++ b/drivers/i2c/busses/i2c-imx-lpi2c.c > @@ -94,7 +94,8 @@ enum lpi2c_imx_pincfg { > > struct lpi2c_imx_struct { > struct i2c_adapter adapter; > - struct clk *clk; > + struct clk *clk_per; > + struct clk *clk_ipg; > void __iomem *base; > __u8 *rx_buf; > __u8 *tx_buf; > @@ -563,10 +564,16 @@ static int lpi2c_imx_probe(struct platform_device > *pdev) > strlcpy(lpi2c_imx->adapter.name, pdev->name, > sizeof(lpi2c_imx->adapter.name)); > > - lpi2c_imx->clk = devm_clk_get(&pdev->dev, NULL); > - if (IS_ERR(lpi2c_imx->clk)) { > + lpi2c_imx->clk_per = devm_clk_get(&pdev->dev, "per"); > + if (IS_ERR(lpi2c_imx->clk_per)) { > dev_err(&pdev->dev, "can't get I2C peripheral clock\n"); > - return PTR_ERR(lpi2c_imx->clk); > + return PTR_ERR(lpi2c_imx->clk_per); > + } > + > + lpi2c_imx->clk_ipg = devm_clk_get(&pdev->dev, "ipg"); > + if (IS_ERR(lpi2c_imx->clk_ipg)) { > + dev_err(&pdev->dev, "can't get I2C ipg clock\n"); > + return PTR_ERR(lpi2c_imx->clk_ipg); > } Will this break exist dts? Regards Aisheng > > ret = of_property_read_u32(pdev->dev.of_node, > @@ -633,7 +640,8 @@ static int __maybe_unused > lpi2c_runtime_suspend(struct device *dev) { > struct lpi2c_imx_struct *lpi2c_imx = dev_get_drvdata(dev); > > - clk_disable_unprepare(lpi2c_imx->clk); > + clk_disable_unprepare(lpi2c_imx->clk_ipg); > + clk_disable_unprepare(lpi2c_imx->clk_per); > pinctrl_pm_select_idle_state(dev); > > return 0; > @@ -645,12 +653,18 @@ static int __maybe_unused > lpi2c_runtime_resume(struct device *dev) > int ret; > > pinctrl_pm_select_default_state(dev); > - ret = clk_prepare_enable(lpi2c_imx->clk); > + ret = clk_prepare_enable(lpi2c_imx->clk_per); > if (ret) { > - dev_err(dev, "can't enable I2C clock, ret=%d\n", ret); > + dev_err(dev, "can't enable I2C per clock, ret=%d\n", ret); > return ret; > } > > + ret = clk_prepare_enable(lpi2c_imx->clk_ipg); > + if (ret) { > + clk_disable_unprepare(lpi2c_imx->clk_per); > + dev_err(dev, "can't enable I2C ipg clock, ret=%d\n", ret); > + } > + > return ret; > } > > -- > 2.25.1
> -----Original Message----- > From: Aisheng Dong <aisheng.dong@nxp.com> > Sent: Friday, March 19, 2021 12:46 > To: Clark Wang <xiaoning.wang@nxp.com>; shawnguo@kernel.org; > s.hauer@pengutronix.de > Cc: kernel@pengutronix.de; festevam@gmail.com; dl-linux-imx <linux- > imx@nxp.com>; sumit.semwal@linaro.org; christian.koenig@amd.com; > linux-i2c@vger.kernel.org; linux-arm-kernel@lists.infradead.org; linux- > kernel@vger.kernel.org > Subject: RE: [PATCH 03/11] i2c: imx-lpi2c: add ipg clk for lpi2c driver > > > From: Clark Wang <xiaoning.wang@nxp.com> > > Sent: Wednesday, March 17, 2021 2:54 PM > > > > The lpi2c IP needs two clks: ipg clk and per clk. The old lpi2c driver > > missed ipg clk. This patch adds ipg clk for lpi2c driver. > > > > Pleas also update dt-binding and sent along with this patchset.(before this > one) Okay, thanks. > > > Signed-off-by: Gao Pan <pandy.gao@nxp.com> > > Signed-off-by: Clark Wang <xiaoning.wang@nxp.com> > > Acked-by: Fugang Duan <fugang.duan@nxp.com> > > You can drop the Ack tag if the patch was changed > > > --- > > drivers/i2c/busses/i2c-imx-lpi2c.c | 28 +++++++++++++++++++++------- > > 1 file changed, 21 insertions(+), 7 deletions(-) > > > > diff --git a/drivers/i2c/busses/i2c-imx-lpi2c.c > > b/drivers/i2c/busses/i2c-imx-lpi2c.c > > index 1e920e7ac7c1..664fcc0dba51 100644 > > --- a/drivers/i2c/busses/i2c-imx-lpi2c.c > > +++ b/drivers/i2c/busses/i2c-imx-lpi2c.c > > @@ -94,7 +94,8 @@ enum lpi2c_imx_pincfg { > > > > struct lpi2c_imx_struct { > > struct i2c_adapter adapter; > > - struct clk *clk; > > + struct clk *clk_per; > > + struct clk *clk_ipg; > > void __iomem *base; > > __u8 *rx_buf; > > __u8 *tx_buf; > > @@ -563,10 +564,16 @@ static int lpi2c_imx_probe(struct > > platform_device > > *pdev) > > strlcpy(lpi2c_imx->adapter.name, pdev->name, > > sizeof(lpi2c_imx->adapter.name)); > > > > - lpi2c_imx->clk = devm_clk_get(&pdev->dev, NULL); > > - if (IS_ERR(lpi2c_imx->clk)) { > > + lpi2c_imx->clk_per = devm_clk_get(&pdev->dev, "per"); > > + if (IS_ERR(lpi2c_imx->clk_per)) { > > dev_err(&pdev->dev, "can't get I2C peripheral clock\n"); > > - return PTR_ERR(lpi2c_imx->clk); > > + return PTR_ERR(lpi2c_imx->clk_per); > > + } > > + > > + lpi2c_imx->clk_ipg = devm_clk_get(&pdev->dev, "ipg"); > > + if (IS_ERR(lpi2c_imx->clk_ipg)) { > > + dev_err(&pdev->dev, "can't get I2C ipg clock\n"); > > + return PTR_ERR(lpi2c_imx->clk_ipg); > > } > > Will this break exist dts? It will not break the build. But will break the lpi2c probe for imx7ulp and imx8qxp/qm. I will send two patches to update dts in V2. Best Regards, Clark Wang > > Regards > Aisheng > > > > > ret = of_property_read_u32(pdev->dev.of_node, > > @@ -633,7 +640,8 @@ static int __maybe_unused > > lpi2c_runtime_suspend(struct device *dev) { > > struct lpi2c_imx_struct *lpi2c_imx = dev_get_drvdata(dev); > > > > - clk_disable_unprepare(lpi2c_imx->clk); > > + clk_disable_unprepare(lpi2c_imx->clk_ipg); > > + clk_disable_unprepare(lpi2c_imx->clk_per); > > pinctrl_pm_select_idle_state(dev); > > > > return 0; > > @@ -645,12 +653,18 @@ static int __maybe_unused > > lpi2c_runtime_resume(struct device *dev) > > int ret; > > > > pinctrl_pm_select_default_state(dev); > > - ret = clk_prepare_enable(lpi2c_imx->clk); > > + ret = clk_prepare_enable(lpi2c_imx->clk_per); > > if (ret) { > > - dev_err(dev, "can't enable I2C clock, ret=%d\n", ret); > > + dev_err(dev, "can't enable I2C per clock, ret=%d\n", ret); > > return ret; > > } > > > > + ret = clk_prepare_enable(lpi2c_imx->clk_ipg); > > + if (ret) { > > + clk_disable_unprepare(lpi2c_imx->clk_per); > > + dev_err(dev, "can't enable I2C ipg clock, ret=%d\n", ret); > > + } > > + > > return ret; > > } > > > > -- > > 2.25.1
> > > + > > > + lpi2c_imx->clk_ipg = devm_clk_get(&pdev->dev, "ipg"); > > > + if (IS_ERR(lpi2c_imx->clk_ipg)) { > > > + dev_err(&pdev->dev, "can't get I2C ipg clock\n"); > > > + return PTR_ERR(lpi2c_imx->clk_ipg); > > > } > > > > Will this break exist dts? > > It will not break the build. But will break the lpi2c probe for imx7ulp and > imx8qxp/qm. > I will send two patches to update dts in V2. > Please don't break exist platforms. Regards Aisheng > Best Regards, > Clark Wang > > > > > Regards > > Aisheng > > > > > > > > ret = of_property_read_u32(pdev->dev.of_node, > > > @@ -633,7 +640,8 @@ static int __maybe_unused > > > lpi2c_runtime_suspend(struct device *dev) { > > > struct lpi2c_imx_struct *lpi2c_imx = dev_get_drvdata(dev); > > > > > > - clk_disable_unprepare(lpi2c_imx->clk); > > > + clk_disable_unprepare(lpi2c_imx->clk_ipg); > > > + clk_disable_unprepare(lpi2c_imx->clk_per); > > > pinctrl_pm_select_idle_state(dev); > > > > > > return 0; > > > @@ -645,12 +653,18 @@ static int __maybe_unused > > > lpi2c_runtime_resume(struct device *dev) > > > int ret; > > > > > > pinctrl_pm_select_default_state(dev); > > > - ret = clk_prepare_enable(lpi2c_imx->clk); > > > + ret = clk_prepare_enable(lpi2c_imx->clk_per); > > > if (ret) { > > > - dev_err(dev, "can't enable I2C clock, ret=%d\n", ret); > > > + dev_err(dev, "can't enable I2C per clock, ret=%d\n", ret); > > > return ret; > > > } > > > > > > + ret = clk_prepare_enable(lpi2c_imx->clk_ipg); > > > + if (ret) { > > > + clk_disable_unprepare(lpi2c_imx->clk_per); > > > + dev_err(dev, "can't enable I2C ipg clock, ret=%d\n", ret); > > > + } > > > + > > > return ret; > > > } > > > > > > -- > > > 2.25.1
diff --git a/drivers/i2c/busses/i2c-imx-lpi2c.c b/drivers/i2c/busses/i2c-imx-lpi2c.c index 1e920e7ac7c1..664fcc0dba51 100644 --- a/drivers/i2c/busses/i2c-imx-lpi2c.c +++ b/drivers/i2c/busses/i2c-imx-lpi2c.c @@ -94,7 +94,8 @@ enum lpi2c_imx_pincfg { struct lpi2c_imx_struct { struct i2c_adapter adapter; - struct clk *clk; + struct clk *clk_per; + struct clk *clk_ipg; void __iomem *base; __u8 *rx_buf; __u8 *tx_buf; @@ -563,10 +564,16 @@ static int lpi2c_imx_probe(struct platform_device *pdev) strlcpy(lpi2c_imx->adapter.name, pdev->name, sizeof(lpi2c_imx->adapter.name)); - lpi2c_imx->clk = devm_clk_get(&pdev->dev, NULL); - if (IS_ERR(lpi2c_imx->clk)) { + lpi2c_imx->clk_per = devm_clk_get(&pdev->dev, "per"); + if (IS_ERR(lpi2c_imx->clk_per)) { dev_err(&pdev->dev, "can't get I2C peripheral clock\n"); - return PTR_ERR(lpi2c_imx->clk); + return PTR_ERR(lpi2c_imx->clk_per); + } + + lpi2c_imx->clk_ipg = devm_clk_get(&pdev->dev, "ipg"); + if (IS_ERR(lpi2c_imx->clk_ipg)) { + dev_err(&pdev->dev, "can't get I2C ipg clock\n"); + return PTR_ERR(lpi2c_imx->clk_ipg); } ret = of_property_read_u32(pdev->dev.of_node, @@ -633,7 +640,8 @@ static int __maybe_unused lpi2c_runtime_suspend(struct device *dev) { struct lpi2c_imx_struct *lpi2c_imx = dev_get_drvdata(dev); - clk_disable_unprepare(lpi2c_imx->clk); + clk_disable_unprepare(lpi2c_imx->clk_ipg); + clk_disable_unprepare(lpi2c_imx->clk_per); pinctrl_pm_select_idle_state(dev); return 0; @@ -645,12 +653,18 @@ static int __maybe_unused lpi2c_runtime_resume(struct device *dev) int ret; pinctrl_pm_select_default_state(dev); - ret = clk_prepare_enable(lpi2c_imx->clk); + ret = clk_prepare_enable(lpi2c_imx->clk_per); if (ret) { - dev_err(dev, "can't enable I2C clock, ret=%d\n", ret); + dev_err(dev, "can't enable I2C per clock, ret=%d\n", ret); return ret; } + ret = clk_prepare_enable(lpi2c_imx->clk_ipg); + if (ret) { + clk_disable_unprepare(lpi2c_imx->clk_per); + dev_err(dev, "can't enable I2C ipg clock, ret=%d\n", ret); + } + return ret; }