Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix HDMI resolutions #232

Merged
merged 2 commits into from
Sep 1, 2024
Merged

Fix HDMI resolutions #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c75da59
Revert "arm64: dts: rockchip: rk3588: remove unused hdptxphy_hdmi_clk…
efectn Aug 31, 2024
351fa74
arm64: dts: rockchip: rk3588: replace hdptxphy_hdmi_clk{0,1} to hdptx…
efectn Aug 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions arch/arm64/boot/dts/rockchip/rk3588-blueberry.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,11 @@
mem-supply = <&vdd_cpu_big1_mem_s0>;
};

&display_subsystem {
clocks = <&hdptxphy_hdmi0>, <&hdptxphy_hdmi1>;
clock-names = "hdmi0_phy_pll", "hdmi1_phy_pll";
};

&gpu_opp_table {
/delete-node/ opp-198000000;
/delete-node/ opp-297000000;
Expand All @@ -147,6 +152,14 @@
status = "okay";
};

&hdptxphy_hdmi0 {
status = "okay";
};

&hdptxphy_hdmi1 {
status = "okay";
};

&iep {
status = "okay";
};
Expand Down
15 changes: 14 additions & 1 deletion arch/arm64/boot/dts/rockchip/rk3588-firefly-itx-3588j.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,11 @@
mem-supply = <&vdd_cpu_big1_mem_s0>;
};

&display_subsystem {
clocks = <&hdptxphy_hdmi0>, <&hdptxphy_hdmi1>;
clock-names = "hdmi0_phy_pll", "hdmi1_phy_pll";
};

&dp0 {
status = "okay";
};
Expand Down Expand Up @@ -598,6 +603,14 @@
status = "okay";
};

&hdptxphy_hdmi0 {
status = "okay";
};

&hdptxphy_hdmi1 {
status = "okay";
};

&route_hdmi1{
status = "okay";
connect = <&vp1_out_hdmi1>;
Expand Down Expand Up @@ -1400,4 +1413,4 @@
regulator-on-in-suspend;
regulator-suspend-microvolt = <1800000>;
};
};
};
2 changes: 2 additions & 0 deletions arch/arm64/boot/dts/rockchip/rk3588-fxblox-rk1.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,6 +640,8 @@
};

&display_subsystem {
clocks = <&hdptxphy_hdmi0>, <&hdptxphy_hdmi1>;
clock-names = "hdmi0_phy_pll", "hdmi1_phy_pll";
route {
route_dp0: route-dp0 {
status = "ok";
Expand Down
13 changes: 13 additions & 0 deletions arch/arm64/boot/dts/rockchip/rk3588-mixtile-core3588e.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,6 +561,19 @@
cursor-win-id = <ROCKCHIP_VOP2_ESMART3>;
};

&display_subsystem {
clocks = <&hdptxphy_hdmi0>;
clock-names = "hdmi0_phy_pll";
};

&hdptxphy_hdmi0 {
status = "okay";
};

&hdptxphy_hdmi0 {
status = "okay";
};

&combphy0_ps {
status = "okay";
};
Expand Down
7 changes: 7 additions & 0 deletions arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,3 +717,10 @@
/delete-property/ enable-active-high;
gpio = <&gpio4 RK_PA5 GPIO_ACTIVE_LOW>;
};


&display_subsystem {
clocks = <&hdptxphy_hdmi0>, <&hdptxphy_hdmi1>;
clock-names = "hdmi0_phy_pll", "hdmi1_phy_pll";
};

13 changes: 13 additions & 0 deletions arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,11 @@
status = "okay";
};

&display_subsystem {
clocks = <&hdptxphy_hdmi0>, <&hdptxphy_hdmi1>;
clock-names = "hdmi0_phy_pll", "hdmi1_phy_pll";
};

&dp0 {
status = "okay";
};
Expand Down Expand Up @@ -480,6 +485,14 @@
status = "okay";
};

&hdptxphy_hdmi0 {
status = "okay";
};

&hdptxphy_hdmi1 {
status = "okay";
};

&iep {
status = "okay";
};
Expand Down
13 changes: 13 additions & 0 deletions arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,6 +587,19 @@
status = "okay";
};

&display_subsystem {
clocks = <&hdptxphy_hdmi0>, <&hdptxphy_hdmi1>;
clock-names = "hdmi0_phy_pll", "hdmi1_phy_pll";
};

&hdptxphy_hdmi0 {
status = "okay";
};

&hdptxphy_hdmi1 {
status = "okay";
};

&hdmi1 {
status = "okay";
pinctrl-names = "default";
Expand Down
11 changes: 11 additions & 0 deletions arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,9 @@
};

&display_subsystem {
clocks = <&hdptxphy_hdmi0>, <&hdptxphy_hdmi1>;
clock-names = "hdmi0_phy_pll", "hdmi1_phy_pll";

route {
route_hdmi0: route-hdmi0 {
status = "okay";
Expand All @@ -654,6 +657,14 @@
};
};

&hdptxphy_hdmi0 {
status = "okay";
};

&hdptxphy_hdmi1 {
status = "okay";
};

&hdmi0 {
status = "okay";
cec-enable = "true";
Expand Down
9 changes: 9 additions & 0 deletions arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,6 +664,15 @@
cursor-win-id = <ROCKCHIP_VOP2_ESMART3>;
};

&display_subsystem {
clocks = <&hdptxphy_hdmi0>;
clock-names = "hdmi0_phy_pll";
};

&hdptxphy_hdmi0 {
status = "okay";
};

&uart9 {
pinctrl-0 = <&uart9m0_xfer>;
status = "okay";
Expand Down
5 changes: 5 additions & 0 deletions arch/arm64/boot/dts/rockchip/rk3588s-9tripod-linux.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,11 @@
status = "okay";
};

&display_subsystem {
clocks = <&hdptxphy_hdmi0>;
clock-names = "hdmi0_phy_pll";
};

&dmc {
center-supply = <&vdd_ddr_s0>;
mem-supply = <&vdd_log_s0>;
Expand Down
9 changes: 9 additions & 0 deletions arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -994,6 +994,15 @@
cursor-win-id = <ROCKCHIP_VOP2_ESMART3>;
};

&display_subsystem {
clocks = <&hdptxphy_hdmi0>;
clock-names = "hdmi0_phy_pll";
};

&hdptxphy_hdmi0 {
status = "okay";
};

&tsadc {
status = "okay";
};
Expand Down
9 changes: 9 additions & 0 deletions arch/arm64/boot/dts/rockchip/rk3588s-lubancat-4.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1502,6 +1502,15 @@
cursor-win-id = <ROCKCHIP_VOP2_CLUSTER3>;
};

&display_subsystem {
clocks = <&hdptxphy_hdmi0>;
clock-names = "hdmi0_phy_pll";
};

&hdptxphy_hdmi0 {
status = "okay";
};

&pinctrl {
hym8563 {
hym8563_int: hym8563-int {
Expand Down
5 changes: 5 additions & 0 deletions arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6-common.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -713,3 +713,8 @@
&wdt {
status = "okay";
};

&display_subsystem {
clocks = <&hdptxphy_hdmi0>;
clock-names = "hdmi0_phy_pll";
};
5 changes: 5 additions & 0 deletions arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5-pro.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,6 +534,11 @@
rockchip,primary-plane = <ROCKCHIP_VOP2_CLUSTER3>;
};

&display_subsystem {
clocks = <&hdptxphy_hdmi0>;
clock-names = "hdmi0_phy_pll";
};

&cpu_l0 {
cpu-supply = <&vdd_cpu_lit_s0>;
mem-supply = <&vdd_cpu_lit_mem_s0>;
Expand Down
8 changes: 7 additions & 1 deletion arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,12 @@
status = "okay";
};

/* Fix tty terminal out of screen, and most dclk of resolutions was not supported in hdmiphy clock from parent clock by default */
&display_subsystem {
clocks = <&hdptxphy_hdmi0>;
clock-names = "hdmi0_phy_pll";
};

&dp0 {
status = "okay";
};
Expand Down Expand Up @@ -1156,4 +1162,4 @@
cursor-win-id=<ROCKCHIP_VOP2_ESMART3>;
rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER3 | 1 << ROCKCHIP_VOP2_ESMART3)>;
rockchip,primary-plane = <ROCKCHIP_VOP2_CLUSTER3>;
};
};
9 changes: 9 additions & 0 deletions arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5-io.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,15 @@
cursor-win-id = <ROCKCHIP_VOP2_ESMART3>;
};

&display_subsystem {
clocks = <&hdptxphy_hdmi0>;
clock-names = "hdmi0_phy_pll";
};

&hdptxphy_hdmi0 {
status = "okay";
};

&pinctrl {

usb {
Expand Down
9 changes: 9 additions & 0 deletions arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5-rpi-cm4-io.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,15 @@
cursor-win-id = <ROCKCHIP_VOP2_ESMART3>;
};

&display_subsystem {
clocks = <&hdptxphy_hdmi0>;
clock-names = "hdmi0_phy_pll";
};

&hdptxphy_hdmi0 {
status = "okay";
};

&i2c7 {
status = "okay";
pinctrl-names = "default";
Expand Down
9 changes: 9 additions & 0 deletions arch/arm64/boot/dts/rockchip/rk3588s-radxa-e52c.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,15 @@
cursor-win-id = <ROCKCHIP_VOP2_ESMART3>;
};

&display_subsystem {
clocks = <&hdptxphy_hdmi0>;
clock-names = "hdmi0_phy_pll";
};

&hdptxphy_hdmi0 {
status = "okay";
};

/* USB */

&u2phy0 {
Expand Down
9 changes: 9 additions & 0 deletions arch/arm64/boot/dts/rockchip/rk3588s-radxa-nx5-io.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,15 @@
cursor-win-id = <ROCKCHIP_VOP2_ESMART3>;
};

&display_subsystem {
clocks = <&hdptxphy_hdmi0>;
clock-names = "hdmi0_phy_pll";
};

&hdptxphy_hdmi0 {
status = "okay";
};

&sdmmc {
no-sdio;
no-mmc;
Expand Down
9 changes: 9 additions & 0 deletions arch/arm64/boot/dts/rockchip/rk3588s-roc-pc.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,11 @@
mem-supply = <&vdd_cpu_big1_mem_s0>;
};

&display_subsystem {
clocks = <&hdptxphy_hdmi0>;
clock-names = "hdmi0_phy_pll";
};

&dp0 {
status = "okay";
};
Expand Down Expand Up @@ -378,6 +383,10 @@
status = "okay";
};

&hdptxphy_hdmi0 {
status = "okay";
};

&i2c0 {
status = "okay";
pinctrl-0 = <&i2c0m2_xfer>;
Expand Down
9 changes: 9 additions & 0 deletions arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,6 +541,15 @@
cursor-win-id = <ROCKCHIP_VOP2_ESMART3>;
};

&display_subsystem {
clocks = <&hdptxphy_hdmi0>;
clock-names = "hdmi0_phy_pll";
};

&hdptxphy_hdmi0 {
status = "okay";
};

/* USB */

&usb_host0_ehci {
Expand Down
9 changes: 9 additions & 0 deletions arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,15 @@
rockchip,primary-plane = <ROCKCHIP_VOP2_ESMART3>;
};

&display_subsystem {
clocks = <&hdptxphy_hdmi0>;
clock-names = "hdmi0_phy_pll";
};

&hdptxphy_hdmi0 {
status = "okay";
};

/* USB */

&usb_host0_ehci {
Expand Down