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

Commit 696314cf authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'fixes' of... 

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into fixes
parents 419bb4e0 e9d0b97e

arch/arm/mach-omap2/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ config ARCH_OMAP2PLUS_TYPICAL 
	default y

	select AEABI

	select REGULATOR

	select PM

	select PM_RUNTIME

	select VFP

	select NEON if ARCH_OMAP3 || ARCH_OMAP4

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

+0 −2
Original line number Diff line number Diff line
@@ -45,8 +45,6 @@ static struct omap_board_config_kernel am3517_crane_config[] __initdata = { 
static struct omap_board_mux board_mux[] __initdata = {

	{ .reg_offset = OMAP_MUX_TERMINATOR },

};

#else

#define board_mux	NULL

#endif



static void __init am3517_crane_init_early(void)

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

+10 −13
Original line number Diff line number Diff line
@@ -491,23 +491,22 @@ static void __init beagle_opp_init(void) 


	/* Custom OPP enabled for all xM versions */

	if (cpu_is_omap3630()) {

		struct omap_hwmod *mh = omap_hwmod_lookup("mpu");

		struct omap_hwmod *dh = omap_hwmod_lookup("iva");

		struct device *dev;

		struct device *mpu_dev, *iva_dev;



		if (!mh || !dh) {

		mpu_dev = omap2_get_mpuss_device();

		iva_dev = omap2_get_iva_device();



		if (!mpu_dev || !iva_dev) {

			pr_err("%s: Aiee.. no mpu/dsp devices? %p %p\n",

				__func__, mh, dh);

				__func__, mpu_dev, iva_dev);

			return;

		}

		/* Enable MPU 1GHz and lower opps */

		dev = &mh->od->pdev.dev;

		r = opp_enable(dev, 800000000);

		r = opp_enable(mpu_dev, 800000000);

		/* TODO: MPU 1GHz needs SR and ABB */



		/* Enable IVA 800MHz and lower opps */

		dev = &dh->od->pdev.dev;

		r |= opp_enable(dev, 660000000);

		r |= opp_enable(iva_dev, 660000000);

		/* TODO: DSP 800MHz needs SR and ABB */

		if (r) {

			pr_err("%s: failed to enable higher opp %d\n",
@@ -516,10 +515,8 @@ static void __init beagle_opp_init(void) 
			 * Cleanup - disable the higher freqs - we dont care

			 * about the results

			 */

			dev = &mh->od->pdev.dev;

			opp_disable(dev, 800000000);

			dev = &dh->od->pdev.dev;

			opp_disable(dev, 660000000);

			opp_disable(mpu_dev, 800000000);

			opp_disable(iva_dev, 660000000);

		}

	}

	return;

arch/arm/mach-omap2/cminst44xx.h

+24 −1
Original line number Diff line number Diff line
@@ -18,13 +18,36 @@ extern void omap4_cminst_clkdm_force_sleep(u8 part, s16 inst, u16 cdoffs); 
extern void omap4_cminst_clkdm_force_wakeup(u8 part, s16 inst, u16 cdoffs);



extern int omap4_cminst_wait_module_ready(u8 part, u16 inst, s16 cdoffs, u16 clkctrl_offs);

extern int omap4_cminst_wait_module_idle(u8 part, u16 inst, s16 cdoffs, u16 clkctrl_offs);



# ifdef CONFIG_ARCH_OMAP4

extern int omap4_cminst_wait_module_idle(u8 part, u16 inst, s16 cdoffs,

					 u16 clkctrl_offs);



extern void omap4_cminst_module_enable(u8 mode, u8 part, u16 inst, s16 cdoffs,

				       u16 clkctrl_offs);

extern void omap4_cminst_module_disable(u8 part, u16 inst, s16 cdoffs,

					u16 clkctrl_offs);



# else



static inline int omap4_cminst_wait_module_idle(u8 part, u16 inst, s16 cdoffs,

					u16 clkctrl_offs)

{

	return 0;

}



static inline void omap4_cminst_module_enable(u8 mode, u8 part, u16 inst,

				s16 cdoffs, u16 clkctrl_offs)

{

}



static inline void omap4_cminst_module_disable(u8 part, u16 inst, s16 cdoffs,

				 u16 clkctrl_offs)

{

}



# endif



/*

 * In an ideal world, we would not export these low-level functions,

 * but this will probably take some time to fix properly

arch/arm/mach-omap2/mux.c

+4 −10
Original line number Diff line number Diff line
@@ -821,11 +821,10 @@ static void __init omap_mux_set_cmdline_signals(void) 
	if (!omap_mux_options)

		return;



	options = kmalloc(strlen(omap_mux_options) + 1, GFP_KERNEL);

	options = kstrdup(omap_mux_options, GFP_KERNEL);

	if (!options)

		return;



	strcpy(options, omap_mux_options);

	next_opt = options;



	while ((token = strsep(&next_opt, ",")) != NULL) {
@@ -855,24 +854,19 @@ static int __init omap_mux_copy_names(struct omap_mux *src, 


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

		if (src->muxnames[i]) {

			dst->muxnames[i] =

				kmalloc(strlen(src->muxnames[i]) + 1,

			dst->muxnames[i] = kstrdup(src->muxnames[i],

						   GFP_KERNEL);

			if (!dst->muxnames[i])

				goto free;

			strcpy(dst->muxnames[i], src->muxnames[i]);

		}

	}



#ifdef CONFIG_DEBUG_FS

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

		if (src->balls[i]) {

			dst->balls[i] =

				kmalloc(strlen(src->balls[i]) + 1,

					GFP_KERNEL);

			dst->balls[i] = kstrdup(src->balls[i], GFP_KERNEL);

			if (!dst->balls[i])

				goto free;

			strcpy(dst->balls[i], src->balls[i]);

		}

	}

#endif