summaryrefslogtreecommitdiffstats
path: root/drivers/soc
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2018-11-30 15:50:23 -0800
committerOlof Johansson <olof@lixom.net>2018-11-30 15:50:23 -0800
commit0277a623dd786cb07a7c5f4fb25327aa93cd5d49 (patch)
tree33b72ea233b045793a38778b91cb8fbe44de49b8 /drivers/soc
parent0be66f394efdfb832f01248a0e043ae56c886cc1 (diff)
parent3be5e10daf1fc063ec5cff3cd785c4a59814af0b (diff)
downloadlinux-0277a623dd786cb07a7c5f4fb25327aa93cd5d49.tar.bz2
Merge tag 'omap-for-v4.21/driver-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/drivers
Driver changes for omaps for v4.21 merge window Few SoC related driver changes to add PRCM as the wake-up source for wkup_m3_ipc driver, and to improve ti-sysc driver for dra7 mcasp and device detection when debug is enabled. There is also a non-critical fix for ti-sysc to fix handling of the optional clocks but this can wait for the merge window no problem. * tag 'omap-for-v4.21/driver-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: soc: ti: wkup_m3: Add PRCM int16 as the wake up source bus: ti-sysc: Detect devices for debug on omap5 bus: ti-sysc: Add mcasp optional clocks flag bus: ti-sysc: Fix getting optional clocks in clock_roles Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/soc')
-rw-r--r--drivers/soc/ti/wkup_m3_ipc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/soc/ti/wkup_m3_ipc.c b/drivers/soc/ti/wkup_m3_ipc.c
index f5cb8c0af09f..d65e361c5de1 100644
--- a/drivers/soc/ti/wkup_m3_ipc.c
+++ b/drivers/soc/ti/wkup_m3_ipc.c
@@ -57,6 +57,7 @@
static struct wkup_m3_ipc *m3_ipc_state;
static const struct wkup_m3_wakeup_src wakeups[] = {
+ {.irq_nr = 16, .src = "PRCM"},
{.irq_nr = 35, .src = "USB0_PHY"},
{.irq_nr = 36, .src = "USB1_PHY"},
{.irq_nr = 40, .src = "I2C0"},