Skip to content

Commit

Permalink
Merge tag 'omap-for-v4.16/ti-sysc-fix-signed' of ssh://gitolite.kerne…
Browse files Browse the repository at this point in the history
…l.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
  • Loading branch information
Arnd Bergmann committed Jan 26, 2018
2 parents 9db1640 + 3267c08 commit 796543a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/bus/ti-sysc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
Expand Down

0 comments on commit 796543a

Please sign in to comment.