Merge tag 'amlogic-fixes' into v5.9/dt64

[linux-2.6-microblaze.git] / arch / arm64 / boot / dts / amlogic / meson-gxl.dtsi

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
index 6c8b189..c3ac531 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
@@ -131,8 +131,9 @@
 &ethmac {
        clocks = <&clkc CLKID_ETH>,
                 <&clkc CLKID_FCLK_DIV2>,
-                <&clkc CLKID_MPLL2>;
-       clock-names = "stmmaceth", "clkin0", "clkin1";
+                <&clkc CLKID_MPLL2>,
+                <&clkc CLKID_FCLK_DIV2>;
+       clock-names = "stmmaceth", "clkin0", "clkin1", "timing-adjustment";
 
        mdio0: mdio {
                #address-cells = <1>;
@@ -787,7 +788,7 @@
        };
 };
 
-&pwrc_vpu {
+&pwrc {
        resets = <&reset RESET_VIU>,
                 <&reset RESET_VENC>,
                 <&reset RESET_VCBUS>,
@@ -800,6 +801,9 @@
                 <&reset RESET_VDI6>,
                 <&reset RESET_VENCL>,
                 <&reset RESET_VID_LOCK>;
+       reset-names = "viu", "venc", "vcbus", "bt656",
+                     "dvin", "rdma", "venci", "vencp",
+                     "vdac", "vdi6", "vencl", "vid_lock";
        clocks = <&clkc CLKID_VPU>,
                 <&clkc CLKID_VAPB>;
        clock-names = "vpu", "vapb";
@@ -906,7 +910,7 @@
 
 &vpu {
        compatible = "amlogic,meson-gxl-vpu", "amlogic,meson-gx-vpu";
-       power-domains = <&pwrc_vpu>;
+       power-domains = <&pwrc PWRC_GXBB_VPU_ID>;
 };
 
 &vdec {