diff options
-rw-r--r-- | Documentation/devicetree/bindings/gpio/gpio-mvebu.txt | 6 | ||||
-rw-r--r-- | drivers/gpio/gpio-mvebu.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/devicetree/bindings/gpio/gpio-mvebu.txt b/Documentation/devicetree/bindings/gpio/gpio-mvebu.txt index 42c3bb2d53e8..01e331a5f3e7 100644 --- a/Documentation/devicetree/bindings/gpio/gpio-mvebu.txt +++ b/Documentation/devicetree/bindings/gpio/gpio-mvebu.txt | |||
@@ -41,9 +41,9 @@ Required properties: | |||
41 | Optional properties: | 41 | Optional properties: |
42 | 42 | ||
43 | In order to use the GPIO lines in PWM mode, some additional optional | 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 | - reg: an additional register set is needed, for the GPIO Blink | 48 | - reg: an additional register set is needed, for the GPIO Blink |
49 | Counter on/off registers. | 49 | Counter on/off registers. |
@@ -71,7 +71,7 @@ Example: | |||
71 | }; | 71 | }; |
72 | 72 | ||
73 | gpio1: gpio@18140 { | 73 | gpio1: gpio@18140 { |
74 | compatible = "marvell,armada-370-xp-gpio"; | 74 | compatible = "marvell,armada-370-gpio"; |
75 | reg = <0x18140 0x40>, <0x181c8 0x08>; | 75 | reg = <0x18140 0x40>, <0x181c8 0x08>; |
76 | reg-names = "gpio", "pwm"; | 76 | reg-names = "gpio", "pwm"; |
77 | ngpios = <17>; | 77 | ngpios = <17>; |
diff --git a/drivers/gpio/gpio-mvebu.c b/drivers/gpio/gpio-mvebu.c index 5104b6398139..c83ea68be792 100644 --- a/drivers/gpio/gpio-mvebu.c +++ b/drivers/gpio/gpio-mvebu.c | |||
@@ -721,7 +721,7 @@ static int mvebu_pwm_probe(struct platform_device *pdev, | |||
721 | u32 set; | 721 | u32 set; |
722 | 722 | ||
723 | if (!of_device_is_compatible(mvchip->chip.of_node, | 723 | if (!of_device_is_compatible(mvchip->chip.of_node, |
724 | "marvell,armada-370-xp-gpio")) | 724 | "marvell,armada-370-gpio")) |
725 | return 0; | 725 | return 0; |
726 | 726 | ||
727 | if (IS_ERR(mvchip->clk)) | 727 | if (IS_ERR(mvchip->clk)) |
@@ -852,7 +852,7 @@ static const struct of_device_id mvebu_gpio_of_match[] = { | |||
852 | .data = (void *) MVEBU_GPIO_SOC_VARIANT_ARMADAXP, | 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 | .data = (void *) MVEBU_GPIO_SOC_VARIANT_ORION, | 856 | .data = (void *) MVEBU_GPIO_SOC_VARIANT_ORION, |
857 | }, | 857 | }, |
858 | { | 858 | { |
@@ -1128,7 +1128,7 @@ static int mvebu_gpio_probe(struct platform_device *pdev) | |||
1128 | mvchip); | 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 | if (IS_ENABLED(CONFIG_PWM)) | 1132 | if (IS_ENABLED(CONFIG_PWM)) |
1133 | return mvebu_pwm_probe(pdev, mvchip, id); | 1133 | return mvebu_pwm_probe(pdev, mvchip, id); |
1134 | 1134 | ||