diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2013-04-05 10:15:01 -0400 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2013-04-09 10:52:32 -0400 |
commit | 9ac8f50a35a93928e750d6edc4133d1308f4f95d (patch) | |
tree | aadbe97ba3d301ae54fa3b8709c7a6a2bda4e011 /arch/powerpc/boot/dts | |
parent | ddb487dca347956ed3bedda1f5a00ab62d05ebff (diff) |
powerpc/fsl-booke: Minor fixes to T4240 Si device tree
* Fix cpu unit address to match reg
* Update compatible for rcpm & clockgen to be 2.0 instead of 2
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/boot/dts')
-rw-r--r-- | arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | 4 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi | 22 |
2 files changed, 13 insertions, 13 deletions
diff --git a/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi b/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi index 1d7292627b72..e77e6adba05f 100644 --- a/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | |||
@@ -364,12 +364,12 @@ | |||
364 | }; | 364 | }; |
365 | 365 | ||
366 | clockgen: global-utilities@e1000 { | 366 | clockgen: global-utilities@e1000 { |
367 | compatible = "fsl,t4240-clockgen", "fsl,qoriq-clockgen-2"; | 367 | compatible = "fsl,t4240-clockgen", "fsl,qoriq-clockgen-2.0"; |
368 | reg = <0xe1000 0x1000>; | 368 | reg = <0xe1000 0x1000>; |
369 | }; | 369 | }; |
370 | 370 | ||
371 | rcpm: global-utilities@e2000 { | 371 | rcpm: global-utilities@e2000 { |
372 | compatible = "fsl,t4240-rcpm", "fsl,qoriq-rcpm-2"; | 372 | compatible = "fsl,t4240-rcpm", "fsl,qoriq-rcpm-2.0"; |
373 | reg = <0xe2000 0x1000>; | 373 | reg = <0xe2000 0x1000>; |
374 | }; | 374 | }; |
375 | 375 | ||
diff --git a/arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi b/arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi index 9b39a438d691..a93c55a88560 100644 --- a/arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi +++ b/arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi | |||
@@ -69,57 +69,57 @@ | |||
69 | reg = <0 1>; | 69 | reg = <0 1>; |
70 | next-level-cache = <&L2_1>; | 70 | next-level-cache = <&L2_1>; |
71 | }; | 71 | }; |
72 | cpu1: PowerPC,e6500@1 { | 72 | cpu1: PowerPC,e6500@2 { |
73 | device_type = "cpu"; | 73 | device_type = "cpu"; |
74 | reg = <2 3>; | 74 | reg = <2 3>; |
75 | next-level-cache = <&L2_1>; | 75 | next-level-cache = <&L2_1>; |
76 | }; | 76 | }; |
77 | cpu2: PowerPC,e6500@2 { | 77 | cpu2: PowerPC,e6500@4 { |
78 | device_type = "cpu"; | 78 | device_type = "cpu"; |
79 | reg = <4 5>; | 79 | reg = <4 5>; |
80 | next-level-cache = <&L2_1>; | 80 | next-level-cache = <&L2_1>; |
81 | }; | 81 | }; |
82 | cpu3: PowerPC,e6500@3 { | 82 | cpu3: PowerPC,e6500@6 { |
83 | device_type = "cpu"; | 83 | device_type = "cpu"; |
84 | reg = <6 7>; | 84 | reg = <6 7>; |
85 | next-level-cache = <&L2_1>; | 85 | next-level-cache = <&L2_1>; |
86 | }; | 86 | }; |
87 | cpu4: PowerPC,e6500@4 { | 87 | cpu4: PowerPC,e6500@8 { |
88 | device_type = "cpu"; | 88 | device_type = "cpu"; |
89 | reg = <8 9>; | 89 | reg = <8 9>; |
90 | next-level-cache = <&L2_2>; | 90 | next-level-cache = <&L2_2>; |
91 | }; | 91 | }; |
92 | cpu5: PowerPC,e6500@5 { | 92 | cpu5: PowerPC,e6500@10 { |
93 | device_type = "cpu"; | 93 | device_type = "cpu"; |
94 | reg = <10 11>; | 94 | reg = <10 11>; |
95 | next-level-cache = <&L2_2>; | 95 | next-level-cache = <&L2_2>; |
96 | }; | 96 | }; |
97 | cpu6: PowerPC,e6500@6 { | 97 | cpu6: PowerPC,e6500@12 { |
98 | device_type = "cpu"; | 98 | device_type = "cpu"; |
99 | reg = <12 13>; | 99 | reg = <12 13>; |
100 | next-level-cache = <&L2_2>; | 100 | next-level-cache = <&L2_2>; |
101 | }; | 101 | }; |
102 | cpu7: PowerPC,e6500@7 { | 102 | cpu7: PowerPC,e6500@14 { |
103 | device_type = "cpu"; | 103 | device_type = "cpu"; |
104 | reg = <14 15>; | 104 | reg = <14 15>; |
105 | next-level-cache = <&L2_2>; | 105 | next-level-cache = <&L2_2>; |
106 | }; | 106 | }; |
107 | cpu8: PowerPC,e6500@8 { | 107 | cpu8: PowerPC,e6500@16 { |
108 | device_type = "cpu"; | 108 | device_type = "cpu"; |
109 | reg = <16 17>; | 109 | reg = <16 17>; |
110 | next-level-cache = <&L2_3>; | 110 | next-level-cache = <&L2_3>; |
111 | }; | 111 | }; |
112 | cpu9: PowerPC,e6500@9 { | 112 | cpu9: PowerPC,e6500@18 { |
113 | device_type = "cpu"; | 113 | device_type = "cpu"; |
114 | reg = <18 19>; | 114 | reg = <18 19>; |
115 | next-level-cache = <&L2_3>; | 115 | next-level-cache = <&L2_3>; |
116 | }; | 116 | }; |
117 | cpu10: PowerPC,e6500@10 { | 117 | cpu10: PowerPC,e6500@20 { |
118 | device_type = "cpu"; | 118 | device_type = "cpu"; |
119 | reg = <20 21>; | 119 | reg = <20 21>; |
120 | next-level-cache = <&L2_3>; | 120 | next-level-cache = <&L2_3>; |
121 | }; | 121 | }; |
122 | cpu11: PowerPC,e6500@11 { | 122 | cpu11: PowerPC,e6500@22 { |
123 | device_type = "cpu"; | 123 | device_type = "cpu"; |
124 | reg = <22 23>; | 124 | reg = <22 23>; |
125 | next-level-cache = <&L2_3>; | 125 | next-level-cache = <&L2_3>; |