From: Olof Johansson Date: Tue, 15 May 2018 20:40:31 +0000 (-0700) Subject: Merge tag 'v4.17-next-soc' of https://git.kernel.org/pub/scm/linux/kernel/git/matthia... X-Git-Tag: v4.18-rc1~49^2~7 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f6b3f4ac521523432761f4480dd3cad1a955593b;p=users%2Fjedix%2Flinux-maple.git Merge tag 'v4.17-next-soc' of https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into next/drivers - use timeout helpers for scpsys and infracfg drivers - use of_device_get_match_data in pmic wrapper and scpsys * tag 'v4.17-next-soc' of https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux: soc: mediatek: remove unneeded semicolon soc: mediatek: add a fixed wait for SRAM stable soc: mediatek: introduce a CAPS flag for scp_domain_data soc: mediatek: reuse regmap_read_poll_timeout helpers regmap: include from include/linux/regmap.h soc: mediatek: reuse read[l,x]_poll_timeout helpers soc: mediatek: use of_device_get_match_data() Signed-off-by: Olof Johansson --- f6b3f4ac521523432761f4480dd3cad1a955593b