Merge tag 'pwm/for-6.9-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux

torvalds · torvalds · commit 576bb2d8e37a · 2024-03-26T09:20:56.000-07:00
Pull pwm fix from Uwe Kleine-König:
 "This contains a single fix for a regression introduced in v5.18-rc1
  which made the img pwm driver fail to bind"

* tag 'pwm/for-6.9-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux:
  pwm: img: fix pwm clock lookup
diff --git a/drivers/pwm/pwm-img.c b/drivers/pwm/pwm-img.c
@@ -284,9 +284,9 @@ static int img_pwm_probe(struct platform_device *pdev)
 		return PTR_ERR(imgchip->sys_clk);
 	}
 
-	imgchip->pwm_clk = devm_clk_get(&pdev->dev, "imgchip");
+	imgchip->pwm_clk = devm_clk_get(&pdev->dev, "pwm");
 	if (IS_ERR(imgchip->pwm_clk)) {
-		dev_err(&pdev->dev, "failed to get imgchip clock\n");
+		dev_err(&pdev->dev, "failed to get pwm clock\n");
 		return PTR_ERR(imgchip->pwm_clk);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -284,9 +284,9 @@ static int img_pwm_probe(struct platform_device *pdev)`
`284`	`284`	`return PTR_ERR(imgchip->sys_clk);`
`285`	`285`	`}`
`286`	`286`
`287`		`- imgchip->pwm_clk = devm_clk_get(&pdev->dev, "imgchip");`
	`287`	`+ imgchip->pwm_clk = devm_clk_get(&pdev->dev, "pwm");`
`288`	`288`	`if (IS_ERR(imgchip->pwm_clk)) {`
`289`		`- dev_err(&pdev->dev, "failed to get imgchip clock\n");`
	`289`	`+ dev_err(&pdev->dev, "failed to get pwm clock\n");`
`290`	`290`	`return PTR_ERR(imgchip->pwm_clk);`
`291`	`291`	`}`
`292`	`292`