Commit 89e10b86 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gpio-fixes-for-v6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux 

Pull gpio fixes from Bartosz Golaszewski:
 "One more fix for the upcoming release:

   - fix the check for pwm support on non-A8K platforms in gpio-mvebu"

* tag 'gpio-fixes-for-v6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
  gpio: mvebu: Fix check for pwm support on non-A8K platforms
parents 5a773869 4335417d

drivers/gpio/gpio-mvebu.c

+6 −9
Original line number Diff line number Diff line
@@ -790,8 +790,12 @@ static int mvebu_pwm_probe(struct platform_device *pdev, 
	u32 offset;

	u32 set;



	if (of_device_is_compatible(mvchip->chip.of_node,

				    "marvell,armada-370-gpio")) {

	if (mvchip->soc_variant == MVEBU_GPIO_SOC_VARIANT_A8K) {

		int ret = of_property_read_u32(dev->of_node,

					       "marvell,pwm-offset", &offset);

		if (ret < 0)

			return 0;

	} else {

		/*

		 * There are only two sets of PWM configuration registers for

		 * all the GPIO lines on those SoCs which this driver reserves
@@ -801,13 +805,6 @@ static int mvebu_pwm_probe(struct platform_device *pdev, 
		if (!platform_get_resource_byname(pdev, IORESOURCE_MEM, "pwm"))

			return 0;

		offset = 0;

	} else if (mvchip->soc_variant == MVEBU_GPIO_SOC_VARIANT_A8K) {

		int ret = of_property_read_u32(dev->of_node,

					       "marvell,pwm-offset", &offset);

		if (ret < 0)

			return 0;

	} else {

		return 0;

	}



	if (IS_ERR(mvchip->clk))