From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752715Ab3L2WR3 (ORCPT ); Sun, 29 Dec 2013 17:17:29 -0500 Received: from mail-yh0-f54.google.com ([209.85.213.54]:58121 "EHLO mail-yh0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752469Ab3L2WR2 convert rfc822-to-8bit (ORCPT ); Sun, 29 Dec 2013 17:17:28 -0500 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8BIT To: Tushar Behera , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org From: Mike Turquette In-Reply-To: <1388053141-30085-2-git-send-email-tushar.behera@linaro.org> Cc: lee.jones@linaro.org, kgene.kim@samsung.com, patches@linaro.org References: <1383202124-1775-1-git-send-email-tushar.behera@linaro.org> <1388053141-30085-1-git-send-email-tushar.behera@linaro.org> <1388053141-30085-2-git-send-email-tushar.behera@linaro.org> Message-ID: <20131229221723.12054.40917@quantum> User-Agent: alot/0.3.5 Subject: Re: [PATCH RESEND 1/4] clk: clk-s2mps11: Refactor for including support for other MFD clocks Date: Sun, 29 Dec 2013 14:17:23 -0800 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > Reviewed-by: Tomasz Figa > Reviewed-by: Yadwinder Singh Brar > CC: Mike Turquette > --- > 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 > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mike Turquette Subject: Re: [PATCH RESEND 1/4] clk: clk-s2mps11: Refactor for including support for other MFD clocks Date: Sun, 29 Dec 2013 14:17:23 -0800 Message-ID: <20131229221723.12054.40917@quantum> References: <1383202124-1775-1-git-send-email-tushar.behera@linaro.org> <1388053141-30085-1-git-send-email-tushar.behera@linaro.org> <1388053141-30085-2-git-send-email-tushar.behera@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1388053141-30085-2-git-send-email-tushar.behera@linaro.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: Tushar Behera , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Cc: kgene.kim@samsung.com, lee.jones@linaro.org, patches@linaro.org List-Id: linux-samsung-soc@vger.kernel.org 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 > Reviewed-by: Tomasz Figa > Reviewed-by: Yadwinder Singh Brar > CC: Mike Turquette > --- > 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 > From mboxrd@z Thu Jan 1 00:00:00 1970 From: mturquette@linaro.org (Mike Turquette) Date: Sun, 29 Dec 2013 14:17:23 -0800 Subject: [PATCH RESEND 1/4] clk: clk-s2mps11: Refactor for including support for other MFD clocks In-Reply-To: <1388053141-30085-2-git-send-email-tushar.behera@linaro.org> References: <1383202124-1775-1-git-send-email-tushar.behera@linaro.org> <1388053141-30085-1-git-send-email-tushar.behera@linaro.org> <1388053141-30085-2-git-send-email-tushar.behera@linaro.org> Message-ID: <20131229221723.12054.40917@quantum> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 > Reviewed-by: Tomasz Figa > Reviewed-by: Yadwinder Singh Brar > CC: Mike Turquette > --- > 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 >