]> 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>
Sun, 19 Oct 2025 14:23:15 +0000 (16:23 +0200)
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
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 e157273fd2f70c58e64b435edad4266830b0d60a..c8a586e02cc61b1e3c3a882252855095b780e05f 100644 (file)
@@ -274,7 +274,7 @@ static int berlin_pwm_suspend(struct device *dev)
                if (!channel)
                        continue;
 
-               channel->enable = berlin_pwm_readl(bpc, i, BERLIN_PWM_ENABLE);
+               channel->enable = berlin_pwm_readl(bpc, i, BERLIN_PWM_EN);
                channel->ctrl = berlin_pwm_readl(bpc, i, BERLIN_PWM_CONTROL);
                channel->duty = berlin_pwm_readl(bpc, i, BERLIN_PWM_DUTY);
                channel->tcnt = berlin_pwm_readl(bpc, i, BERLIN_PWM_TCNT);
@@ -305,7 +305,7 @@ static int berlin_pwm_resume(struct device *dev)
                berlin_pwm_writel(bpc, i, channel->ctrl, BERLIN_PWM_CONTROL);
                berlin_pwm_writel(bpc, i, channel->duty, BERLIN_PWM_DUTY);
                berlin_pwm_writel(bpc, i, channel->tcnt, BERLIN_PWM_TCNT);
-               berlin_pwm_writel(bpc, i, channel->enable, BERLIN_PWM_ENABLE);
+               berlin_pwm_writel(bpc, i, channel->enable, BERLIN_PWM_EN);
        }
 
        return 0;