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

Commit c084c8da authored by Lee Jones's avatar Lee Jones Committed by Sean Paul
Browse files

drm/sti: use new Reset API 



Since 0b52297f ("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: default avatarLee Jones <lee.jones@linaro.org>
Acked-by: default avatarPeter Griffin <peter.griffin@linaro.org>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20160725100933.9261-1-lee.jones@linaro.org
parent d9a7ed77

drivers/gpu/drm/sti/sti_compositor.c

+2 −2
Original line number Diff line number Diff line
@@ -254,12 +254,12 @@ static int sti_compositor_probe(struct platform_device *pdev) 
	}



	/* Get reset resources */

	compo->rst_main = devm_reset_control_get(dev, "compo-main");

	compo->rst_main = devm_reset_control_get_shared(dev, "compo-main");

	/* Take compo main out of reset */

	if (!IS_ERR(compo->rst_main))

		reset_control_deassert(compo->rst_main);



	compo->rst_aux = devm_reset_control_get(dev, "compo-aux");

	compo->rst_aux = devm_reset_control_get_shared(dev, "compo-aux");

	/* Take compo aux out of reset */

	if (!IS_ERR(compo->rst_aux))

		reset_control_deassert(compo->rst_aux);