From: Tushar Behera <tushar.behera@linaro.org> To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Cc: mturquette@linaro.org, lee.jones@linaro.org, kgene.kim@samsung.com, patches@linaro.org, Yadwinder Singh Brar <yadi.brar@samsung.com> Subject: [PATCH 2/4] clk: clk-s2mps11: Add support for clocks in S5M8767 MFD Date: Thu, 31 Oct 2013 12:18:42 +0530 [thread overview] Message-ID: <1383202124-1775-3-git-send-email-tushar.behera@linaro.org> (raw) In-Reply-To: <1383202124-1775-1-git-send-email-tushar.behera@linaro.org> Since clock operation within S2MPS11 and S5M8767 are similar, we can support both the devices within a single driver. Signed-off-by: Tushar Behera <tushar.behera@linaro.org> CC: Yadwinder Singh Brar <yadi.brar@samsung.com> CC: Mike Turquette <mturquette@linaro.org> --- drivers/clk/Kconfig | 6 ++++-- drivers/clk/clk-s2mps11.c | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig index 5c51115..7f2aef2 100644 --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig @@ -65,10 +65,12 @@ config COMMON_CLK_SI5351 generators. config COMMON_CLK_S2MPS11 - tristate "Clock driver for S2MPS11 MFD" + tristate "Clock driver for S2MPS11/S5M8767 MFD" depends on MFD_SEC_CORE ---help--- - This driver supports S2MPS11 crystal oscillator clock. + This driver supports S2MPS11/S5M8767 crystal oscillator clock. These + multi-function devices have 3 fixed-rate oscillators, clocked at + 32KHz each. config CLK_TWL6040 tristate "External McPDM functional clock from twl6040" diff --git a/drivers/clk/clk-s2mps11.c b/drivers/clk/clk-s2mps11.c index 2262cb4..19c075c 100644 --- a/drivers/clk/clk-s2mps11.c +++ b/drivers/clk/clk-s2mps11.c @@ -27,6 +27,7 @@ #include <linux/clk-provider.h> #include <linux/platform_device.h> #include <linux/mfd/samsung/s2mps11.h> +#include <linux/mfd/samsung/s5m8767.h> #include <linux/mfd/samsung/core.h> #define s2mps11_name(a) (a->hw.init->name) @@ -175,6 +176,9 @@ static int s2mps11_clk_probe(struct platform_device *pdev) case S2MPS11X: s2mps11_reg = S2MPS11_REG_RTC_CTRL; break; + case S5M8767X: + s2mps11_reg = S5M8767_REG_CTRL1; + break; default: dev_err(&pdev->dev, "Invalid device type\n"); return -EINVAL; @@ -254,6 +258,7 @@ static int s2mps11_clk_remove(struct platform_device *pdev) static const struct platform_device_id s2mps11_clk_id[] = { { "s2mps11-clk", S2MPS11X}, + { "s5m8767-clk", S5M8767X}, { }, }; MODULE_DEVICE_TABLE(platform, s2mps11_clk_id); -- 1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: tushar.behera@linaro.org (Tushar Behera) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/4] clk: clk-s2mps11: Add support for clocks in S5M8767 MFD Date: Thu, 31 Oct 2013 12:18:42 +0530 [thread overview] Message-ID: <1383202124-1775-3-git-send-email-tushar.behera@linaro.org> (raw) In-Reply-To: <1383202124-1775-1-git-send-email-tushar.behera@linaro.org> Since clock operation within S2MPS11 and S5M8767 are similar, we can support both the devices within a single driver. Signed-off-by: Tushar Behera <tushar.behera@linaro.org> CC: Yadwinder Singh Brar <yadi.brar@samsung.com> CC: Mike Turquette <mturquette@linaro.org> --- drivers/clk/Kconfig | 6 ++++-- drivers/clk/clk-s2mps11.c | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig index 5c51115..7f2aef2 100644 --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig @@ -65,10 +65,12 @@ config COMMON_CLK_SI5351 generators. config COMMON_CLK_S2MPS11 - tristate "Clock driver for S2MPS11 MFD" + tristate "Clock driver for S2MPS11/S5M8767 MFD" depends on MFD_SEC_CORE ---help--- - This driver supports S2MPS11 crystal oscillator clock. + This driver supports S2MPS11/S5M8767 crystal oscillator clock. These + multi-function devices have 3 fixed-rate oscillators, clocked at + 32KHz each. config CLK_TWL6040 tristate "External McPDM functional clock from twl6040" diff --git a/drivers/clk/clk-s2mps11.c b/drivers/clk/clk-s2mps11.c index 2262cb4..19c075c 100644 --- a/drivers/clk/clk-s2mps11.c +++ b/drivers/clk/clk-s2mps11.c @@ -27,6 +27,7 @@ #include <linux/clk-provider.h> #include <linux/platform_device.h> #include <linux/mfd/samsung/s2mps11.h> +#include <linux/mfd/samsung/s5m8767.h> #include <linux/mfd/samsung/core.h> #define s2mps11_name(a) (a->hw.init->name) @@ -175,6 +176,9 @@ static int s2mps11_clk_probe(struct platform_device *pdev) case S2MPS11X: s2mps11_reg = S2MPS11_REG_RTC_CTRL; break; + case S5M8767X: + s2mps11_reg = S5M8767_REG_CTRL1; + break; default: dev_err(&pdev->dev, "Invalid device type\n"); return -EINVAL; @@ -254,6 +258,7 @@ static int s2mps11_clk_remove(struct platform_device *pdev) static const struct platform_device_id s2mps11_clk_id[] = { { "s2mps11-clk", S2MPS11X}, + { "s5m8767-clk", S5M8767X}, { }, }; MODULE_DEVICE_TABLE(platform, s2mps11_clk_id); -- 1.7.9.5
next prev parent reply other threads:[~2013-10-31 6:51 UTC|newest] Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-10-31 6:48 [PATCH 0/4] Add support for clocks in S5M8767 Tushar Behera 2013-10-31 6:48 ` Tushar Behera 2013-10-31 6:48 ` [PATCH 1/4] clk: clk-s2mps11: Refactor for including support for other MFD clocks Tushar Behera 2013-10-31 6:48 ` Tushar Behera 2013-11-11 14:17 ` Yadwinder Singh Brar 2013-11-11 14:17 ` Yadwinder Singh Brar 2013-11-11 14:17 ` Yadwinder Singh Brar 2013-10-31 6:48 ` Tushar Behera [this message] 2013-10-31 6:48 ` [PATCH 2/4] clk: clk-s2mps11: Add support for clocks in S5M8767 MFD Tushar Behera 2013-11-11 14:18 ` Yadwinder Singh Brar 2013-11-11 14:18 ` Yadwinder Singh Brar 2013-11-11 14:18 ` Yadwinder Singh Brar 2013-10-31 6:48 ` [PATCH 3/4] mfd: sec-core: Add cells for S5M8767-clocks Tushar Behera 2013-10-31 6:48 ` Tushar Behera 2013-10-31 16:16 ` Lee Jones 2013-10-31 16:16 ` Lee Jones 2013-11-05 6:29 ` Tushar Behera 2013-11-05 6:29 ` Tushar Behera 2013-11-05 6:29 ` Tushar Behera 2013-11-05 7:57 ` Kyungmin Park 2013-11-05 7:57 ` Kyungmin Park 2013-11-05 7:57 ` Kyungmin Park 2013-11-05 8:04 ` Tushar Behera 2013-11-05 8:04 ` Tushar Behera 2013-11-05 8:04 ` Tushar Behera 2013-11-05 8:58 ` Kyungmin Park 2013-11-05 8:58 ` Kyungmin Park 2013-11-05 8:58 ` Kyungmin Park 2013-10-31 6:48 ` [PATCH 4/4] ARM: dts: Add S5M8767 clock nodes on Arndale board Tushar Behera 2013-10-31 6:48 ` Tushar Behera 2013-11-10 12:34 ` [PATCH 0/4] Add support for clocks in S5M8767 Tomasz Figa 2013-11-10 12:34 ` Tomasz Figa 2013-11-11 2:58 ` Tushar Behera 2013-11-11 2:58 ` Tushar Behera 2013-11-11 2:58 ` Tushar Behera 2013-12-24 8:57 ` Tushar Behera 2013-12-24 8:57 ` Tushar Behera 2013-12-24 8:57 ` Tushar Behera 2013-12-26 10:18 ` [PATCH RESEND " 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 2013-12-26 10:18 ` Tushar Behera 2013-12-26 10:18 ` Tushar Behera 2013-12-29 22:17 ` Mike Turquette 2013-12-29 22:17 ` Mike Turquette 2013-12-29 22:17 ` Mike Turquette 2013-12-30 4:03 ` Tushar Behera 2013-12-30 4:03 ` Tushar Behera 2013-12-30 4:03 ` Tushar Behera 2013-12-31 16:09 ` Mark Brown 2013-12-31 16:09 ` Mark Brown 2013-12-31 16:09 ` Mark Brown 2013-12-31 19:13 ` Mike Turquette 2013-12-31 19:13 ` Mike Turquette 2013-12-31 19:13 ` Mike Turquette 2013-12-26 10:18 ` [PATCH RESEND 2/4] clk: clk-s2mps11: Add support for clocks in S5M8767 MFD Tushar Behera 2013-12-26 10:18 ` Tushar Behera 2013-12-26 10:19 ` [PATCH RESEND 3/4] mfd: sec-core: Add cells for S5M8767-clocks Tushar Behera 2013-12-26 10:19 ` Tushar Behera 2014-01-06 11:22 ` Lee Jones 2014-01-06 11:22 ` Lee Jones 2013-12-26 10:19 ` [PATCH RESEND 4/4] ARM: dts: Add S5M8767 clock nodes on Arndale board Tushar Behera 2013-12-26 10:19 ` Tushar Behera
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1383202124-1775-3-git-send-email-tushar.behera@linaro.org \ --to=tushar.behera@linaro.org \ --cc=kgene.kim@samsung.com \ --cc=lee.jones@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=mturquette@linaro.org \ --cc=patches@linaro.org \ --cc=yadi.brar@samsung.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.