Skip to content

Commit

Permalink
Merge pull request torvalds#181 from vamrs-feng/linux-5.10-gen-rkr4.1
Browse files Browse the repository at this point in the history
Changes:
  * Radxa CM3: Enable dmc.
  * Radxa CM3: Remove hardware cursor configuration.

Signed-off-by: Stephen Chen <[email protected]>
  • Loading branch information
RadxaStephen authored Aug 18, 2023
2 parents e9623f2 + eed0317 commit 2c36347
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 10 deletions.
9 changes: 0 additions & 9 deletions arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3-io.dts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
/dts-v1/;

#include "rk3566-radxa-cm3.dtsi"
#include <dt-bindings/display/rockchip_vop.h>

/ {
model = "Radxa Compute Module 3(CM3) IO Board";
Expand Down Expand Up @@ -138,14 +137,6 @@
connect = <&vp0_out_hdmi>;
};

&vp0 {
cursor-win-id = <ROCKCHIP_VOP2_CLUSTER0>;
};

&vp1 {
cursor-win-id = <ROCKCHIP_VOP2_CLUSTER1>;
};

&sdmmc0 {
max-frequency = <150000000>;
supports-sd;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@

&dmc {
center-supply = <&vdd_logic>;
status = "disabled";
status = "okay";
};

&rkcif {
Expand Down

0 comments on commit 2c36347

Please sign in to comment.