Merge tag 'block-5.14-2021-08-07' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / arch / arm / boot / dts / rk3066a.dtsi

diff --git a/arch/arm/boot/dts/rk3066a.dtsi b/arch/arm/boot/dts/rk3066a.dtsi
index 30dcf55..f5a665b 100644 (file)
--- a/arch/arm/boot/dts/rk3066a.dtsi
+++ b/arch/arm/boot/dts/rk3066a.dtsi
@@ -217,7 +217,7 @@
                                       <150000000>, <75000000>;
        };
 
-       timer@2000e000 {
+       timer2: timer@2000e000 {
                compatible = "snps,dw-apb-timer-osc";
                reg = <0x2000e000 0x100>;
                interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
@@ -238,7 +238,7 @@
                };
        };
 
-       timer@20038000 {
+       timer0: timer@20038000 {
                compatible = "snps,dw-apb-timer-osc";
                reg = <0x20038000 0x100>;
                interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;
@@ -246,7 +246,7 @@
                clock-names = "timer", "pclk";
        };
 
-       timer@2003a000 {
+       timer1: timer@2003a000 {
                compatible = "snps,dw-apb-timer-osc";
                reg = <0x2003a000 0x100>;
                interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
@@ -684,7 +684,6 @@
        usbphy: usbphy {
                compatible = "rockchip,rk3066a-usb-phy",
                             "rockchip,rk3288-usb-phy";
-               #phy-cells = <0>;
                #address-cells = <1>;
                #size-cells = <0>;
                status = "disabled";
@@ -869,6 +868,10 @@
        pinctrl-0 = <&uart3_xfer>;
 };
 
+&vpu {
+       power-domains = <&power RK3066_PD_VIDEO>;
+};
+
 &wdt {
        compatible = "rockchip,rk3066-wdt", "snps,dw-wdt";
 };