Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1255891 > unrolled thread

[PATCH v3 4/5] clk: s2mps15: Add support for S2MPS15 clocks

Started byAlim Akhtar <alim.akhtar@samsung.com>
First post2015-10-26 14:10 +0100
Last post2015-10-28 06:40 +0100
Articles 7 — 2 participants

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  [PATCH v3 4/5] clk: s2mps15: Add support for S2MPS15 clocks Alim Akhtar <alim.akhtar@samsung.com> - 2015-10-26 14:10 +0100
    Re: [PATCH v3 4/5] clk: s2mps15: Add support for S2MPS15 clocks Krzysztof Kozlowski <k.kozlowski@samsung.com> - 2015-10-28 02:30 +0100
      Re: [PATCH v3 4/5] clk: s2mps15: Add support for S2MPS15 clocks Alim Akhtar <alim.akhtar@samsung.com> - 2015-10-28 04:50 +0100
    Re: [PATCH v3 4/5] clk: s2mps15: Add support for S2MPS15 clocks Krzysztof Kozlowski <k.kozlowski@samsung.com> - 2015-10-28 02:30 +0100
      Re: [PATCH v3 4/5] clk: s2mps15: Add support for S2MPS15 clocks Krzysztof Kozlowski <k.kozlowski@samsung.com> - 2015-10-28 05:40 +0100
        Re: [PATCH v3 4/5] clk: s2mps15: Add support for S2MPS15 clocks Alim Akhtar <alim.akhtar@samsung.com> - 2015-10-28 06:10 +0100
          Re: [PATCH v3 4/5] clk: s2mps15: Add support for S2MPS15 clocks Krzysztof Kozlowski <k.kozlowski@samsung.com> - 2015-10-28 06:40 +0100

#1255891 — [PATCH v3 4/5] clk: s2mps15: Add support for S2MPS15 clocks

FromAlim Akhtar <alim.akhtar@samsung.com>
Date2015-10-26 14:10 +0100
Subject[PATCH v3 4/5] clk: s2mps15: Add support for S2MPS15 clocks
Message-ID<qnPHc-cN-19@gated-at.bofh.it>
S2MPS15 PMIC has three 32k buffered clocks outputs. This patch
adds supports for the same to the s2mps11 clock driver.

Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
---
 drivers/clk/Kconfig       |    5 +++--
 drivers/clk/clk-s2mps11.c |   24 ++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index a1fa61159179..037a314b5d76 100644
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -120,9 +120,10 @@ config COMMON_CLK_S2MPS11
 	tristate "Clock driver for S2MPS1X/S5M8767 MFD"
 	depends on MFD_SEC_CORE
 	---help---
-	  This driver supports S2MPS11/S2MPS14/S5M8767 crystal oscillator
+	  This driver supports S2MPS1X/S5M8767 crystal oscillator
 	  clock. These multi-function devices have two (S2MPS14) or three
-	  (S2MPS11, S5M8767) fixed-rate oscillators, clocked at 32KHz each.
+	  (S2MPS11/S2MPS13/S2MPS15/S5M8767) 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 d266299dfdb1..455500dca653 100644
--- a/drivers/clk/clk-s2mps11.c
+++ b/drivers/clk/clk-s2mps11.c
@@ -25,6 +25,7 @@
 #include <linux/mfd/samsung/s2mps11.h>
 #include <linux/mfd/samsung/s2mps13.h>
 #include <linux/mfd/samsung/s2mps14.h>
+#include <linux/mfd/samsung/s2mps15.h>
 #include <linux/mfd/samsung/s5m8767.h>
 #include <linux/mfd/samsung/core.h>
 
@@ -148,6 +149,24 @@ static struct clk_init_data s2mps14_clks_init[S2MPS11_CLKS_NUM] = {
 	},
 };
 
+static struct clk_init_data s2mps15_clks_init[S2MPS11_CLKS_NUM] = {
+	[S2MPS11_CLK_AP] = {
+		.name = "s2mps15_ap",
+		.ops = &s2mps11_clk_ops,
+		.flags = CLK_IS_ROOT,
+	},
+	[S2MPS11_CLK_CP] = {
+		.name = "s2mps15_cp",
+		.ops = &s2mps11_clk_ops,
+		.flags = CLK_IS_ROOT,
+	},
+	[S2MPS11_CLK_BT] = {
+		.name = "s2mps15_bt",
+		.ops = &s2mps11_clk_ops,
+		.flags = CLK_IS_ROOT,
+	},
+};
+
 static struct device_node *s2mps11_clk_parse_dt(struct platform_device *pdev,
 		struct clk_init_data *clks_init)
 {
@@ -207,6 +226,10 @@ static int s2mps11_clk_probe(struct platform_device *pdev)
 		s2mps11_reg = S2MPS14_REG_RTCCTRL;
 		clks_init = s2mps14_clks_init;
 		break;
+	case S2MPS15X:
+		s2mps11_reg = S2MPS15_REG_RTC_BUF;
+		clks_init = s2mps15_clks_init;
+		break;
 	case S5M8767X:
 		s2mps11_reg = S5M8767_REG_CTRL1;
 		clks_init = s2mps11_clks_init;
@@ -292,6 +315,7 @@ static const struct platform_device_id s2mps11_clk_id[] = {
 	{ "s2mps11-clk", S2MPS11X},
 	{ "s2mps13-clk", S2MPS13X},
 	{ "s2mps14-clk", S2MPS14X},
+	{ "s2mps15-clk", S2MPS15X},
 	{ "s5m8767-clk", S5M8767X},
 	{ },
 };
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]

#1257553

FromKrzysztof Kozlowski <k.kozlowski@samsung.com>
Date2015-10-28 02:30 +0100
Message-ID<qonIR-4nq-1@gated-at.bofh.it>
In reply to#1255891
On 26.10.2015 21:51, Alim Akhtar wrote:
> S2MPS15 PMIC has three 32k buffered clocks outputs. This patch
> adds supports for the same to the s2mps11 clock driver.
> 
> Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
> ---
>  drivers/clk/Kconfig       |    5 +++--
>  drivers/clk/clk-s2mps11.c |   24 ++++++++++++++++++++++++
>  2 files changed, 27 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
> index a1fa61159179..037a314b5d76 100644
> --- a/drivers/clk/Kconfig
> +++ b/drivers/clk/Kconfig
> @@ -120,9 +120,10 @@ config COMMON_CLK_S2MPS11
>  	tristate "Clock driver for S2MPS1X/S5M8767 MFD"
>  	depends on MFD_SEC_CORE
>  	---help---
> -	  This driver supports S2MPS11/S2MPS14/S5M8767 crystal oscillator
> +	  This driver supports S2MPS1X/S5M8767 crystal oscillator
>  	  clock. These multi-function devices have two (S2MPS14) or three
> -	  (S2MPS11, S5M8767) fixed-rate oscillators, clocked at 32KHz each.
> +	  (S2MPS11/S2MPS13/S2MPS15/S5M8767) 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 d266299dfdb1..455500dca653 100644
> --- a/drivers/clk/clk-s2mps11.c
> +++ b/drivers/clk/clk-s2mps11.c
> @@ -25,6 +25,7 @@
>  #include <linux/mfd/samsung/s2mps11.h>
>  #include <linux/mfd/samsung/s2mps13.h>
>  #include <linux/mfd/samsung/s2mps14.h>
> +#include <linux/mfd/samsung/s2mps15.h>
>  #include <linux/mfd/samsung/s5m8767.h>
>  #include <linux/mfd/samsung/core.h>
>  
> @@ -148,6 +149,24 @@ static struct clk_init_data s2mps14_clks_init[S2MPS11_CLKS_NUM] = {
>  	},
>  };
>  
> +static struct clk_init_data s2mps15_clks_init[S2MPS11_CLKS_NUM] = {
> +	[S2MPS11_CLK_AP] = {
> +		.name = "s2mps15_ap",
> +		.ops = &s2mps11_clk_ops,
> +		.flags = CLK_IS_ROOT,
> +	},
> +	[S2MPS11_CLK_CP] = {
> +		.name = "s2mps15_cp",
> +		.ops = &s2mps11_clk_ops,
> +		.flags = CLK_IS_ROOT,
> +	},
> +	[S2MPS11_CLK_BT] = {
> +		.name = "s2mps15_bt",
> +		.ops = &s2mps11_clk_ops,
> +		.flags = CLK_IS_ROOT,
> +	},
> +};

I see that for S2MPS13 we already added similar array which duplicates
the S2MPS11. This actually looks wrong. Just re-use existing
s2mps11_clks_init.

Best regards,
Krzysztof

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1257644

FromAlim Akhtar <alim.akhtar@samsung.com>
Date2015-10-28 04:50 +0100
Message-ID<qopUm-5KM-9@gated-at.bofh.it>
In reply to#1257553
Hello

On 10/28/2015 06:52 AM, Krzysztof Kozlowski wrote:
> On 26.10.2015 21:51, Alim Akhtar wrote:
>> S2MPS15 PMIC has three 32k buffered clocks outputs. This patch
>> adds supports for the same to the s2mps11 clock driver.
>>
>> Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
>> ---
>>   drivers/clk/Kconfig       |    5 +++--
>>   drivers/clk/clk-s2mps11.c |   24 ++++++++++++++++++++++++
>>   2 files changed, 27 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
>> index a1fa61159179..037a314b5d76 100644
>> --- a/drivers/clk/Kconfig
>> +++ b/drivers/clk/Kconfig
>> @@ -120,9 +120,10 @@ config COMMON_CLK_S2MPS11
>>   	tristate "Clock driver for S2MPS1X/S5M8767 MFD"
>>   	depends on MFD_SEC_CORE
>>   	---help---
>> -	  This driver supports S2MPS11/S2MPS14/S5M8767 crystal oscillator
>> +	  This driver supports S2MPS1X/S5M8767 crystal oscillator
>>   	  clock. These multi-function devices have two (S2MPS14) or three
>> -	  (S2MPS11, S5M8767) fixed-rate oscillators, clocked at 32KHz each.
>> +	  (S2MPS11/S2MPS13/S2MPS15/S5M8767) 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 d266299dfdb1..455500dca653 100644
>> --- a/drivers/clk/clk-s2mps11.c
>> +++ b/drivers/clk/clk-s2mps11.c
>> @@ -25,6 +25,7 @@
>>   #include <linux/mfd/samsung/s2mps11.h>
>>   #include <linux/mfd/samsung/s2mps13.h>
>>   #include <linux/mfd/samsung/s2mps14.h>
>> +#include <linux/mfd/samsung/s2mps15.h>
>>   #include <linux/mfd/samsung/s5m8767.h>
>>   #include <linux/mfd/samsung/core.h>
>>
>> @@ -148,6 +149,24 @@ static struct clk_init_data s2mps14_clks_init[S2MPS11_CLKS_NUM] = {
>>   	},
>>   };
>>
>> +static struct clk_init_data s2mps15_clks_init[S2MPS11_CLKS_NUM] = {
>> +	[S2MPS11_CLK_AP] = {
>> +		.name = "s2mps15_ap",
>> +		.ops = &s2mps11_clk_ops,
>> +		.flags = CLK_IS_ROOT,
>> +	},
>> +	[S2MPS11_CLK_CP] = {
>> +		.name = "s2mps15_cp",
>> +		.ops = &s2mps11_clk_ops,
>> +		.flags = CLK_IS_ROOT,
>> +	},
>> +	[S2MPS11_CLK_BT] = {
>> +		.name = "s2mps15_bt",
>> +		.ops = &s2mps11_clk_ops,
>> +		.flags = CLK_IS_ROOT,
>> +	},
>> +};
>
> I see that for S2MPS13 we already added similar array which duplicates
> the S2MPS11. This actually looks wrong. Just re-use existing
> s2mps11_clks_init.
>
hmm..ok will do.
> Best regards,
> Krzysztof
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1257554

FromKrzysztof Kozlowski <k.kozlowski@samsung.com>
Date2015-10-28 02:30 +0100
Message-ID<qonIR-4nq-3@gated-at.bofh.it>
In reply to#1255891
On 26.10.2015 21:51, Alim Akhtar wrote:
> S2MPS15 PMIC has three 32k buffered clocks outputs. This patch
> adds supports for the same to the s2mps11 clock driver.
> 
> Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
> ---
>  drivers/clk/Kconfig       |    5 +++--
>  drivers/clk/clk-s2mps11.c |   24 ++++++++++++++++++++++++
>  2 files changed, 27 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
> index a1fa61159179..037a314b5d76 100644
> --- a/drivers/clk/Kconfig
> +++ b/drivers/clk/Kconfig
> @@ -120,9 +120,10 @@ config COMMON_CLK_S2MPS11
>  	tristate "Clock driver for S2MPS1X/S5M8767 MFD"
>  	depends on MFD_SEC_CORE
>  	---help---
> -	  This driver supports S2MPS11/S2MPS14/S5M8767 crystal oscillator
> +	  This driver supports S2MPS1X/S5M8767 crystal oscillator
>  	  clock. These multi-function devices have two (S2MPS14) or three
> -	  (S2MPS11, S5M8767) fixed-rate oscillators, clocked at 32KHz each.
> +	  (S2MPS11/S2MPS13/S2MPS15/S5M8767) 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 d266299dfdb1..455500dca653 100644
> --- a/drivers/clk/clk-s2mps11.c
> +++ b/drivers/clk/clk-s2mps11.c
> @@ -25,6 +25,7 @@
>  #include <linux/mfd/samsung/s2mps11.h>
>  #include <linux/mfd/samsung/s2mps13.h>
>  #include <linux/mfd/samsung/s2mps14.h>
> +#include <linux/mfd/samsung/s2mps15.h>
>  #include <linux/mfd/samsung/s5m8767.h>
>  #include <linux/mfd/samsung/core.h>
>  
> @@ -148,6 +149,24 @@ static struct clk_init_data s2mps14_clks_init[S2MPS11_CLKS_NUM] = {
>  	},
>  };
>  
> +static struct clk_init_data s2mps15_clks_init[S2MPS11_CLKS_NUM] = {
> +	[S2MPS11_CLK_AP] = {
> +		.name = "s2mps15_ap",
> +		.ops = &s2mps11_clk_ops,
> +		.flags = CLK_IS_ROOT,
> +	},
> +	[S2MPS11_CLK_CP] = {
> +		.name = "s2mps15_cp",
> +		.ops = &s2mps11_clk_ops,
> +		.flags = CLK_IS_ROOT,
> +	},
> +	[S2MPS11_CLK_BT] = {
> +		.name = "s2mps15_bt",
> +		.ops = &s2mps11_clk_ops,
> +		.flags = CLK_IS_ROOT,
> +	},
> +};
> +
>  static struct device_node *s2mps11_clk_parse_dt(struct platform_device *pdev,
>  		struct clk_init_data *clks_init)
>  {
> @@ -207,6 +226,10 @@ static int s2mps11_clk_probe(struct platform_device *pdev)
>  		s2mps11_reg = S2MPS14_REG_RTCCTRL;
>  		clks_init = s2mps14_clks_init;
>  		break;
> +	case S2MPS15X:
> +		s2mps11_reg = S2MPS15_REG_RTC_BUF;
> +		clks_init = s2mps15_clks_init;

Another question (after looking at RTC driver):
Is this the same register address as S2MPS14?

Best regards,
Krzysztof

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1257652

FromKrzysztof Kozlowski <k.kozlowski@samsung.com>
Date2015-10-28 05:40 +0100
Message-ID<qoqGJ-6g5-13@gated-at.bofh.it>
In reply to#1257554
On 28.10.2015 10:26, Krzysztof Kozlowski wrote:
> On 26.10.2015 21:51, Alim Akhtar wrote:
>> S2MPS15 PMIC has three 32k buffered clocks outputs. This patch
>> adds supports for the same to the s2mps11 clock driver.
>>
>> Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
>> ---
>>  drivers/clk/Kconfig       |    5 +++--
>>  drivers/clk/clk-s2mps11.c |   24 ++++++++++++++++++++++++
>>  2 files changed, 27 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
>> index a1fa61159179..037a314b5d76 100644
>> --- a/drivers/clk/Kconfig
>> +++ b/drivers/clk/Kconfig
>> @@ -120,9 +120,10 @@ config COMMON_CLK_S2MPS11
>>  	tristate "Clock driver for S2MPS1X/S5M8767 MFD"
>>  	depends on MFD_SEC_CORE
>>  	---help---
>> -	  This driver supports S2MPS11/S2MPS14/S5M8767 crystal oscillator
>> +	  This driver supports S2MPS1X/S5M8767 crystal oscillator
>>  	  clock. These multi-function devices have two (S2MPS14) or three
>> -	  (S2MPS11, S5M8767) fixed-rate oscillators, clocked at 32KHz each.
>> +	  (S2MPS11/S2MPS13/S2MPS15/S5M8767) 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 d266299dfdb1..455500dca653 100644
>> --- a/drivers/clk/clk-s2mps11.c
>> +++ b/drivers/clk/clk-s2mps11.c
>> @@ -25,6 +25,7 @@
>>  #include <linux/mfd/samsung/s2mps11.h>
>>  #include <linux/mfd/samsung/s2mps13.h>
>>  #include <linux/mfd/samsung/s2mps14.h>
>> +#include <linux/mfd/samsung/s2mps15.h>
>>  #include <linux/mfd/samsung/s5m8767.h>
>>  #include <linux/mfd/samsung/core.h>
>>  
>> @@ -148,6 +149,24 @@ static struct clk_init_data s2mps14_clks_init[S2MPS11_CLKS_NUM] = {
>>  	},
>>  };
>>  
>> +static struct clk_init_data s2mps15_clks_init[S2MPS11_CLKS_NUM] = {
>> +	[S2MPS11_CLK_AP] = {
>> +		.name = "s2mps15_ap",
>> +		.ops = &s2mps11_clk_ops,
>> +		.flags = CLK_IS_ROOT,
>> +	},
>> +	[S2MPS11_CLK_CP] = {
>> +		.name = "s2mps15_cp",
>> +		.ops = &s2mps11_clk_ops,
>> +		.flags = CLK_IS_ROOT,
>> +	},
>> +	[S2MPS11_CLK_BT] = {
>> +		.name = "s2mps15_bt",
>> +		.ops = &s2mps11_clk_ops,
>> +		.flags = CLK_IS_ROOT,
>> +	},
>> +};
>> +
>>  static struct device_node *s2mps11_clk_parse_dt(struct platform_device *pdev,
>>  		struct clk_init_data *clks_init)
>>  {
>> @@ -207,6 +226,10 @@ static int s2mps11_clk_probe(struct platform_device *pdev)
>>  		s2mps11_reg = S2MPS14_REG_RTCCTRL;
>>  		clks_init = s2mps14_clks_init;
>>  		break;
>> +	case S2MPS15X:
>> +		s2mps11_reg = S2MPS15_REG_RTC_BUF;
>> +		clks_init = s2mps15_clks_init;
> 
> Another question (after looking at RTC driver):
> Is this the same register address as S2MPS14?

I found the answer - this is the same address as in S2MPS13 and S2MPS14:
0xc. The S2MPS14 has only two clocks though but S2MPS13 has three.
Again, as in RTC, you should re-use existing support.

It looks there is no need for this patch at all.

Best regards,
Krzysztof
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1257659

FromAlim Akhtar <alim.akhtar@samsung.com>
Date2015-10-28 06:10 +0100
Message-ID<qor9M-6GJ-11@gated-at.bofh.it>
In reply to#1257652

On 10/28/2015 10:04 AM, Krzysztof Kozlowski wrote:
> On 28.10.2015 10:26, Krzysztof Kozlowski wrote:
>> On 26.10.2015 21:51, Alim Akhtar wrote:
>>> S2MPS15 PMIC has three 32k buffered clocks outputs. This patch
>>> adds supports for the same to the s2mps11 clock driver.
>>>
>>> Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
>>> ---
>>>   drivers/clk/Kconfig       |    5 +++--
>>>   drivers/clk/clk-s2mps11.c |   24 ++++++++++++++++++++++++
>>>   2 files changed, 27 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
>>> index a1fa61159179..037a314b5d76 100644
>>> --- a/drivers/clk/Kconfig
>>> +++ b/drivers/clk/Kconfig
>>> @@ -120,9 +120,10 @@ config COMMON_CLK_S2MPS11
>>>   	tristate "Clock driver for S2MPS1X/S5M8767 MFD"
>>>   	depends on MFD_SEC_CORE
>>>   	---help---
>>> -	  This driver supports S2MPS11/S2MPS14/S5M8767 crystal oscillator
>>> +	  This driver supports S2MPS1X/S5M8767 crystal oscillator
>>>   	  clock. These multi-function devices have two (S2MPS14) or three
>>> -	  (S2MPS11, S5M8767) fixed-rate oscillators, clocked at 32KHz each.
>>> +	  (S2MPS11/S2MPS13/S2MPS15/S5M8767) 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 d266299dfdb1..455500dca653 100644
>>> --- a/drivers/clk/clk-s2mps11.c
>>> +++ b/drivers/clk/clk-s2mps11.c
>>> @@ -25,6 +25,7 @@
>>>   #include <linux/mfd/samsung/s2mps11.h>
>>>   #include <linux/mfd/samsung/s2mps13.h>
>>>   #include <linux/mfd/samsung/s2mps14.h>
>>> +#include <linux/mfd/samsung/s2mps15.h>
>>>   #include <linux/mfd/samsung/s5m8767.h>
>>>   #include <linux/mfd/samsung/core.h>
>>>
>>> @@ -148,6 +149,24 @@ static struct clk_init_data s2mps14_clks_init[S2MPS11_CLKS_NUM] = {
>>>   	},
>>>   };
>>>
>>> +static struct clk_init_data s2mps15_clks_init[S2MPS11_CLKS_NUM] = {
>>> +	[S2MPS11_CLK_AP] = {
>>> +		.name = "s2mps15_ap",
>>> +		.ops = &s2mps11_clk_ops,
>>> +		.flags = CLK_IS_ROOT,
>>> +	},
>>> +	[S2MPS11_CLK_CP] = {
>>> +		.name = "s2mps15_cp",
>>> +		.ops = &s2mps11_clk_ops,
>>> +		.flags = CLK_IS_ROOT,
>>> +	},
>>> +	[S2MPS11_CLK_BT] = {
>>> +		.name = "s2mps15_bt",
>>> +		.ops = &s2mps11_clk_ops,
>>> +		.flags = CLK_IS_ROOT,
>>> +	},
>>> +};
>>> +
>>>   static struct device_node *s2mps11_clk_parse_dt(struct platform_device *pdev,
>>>   		struct clk_init_data *clks_init)
>>>   {
>>> @@ -207,6 +226,10 @@ static int s2mps11_clk_probe(struct platform_device *pdev)
>>>   		s2mps11_reg = S2MPS14_REG_RTCCTRL;
>>>   		clks_init = s2mps14_clks_init;
>>>   		break;
>>> +	case S2MPS15X:
>>> +		s2mps11_reg = S2MPS15_REG_RTC_BUF;
>>> +		clks_init = s2mps15_clks_init;
>>
>> Another question (after looking at RTC driver):
>> Is this the same register address as S2MPS14?
>
> I found the answer - this is the same address as in S2MPS13 and S2MPS14:
> 0xc. The S2MPS14 has only two clocks though but S2MPS13 has three.
> Again, as in RTC, you should re-use existing support.
>
> It looks there is no need for this patch at all.
>
Yes, checked that, rtc looks same to s2mps14 and clk looks same as 
s2mps13{ not s2mps11}, because of the RTC_BUF address changes.
Will drop patch 4 and 5 and use the existing names where applicable.
I think I don't have to change the binding or Kconfig changes?


> Best regards,
> Krzysztof
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1257678

FromKrzysztof Kozlowski <k.kozlowski@samsung.com>
Date2015-10-28 06:40 +0100
Message-ID<qorCP-6TG-15@gated-at.bofh.it>
In reply to#1257659
On 28.10.2015 13:55, Alim Akhtar wrote:
> 
> 
> On 10/28/2015 10:04 AM, Krzysztof Kozlowski wrote:
>> On 28.10.2015 10:26, Krzysztof Kozlowski wrote:
>>> On 26.10.2015 21:51, Alim Akhtar wrote:
>>>> S2MPS15 PMIC has three 32k buffered clocks outputs. This patch
>>>> adds supports for the same to the s2mps11 clock driver.
>>>>
>>>> Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
>>>> ---
>>>>   drivers/clk/Kconfig       |    5 +++--
>>>>   drivers/clk/clk-s2mps11.c |   24 ++++++++++++++++++++++++
>>>>   2 files changed, 27 insertions(+), 2 deletions(-)
>>>>
>>>> diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
>>>> index a1fa61159179..037a314b5d76 100644
>>>> --- a/drivers/clk/Kconfig
>>>> +++ b/drivers/clk/Kconfig
>>>> @@ -120,9 +120,10 @@ config COMMON_CLK_S2MPS11
>>>>       tristate "Clock driver for S2MPS1X/S5M8767 MFD"
>>>>       depends on MFD_SEC_CORE
>>>>       ---help---
>>>> -      This driver supports S2MPS11/S2MPS14/S5M8767 crystal oscillator
>>>> +      This driver supports S2MPS1X/S5M8767 crystal oscillator
>>>>         clock. These multi-function devices have two (S2MPS14) or three
>>>> -      (S2MPS11, S5M8767) fixed-rate oscillators, clocked at 32KHz
>>>> each.
>>>> +      (S2MPS11/S2MPS13/S2MPS15/S5M8767) 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 d266299dfdb1..455500dca653 100644
>>>> --- a/drivers/clk/clk-s2mps11.c
>>>> +++ b/drivers/clk/clk-s2mps11.c
>>>> @@ -25,6 +25,7 @@
>>>>   #include <linux/mfd/samsung/s2mps11.h>
>>>>   #include <linux/mfd/samsung/s2mps13.h>
>>>>   #include <linux/mfd/samsung/s2mps14.h>
>>>> +#include <linux/mfd/samsung/s2mps15.h>
>>>>   #include <linux/mfd/samsung/s5m8767.h>
>>>>   #include <linux/mfd/samsung/core.h>
>>>>
>>>> @@ -148,6 +149,24 @@ static struct clk_init_data
>>>> s2mps14_clks_init[S2MPS11_CLKS_NUM] = {
>>>>       },
>>>>   };
>>>>
>>>> +static struct clk_init_data s2mps15_clks_init[S2MPS11_CLKS_NUM] = {
>>>> +    [S2MPS11_CLK_AP] = {
>>>> +        .name = "s2mps15_ap",
>>>> +        .ops = &s2mps11_clk_ops,
>>>> +        .flags = CLK_IS_ROOT,
>>>> +    },
>>>> +    [S2MPS11_CLK_CP] = {
>>>> +        .name = "s2mps15_cp",
>>>> +        .ops = &s2mps11_clk_ops,
>>>> +        .flags = CLK_IS_ROOT,
>>>> +    },
>>>> +    [S2MPS11_CLK_BT] = {
>>>> +        .name = "s2mps15_bt",
>>>> +        .ops = &s2mps11_clk_ops,
>>>> +        .flags = CLK_IS_ROOT,
>>>> +    },
>>>> +};
>>>> +
>>>>   static struct device_node *s2mps11_clk_parse_dt(struct
>>>> platform_device *pdev,
>>>>           struct clk_init_data *clks_init)
>>>>   {
>>>> @@ -207,6 +226,10 @@ static int s2mps11_clk_probe(struct
>>>> platform_device *pdev)
>>>>           s2mps11_reg = S2MPS14_REG_RTCCTRL;
>>>>           clks_init = s2mps14_clks_init;
>>>>           break;
>>>> +    case S2MPS15X:
>>>> +        s2mps11_reg = S2MPS15_REG_RTC_BUF;
>>>> +        clks_init = s2mps15_clks_init;
>>>
>>> Another question (after looking at RTC driver):
>>> Is this the same register address as S2MPS14?
>>
>> I found the answer - this is the same address as in S2MPS13 and S2MPS14:
>> 0xc. The S2MPS14 has only two clocks though but S2MPS13 has three.
>> Again, as in RTC, you should re-use existing support.
>>
>> It looks there is no need for this patch at all.
>>
> Yes, checked that, rtc looks same to s2mps14 and clk looks same as
> s2mps13{ not s2mps11}, because of the RTC_BUF address changes.
> Will drop patch 4 and 5 and use the existing names where applicable.

Thanks!

> I think I don't have to change the binding or Kconfig changes?

I think you don't have to. Only the main MFD driver will be updated with
respective child driver names and compatible.

Best regards,
Krzysztof
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web