Merge tag 'sunxi-dt64-for-4.12' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/dt64

Allwinner arm64 DT changes for 4.12

Some patches to enable the PRCM block in the A64

* tag 'sunxi-dt64-for-4.12' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  arm64: allwinner: a64: add R_PIO pinctrl node
  arm64: allwinner: a64: add r_ccu node

Signed-off-by: Olof Johansson <olof@lixom.net>

1 files changed, 29 insertions, 0 deletions

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
index 1c64ea2d23f9..6bc606b4d74d 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
@@ -98,6 +98,14 @@
                 clock-output-names = "osc32k";
         };
 
+        iosc: internal-osc-clk {
+                #clock-cells = <0>;
+                compatible = "fixed-clock";
+                clock-frequency = <16000000>;
+                clock-accuracy = <300000000>;
+                clock-output-names = "iosc";
+        };
+
         psci {
                 compatible = "arm,psci-0.2";
                 method = "smc";
@@ -392,5 +400,26 @@
                         interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>,
                                      <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
                 };
+
+                r_ccu: clock@1f01400 {
+                        compatible = "allwinner,sun50i-a64-r-ccu";
+                        reg = <0x01f01400 0x100>;
+                        clocks = <&osc24M>, <&osc32k>, <&iosc>;
+                        clock-names = "hosc", "losc", "iosc";
+                        #clock-cells = <1>;
+                        #reset-cells = <1>;
+                };
+
+                r_pio: pinctrl@01f02c00 {
+                        compatible = "allwinner,sun50i-a64-r-pinctrl";
+                        reg = <0x01f02c00 0x400>;
+                        interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&r_ccu 3>, <&osc24M>, <&osc32k>;
+                        clock-names = "apb", "hosc", "losc";
+                        gpio-controller;
+                        #gpio-cells = <3>;
+                        interrupt-controller;
+                        #interrupt-cells = <3>;
+                };
         };
 };