From 2f7c68cb55ecb7331f2381deb497c27155f32faf Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Wed, 03 Jan 2024 09:43:39 +0000
Subject: [PATCH] update kernel to 5.10.198
---
kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi | 231 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 163 insertions(+), 68 deletions(-)
diff --git a/kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi b/kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi
index 4672c43..ad8ce8e 100755
--- a/kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi
+++ b/kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi
@@ -16,6 +16,14 @@
model = "Rockchip RK3568 EVB1 DDR4 V10 Board";
compatible = "rockchip,rk3568-evb1-ddr4-v10", "rockchip,rk3568";
+ rk_headset: rk-headset {
+ compatible = "rockchip_headset";
+ headset_gpio = <&gpio0 RK_PD5 GPIO_ACTIVE_LOW>;
+ spk_ctl_gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_LOW>;//AMP_SD_GPIO4_C2_3V3
+ pinctrl-names = "default";
+ pinctrl-0 = <&hp_det>;
+ };
+
vcc2v5_sys: vcc2v5-ddr {
compatible = "regulator-fixed";
regulator-name = "vcc2v5-sys";
@@ -26,15 +34,6 @@
vin-supply = <&vcc3v3_sys>;
};
- vcc3v3_vga: vcc3v3-vga {
- compatible = "regulator-fixed";
- regulator-name = "vcc3v3_vga";
- regulator-always-on;
- regulator-boot-on;
- gpio = <&gpio0 RK_PD5 GPIO_ACTIVE_HIGH>;
- enable-active-high;
- vin-supply = <&vcc3v3_sys>;
- };
pcie30_avdd0v9: pcie30-avdd0v9 {
compatible = "regulator-fixed";
@@ -61,7 +60,9 @@
regulator-name = "vcc3v3_pcie";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
+ regulator-always-on;
enable-active-high;
+ regulator-boot-on;
gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;
startup-delay-us = <5000>;
vin-supply = <&dc_12v>;
@@ -86,9 +87,8 @@
enable-active-high;
regulator-always-on;
regulator-boot-on;
- };
+ };
#endif
-
ndj_io_init {
compatible = "nk_io_control";
pinctrl-names = "default";
@@ -137,7 +137,7 @@
};
hp_en {
- gpio_num = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>;//HP_EN_GPIO3_A6_3V3
+ gpio_num = <&gpio3 RK_PA6 GPIO_ACTIVE_LOW>;//HP_EN_GPIO3_A6_3V3
gpio_function = <0>;
};
@@ -186,9 +186,28 @@
gpio_function = <1>;
};
#endif
- };
-
- panel: panel {
+ };
+#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
+ 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
+ vcc_12v_io = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; //VCC12_IO_EN_GPIO0_C7_3V3
+ en_4g_gpio = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; //4G_PWREN_H_GPIO0_C6
+ reset_4g_gpio = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>; //4G_RST_GPIO01_B2_3V3
+ air_mode_4g_gpio = <&gpio1 RK_PB0 GPIO_ACTIVE_HIGH>; //4G_AIR_MODE_GPIO01_B0_3V3
+ wake_4g_gpio = <&gpio1 RK_PB1 GPIO_ACTIVE_HIGH>; //4G_WAKEUP_GPIO01_B1_3V3
+ hp_en_gpio = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>;//HP_EN_GPIO3_A6_3V3
+// spk_out_gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>;//AMP_SD_GPIO4_C2_3V3
+ wifi_power_en_gpio = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
+// pcie_power_en_gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;//PCIE_PWREN_H_GPIO0_D4
+ pinctrl-names = "default";
+ pinctrl-0 = <&nk_io_gpio>;
+ };
+#endif
+ panel: panel {
compatible = "simple-panel";
backlight = <&backlight>;
power-supply = <&vcc3v3_lcd0_n>;
@@ -292,6 +311,10 @@
* video_phy0 needs to be enabled
* when dsi0 is enabled
*/
+&video_phy0 {
+ status = "disabled";
+};
+
&dsi0 {
status = "disabled";
};
@@ -312,6 +335,10 @@
* video_phy1 needs to be enabled
* when dsi1 is enabled
*/
+
+&video_phy1 {
+ status = "okay";
+};
&dsi1 {
status = "disabled";
};
@@ -321,15 +348,29 @@
};
&dsi1_in_vp1 {
- status = "disabled";
+ status = "okay";
};
&dsi1_panel {
- power-supply = <&vcc3v3_lcd1_n>;
+ 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
+ pinctrl-names = "default";
+ pinctrl-0 = <&lcd1_rst_gpio>;
};
+&route_dsi1 {
+ status = "disabled";
+ connect = <&vp1_out_dsi1>;
+};
+
+
+/*
+* edp_start
+*/
+
&edp {
- //hpd-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;
force-hpd;
status = "okay";
ports {
@@ -348,18 +389,67 @@
};
&edp_in_vp0 {
- status = "disabled";
+ status = "disabled";
};
&edp_in_vp1 {
+ status = "okay";
+
+};
+
+&route_edp {
+ status = "okay";
+ connect = <&vp1_out_edp>;
+};
+
+&route_edp {
status = "okay";
};
+/*
+* edp_end
+*/
+
+/*
+* Hdmi_start
+*/
+
+&hdmi {
+ status = "okay";
+ rockchip,phy-table =
+ <92812500 0x8009 0x0000 0x0270>,
+ <165000000 0x800b 0x0000 0x026d>,
+ <185625000 0x800b 0x0000 0x01ed>,
+ <297000000 0x800b 0x0000 0x01ad>,
+ <594000000 0x8029 0x0000 0x0088>,
+ <000000000 0x0000 0x0000 0x0000>;
+};
+
+&route_hdmi {
+ status = "okay";
+ connect = <&vp0_out_hdmi>;
+};
+
+&hdmi_in_vp0 {
+ status = "okay";
+};
+
+&hdmi_in_vp1 {
+ status = "disabled";
+};
+
+&hdmi_sound {
+ status = "okay";
+};
+
+/*
+ * Hdmi_END
+*/
&gmac0 {
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>;
@@ -379,7 +469,9 @@
rx_delay = <0x2f>;
phy-handle = <&rgmii_phy0>;
+
status = "disabled";
+
};
&gmac1 {
@@ -444,7 +536,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";
@@ -501,6 +592,19 @@
};
};
+&i2c5 {
+ status = "okay";
+
+ hym8563: hym8563@51 {
+ compatible = "haoyu,hym8563";
+ reg = <0x51>;
+ #clock-cells = <0>;
+ clock-frequency = <32768>;
+ clock-output-names = "xin32k";
+ /* rtc_int is not connected */
+ };
+};
+
&mdio0 {
rgmii_phy0: phy@0 {
compatible = "ethernet-phy-ieee802.3-c22";
@@ -515,16 +619,10 @@
};
};
-&video_phy0 {
- status = "disabled";
-};
-&video_phy1 {
- status = "disabled";
-};
&pcie30phy {
- status = "disabled";
+ status = "okay";
};
&pcie2x1 {
@@ -533,23 +631,24 @@
status = "okay";
};
-&pcie3x2 {
- reset-gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>;
- vpcie3v3-supply = <&vcc3v3_pcie>;
- status = "okay";
-};
-
&pinctrl {
-
+// cam {
+// camera_pwr: camera-pwr {
+// rockchip,pins =
+// /* camera power en */
+// <0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
+// };
+// };
headphone {
hp_det: hp-det {
- rockchip,pins = <3 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
+ rockchip,pins = <0 RK_PD5 RK_FUNC_GPIO &pcfg_pull_down>,
+ <4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
wireless-wlan {
wifi_host_wake_irq: wifi-host-wake-irq {
- rockchip,pins = <3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_down>;
+ rockchip,pins = <2 RK_PB2 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
@@ -559,6 +658,12 @@
};
};
+ lcd1 {
+ lcd1_rst_gpio: lcd1-rst-gpio {
+ rockchip,pins = <3 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+ };
+
nk_io_init{
nk_io_gpio: nk-io-gpio{
rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
@@ -568,7 +673,7 @@
<4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,
<1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>,
<0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>,
- <1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,
+ <1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,
<1 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
<1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>,
<3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>,
@@ -584,10 +689,6 @@
<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
-};
-
-&rk809_sound {
- hp-det-gpio = <&gpio3 RK_PC2 GPIO_ACTIVE_LOW>;
};
&rkisp {
@@ -612,36 +713,30 @@
};
};
-&route_dsi0 {
- status = "disabled";
- connect = <&vp1_out_dsi0>;
-};
-
-
-&route_edp {
- status = "okay";
- connect = <&vp1_out_edp>;
-};
&sata2 {
status = "okay";
};
&sdmmc2 {
- max-frequency = <150000000>;
- supports-sdio;
- bus-width = <4>;
- disable-wp;
- cap-sd-highspeed;
- cap-sdio-irq;
- keep-power-in-suspend;
- mmc-pwrseq = <&sdio_pwrseq>;
- non-removable;
- pinctrl-names = "default";
- pinctrl-0 = <&sdmmc2m0_bus4 &sdmmc2m0_cmd &sdmmc2m0_clk>;
- sd-uhs-sdr104;
- status = "okay";
+ status = "disabled";
+};
+
+&sdmmc1 {
+ max-frequency = <150000000>;
+ supports-sdio;
+ bus-width = <4>;
+ disable-wp;
+ cap-sd-highspeed;
+ cap-sdio-irq;
+ keep-power-in-suspend;
+ mmc-pwrseq = <&sdio_pwrseq>;
+ non-removable;
+ pinctrl-names = "default";
+ pinctrl-0 = <&sdmmc1_bus4 &sdmmc1_cmd &sdmmc1_clk>;
+ sd-uhs-sdr104;
+ status = "okay";
};
&spdif_8ch {
@@ -682,8 +777,8 @@
pinctrl-0 = <&uart1m0_rtsn>;
pinctrl-1 = <&uart1_gpios>;
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>;
+ BT,wake_gpio = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
+ BT,wake_host_irq = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
status = "okay";
};
@@ -720,4 +815,4 @@
&uart9 {
status = "okay";
pinctrl-0 = <&uart9m1_xfer>;
-};
\ No newline at end of file
+};
--
Gitblit v1.6.2