.. | .. |
---|
81 | 81 | }; |
---|
82 | 82 | |
---|
83 | 83 | cpu0: cpu@0 { |
---|
84 | | - compatible = "arm,cortex-a53", "arm,armv8"; |
---|
| 84 | + compatible = "arm,cortex-a53"; |
---|
85 | 85 | device_type = "cpu"; |
---|
86 | 86 | reg = <0x0 0x0>; |
---|
87 | 87 | enable-method = "psci"; |
---|
.. | .. |
---|
94 | 94 | }; |
---|
95 | 95 | |
---|
96 | 96 | cpu1: cpu@1 { |
---|
97 | | - compatible = "arm,cortex-a53", "arm,armv8"; |
---|
| 97 | + compatible = "arm,cortex-a53"; |
---|
98 | 98 | device_type = "cpu"; |
---|
99 | 99 | reg = <0x0 0x1>; |
---|
100 | 100 | enable-method = "psci"; |
---|
101 | 101 | next-level-cache = <&CLUSTER0_L2>; |
---|
| 102 | + clocks = <&stub_clock 0>; |
---|
102 | 103 | operating-points-v2 = <&cpu_opp_table>; |
---|
103 | 104 | cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP>; |
---|
104 | 105 | #cooling-cells = <2>; /* min followed by max */ |
---|
.. | .. |
---|
106 | 107 | }; |
---|
107 | 108 | |
---|
108 | 109 | cpu2: cpu@2 { |
---|
109 | | - compatible = "arm,cortex-a53", "arm,armv8"; |
---|
| 110 | + compatible = "arm,cortex-a53"; |
---|
110 | 111 | device_type = "cpu"; |
---|
111 | 112 | reg = <0x0 0x2>; |
---|
112 | 113 | enable-method = "psci"; |
---|
113 | 114 | next-level-cache = <&CLUSTER0_L2>; |
---|
| 115 | + clocks = <&stub_clock 0>; |
---|
114 | 116 | operating-points-v2 = <&cpu_opp_table>; |
---|
115 | 117 | cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP>; |
---|
116 | 118 | #cooling-cells = <2>; /* min followed by max */ |
---|
.. | .. |
---|
118 | 120 | }; |
---|
119 | 121 | |
---|
120 | 122 | cpu3: cpu@3 { |
---|
121 | | - compatible = "arm,cortex-a53", "arm,armv8"; |
---|
| 123 | + compatible = "arm,cortex-a53"; |
---|
122 | 124 | device_type = "cpu"; |
---|
123 | 125 | reg = <0x0 0x3>; |
---|
124 | 126 | enable-method = "psci"; |
---|
125 | 127 | next-level-cache = <&CLUSTER0_L2>; |
---|
| 128 | + clocks = <&stub_clock 0>; |
---|
126 | 129 | operating-points-v2 = <&cpu_opp_table>; |
---|
127 | 130 | cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP>; |
---|
128 | 131 | #cooling-cells = <2>; /* min followed by max */ |
---|
.. | .. |
---|
130 | 133 | }; |
---|
131 | 134 | |
---|
132 | 135 | cpu4: cpu@100 { |
---|
133 | | - compatible = "arm,cortex-a53", "arm,armv8"; |
---|
| 136 | + compatible = "arm,cortex-a53"; |
---|
134 | 137 | device_type = "cpu"; |
---|
135 | 138 | reg = <0x0 0x100>; |
---|
136 | 139 | enable-method = "psci"; |
---|
137 | 140 | next-level-cache = <&CLUSTER1_L2>; |
---|
| 141 | + clocks = <&stub_clock 0>; |
---|
138 | 142 | operating-points-v2 = <&cpu_opp_table>; |
---|
139 | 143 | cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP>; |
---|
140 | 144 | #cooling-cells = <2>; /* min followed by max */ |
---|
.. | .. |
---|
142 | 146 | }; |
---|
143 | 147 | |
---|
144 | 148 | cpu5: cpu@101 { |
---|
145 | | - compatible = "arm,cortex-a53", "arm,armv8"; |
---|
| 149 | + compatible = "arm,cortex-a53"; |
---|
146 | 150 | device_type = "cpu"; |
---|
147 | 151 | reg = <0x0 0x101>; |
---|
148 | 152 | enable-method = "psci"; |
---|
149 | 153 | next-level-cache = <&CLUSTER1_L2>; |
---|
| 154 | + clocks = <&stub_clock 0>; |
---|
150 | 155 | operating-points-v2 = <&cpu_opp_table>; |
---|
151 | 156 | cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP>; |
---|
152 | 157 | #cooling-cells = <2>; /* min followed by max */ |
---|
.. | .. |
---|
154 | 159 | }; |
---|
155 | 160 | |
---|
156 | 161 | cpu6: cpu@102 { |
---|
157 | | - compatible = "arm,cortex-a53", "arm,armv8"; |
---|
| 162 | + compatible = "arm,cortex-a53"; |
---|
158 | 163 | device_type = "cpu"; |
---|
159 | 164 | reg = <0x0 0x102>; |
---|
160 | 165 | enable-method = "psci"; |
---|
161 | 166 | next-level-cache = <&CLUSTER1_L2>; |
---|
| 167 | + clocks = <&stub_clock 0>; |
---|
162 | 168 | operating-points-v2 = <&cpu_opp_table>; |
---|
163 | 169 | cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP>; |
---|
164 | 170 | #cooling-cells = <2>; /* min followed by max */ |
---|
.. | .. |
---|
166 | 172 | }; |
---|
167 | 173 | |
---|
168 | 174 | cpu7: cpu@103 { |
---|
169 | | - compatible = "arm,cortex-a53", "arm,armv8"; |
---|
| 175 | + compatible = "arm,cortex-a53"; |
---|
170 | 176 | device_type = "cpu"; |
---|
171 | 177 | reg = <0x0 0x103>; |
---|
172 | 178 | enable-method = "psci"; |
---|
173 | 179 | next-level-cache = <&CLUSTER1_L2>; |
---|
| 180 | + clocks = <&stub_clock 0>; |
---|
174 | 181 | operating-points-v2 = <&cpu_opp_table>; |
---|
175 | 182 | cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP>; |
---|
176 | 183 | #cooling-cells = <2>; /* min followed by max */ |
---|
.. | .. |
---|
253 | 260 | compatible = "hisilicon,hi6220-aoctrl", "syscon"; |
---|
254 | 261 | reg = <0x0 0xf7800000 0x0 0x2000>; |
---|
255 | 262 | #clock-cells = <1>; |
---|
| 263 | + #reset-cells = <1>; |
---|
256 | 264 | }; |
---|
257 | 265 | |
---|
258 | 266 | sys_ctrl: sys_ctrl@f7030000 { |
---|
.. | .. |
---|
294 | 302 | mboxes = <&mailbox 1 0 11>; |
---|
295 | 303 | }; |
---|
296 | 304 | |
---|
297 | | - uart0: uart@f8015000 { /* console */ |
---|
| 305 | + uart0: serial@f8015000 { /* console */ |
---|
298 | 306 | compatible = "arm,pl011", "arm,primecell"; |
---|
299 | 307 | reg = <0x0 0xf8015000 0x0 0x1000>; |
---|
300 | 308 | interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>; |
---|
.. | .. |
---|
303 | 311 | clock-names = "uartclk", "apb_pclk"; |
---|
304 | 312 | }; |
---|
305 | 313 | |
---|
306 | | - uart1: uart@f7111000 { |
---|
| 314 | + uart1: serial@f7111000 { |
---|
307 | 315 | compatible = "arm,pl011", "arm,primecell"; |
---|
308 | 316 | reg = <0x0 0xf7111000 0x0 0x1000>; |
---|
309 | 317 | interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>; |
---|
.. | .. |
---|
312 | 320 | clock-names = "uartclk", "apb_pclk"; |
---|
313 | 321 | pinctrl-names = "default"; |
---|
314 | 322 | pinctrl-0 = <&uart1_pmx_func &uart1_cfg_func1 &uart1_cfg_func2>; |
---|
| 323 | + dmas = <&dma0 8 &dma0 9>; |
---|
| 324 | + dma-names = "rx", "tx"; |
---|
315 | 325 | status = "disabled"; |
---|
316 | 326 | }; |
---|
317 | 327 | |
---|
318 | | - uart2: uart@f7112000 { |
---|
| 328 | + uart2: serial@f7112000 { |
---|
319 | 329 | compatible = "arm,pl011", "arm,primecell"; |
---|
320 | 330 | reg = <0x0 0xf7112000 0x0 0x1000>; |
---|
321 | 331 | interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>; |
---|
.. | .. |
---|
327 | 337 | status = "disabled"; |
---|
328 | 338 | }; |
---|
329 | 339 | |
---|
330 | | - uart3: uart@f7113000 { |
---|
| 340 | + uart3: serial@f7113000 { |
---|
331 | 341 | compatible = "arm,pl011", "arm,primecell"; |
---|
332 | 342 | reg = <0x0 0xf7113000 0x0 0x1000>; |
---|
333 | 343 | interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>; |
---|
.. | .. |
---|
339 | 349 | status = "disabled"; |
---|
340 | 350 | }; |
---|
341 | 351 | |
---|
342 | | - uart4: uart@f7114000 { |
---|
| 352 | + uart4: serial@f7114000 { |
---|
343 | 353 | compatible = "arm,pl011", "arm,primecell"; |
---|
344 | 354 | reg = <0x0 0xf7114000 0x0 0x1000>; |
---|
345 | 355 | interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>; |
---|
.. | .. |
---|
361 | 371 | clocks = <&sys_ctrl HI6220_EDMAC_ACLK>; |
---|
362 | 372 | dma-no-cci; |
---|
363 | 373 | dma-type = "hi6220_dma"; |
---|
364 | | - status = "ok"; |
---|
| 374 | + status = "okay"; |
---|
365 | 375 | }; |
---|
366 | 376 | |
---|
367 | 377 | dual_timer0: timer@f8008000 { |
---|
.. | .. |
---|
833 | 843 | compatible = "arm,sp805", "arm,primecell"; |
---|
834 | 844 | reg = <0x0 0xf8005000 0x0 0x1000>; |
---|
835 | 845 | interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>; |
---|
836 | | - clocks = <&ao_ctrl HI6220_WDT0_PCLK>; |
---|
837 | | - clock-names = "apb_pclk"; |
---|
| 846 | + clocks = <&ao_ctrl HI6220_WDT0_PCLK>, |
---|
| 847 | + <&ao_ctrl HI6220_WDT0_PCLK>; |
---|
| 848 | + clock-names = "wdog_clk", "apb_pclk"; |
---|
838 | 849 | }; |
---|
839 | 850 | |
---|
840 | 851 | tsensor: tsensor@0,f7030700 { |
---|
.. | .. |
---|
886 | 897 | cooling-maps { |
---|
887 | 898 | map0 { |
---|
888 | 899 | trip = <&target>; |
---|
889 | | - cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; |
---|
| 900 | + cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, |
---|
| 901 | + <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, |
---|
| 902 | + <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, |
---|
| 903 | + <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, |
---|
| 904 | + <&cpu4 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, |
---|
| 905 | + <&cpu5 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, |
---|
| 906 | + <&cpu6 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, |
---|
| 907 | + <&cpu7 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; |
---|
890 | 908 | }; |
---|
891 | 909 | }; |
---|
892 | 910 | }; |
---|
.. | .. |
---|
1005 | 1023 | clock-names = "apb_pclk"; |
---|
1006 | 1024 | cpu = <&cpu7>; |
---|
1007 | 1025 | }; |
---|
| 1026 | + |
---|
| 1027 | + mali: gpu@f4080000 { |
---|
| 1028 | + compatible = "hisilicon,hi6220-mali", "arm,mali-450"; |
---|
| 1029 | + reg = <0x0 0xf4080000 0x0 0x00040000>; |
---|
| 1030 | + interrupt-parent = <&gic>; |
---|
| 1031 | + interrupts = <GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>, |
---|
| 1032 | + <GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>, |
---|
| 1033 | + <GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>, |
---|
| 1034 | + <GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>, |
---|
| 1035 | + <GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>, |
---|
| 1036 | + <GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>, |
---|
| 1037 | + <GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>, |
---|
| 1038 | + <GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>, |
---|
| 1039 | + <GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>, |
---|
| 1040 | + <GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>, |
---|
| 1041 | + <GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>; |
---|
| 1042 | + |
---|
| 1043 | + interrupt-names = "gp", |
---|
| 1044 | + "gpmmu", |
---|
| 1045 | + "pp", |
---|
| 1046 | + "pp0", |
---|
| 1047 | + "ppmmu0", |
---|
| 1048 | + "pp1", |
---|
| 1049 | + "ppmmu1", |
---|
| 1050 | + "pp2", |
---|
| 1051 | + "ppmmu2", |
---|
| 1052 | + "pp3", |
---|
| 1053 | + "ppmmu3"; |
---|
| 1054 | + clocks = <&media_ctrl HI6220_G3D_CLK>, |
---|
| 1055 | + <&media_ctrl HI6220_G3D_PCLK>; |
---|
| 1056 | + clock-names = "core", "bus"; |
---|
| 1057 | + assigned-clocks = <&media_ctrl HI6220_G3D_CLK>, |
---|
| 1058 | + <&media_ctrl HI6220_G3D_PCLK>; |
---|
| 1059 | + assigned-clock-rates = <500000000>, <144000000>; |
---|
| 1060 | + reset-names = "ao_g3d", "media_g3d"; |
---|
| 1061 | + resets = <&ao_ctrl AO_G3D>, <&media_ctrl MEDIA_G3D>; |
---|
| 1062 | + }; |
---|
1008 | 1063 | }; |
---|
1009 | 1064 | }; |
---|
1010 | 1065 | |
---|