Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46232a36 authored by Kevin Hilman's avatar Kevin Hilman Committed by Tony Lindgren
Browse files

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: default avatarKevin Hilman <khilman@ti.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent cc1b0765

arch/arm/mach-omap2/pm.c

+2 −4
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line 
#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)