clk: tegra: Fix cdev1 and cdev2 IDs

Correct IDs for cdev1 and cdev2 are 94 and 93 respectively. Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia.com> [swarren: split into separate driver and device-tree patches] Signed-off-by: Stephen Warren <swarren@nvidia.com>
author: Prashant Gaikwad <pgaikwad@nvidia.com> 2013-04-04 05:05:04 -0400
committer: Stephen Warren <swarren@nvidia.com> 2013-04-04 19:17:44 -0400
commit: 1071b2df22aa45ffeaf34dfccc889d92586ca645 (patch)
tree: 94b3a7d1dd1cf283ecee249fbce8e577469ac557 /arch/arm
parent: a44a019d45820eaeeb449450caa9e43f1f00a09b (diff)
11 files changed, 11 insertions, 11 deletions
diff --git a/arch/arm/boot/dts/tegra20-colibri-512.dtsi b/arch/arm/boot/dts/tegra20-colibri-512.dtsi
index a094787aca22..a573b94b7c93 100644
--- a/arch/arm/boot/dts/tegra20-colibri-512.dtsi
+++ b/arch/arm/boot/dts/tegra20-colibri-512.dtsi
@@ -483,7 +483,7 @@
                nvidia,ac97-controller = <&ac97>;
-                clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
+                clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
                clock-names = "pll_a", "pll_a_out0", "mclk";
        };
diff --git a/arch/arm/boot/dts/tegra20-harmony.dts b/arch/arm/boot/dts/tegra20-harmony.dts
index a44b54eb6037..e7d5de4e00b9 100644
--- a/arch/arm/boot/dts/tegra20-harmony.dts
+++ b/arch/arm/boot/dts/tegra20-harmony.dts
@@ -687,7 +687,7 @@
                nvidia,int-mic-en-gpios = <&gpio 184 0>; /*gpio PX0 */
                nvidia,ext-mic-en-gpios = <&gpio 185 0>; /* gpio PX1 */
-                clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
+                clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
                clock-names = "pll_a", "pll_a_out0", "mclk";
        };
 };
diff --git a/arch/arm/boot/dts/tegra20-medcom-wide.dts b/arch/arm/boot/dts/tegra20-medcom-wide.dts
index 740ba7c424d4..ace23437da89 100644
--- a/arch/arm/boot/dts/tegra20-medcom-wide.dts
+++ b/arch/arm/boot/dts/tegra20-medcom-wide.dts
@@ -59,7 +59,7 @@
                nvidia,spkr-en-gpios = <&wm8903 2 0>;
                nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
-                clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
+                clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
                clock-names = "pll_a", "pll_a_out0", "mclk";
        };
 };
diff --git a/arch/arm/boot/dts/tegra20-paz00.dts b/arch/arm/boot/dts/tegra20-paz00.dts
index 8c0e9a265810..e3e0c9977df4 100644
--- a/arch/arm/boot/dts/tegra20-paz00.dts
+++ b/arch/arm/boot/dts/tegra20-paz00.dts
@@ -522,7 +522,7 @@
                nvidia,i2s-controller = <&tegra_i2s1>;
                nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
-                clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
+                clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
                clock-names = "pll_a", "pll_a_out0", "mclk";
        };
 };
diff --git a/arch/arm/boot/dts/tegra20-plutux.dts b/arch/arm/boot/dts/tegra20-plutux.dts
index 7085ae5f0562..1a17cc30bb9d 100644
--- a/arch/arm/boot/dts/tegra20-plutux.dts
+++ b/arch/arm/boot/dts/tegra20-plutux.dts
@@ -53,7 +53,7 @@
                nvidia,spkr-en-gpios = <&wm8903 2 0>;
                nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
-                clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
+                clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
                clock-names = "pll_a", "pll_a_out0", "mclk";
        };
 };
diff --git a/arch/arm/boot/dts/tegra20-seaboard.dts b/arch/arm/boot/dts/tegra20-seaboard.dts
index c45b69859748..cee4c34010fe 100644
--- a/arch/arm/boot/dts/tegra20-seaboard.dts
+++ b/arch/arm/boot/dts/tegra20-seaboard.dts
@@ -830,7 +830,7 @@
                nvidia,spkr-en-gpios = <&wm8903 2 0>;
                nvidia,hp-det-gpios = <&gpio 185 0>; /* gpio PX1 */
-                clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
+                clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
                clock-names = "pll_a", "pll_a_out0", "mclk";
        };
 };
diff --git a/arch/arm/boot/dts/tegra20-tec.dts b/arch/arm/boot/dts/tegra20-tec.dts
index 9be175d38392..742f0b38d21d 100644
--- a/arch/arm/boot/dts/tegra20-tec.dts
+++ b/arch/arm/boot/dts/tegra20-tec.dts
@@ -53,7 +53,7 @@
                nvidia,spkr-en-gpios = <&wm8903 2 0>;
                nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
-                clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
+                clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
                clock-names = "pll_a", "pll_a_out0", "mclk";
        };
 };
diff --git a/arch/arm/boot/dts/tegra20-trimslice.dts b/arch/arm/boot/dts/tegra20-trimslice.dts
index f2fbc3838d0d..9cc78a15d739 100644
--- a/arch/arm/boot/dts/tegra20-trimslice.dts
+++ b/arch/arm/boot/dts/tegra20-trimslice.dts
@@ -397,7 +397,7 @@
                nvidia,i2s-controller = <&tegra_i2s1>;
                nvidia,audio-codec = <&codec>;
-                clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
+                clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
                clock-names = "pll_a", "pll_a_out0", "mclk";
        };
 };
diff --git a/arch/arm/boot/dts/tegra20-ventana.dts b/arch/arm/boot/dts/tegra20-ventana.dts
index 395df485d558..dd38f1f03834 100644
--- a/arch/arm/boot/dts/tegra20-ventana.dts
+++ b/arch/arm/boot/dts/tegra20-ventana.dts
@@ -640,7 +640,7 @@
                nvidia,int-mic-en-gpios = <&gpio 184 0>; /* gpio PX0 */
                nvidia,ext-mic-en-gpios = <&gpio 185 0>; /* gpio PX1 */
-                clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
+                clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
                clock-names = "pll_a", "pll_a_out0", "mclk";
        };
 };
diff --git a/arch/arm/boot/dts/tegra20-whistler.dts b/arch/arm/boot/dts/tegra20-whistler.dts
index 2ed6bb8ce6f4..d2567f83aaff 100644
--- a/arch/arm/boot/dts/tegra20-whistler.dts
+++ b/arch/arm/boot/dts/tegra20-whistler.dts
@@ -584,7 +584,7 @@
                nvidia,i2s-controller = <&tegra_i2s1>;
                nvidia,audio-codec = <&codec>;
-                clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
+                clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
                clock-names = "pll_a", "pll_a_out0", "mclk";
        };
 };
diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi
index 1911432987ef..3e676a26c980 100644
--- a/arch/arm/boot/dts/tegra20.dtsi
+++ b/arch/arm/boot/dts/tegra20.dtsi
@@ -478,7 +478,7 @@
                compatible = "nvidia,tegra20-usb-phy";
                reg = <0xc5004400 0x3c00>;
                phy_type = "ulpi";
-                clocks = <&tegra_car 94>, <&tegra_car 127>;
+                clocks = <&tegra_car 93>, <&tegra_car 127>;
                clock-names = "phy", "pll_u";
        };
author	Prashant Gaikwad <pgaikwad@nvidia.com>	2013-04-04 05:05:04 -0400
committer	Stephen Warren <swarren@nvidia.com>	2013-04-04 19:17:44 -0400
commit	1071b2df22aa45ffeaf34dfccc889d92586ca645 (patch)
tree	94b3a7d1dd1cf283ecee249fbce8e577469ac557 /arch/arm
parent	a44a019d45820eaeeb449450caa9e43f1f00a09b (diff)

diff --git a/arch/arm/boot/dts/tegra20-colibri-512.dtsi b/arch/arm/boot/dts/tegra20-colibri-512.dtsi index a094787aca22..a573b94b7c93 100644 --- a/arch/arm/boot/dts/tegra20-colibri-512.dtsi +++ b/arch/arm/boot/dts/tegra20-colibri-512.dtsi
@@ -483,7 +483,7 @@
483		483
484	nvidia,ac97-controller = <&ac97>;	484	nvidia,ac97-controller = <&ac97>;
485		485
486	clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;	486	clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
487	clock-names = "pll_a", "pll_a_out0", "mclk";	487	clock-names = "pll_a", "pll_a_out0", "mclk";
488	};	488	};
489		489


diff --git a/arch/arm/boot/dts/tegra20-harmony.dts b/arch/arm/boot/dts/tegra20-harmony.dts index a44b54eb6037..e7d5de4e00b9 100644 --- a/arch/arm/boot/dts/tegra20-harmony.dts +++ b/arch/arm/boot/dts/tegra20-harmony.dts
@@ -687,7 +687,7 @@
687	nvidia,int-mic-en-gpios = <&gpio 184 0>; /gpio PX0 /	687	nvidia,int-mic-en-gpios = <&gpio 184 0>; /gpio PX0 /
688	nvidia,ext-mic-en-gpios = <&gpio 185 0>; /* gpio PX1 */	688	nvidia,ext-mic-en-gpios = <&gpio 185 0>; /* gpio PX1 */
689		689
690	clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;	690	clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
691	clock-names = "pll_a", "pll_a_out0", "mclk";	691	clock-names = "pll_a", "pll_a_out0", "mclk";
692	};	692	};
693	};	693	};


diff --git a/arch/arm/boot/dts/tegra20-medcom-wide.dts b/arch/arm/boot/dts/tegra20-medcom-wide.dts index 740ba7c424d4..ace23437da89 100644 --- a/arch/arm/boot/dts/tegra20-medcom-wide.dts +++ b/arch/arm/boot/dts/tegra20-medcom-wide.dts
@@ -59,7 +59,7 @@
59	nvidia,spkr-en-gpios = <&wm8903 2 0>;	59	nvidia,spkr-en-gpios = <&wm8903 2 0>;
60	nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */	60	nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
61		61
62	clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;	62	clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
63	clock-names = "pll_a", "pll_a_out0", "mclk";	63	clock-names = "pll_a", "pll_a_out0", "mclk";
64	};	64	};
65	};	65	};


diff --git a/arch/arm/boot/dts/tegra20-paz00.dts b/arch/arm/boot/dts/tegra20-paz00.dts index 8c0e9a265810..e3e0c9977df4 100644 --- a/arch/arm/boot/dts/tegra20-paz00.dts +++ b/arch/arm/boot/dts/tegra20-paz00.dts
@@ -522,7 +522,7 @@
522	nvidia,i2s-controller = <&tegra_i2s1>;	522	nvidia,i2s-controller = <&tegra_i2s1>;
523	nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */	523	nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
524		524
525	clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;	525	clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
526	clock-names = "pll_a", "pll_a_out0", "mclk";	526	clock-names = "pll_a", "pll_a_out0", "mclk";
527	};	527	};
528	};	528	};


diff --git a/arch/arm/boot/dts/tegra20-plutux.dts b/arch/arm/boot/dts/tegra20-plutux.dts index 7085ae5f0562..1a17cc30bb9d 100644 --- a/arch/arm/boot/dts/tegra20-plutux.dts +++ b/arch/arm/boot/dts/tegra20-plutux.dts
@@ -53,7 +53,7 @@
53	nvidia,spkr-en-gpios = <&wm8903 2 0>;	53	nvidia,spkr-en-gpios = <&wm8903 2 0>;
54	nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */	54	nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
55		55
56	clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;	56	clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
57	clock-names = "pll_a", "pll_a_out0", "mclk";	57	clock-names = "pll_a", "pll_a_out0", "mclk";
58	};	58	};
59	};	59	};


diff --git a/arch/arm/boot/dts/tegra20-seaboard.dts b/arch/arm/boot/dts/tegra20-seaboard.dts index c45b69859748..cee4c34010fe 100644 --- a/arch/arm/boot/dts/tegra20-seaboard.dts +++ b/arch/arm/boot/dts/tegra20-seaboard.dts
@@ -830,7 +830,7 @@
830	nvidia,spkr-en-gpios = <&wm8903 2 0>;	830	nvidia,spkr-en-gpios = <&wm8903 2 0>;
831	nvidia,hp-det-gpios = <&gpio 185 0>; /* gpio PX1 */	831	nvidia,hp-det-gpios = <&gpio 185 0>; /* gpio PX1 */
832		832
833	clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;	833	clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
834	clock-names = "pll_a", "pll_a_out0", "mclk";	834	clock-names = "pll_a", "pll_a_out0", "mclk";
835	};	835	};
836	};	836	};


diff --git a/arch/arm/boot/dts/tegra20-tec.dts b/arch/arm/boot/dts/tegra20-tec.dts index 9be175d38392..742f0b38d21d 100644 --- a/arch/arm/boot/dts/tegra20-tec.dts +++ b/arch/arm/boot/dts/tegra20-tec.dts
@@ -53,7 +53,7 @@
53	nvidia,spkr-en-gpios = <&wm8903 2 0>;	53	nvidia,spkr-en-gpios = <&wm8903 2 0>;
54	nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */	54	nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
55		55
56	clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;	56	clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
57	clock-names = "pll_a", "pll_a_out0", "mclk";	57	clock-names = "pll_a", "pll_a_out0", "mclk";
58	};	58	};
59	};	59	};


diff --git a/arch/arm/boot/dts/tegra20-trimslice.dts b/arch/arm/boot/dts/tegra20-trimslice.dts index f2fbc3838d0d..9cc78a15d739 100644 --- a/arch/arm/boot/dts/tegra20-trimslice.dts +++ b/arch/arm/boot/dts/tegra20-trimslice.dts
@@ -397,7 +397,7 @@
397	nvidia,i2s-controller = <&tegra_i2s1>;	397	nvidia,i2s-controller = <&tegra_i2s1>;
398	nvidia,audio-codec = <&codec>;	398	nvidia,audio-codec = <&codec>;
399		399
400	clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;	400	clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
401	clock-names = "pll_a", "pll_a_out0", "mclk";	401	clock-names = "pll_a", "pll_a_out0", "mclk";
402	};	402	};
403	};	403	};


diff --git a/arch/arm/boot/dts/tegra20-ventana.dts b/arch/arm/boot/dts/tegra20-ventana.dts index 395df485d558..dd38f1f03834 100644 --- a/arch/arm/boot/dts/tegra20-ventana.dts +++ b/arch/arm/boot/dts/tegra20-ventana.dts
@@ -640,7 +640,7 @@
640	nvidia,int-mic-en-gpios = <&gpio 184 0>; /* gpio PX0 */	640	nvidia,int-mic-en-gpios = <&gpio 184 0>; /* gpio PX0 */
641	nvidia,ext-mic-en-gpios = <&gpio 185 0>; /* gpio PX1 */	641	nvidia,ext-mic-en-gpios = <&gpio 185 0>; /* gpio PX1 */
642		642
643	clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;	643	clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
644	clock-names = "pll_a", "pll_a_out0", "mclk";	644	clock-names = "pll_a", "pll_a_out0", "mclk";
645	};	645	};
646	};	646	};


diff --git a/arch/arm/boot/dts/tegra20-whistler.dts b/arch/arm/boot/dts/tegra20-whistler.dts index 2ed6bb8ce6f4..d2567f83aaff 100644 --- a/arch/arm/boot/dts/tegra20-whistler.dts +++ b/arch/arm/boot/dts/tegra20-whistler.dts
@@ -584,7 +584,7 @@
584	nvidia,i2s-controller = <&tegra_i2s1>;	584	nvidia,i2s-controller = <&tegra_i2s1>;
585	nvidia,audio-codec = <&codec>;	585	nvidia,audio-codec = <&codec>;
586		586
587	clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;	587	clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
588	clock-names = "pll_a", "pll_a_out0", "mclk";	588	clock-names = "pll_a", "pll_a_out0", "mclk";
589	};	589	};
590	};	590	};


diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi index 1911432987ef..3e676a26c980 100644 --- a/arch/arm/boot/dts/tegra20.dtsi +++ b/arch/arm/boot/dts/tegra20.dtsi
@@ -478,7 +478,7 @@
478	compatible = "nvidia,tegra20-usb-phy";	478	compatible = "nvidia,tegra20-usb-phy";
479	reg = <0xc5004400 0x3c00>;	479	reg = <0xc5004400 0x3c00>;
480	phy_type = "ulpi";	480	phy_type = "ulpi";
481	clocks = <&tegra_car 94>, <&tegra_car 127>;	481	clocks = <&tegra_car 93>, <&tegra_car 127>;
482	clock-names = "phy", "pll_u";	482	clock-names = "phy", "pll_u";
483	};	483	};
484		484