From e6a6f982d0a7f09370a6f62d6d53cdc952699d61 Mon Sep 17 00:00:00 2001 From: mahdichi Date: Sun, 24 Dec 2023 18:47:52 +0330 Subject: [PATCH 1/2] rk3588-fxblox-rk1a dd edp and user leds to dts --- .../boot/dts/rockchip/rk3588-fxblox-rk1.dts | 98 +++++++++++++++++-- 1 file changed, 91 insertions(+), 7 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-fxblox-rk1.dts b/arch/arm64/boot/dts/rockchip/rk3588-fxblox-rk1.dts index 35b5a3150bc2e..07aad20beb207 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-fxblox-rk1.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-fxblox-rk1.dts @@ -205,7 +205,18 @@ led_blue { gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>; default-state = "off"; - }; + }; + + user-led1 { + gpios = <&gpio4 RK_PA1 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "heartbeat"; + default-state = "on"; + }; + + user-led2 { + gpios = <&gpio4 RK_PA0 GPIO_ACTIVE_HIGH>; + default-state = "off"; + }; }; fan0: pwm-fan { @@ -215,6 +226,39 @@ cooling-levels = <90 110 130 150 170 190 210 230 255>; pwms = <&pwm1 0 10000 0>; }; + + panel-edp0 { + compatible = "simple-panel"; + prepare-delay-ms = <120>; + enable-delay-ms = <120>; + unprepare-delay-ms = <120>; + disable-delay-ms = <120>; + width-mm = <129>; + height-mm = <171>; + + panel-timing { + clock-frequency = <148500000>; + hactive = <1920>; + vactive = <1080>; + hfront-porch = <88>; + hsync-len = <44>; + hback-porch = <148>; + vfront-porch = <4>; + vsync-len = <5>; + vback-porch = <36>; + hsync-active = <0>; + vsync-active = <0>; + de-active = <0>; + pixelclk-active = <0>; + }; + + port { + panel_in_edp0: endpoint { + data-lanes = <2>; + remote-endpoint = <&edp0_out_panel>; + }; + }; + }; }; &av1d { @@ -597,8 +641,8 @@ &display_subsystem { clocks = <&hdptxphy_hdmi_clk0>, <&hdptxphy_hdmi_clk1>; - clock-names = "hdmi0_phy_pll", "hdmi1_phy_pll"; - + clock-names = "hdmi0_phy_pll", "hdmi1_phy_pll"; + route { route_dp0: route-dp0 { status = "ok"; @@ -615,8 +659,17 @@ logo,kernel = "logo_kernel.bmp"; logo,mode = "center"; charge_logo,mode = "center"; - connect = <&vp2_out_dp1>; - }; + connect = <&vp1_out_dp1>; + }; + + route_edp0: route-edp0 { + status = "ok"; + logo,uboot = "logo.bmp"; + logo,kernel = "logo_kernel.bmp"; + logo,mode = "center"; + charge_logo,mode = "center"; + connect = <&vp2_out_edp0>; + }; }; }; @@ -1030,7 +1083,7 @@ status = "okay"; }; -&dp1_in_vp2 { +&dp1_in_vp1 { status = "okay"; }; @@ -1041,7 +1094,7 @@ &route_dp1 { status = "okay"; - connect = <&vp2_out_dp1>; + connect = <&vp1_out_dp1>; }; &spdif_tx2 { @@ -1255,3 +1308,34 @@ }; }; + +&edp0 { + force-hpd; + status = "okay"; + + ports { + port@1 { + reg = <1>; + edp0_out_panel: endpoint { + remote-endpoint = <&panel_in_edp0>; + }; + }; + }; +}; + + +&edp0_in_vp2 { + status = "okay"; +}; + +&hdptxphy0 { + status = "okay"; +}; + +&spdif_tx3 { + status = "okay"; +}; + +&hdptxphy0 { + status = "okay"; +}; \ No newline at end of file From 5b1cd718285a8a8600559a747ecd2984fc0f722b Mon Sep 17 00:00:00 2001 From: Mahdi Changani Date: Mon, 25 Dec 2023 19:53:39 -0800 Subject: [PATCH 2/2] Update rk3588-fxblox-rk1.dts --- arch/arm64/boot/dts/rockchip/rk3588-fxblox-rk1.dts | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-fxblox-rk1.dts b/arch/arm64/boot/dts/rockchip/rk3588-fxblox-rk1.dts index 07aad20beb207..dcaff704f12f0 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-fxblox-rk1.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-fxblox-rk1.dts @@ -206,7 +206,7 @@ gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - + user-led1 { gpios = <&gpio4 RK_PA1 GPIO_ACTIVE_HIGH>; linux,default-trigger = "heartbeat"; @@ -641,8 +641,7 @@ &display_subsystem { clocks = <&hdptxphy_hdmi_clk0>, <&hdptxphy_hdmi_clk1>; - clock-names = "hdmi0_phy_pll", "hdmi1_phy_pll"; - + clock-names = "hdmi0_phy_pll", "hdmi1_phy_pll"; route { route_dp0: route-dp0 { status = "ok"; @@ -1308,7 +1307,6 @@ }; }; - &edp0 { force-hpd; status = "okay"; @@ -1338,4 +1336,4 @@ &hdptxphy0 { status = "okay"; -}; \ No newline at end of file +};