Skip to content

Commit

Permalink
patch: kernel: rk35xx-vendor-6.1: adakta-smarc: update display
Browse files Browse the repository at this point in the history
  • Loading branch information
@bmx666
bmx666 committed Dec 17, 2024
1 parent a1fa45d commit fa1b599
Show file tree
Hide file tree
Showing 4 changed files with 113 additions and 119 deletions.
184 changes: 81 additions & 103 deletions patch/kernel/rk35xx-vendor-6.1/dt/rk3568-adakta-smarc-base-display.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
*
*/

#include <dt-bindings/display/drm_mipi_dsi.h>
#include <dt-bindings/display/media-bus-format.h>

/ {
Expand Down Expand Up @@ -80,48 +81,15 @@
default-brightness-level = <200>;
};

lvds1_backlight: lvds0-backlight {
mipi_dsi1_backlight: mipi-dsi1-backlight {
compatible = "pwm-backlight";
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
104 105 106 107 108 109 110 111
112 113 114 115 116 117 118 119
120 121 122 123 124 125 126 127
128 129 130 131 132 133 134 135
136 137 138 139 140 141 142 143
144 145 146 147 148 149 150 151
152 153 154 155 156 157 158 159
160 161 162 163 164 165 166 167
168 169 170 171 172 173 174 175
176 177 178 179 180 181 182 183
184 185 186 187 188 189 190 191
192 193 194 195 196 197 198 199
200 201 202 203 204 205 206 207
208 209 210 211 212 213 214 215
216 217 218 219 220 221 222 223
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 = <200>;
brightness-levels = <0 16 18 20 22 24 26 29 32 35 38 42 46 51 56 62 68 75 83 91 100>;
default-brightness-level = <15>;
};

vcc3v3_lvds0_en: vcc3v3-lvds0-en {
compatible = "regulator-fixed";
regulator-name = "vcc3v3_lvds1_en";
regulator-name = "vcc3v3_lvds0_en";
regulator-boot-on;
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
Expand All @@ -136,15 +104,15 @@
};
};

vcc3v3_lvds1_en: vcc3v3-lvds1-en {
vcc3v3_mipi_dsi1_en: vcc3v3-mipi-dsi1-en {
compatible = "regulator-fixed";
regulator-name = "vcc3v3_lvds1_en";
regulator-name = "vcc3v3_mipi_dsi1_en";
regulator-boot-on;
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
enable-active-high;
pinctrl-names = "default";
pinctrl-0 = <&lvds1_vdd_en>;
pinctrl-0 = <&mipi_dsi1_vdd_en>;
gpio = <&gpio0 RK_PC0 GPIO_ACTIVE_HIGH>;
vin-supply = <&vcc3v3_sys>;

Expand All @@ -153,6 +121,22 @@
};
};

display_vccio_1v8: display-vccio-1v8 {
compatible = "regulator-fixed";
regulator-name = "display_vccio_1v8";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-always-on;
};

display_vdd_3v3: display-vdd-3v3 {
compatible = "regulator-fixed";
regulator-name = "display_vdd_3v3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
};

panel-lvds0 {
compatible = "simple-panel";
backlight = <&lvds0_backlight>;
Expand Down Expand Up @@ -197,51 +181,6 @@
};
};
};

panel-lvds1 {
compatible = "simple-panel";
backlight = <&lvds1_backlight>;
power-supply = <&vcc3v3_lvds1_en>;
enable-delay-ms = <20>;
prepare-delay-ms = <20>;
unprepare-delay-ms = <20>;
disable-delay-ms = <20>;
bus-format = <MEDIA_BUS_FMT_RGB888_1X7X4_SPWG>;
width-mm = <304>;
height-mm = <228>;

display-timings {
native-mode = <&lvds1_g150xtn03_timing>;

lvds1_g150xtn03_timing: lvds1-g150xtn03-timing {
clock-frequency = <65000000>;
hactive = <1024>;
vactive = <768>;
hfront-porch = <24>;
hsync-len = <136>;
hback-porch = <160>;
vfront-porch = <3>;
vsync-len = <6>;
vback-porch = <29>;
hsync-active = <0>;
vsync-active = <0>;
de-active = <0>;
pixelclk-active = <0>;
};
};

ports {
#address-cells = <1>;
#size-cells = <0>;

port@0 {
reg = <0>;
panel_in_lvds1: endpoint {
remote-endpoint = <&lvds1_out_panel>;
};
};
};
};
};

&pinctrl {
Expand All @@ -251,22 +190,28 @@
};
};

lvds {
lvds0 {
lvds0_vdd_en: lvds0-vdd-en {
rockchip,pins = <0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>;
};

lvds0_backlight_en: lvds0-backlight-en {
rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
};
};

lvds1_vdd_en: lvds1-vdd-en {
mipi-dsi {
mipi_dsi1_vdd_en: mipi-dsi1-vdd-en {
rockchip,pins = <0 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>;
};

lvds1_backlight_en: lvds1-backlight-en {
mipi_dsi1_reset: mipi-dsi1-reset {
rockchip,pins = <0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
};

mipi_dsi1_int: mipi-dsi1-int {
rockchip,pins = <4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

Expand All @@ -276,6 +221,52 @@

&dsi1 {
status = "disabled";
power-supply = <&vcc3v3_mipi_dsi1_en>;

dsi1_panel: dsi1-panel {
compatible = "feixin,k101-im2ba02";

avdd-supply = <&display_vdd_3v3>;
dvdd-supply = <&display_vdd_3v3>;
cvdd-supply = <&display_vccio_1v8>;

pinctrl-names = "default";
pinctrl-0 = <&mipi_dsi1_reset>;
reset-gpios = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>;

backlight = <&mipi_dsi1_backlight>;

reg = <0>;
status = "disabled";

ports {
#address-cells = <1>;
#size-cells = <0>;

port@0 {
reg = <0>;
panel_in_dsi1: endpoint {
remote-endpoint = <&dsi1_out_panel>;
};
};
};
};

ports {
#address-cells = <1>;
#size-cells = <0>;

port@1 {
reg = <1>;
#address-cells = <1>;
#size-cells = <0>;

dsi1_out_panel: endpoint@0 {
reg = <0>;
remote-endpoint = <&panel_in_dsi1>;
};
};
};
};

&edp {
Expand Down Expand Up @@ -335,23 +326,10 @@

&lvds1 {
status = "disabled";

ports {
port@1 {
reg = <1>;

lvds1_out_panel: endpoint {
remote-endpoint = <&panel_in_lvds1>;
};
};
};
};

&lvds1_backlight {
pwms = <&pwm0 0 10000 0>;
pinctrl-names = "default";
pinctrl-0 = <&lvds1_backlight_en>;
enable-gpios = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>;
&mipi_dsi1_backlight {
pwms = <&pwm0 0 50000 PWM_POLARITY_INVERTED>;
status = "disabled";
};

Expand Down
4 changes: 2 additions & 2 deletions patch/kernel/rk35xx-vendor-6.1/overlay-dtbo.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ index f3fc426ec76f..1b4251fd76bb 100644
+ adakta-smarc-display-hdmi-vp1.dtbo \
+ adakta-smarc-display-lvds0-vp1.dtbo \
+ adakta-smarc-display-lvds0-vp2.dtbo \
+ adakta-smarc-display-lvds1-vp1.dtbo \
+ adakta-smarc-display-lvds1-vp2.dtbo
+ adakta-smarc-display-dsi1-vp0.dtbo \
+ adakta-smarc-display-dsi1-vp1.dtbo
+
# SPDX-License-Identifier: GPL-2.0
dtbo-$(CONFIG_ARCH_ROCKCHIP) += \
Expand Down
22 changes: 15 additions & 7 deletions ...verlay/adakta-smarc-display-lvds1-vp1.dts → ...overlay/adakta-smarc-display-dsi1-vp1.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,39 +3,39 @@

/ {
metadata {
title = "Enable LVDS1 via VP1";
title = "Enable MIPI DSI1 via VP1";
compatible = "adakta,adakta-smarc-rk3568";
category = "display";
description = "Enable LVDS1 via VP1";
description = "Enable MIPI DSI1 via VP1";
};

fragment@0 {
target = <&lvds1>;
target = <&dsi1>;

__overlay__ {
status = "okay";
};
};

fragment@1 {
target = <&lvds1_in_vp1>;
target = <&dsi1_in_vp1>;

__overlay__ {
status = "okay";
};
};

fragment@2 {
target = <&route_lvds>;
target = <&route_dsi1>;

__overlay__ {
status = "okay";
connect = <&vp1_out_lvds>;
connect = <&vp1_out_dsi1>;
};
};

fragment@3 {
target = <&lvds1_backlight>;
target = <&mipi_dsi1_backlight>;

__overlay__ {
status = "okay";
Expand All @@ -49,4 +49,12 @@
status = "okay";
};
};

fragment@5 {
target = <&dsi1_panel>;

__overlay__ {
status = "okay";
};
};
};
22 changes: 15 additions & 7 deletions ...verlay/adakta-smarc-display-lvds1-vp2.dts → ...overlay/adakta-smarc-display-dsi1-vp2.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,39 +3,39 @@

/ {
metadata {
title = "Enable LVDS1 via VP2";
title = "Enable MIPI DSI1 via VP2";
compatible = "adakta,adakta-smarc-rk3568";
category = "display";
description = "Enable LVDS1 via VP2";
description = "Enable MIPI DSI1 via VP2";
};

fragment@0 {
target = <&lvds1>;
target = <&dsi1>;

__overlay__ {
status = "okay";
};
};

fragment@1 {
target = <&lvds1_in_vp2>;
target = <&dsi1_in_vp2>;

__overlay__ {
status = "okay";
};
};

fragment@2 {
target = <&route_lvds>;
target = <&route_dsi1>;

__overlay__ {
status = "okay";
connect = <&vp2_out_lvds>;
connect = <&vp2_out_dsi1>;
};
};

fragment@3 {
target = <&lvds1_backlight>;
target = <&mipi_dsi1_backlight>;

__overlay__ {
status = "okay";
Expand All @@ -49,4 +49,12 @@
status = "okay";
};
};

fragment@5 {
target = <&dsi1_panel>;

__overlay__ {
status = "okay";
};
};
};

0 comments on commit fa1b599

Please sign in to comment.