diff mbox series

[v4,2/9] i2c: npcm: Change the way of getting GCR regmap

Message ID 20220510091654.8498-3-warp5tw@gmail.com
State New
Headers show
Series i2c: npcm: Bug fixes timeout, spurious interrupts | expand

Commit Message

Tyrone Ting May 10, 2022, 9:16 a.m. UTC
From: Tali Perry <tali.perry1@gmail.com>

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 <tali.perry1@gmail.com>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
---
 drivers/i2c/busses/i2c-npcm7xx.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Comments

Wolfram Sang May 16, 2022, 7:48 p.m. UTC | #1
On Tue, May 10, 2022 at 05:16:47PM +0800, Tyrone Ting wrote:
> From: Tali Perry <tali.perry1@gmail.com>
> 
> 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 <tali.perry1@gmail.com>
> Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>

Tyrone, your SoB is missing for all patches from Tali.
Tyrone Ting May 17, 2022, 1:05 a.m. UTC | #2
Hi Wolfram:

Thank you for your feedback and here is my reply below.

Wolfram Sang <wsa@kernel.org> 於 2022年5月17日 週二 上午3:48寫道:
>
> On Tue, May 10, 2022 at 05:16:47PM +0800, Tyrone Ting wrote:
> > From: Tali Perry <tali.perry1@gmail.com>
> >
> > 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 <tali.perry1@gmail.com>
> > Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
>
> Tyrone, your SoB is missing for all patches from Tali.
>

After reviewing these two links, we decided to keep only the author's
SoB for each commit.

https://lore.kernel.org/lkml/YiCZlhJoXPLpQ6%2FD@smile.fi.intel.com/
https://lore.kernel.org/lkml/YiCb7LNY9tmMCZx7@smile.fi.intel.com/

Best Regards,
Tyrone
Wolfram Sang May 17, 2022, 6:04 a.m. UTC | #3
> After reviewing these two links, we decided to keep only the author's
> SoB for each commit.
> 
> https://lore.kernel.org/lkml/YiCZlhJoXPLpQ6%2FD@smile.fi.intel.com/
> https://lore.kernel.org/lkml/YiCb7LNY9tmMCZx7@smile.fi.intel.com/

When Andy said "chain is wrong", he meant the order. You must add your
SoB, otherwise I can't take the patches. But yours should be last. The
SoBs need to be in the order people worked on it.

Does that make sense to you?
Tyrone Ting May 17, 2022, 6:09 a.m. UTC | #4
Hi Wolfram:

Got it and thank you for your help.

I'll come up with the new patch set with the corrected SoBs.

Wolfram Sang <wsa@kernel.org> 於 2022年5月17日 週二 下午2:04寫道:
>
>
> > After reviewing these two links, we decided to keep only the author's
> > SoB for each commit.
> >
> > https://lore.kernel.org/lkml/YiCZlhJoXPLpQ6%2FD@smile.fi.intel.com/
> > https://lore.kernel.org/lkml/YiCb7LNY9tmMCZx7@smile.fi.intel.com/
>
> When Andy said "chain is wrong", he meant the order. You must add your
> SoB, otherwise I can't take the patches. But yours should be last. The
> SoBs need to be in the order people worked on it.
>
> Does that make sense to you?
>

Best Regards,
Tyrone
diff mbox series

Patch

diff --git a/drivers/i2c/busses/i2c-npcm7xx.c b/drivers/i2c/busses/i2c-npcm7xx.c
index 71aad029425d..e6ae11ed2d82 100644
--- a/drivers/i2c/busses/i2c-npcm7xx.c
+++ b/drivers/i2c/busses/i2c-npcm7xx.c
@@ -2236,6 +2236,7 @@  static int npcm_i2c_probe_bus(struct platform_device *pdev)
 	static struct regmap *clk_regmap;
 	int irq;
 	int ret;
+	struct device_node *np = pdev->dev.of_node;
 
 	bus = devm_kzalloc(&pdev->dev, sizeof(*bus), GFP_KERNEL);
 	if (!bus)
@@ -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);