Commit da8a30aa authored Nov 15, 2021 by Uwe Kleine-König Committed by Zheng Zengkai Nov 15, 2021

pwm: rockchip: Don't modify HW state in .remove() callback

stable inclusion
from stable-5.10.69
commit a6a2b36a8cc45bf9063cdc4bde7434e8eac66ecd
bugzilla: 182675 https://gitee.com/openeuler/kernel/issues/I4I3ED

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=a6a2b36a8cc45bf9063cdc4bde7434e8eac66ecd



--------------------------------

[ Upstream commit 9d768cd7 ]

A consumer is expected to disable a PWM before calling pwm_put(). And if
they didn't there is hopefully a good reason (or the consumer needs
fixing). Also if disabling an enabled PWM was the right thing to do,
this should better be done in the framework instead of in each low level
driver.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Chen Jun <chenjun102@huawei.com>
Acked-by: Weilong Chen <chenweilong@huawei.com>

Signed-off-by: Chen Jun <chenjun102@huawei.com>
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>

parent b22d3230

drivers/pwm/pwm-rockchip.c

+0 −14

Original line number	Diff line number	Diff line
		@@ -382,20 +382,6 @@ static int rockchip_pwm_remove(struct platform_device *pdev)
		{
		struct rockchip_pwm_chip *pc = platform_get_drvdata(pdev);

		/*
		* Disable the PWM clk before unpreparing it if the PWM device is still
		* running. This should only happen when the last PWM user left it
		* enabled, or when nobody requested a PWM that was previously enabled
		* by the bootloader.
		*
		* FIXME: Maybe the core should disable all PWM devices in
		* pwmchip_remove(). In this case we'd only have to call
		* clk_unprepare() after pwmchip_remove().
		*
		*/
		if (pwm_is_enabled(pc->chip.pwms))
		clk_disable(pc->clk);

		clk_unprepare(pc->pclk);
		clk_unprepare(pc->clk);