aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxime Ripard <maxime.ripard@free-electrons.com>2016-10-19 05:15:27 -0400
committerMaxime Ripard <maxime.ripard@free-electrons.com>2016-11-22 09:34:08 -0500
commitbe7bc6b98781451d9ec55fa9267ac895f060d172 (patch)
treecb2d889feae189d480e335831460ac72b2fbe7e5
parent82f2e1884eba4ad04af0a04dc0247cde631d451a (diff)
ARM: sunxi: Add the missing clocks to the pinctrl nodes
The pin controllers also use the two oscillators for debouncing. Add them to the DTs. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Chen-Yu Tsai <wens@csie.org>
-rw-r--r--arch/arm/boot/dts/sun4i-a10.dtsi3
-rw-r--r--arch/arm/boot/dts/sun5i.dtsi3
-rw-r--r--arch/arm/boot/dts/sun6i-a31.dtsi6
-rw-r--r--arch/arm/boot/dts/sun7i-a20.dtsi3
-rw-r--r--arch/arm/boot/dts/sun8i-a23-a33.dtsi6
-rw-r--r--arch/arm/boot/dts/sun8i-h3.dtsi6
-rw-r--r--arch/arm/boot/dts/sun9i-a80.dtsi6
7 files changed, 22 insertions, 11 deletions
diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
index 7e7dfc2b43db..b14a4281058d 100644
--- a/arch/arm/boot/dts/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
@@ -967,7 +967,8 @@
967 compatible = "allwinner,sun4i-a10-pinctrl"; 967 compatible = "allwinner,sun4i-a10-pinctrl";
968 reg = <0x01c20800 0x400>; 968 reg = <0x01c20800 0x400>;
969 interrupts = <28>; 969 interrupts = <28>;
970 clocks = <&apb0_gates 5>; 970 clocks = <&apb0_gates 5>, <&osc24M>, <&osc32k>;
971 clock-names = "apb", "hosc", "losc";
971 gpio-controller; 972 gpio-controller;
972 interrupt-controller; 973 interrupt-controller;
973 #interrupt-cells = <3>; 974 #interrupt-cells = <3>;
diff --git a/arch/arm/boot/dts/sun5i.dtsi b/arch/arm/boot/dts/sun5i.dtsi
index b4ccee8cfb02..b0fca4ef4dae 100644
--- a/arch/arm/boot/dts/sun5i.dtsi
+++ b/arch/arm/boot/dts/sun5i.dtsi
@@ -547,7 +547,8 @@
547 pio: pinctrl@01c20800 { 547 pio: pinctrl@01c20800 {
548 reg = <0x01c20800 0x400>; 548 reg = <0x01c20800 0x400>;
549 interrupts = <28>; 549 interrupts = <28>;
550 clocks = <&apb0_gates 5>; 550 clocks = <&apb0_gates 5>, <&osc24M>, <&osc32k>;
551 clock-names = "apb", "hosc", "losc";
551 gpio-controller; 552 gpio-controller;
552 interrupt-controller; 553 interrupt-controller;
553 #interrupt-cells = <3>; 554 #interrupt-cells = <3>;
diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
index ef24669234a0..2b26175d55d1 100644
--- a/arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
@@ -471,7 +471,8 @@
471 <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>, 471 <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>,
472 <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>, 472 <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>,
473 <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>; 473 <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
474 clocks = <&ccu CLK_APB1_PIO>; 474 clocks = <&ccu CLK_APB1_PIO>, <&osc24M>, <&osc32k>;
475 clock-names = "apb", "hosc", "losc";
475 gpio-controller; 476 gpio-controller;
476 interrupt-controller; 477 interrupt-controller;
477 #interrupt-cells = <3>; 478 #interrupt-cells = <3>;
@@ -1064,7 +1065,8 @@
1064 reg = <0x01f02c00 0x400>; 1065 reg = <0x01f02c00 0x400>;
1065 interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>, 1066 interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>,
1066 <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>; 1067 <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
1067 clocks = <&apb0_gates 0>; 1068 clocks = <&apb0_gates 0>, <&osc24M>, <&osc32k>;
1069 clock-names = "apb", "hosc", "losc";
1068 resets = <&apb0_rst 0>; 1070 resets = <&apb0_rst 0>;
1069 gpio-controller; 1071 gpio-controller;
1070 interrupt-controller; 1072 interrupt-controller;
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
index 94cf5a1c7172..f7db067b0de0 100644
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@ -1085,7 +1085,8 @@
1085 compatible = "allwinner,sun7i-a20-pinctrl"; 1085 compatible = "allwinner,sun7i-a20-pinctrl";
1086 reg = <0x01c20800 0x400>; 1086 reg = <0x01c20800 0x400>;
1087 interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>; 1087 interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
1088 clocks = <&apb0_gates 5>; 1088 clocks = <&apb0_gates 5>, <&osc24M>, <&osc32k>;
1089 clock-names = "apb", "hosc", "losc";
1089 gpio-controller; 1090 gpio-controller;
1090 interrupt-controller; 1091 interrupt-controller;
1091 #interrupt-cells = <3>; 1092 #interrupt-cells = <3>;
diff --git a/arch/arm/boot/dts/sun8i-a23-a33.dtsi b/arch/arm/boot/dts/sun8i-a23-a33.dtsi
index 300a1bd5a6ec..e4991a78ad73 100644
--- a/arch/arm/boot/dts/sun8i-a23-a33.dtsi
+++ b/arch/arm/boot/dts/sun8i-a23-a33.dtsi
@@ -266,7 +266,8 @@
266 /* compatible gets set in SoC specific dtsi file */ 266 /* compatible gets set in SoC specific dtsi file */
267 reg = <0x01c20800 0x400>; 267 reg = <0x01c20800 0x400>;
268 /* interrupts get set in SoC specific dtsi file */ 268 /* interrupts get set in SoC specific dtsi file */
269 clocks = <&ccu CLK_BUS_PIO>; 269 clocks = <&ccu CLK_BUS_PIO>, <&osc24M>, <&osc32k>;
270 clock-names = "apb", "hosc", "losc";
270 gpio-controller; 271 gpio-controller;
271 interrupt-controller; 272 interrupt-controller;
272 #interrupt-cells = <3>; 273 #interrupt-cells = <3>;
@@ -575,7 +576,8 @@
575 compatible = "allwinner,sun8i-a23-r-pinctrl"; 576 compatible = "allwinner,sun8i-a23-r-pinctrl";
576 reg = <0x01f02c00 0x400>; 577 reg = <0x01f02c00 0x400>;
577 interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>; 578 interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
578 clocks = <&apb0_gates 0>; 579 clocks = <&apb0_gates 0>, <&osc24M>, <&osc32k>;
580 clock-names = "apb", "hosc", "losc";
579 resets = <&apb0_rst 0>; 581 resets = <&apb0_rst 0>;
580 gpio-controller; 582 gpio-controller;
581 interrupt-controller; 583 interrupt-controller;
diff --git a/arch/arm/boot/dts/sun8i-h3.dtsi b/arch/arm/boot/dts/sun8i-h3.dtsi
index c38b028cac83..3c6596f06ebc 100644
--- a/arch/arm/boot/dts/sun8i-h3.dtsi
+++ b/arch/arm/boot/dts/sun8i-h3.dtsi
@@ -321,7 +321,8 @@
321 reg = <0x01c20800 0x400>; 321 reg = <0x01c20800 0x400>;
322 interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>, 322 interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>,
323 <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>; 323 <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
324 clocks = <&ccu CLK_BUS_PIO>; 324 clocks = <&ccu CLK_BUS_PIO>, <&osc24M>, <&osc32k>;
325 clock-names = "apb", "hosc", "losc";
325 gpio-controller; 326 gpio-controller;
326 #gpio-cells = <3>; 327 #gpio-cells = <3>;
327 interrupt-controller; 328 interrupt-controller;
@@ -614,7 +615,8 @@
614 compatible = "allwinner,sun8i-h3-r-pinctrl"; 615 compatible = "allwinner,sun8i-h3-r-pinctrl";
615 reg = <0x01f02c00 0x400>; 616 reg = <0x01f02c00 0x400>;
616 interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>; 617 interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
617 clocks = <&apb0_gates 0>; 618 clocks = <&apb0_gates 0>, <&osc24M>, <&osc32k>;
619 clock-names = "apb", "hosc", "losc";
618 resets = <&apb0_reset 0>; 620 resets = <&apb0_reset 0>;
619 gpio-controller; 621 gpio-controller;
620 #gpio-cells = <3>; 622 #gpio-cells = <3>;
diff --git a/arch/arm/boot/dts/sun9i-a80.dtsi b/arch/arm/boot/dts/sun9i-a80.dtsi
index ab6a221027ef..979ad1aacfb1 100644
--- a/arch/arm/boot/dts/sun9i-a80.dtsi
+++ b/arch/arm/boot/dts/sun9i-a80.dtsi
@@ -678,7 +678,8 @@
678 <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>, 678 <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>,
679 <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>, 679 <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>,
680 <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>; 680 <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
681 clocks = <&apb0_gates 5>; 681 clocks = <&apb0_gates 5>, <&osc24M>, <&osc32k>;
682 clock-names = "apb", "hosc", "losc";
682 gpio-controller; 683 gpio-controller;
683 interrupt-controller; 684 interrupt-controller;
684 #interrupt-cells = <3>; 685 #interrupt-cells = <3>;
@@ -902,7 +903,8 @@
902 reg = <0x08002c00 0x400>; 903 reg = <0x08002c00 0x400>;
903 interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>, 904 interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>,
904 <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>; 905 <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
905 clocks = <&apbs_gates 0>; 906 clocks = <&apbs_gates 0>, <&osc24M>, <&osc32k>;
907 clock-names = "apb", "hosc", "losc";
906 resets = <&apbs_rst 0>; 908 resets = <&apbs_rst 0>;
907 gpio-controller; 909 gpio-controller;
908 interrupt-controller; 910 interrupt-controller;