]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
pwm: berlin: Fix wrong register in suspend/resume
authorJisheng Zhang <jszhang@kernel.org>
Tue, 19 Aug 2025 11:42:24 +0000 (19:42 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 29 Oct 2025 12:59:56 +0000 (13:59 +0100)
commit 3a4b9d027e4061766f618292df91760ea64a1fcc upstream.

The 'enable' register should be BERLIN_PWM_EN rather than
BERLIN_PWM_ENABLE, otherwise, the driver accesses wrong address, there
will be cpu exception then kernel panic during suspend/resume.

Fixes: bbf0722c1c66 ("pwm: berlin: Add suspend/resume support")
Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
Link: https://lore.kernel.org/r/20250819114224.31825-1-jszhang@kernel.org
Cc: stable@vger.kernel.org
[ukleinek: backport to 5.10]
Signed-off-by: Uwe Kleine-König <ukleinek@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/pwm/pwm-berlin.c

index b91c477cc84be90fc29d200a3528fdffd20ae1aa..c9d11486f2c1d4232ca6193068e9fbb6a501ed36 100644 (file)
@@ -249,7 +249,7 @@ static int berlin_pwm_suspend(struct device *dev)
                if (!channel)
                        continue;
 
-               channel->enable = berlin_pwm_readl(pwm, i, BERLIN_PWM_ENABLE);
+               channel->enable = berlin_pwm_readl(pwm, i, BERLIN_PWM_EN);
                channel->ctrl = berlin_pwm_readl(pwm, i, BERLIN_PWM_CONTROL);
                channel->duty = berlin_pwm_readl(pwm, i, BERLIN_PWM_DUTY);
                channel->tcnt = berlin_pwm_readl(pwm, i, BERLIN_PWM_TCNT);
@@ -280,7 +280,7 @@ static int berlin_pwm_resume(struct device *dev)
                berlin_pwm_writel(pwm, i, channel->ctrl, BERLIN_PWM_CONTROL);
                berlin_pwm_writel(pwm, i, channel->duty, BERLIN_PWM_DUTY);
                berlin_pwm_writel(pwm, i, channel->tcnt, BERLIN_PWM_TCNT);
-               berlin_pwm_writel(pwm, i, channel->enable, BERLIN_PWM_ENABLE);
+               berlin_pwm_writel(pwm, i, channel->enable, BERLIN_PWM_EN);
        }
 
        return 0;