[4/5] clk: max77686: Add support for MAX77620 clocks
diff mbox

Message ID 1466000018-16784-5-git-send-email-ldewangan@nvidia.com
State Not Applicable
Headers show

Commit Message

Laxman Dewangan June 15, 2016, 2:13 p.m. UTC
Maxim Max77620 has one 32KHz clock output and the clock HW
IP used on this PMIC is same as what it is there in the MAX77686.

Add clock driver support for MAX77620 on the MAX77686 driver.

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
CC: Krzysztof Kozlowski <k.kozlowski@samsung.com>
CC: Javier Martinez Canillas <javier@dowhile0.org>
---
 drivers/clk/Kconfig        |  7 ++++---
 drivers/clk/clk-max77686.c | 16 ++++++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

Comments

Javier Martinez Canillas June 15, 2016, 3:27 p.m. UTC | #1
Hello Laxman,

On 06/15/2016 10:13 AM, Laxman Dewangan wrote:
> Maxim Max77620 has one 32KHz clock output and the clock HW
> IP used on this PMIC is same as what it is there in the MAX77686.
> 
> Add clock driver support for MAX77620 on the MAX77686 driver.
> 
> Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
> CC: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> CC: Javier Martinez Canillas <javier@dowhile0.org>
> ---
>  drivers/clk/Kconfig        |  7 ++++---
>  drivers/clk/clk-max77686.c | 16 ++++++++++++++++
>  2 files changed, 20 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
> index 6afad74..d75f4c5 100644
> --- a/drivers/clk/Kconfig
> +++ b/drivers/clk/Kconfig
> @@ -32,10 +32,11 @@ config COMMON_CLK_WM831X
>  source "drivers/clk/versatile/Kconfig"
>  
>  config COMMON_CLK_MAX77686
> -	tristate "Clock driver for Maxim 77686/77802 MFD"
> -	depends on MFD_MAX77686
> +	tristate "Clock driver for Maxim 77686/77802/MAX77620 MFD"
> +	depends on MFD_MAX77686 || MFD_MAX77620
>  	---help---
> -	  This driver supports Maxim 77686/77802 crystal oscillator clock.
> +	  This driver supports Maxim 77686/77802/MAX77620 crystal oscillator

s/MAX77620/77620

Besides this minor nit, the patch looks good to me:

Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>

Best regards,
Laxman Dewangan June 16, 2016, 9:52 a.m. UTC | #2
Hi Krzysztof/Javier,
Thanks for review of the series.

I will post the V2 after taking care of all comment.

One query about the comment.

Thanks,
Laxman

On Thursday 16 June 2016 03:24 PM, Krzysztof Kozlowski wrote:
> On 06/15/2016 04:13 PM, Laxman Dewangan wrote:
>>   enum chip_name {
>>   	CHIP_MAX77686,
>>   	CHIP_MAX77802,
>> +	CHIP_MAX77620,
> Now it is more obvious why it is here. However I don't like the
> duplication of device IDs, under different names and different values:
> 1. include/linux/mfd/max77686-private.h
> 2. include/linux/mfd/max77620.h
> 3. here
>
> I was thinking about way of combining it... but these headers are
> different. Unless there will be one header for all three devices.
>
> Anyway, please add the max77686 prefix to the enum.

so will it be:

enum max77686_chip_name {
     CHIP_MAX77686,
     CHIP_MAX77802,
     CHIP_MAX77620,
};


Will it be fine here?

--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Krzysztof Kozlowski June 16, 2016, 9:54 a.m. UTC | #3
On 06/15/2016 04:13 PM, Laxman Dewangan wrote:
> Maxim Max77620 has one 32KHz clock output and the clock HW
> IP used on this PMIC is same as what it is there in the MAX77686.
> 
> Add clock driver support for MAX77620 on the MAX77686 driver.
> 
> Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
> CC: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> CC: Javier Martinez Canillas <javier@dowhile0.org>
> ---
>  drivers/clk/Kconfig        |  7 ++++---
>  drivers/clk/clk-max77686.c | 16 ++++++++++++++++
>  2 files changed, 20 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
> index 6afad74..d75f4c5 100644
> --- a/drivers/clk/Kconfig
> +++ b/drivers/clk/Kconfig
> @@ -32,10 +32,11 @@ config COMMON_CLK_WM831X
>  source "drivers/clk/versatile/Kconfig"
>  
>  config COMMON_CLK_MAX77686
> -	tristate "Clock driver for Maxim 77686/77802 MFD"
> -	depends on MFD_MAX77686
> +	tristate "Clock driver for Maxim 77686/77802/MAX77620 MFD"
> +	depends on MFD_MAX77686 || MFD_MAX77620
>  	---help---
> -	  This driver supports Maxim 77686/77802 crystal oscillator clock.
> +	  This driver supports Maxim 77686/77802/MAX77620 crystal oscillator
> +	  clock.
>  
>  config COMMON_CLK_RK808
>  	tristate "Clock driver for RK808"
> diff --git a/drivers/clk/clk-max77686.c b/drivers/clk/clk-max77686.c
> index 31ba726..d2be736 100644
> --- a/drivers/clk/clk-max77686.c
> +++ b/drivers/clk/clk-max77686.c
> @@ -19,6 +19,7 @@
>  #include <linux/err.h>
>  #include <linux/module.h>
>  #include <linux/platform_device.h>
> +#include <linux/mfd/max77620.h>
>  #include <linux/mfd/max77686.h>
>  #include <linux/mfd/max77686-private.h>
>  #include <linux/clk-provider.h>
> @@ -30,12 +31,14 @@
>  
>  #include <dt-bindings/clock/maxim,max77686.h>
>  #include <dt-bindings/clock/maxim,max77802.h>
> +#include <dt-bindings/mfd/max77620.h>
>  
>  #define MAX77802_CLOCK_LOW_JITTER_SHIFT 0x3
>  
>  enum chip_name {
>  	CHIP_MAX77686,
>  	CHIP_MAX77802,
> +	CHIP_MAX77620,

Now it is more obvious why it is here. However I don't like the
duplication of device IDs, under different names and different values:
1. include/linux/mfd/max77686-private.h
2. include/linux/mfd/max77620.h
3. here

I was thinking about way of combining it... but these headers are
different. Unless there will be one header for all three devices.

Anyway, please add the max77686 prefix to the enum.

Best regards,
Krzysztof

>  };
>  
>  struct max_gen_hw_clk_data {
> @@ -91,6 +94,14 @@ static struct max_gen_hw_clk_data max77802_hw_clks_info[MAX77802_CLKS_NUM] = {
>  	},
>  };
>  
> +static struct max_gen_hw_clk_data max77620_hw_clks_info[MAX77620_CLKS_NUM] = {
> +	[MAX77620_CLK_32K_OUT0] = {
> +		.name = "32khz_pmic",
> +		.reg = MAX77620_REG_CNFG1_32K,
> +		.mask = MAX77620_CNFG1_32K_OUT0_EN,
> +	},
> +};
> +
>  static struct max_gen_clk_data *to_max_gen_clk_data(struct clk_hw *hw)
>  {
>  	return container_of(hw, struct max_gen_clk_data, hw);
> @@ -171,6 +182,10 @@ static int max77686_clk_probe(struct platform_device *pdev)
>  		num_clks = MAX77802_CLKS_NUM;
>  		hw_clks = max77802_hw_clks_info;
>  		break;
> +	case CHIP_MAX77620:
> +		num_clks = MAX77620_CLKS_NUM;
> +		hw_clks = max77620_hw_clks_info;
> +		break;
>  	default:
>  		dev_err(dev, "Unknown Chip ID\n");
>  		return -EINVAL;
> @@ -269,6 +284,7 @@ static int max77686_clk_remove(struct platform_device *pdev)
>  static const struct platform_device_id max77686_clk_id[] = {
>  	{ "max77686-clk", .driver_data = (kernel_ulong_t)CHIP_MAX77686, },
>  	{ "max77802-clk", .driver_data = (kernel_ulong_t)CHIP_MAX77802, },
> +	{ "max77620-clock", .driver_data = (kernel_ulong_t)CHIP_MAX77620, },
>  	{},
>  };
>  MODULE_DEVICE_TABLE(platform, max77686_clk_id);
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Krzysztof Kozlowski June 16, 2016, 10:11 a.m. UTC | #4
On 06/16/2016 11:52 AM, Laxman Dewangan wrote:
> Hi Krzysztof/Javier,
> Thanks for review of the series.
> 
> I will post the V2 after taking care of all comment.
> 
> One query about the comment.
> 
> Thanks,
> Laxman
> 
> On Thursday 16 June 2016 03:24 PM, Krzysztof Kozlowski wrote:
>> On 06/15/2016 04:13 PM, Laxman Dewangan wrote:
>>>   enum chip_name {
>>>       CHIP_MAX77686,
>>>       CHIP_MAX77802,
>>> +    CHIP_MAX77620,
>> Now it is more obvious why it is here. However I don't like the
>> duplication of device IDs, under different names and different values:
>> 1. include/linux/mfd/max77686-private.h
>> 2. include/linux/mfd/max77620.h
>> 3. here
>>
>> I was thinking about way of combining it... but these headers are
>> different. Unless there will be one header for all three devices.
>>
>> Anyway, please add the max77686 prefix to the enum.
> 
> so will it be:
> 
> enum max77686_chip_name {
>     CHIP_MAX77686,
>     CHIP_MAX77802,
>     CHIP_MAX77620,
> };
> 
> 
> Will it be fine here?

Yes, looks fine to me.

Best regards,
Krzysztof


--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Krzysztof Kozlowski June 16, 2016, 1:02 p.m. UTC | #5
On 06/15/2016 04:13 PM, Laxman Dewangan wrote:
> Maxim Max77620 has one 32KHz clock output and the clock HW
> IP used on this PMIC is same as what it is there in the MAX77686.
> 
> Add clock driver support for MAX77620 on the MAX77686 driver.
> 
> Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
> CC: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> CC: Javier Martinez Canillas <javier@dowhile0.org>
> ---
>  drivers/clk/Kconfig        |  7 ++++---
>  drivers/clk/clk-max77686.c | 16 ++++++++++++++++
>  2 files changed, 20 insertions(+), 3 deletions(-)

Tested on max77686 and max77802:
Tested-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>

Best regards,
Krzysztof

--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox

diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index 6afad74..d75f4c5 100644
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -32,10 +32,11 @@  config COMMON_CLK_WM831X
 source "drivers/clk/versatile/Kconfig"
 
 config COMMON_CLK_MAX77686
-	tristate "Clock driver for Maxim 77686/77802 MFD"
-	depends on MFD_MAX77686
+	tristate "Clock driver for Maxim 77686/77802/MAX77620 MFD"
+	depends on MFD_MAX77686 || MFD_MAX77620
 	---help---
-	  This driver supports Maxim 77686/77802 crystal oscillator clock.
+	  This driver supports Maxim 77686/77802/MAX77620 crystal oscillator
+	  clock.
 
 config COMMON_CLK_RK808
 	tristate "Clock driver for RK808"
diff --git a/drivers/clk/clk-max77686.c b/drivers/clk/clk-max77686.c
index 31ba726..d2be736 100644
--- a/drivers/clk/clk-max77686.c
+++ b/drivers/clk/clk-max77686.c
@@ -19,6 +19,7 @@ 
 #include <linux/err.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
+#include <linux/mfd/max77620.h>
 #include <linux/mfd/max77686.h>
 #include <linux/mfd/max77686-private.h>
 #include <linux/clk-provider.h>
@@ -30,12 +31,14 @@ 
 
 #include <dt-bindings/clock/maxim,max77686.h>
 #include <dt-bindings/clock/maxim,max77802.h>
+#include <dt-bindings/mfd/max77620.h>
 
 #define MAX77802_CLOCK_LOW_JITTER_SHIFT 0x3
 
 enum chip_name {
 	CHIP_MAX77686,
 	CHIP_MAX77802,
+	CHIP_MAX77620,
 };
 
 struct max_gen_hw_clk_data {
@@ -91,6 +94,14 @@  static struct max_gen_hw_clk_data max77802_hw_clks_info[MAX77802_CLKS_NUM] = {
 	},
 };
 
+static struct max_gen_hw_clk_data max77620_hw_clks_info[MAX77620_CLKS_NUM] = {
+	[MAX77620_CLK_32K_OUT0] = {
+		.name = "32khz_pmic",
+		.reg = MAX77620_REG_CNFG1_32K,
+		.mask = MAX77620_CNFG1_32K_OUT0_EN,
+	},
+};
+
 static struct max_gen_clk_data *to_max_gen_clk_data(struct clk_hw *hw)
 {
 	return container_of(hw, struct max_gen_clk_data, hw);
@@ -171,6 +182,10 @@  static int max77686_clk_probe(struct platform_device *pdev)
 		num_clks = MAX77802_CLKS_NUM;
 		hw_clks = max77802_hw_clks_info;
 		break;
+	case CHIP_MAX77620:
+		num_clks = MAX77620_CLKS_NUM;
+		hw_clks = max77620_hw_clks_info;
+		break;
 	default:
 		dev_err(dev, "Unknown Chip ID\n");
 		return -EINVAL;
@@ -269,6 +284,7 @@  static int max77686_clk_remove(struct platform_device *pdev)
 static const struct platform_device_id max77686_clk_id[] = {
 	{ "max77686-clk", .driver_data = (kernel_ulong_t)CHIP_MAX77686, },
 	{ "max77802-clk", .driver_data = (kernel_ulong_t)CHIP_MAX77802, },
+	{ "max77620-clock", .driver_data = (kernel_ulong_t)CHIP_MAX77620, },
 	{},
 };
 MODULE_DEVICE_TABLE(platform, max77686_clk_id);