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

Commit 4f427634 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'omap-fixes-for-linus' of... 

Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
  omap4: prcm: Fix the CPUx clockdomain offsets
  OMAP2+: clocksource: fix crash on boot when !CONFIG_OMAP_32K_TIMER
  OMAP2/3: clock: fix fint calculation for DPLL_FREQSEL
  OMAP2+: mailbox: fix lookups for multiple mailboxes
  OMAP2420: mailbox: fix IVA vs DSP IRQ numbering
  mach-omap2: smartreflex: world-writable debugfs voltage files
  mach-omap2: pm: world-writable debugfs timer files
  mach-omap2: mux: world-writable debugfs files
parents 7f233dee 02fa9f04

arch/arm/mach-omap2/clkt_dpll.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static int _dpll_test_fint(struct clk *clk, u8 n) 
	dd = clk->dpll_data;



	/* DPLL divider must result in a valid jitter correction val */

	fint = clk->parent->rate / (n + 1);

	fint = clk->parent->rate / n;

	if (fint < DPLL_FINT_BAND1_MIN) {



		pr_debug("rejecting n=%d due to Fint failure, "

arch/arm/mach-omap2/mailbox.c

+1 −1
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ static struct omap_mbox mbox_iva_info = { 
	.priv	= &omap2_mbox_iva_priv,

};



struct omap_mbox *omap2_mboxes[] = { &mbox_iva_info, &mbox_dsp_info, NULL };

struct omap_mbox *omap2_mboxes[] = { &mbox_dsp_info, &mbox_iva_info, NULL };

#endif



#if defined(CONFIG_ARCH_OMAP4)

arch/arm/mach-omap2/mux.c

+1 −1
Original line number Diff line number Diff line
@@ -605,7 +605,7 @@ static void __init omap_mux_dbg_create_entry( 
	list_for_each_entry(e, &partition->muxmodes, node) {

		struct omap_mux *m = &e->mux;



		(void)debugfs_create_file(m->muxnames[0], S_IWUGO, mux_dbg_dir,

		(void)debugfs_create_file(m->muxnames[0], S_IWUSR, mux_dbg_dir,

					  m, &omap_mux_dbg_signal_fops);

	}

}

arch/arm/mach-omap2/pm-debug.c

+4 −4
Original line number Diff line number Diff line
@@ -637,14 +637,14 @@ static int __init pm_dbg_init(void) 


		}



	(void) debugfs_create_file("enable_off_mode", S_IRUGO | S_IWUGO, d,

	(void) debugfs_create_file("enable_off_mode", S_IRUGO | S_IWUSR, d,

				   &enable_off_mode, &pm_dbg_option_fops);

	(void) debugfs_create_file("sleep_while_idle", S_IRUGO | S_IWUGO, d,

	(void) debugfs_create_file("sleep_while_idle", S_IRUGO | S_IWUSR, d,

				   &sleep_while_idle, &pm_dbg_option_fops);

	(void) debugfs_create_file("wakeup_timer_seconds", S_IRUGO | S_IWUGO, d,

	(void) debugfs_create_file("wakeup_timer_seconds", S_IRUGO | S_IWUSR, d,

				   &wakeup_timer_seconds, &pm_dbg_option_fops);

	(void) debugfs_create_file("wakeup_timer_milliseconds",

			S_IRUGO | S_IWUGO, d, &wakeup_timer_milliseconds,

			S_IRUGO | S_IWUSR, d, &wakeup_timer_milliseconds,

			&pm_dbg_option_fops);

	pm_dbg_init_done = 1;

arch/arm/mach-omap2/prcm_mpu44xx.h

+2 −2
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@ 
#define OMAP4430_PRCM_MPU_CPU1_INST		0x0800



/* PRCM_MPU clockdomain register offsets (from instance start) */

#define OMAP4430_PRCM_MPU_CPU0_MPU_CDOFFS	0x0000

#define OMAP4430_PRCM_MPU_CPU1_MPU_CDOFFS	0x0000

#define OMAP4430_PRCM_MPU_CPU0_MPU_CDOFFS	0x0018

#define OMAP4430_PRCM_MPU_CPU1_MPU_CDOFFS	0x0018





/*