From f70575805708cabdedea7498aaa3f710fde4d920 Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Wed, 31 Jan 2024 03:29:01 +0000
Subject: [PATCH] add lvds1024*800
---
kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi | 193 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 155 insertions(+), 38 deletions(-)
diff --git a/kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi b/kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi
index a91435a..6fa4b51 100755
--- a/kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi
+++ b/kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi
@@ -89,10 +89,108 @@
regulator-boot-on;
};
#endif
-
+ ndj_io_init {
+ compatible = "nk_io_control";
+ pinctrl-names = "default";
+ pinctrl-0 = <&nk_io_gpio>;
+
+ //gpio_op0 = <&gpio1 RK_PD0 GPIO_ACTIVE_HIGH>;
+
+ vcc_5v {
+ gpio_num = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
+ gpio_function = <0>;
+ };
+
+ vcc_12v {
+ gpio_num = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; //VCC12_IO_EN_GPIO0_C7_3V3
+ gpio_function = <0>;
+ };
+
+ hub_host2_rst {
+ gpio_num = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>; //HUB_RST_GPIO4_D2_3V3
+ gpio_function = <3>;
+ };
+
+ hub_host3 {
+ gpio_num = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>; //HOST3_EN_GPIO4_B2_1V8
+ gpio_function = <0>;
+ };
+
+ wake_4g {
+ gpio_num = <&gpio1 RK_PB1 GPIO_ACTIVE_LOW>; //4G_WAKEUP_GPIO01_B1_3V3
+ gpio_function = <0>;
+ };
+
+ air_mode_4g {
+ gpio_num = <&gpio1 RK_PB0 GPIO_ACTIVE_LOW>; //4G_AIR_MODE_GPIO01_B0_3V3
+ gpio_function = <0>;
+ };
+
+ reset_4g {
+ gpio_num = <&gpio1 RK_PB2 GPIO_ACTIVE_LOW>; //4G_RST_GPIO01_B2_3V3
+ gpio_function = <3>;
+ };
+
+ en_4g {
+ gpio_num = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; //4G_PWREN_H_GPIO0_C6
+ gpio_function = <0>;
+ };
+
+ hp_en {
+ gpio_num = <&gpio3 RK_PA6 GPIO_ACTIVE_LOW>;//HP_EN_GPIO3_A6_3V3
+ gpio_function = <0>;
+ };
+
+ wifi_power_en {
+ gpio_num = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
+ gpio_function = <0>;
+ };
+ #if 0
+ do1 {
+ gpio_num = <&gpio1 RK_PD0 GPIO_ACTIVE_LOW>;
+ gpio_function = <0>;
+ };
+
+ do2 {
+ gpio_num = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;
+ gpio_function = <0>;
+ };
+
+ do3 {
+ gpio_num = <&gpio1 RK_PD1 GPIO_ACTIVE_HIGH>;
+ gpio_function = <0>;
+ };
+
+ do4 {
+ gpio_num = <&gpio1 RK_PD3 GPIO_ACTIVE_HIGH>;
+ gpio_function = <0>;
+ };
+
+ do5 {
+ gpio_num = <&gpio2 RK_PD6 GPIO_ACTIVE_LOW>;
+ gpio_function = <0>;
+ };
+
+ do6 {
+ gpio_num = <&gpio2 RK_PD7 GPIO_ACTIVE_LOW>;
+ gpio_function = <0>;
+ };
+
+ do7 {
+ gpio_num = <&gpio3 RK_PA0 GPIO_ACTIVE_LOW>;
+ gpio_function = <0>;
+ };
+
+ di1 {
+ gpio_num = <&gpio2 RK_PD5 GPIO_ACTIVE_HIGH>;
+ gpio_function = <1>;
+ };
+ #endif
+ };
+#if 0
nk_io_init {
compatible = "nk_io_control";
- vcc3_io_en_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; //VCC3_IO_EN_GPIO0_C4_3V3
+// vcc3_io_en_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; //VCC3_IO_EN_GPIO0_C4_3V3
hub_host2_5V_rest_gpio = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>; //HUB_RST_GPIO4_D2_3V3
hub_host3_5v_gpio = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>; //HOST3_EN_GPIO4_B2_1V8
vcc_5v_io = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
@@ -108,7 +206,7 @@
pinctrl-names = "default";
pinctrl-0 = <&nk_io_gpio>;
};
-
+#endif
panel: panel {
compatible = "simple-panel";
backlight = <&backlight>;
@@ -128,8 +226,8 @@
nodka-lvds = <15>;
display-timings {
- native-mode = <&timing0>;
- timing0: timing0 {
+ native-mode = <&timing>;
+ timing: timing {
clock-frequency = <72500000>;
hactive = <1280>;
vactive = <800>;
@@ -146,8 +244,8 @@
};
};
ports {
- panel_in: endpoint {
- remote-endpoint = <&edp_out>;
+ panel_in_lvds: endpoint {
+ remote-endpoint = <&lvds_out>;
};
};
};
@@ -214,7 +312,7 @@
* when dsi0 is enabled
*/
&video_phy0 {
- status = "disabled";
+ status = "okay";
};
&dsi0 {
@@ -239,7 +337,7 @@
*/
&video_phy1 {
- status = "okay";
+ status = "disabled";
};
&dsi1 {
status = "disabled";
@@ -250,11 +348,11 @@
};
&dsi1_in_vp1 {
- status = "okay";
+ status = "disabled";
};
&dsi1_panel {
- power-supply = <&vcc3v3_lcd1_n>; //MIPI_3V3EN_GPIO3_A3_d_3V3
+// power-supply = <&vcc3v3_lcd1_n>; //MIPI_3V3EN_GPIO3_A3_d_3V3
vddio-mipi = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>; //MIPI_EN_1V8_GPIO3_A4_d_3V3
reset-gpios = <&gpio3 RK_PC7 GPIO_ACTIVE_LOW>; //MIPI_RST_L_GPIO3_C7
vcc-5v-gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
@@ -274,20 +372,11 @@
&edp {
force-hpd;
- status = "okay";
- ports {
- port@1 {
- reg = <1>;
- edp_out: endpoint {
- remote-endpoint = <&panel_in>;
- };
- };
- };
+ status = "disabled";
};
&edp_phy {
- status = "okay";
-
+ status = "disabled";
};
&edp_in_vp0 {
@@ -295,18 +384,40 @@
};
&edp_in_vp1 {
- status = "okay";
+ status = "disabled";
};
&route_edp {
- status = "okay";
+ status = "disabled";
connect = <&vp1_out_edp>;
};
&route_edp {
+ status = "disabled";
+};
+
+&lvds {
+ status = "okay";
+ ports {
+ port@1 {
+ reg = <1>;
+ lvds_out:endpoint {
+ remote-endpoint = <&panel_in_lvds>;
+ };
+ };
+ };
+};
+
+&route_lvds{
+ status = "okay";
+ connect = <&vp1_out_lvds>;
+};
+
+&lvds_in_vp1 {
status = "okay";
};
+
/*
* edp_end
*/
@@ -351,7 +462,7 @@
phy-mode = "rgmii";
clock_in_out = "output";
- snps,reset-gpio = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>;
+ snps,reset-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;
snps,reset-active-low;
/* Reset time is 20ms, 100ms for rtl8211f */
snps,reset-delays-us = <0 20000 100000>;
@@ -371,7 +482,9 @@
rx_delay = <0x2f>;
phy-handle = <&rgmii_phy0>;
+
status = "disabled";
+
};
&gmac1 {
@@ -405,9 +518,7 @@
* power-supply should switche to vcc3v3_lcd1_n
* when mipi panel is connected to dsi1.
*/
->1x {
- power-supply = <&vcc3v3_lcd0_n>;
-};
+
&i2c3 {
status = "okay";
@@ -426,7 +537,7 @@
};
&i2c4 {
- status = "okay";
+ status = "disabled";
gc8034: gc8034@37 {
compatible = "galaxycore,gc8034";
status = "okay";
@@ -438,7 +549,6 @@
reset-gpios = <&gpio3 RK_PB6 GPIO_ACTIVE_LOW>;
pwdn-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_LOW>;
rockchip,grf = <&grf>;
- power-domains = <&power RK3568_PD_VI>;
rockchip,camera-module-index = <0>;
rockchip,camera-module-facing = "back";
rockchip,camera-module-name = "RK-CMK-8M-2-v1";
@@ -472,7 +582,7 @@
};
};
ov5695: ov5695@36 {
- status = "okay";
+ status = "disabled";
compatible = "ovti,ov5695";
reg = <0x36>;
clocks = <&cru CLK_CIF_OUT>;
@@ -585,6 +695,10 @@
<3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>,
<3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,
<3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>,
+ <2 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,//93 SPI2_CS0_M1_3V3
+ <2 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>,//94 SPI2_MOSI_M1_3V3
+ <2 RK_PD7 RK_FUNC_GPIO &pcfg_pull_none>,//95 SPI2_MISO_M1_3V3
+ <3 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>,//96 SPI2_CLK_M1_3V3
<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
@@ -611,8 +725,6 @@
};
};
};
-
-
@@ -674,20 +786,25 @@
clock-names = "ext_clock";
//wifi-bt-power-toggle;
uart_rts_gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
- BT,power_gpio = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default", "rts_gpio";
pinctrl-0 = <&uart1m0_rtsn>;
pinctrl-1 = <&uart1_gpios>;
- BT,reset_gpio = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>;
- BT,wake_gpio = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>;
- BT,wake_host_irq = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;
- status = "disabled";
+ BT,reset_gpio = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
+ BT,wake_gpio = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
+ BT,wake_host_irq = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
+ status = "okay";
};
&uart0 {
status = "okay";
};
+&uart1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;
+ status = "okay";
+};
+
&uart3 {
status = "okay";
pinctrl-0 = <&uart3m1_xfer>;
--
Gitblit v1.6.2