2022-05-17 14:00:19

by Tyrone Ting

[permalink] [raw]
Subject: [PATCH v5 02/10] i2c: npcm: Change the way of getting GCR regmap

From: Tali Perry <[email protected]>

Change the way of getting NPCM system manager reigster (GCR)
and still maintain the old mechanism as a fallback if getting
nuvoton,sys-mgr fails while working with the legacy devicetree
file.

Fixes: 56a1485b102e ("i2c: npcm7xx: Add Nuvoton NPCM I2C controller driver")
Signed-off-by: Tali Perry <[email protected]>
Signed-off-by: Tyrone Ting <[email protected]>
Acked-by: Krzysztof Kozlowski <[email protected]>
---
drivers/i2c/busses/i2c-npcm7xx.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/i2c/busses/i2c-npcm7xx.c b/drivers/i2c/busses/i2c-npcm7xx.c
index 71aad029425d..de4e5f2f3e5a 100644
--- a/drivers/i2c/busses/i2c-npcm7xx.c
+++ b/drivers/i2c/busses/i2c-npcm7xx.c
@@ -2229,11 +2229,12 @@ static void npcm_i2c_init_debugfs(struct platform_device *pdev,

static int npcm_i2c_probe_bus(struct platform_device *pdev)
{
- struct npcm_i2c *bus;
- struct i2c_adapter *adap;
- struct clk *i2c_clk;
+ struct device_node *np = pdev->dev.of_node;
static struct regmap *gcr_regmap;
static struct regmap *clk_regmap;
+ struct i2c_adapter *adap;
+ struct npcm_i2c *bus;
+ struct clk *i2c_clk;
int irq;
int ret;

@@ -2250,7 +2251,10 @@ static int npcm_i2c_probe_bus(struct platform_device *pdev)
return PTR_ERR(i2c_clk);
bus->apb_clk = clk_get_rate(i2c_clk);

- gcr_regmap = syscon_regmap_lookup_by_compatible("nuvoton,npcm750-gcr");
+ gcr_regmap = syscon_regmap_lookup_by_phandle(np, "nuvoton,sys-mgr");
+ if (IS_ERR(gcr_regmap))
+ gcr_regmap = syscon_regmap_lookup_by_compatible("nuvoton,npcm750-gcr");
+
if (IS_ERR(gcr_regmap))
return PTR_ERR(gcr_regmap);
regmap_write(gcr_regmap, NPCM_I2CSEGCTL, NPCM_I2CSEGCTL_INIT_VAL);
--
2.17.1



2022-05-22 08:32:49

by Wolfram Sang

[permalink] [raw]
Subject: Re: [PATCH v5 02/10] i2c: npcm: Change the way of getting GCR regmap

On Tue, May 17, 2022 at 06:11:34PM +0800, Tyrone Ting wrote:
> From: Tali Perry <[email protected]>
>
> Change the way of getting NPCM system manager reigster (GCR)
> and still maintain the old mechanism as a fallback if getting
> nuvoton,sys-mgr fails while working with the legacy devicetree
> file.
>
> Fixes: 56a1485b102e ("i2c: npcm7xx: Add Nuvoton NPCM I2C controller driver")
> Signed-off-by: Tali Perry <[email protected]>
> Signed-off-by: Tyrone Ting <[email protected]>
> Acked-by: Krzysztof Kozlowski <[email protected]>

Applied to for-next, thanks!

I dropped the Fixes tag, doesn't look like a bugfix to me.

Attachments:
(No filename) (667.00 B)
 signature.asc (849.00 B)
 Download all attachments

2022-05-23 07:50:37

by Tyrone Ting

[permalink] [raw]
Subject: Re: [PATCH v5 02/10] i2c: npcm: Change the way of getting GCR regmap

Hi Wolfram:

Got it and thank you for your review.

Wolfram Sang <[email protected]> 於 2022年5月21日 週六 下午1:51寫道：
>
> On Tue, May 17, 2022 at 06:11:34PM +0800, Tyrone Ting wrote:
> > From: Tali Perry <[email protected]>
> >
> > Change the way of getting NPCM system manager reigster (GCR)
> > and still maintain the old mechanism as a fallback if getting
> > nuvoton,sys-mgr fails while working with the legacy devicetree
> > file.
> >
> > Fixes: 56a1485b102e ("i2c: npcm7xx: Add Nuvoton NPCM I2C controller driver")
> > Signed-off-by: Tali Perry <[email protected]>
> > Signed-off-by: Tyrone Ting <[email protected]>
> > Acked-by: Krzysztof Kozlowski <[email protected]>
>
> Applied to for-next, thanks!
>
> I dropped the Fixes tag, doesn't look like a bugfix to me.
>

Best Regards,
Tyrone