]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ARM: dts: mvebu: Add PWM properties for armada-38x
authorRalph Sennhauser <ralph.sennhauser@gmail.com>
Thu, 1 Jun 2017 20:10:30 +0000 (22:10 +0200)
committerGregory CLEMENT <gregory.clement@free-electrons.com>
Sat, 17 Jun 2017 06:16:45 +0000 (08:16 +0200)
Add the required properties to the GPIO nodes for them to be used as PWM
lines.

Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
arch/arm/boot/dts/armada-38x.dtsi

index 8b165c31de1efb432e15d2cb63fd7bd69b1af89b..af31f5d6c0e571f607fa47eb7aa00094d3ffdcb9 100644 (file)
@@ -312,31 +312,39 @@ sata3_pins: sata-pins-3 {
                        };
 
                        gpio0: gpio@18100 {
-                               compatible = "marvell,orion-gpio";
-                               reg = <0x18100 0x40>;
+                               compatible = "marvell,armada-370-gpio",
+                                            "marvell,orion-gpio";
+                               reg = <0x18100 0x40>, <0x181c0 0x08>;
+                               reg-names = "gpio", "pwm";
                                ngpios = <32>;
                                gpio-controller;
                                #gpio-cells = <2>;
+                               #pwm-cells = <2>;
                                interrupt-controller;
                                #interrupt-cells = <2>;
                                interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>,
                                             <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>,
                                             <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>,
                                             <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;
+                               clocks = <&coreclk 0>;
                        };
 
                        gpio1: gpio@18140 {
-                               compatible = "marvell,orion-gpio";
-                               reg = <0x18140 0x40>;
+                               compatible = "marvell,armada-370-gpio",
+                                            "marvell,orion-gpio";
+                               reg = <0x18140 0x40>, <0x181c8 0x08>;
+                               reg-names = "gpio", "pwm";
                                ngpios = <28>;
                                gpio-controller;
                                #gpio-cells = <2>;
+                               #pwm-cells = <2>;
                                interrupt-controller;
                                #interrupt-cells = <2>;
                                interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>,
                                             <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>,
                                             <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>,
                                             <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
+                               clocks = <&coreclk 0>;
                        };
 
                        systemc: system-controller@18200 {