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

Commit ec538e30 authored by Paul Walmsley's avatar Paul Walmsley
Browse files

OMAP3: clock: use autoidle clkops for all autoidle-controllable interface clocks 



Mark each interface clock with a corresponding CM_AUTOIDLE bit with
a clkops that has the allow_idle/deny_idle function pointers populated.
This allows the OMAP clock framework to enable and disable autoidle for
these clocks.

Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
Tested-by: default avatarRajendra Nayak <rnayak@ti.com>
Reviewed-by: default avatarKevin Hilman <khilman@ti.com>
parent a1d55623

arch/arm/mach-omap2/clock34xx.c

+28 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ 
 * OMAP3-specific clock framework functions

 * OMAP3-specific clock framework functions

 *

 *

 * Copyright (C) 2007-2008 Texas Instruments, Inc.

 * Copyright (C) 2007-2008 Texas Instruments, Inc.

 * Copyright (C) 2007-2010 Nokia Corporation

 * Copyright (C) 2007-2011 Nokia Corporation

 *

 *

 * Paul Walmsley

 * Paul Walmsley

 * Jouni Högander

 * Jouni Högander
@@ -59,6 +59,15 @@ const struct clkops clkops_omap3430es2_ssi_wait = { 
	.find_companion = omap2_clk_dflt_find_companion,

	.find_companion = omap2_clk_dflt_find_companion,

};

};





const struct clkops clkops_omap3430es2_iclk_ssi_wait = {

	.enable		= omap2_dflt_clk_enable,

	.disable	= omap2_dflt_clk_disable,

	.find_idlest	= omap3430es2_clk_ssi_find_idlest,

	.find_companion = omap2_clk_dflt_find_companion,

	.allow_idle	= omap2_clkt_iclk_allow_idle,

	.deny_idle	= omap2_clkt_iclk_deny_idle,

};



/**

/**

 * omap3430es2_clk_dss_usbhost_find_idlest - CM_IDLEST info for DSS, USBHOST

 * omap3430es2_clk_dss_usbhost_find_idlest - CM_IDLEST info for DSS, USBHOST

 * @clk: struct clk * being enabled

 * @clk: struct clk * being enabled
@@ -94,6 +103,15 @@ const struct clkops clkops_omap3430es2_dss_usbhost_wait = { 
	.find_companion = omap2_clk_dflt_find_companion,

	.find_companion = omap2_clk_dflt_find_companion,

};

};





const struct clkops clkops_omap3430es2_iclk_dss_usbhost_wait = {

	.enable		= omap2_dflt_clk_enable,

	.disable	= omap2_dflt_clk_disable,

	.find_idlest	= omap3430es2_clk_dss_usbhost_find_idlest,

	.find_companion = omap2_clk_dflt_find_companion,

	.allow_idle	= omap2_clkt_iclk_allow_idle,

	.deny_idle	= omap2_clkt_iclk_deny_idle,

};



/**

/**

 * omap3430es2_clk_hsotgusb_find_idlest - return CM_IDLEST info for HSOTGUSB

 * omap3430es2_clk_hsotgusb_find_idlest - return CM_IDLEST info for HSOTGUSB

 * @clk: struct clk * being enabled

 * @clk: struct clk * being enabled
@@ -124,3 +142,12 @@ const struct clkops clkops_omap3430es2_hsotgusb_wait = { 
	.find_idlest	= omap3430es2_clk_hsotgusb_find_idlest,

	.find_idlest	= omap3430es2_clk_hsotgusb_find_idlest,

	.find_companion = omap2_clk_dflt_find_companion,

	.find_companion = omap2_clk_dflt_find_companion,

};

};



const struct clkops clkops_omap3430es2_iclk_hsotgusb_wait = {

	.enable		= omap2_dflt_clk_enable,

	.disable	= omap2_dflt_clk_disable,

	.find_idlest	= omap3430es2_clk_hsotgusb_find_idlest,

	.find_companion = omap2_clk_dflt_find_companion,

	.allow_idle	= omap2_clkt_iclk_allow_idle,

	.deny_idle	= omap2_clkt_iclk_deny_idle,

};

arch/arm/mach-omap2/clock34xx.h

+4 −1
Original line number Original line Diff line number Diff line
@@ -2,14 +2,17 @@ 
 * OMAP34xx clock function prototypes and macros

 * OMAP34xx clock function prototypes and macros

 *

 *

 * Copyright (C) 2007-2010 Texas Instruments, Inc.

 * Copyright (C) 2007-2010 Texas Instruments, Inc.

 * Copyright (C) 2007-2010 Nokia Corporation

 * Copyright (C) 2007-2011 Nokia Corporation

 */

 */





#ifndef __ARCH_ARM_MACH_OMAP2_CLOCK34XX_H

#ifndef __ARCH_ARM_MACH_OMAP2_CLOCK34XX_H

#define __ARCH_ARM_MACH_OMAP2_CLOCK34XX_H

#define __ARCH_ARM_MACH_OMAP2_CLOCK34XX_H





extern const struct clkops clkops_omap3430es2_ssi_wait;

extern const struct clkops clkops_omap3430es2_ssi_wait;

extern const struct clkops clkops_omap3430es2_iclk_ssi_wait;

extern const struct clkops clkops_omap3430es2_hsotgusb_wait;

extern const struct clkops clkops_omap3430es2_hsotgusb_wait;

extern const struct clkops clkops_omap3430es2_iclk_hsotgusb_wait;

extern const struct clkops clkops_omap3430es2_dss_usbhost_wait;

extern const struct clkops clkops_omap3430es2_dss_usbhost_wait;

extern const struct clkops clkops_omap3430es2_iclk_dss_usbhost_wait;





#endif
 
#endif

arch/arm/mach-omap2/clock3517.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ 
 * OMAP3517/3505-specific clock framework functions

 * OMAP3517/3505-specific clock framework functions

 *

 *

 * Copyright (C) 2010 Texas Instruments, Inc.

 * Copyright (C) 2010 Texas Instruments, Inc.

 * Copyright (C) 2010 Nokia Corporation

 * Copyright (C) 2011 Nokia Corporation

 *

 *

 * Ranjith Lohithakshan

 * Ranjith Lohithakshan

 * Paul Walmsley

 * Paul Walmsley
@@ -119,6 +119,8 @@ const struct clkops clkops_am35xx_ipss_wait = { 
	.disable	= omap2_dflt_clk_disable,

	.disable	= omap2_dflt_clk_disable,

	.find_idlest	= am35xx_clk_ipss_find_idlest,

	.find_idlest	= am35xx_clk_ipss_find_idlest,

	.find_companion	= omap2_clk_dflt_find_companion,

	.find_companion	= omap2_clk_dflt_find_companion,

	.allow_idle	= omap2_clkt_iclk_allow_idle,

	.deny_idle	= omap2_clkt_iclk_deny_idle,

};

};

arch/arm/mach-omap2/clock3xxx_data.c

+77 −72

File changed.

Preview size limit exceeded, changes collapsed.