From 29cd05754af6ef0435c257049290243810d81e26 Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Fri, 09 Aug 2024 06:05:49 +0000
Subject: [PATCH] r8111h pcie lan led config
---
kernel/arch/arm64/boot/dts/rockchip/NK-6A13_V0A.dtsi | 150 +++++++++++++++++++++++++++-----------------------
1 files changed, 81 insertions(+), 69 deletions(-)
diff --git a/kernel/arch/arm64/boot/dts/rockchip/NK-6A13_V0A.dtsi b/kernel/arch/arm64/boot/dts/rockchip/NK-6A13_V0A.dtsi
index fc41c64..779560e 100755
--- a/kernel/arch/arm64/boot/dts/rockchip/NK-6A13_V0A.dtsi
+++ b/kernel/arch/arm64/boot/dts/rockchip/NK-6A13_V0A.dtsi
@@ -134,8 +134,8 @@
rk_headset: rk-headset {
status = "okay";
compatible = "rockchip_headset";
- headset_gpio = <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>;
- spk_ctl_gpio = <&gpio3 RK_PC3 GPIO_ACTIVE_LOW>;
+ headset_gpio = <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>;//HP_DET_L_GPIO3_D5_d_3V3
+ spk_ctl_gpio = <&gpio4 RK_PB4 GPIO_ACTIVE_LOW>;//SPK_CTL_GPIO4_B4_u_3V3
pinctrl-names = "default";
pinctrl-0 = <&hp_det>;
io-channels = <&saradc 3>;
@@ -159,9 +159,20 @@
regulator-boot-on;
enable-active-high;
//gpio = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;
- gpio = <&gpio0 RK_PC0 GPIO_ACTIVE_HIGH>;
+ gpio = <&gpio1 RK_PC4 GPIO_ACTIVE_HIGH>;
vin-supply = <&vcc_1v8_s0>;
};
+
+ vcc3v3_lcd1_n: vcc3v3-lcd1-n {
+ compatible = "regulator-fixed";
+ regulator-name = "vcc3v3_lcd1_n";
+ regulator-boot-on;
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ enable-active-high;
+ gpio = <&gpio1 RK_PC4 GPIO_ACTIVE_HIGH>;
+ };
+
vcc3v3_pcie30: vcc3v3-pcie30 {
compatible = "regulator-fixed";
@@ -243,7 +254,7 @@
wifi_chip_type = "ap6398s";
pinctrl-names = "default";
pinctrl-0 = <&wifi_host_wake_irq>;
- WIFI,host_wake_irq = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; //WIFI_WAKE_HOST_H
+ WIFI,host_wake_irq = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>; //GPIO2_B5_u_1V8_WF-BT_WAKEUP_IN
// WIFI,poweren_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;
status = "okay";
};
@@ -253,57 +264,45 @@
pinctrl-names = "default";
pinctrl-0 = <&ndj_io_gpio>;
-// vcc_5v {
-// gpio_num = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>;
-// gpio_function = <0>;
-// };
+ usb_power {
+ gpio_num = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>;
+ gpio_function = <0>;
+ };//USB_HOST_PWREN_H
vcc_12v {
- gpio_num = <&gpio1 RK_PB5 GPIO_ACTIVE_HIGH>;
+ gpio_num = <&gpio0 RK_PD3 GPIO_ACTIVE_HIGH>;
gpio_function = <0>;
- };
+ };//VCC12_IO_EN_GPIO0_D3_u_3V3
vcc_3v {
- gpio_num = <&gpio0 RK_PC0 GPIO_ACTIVE_HIGH>;
+ gpio_num = <&gpio4 RK_PA1 GPIO_ACTIVE_HIGH>;
gpio_function = <0>;
- };
+ };//VCC3_IO_EN_GPIO4_A1_d_3V3
hub_5V_reset {
- gpio_num = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>;
+ gpio_num = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>;
gpio_function = <3>;
- };
+ };//HUB_RESET_GPIO4_B6_d_3V3
4g_power {
- gpio_num = <&gpio1 RK_PB6 GPIO_ACTIVE_HIGH>;
+ gpio_num = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>;
gpio_function = <0>;
- };
+ };//4G_PWREN_GPIO3_C7_u_3V3
- wake_4g {
- gpio_num = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
- gpio_function = <0>;
- };
+// wake_4g {
+// gpio_num = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
+// gpio_function = <0>;
+// };//GPIO2_B5_u_1V8_WF-BT_WAKEUP_IN
air_mode_4g {
gpio_num = <&gpio2 RK_PB4 GPIO_ACTIVE_LOW>;
gpio_function = <0>;
- };
+ }; //GPIO2_B4_u_1V8_4G_AIR_MODE_IN
reset_4g {
gpio_num = <&gpio2 RK_PC3 GPIO_ACTIVE_LOW>;
gpio_function = <3>;
- };
-/*
- spk_ctl {
- gpio_num = <&gpio3 RK_PC3 GPIO_ACTIVE_LOW>;
- gpio_function = <0>;
- };
-
- hp_det
- {
- gpio_num = <&gpio1 RK_PD5 GPIO_ACTIVE_LOW>;
- gpio_function = <1>;
- };
-*/
+ }; //GPIO2_C3_d_1V8_4G_RESET_N_IN
};
@@ -311,12 +310,11 @@
compatible = "simple-panel";
backlight = <&backlight>;
power-supply = <&vcc3v3_lcd_n>;
- vcc-5v-gpio = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>;
- vddio-mipi = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>; //MIPIDIS_PWR_EN_1V8
- enable-gpios = <&gpio3 RK_PD2 GPIO_ACTIVE_HIGH>; //LCD_VDD_EN
- reset-gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_LOW>; //CH7511_RESET_N_1V8
- edp-bl-gpios = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //LCD_BLK-PWR_EN
- edp-bl-en = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>; //LCD_BKL_EN_GPIO3_D4_d_3V3
+ vcc-5v-gpio = <&gpio4 RK_PB5 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO4_B5_d_3V3
+ enable-gpios = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //LCD_VDD_EN_GPIO3_C6_u_3V3
+ reset-gpios = <&gpio1 RK_PB5 GPIO_ACTIVE_LOW>; //CH7511_RESET_N_1V8
+ edp-bl-gpios = <&gpio3 RK_PB2 GPIO_ACTIVE_HIGH>; //LCD_BKL_PWM3_3V3
+ edp-bl-en = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>; //LCD_BKL_EN_GPIO3_A6_d_3V3
bus-format = <MEDIA_BUS_FMT_RGB888_1X24>;
bpc = <8>;
prepare-delay-ms = <200>;
@@ -387,6 +385,11 @@
status = "okay";
};
+&backlight1 {
+ pwms = <&pwm11 0 25000 0>;
+ status = "okay";
+};
+
&combphy0_ps {
status = "okay";
};
@@ -432,8 +435,12 @@
* mipi_dcphy0 needs to be enabled
* when dsi0 is enabled
*/
+&mipi_dcphy0 {
+ status = "okay";
+};
+
&dsi0 {
- status = "disabled";
+ status = "okay";
};
&dsi0_in_vp2 {
@@ -441,12 +448,14 @@
};
&dsi0_in_vp3 {
- status = "disabled";
+ status = "okay";
};
&dsi0_panel {
- power-supply = <&vcc3v3_lcd_n>;
- reset-gpios = <&gpio0 RK_PD3 GPIO_ACTIVE_LOW>;
+ power-supply = <&vcc3v3_lcd1_n>; //LCD_PWREN_H
+ vcc-5v-gpio = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>;
+ reset-gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_LOW>; //MIPIDIS_RST_GPIO1_A0_d_1V8
+ vddio-mipi = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>; //MIPIDIS_PWR_EN_1V8
pinctrl-names = "default";
pinctrl-0 = <&lcd_rst_gpio>;
};
@@ -502,7 +511,7 @@
/* rx_delay = <0x3f>; */
phy-handle = <&rgmii_phy>;
- status = "disabled";
+ status = "okay";
};
&hdmi0 {
@@ -839,9 +848,7 @@
};
};
-&mipi_dcphy0 {
- status = "okay";
-};
+
&mipi_dcphy1 {
status = "disabled";
@@ -849,21 +856,21 @@
&pcie2x1l2 {
phys = <&combphy0_ps PHY_TYPE_PCIE>;
- reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_HIGH>;
+ reset-gpios = <&gpio3 RK_PD0 GPIO_ACTIVE_HIGH>;//PCIE20x1_2_RSTn_GPIO3_D0_3V3
vpcie3v3-supply = <&vcc3v3_pcie30>;
status = "okay";
};//MINIPCIE
&pcie2x1l1 {
phys = <&combphy2_psu PHY_TYPE_PCIE>;
- reset-gpios = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>;
+ reset-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;//PCIEX1_1_PERSTn_M1_L
vpcie3v3-supply = <&vcc3v3_pcie30>;
status = "okay";
};//M.2 WIFI6
&pcie2x1l0 {
phys = <&combphy1_ps PHY_TYPE_PCIE>;
- reset-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;
+ reset-gpios = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>; //PCIEx1_0_PERSTn_M1_L
vpcie3v3-supply = <&vcc3v3_pcie30>;
status = "okay";
};//RTL8111H
@@ -918,7 +925,7 @@
};
spk_con: spk-con {
- rockchip,pins = <3 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
+ rockchip,pins = <4 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
@@ -930,7 +937,7 @@
lcd {
lcd_rst_gpio: lcd-rst-gpio {
- rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
+ rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
@@ -995,22 +1002,22 @@
ndj_io_init{
ndj_io_gpio: ndj_io_gpio_col{
rockchip,pins =
- <1 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,
- <0 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>,
- <4 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>,
- <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>,
- <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,
+ <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
+ <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>,
+ <4 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>,
+ <4 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>,
+ <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>,
<2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,
<2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>,
- <4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>, //vcc_5v
- <4 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>, //GPIO4_B5_d_3V3
- <4 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>, //GPIO4_B6_d_3V3
- <3 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>, //GPIO3_B0_u_3V3
- <3 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>, //GPIO3_B2_d_3V3
- <3 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>, //GPIO3_B3_u_3V3
- <3 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>, //GPIO3_B4_u_3V3
- <3 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>, //GPIO3_A7_u_3V3
- <3 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>; //GPIO3_A0_u_3V3
+ <4 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>, //vcc_5v
+ <1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>, //SPI0_MISO_M2_1V8
+ <1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>, //SPI0_MISO_M2_1V8
+ <1 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>, //SPI0_CLK_M2_1V8
+ <1 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>, //SPI0_CS0_M2_1V8
+ <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>, //SPI4_MISO_M2_1V8
+ <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>, //SPI4_MOSI_M2_1V8
+ <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>, //GPIO3_A7_u_3V3
+ <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>; //GPIO3_A0_u_3V3
};
};
@@ -1033,6 +1040,11 @@
&pwm10 {
status = "okay";
pinctrl-0 = <&pwm10m2_pins>;
+};
+
+&pwm11 {
+ status = "okay";
+ pinctrl-0 = <&pwm11m3_pins>;
};
&route_hdmi0 {
@@ -1128,7 +1140,7 @@
};
&uart3 {
- status = "okay";
+ status = "disabled";
pinctrl-names = "default";
pinctrl-0 = <&uart3m1_xfer>;
};
@@ -1159,7 +1171,7 @@
};
&uart8 {
- status = "okay";
+ status = "disabled";
pinctrl-names = "default";
pinctrl-0 = <&uart8m1_xfer>;
};
--
Gitblit v1.6.2