[v8,10/12] clk: Kconfig for Palmas clock driver

Commit Message

Ian Lartey March 7, 2013, 1:17 p.m. UTC

Signed-off-by: Graeme Gregory <[e-mail]>
Signed-off-by: J Keerthy <[e-mail]>
Signed-off-by: Ian Lartey <[e-mail]>
---
 drivers/clk/Kconfig        |    8 ++++++++
 drivers/clk/Makefile       |    1 +
 drivers/leds/leds-palmas.c |   19 ++++++-------------
 3 files changed, 15 insertions(+), 13 deletions(-)

Comments

Kim, Milo March 8, 2013, 1:13 a.m. UTC | #1

>  drivers/clk/Kconfig        |    8 ++++++++
>  drivers/clk/Makefile       |    1 +
>  drivers/leds/leds-palmas.c |   19 ++++++-------------

If this patch is for only clock module, then LED patch should be detached.

[PATCH v8 10/12] clk: Kconfig for Palmas clock driver
[PATCH v8 12/12] clk: add a clock driver for palmas
It could be joined into one patch file.

Best Regards,
Milo

Ian Lartey March 8, 2013, 5:14 p.m. UTC | #2

On 08/03/13 01:13, Kim, Milo wrote:
>>   drivers/clk/Kconfig        |    8 ++++++++
>>   drivers/clk/Makefile       |    1 +
>>   drivers/leds/leds-palmas.c |   19 ++++++-------------
>
> If this patch is for only clock module, then LED patch should be detached.

Yes indeed.
>
> [PATCH v8 10/12] clk: Kconfig for Palmas clock driver
> [PATCH v8 12/12] clk: add a clock driver for palmas
> It could be joined into one patch file.

Kind of safer to keep them separate:

[PATCH v8 10/12] clk: Kconfig for Palmas clock driver
can often cause a merge conflict if there are already
additional drivers/files in the clk directory

[PATCH v8 12/12] clk: add a clock driver for palmas
has more chance of being applied without any issues
(unless the person taking the patch already has
their own clk-palmas.c.


>
> Best Regards,
> Milo
>


Regards,

Ian

> _______________________________________________
> linux-arm-kernel mailing list
> [e-mail]
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>

Patch

diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index a47e6ee..a8e0655 100644
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -63,6 +63,14 @@  config CLK_TWL6040
 	  McPDM. McPDM module is using the external bit clock on the McPDM bus
 	  as functional clock.
 
+config CLK_PALMAS
+	tristate "Palmas PMIC Clock Support"
+	depends on MFD_PALMAS
+	---help---
+	  Enable clock support for the two clocks on Palmas PMIC chips:
+	  - A 32KHz audio-gated clock (primarily for audio devices)
+	  - A digitally-gated 32KHz clock
+
 endmenu
 
 source "drivers/clk/mvebu/Kconfig"
diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
index 300d477..77dc283 100644
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@ -34,3 +34,4 @@  obj-$(CONFIG_X86)		+= x86/
 obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o
 obj-$(CONFIG_COMMON_CLK_MAX77686) += clk-max77686.o
 obj-$(CONFIG_CLK_TWL6040)	+= clk-twl6040.o
+obj-$(CONFIG_CLK_PALMAS)	+= clk-palmas.o
diff --git a/drivers/leds/leds-palmas.c b/drivers/leds/leds-palmas.c
index 4a35352..ea53bfe 100644
--- a/drivers/leds/leds-palmas.c
+++ b/drivers/leds/leds-palmas.c
@@ -341,37 +341,30 @@  static int  palmas_dt_to_pdata(struct device *dev,
 		struct device_node *node,
 		struct palmas_leds_platform_data *pdata)
 {
-	struct device_node *child_node;
 	int ret;
 	u32 prop;
 
-	child_node = of_get_child_by_name(node, "leds");
-	if (!child_node) {
-		dev_err(dev, "child node 'palmas_leds' not found\n");
-		return -EINVAL;
-	}
-
-	ret = of_property_read_u32(child_node, "ti,led1-current", &prop);
+	ret = of_property_read_u32(node, "ti,led1-current", &prop);
 	if (!ret)
 		pdata->led1_current = prop;
 
-	ret = of_property_read_u32(child_node, "ti,led2-current", &prop);
+	ret = of_property_read_u32(node, "ti,led2-current", &prop);
 	if (!ret)
 		pdata->led2_current = prop;
 
-	ret = of_property_read_u32(child_node, "ti,led3-current", &prop);
+	ret = of_property_read_u32(node, "ti,led3-current", &prop);
 	if (!ret)
 		pdata->led3_current = prop;
 
-	ret = of_property_read_u32(child_node, "ti,led4-current", &prop);
+	ret = of_property_read_u32(node, "ti,led4-current", &prop);
 	if (!ret)
 		pdata->led4_current = prop;
 
-	ret = of_property_read_u32(child_node, "ti,chrg-led-mode", &prop);
+	ret = of_property_read_u32(node, "ti,chrg-led-mode", &prop);
 	if (!ret)
 		pdata->chrg_led_mode = prop;
 
-	ret = of_property_read_u32(child_node, "ti,chrg-led-vbat-low", &prop);
+	ret = of_property_read_u32(node, "ti,chrg-led-vbat-low", &prop);
 	if (!ret)
 		pdata->chrg_led_vbat_low = prop;