Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+6
-6
+3
-3
Documentation/devicetree/bindings/gpio/gpio-mvebu.txt
+3
-3
Documentation/devicetree/bindings/gpio/gpio-mvebu.txt
···
41
41
Optional properties:
42
42
43
43
In order to use the GPIO lines in PWM mode, some additional optional
44
-
properties are required. Only Armada 370 and XP support these properties.
44
+
properties are required.
45
45
46
-
- compatible: Must contain "marvell,armada-370-xp-gpio"
46
+
- compatible: Must contain "marvell,armada-370-gpio"
47
47
48
48
- reg: an additional register set is needed, for the GPIO Blink
49
49
Counter on/off registers.
···
71
71
};
72
72
73
73
gpio1: gpio@18140 {
74
-
compatible = "marvell,armada-370-xp-gpio";
74
+
compatible = "marvell,armada-370-gpio";
75
75
reg = <0x18140 0x40>, <0x181c8 0x08>;
76
76
reg-names = "gpio", "pwm";
77
77
ngpios = <17>;
+3
-3
drivers/gpio/gpio-mvebu.c
+3
-3
drivers/gpio/gpio-mvebu.c
···
721
721
u32 set;
722
722
723
723
if (!of_device_is_compatible(mvchip->chip.of_node,
724
-
"marvell,armada-370-xp-gpio"))
724
+
"marvell,armada-370-gpio"))
725
725
return 0;
726
726
727
727
if (IS_ERR(mvchip->clk))
···
852
852
.data = (void *) MVEBU_GPIO_SOC_VARIANT_ARMADAXP,
853
853
},
854
854
{
855
-
.compatible = "marvell,armada-370-xp-gpio",
855
+
.compatible = "marvell,armada-370-gpio",
856
856
.data = (void *) MVEBU_GPIO_SOC_VARIANT_ORION,
857
857
},
858
858
{
···
1128
1128
mvchip);
1129
1129
}
1130
1130
1131
-
/* Armada 370/XP has simple PWM support for GPIO lines */
1131
+
/* Some MVEBU SoCs have simple PWM support for GPIO lines */
1132
1132
if (IS_ENABLED(CONFIG_PWM))
1133
1133
return mvebu_pwm_probe(pdev, mvchip, id);
1134
1134