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

Commit 796543a6 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v4.16/ti-sysc-fix-signed' of... 

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
parents 9db16401 3267c081

drivers/bus/ti-sysc.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

};