hc
2024-07-16 1704a4ce91d494c7b0698b3cd7108a624fe36288
kernel/arch/arm64/boot/dts/rockchip/NK-6A13_V0A.dtsi
....@@ -163,6 +163,17 @@
163163 vin-supply = <&vcc_1v8_s0>;
164164 };
165165
166
+ vcc3v3_lcd1_n: vcc3v3-lcd1-n {
167
+ compatible = "regulator-fixed";
168
+ regulator-name = "vcc3v3_lcd1_n";
169
+ regulator-boot-on;
170
+ regulator-min-microvolt = <3300000>;
171
+ regulator-max-microvolt = <3300000>;
172
+ enable-active-high;
173
+ gpio = <&gpio1 RK_PC4 GPIO_ACTIVE_HIGH>;
174
+ };
175
+
176
+
166177 vcc3v3_pcie30: vcc3v3-pcie30 {
167178 compatible = "regulator-fixed";
168179 regulator-name = "vcc3v3_pcie30";
....@@ -311,8 +322,7 @@
311322 compatible = "simple-panel";
312323 backlight = <&backlight>;
313324 power-supply = <&vcc3v3_lcd_n>;
314
- vcc-5v-gpio = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>;
315
- vddio-mipi = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>; //MIPIDIS_PWR_EN_1V8
325
+ vcc-5v-gpio = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>;
316326 enable-gpios = <&gpio3 RK_PD2 GPIO_ACTIVE_HIGH>; //LCD_VDD_EN
317327 reset-gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_LOW>; //CH7511_RESET_N_1V8
318328 edp-bl-gpios = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //LCD_BLK-PWR_EN
....@@ -387,6 +397,11 @@
387397 status = "okay";
388398 };
389399
400
+&backlight1 {
401
+ pwms = <&pwm11 0 25000 0>;
402
+ status = "okay";
403
+};
404
+
390405 &combphy0_ps {
391406 status = "okay";
392407 };
....@@ -432,8 +447,12 @@
432447 * mipi_dcphy0 needs to be enabled
433448 * when dsi0 is enabled
434449 */
450
+&mipi_dcphy0 {
451
+ status = "okay";
452
+};
453
+
435454 &dsi0 {
436
- status = "disabled";
455
+ status = "okay";
437456 };
438457
439458 &dsi0_in_vp2 {
....@@ -441,12 +460,13 @@
441460 };
442461
443462 &dsi0_in_vp3 {
444
- status = "disabled";
463
+ status = "okay";
445464 };
446465
447466 &dsi0_panel {
448
- power-supply = <&vcc3v3_lcd_n>;
449
- reset-gpios = <&gpio0 RK_PD3 GPIO_ACTIVE_LOW>;
467
+ power-supply = <&vcc3v3_lcd1_n>; //LCD_PWREN_H
468
+ reset-gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_LOW>; //MIPIDIS_RST_GPIO1_A0_d_1V8
469
+ vddio-mipi = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>; //MIPIDIS_PWR_EN_1V8
450470 pinctrl-names = "default";
451471 pinctrl-0 = <&lcd_rst_gpio>;
452472 };
....@@ -839,9 +859,7 @@
839859 };
840860 };
841861
842
-&mipi_dcphy0 {
843
- status = "okay";
844
-};
862
+
845863
846864 &mipi_dcphy1 {
847865 status = "disabled";
....@@ -930,7 +948,7 @@
930948
931949 lcd {
932950 lcd_rst_gpio: lcd-rst-gpio {
933
- rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
951
+ rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
934952 };
935953 };
936954
....@@ -1035,6 +1053,11 @@
10351053 pinctrl-0 = <&pwm10m2_pins>;
10361054 };
10371055
1056
+&pwm11 {
1057
+ status = "okay";
1058
+ pinctrl-0 = <&pwm11m3_pins>;
1059
+};
1060
+
10381061 &route_hdmi0 {
10391062 status = "okay";
10401063 };