Skip to content

Commit 741db4a

Browse files
committed
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: Olof Johansson <[email protected]>
2 parents 8b9c133 + 0b4d697 commit 741db4a

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,3 +189,7 @@
189189
};
190190
};
191191

192+
&uart3 {
193+
interrupts-extended = <&wakeupgen GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH
194+
&omap4_pmx_core OMAP4_UART3_RX>;
195+
};

arch/arm/mach-omap2/Kconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ config SOC_AM43XX
6565
select MACH_OMAP_GENERIC
6666
select MIGHT_HAVE_CACHE_L2X0
6767
select HAVE_ARM_SCU
68+
select GENERIC_CLOCKEVENTS_BROADCAST
69+
select HAVE_ARM_TWD
6870

6971
config SOC_DRA7XX
7072
bool "TI DRA7XX"

arch/arm/mach-omap2/timer.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,12 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer,
320320
return r;
321321
}
322322

323+
#if !defined(CONFIG_SMP) && defined(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST)
324+
void tick_broadcast(const struct cpumask *mask)
325+
{
326+
}
327+
#endif
328+
323329
static void __init omap2_gp_clockevent_init(int gptimer_id,
324330
const char *fck_source,
325331
const char *property)

0 commit comments

Comments
 (0)