Commit fdeee1cc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull pwm fix from Uwe Kleine-König:
 "Correct mismatched pwm chip info for adp5585.

  Luke Wang found a problem in the pwm-adp5585 driver about how register
  information is mapped to the different device variants. This
  effectively made the driver non-functional.

  That didn't pop up before because the driver change was developed as
  part of a bigger mfd series and the original author didn't retest PWM
  functionality after it was tested in an earlier revision but then
  reworked"

* tag 'pwm/for-6.18-rc7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux:
  pwm: adp5585: Correct mismatched pwm chip info
parents 0678f563 f84fd5be

drivers/pwm/pwm-adp5585.c

+2 −2
Original line number Diff line number Diff line
@@ -190,13 +190,13 @@ static int adp5585_pwm_probe(struct platform_device *pdev) 
	return 0;

}



static const struct adp5585_pwm_chip adp5589_pwm_chip_info = {

static const struct adp5585_pwm_chip adp5585_pwm_chip_info = {

	.pwm_cfg = ADP5585_PWM_CFG,

	.pwm_offt_low = ADP5585_PWM_OFFT_LOW,

	.pwm_ont_low = ADP5585_PWM_ONT_LOW,

};



static const struct adp5585_pwm_chip adp5585_pwm_chip_info = {

static const struct adp5585_pwm_chip adp5589_pwm_chip_info = {

	.pwm_cfg = ADP5589_PWM_CFG,

	.pwm_offt_low = ADP5589_PWM_OFFT_LOW,

	.pwm_ont_low = ADP5589_PWM_ONT_LOW,