ARM: tegra: Rename top-level clocks

Clocks defined at the top level in device tree are no longer part of a
simple bus and therefore don't have a reg property. Nodes without a reg
property shouldn't have a unit-address either, so drop the unit address
from the node names. To ensure nodes aren't duplicated (in which case
they would end up merged in the final DTB), append the name of the clock
to the node name.

[treding@nvidia.com: factored out patch and wrote commit message]
Signed-off-by: David Heidelberg <david@ixit.cz>
Co-developed-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm/boot/dts/tegra114-dalmore.dts b/arch/arm/boot/dts/tegra114-dalmore.dts
index e64199ba82cbeeae9012093a60f132583e69ad9d..ad8116780dc9fcd7b35936e1240f2c184a6fcc5f 100644 (file)
--- a/arch/arm/boot/dts/tegra114-dalmore.dts
+++ b/arch/arm/boot/dts/tegra114-dalmore.dts
@@ -1152,7 +1152,7 @@
                default-brightness-level = <6>;
        };
 
-       clk32k_in: clock@0 {
+       clk32k_in: clock-32k {
                compatible = "fixed-clock";
                clock-frequency = <32768>;
                #clock-cells = <0>;

diff --git a/arch/arm/boot/dts/tegra114-roth.dts b/arch/arm/boot/dts/tegra114-roth.dts
index 71a2806c0f595936c849700b91d34be57ada063c..ed6ebbf008e103169accd0b66b23bb408a2a723e 100644 (file)
--- a/arch/arm/boot/dts/tegra114-roth.dts
+++ b/arch/arm/boot/dts/tegra114-roth.dts
@@ -1016,7 +1016,7 @@
                enable-gpios = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_HIGH>;
        };
 
-       clk32k_in: clock@0 {
+       clk32k_in: clock-32k {
                compatible = "fixed-clock";
                clock-frequency = <32768>;
                #clock-cells = <0>;

diff --git a/arch/arm/boot/dts/tegra114-tn7.dts b/arch/arm/boot/dts/tegra114-tn7.dts
index 753130b1e37b75cc585d1bfb669c9ace16860e8b..36717331101ee6289b8a62a4bdaf671bdcd06442 100644 (file)
--- a/arch/arm/boot/dts/tegra114-tn7.dts
+++ b/arch/arm/boot/dts/tegra114-tn7.dts
@@ -273,7 +273,7 @@
                power-supply = <&lcd_bl_en>;
        };
 
-       clk32k_in: clock@0 {
+       clk32k_in: clock-32k {
                compatible = "fixed-clock";
                clock-frequency = <32768>;
                #clock-cells = <0>;

diff --git a/arch/arm/boot/dts/tegra124-jetson-tk1.dts b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
index b2b3eea81232a242e8f4b17509321e1ea417a2c5..f59135b93cb0a564c73d8a699b5ae04da948fd98 100644 (file)
--- a/arch/arm/boot/dts/tegra124-jetson-tk1.dts
+++ b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
@@ -1869,7 +1869,7 @@
                vbus-supply = <&vdd_usb3_vbus>;
        };
 
-       clk32k_in: clock@0 {
+       clk32k_in: clock-32k {
                compatible = "fixed-clock";
                clock-frequency = <32768>;
                #clock-cells = <0>;

diff --git a/arch/arm/boot/dts/tegra124-nyan.dtsi b/arch/arm/boot/dts/tegra124-nyan.dtsi
index 63a81270300a641431a9030369c2a8c2f689850f..f15623f83893df55579f394733efd5c061485f13 100644 (file)
--- a/arch/arm/boot/dts/tegra124-nyan.dtsi
+++ b/arch/arm/boot/dts/tegra124-nyan.dtsi
@@ -582,7 +582,7 @@
                         256>;
        };
 
-       clk32k_in: clock@0 {
+       clk32k_in: clock-32k {
                compatible = "fixed-clock";
                clock-frequency = <32768>;
                #clock-cells = <0>;

diff --git a/arch/arm/boot/dts/tegra124-venice2.dts b/arch/arm/boot/dts/tegra124-venice2.dts
index 02cf986c75678e811925e124e693c31b9df406e0..14eeb1242b156c1f565a57f064ede656e760a220 100644 (file)
--- a/arch/arm/boot/dts/tegra124-venice2.dts
+++ b/arch/arm/boot/dts/tegra124-venice2.dts
@@ -1062,7 +1062,7 @@
                default-brightness-level = <6>;
        };
 
-       clk32k_in: clock@0 {
+       clk32k_in: clock-32k {
                compatible = "fixed-clock";
                clock-frequency = <32768>;
                #clock-cells = <0>;

diff --git a/arch/arm/boot/dts/tegra20-acer-a500-picasso.dts b/arch/arm/boot/dts/tegra20-acer-a500-picasso.dts
index 23d3f8daab23261887c9e769ded790836241318a..1aaee6f09fd835950ed19d1e147e1aae177c893c 100644 (file)
--- a/arch/arm/boot/dts/tegra20-acer-a500-picasso.dts
+++ b/arch/arm/boot/dts/tegra20-acer-a500-picasso.dts
@@ -827,7 +827,7 @@
        };
 
        /* PMIC has a built-in 32KHz oscillator which is used by PMC */
-       clk32k_in: clock@0 {
+       clk32k_in: clock-32k-in {
                compatible = "fixed-clock";
                #clock-cells = <0>;
                clock-frequency = <32768>;
@@ -839,7 +839,7 @@
         * oscillator is used as a reference clock-source by the
         * Azurewave WiFi/BT module.
         */
-       rtc_32k_wifi: clock@1 {
+       rtc_32k_wifi: clock-32k-wifi {
                compatible = "fixed-clock";
                #clock-cells = <0>;
                clock-frequency = <32768>;

diff --git a/arch/arm/boot/dts/tegra20-harmony.dts b/arch/arm/boot/dts/tegra20-harmony.dts
index ae4312eedcbd530c71d4b982e64d8f91d3b43ad3..4d137461f3c4606e144021b5afa649f59eb24215 100644 (file)
--- a/arch/arm/boot/dts/tegra20-harmony.dts
+++ b/arch/arm/boot/dts/tegra20-harmony.dts
@@ -640,7 +640,7 @@
                default-brightness-level = <6>;
        };
 
-       clk32k_in: clock@0 {
+       clk32k_in: clock-32k {
                compatible = "fixed-clock";
                clock-frequency = <32768>;
                #clock-cells = <0>;

diff --git a/arch/arm/boot/dts/tegra20-paz00.dts b/arch/arm/boot/dts/tegra20-paz00.dts
index 5b38b0606f993b645c8b766b53aa57f6c78a4bb5..d3d24523553e1edeb19230577984a15c797ed8af 100644 (file)
--- a/arch/arm/boot/dts/tegra20-paz00.dts
+++ b/arch/arm/boot/dts/tegra20-paz00.dts
@@ -575,7 +575,7 @@
                default-brightness-level = <10>;
        };
 
-       clk32k_in: clock@0 {
+       clk32k_in: clock-32k {
                compatible = "fixed-clock";
                clock-frequency = <32768>;
                #clock-cells = <0>;

diff --git a/arch/arm/boot/dts/tegra20-seaboard.dts b/arch/arm/boot/dts/tegra20-seaboard.dts
index 92d494b8c3d25a74eae9aecd601a5dc10e54eedd..ffeae5da22e7e10eca9a0ee75df2e9bd01d8d6b3 100644 (file)
--- a/arch/arm/boot/dts/tegra20-seaboard.dts
+++ b/arch/arm/boot/dts/tegra20-seaboard.dts
@@ -792,7 +792,7 @@
                default-brightness-level = <6>;
        };
 
-       clk32k_in: clock@0 {
+       clk32k_in: clock-32k {
                compatible = "fixed-clock";
                clock-frequency = <32768>;
                #clock-cells = <0>;

diff --git a/arch/arm/boot/dts/tegra20-tamonten.dtsi b/arch/arm/boot/dts/tegra20-tamonten.dtsi
index dd4d506683de7dcf07c45b173e57077ce79acbf0..d5f1a46da0bc31ad39b2c5619e7ba3bea5c7976f 100644 (file)
--- a/arch/arm/boot/dts/tegra20-tamonten.dtsi
+++ b/arch/arm/boot/dts/tegra20-tamonten.dtsi
@@ -502,7 +502,7 @@
                status = "okay";
        };
 
-       clk32k_in: clock@0 {
+       clk32k_in: clock-32k {
                compatible = "fixed-clock";
                clock-frequency = <32768>;
                #clock-cells = <0>;

diff --git a/arch/arm/boot/dts/tegra20-trimslice.dts b/arch/arm/boot/dts/tegra20-trimslice.dts
index beae368f827a49a4e2fe5c18588ac665bcfb611f..49c3b3bfac51bc5ab3b6e24f81671ab42775ad77 100644 (file)
--- a/arch/arm/boot/dts/tegra20-trimslice.dts
+++ b/arch/arm/boot/dts/tegra20-trimslice.dts
@@ -380,7 +380,7 @@
                bus-width = <4>;
        };
 
-       clk32k_in: clock@0 {
+       clk32k_in: clock-32k {
                compatible = "fixed-clock";
                clock-frequency = <32768>;
                #clock-cells = <0>;

diff --git a/arch/arm/boot/dts/tegra20-ventana.dts b/arch/arm/boot/dts/tegra20-ventana.dts
index 5a2578b3707f42a8bd8ec4835ff411d9033b3abd..ef97457f133445d7299f4274c8a8f46071528ed5 100644 (file)
--- a/arch/arm/boot/dts/tegra20-ventana.dts
+++ b/arch/arm/boot/dts/tegra20-ventana.dts
@@ -606,7 +606,7 @@
                default-brightness-level = <6>;
        };
 
-       clk32k_in: clock@0 {
+       clk32k_in: clock-32k {
                compatible = "fixed-clock";
                clock-frequency = <32768>;
                #clock-cells = <0>;

diff --git a/arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi b/arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi
index 07d4ea130964ffb4c8aaa27b622d2c199cbf8505..72159eb55a3df0b3553b064dc470c5c350a51cd4 100644 (file)
--- a/arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi
+++ b/arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi
@@ -1069,7 +1069,7 @@
        };
 
        /* PMIC has a built-in 32KHz oscillator which is used by PMC */
-       clk32k_in: clock@0 {
+       clk32k_in: clock-32k {
                compatible = "fixed-clock";
                #clock-cells = <0>;
                clock-frequency = <32768>;

diff --git a/arch/arm/boot/dts/tegra30-beaver.dts b/arch/arm/boot/dts/tegra30-beaver.dts
index f724abcdb1a5590591e1d231b37563b709eee82d..91ecca0be5a2231685e43ccc7989a8a90f7ce265 100644 (file)
--- a/arch/arm/boot/dts/tegra30-beaver.dts
+++ b/arch/arm/boot/dts/tegra30-beaver.dts
@@ -1967,7 +1967,7 @@
                status = "okay";
        };
 
-       clk32k_in: clock@0 {
+       clk32k_in: clock-32k {
                compatible = "fixed-clock";
                clock-frequency = <32768>;
                #clock-cells = <0>;

diff --git a/arch/arm/boot/dts/tegra30-cardhu.dtsi b/arch/arm/boot/dts/tegra30-cardhu.dtsi
index e7bfe0e5ee0676be18bc61e18fa51a1ed19ca519..6074885280fc356aa98e9c34ec0aa03304a17f02 100644 (file)
--- a/arch/arm/boot/dts/tegra30-cardhu.dtsi
+++ b/arch/arm/boot/dts/tegra30-cardhu.dtsi
@@ -434,7 +434,7 @@
                default-brightness-level = <6>;
        };
 
-       clk32k_in: clock@0 {
+       clk32k_in: clock-32k {
                compatible = "fixed-clock";
                clock-frequency = <32768>;
                #clock-cells = <0>;