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

Commit ce3fc89a authored by Vaibhav Hiremath's avatar Vaibhav Hiremath Committed by Paul Walmsley
Browse files

ARM: OMAP AM33xx: voltagedomain: Add voltage domain data 



Currently dummy voltage domain data is being created
in order to succeed boot process, nothing has been done
w.r.t actual hardware (voltage control).

Also, hook up the AM33XX voltage domain to OMAP framework.

Signed-off-by: default avatarVaibhav Hiremath <hvaibhav@ti.com>
Signed-off-by: default avatarAfzal Mohammed <afzal@ti.com>
Cc: Benoit Cousson <b-cousson@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Kevin Hilman <khilman@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Rajendra Nayak <rnayak@ti.com>
Acked-by: default avatarKevin Hilman <khilman@ti.com>
[paul@pwsan.com: updated for 3.5]
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 2e113c64

arch/arm/mach-omap2/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -99,6 +99,7 @@ obj-$(CONFIG_ARCH_OMAP3) += $(voltagedomain-common) 
obj-$(CONFIG_ARCH_OMAP3)		+= voltagedomains3xxx_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= voltagedomains3xxx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= $(voltagedomain-common)

obj-$(CONFIG_ARCH_OMAP4)		+= $(voltagedomain-common)

obj-$(CONFIG_ARCH_OMAP4)		+= voltagedomains44xx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= voltagedomains44xx_data.o

obj-$(CONFIG_SOC_AM33XX)                += voltagedomains33xx_data.o





# OMAP powerdomain framework

# OMAP powerdomain framework

powerdomain-common			+= powerdomain.o powerdomain-common.o

powerdomain-common			+= powerdomain.o powerdomain-common.o

arch/arm/mach-omap2/common.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -129,6 +129,7 @@ void omap3430_init_early(void); 
void omap35xx_init_early(void);

void omap35xx_init_early(void);

void omap3630_init_early(void);

void omap3630_init_early(void);

void omap3_init_early(void);	/* Do not use this one */

void omap3_init_early(void);	/* Do not use this one */

void am33xx_init_early(void);

void am35xx_init_early(void);

void am35xx_init_early(void);

void ti81xx_init_early(void);

void ti81xx_init_early(void);

void am33xx_init_early(void);

void am33xx_init_early(void);

arch/arm/mach-omap2/io.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -484,6 +484,7 @@ void __init am33xx_init_early(void) 
	omap3xxx_check_revision();

	omap3xxx_check_revision();

	ti81xx_check_features();

	ti81xx_check_features();

	omap_common_init_early();

	omap_common_init_early();

	am33xx_voltagedomains_init();

}

}

#endif

#endif

arch/arm/mach-omap2/voltage.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -156,6 +156,7 @@ int omap_voltage_late_init(void); 




extern void omap2xxx_voltagedomains_init(void);

extern void omap2xxx_voltagedomains_init(void);

extern void omap3xxx_voltagedomains_init(void);

extern void omap3xxx_voltagedomains_init(void);

extern void am33xx_voltagedomains_init(void);

extern void omap44xx_voltagedomains_init(void);

extern void omap44xx_voltagedomains_init(void);





struct voltagedomain *voltdm_lookup(const char *name);

struct voltagedomain *voltdm_lookup(const char *name);

arch/arm/mach-omap2/voltagedomains33xx_data.c

0 → 100644
+43 −0
Original line number Original line Diff line number Diff line 
/*

 * AM33XX voltage domain data

 *

 * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License as

 * published by the Free Software Foundation version 2.

 *

 * This program is distributed "as is" WITHOUT ANY WARRANTY of any

 * kind, whether express or implied; without even the implied warranty

 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#include <linux/kernel.h>

#include <linux/init.h>



#include "voltage.h"



static struct voltagedomain am33xx_voltdm_mpu = {

	.name		= "mpu",

};



static struct voltagedomain am33xx_voltdm_core = {

	.name		= "core",

};



static struct voltagedomain am33xx_voltdm_rtc = {

	.name		= "rtc",

};



static struct voltagedomain *voltagedomains_am33xx[] __initdata = {

	&am33xx_voltdm_mpu,

	&am33xx_voltdm_core,

	&am33xx_voltdm_rtc,

	NULL,

};



void __init am33xx_voltagedomains_init(void)

{

	voltdm_init(voltagedomains_am33xx);

}