Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / keystone-k2hk-clocks.dtsi

diff --git a/arch/arm/boot/dts/keystone-k2hk-clocks.dtsi b/arch/arm/boot/dts/keystone-k2hk-clocks.dtsi
index af9b7190533aa9c47bf9cd17a63a1d08901ede7d..4ba6912176ef1420d901720863cd2d33e18cb243 100644 (file)
--- a/arch/arm/boot/dts/keystone-k2hk-clocks.dtsi
+++ b/arch/arm/boot/dts/keystone-k2hk-clocks.dtsi
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
- * Copyright 2013-2014 Texas Instruments, Inc.
- *
  * Keystone 2 Kepler/Hawking SoC clock nodes
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
+ * Copyright (C) 2013-2017 Texas Instruments Incorporated - http://www.ti.com/
  */
 
 clocks {
@@ -53,7 +50,7 @@ clocks {
                reg-names = "control";
        };
 
-       clktsip: clktsip {
+       clktsip: clktsip@2350000 {
                #clock-cells = <0>;
                compatible = "ti,keystone,psc-clock";
                clocks = <&chipclk16>;
@@ -63,7 +60,7 @@ clocks {
                domain-id = <0>;
        };
 
-       clksrio: clksrio {
+       clksrio: clksrio@235002c {
                #clock-cells = <0>;
                compatible = "ti,keystone,psc-clock";
                clocks = <&chipclk1rstiso13>;
@@ -73,7 +70,7 @@ clocks {
                domain-id = <4>;
        };
 
-       clkhyperlink0: clkhyperlink0 {
+       clkhyperlink0: clkhyperlink0@2350030 {
                #clock-cells = <0>;
                compatible = "ti,keystone,psc-clock";
                clocks = <&chipclk12>;
@@ -83,7 +80,7 @@ clocks {
                domain-id = <5>;
        };
 
-       clkgem1: clkgem1 {
+       clkgem1: clkgem1@2350040 {
                #clock-cells = <0>;
                compatible = "ti,keystone,psc-clock";
                clocks = <&chipclk1>;
@@ -93,7 +90,7 @@ clocks {
                domain-id = <9>;
        };
 
-       clkgem2: clkgem2 {
+       clkgem2: clkgem2@2350044 {
                #clock-cells = <0>;
                compatible = "ti,keystone,psc-clock";
                clocks = <&chipclk1>;
@@ -103,7 +100,7 @@ clocks {
                domain-id = <10>;
        };
 
-       clkgem3: clkgem3 {
+       clkgem3: clkgem3@2350048 {
                #clock-cells = <0>;
                compatible = "ti,keystone,psc-clock";
                clocks = <&chipclk1>;
@@ -113,7 +110,7 @@ clocks {
                domain-id = <11>;
        };
 
-       clkgem4: clkgem4 {
+       clkgem4: clkgem4@235004c {
                #clock-cells = <0>;
                compatible = "ti,keystone,psc-clock";
                clocks = <&chipclk1>;
@@ -123,7 +120,7 @@ clocks {
                domain-id = <12>;
        };
 
-       clkgem5: clkgem5 {
+       clkgem5: clkgem5@2350050 {
                #clock-cells = <0>;
                compatible = "ti,keystone,psc-clock";
                clocks = <&chipclk1>;
@@ -133,7 +130,7 @@ clocks {
                domain-id = <13>;
        };
 
-       clkgem6: clkgem6 {
+       clkgem6: clkgem6@2350054 {
                #clock-cells = <0>;
                compatible = "ti,keystone,psc-clock";
                clocks = <&chipclk1>;
@@ -143,7 +140,7 @@ clocks {
                domain-id = <14>;
        };
 
-       clkgem7: clkgem7 {
+       clkgem7: clkgem7@2350058 {
                #clock-cells = <0>;
                compatible = "ti,keystone,psc-clock";
                clocks = <&chipclk1>;
@@ -153,7 +150,7 @@ clocks {
                domain-id = <15>;
        };
 
-       clkddr31: clkddr31 {
+       clkddr31: clkddr31@2350060 {
                #clock-cells = <0>;
                compatible = "ti,keystone,psc-clock";
                clocks = <&chipclk13>;
@@ -163,7 +160,7 @@ clocks {
                domain-id = <16>;
        };
 
-       clktac: clktac {
+       clktac: clktac@2350064 {
                #clock-cells = <0>;
                compatible = "ti,keystone,psc-clock";
                clocks = <&chipclk13>;
@@ -173,7 +170,7 @@ clocks {
                domain-id = <17>;
        };
 
-       clkrac01: clkrac01 {
+       clkrac01: clkrac01@2350068 {
                #clock-cells = <0>;
                compatible = "ti,keystone,psc-clock";
                clocks = <&chipclk13>;
@@ -183,7 +180,7 @@ clocks {
                domain-id = <17>;
        };
 
-       clkrac23: clkrac23 {
+       clkrac23: clkrac23@235006c {
                #clock-cells = <0>;
                compatible = "ti,keystone,psc-clock";
                clocks = <&chipclk13>;
@@ -193,7 +190,7 @@ clocks {
                domain-id = <18>;
        };
 
-       clkfftc0: clkfftc0 {
+       clkfftc0: clkfftc0@2350070 {
                #clock-cells = <0>;
                compatible = "ti,keystone,psc-clock";
                clocks = <&chipclk13>;
@@ -203,7 +200,7 @@ clocks {
                domain-id = <19>;
        };
 
-       clkfftc1: clkfftc1 {
+       clkfftc1: clkfftc1@2350074 {
                #clock-cells = <0>;
                compatible = "ti,keystone,psc-clock";
                clocks = <&chipclk13>;
@@ -213,7 +210,7 @@ clocks {
                domain-id = <19>;
        };
 
-       clkfftc2: clkfftc2 {
+       clkfftc2: clkfftc2@2350078 {
                #clock-cells = <0>;
                compatible = "ti,keystone,psc-clock";
                clocks = <&chipclk13>;
@@ -223,7 +220,7 @@ clocks {
                domain-id = <20>;
        };
 
-       clkfftc3: clkfftc3 {
+       clkfftc3: clkfftc3@235007c {
                #clock-cells = <0>;
                compatible = "ti,keystone,psc-clock";
                clocks = <&chipclk13>;
@@ -233,7 +230,7 @@ clocks {
                domain-id = <20>;
        };
 
-       clkfftc4: clkfftc4 {
+       clkfftc4: clkfftc4@2350080 {
                #clock-cells = <0>;
                compatible = "ti,keystone,psc-clock";
                clocks = <&chipclk13>;
@@ -243,7 +240,7 @@ clocks {
                domain-id = <20>;
        };
 
-       clkfftc5: clkfftc5 {
+       clkfftc5: clkfftc5@2350084 {
                #clock-cells = <0>;
                compatible = "ti,keystone,psc-clock";
                clocks = <&chipclk13>;
@@ -253,7 +250,7 @@ clocks {
                domain-id = <20>;
        };
 
-       clkaif: clkaif {
+       clkaif: clkaif@2350088 {
                #clock-cells = <0>;
                compatible = "ti,keystone,psc-clock";
                clocks = <&chipclk13>;
@@ -263,7 +260,7 @@ clocks {
                domain-id = <21>;
        };
 
-       clktcp3d0: clktcp3d0 {
+       clktcp3d0: clktcp3d0@235008c {
                #clock-cells = <0>;
                compatible = "ti,keystone,psc-clock";
                clocks = <&chipclk13>;
@@ -273,7 +270,7 @@ clocks {
                domain-id = <22>;
        };
 
-       clktcp3d1: clktcp3d1 {
+       clktcp3d1: clktcp3d1@2350090 {
                #clock-cells = <0>;
                compatible = "ti,keystone,psc-clock";
                clocks = <&chipclk13>;
@@ -283,7 +280,7 @@ clocks {
                domain-id = <22>;
        };
 
-       clktcp3d2: clktcp3d2 {
+       clktcp3d2: clktcp3d2@2350094 {
                #clock-cells = <0>;
                compatible = "ti,keystone,psc-clock";
                clocks = <&chipclk13>;
@@ -293,7 +290,7 @@ clocks {
                domain-id = <23>;
        };
 
-       clktcp3d3: clktcp3d3 {
+       clktcp3d3: clktcp3d3@2350098 {
                #clock-cells = <0>;
                compatible = "ti,keystone,psc-clock";
                clocks = <&chipclk13>;
@@ -303,7 +300,7 @@ clocks {
                domain-id = <23>;
        };
 
-       clkvcp0: clkvcp0 {
+       clkvcp0: clkvcp0@235009c {
                #clock-cells = <0>;
                compatible = "ti,keystone,psc-clock";
                clocks = <&chipclk13>;
@@ -313,7 +310,7 @@ clocks {
                domain-id = <24>;
        };
 
-       clkvcp1: clkvcp1 {
+       clkvcp1: clkvcp1@23500a0 {
                #clock-cells = <0>;
                compatible = "ti,keystone,psc-clock";
                clocks = <&chipclk13>;
@@ -323,7 +320,7 @@ clocks {
                domain-id = <24>;
        };
 
-       clkvcp2: clkvcp2 {
+       clkvcp2: clkvcp2@23500a4 {
                #clock-cells = <0>;
                compatible = "ti,keystone,psc-clock";
                clocks = <&chipclk13>;
@@ -333,7 +330,7 @@ clocks {
                domain-id = <24>;
        };
 
-       clkvcp3: clkvcp3 {
+       clkvcp3: clkvcp3@23500a8 {
                #clock-cells = <0>;
                compatible = "ti,keystone,psc-clock";
                clocks = <&chipclk13>;
@@ -343,7 +340,7 @@ clocks {
                domain-id = <24>;
        };
 
-       clkvcp4: clkvcp4 {
+       clkvcp4: clkvcp4@23500ac {
                #clock-cells = <0>;
                compatible = "ti,keystone,psc-clock";
                clocks = <&chipclk13>;
@@ -353,7 +350,7 @@ clocks {
                domain-id = <25>;
        };
 
-       clkvcp5: clkvcp5 {
+       clkvcp5: clkvcp5@23500b0 {
                #clock-cells = <0>;
                compatible = "ti,keystone,psc-clock";
                clocks = <&chipclk13>;
@@ -363,7 +360,7 @@ clocks {
                domain-id = <25>;
        };
 
-       clkvcp6: clkvcp6 {
+       clkvcp6: clkvcp6@23500b4 {
                #clock-cells = <0>;
                compatible = "ti,keystone,psc-clock";
                clocks = <&chipclk13>;
@@ -373,7 +370,7 @@ clocks {
                domain-id = <25>;
        };
 
-       clkvcp7: clkvcp7 {
+       clkvcp7: clkvcp7@23500b8 {
                #clock-cells = <0>;
                compatible = "ti,keystone,psc-clock";
                clocks = <&chipclk13>;
@@ -383,7 +380,7 @@ clocks {
                domain-id = <25>;
        };
 
-       clkbcp: clkbcp {
+       clkbcp: clkbcp@23500bc {
                #clock-cells = <0>;
                compatible = "ti,keystone,psc-clock";
                clocks = <&chipclk13>;
@@ -393,7 +390,7 @@ clocks {
                domain-id = <26>;
        };
 
-       clkdxb: clkdxb {
+       clkdxb: clkdxb@23500c0 {
                #clock-cells = <0>;
                compatible = "ti,keystone,psc-clock";
                clocks = <&chipclk13>;
@@ -403,7 +400,7 @@ clocks {
                domain-id = <27>;
        };
 
-       clkhyperlink1: clkhyperlink1 {
+       clkhyperlink1: clkhyperlink1@23500c4 {
                #clock-cells = <0>;
                compatible = "ti,keystone,psc-clock";
                clocks = <&chipclk12>;
@@ -413,7 +410,7 @@ clocks {
                domain-id = <28>;
        };
 
-       clkxge: clkxge {
+       clkxge: clkxge@23500c8 {
                #clock-cells = <0>;
                compatible = "ti,keystone,psc-clock";
                clocks = <&chipclk13>;