Merge git://git.denx.de/u-boot-usb

[oweals/u-boot.git] / arch / arm / dts / rk3288.dtsi

diff --git a/arch/arm/dts/rk3288.dtsi b/arch/arm/dts/rk3288.dtsi
index 2c8a616782bce1aa7306661ec6ebb8e3ec5405e1..866fc08215245eab36ad8bcdc30c459362361fd8 100644 (file)
--- a/arch/arm/dts/rk3288.dtsi
+++ b/arch/arm/dts/rk3288.dtsi
@@ -1,6 +1,4 @@
-/*
- * SPDX-License-Identifier:    GPL-2.0+
- */
+// SPDX-License-Identifier: GPL-2.0+
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/interrupt-controller/irq.h>
@@ -470,7 +468,6 @@
        };
 
        dmc: dmc@ff610000 {
-               u-boot,dm-pre-reloc;
                compatible = "rockchip,rk3288-dmc", "syscon";
                rockchip,cru = <&cru>;
                rockchip,grf = <&grf>;
@@ -586,13 +583,11 @@
        };
 
        pmu: power-management@ff730000 {
-               u-boot,dm-pre-reloc;
                compatible = "rockchip,rk3288-pmu", "syscon";
                reg = <0xff730000 0x100>;
        };
 
        sgrf: syscon@ff740000 {
-               u-boot,dm-pre-reloc;
                compatible = "rockchip,rk3288-sgrf", "syscon";
                reg = <0xff740000 0x1000>;
        };
@@ -601,7 +596,6 @@
                compatible = "rockchip,rk3288-cru";
                reg = <0xff760000 0x1000>;
                rockchip,grf = <&grf>;
-               u-boot,dm-pre-reloc;
                #clock-cells = <1>;
                #reset-cells = <1>;
                assigned-clocks = <&cru PLL_GPLL>, <&cru PLL_CPLL>,
@@ -617,7 +611,6 @@
        };
 
        grf: syscon@ff770000 {
-               u-boot,dm-pre-reloc;
                compatible = "rockchip,rk3288-grf", "syscon";
                reg = <0xff770000 0x1000>;
        };
@@ -651,6 +644,7 @@
                interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
                #address-cells = <1>;
                #size-cells = <0>;
+               #sound-dai-cells = <1>;
                dmas = <&dmac_bus_s 0>, <&dmac_bus_s 1>;
                dma-names = "tx", "rx";
                clock-names = "i2s_hclk", "i2s_clk";
@@ -661,7 +655,6 @@
        };
 
        vopb: vop@ff930000 {
-               u-boot,dm-pre-reloc;
                compatible = "rockchip,rk3288-vop";
                reg = <0xff930000 0x19c>;
                interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
@@ -716,7 +709,6 @@
                iommus = <&vopl_mmu>;
                power-domains = <&power RK3288_PD_VIO>;
                status = "disabled";
-               u-boot,dm-pre-reloc;
                vopl_out: port {
                        #address-cells = <1>;
                        #size-cells = <0>;
@@ -843,8 +835,6 @@
                #size-cells = <0>;
                status = "disabled";
                ports {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
                        reg = <1>;
                        mipi_in: port {
                                #address-cells = <1>;
@@ -914,7 +904,6 @@
        };
 
        noc: syscon@ffac0000 {
-               u-boot,dm-pre-reloc;
                compatible = "rockchip,rk3288-noc", "syscon";
                reg = <0xffac0000 0x2000>;
        };