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

Commit 231900af authored by Daniel Lezcano's avatar Daniel Lezcano Committed by Kevin Hilman
Browse files

ARM: OMAP3: cpuidle - remove rx51 cpuidle parameters table 



As suggested, this table is an optimized version for rx51 and we
remove it in order to consolidate the cpuidle code between omap3
and omap4, we remove this specific data definition which is used
to override the default omap3 latencies but at the cost of extra
code and complexity.

In order to not lose the values which probably took time to be
measured, the table is converted into a comment with an array
description.

Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Reviewed-by: default avatarJean Pihet <j-pihet@ti.com>
Reviewed-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Tested-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Tested-by: default avatarKevin Hilman <khilman@ti.com>
Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
parent 102c2551

arch/arm/mach-omap2/board-rx51.c

+18 −20
Original line number Diff line number Diff line
@@ -59,25 +59,24 @@ static struct platform_device leds_gpio = { 
};



/*

 * cpuidle C-states definition override from the default values.

 * The 'exit_latency' field is the sum of sleep and wake-up latencies.

 * cpuidle C-states definition for rx51.

 *

 * The 'exit_latency' field is the sum of sleep

 * and wake-up latencies.



    ---------------------------------------------

   | state |  exit_latency  |  target_residency  |

    ---------------------------------------------

   |  C1   |    110 + 162   |            5       |

   |  C2   |    106 + 180   |          309       |

   |  C3   |    107 + 410   |        46057       |

   |  C4   |    121 + 3374  |        46057       |

   |  C5   |    855 + 1146  |        46057       |

   |  C6   |   7580 + 4134  |       484329       |

   |  C7   |   7505 + 15274 |       484329       |

    ---------------------------------------------



*/

static struct cpuidle_params rx51_cpuidle_params[] = {

	/* C1 */

	{110 + 162, 5 , 1},

	/* C2 */

	{106 + 180, 309, 1},

	/* C3 */

	{107 + 410, 46057, 0},

	/* C4 */

	{121 + 3374, 46057, 0},

	/* C5 */

	{855 + 1146, 46057, 1},

	/* C6 */

	{7580 + 4134, 484329, 0},

	/* C7 */

	{7505 + 15274, 484329, 1},

};



extern void __init rx51_peripherals_init(void);
@@ -98,7 +97,6 @@ static void __init rx51_init(void) 
	struct omap_sdrc_params *sdrc_params;



	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);

	omap3_pm_init_cpuidle(rx51_cpuidle_params);

	omap_serial_init();



	sdrc_params = nokia_get_sdram_timings();

arch/arm/mach-omap2/cpuidle34xx.c

+0 −17
Original line number Diff line number Diff line
@@ -298,23 +298,6 @@ select_state: 


DEFINE_PER_CPU(struct cpuidle_device, omap3_idle_dev);



void omap3_pm_init_cpuidle(struct cpuidle_params *cpuidle_board_params)

{

	int i;



	if (!cpuidle_board_params)

		return;



	for (i = 0; i < OMAP3_NUM_STATES; i++) {

		cpuidle_params_table[i].valid =	cpuidle_board_params[i].valid;

		cpuidle_params_table[i].exit_latency =

			cpuidle_board_params[i].exit_latency;

		cpuidle_params_table[i].target_residency =

			cpuidle_board_params[i].target_residency;

	}

	return;

}



struct cpuidle_driver omap3_idle_driver = {

	.name = 	"omap3_idle",

	.owner = 	THIS_MODULE,

arch/arm/mach-omap2/pm.h

+0 −9
Original line number Diff line number Diff line
@@ -50,15 +50,6 @@ struct cpuidle_params { 
	u8 valid;		/* validates the C-state */

};



#if defined(CONFIG_PM) && defined(CONFIG_CPU_IDLE)

extern void omap3_pm_init_cpuidle(struct cpuidle_params *cpuidle_board_params);

#else

static

inline void omap3_pm_init_cpuidle(struct cpuidle_params *cpuidle_board_params)

{

}

#endif



extern int omap3_pm_get_suspend_state(struct powerdomain *pwrdm);

extern int omap3_pm_set_suspend_state(struct powerdomain *pwrdm, int state);