Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/sti: use new Reset API

Since 0b52297f228 ("reset: Add support for shared reset controls") the
new Reset API now demands consumers choose either an *_exclusive or a
*_shared line when requesting reset lines.

This issue was found when running a kernel containing the aforementioned
patch which includes an informitive WARN(). It implies that one or
more used reset lines are in fact shared. This is why we're using the
*_shared variant.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Acked-by: Peter Griffin <peter.griffin@linaro.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20160725100933.9261-1-lee.jones@linaro.org

authored by

Lee Jones and committed by
Sean Paul
c084c8da d9a7ed77

+2 -2
+2 -2
drivers/gpu/drm/sti/sti_compositor.c
··· 254 254 } 255 255 256 256 /* Get reset resources */ 257 - compo->rst_main = devm_reset_control_get(dev, "compo-main"); 257 + compo->rst_main = devm_reset_control_get_shared(dev, "compo-main"); 258 258 /* Take compo main out of reset */ 259 259 if (!IS_ERR(compo->rst_main)) 260 260 reset_control_deassert(compo->rst_main); 261 261 262 - compo->rst_aux = devm_reset_control_get(dev, "compo-aux"); 262 + compo->rst_aux = devm_reset_control_get_shared(dev, "compo-aux"); 263 263 /* Take compo aux out of reset */ 264 264 if (!IS_ERR(compo->rst_aux)) 265 265 reset_control_deassert(compo->rst_aux);