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

Commit 741db4a7 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v4.4/fixes-rc6' of... 

Merge tag 'omap-for-v4.4/fixes-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Few fixes for omaps to allow am437x only builds to boot properly with
CPU_IDLE and ARM TWD timer. This is probably a common configuration setup
for people making products with these SoCs so let's make sure it works.

Also a wakeirq fix for duovero parlor making my life a bit easier as that
allows me to run basic PM regression tests on it.

It would be nice to have these in v4.4, but if it gets too late for that
because of the holidays, it is not super critical if these get merged for
v4.5.

* tag 'omap-for-v4.4/fixes-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: dts: Fix UART wakeirq for omap4 duovero parlor
  ARM: OMAP2+: AM43xx: select ARM TWD timer
  ARM: OMAP2+: am43xx: enable GENERIC_CLOCKEVENTS_BROADCAST

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 8b9c1334 0b4d6972

arch/arm/boot/dts/omap4-duovero-parlor.dts

+4 −0
Original line number Diff line number Diff line
@@ -189,3 +189,7 @@ 
	};

};



&uart3 {

	interrupts-extended = <&wakeupgen GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH

			       &omap4_pmx_core OMAP4_UART3_RX>;

};

arch/arm/mach-omap2/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ config SOC_AM43XX 
	select MACH_OMAP_GENERIC

	select MIGHT_HAVE_CACHE_L2X0

	select HAVE_ARM_SCU

	select GENERIC_CLOCKEVENTS_BROADCAST

	select HAVE_ARM_TWD



config SOC_DRA7XX

	bool "TI DRA7XX"

arch/arm/mach-omap2/timer.c

+6 −0
Original line number Diff line number Diff line
@@ -320,6 +320,12 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer, 
	return r;

}



#if !defined(CONFIG_SMP) && defined(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST)

void tick_broadcast(const struct cpumask *mask)

{

}

#endif



static void __init omap2_gp_clockevent_init(int gptimer_id,

						const char *fck_source,

						const char *property)