Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25b2398f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gpio-v4.12-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio 

Pull GPIO fix from Linus Walleij:
 "A single GPIO patch fixing the compatible string for the MVEBU PWM
  controller embedded in the GPIO controller before we release v4.12.
  Hopefully"

* tag 'gpio-v4.12-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
  gpio: mvebu: change compatible string for PWM support
parents 51c933f2 6c7515c6

Documentation/devicetree/bindings/gpio/gpio-mvebu.txt

+3 −3
Original line number Diff line number Diff line
@@ -41,9 +41,9 @@ Required properties: 
Optional properties:



In order to use the GPIO lines in PWM mode, some additional optional

properties are required. Only Armada 370 and XP support these properties.

properties are required.



- compatible: Must contain "marvell,armada-370-xp-gpio"

- compatible: Must contain "marvell,armada-370-gpio"



- reg: an additional register set is needed, for the GPIO Blink

  Counter on/off registers.
@@ -71,7 +71,7 @@ Example: 
		};



		gpio1: gpio@18140 {

			compatible = "marvell,armada-370-xp-gpio";

			compatible = "marvell,armada-370-gpio";

			reg = <0x18140 0x40>, <0x181c8 0x08>;

			reg-names = "gpio", "pwm";

			ngpios = <17>;

drivers/gpio/gpio-mvebu.c

+3 −3
Original line number Diff line number Diff line
@@ -721,7 +721,7 @@ static int mvebu_pwm_probe(struct platform_device *pdev, 
	u32 set;



	if (!of_device_is_compatible(mvchip->chip.of_node,

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

				     "marvell,armada-370-gpio"))

		return 0;



	if (IS_ERR(mvchip->clk))
@@ -852,7 +852,7 @@ static const struct of_device_id mvebu_gpio_of_match[] = { 
		.data	    = (void *) MVEBU_GPIO_SOC_VARIANT_ARMADAXP,

	},

	{

		.compatible = "marvell,armada-370-xp-gpio",

		.compatible = "marvell,armada-370-gpio",

		.data	    = (void *) MVEBU_GPIO_SOC_VARIANT_ORION,

	},

	{
@@ -1128,7 +1128,7 @@ static int mvebu_gpio_probe(struct platform_device *pdev) 
						 mvchip);

	}



	/* Armada 370/XP has simple PWM support for GPIO lines */

	/* Some MVEBU SoCs have simple PWM support for GPIO lines */

	if (IS_ENABLED(CONFIG_PWM))

		return mvebu_pwm_probe(pdev, mvchip, id);