Merge tag 'arm-dt-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux-2.6-microblaze.git] / arch / arm64 / boot / dts / marvell / armada-cp11x.dtsi

diff --git a/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi b/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi
index 7c329e1..64179a3 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi
@@ -234,12 +234,17 @@
                                gpio-controller;
                                #gpio-cells = <2>;
                                gpio-ranges = <&CP11X_LABEL(pinctrl) 0 0 32>;
+                               marvell,pwm-offset = <0x1f0>;
+                               #pwm-cells = <2>;
                                interrupt-controller;
                                interrupts = <86 IRQ_TYPE_LEVEL_HIGH>,
                                        <85 IRQ_TYPE_LEVEL_HIGH>,
                                        <84 IRQ_TYPE_LEVEL_HIGH>,
                                        <83 IRQ_TYPE_LEVEL_HIGH>;
                                #interrupt-cells = <2>;
+                               clock-names = "core", "axi";
+                               clocks = <&CP11X_LABEL(clk) 1 21>,
+                                        <&CP11X_LABEL(clk) 1 17>;
                                status = "disabled";
                        };
 
@@ -250,12 +255,17 @@
                                gpio-controller;
                                #gpio-cells = <2>;
                                gpio-ranges = <&CP11X_LABEL(pinctrl) 0 32 31>;
+                               marvell,pwm-offset = <0x1f0>;
+                               #pwm-cells = <2>;
                                interrupt-controller;
                                interrupts = <82 IRQ_TYPE_LEVEL_HIGH>,
                                        <81 IRQ_TYPE_LEVEL_HIGH>,
                                        <80 IRQ_TYPE_LEVEL_HIGH>,
                                        <79 IRQ_TYPE_LEVEL_HIGH>;
                                #interrupt-cells = <2>;
+                               clock-names = "core", "axi";
+                               clocks = <&CP11X_LABEL(clk) 1 21>,
+                                        <&CP11X_LABEL(clk) 1 17>;
                                status = "disabled";
                        };
                };