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

Commit 88fa269b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2xxx: PM: fix OMAP2xxx-specific UART idle bug in v3.3
  ARM: OMAP3: cm-t35: fix section mismatch warning
  ARM: OMAP2: Fix the OMAP2 only build break seen with 2011+ ARM tool-chains
  ARM: OMAP2+: board-generic: Add missing handle_irq callbacks
parents e9c6c5df 1e056ddd

arch/arm/mach-omap2/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ clock-common = clock.o clock_common_data.o \ 
					  clkt_dpll.o clkt_clksel.o

secure-common				= omap-smc.o omap-secure.o



obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common) $(secure-common)

obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common)

obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(hwmod-common) $(secure-common)

obj-$(CONFIG_ARCH_OMAP4) += prm44xx.o $(hwmod-common) $(secure-common)

arch/arm/mach-omap2/board-cm-t35.c

+1 −1
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ static struct usbhs_omap_board_data usbhs_bdata __initdata = { 
	.reset_gpio_port[2]  = -EINVAL

};



static void cm_t35_init_usbh(void)

static void  __init cm_t35_init_usbh(void)

{

	int err;

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

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/i2c/twl.h>



#include <mach/hardware.h>

#include <asm/hardware/gic.h>

#include <asm/mach/arch.h>



#include <plat/board.h>
@@ -102,6 +103,7 @@ DT_MACHINE_START(OMAP242X_DT, "Generic OMAP2420 (Flattened Device Tree)") 
	.map_io		= omap242x_map_io,

	.init_early	= omap2420_init_early,

	.init_irq	= omap2_init_irq,

	.handle_irq	= omap2_intc_handle_irq,

	.init_machine	= omap_generic_init,

	.timer		= &omap2_timer,

	.dt_compat	= omap242x_boards_compat,
@@ -141,6 +143,7 @@ DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)") 
	.map_io		= omap3_map_io,

	.init_early	= omap3430_init_early,

	.init_irq	= omap3_init_irq,

	.handle_irq	= omap3_intc_handle_irq,

	.init_machine	= omap3_init,

	.timer		= &omap3_timer,

	.dt_compat	= omap3_boards_compat,
@@ -160,6 +163,7 @@ DT_MACHINE_START(OMAP4_DT, "Generic OMAP4 (Flattened Device Tree)") 
	.map_io		= omap4_map_io,

	.init_early	= omap4430_init_early,

	.init_irq	= gic_init_irq,

	.handle_irq	= gic_handle_irq,

	.init_machine	= omap4_init,

	.timer		= &omap4_timer,

	.dt_compat	= omap4_boards_compat,

arch/arm/mach-omap2/pm24xx.c

+1 −7
Original line number Diff line number Diff line
@@ -82,13 +82,7 @@ static int omap2_fclks_active(void) 
	f1 = omap2_cm_read_mod_reg(CORE_MOD, CM_FCLKEN1);

	f2 = omap2_cm_read_mod_reg(CORE_MOD, OMAP24XX_CM_FCLKEN2);



	/* Ignore UART clocks.  These are handled by UART core (serial.c) */

	f1 &= ~(OMAP24XX_EN_UART1_MASK | OMAP24XX_EN_UART2_MASK);

	f2 &= ~OMAP24XX_EN_UART3_MASK;



	if (f1 | f2)

		return 1;

	return 0;

	return (f1 | f2) ? 1 : 0;

}



static void omap2_enter_full_retention(void)

arch/arm/plat-omap/include/plat/omap-secure.h

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 


#include <linux/types.h>



#ifdef CONFIG_ARCH_OMAP2PLUS

#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)

extern int omap_secure_ram_reserve_memblock(void);

#else

static inline void omap_secure_ram_reserve_memblock(void)