Skip to content
Snippets Groups Projects
Commit 342d46cc authored by Alessandro Pecugi's avatar Alessandro Pecugi
Browse files

[E09][DTS] remove assignment of drm planes to video ports

Do not assign vop2 planes to vp0/vp1 in the dts.

Because all planes have to be assigned to a video port (otherwise some video ports stop working),
this creates conflicts between overlays and they cannot be applied together.

After df3d7e53, the driver automatically assigns
the correct planes to the video ports that are currently enabled, so this commit
remove the assignment from the dts overlays.
parent 8de8d624
No related branches found
No related tags found
No related merge requests found
...@@ -224,21 +224,6 @@ __overlay__ { ...@@ -224,21 +224,6 @@ __overlay__ {
}; };
}; };
fragment@9 {
target = <&vp0>;
__overlay__ {
rockchip,plane-mask = <(
1 << ROCKCHIP_VOP2_CLUSTER1 |
1 << ROCKCHIP_VOP2_ESMART1 |
1 << ROCKCHIP_VOP2_SMART1 |
1 << ROCKCHIP_VOP2_CLUSTER0 |
1 << ROCKCHIP_VOP2_ESMART0 |
1 << ROCKCHIP_VOP2_SMART0
)>;
rockchip,primary-plane = <ROCKCHIP_VOP2_SMART0>;
};
};
/* __________________________________________________________________________ /* __________________________________________________________________________
* | | * | |
* | BACKLIGHT PWM | * | BACKLIGHT PWM |
......
...@@ -70,17 +70,4 @@ __overlay__ { ...@@ -70,17 +70,4 @@ __overlay__ {
status = "okay"; status = "okay";
}; };
}; };
fragment@5 {
target = <&vp1>;
__overlay__ {
rockchip,plane-mask = <(
1 << ROCKCHIP_VOP2_CLUSTER1 |
1 << ROCKCHIP_VOP2_ESMART1 |
1 << ROCKCHIP_VOP2_CLUSTER0 |
1 << ROCKCHIP_VOP2_ESMART0
)>;
rockchip,primary-plane = <ROCKCHIP_VOP2_ESMART0>;
};
};
}; };
...@@ -318,19 +318,6 @@ __overlay__ { ...@@ -318,19 +318,6 @@ __overlay__ {
}; };
}; };
fragment@10 {
target = <&vp1>;
__overlay__ {
rockchip,plane-mask = <(
1 << ROCKCHIP_VOP2_CLUSTER1 |
1 << ROCKCHIP_VOP2_ESMART1 |
1 << ROCKCHIP_VOP2_CLUSTER0 |
1 << ROCKCHIP_VOP2_ESMART0
)>;
rockchip,primary-plane = <ROCKCHIP_VOP2_ESMART0>;
};
};
fragment@11 { fragment@11 {
target = <&pwm13>; target = <&pwm13>;
__overlay__ { __overlay__ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment