hc
2023-12-09 b22da3d8526a935aa31e086e63f60ff3246cb61c
kernel/arch/arm/boot/dts/rk3xxx.dtsi
....@@ -32,7 +32,7 @@
3232 spi1 = &spi1;
3333 };
3434
35
- amba {
35
+ amba: bus {
3636 compatible = "simple-bus";
3737 #address-cells = <1>;
3838 #size-cells = <1>;
....@@ -70,6 +70,7 @@
7070 <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
7171 #dma-cells = <1>;
7272 arm,pl330-broken-no-flushp;
73
+ arm,pl330-periph-burst;
7374 clocks = <&cru ACLK_DMA2>;
7475 clock-names = "apb_pclk";
7576 };
....@@ -93,7 +94,7 @@
9394 status = "disabled";
9495 };
9596
96
- L2: l2-cache-controller@10138000 {
97
+ L2: cache-controller@10138000 {
9798 compatible = "arm,pl310-cache";
9899 reg = <0x10138000 0x1000>;
99100 cache-unified;
....@@ -110,6 +111,13 @@
110111 reg = <0x1013c200 0x20>;
111112 interrupts = <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_EDGE_RISING)>;
112113 clocks = <&cru CORE_PERI>;
114
+ status = "disabled";
115
+ /* The clock source and the sched_clock provided by the arm_global_timer
116
+ * on Rockchip rk3066a/rk3188 are quite unstable because their rates
117
+ * depend on the CPU frequency.
118
+ * Keep the arm_global_timer disabled in order to have the
119
+ * DW_APB_TIMER (rk3066a) or ROCKCHIP_TIMER (rk3188) selected by default.
120
+ */
113121 };
114122
115123 local_timer: local-timer@1013c600 {
....@@ -147,6 +155,46 @@
147155 clock-names = "baudclk", "apb_pclk";
148156 clocks = <&cru SCLK_UART1>, <&cru PCLK_UART1>;
149157 status = "disabled";
158
+ };
159
+
160
+ qos_gpu: qos@1012d000 {
161
+ compatible = "syscon";
162
+ reg = <0x1012d000 0x20>;
163
+ };
164
+
165
+ qos_vpu: qos@1012e000 {
166
+ compatible = "syscon";
167
+ reg = <0x1012e000 0x20>;
168
+ };
169
+
170
+ qos_lcdc0: qos@1012f000 {
171
+ compatible = "syscon";
172
+ reg = <0x1012f000 0x20>;
173
+ };
174
+
175
+ qos_cif0: qos@1012f080 {
176
+ compatible = "syscon";
177
+ reg = <0x1012f080 0x20>;
178
+ };
179
+
180
+ qos_ipp: qos@1012f100 {
181
+ compatible = "syscon";
182
+ reg = <0x1012f100 0x20>;
183
+ };
184
+
185
+ qos_lcdc1: qos@1012f180 {
186
+ compatible = "syscon";
187
+ reg = <0x1012f180 0x20>;
188
+ };
189
+
190
+ qos_cif1: qos@1012f200 {
191
+ compatible = "syscon";
192
+ reg = <0x1012f200 0x20>;
193
+ };
194
+
195
+ qos_rga: qos@1012f280 {
196
+ compatible = "syscon";
197
+ reg = <0x1012f280 0x20>;
150198 };
151199
152200 usb_otg: usb@10180000 {
....@@ -193,7 +241,7 @@
193241 status = "disabled";
194242 };
195243
196
- mmc0: dwmmc@10214000 {
244
+ mmc0: mmc@10214000 {
197245 compatible = "rockchip,rk2928-dw-mshc";
198246 reg = <0x10214000 0x1000>;
199247 interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
....@@ -207,7 +255,7 @@
207255 status = "disabled";
208256 };
209257
210
- mmc1: dwmmc@10218000 {
258
+ mmc1: mmc@10218000 {
211259 compatible = "rockchip,rk2928-dw-mshc";
212260 reg = <0x10218000 0x1000>;
213261 interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
....@@ -221,7 +269,7 @@
221269 status = "disabled";
222270 };
223271
224
- emmc: dwmmc@1021c000 {
272
+ emmc: mmc@1021c000 {
225273 compatible = "rockchip,rk2928-dw-mshc";
226274 reg = <0x1021c000 0x1000>;
227275 interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
....@@ -249,7 +297,7 @@
249297 compatible = "rockchip,rk3066-pmu", "syscon", "simple-mfd";
250298 reg = <0x20004000 0x100>;
251299
252
- reboot_mode: reboot-mode {
300
+ reboot-mode {
253301 compatible = "syscon-reboot-mode";
254302 offset = <0x40>;
255303 mode-normal = <BOOT_NORMAL>;