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

Commit 9b28b11e authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'for_2.6.40/pm-cleanup' of... 

Merge branch 'for_2.6.40/pm-cleanup' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
parents b7679ab3 99aa1827

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 39

EXTRAVERSION = -rc7

EXTRAVERSION =

NAME = Flesh-Eating Bats with Fangs



# *DOCUMENTATION*

arch/alpha/include/asm/unistd.h

+5 −1
Original line number Diff line number Diff line
@@ -452,10 +452,14 @@ 
#define __NR_fanotify_init		494

#define __NR_fanotify_mark		495

#define __NR_prlimit64			496

#define __NR_name_to_handle_at		497

#define __NR_open_by_handle_at		498

#define __NR_clock_adjtime		499

#define __NR_syncfs			500



#ifdef __KERNEL__



#define NR_SYSCALLS			497

#define NR_SYSCALLS			501



#define __ARCH_WANT_IPC_PARSE_VERSION

#define __ARCH_WANT_OLD_READDIR

arch/alpha/kernel/systbls.S

+8 −4
Original line number Diff line number Diff line
@@ -515,6 +515,10 @@ sys_call_table: 
	.quad sys_fanotify_init

	.quad sys_fanotify_mark			/* 495 */

	.quad sys_prlimit64

	.quad sys_name_to_handle_at

	.quad sys_open_by_handle_at

	.quad sys_clock_adjtime

	.quad sys_syncfs			/* 500 */



	.size sys_call_table, . - sys_call_table

	.type sys_call_table, @object

arch/alpha/kernel/time.c

+1 −2
Original line number Diff line number Diff line
@@ -375,8 +375,7 @@ static struct clocksource clocksource_rpcc = { 


static inline void register_rpcc_clocksource(long cycle_freq)

{

	clocksource_calc_mult_shift(&clocksource_rpcc, cycle_freq, 4);

	clocksource_register(&clocksource_rpcc);

	clocksource_register_hz(&clocksource_rpcc, cycle_freq);

}

#else /* !CONFIG_SMP */

static inline void register_rpcc_clocksource(long cycle_freq)

arch/arm/mach-omap2/board-3430sdp.c

+0 −19
Original line number Diff line number Diff line
@@ -59,24 +59,6 @@ 


#define TWL4030_MSECURE_GPIO 22



/* FIXME: These values need to be updated based on more profiling on 3430sdp*/

static struct cpuidle_params omap3_cpuidle_params_table[] = {

	/* C1 */

	{1, 2, 2, 5},

	/* C2 */

	{1, 10, 10, 30},

	/* C3 */

	{1, 50, 50, 300},

	/* C4 */

	{1, 1500, 1800, 4000},

	/* C5 */

	{1, 2500, 7500, 12000},

	/* C6 */

	{1, 3000, 8500, 15000},

	/* C7 */

	{1, 10000, 30000, 300000},

};



static uint32_t board_keymap[] = {

	KEY(0, 0, KEY_LEFT),

	KEY(0, 1, KEY_RIGHT),
@@ -800,7 +782,6 @@ static void __init omap_3430sdp_init(void) 
	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);

	omap_board_config = sdp3430_config;

	omap_board_config_size = ARRAY_SIZE(sdp3430_config);

	omap3_pm_init_cpuidle(omap3_cpuidle_params_table);

	omap3430_i2c_init();

	omap_display_init(&sdp3430_dss_data);

	if (omap_rev() > OMAP3430_REV_ES1_0)