.. | .. |
---|
42 | 42 | }; |
---|
43 | 43 | |
---|
44 | 44 | hdmi_sound: hdmi-sound { |
---|
| 45 | + compatible = "simple-audio-card"; |
---|
| 46 | + simple-audio-card,format = "i2s"; |
---|
| 47 | + simple-audio-card,mclk-fs = <128>; |
---|
| 48 | + simple-audio-card,name = "hdmi-sound"; |
---|
45 | 49 | status = "okay"; |
---|
46 | | - compatible = "rockchip,hdmi"; |
---|
47 | | - rockchip,mclk-fs = <128>; |
---|
48 | | - rockchip,card-name = "rockchip-hdmi0"; |
---|
49 | | - rockchip,cpu = <&i2s0_8ch>; |
---|
50 | | - rockchip,codec = <&hdmi>; |
---|
51 | | - rockchip,jack-det; |
---|
| 50 | + |
---|
| 51 | + simple-audio-card,cpu { |
---|
| 52 | + sound-dai = <&i2s0_8ch>; |
---|
| 53 | + }; |
---|
| 54 | + simple-audio-card,codec { |
---|
| 55 | + sound-dai = <&hdmi>; |
---|
| 56 | + }; |
---|
52 | 57 | }; |
---|
53 | 58 | |
---|
54 | | - spdif_sound: spdif-sound { |
---|
| 59 | + reserved-memory { |
---|
| 60 | + #address-cells = <2>; |
---|
| 61 | + #size-cells = <2>; |
---|
| 62 | + ranges; |
---|
| 63 | + |
---|
| 64 | + rknpu_reserved: rknpu { |
---|
| 65 | + compatible = "shared-dma-pool"; |
---|
| 66 | + inactive; |
---|
| 67 | + reusable; |
---|
| 68 | + size = <0x0 0x20000000>; |
---|
| 69 | + alignment = <0x0 0x1000>; |
---|
| 70 | + }; |
---|
| 71 | + }; |
---|
| 72 | + |
---|
| 73 | + spdif-sound { |
---|
55 | 74 | status = "okay"; |
---|
56 | 75 | compatible = "simple-audio-card"; |
---|
57 | | - simple-audio-card,name = "ROCKCHIP-SPDIF"; |
---|
| 76 | + simple-audio-card,name = "ROCKCHIP,SPDIF"; |
---|
| 77 | + simple-audio-card,mclk-fs = <128>; |
---|
58 | 78 | simple-audio-card,cpu { |
---|
59 | 79 | sound-dai = <&spdif_8ch>; |
---|
60 | 80 | }; |
---|
.. | .. |
---|
239 | 259 | status = "okay"; |
---|
240 | 260 | |
---|
241 | 261 | vdd_cpu: tcs4525@1c { |
---|
242 | | - compatible = "tcs,tcs452x"; |
---|
| 262 | + compatible = "tcs,tcs4525"; |
---|
243 | 263 | reg = <0x1c>; |
---|
244 | 264 | vin-supply = <&vcc5v0_sys>; |
---|
245 | 265 | regulator-compatible = "fan53555-reg"; |
---|
.. | .. |
---|
326 | 346 | }; |
---|
327 | 347 | |
---|
328 | 348 | &rknpu { |
---|
| 349 | + memory-region = <&rknpu_reserved>; |
---|
329 | 350 | rknpu-supply = <&vdd_npu>; |
---|
330 | 351 | status = "okay"; |
---|
331 | 352 | }; |
---|
332 | 353 | |
---|
333 | 354 | &rknpu_mmu { |
---|
334 | | - status = "okay"; |
---|
| 355 | + status = "disabled"; |
---|
335 | 356 | }; |
---|
336 | 357 | |
---|
337 | 358 | &rkvdec { |
---|
.. | .. |
---|
368 | 389 | |
---|
369 | 390 | &sdhci { |
---|
370 | 391 | bus-width = <8>; |
---|
371 | | - supports-emmc; |
---|
| 392 | + no-sdio; |
---|
| 393 | + no-sd; |
---|
372 | 394 | non-removable; |
---|
373 | 395 | status = "okay"; |
---|
374 | 396 | }; |
---|
375 | 397 | |
---|
376 | 398 | &sfc { |
---|
377 | 399 | status = "okay"; |
---|
| 400 | + |
---|
| 401 | + flash@0 { |
---|
| 402 | + compatible = "spi-nand"; |
---|
| 403 | + reg = <0>; |
---|
| 404 | + spi-max-frequency = <75000000>; |
---|
| 405 | + spi-rx-bus-width = <4>; |
---|
| 406 | + spi-tx-bus-width = <1>; |
---|
| 407 | + }; |
---|
378 | 408 | }; |
---|
379 | 409 | |
---|
380 | 410 | &spdif_8ch { |
---|