aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2015-10-27 18:41:16 -0400
committerScott Wood <scottwood@freescale.com>2015-10-27 19:14:38 -0400
commit7a1db41d83881bed7d5e13972ed308f05153ceee (patch)
tree6ef1c65272e26ab173d8a36b98c6e5113a277224
parent43f2cfcce26e2d67a3689d40777885a98447c586 (diff)
powerpc/fsl: Add #clock-cells and clockgen label to clockgen nodes
This allows new-style clock references to be used, which is needed for fman. The old clock nodes will be removed and all clock references converted to new-style once the qoriq-cpufreq driver is updated to stop depending on the old-style references in cpu nodes. Signed-off-by: Scott Wood <scottwood@freescale.com>
-rw-r--r--arch/powerpc/boot/dts/fsl/qoriq-clockgen1.dtsi3
-rw-r--r--arch/powerpc/boot/dts/fsl/qoriq-clockgen2.dtsi3
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/powerpc/boot/dts/fsl/qoriq-clockgen1.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-clockgen1.dtsi
index 4ece1edbff63..88cd70de4f86 100644
--- a/arch/powerpc/boot/dts/fsl/qoriq-clockgen1.dtsi
+++ b/arch/powerpc/boot/dts/fsl/qoriq-clockgen1.dtsi
@@ -32,13 +32,14 @@
32 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 32 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33 */ 33 */
34 34
35global-utilities@e1000 { 35clockgen: global-utilities@e1000 {
36 compatible = "fsl,qoriq-clockgen-1.0"; 36 compatible = "fsl,qoriq-clockgen-1.0";
37 ranges = <0x0 0xe1000 0x1000>; 37 ranges = <0x0 0xe1000 0x1000>;
38 reg = <0xe1000 0x1000>; 38 reg = <0xe1000 0x1000>;
39 clock-frequency = <0>; 39 clock-frequency = <0>;
40 #address-cells = <1>; 40 #address-cells = <1>;
41 #size-cells = <1>; 41 #size-cells = <1>;
42 #clock-cells = <2>;
42 43
43 sysclk: sysclk { 44 sysclk: sysclk {
44 #clock-cells = <0>; 45 #clock-cells = <0>;
diff --git a/arch/powerpc/boot/dts/fsl/qoriq-clockgen2.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-clockgen2.dtsi
index 48e0b6e4ce33..6dfd7c5357ab 100644
--- a/arch/powerpc/boot/dts/fsl/qoriq-clockgen2.dtsi
+++ b/arch/powerpc/boot/dts/fsl/qoriq-clockgen2.dtsi
@@ -32,12 +32,13 @@
32 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 32 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33 */ 33 */
34 34
35global-utilities@e1000 { 35clockgen: global-utilities@e1000 {
36 compatible = "fsl,qoriq-clockgen-2.0"; 36 compatible = "fsl,qoriq-clockgen-2.0";
37 ranges = <0x0 0xe1000 0x1000>; 37 ranges = <0x0 0xe1000 0x1000>;
38 reg = <0xe1000 0x1000>; 38 reg = <0xe1000 0x1000>;
39 #address-cells = <1>; 39 #address-cells = <1>;
40 #size-cells = <1>; 40 #size-cells = <1>;
41 #clock-cells = <2>;
41 42
42 sysclk: sysclk { 43 sysclk: sysclk {
43 #clock-cells = <0>; 44 #clock-cells = <0>;