Skip to content

Commit

Permalink
Merge pull request JustEnoughLinuxOS#3034 from r3claimer/dev
Browse files Browse the repository at this point in the history 
RK3588: work on hdmi, fix brightness table for Ace
  • Loading branch information
@r3claimer
r3claimer committed Mar 12, 2024
2 parents ad0dd72 + 2a9afb7 commit dff961a
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 46 deletions.
37 changes: 20 additions & 17 deletions projects/Rockchip/devices/RK3588/linux/linux.aarch64.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4171,7 +4171,7 @@ CONFIG_VIDEO_ROCKCHIP_ISPP=y
# CONFIG_VIDEO_ROCKCHIP_ISPP_VERSION_V10 is not set
CONFIG_VIDEO_ROCKCHIP_ISPP_VERSION_V20=y
CONFIG_VIDEO_ROCKCHIP_HDMIRX_CLASS=y
# CONFIG_VIDEO_ROCKCHIP_HDMIRX is not set
CONFIG_VIDEO_ROCKCHIP_HDMIRX=y
# CONFIG_VIDEO_XILINX is not set
CONFIG_V4L_MEM2MEM_DRIVERS=y
# CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
Expand Down Expand Up @@ -4709,24 +4709,22 @@ CONFIG_DVB_SP2=m
#
# CONFIG_VGA_ARB is not set
CONFIG_DRM=y
# CONFIG_DRM_EDID is not set
CONFIG_DRM_EDID=y
# CONFIG_DRM_IGNORE_IOTCL_PERMIT is not set
CONFIG_DRM_MIPI_DSI=y
# CONFIG_DRM_DP is not set
# CONFIG_DRM_DP_AUX_CHARDEV is not set
CONFIG_DRM_DP=y
CONFIG_DRM_DP_AUX_CHARDEV=y
# CONFIG_DRM_DEBUG_MM is not set
# CONFIG_DRM_DEBUG_SELFTEST is not set
CONFIG_DRM_KMS_HELPER=y
CONFIG_DRM_KMS_FB_HELPER=y
# CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
CONFIG_DRM_FBDEV_EMULATION=y
CONFIG_DRM_FBDEV_OVERALLOC=200
CONFIG_DRM_FBDEV_OVERALLOC=100
# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
# CONFIG_DRM_DP_CEC is not set
CONFIG_DRM_GEM_CMA_HELPER=y
CONFIG_DRM_KMS_CMA_HELPER=y
CONFIG_DRM_GEM_SHMEM_HELPER=y
CONFIG_DRM_SCHED=y

#
# I2C encoder or helper chips
Expand All @@ -4751,23 +4749,23 @@ CONFIG_DRM_MALI_DISPLAY=y
# CONFIG_DRM_VGEM is not set
# CONFIG_DRM_VKMS is not set
CONFIG_DRM_ROCKCHIP=y
CONFIG_ROCKCHIP_DRM_DEBUG=y
# CONFIG_ROCKCHIP_DRM_DEBUG is not set
# CONFIG_ROCKCHIP_DRM_DIRECT_SHOW is not set
CONFIG_ROCKCHIP_VOP=y
CONFIG_ROCKCHIP_VOP2=y
# CONFIG_ROCKCHIP_ANALOGIX_DP is not set
# CONFIG_ROCKCHIP_CDN_DP is not set
CONFIG_ROCKCHIP_ANALOGIX_DP=y
CONFIG_ROCKCHIP_CDN_DP=y
# CONFIG_ROCKCHIP_DRM_TVE is not set
# CONFIG_ROCKCHIP_DW_HDMI is not set
CONFIG_ROCKCHIP_DW_HDMI=y
CONFIG_ROCKCHIP_DW_MIPI_DSI=y
# CONFIG_ROCKCHIP_DW_DP is not set
# CONFIG_ROCKCHIP_INNO_HDMI is not set
CONFIG_ROCKCHIP_DW_DP=y
CONFIG_ROCKCHIP_INNO_HDMI=y
CONFIG_ROCKCHIP_LVDS=y
CONFIG_ROCKCHIP_RGB=y
# CONFIG_ROCKCHIP_RK3066_HDMI is not set
# CONFIG_ROCKCHIP_VCONN is not set
# CONFIG_DRM_ROCKCHIP_VVOP is not set
CONFIG_ROCKCHIP_DW_HDCP2=y
CONFIG_ROCKCHIP_DW_HDCP2=m
# CONFIG_DRM_UDL is not set
# CONFIG_DRM_AST is not set
# CONFIG_DRM_MGAG200 is not set
Expand Down Expand Up @@ -4847,7 +4845,7 @@ CONFIG_DRM_PANEL_BRIDGE=y
#
# CONFIG_DRM_CDNS_DSI is not set
# CONFIG_DRM_CHRONTEL_CH7033 is not set
# CONFIG_DRM_DISPLAY_CONNECTOR is not set
CONFIG_DRM_DISPLAY_CONNECTOR=y
# CONFIG_DRM_ITE_IT6161 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
# CONFIG_DRM_LVDS_CODEC is not set
Expand Down Expand Up @@ -4875,8 +4873,13 @@ CONFIG_DRM_PANEL_BRIDGE=y
# CONFIG_DRM_TI_TPD12S015 is not set
# CONFIG_DRM_ANALOGIX_ANX6345 is not set
# CONFIG_DRM_ANALOGIX_ANX78XX is not set
CONFIG_DRM_ANALOGIX_DP=y
# CONFIG_DRM_I2C_ADV7511 is not set
# CONFIG_DRM_CDNS_MHDP8546 is not set
CONFIG_DRM_DW_HDMI=y
# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
CONFIG_DRM_DW_HDMI_I2S_AUDIO=y
CONFIG_DRM_DW_HDMI_CEC=y
CONFIG_DRM_DW_MIPI_DSI=y
# end of Display Interface Bridges

Expand Down
52 changes: 23 additions & 29 deletions projects/Rockchip/patches/linux/RK3588/000-gameforce-ace.patch
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/Makefile linux/arch/arm64/boot/dts/rockchip/Makefile
--- linux.orig/arch/arm64/boot/dts/rockchip/Makefile 2024-03-06 16:57:38.191015550 +0000
+++ linux/arch/arm64/boot/dts/rockchip/Makefile 2024-03-06 16:59:03.441724317 +0000
@@ -285,6 +285,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-e
--- linux.orig/arch/arm64/boot/dts/rockchip/Makefile 2024-03-12 19:48:42.910728919 +0000
+++ linux/arch/arm64/boot/dts/rockchip/Makefile 2024-03-12 19:49:37.876527225 +0000
@@ -313,6 +313,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-e
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-evb4-lp4x-v10-linux.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-evb8-lp4x-v10.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-9tripod-linux.dtb
Expand All @@ -11,8 +11,8 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/Makefile linux/arch/arm64/boo
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-nanopi-r6c.dtb
diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dts linux/arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dts
--- linux.orig/arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dts 1970-01-01 00:00:00.000000000 +0000
+++ linux/arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dts 2024-03-06 16:58:28.748621788 +0000
@@ -0,0 +1,1409 @@
+++ linux/arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dts 2024-03-12 19:56:53.872819527 +0000
@@ -0,0 +1,1403 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2021 Rockchip Electronics Co., Ltd.
Expand Down Expand Up @@ -64,7 +64,6 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dts lin
+ status = "okay";
+
+ joypad-name = "GameForce ACE Gamepad";
+ //joypad-vendor = <0x045e>;
+ joypad-product = <0x1000>;
+ joypad-revision = <0x0100>;
+
Expand Down Expand Up @@ -196,7 +195,6 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dts lin
+ pwm_fan: pwm-fan {
+ compatible = "pwm-fan";
+ #cooling-cells = <2>;
+ cooling-levels = <0 100 150 200 255>;
+ pwms = <&pwm12 0 50000 PWM_POLARITY_INVERTED>;
+ };
+
Expand Down Expand Up @@ -230,19 +228,19 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dts lin
+ compatible = "pwm-backlight";
+ pwms = <&pwm13 0 25000 1>;
+ brightness-levels = <
+ 0 20 20 21 21 22 22 23
+ 23 24 24 25 25 26 26 27
+ 27 28 28 29 29 30 30 31
+ 31 32 32 33 33 34 34 35
+ 35 36 36 37 37 38 38 39
+ 40 41 42 43 44 45 46 47
+ 48 49 50 51 52 53 54 55
+ 56 57 58 59 60 61 62 63
+ 64 65 66 67 68 69 70 71
+ 72 73 74 75 76 77 78 79
+ 80 81 82 83 84 85 86 87
+ 88 89 90 91 92 93 94 95
+ 96 97 98 99 100 101 102 103
+ 0 1 2 3 4 5 6 7
+ 8 9 10 11 12 13 14 15
+ 16 17 18 19 20 21 22 23
+ 24 25 26 27 28 29 30 31
+ 32 33 34 35 36 37 38 39
+ 40 41 42 43 44 45 46 47
+ 48 49 50 51 52 53 54 55
+ 56 57 58 59 60 61 62 63
+ 64 65 66 67 68 69 70 71
+ 72 73 74 75 76 77 78 79
+ 80 81 82 83 84 85 86 87
+ 88 89 90 91 92 93 94 95
+ 96 97 98 99 100 101 102 103
+ 104 105 106 107 108 109 110 111
+ 112 113 114 115 116 117 118 119
+ 120 121 122 123 124 125 126 127
Expand All @@ -261,9 +259,8 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dts lin
+ 224 225 226 227 228 229 230 231
+ 232 233 234 235 236 237 238 239
+ 240 241 242 243 244 245 246 247
+ 248 249 250 251 252 253 254 255
+ >;
+ default-brightness-level = <25>;
+ 248 249 250 251 252 253 254 255>;
+ default-brightness-level = <200>;
+ enable-gpios = <&gpio3 RK_PC0 GPIO_ACTIVE_HIGH>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&lcd_bl_en>;
Expand Down Expand Up @@ -449,11 +446,8 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dts lin
+ mem-supply = <&vdd_cpu_big1_mem_s0>;
+};
+
+// gsy HDMI
+&hdmi0 {
+ enable-gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>;
+ // pinctrl-names = "default";
+ // pinctrl-0 = <&hdmi0_en>;
+ status = "disabled";
+};
+
Expand All @@ -466,12 +460,12 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dts lin
+};
+
+&hdptxphy_hdmi0 {
+ status = "okay";
+ status = "disabled";
+};
+
+&route_hdmi0 {
+ status = "okay";
+ // connect = <&vp0_out_hdmi0>;
+ status = "disabled";
+ connect = <&vp0_out_hdmi0>;
+};
+
+// gsy DP
Expand Down

0 comments on commit dff961a

Please sign in to comment.