aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/bus
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2018-01-26 17:35:16 +0100
committerArnd Bergmann <arnd@arndb.de>2018-01-26 17:35:16 +0100
commit796543a64ebffdb638a22f428c4dadd037e34866 (patch)
treeb2cc26bdbfd5c0313058b177544447376c16b0fb /drivers/bus
parent9db16401d2d2e651fe1ca55ccb32e9bef402b411 (diff)
parent3267c081e037e2ed1a3af65ee46825799a7ccda5 (diff)
Merge tag 'omap-for-v4.16/ti-sysc-fix-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/drivers
Pull "one ti-sysc driver fix for v4.16 merge window" from Tony Lindgren: One minor fix for ti-sysc smartreflex sysc mask that prevents idling the smartreflex interconnect target module for device tree based probing. * tag 'omap-for-v4.16/ti-sysc-fix-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: bus: ti-sysc: Fix smartreflex sysc mask
Diffstat (limited to 'drivers/bus')
-rw-r--r--drivers/bus/ti-sysc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c
index 2c62985a345f..4d46003c46cf 100644
--- a/drivers/bus/ti-sysc.c
+++ b/drivers/bus/ti-sysc.c
@@ -816,7 +816,7 @@ static const struct sysc_regbits sysc_regbits_omap36xx_sr = {
static const struct sysc_capabilities sysc_36xx_sr = {
.type = TI_SYSC_OMAP36XX_SR,
- .sysc_mask = SYSC_OMAP2_ENAWAKEUP,
+ .sysc_mask = SYSC_OMAP3_SR_ENAWAKEUP,
.regbits = &sysc_regbits_omap36xx_sr,
.mod_quirks = SYSC_QUIRK_UNCACHED,
};

Privacy Policy