* [PATCH RESEND 1/4] clk: clk-s2mps11: Refactor for including support for other MFD clocks [not found] ` <mvd17-4vW-3@gated-at.bofh.it> @ 2014-01-29 10:29 ` Krzysztof Kozlowski 0 siblings, 0 replies; 6+ messages in thread From: Krzysztof Kozlowski @ 2014-01-29 10:29 UTC (permalink / raw) To: linux-arm-kernel Hi, > > Quoting Mark Brown (2013-12-31 08:09:16) > > On Mon, Dec 30, 2013 at 09:33:50AM +0530, Tushar Behera wrote: > > > > > Commit 1b1ccee1e821 "mfd: s2mps11: Fix build after regmap field rename > > > in sec-core.c" is also touching this file, which is in Mark's tree > > > right now. If I rebase > > > > It's been in Linus' tree for a while now. > > OK, so I merged the two patches into clk-next, then merged clk-next into > next-20131224 and the merge is super trivial to resolve. So I propose > that we just let it get resolved in linux-next the usual way. > > Any objections? If not I'll take these two patches into clk-next. Did you merged these patches into clk-next? Unfortunately I couldn't find them (clk-next, next). I am asking because I want to send patches with support for S2MPS14 clock (based on these patches). Best regards, Krzysztof ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 0/4] Add support for clocks in S5M8767 @ 2013-10-31 6:48 Tushar Behera 2013-12-26 10:18 ` [PATCH RESEND " Tushar Behera 0 siblings, 1 reply; 6+ messages in thread From: Tushar Behera @ 2013-10-31 6:48 UTC (permalink / raw) To: linux-arm-kernel S5M8767 chip has 3 crystal oscillators which are operated in the same as the crystal oscillators in S2MPS11. Extend s2mps11-clk driver to support clocks in S5M8767. The patches are based on next-20131030. Tushar Behera (4): clk: clk-s2mps11: Refactor for including support for other MFD clocks clk: clk-s2mps11: Add support for clocks in S5M8767 MFD mfd: sec-core: Add cells for S5M8767-clocks ARM: dts: Add S5M8767 clock nodes on Arndale board arch/arm/boot/dts/exynos5250-arndale.dts | 7 +++++++ drivers/clk/Kconfig | 6 ++++-- drivers/clk/clk-s2mps11.c | 25 +++++++++++++++++++++---- drivers/mfd/sec-core.c | 4 +++- 4 files changed, 35 insertions(+), 7 deletions(-) -- 1.7.9.5 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH RESEND 0/4] Add support for clocks in S5M8767 2013-10-31 6:48 [PATCH 0/4] Add support for clocks in S5M8767 Tushar Behera @ 2013-12-26 10:18 ` Tushar Behera 2013-12-26 10:18 ` [PATCH RESEND 1/4] clk: clk-s2mps11: Refactor for including support for other MFD clocks Tushar Behera 0 siblings, 1 reply; 6+ messages in thread From: Tushar Behera @ 2013-12-26 10:18 UTC (permalink / raw) To: linux-arm-kernel S5M8767 chip has 3 crystal oscillators which are operated in the same as the crystal oscillators in S2MPS11. Extend s2mps11-clk driver to support clocks in S5M8767. The earlier set of patches no longer apply cleanly on linux-next, hence rebased them on top of next-20131224. Tushar Behera (4): clk: clk-s2mps11: Refactor for including support for other MFD clocks clk: clk-s2mps11: Add support for clocks in S5M8767 MFD mfd: sec-core: Add cells for S5M8767-clocks ARM: dts: Add S5M8767 clock nodes on Arndale board arch/arm/boot/dts/exynos5250-arndale.dts | 7 +++++++ drivers/clk/Kconfig | 6 ++++-- drivers/clk/clk-s2mps11.c | 25 +++++++++++++++++++++---- drivers/mfd/sec-core.c | 4 +++- 4 files changed, 35 insertions(+), 7 deletions(-) -- 1.7.9.5 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH RESEND 1/4] clk: clk-s2mps11: Refactor for including support for other MFD clocks 2013-12-26 10:18 ` [PATCH RESEND " Tushar Behera @ 2013-12-26 10:18 ` Tushar Behera 2013-12-29 22:17 ` Mike Turquette 0 siblings, 1 reply; 6+ messages in thread From: Tushar Behera @ 2013-12-26 10:18 UTC (permalink / raw) To: linux-arm-kernel The clocks in S2MPS11 and S5M8767 are managed in the same way, baring a difference in the register offset. It would be better to update existing S2MPS11 driver to support the clocks in S5M8767, rather than creating an almost duplicate driver altogether. Signed-off-by: Tushar Behera <tushar.behera@linaro.org> Reviewed-by: Tomasz Figa <t.figa@samsung.com> Reviewed-by: Yadwinder Singh Brar <yadi.brar@samsung.com> CC: Mike Turquette <mturquette@linaro.org> --- drivers/clk/clk-s2mps11.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/drivers/clk/clk-s2mps11.c b/drivers/clk/clk-s2mps11.c index 00a3abe..43e25bb 100644 --- a/drivers/clk/clk-s2mps11.c +++ b/drivers/clk/clk-s2mps11.c @@ -48,6 +48,7 @@ struct s2mps11_clk { struct clk_lookup *lookup; u32 mask; bool enabled; + unsigned int reg; }; static struct s2mps11_clk *to_s2mps11_clk(struct clk_hw *hw) @@ -61,7 +62,7 @@ static int s2mps11_clk_prepare(struct clk_hw *hw) int ret; ret = regmap_update_bits(s2mps11->iodev->regmap_pmic, - S2MPS11_REG_RTC_CTRL, + s2mps11->reg, s2mps11->mask, s2mps11->mask); if (!ret) s2mps11->enabled = true; @@ -74,7 +75,7 @@ static void s2mps11_clk_unprepare(struct clk_hw *hw) struct s2mps11_clk *s2mps11 = to_s2mps11_clk(hw); int ret; - ret = regmap_update_bits(s2mps11->iodev->regmap_pmic, S2MPS11_REG_RTC_CTRL, + ret = regmap_update_bits(s2mps11->iodev->regmap_pmic, s2mps11->reg, s2mps11->mask, ~s2mps11->mask); if (!ret) @@ -155,6 +156,7 @@ static int s2mps11_clk_probe(struct platform_device *pdev) struct sec_pmic_dev *iodev = dev_get_drvdata(pdev->dev.parent); struct s2mps11_clk *s2mps11_clks, *s2mps11_clk; struct device_node *clk_np = NULL; + unsigned int s2mps11_reg; int i, ret = 0; u32 val; @@ -169,13 +171,23 @@ static int s2mps11_clk_probe(struct platform_device *pdev) if (IS_ERR(clk_np)) return PTR_ERR(clk_np); + switch(platform_get_device_id(pdev)->driver_data) { + case S2MPS11X: + s2mps11_reg = S2MPS11_REG_RTC_CTRL; + break; + default: + dev_err(&pdev->dev, "Invalid device type\n"); + return -EINVAL; + }; + for (i = 0; i < S2MPS11_CLKS_NUM; i++, s2mps11_clk++) { s2mps11_clk->iodev = iodev; s2mps11_clk->hw.init = &s2mps11_clks_init[i]; s2mps11_clk->mask = 1 << i; + s2mps11_clk->reg = s2mps11_reg; ret = regmap_read(s2mps11_clk->iodev->regmap_pmic, - S2MPS11_REG_RTC_CTRL, &val); + s2mps11_clk->reg, &val); if (ret < 0) goto err_reg; @@ -241,7 +253,7 @@ static int s2mps11_clk_remove(struct platform_device *pdev) } static const struct platform_device_id s2mps11_clk_id[] = { - { "s2mps11-clk", 0}, + { "s2mps11-clk", S2MPS11X}, { }, }; MODULE_DEVICE_TABLE(platform, s2mps11_clk_id); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH RESEND 1/4] clk: clk-s2mps11: Refactor for including support for other MFD clocks 2013-12-26 10:18 ` [PATCH RESEND 1/4] clk: clk-s2mps11: Refactor for including support for other MFD clocks Tushar Behera @ 2013-12-29 22:17 ` Mike Turquette 2013-12-30 4:03 ` Tushar Behera 0 siblings, 1 reply; 6+ messages in thread From: Mike Turquette @ 2013-12-29 22:17 UTC (permalink / raw) To: linux-arm-kernel Quoting Tushar Behera (2013-12-26 02:18:58) > The clocks in S2MPS11 and S5M8767 are managed in the same way, baring > a difference in the register offset. It would be better to update > existing S2MPS11 driver to support the clocks in S5M8767, rather than > creating an almost duplicate driver altogether. Can you rebase patches #1 & #2 onto clk-next? They do not apply cleanly as-is. Regards, Mike > > Signed-off-by: Tushar Behera <tushar.behera@linaro.org> > Reviewed-by: Tomasz Figa <t.figa@samsung.com> > Reviewed-by: Yadwinder Singh Brar <yadi.brar@samsung.com> > CC: Mike Turquette <mturquette@linaro.org> > --- > drivers/clk/clk-s2mps11.c | 20 ++++++++++++++++---- > 1 file changed, 16 insertions(+), 4 deletions(-) > > diff --git a/drivers/clk/clk-s2mps11.c b/drivers/clk/clk-s2mps11.c > index 00a3abe..43e25bb 100644 > --- a/drivers/clk/clk-s2mps11.c > +++ b/drivers/clk/clk-s2mps11.c > @@ -48,6 +48,7 @@ struct s2mps11_clk { > struct clk_lookup *lookup; > u32 mask; > bool enabled; > + unsigned int reg; > }; > > static struct s2mps11_clk *to_s2mps11_clk(struct clk_hw *hw) > @@ -61,7 +62,7 @@ static int s2mps11_clk_prepare(struct clk_hw *hw) > int ret; > > ret = regmap_update_bits(s2mps11->iodev->regmap_pmic, > - S2MPS11_REG_RTC_CTRL, > + s2mps11->reg, > s2mps11->mask, s2mps11->mask); > if (!ret) > s2mps11->enabled = true; > @@ -74,7 +75,7 @@ static void s2mps11_clk_unprepare(struct clk_hw *hw) > struct s2mps11_clk *s2mps11 = to_s2mps11_clk(hw); > int ret; > > - ret = regmap_update_bits(s2mps11->iodev->regmap_pmic, S2MPS11_REG_RTC_CTRL, > + ret = regmap_update_bits(s2mps11->iodev->regmap_pmic, s2mps11->reg, > s2mps11->mask, ~s2mps11->mask); > > if (!ret) > @@ -155,6 +156,7 @@ static int s2mps11_clk_probe(struct platform_device *pdev) > struct sec_pmic_dev *iodev = dev_get_drvdata(pdev->dev.parent); > struct s2mps11_clk *s2mps11_clks, *s2mps11_clk; > struct device_node *clk_np = NULL; > + unsigned int s2mps11_reg; > int i, ret = 0; > u32 val; > > @@ -169,13 +171,23 @@ static int s2mps11_clk_probe(struct platform_device *pdev) > if (IS_ERR(clk_np)) > return PTR_ERR(clk_np); > > + switch(platform_get_device_id(pdev)->driver_data) { > + case S2MPS11X: > + s2mps11_reg = S2MPS11_REG_RTC_CTRL; > + break; > + default: > + dev_err(&pdev->dev, "Invalid device type\n"); > + return -EINVAL; > + }; > + > for (i = 0; i < S2MPS11_CLKS_NUM; i++, s2mps11_clk++) { > s2mps11_clk->iodev = iodev; > s2mps11_clk->hw.init = &s2mps11_clks_init[i]; > s2mps11_clk->mask = 1 << i; > + s2mps11_clk->reg = s2mps11_reg; > > ret = regmap_read(s2mps11_clk->iodev->regmap_pmic, > - S2MPS11_REG_RTC_CTRL, &val); > + s2mps11_clk->reg, &val); > if (ret < 0) > goto err_reg; > > @@ -241,7 +253,7 @@ static int s2mps11_clk_remove(struct platform_device *pdev) > } > > static const struct platform_device_id s2mps11_clk_id[] = { > - { "s2mps11-clk", 0}, > + { "s2mps11-clk", S2MPS11X}, > { }, > }; > MODULE_DEVICE_TABLE(platform, s2mps11_clk_id); > -- > 1.7.9.5 > ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH RESEND 1/4] clk: clk-s2mps11: Refactor for including support for other MFD clocks 2013-12-29 22:17 ` Mike Turquette @ 2013-12-30 4:03 ` Tushar Behera 2013-12-31 16:09 ` Mark Brown 0 siblings, 1 reply; 6+ messages in thread From: Tushar Behera @ 2013-12-30 4:03 UTC (permalink / raw) To: linux-arm-kernel On 30 December 2013 03:47, Mike Turquette <mturquette@linaro.org> wrote: > Quoting Tushar Behera (2013-12-26 02:18:58) >> The clocks in S2MPS11 and S5M8767 are managed in the same way, baring >> a difference in the register offset. It would be better to update >> existing S2MPS11 driver to support the clocks in S5M8767, rather than >> creating an almost duplicate driver altogether. > > Can you rebase patches #1 & #2 onto clk-next? They do not apply cleanly > as-is. > > Regards, > Mike > Commit 1b1ccee1e821 "mfd: s2mps11: Fix build after regmap field rename in sec-core.c" is also touching this file, which is in Mark's tree right now. If I rebase this patch on top clk-next, I am getting conflicts when I merge that with linux-next. Let me know how you want to handle this. I am attaching the rebased patches for your reference. If you want, I will send them again through git-send-email. -- Tushar Behera -------------- next part -------------- A non-text attachment was scrubbed... Name: 0001-clk-clk-s2mps11-Refactor-for-including-support-for-o.patch Type: text/x-patch Size: 2904 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131230/fbd9b99e/attachment.bin> -------------- next part -------------- A non-text attachment was scrubbed... Name: 0002-clk-clk-s2mps11-Add-support-for-clocks-in-S5M8767-MF.patch Type: text/x-patch Size: 2224 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131230/fbd9b99e/attachment-0001.bin> ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH RESEND 1/4] clk: clk-s2mps11: Refactor for including support for other MFD clocks 2013-12-30 4:03 ` Tushar Behera @ 2013-12-31 16:09 ` Mark Brown 2013-12-31 19:13 ` Mike Turquette 0 siblings, 1 reply; 6+ messages in thread From: Mark Brown @ 2013-12-31 16:09 UTC (permalink / raw) To: linux-arm-kernel On Mon, Dec 30, 2013 at 09:33:50AM +0530, Tushar Behera wrote: > Commit 1b1ccee1e821 "mfd: s2mps11: Fix build after regmap field rename > in sec-core.c" is also touching this file, which is in Mark's tree > right now. If I rebase It's been in Linus' tree for a while now. -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131231/154498c4/attachment.sig> ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH RESEND 1/4] clk: clk-s2mps11: Refactor for including support for other MFD clocks 2013-12-31 16:09 ` Mark Brown @ 2013-12-31 19:13 ` Mike Turquette 0 siblings, 0 replies; 6+ messages in thread From: Mike Turquette @ 2013-12-31 19:13 UTC (permalink / raw) To: linux-arm-kernel Quoting Mark Brown (2013-12-31 08:09:16) > On Mon, Dec 30, 2013 at 09:33:50AM +0530, Tushar Behera wrote: > > > Commit 1b1ccee1e821 "mfd: s2mps11: Fix build after regmap field rename > > in sec-core.c" is also touching this file, which is in Mark's tree > > right now. If I rebase > > It's been in Linus' tree for a while now. OK, so I merged the two patches into clk-next, then merged clk-next into next-20131224 and the merge is super trivial to resolve. So I propose that we just let it get resolved in linux-next the usual way. Any objections? If not I'll take these two patches into clk-next. Regards, Mike ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-01-29 10:29 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <m8Uox-5kN-11@gated-at.bofh.it>
[not found] ` <mtgmt-44E-3@gated-at.bofh.it>
[not found] ` <mtgmu-44E-27@gated-at.bofh.it>
[not found] ` <muwSe-WJ-17@gated-at.bofh.it>
[not found] ` <muCkW-RP-15@gated-at.bofh.it>
[not found] ` <mva3f-bR-7@gated-at.bofh.it>
[not found] ` <mvd17-4vW-3@gated-at.bofh.it>
2014-01-29 10:29 ` [PATCH RESEND 1/4] clk: clk-s2mps11: Refactor for including support for other MFD clocks Krzysztof Kozlowski
2013-10-31 6:48 [PATCH 0/4] Add support for clocks in S5M8767 Tushar Behera
2013-12-26 10:18 ` [PATCH RESEND " Tushar Behera
2013-12-26 10:18 ` [PATCH RESEND 1/4] clk: clk-s2mps11: Refactor for including support for other MFD clocks Tushar Behera
2013-12-29 22:17 ` Mike Turquette
2013-12-30 4:03 ` Tushar Behera
2013-12-31 16:09 ` Mark Brown
2013-12-31 19:13 ` Mike Turquette
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox