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

Commit a2358a7b authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'integration-2.6.39-for-tony' of... 

Merge branch 'integration-2.6.39-for-tony' of git://git.pwsan.com/linux-integration into omap-for-linus

Conflicts:
	arch/arm/mach-omap2/pm34xx.c
parents 94a06b74 a08572ae

MAINTAINERS

+10 −0
Original line number Diff line number Diff line
@@ -4506,6 +4506,16 @@ L: linux-omap@vger.kernel.org 
S:	Maintained

F:	arch/arm/*omap*/*pm*



OMAP POWERDOMAIN/CLOCKDOMAIN SOC ADAPTATION LAYER SUPPORT

M:	Rajendra Nayak <rnayak@ti.com>

M:	Paul Walmsley <paul@pwsan.com>

L:	linux-omap@vger.kernel.org

S:	Maintained

F:	arch/arm/mach-omap2/powerdomain2xxx_3xxx.c

F:	arch/arm/mach-omap2/powerdomain44xx.c

F:	arch/arm/mach-omap2/clockdomain2xxx_3xxx.c

F:	arch/arm/mach-omap2/clockdomain44xx.c



OMAP AUDIO SUPPORT

M:	Jarkko Nikula <jhnikula@gmail.com>

L:	alsa-devel@alsa-project.org (subscribers-only)

arch/arm/mach-omap2/Makefile

+26 −8
Original line number Diff line number Diff line
@@ -59,10 +59,10 @@ endif 
# Power Management

ifeq ($(CONFIG_PM),y)

obj-$(CONFIG_ARCH_OMAP2)		+= pm24xx.o

obj-$(CONFIG_ARCH_OMAP2)		+= sleep24xx.o pm_bus.o voltage.o

obj-$(CONFIG_ARCH_OMAP3)		+= pm34xx.o sleep34xx.o voltage.o \

obj-$(CONFIG_ARCH_OMAP2)		+= sleep24xx.o pm_bus.o

obj-$(CONFIG_ARCH_OMAP3)		+= pm34xx.o sleep34xx.o \

					   cpuidle34xx.o pm_bus.o

obj-$(CONFIG_ARCH_OMAP4)		+= pm44xx.o voltage.o pm_bus.o

obj-$(CONFIG_ARCH_OMAP4)		+= pm44xx.o pm_bus.o

obj-$(CONFIG_PM_DEBUG)			+= pm-debug.o

obj-$(CONFIG_OMAP_SMARTREFLEX)          += sr_device.o smartreflex.o

obj-$(CONFIG_OMAP_SMARTREFLEX_CLASS3)	+= smartreflex-class3.o
@@ -78,13 +78,25 @@ endif 


# PRCM

obj-$(CONFIG_ARCH_OMAP2)		+= prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o

obj-$(CONFIG_ARCH_OMAP3)		+= prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o

obj-$(CONFIG_ARCH_OMAP3)		+= prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o \

					   vc3xxx_data.o vp3xxx_data.o

# XXX The presence of cm2xxx_3xxx.o on the line below is temporary and

# will be removed once the OMAP4 part of the codebase is converted to

# use OMAP4-specific PRCM functions.

obj-$(CONFIG_ARCH_OMAP4)		+= prcm.o cm2xxx_3xxx.o cminst44xx.o \

					   cm44xx.o prcm_mpu44xx.o \

					   prminst44xx.o

					   prminst44xx.o vc44xx_data.o \

					   vp44xx_data.o



# OMAP voltage domains

ifeq ($(CONFIG_PM),y)

voltagedomain-common			:= voltage.o

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

obj-$(CONFIG_ARCH_OMAP3)		+= $(voltagedomain-common) \

					   voltagedomains3xxx_data.o

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

					   voltagedomains44xx_data.o

endif



# OMAP powerdomain framework

powerdomain-common			+= powerdomain.o powerdomain-common.o
@@ -102,25 +114,31 @@ obj-$(CONFIG_ARCH_OMAP4) += $(powerdomain-common) \ 


# PRCM clockdomain control

obj-$(CONFIG_ARCH_OMAP2)		+= clockdomain.o \

					   clockdomain2xxx_3xxx.o \

					   clockdomains2xxx_3xxx_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= clockdomain.o \

					   clockdomain2xxx_3xxx.o \

					   clockdomains2xxx_3xxx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= clockdomain.o \

					   clockdomain44xx.o \

					   clockdomains44xx_data.o



# Clock framework

obj-$(CONFIG_ARCH_OMAP2)		+= $(clock-common) clock2xxx.o \

					   clkt2xxx_sys.o \

					   clkt2xxx_dpllcore.o \

					   clkt2xxx_virt_prcm_set.o \

					   clkt2xxx_apll.o clkt2xxx_osc.o

					   clkt2xxx_apll.o clkt2xxx_osc.o \

					   clkt2xxx_dpll.o clkt_iclk.o

obj-$(CONFIG_SOC_OMAP2420)		+= clock2420_data.o

obj-$(CONFIG_SOC_OMAP2430)		+= clock2430.o clock2430_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= $(clock-common) clock3xxx.o \

					   clock34xx.o clkt34xx_dpll3m2.o \

					   clock3517.o clock36xx.o \

					   dpll3xxx.o clock3xxx_data.o

					   dpll3xxx.o clock3xxx_data.o \

					   clkt_iclk.o

obj-$(CONFIG_ARCH_OMAP4)		+= $(clock-common) clock44xx_data.o \

					   dpll3xxx.o

					   dpll3xxx.o dpll44xx.o



# OMAP2 clock rate set data (old "OPP" data)

obj-$(CONFIG_SOC_OMAP2420)		+= opp2420_data.o

arch/arm/mach-omap2/clkt2xxx_apll.c

+24 −0
Original line number Diff line number Diff line
@@ -78,6 +78,26 @@ static int omap2_clk_apll54_enable(struct clk *clk) 
	return omap2_clk_apll_enable(clk, OMAP24XX_ST_54M_APLL_MASK);

}



static void _apll96_allow_idle(struct clk *clk)

{

	omap2xxx_cm_set_apll96_auto_low_power_stop();

}



static void _apll96_deny_idle(struct clk *clk)

{

	omap2xxx_cm_set_apll96_disable_autoidle();

}



static void _apll54_allow_idle(struct clk *clk)

{

	omap2xxx_cm_set_apll54_auto_low_power_stop();

}



static void _apll54_deny_idle(struct clk *clk)

{

	omap2xxx_cm_set_apll54_disable_autoidle();

}



/* Stop APLL */

static void omap2_clk_apll_disable(struct clk *clk)

{
@@ -93,11 +113,15 @@ static void omap2_clk_apll_disable(struct clk *clk) 
const struct clkops clkops_apll96 = {

	.enable		= omap2_clk_apll96_enable,

	.disable	= omap2_clk_apll_disable,

	.allow_idle	= _apll96_allow_idle,

	.deny_idle	= _apll96_deny_idle,

};



const struct clkops clkops_apll54 = {

	.enable		= omap2_clk_apll54_enable,

	.disable	= omap2_clk_apll_disable,

	.allow_idle	= _apll54_allow_idle,

	.deny_idle	= _apll54_deny_idle,

};



/* Public functions */

arch/arm/mach-omap2/clkt2xxx_dpll.c

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

 * OMAP2-specific DPLL control functions

 *

 * Copyright (C) 2011 Nokia Corporation

 * Paul Walmsley

 *

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

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#include <linux/kernel.h>

#include <linux/errno.h>

#include <linux/clk.h>

#include <linux/io.h>



#include <plat/clock.h>



#include "clock.h"

#include "cm2xxx_3xxx.h"

#include "cm-regbits-24xx.h"



/* Private functions */



/**

 * _allow_idle - enable DPLL autoidle bits

 * @clk: struct clk * of the DPLL to operate on

 *

 * Enable DPLL automatic idle control.  The DPLL will enter low-power

 * stop when its downstream clocks are gated.  No return value.

 * REVISIT: DPLL can optionally enter low-power bypass by writing 0x1

 * instead.  Add some mechanism to optionally enter this mode.

 */

static void _allow_idle(struct clk *clk)

{

	if (!clk || !clk->dpll_data)

		return;



	omap2xxx_cm_set_dpll_auto_low_power_stop();

}



/**

 * _deny_idle - prevent DPLL from automatically idling

 * @clk: struct clk * of the DPLL to operate on

 *

 * Disable DPLL automatic idle control.  No return value.

 */

static void _deny_idle(struct clk *clk)

{

	if (!clk || !clk->dpll_data)

		return;



	omap2xxx_cm_set_dpll_disable_autoidle();

}





/* Public data */



const struct clkops clkops_omap2xxx_dpll_ops = {

	.allow_idle	= _allow_idle,

	.deny_idle	= _deny_idle,

};

arch/arm/mach-omap2/clkt2xxx_osc.c

+14 −0
Original line number Diff line number Diff line
@@ -30,6 +30,13 @@ 
#include "prm2xxx_3xxx.h"

#include "prm-regbits-24xx.h"



/*

 * XXX This does not actually enable the osc_ck, since the osc_ck must

 * be running for this function to be called.  Instead, this function

 * is used to disable an autoidle mode on the osc_ck.  The existing

 * clk_enable/clk_disable()-based usecounting for osc_ck should be

 * replaced with autoidle-based usecounting.

 */

static int omap2_enable_osc_ck(struct clk *clk)

{

	u32 pcc;
@@ -41,6 +48,13 @@ static int omap2_enable_osc_ck(struct clk *clk) 
	return 0;

}



/*

 * XXX This does not actually disable the osc_ck, since doing so would

 * immediately halt the system.  Instead, this function is used to

 * enable an autoidle mode on the osc_ck.  The existing

 * clk_enable/clk_disable()-based usecounting for osc_ck should be

 * replaced with autoidle-based usecounting.

 */

static void omap2_disable_osc_ck(struct clk *clk)

{

	u32 pcc;