ARM: OMAP: PM: only register TWL with voltage layer when device is present

PATCH New Kevin Hilman 2 participants 8 messages Nov 9, 2011 – Nov 18, 2011

Subsystems (4)

Arm (32-bit) Arm sub-architectures OMAP2+ support OMAP power management support

lore

Share & tools

lore

Kevin Hilman

author

2011-11-09 00:14 UTC #0 lore raw

PATCH 1/1 ARM: OMAP: PM: only register TWL with voltage layer when device is present

Current code registers voltage layer details for TWL PMIC even when a TWL has not been registered. Fix this to only register the TWL with voltage layer when the TWL PMIC is initialized by board-level code.

Signed-off-by Kevin Hilman <[email protected]>

---
Barring any objections, will be queued as a fix for v3.2-rc cycle.

Originally posted here: http://marc.info/?l=linux-omap&m=131831996730420&w=2,
but posting again since it was buried inside this thread.

 arch/arm/mach-omap2/pm.c         |    6 ++----
 arch/arm/mach-omap2/twl-common.c |   11 +++++++++++
 arch/arm/mach-omap2/twl-common.h |    3 +++
 3 files changed, 16 insertions(+), 4 deletions(-)

arch/arm/mach-omap2/pm.c +2 -4

index 1e79bdf..00bff46 100644
@@ -24,6 +24,7 @@
 #include "powerdomain.h"
 #include "clockdomain.h"
 #include "pm.h"
+#include "twl-common.h"
 
 static struct omap_device_pm_latency *pm_lats;

@@ -226,11 +227,8 @@ postcore_initcall(omap2_common_pm_init);
 
 static int __init omap2_common_pm_late_init(void)
 {
-	/* Init the OMAP TWL parameters */
-	omap3_twl_init();
-	omap4_twl_init();
-
 	/* Init the voltage layer */
+	omap_pmic_late_init();
 	omap_voltage_late_init();
 
 	/* Initialize the voltages */

arch/arm/mach-omap2/twl-common.c +11 -0

index 52243577..10b20c6 100644
@@ -30,6 +30,7 @@
 #include <plat/usb.h>
 
 #include "twl-common.h"
+#include "pm.h"
 
 static struct i2c_board_info __initdata pmic_i2c_board_info = {
 	.addr		= 0x48,

@@ -48,6 +49,16 @@ void __init omap_pmic_init(int bus, u32 clkrate,
 	omap_register_i2c_bus(bus, clkrate, &pmic_i2c_board_info, 1);
 }
 
+void __init omap_pmic_late_init(void)
+{
+	/* Init the OMAP TWL parameters (if PMIC has been registerd) */
+	if (!pmic_i2c_board_info.irq)
+		return;
+
+	omap3_twl_init();
+	omap4_twl_init();
+}
+
 #if defined(CONFIG_ARCH_OMAP3)
 static struct twl4030_usb_data omap3_usb_pdata = {
 	.usb_mode	= T2_USB_MODE_ULPI,

arch/arm/mach-omap2/twl-common.h +3 -0

index 5e83a5b..275dde8 100644
@@ -1,6 +1,8 @@
 #ifndef __OMAP_PMIC_COMMON__
 #define __OMAP_PMIC_COMMON__
 
+#include <plat/irqs.h>
+
 #define TWL_COMMON_PDATA_USB		(1 << 0)
 #define TWL_COMMON_PDATA_BCI		(1 << 1)
 #define TWL_COMMON_PDATA_MADC		(1 << 2)

@@ -30,6 +32,7 @@ struct twl4030_platform_data;
 
 void omap_pmic_init(int bus, u32 clkrate, const char *pmic_type, int pmic_irq,
 		    struct twl4030_platform_data *pmic_data);
+void omap_pmic_late_init(void);
 
 static inline void omap2_pmic_init(const char *pmic_type,
 				   struct twl4030_platform_data *pmic_data)

Signature · 1 line

1.7.6

Premi, Sanjeev

2011-11-09 10:11 UTC #1 lore raw

PATCH 1/1 ARM: OMAP: PM: only register TWL with voltage layer when device is present

Quoted 67 lines

-----Original Message-----
From: linux-omap-owner at vger.kernel.org [mailto:linux-omap-owner at vger.kernel.org] On Behalf Of Hilman, Kevin
Sent: Wednesday, November 09, 2011 5:45 AM
To: linux-omap at vger.kernel.org
Cc: linux-arm-kernel at lists.infradead.org; Koyamangalath, Abhilash
Subject: [PATCH] ARM: OMAP: PM: only register TWL with voltage layer when device is present
Current code registers voltage layer details for TWL PMIC even when a TWL
has not been registered. Fix this to only register the TWL with voltage
layer when the TWL PMIC is initialized by board-level code.
Signed-off-by Kevin Hilman <[email protected]>
---
Barring any objections, will be queued as a fix for v3.2-rc cycle.
Originally posted here:
http://marc.info/?l=linux-omap&m=131831996730420&w=2,
but posting again since it was buried inside this thread.
 arch/arm/mach-omap2/pm.c         |    6 ++----
 arch/arm/mach-omap2/twl-common.c |   11 +++++++++++
 arch/arm/mach-omap2/twl-common.h |    3 +++
 3 files changed, 16 insertions(+), 4 deletions(-)
arch/arm/mach-omap2/pm.c +2 -4
index 1e79bdf..00bff46 100644
@@ -24,6 +24,7 @@
 #include "powerdomain.h"
 #include "clockdomain.h"
 #include "pm.h"
+#include "twl-common.h"
 
 static struct omap_device_pm_latency *pm_lats;
 
@@ -226,11 +227,8 @@ postcore_initcall(omap2_common_pm_init);
 
 static int __init omap2_common_pm_late_init(void)
 {
-	/* Init the OMAP TWL parameters */
-	omap3_twl_init();
-	omap4_twl_init();
-
 	/* Init the voltage layer */
+	omap_pmic_late_init();
 	omap_voltage_late_init();
 
 	/* Initialize the voltages */
arch/arm/mach-omap2/twl-common.c +1 -0
index 52243577..10b20c6 100644
@@ -30,6 +30,7 @@
 #include <plat/usb.h>
 
 #include "twl-common.h"
+#include "pm.h"
 
 static struct i2c_board_info __initdata pmic_i2c_board_info = {
 	.addr		= 0x48,

arch/arm/mach-omap2/twl-common.c void __init omap_pmic_init(int bus, u32 clkrate, · line 56

Quoted 8 lines

arch/arm/mach-omap2/twl-common.c +5 -0

@@ -48,6 +49,16 @@ void __init omap_pmic_init(int bus, u32 clkrate,
 	omap_register_i2c_bus(bus, clkrate, &pmic_i2c_board_info, 1);
 }
 
+void __init omap_pmic_late_init(void)
+{
+	/* Init the OMAP TWL parameters (if PMIC has been registerd) */
+	if (!pmic_i2c_board_info.irq)
+		return;

Kevin,

I have been out-of-loop from PM for some time. So my query may be redundant:

1) What happens when different PMIC (not TWL series) is registered for AM35x? e.g. TPS65023
http://www.spinics.net/lists/linux-omap/msg48630.html

2) Wouldn't we still fall back into omap3_twl_init()?

~sanjeev

Quoted 41 lines

arch/arm/mach-omap2/twl-common.c +5 -0

+
+	omap3_twl_init();
+	omap4_twl_init();
+}
+
 #if defined(CONFIG_ARCH_OMAP3)
 static struct twl4030_usb_data omap3_usb_pdata = {
 	.usb_mode	= T2_USB_MODE_ULPI,

arch/arm/mach-omap2/twl-common.h +3 -0

index 5e83a5b..275dde8 100644
@@ -1,6 +1,8 @@
 #ifndef __OMAP_PMIC_COMMON__
 #define __OMAP_PMIC_COMMON__
 
+#include <plat/irqs.h>
+
 #define TWL_COMMON_PDATA_USB		(1 << 0)
 #define TWL_COMMON_PDATA_BCI		(1 << 1)
 #define TWL_COMMON_PDATA_MADC		(1 << 2)

@@ -30,6 +32,7 @@ struct twl4030_platform_data;
 
 void omap_pmic_init(int bus, u32 clkrate, const char 
 *pmic_type, int pmic_irq,
 		    struct twl4030_platform_data *pmic_data);
+void omap_pmic_late_init(void);
 
 static inline void omap2_pmic_init(const char *pmic_type,

struct twl4030_platform_data
*pmic_data)

Signature · 7 lines

1.7.6

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

Kevin Hilman

author

2011-11-10 18:33 UTC #2 lore raw

PATCH 1/1 ARM: OMAP: PM: only register TWL with voltage layer when device is present

Quoted 5 lines · Sanjeev

Quoted 5 lines
Current code registers voltage layer details for TWL PMIC even when a TWL has not been registered. Fix this to only register the TWL with voltage layer when the TWL PMIC is initialized by board-level code.
Signed-off-by Kevin Hilman <[email protected]>

[...]

Quoted 8 lines

I have been out-of-loop from PM for some time. So my query may be redundant:
1) What happens when different PMIC (not TWL series) is registered for AM35x? e.g. TPS65023
http://www.spinics.net/lists/linux-omap/msg48630.html
2) Wouldn't we still fall back into omap3_twl_init()?

I'm not sure I follow the question.

If you're not using a TWL PMIC (or similar derivative) then omap*_twl_init() should not be called.

If you are using a TWL PMIC, then no, the omap*_twl_init functions should not be called.

Kevin

Premi, Sanjeev

2011-11-11 10:21 UTC #3 lore raw

PATCH 1/1 ARM: OMAP: PM: only register TWL with voltage layer when device is present

Quoted 32 lines

-----Original Message-----
From: Hilman, Kevin
Sent: Friday, November 11, 2011 12:04 AM
To: Premi, Sanjeev
Cc: linux-omap at vger.kernel.org;
linux-arm-kernel at lists.infradead.org; Koyamangalath, Abhilash
Subject: Re: [PATCH] ARM: OMAP: PM: only register TWL with voltage layer when device is present
Quoted 1 line · Sanjeev
Quoted 1 line
Current code registers voltage layer details for TWL PMIC
even when a
Quoted 1 line
Quoted 1 line
TWL has not been registered. Fix this to only register
the TWL with
Quoted 3 lines
Quoted 3 lines
voltage layer when the TWL PMIC is initialized by board-level code.
Signed-off-by Kevin Hilman <[email protected]>
[...]
Quoted 8 lines
I have been out-of-loop from PM for some time. So my query may be redundant:
1) What happens when different PMIC (not TWL series) is registered for AM35x? e.g. TPS65023
http://www.spinics.net/lists/linux-omap/msg48630.html
2) Wouldn't we still fall back into omap3_twl_init()?

Quoted 7 lines

I'm not sure I follow the question.
If you're not using a TWL PMIC (or similar derivative) then omap*_twl_init() should not be called.
If you are using a TWL PMIC, then no, the omap*_twl_init functions should not be called.

When I read this function (in the patch), if pmic_i2c_board_info.irq is non-zero, omap3_twl_init() and omap4_twl_init() are called.

So my question was, for the case when PMIC is not TWL family. Then, is checking ".irq" sufficient to prevent the execution of twl specific functions.

void __init omap_pmic_late_init(void)
{
/* Init the OMAP TWL parameters (if PMIC has been registerd) */ if (!pmic_i2c_board_info.irq)
return;

omap3_twl_init();
omap4_twl_init();
}

Shouldn't we check for some "signature" or equiv, before calling the PMIC specific init? This "signature" can be set when the PMIC is registered?

Another simplification would be to register the PMIC specific init function itself during registration; and call here.

~sanjeev

Quoted 3 lines

Kevin

Kevin Hilman

author

2011-11-16 23:54 UTC #4 lore raw

PATCH 1/1 ARM: OMAP: PM: only register TWL with voltage layer when device is present

Quoted 40 lines · Sanjeev

Quoted 32 lines
-----Original Message-----
From: Hilman, Kevin
Sent: Friday, November 11, 2011 12:04 AM
To: Premi, Sanjeev
Cc: linux-omap at vger.kernel.org;
linux-arm-kernel at lists.infradead.org; Koyamangalath, Abhilash
Subject: Re: [PATCH] ARM: OMAP: PM: only register TWL with voltage layer when device is present
Quoted 1 line · Sanjeev
Quoted 1 line
Current code registers voltage layer details for TWL PMIC
even when a
Quoted 1 line
Quoted 1 line
TWL has not been registered. Fix this to only register
the TWL with
Quoted 3 lines
Quoted 3 lines
voltage layer when the TWL PMIC is initialized by board-level code.
Signed-off-by Kevin Hilman <[email protected]>
[...]
Quoted 8 lines
I have been out-of-loop from PM for some time. So my query may be redundant:
1) What happens when different PMIC (not TWL series) is registered for AM35x? e.g. TPS65023
http://www.spinics.net/lists/linux-omap/msg48630.html
2) Wouldn't we still fall back into omap3_twl_init()?
Quoted 7 lines
I'm not sure I follow the question.
If you're not using a TWL PMIC (or similar derivative) then omap*_twl_init() should not be called.
If you are using a TWL PMIC, then no, the omap*_twl_init functions should not be called.

Quoted 6 lines

When I read this function (in the patch), if pmic_i2c_board_info.irq is non-zero, omap3_twl_init() and omap4_twl_init() are called.
So my question was, for the case when PMIC is not TWL family. Then, is checking ".irq" sufficient to prevent the execution of twl specific functions.

If PMIC is not TWL family, then I don't expect any functions in twl_common.c to be called.

Kevin

Premi, Sanjeev

2011-11-17 13:20 UTC #5 lore raw

PATCH 1/1 ARM: OMAP: PM: only register TWL with voltage layer when device is present

Quoted 56 lines

-----Original Message-----
From: Hilman, Kevin
Sent: Thursday, November 17, 2011 5:25 AM
To: Premi, Sanjeev
Cc: linux-omap at vger.kernel.org;
linux-arm-kernel at lists.infradead.org; Koyamangalath, Abhilash
Subject: Re: [PATCH] ARM: OMAP: PM: only register TWL with voltage layer when device is present
Quoted 11 lines · Sanjeev
Quoted 11 lines
-----Original Message-----
From: Hilman, Kevin
Sent: Friday, November 11, 2011 12:04 AM
To: Premi, Sanjeev
Cc: linux-omap at vger.kernel.org;
linux-arm-kernel at lists.infradead.org; Koyamangalath, Abhilash
Subject: Re: [PATCH] ARM: OMAP: PM: only register TWL with voltage layer when device is present
Quoted 7 lines
Quoted 7 lines
Quoted 1 line · Sanjeev
Quoted 1 line
Current code registers voltage layer details for TWL PMIC
even when a
Quoted 1 line
Quoted 1 line
TWL has not been registered. Fix this to only register
the TWL with
Quoted 1 line
Quoted 1 line
voltage layer when the TWL PMIC is initialized by
board-level code.
Quoted 9 lines
Quoted 9 lines
Quoted 2 lines
Quoted 2 lines
Signed-off-by Kevin Hilman <[email protected]>
[...]
Quoted 4 lines
I have been out-of-loop from PM for some time. So my query may be redundant:
1) What happens when different PMIC (not TWL series) is
registered
Quoted 16 lines
Quoted 5 lines
Quoted 4 lines
   for AM35x? e.g. TPS65023
   http://www.spinics.net/lists/linux-omap/msg48630.html
2) Wouldn't we still fall back into omap3_twl_init()?
Quoted 7 lines
I'm not sure I follow the question.
If you're not using a TWL PMIC (or similar derivative) then omap*_twl_init() should not be called.
If you are using a TWL PMIC, then no, the omap*_twl_init functions should not be called.
When I read this function (in the patch), if pmic_i2c_board_info.irq is non-zero, omap3_twl_init() and omap4_twl_init() are called.

Quoted 7 lines

Quoted 2 lines
So my question was, for the case when PMIC is not TWL family. Then, is checking ".irq" sufficient to prevent the execution of
twl specific
Quoted 1 line
functions.
If PMIC is not TWL family, then I don't expect any functions in twl_common.c to be called.

This is the reason I wanted to know if the check on ".irq" in the patch is sufficient. If any PMIC requires & sets "pmic_i2c_board_info.irq" then both omap3_twl_init() and omap4_twl_init() will be called.

[quote]
void __init omap_pmic_late_init(void)
{
/* Init the OMAP TWL parameters (if PMIC has been registerd) */ if (!pmic_i2c_board_info.irq)
return;

omap3_twl_init();
omap4_twl_init();
}
[/quote]

OR, is there something - beyond this patch that I may be missing.

~sanjeev

Quoted 3 lines

Kevin

Kevin Hilman

author

2011-11-17 19:20 UTC #6 lore raw

PATCH 1/1 ARM: OMAP: PM: only register TWL with voltage layer when device is present

"Premi, Sanjeev" <[email protected]> writes:

[...]

Quoted 7 lines

Quoted 3 lines
If PMIC is not TWL family, then I don't expect any functions in twl_common.c to be called.
This is the reason I wanted to know if the check on ".irq" in the patch is sufficient. If any PMIC requires & sets "pmic_i2c_board_info.irq" then both omap3_twl_init() and omap4_twl_init() will be called.

Only TWL PMICs should be calling these functions, as they are in code for TWL PMICs *only*.

If you have a non-TWL PMIC, then you should not be using the omap_pmic_* functions.

Admittedly, these omap_pmic_* functions should be renamed to be clear that they are TWL specific.

Kevin

Premi, Sanjeev

2011-11-18 17:58 UTC #7 lore raw

PATCH 1/1 ARM: OMAP: PM: only register TWL with voltage layer when device is present

Quoted 25 lines

-----Original Message-----
From: Hilman, Kevin
Sent: Friday, November 18, 2011 12:51 AM
To: Premi, Sanjeev
Cc: linux-omap at vger.kernel.org;
linux-arm-kernel at lists.infradead.org; Koyamangalath, Abhilash
Subject: Re: [PATCH] ARM: OMAP: PM: only register TWL with voltage layer when device is present
"Premi, Sanjeev" <[email protected]> writes:
[...]
Quoted 6 lines
Quoted 3 lines
If PMIC is not TWL family, then I don't expect any functions in twl_common.c to be called.
This is the reason I wanted to know if the check on ".irq" in the patch is sufficient. If any PMIC requires & sets
"pmic_i2c_board_info.irq"
Quoted 1 line
then both omap3_twl_init() and omap4_twl_init() will be called.
Only TWL PMICs should be calling these functions, as they are in code for TWL PMICs *only*.

Quoted 6 lines

If you have a non-TWL PMIC, then you should not be using the omap_pmic_*
functions.
Admittedly, these omap_pmic_* functions should be renamed to be clear that they are TWL specific.

Thanks. We also need mechanism - may be name - to identify the PMIC family at this stage; and that should be used to select the corresponding init function.

~sanjeev

Quoted 3 lines

Kevin