From 755336cb89d9507a85518c0bbb55ed1db039c2fa Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Tue, 13 Aug 2024 08:02:37 +0000
Subject: [PATCH] 4g /5g
---
kernel/arch/arm64/boot/dts/rockchip/NK-6A13_V0A.dtsi | 187 +++++++++++++++++++---------------------------
1 files changed, 77 insertions(+), 110 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 a4bfda9..9cad9bf 100755
--- a/kernel/arch/arm64/boot/dts/rockchip/NK-6A13_V0A.dtsi
+++ b/kernel/arch/arm64/boot/dts/rockchip/NK-6A13_V0A.dtsi
@@ -128,14 +128,14 @@
* - PDN (power down when low)
*/
post-power-on-delay-ms = <200>;
- reset-gpios = <&gpio3 RK_PB1 GPIO_ACTIVE_LOW>; //WIFI_REG_ON_H
+ reset-gpios = <&gpio1 RK_PC6 GPIO_ACTIVE_LOW>; //BT_DISABLE_GPIO1_C6_d_1V8
};
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 = <&gpio3 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,20 +159,9 @@
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";
@@ -228,9 +217,9 @@
*/
vcc_3v3_sd_s0: vcc-3v3-sd-s0-regulator {
compatible = "regulator-fixed";
- gpio = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;
- pinctrl-names = "default";
- pinctrl-0 = <&sd_s0_pwr>;
+ //gpio = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;
+ //pinctrl-names = "default";
+ //pinctrl-0 = <&sd_s0_pwr>;
regulator-name = "vcc_3v3_sd_s0";
enable-active-high;
};
@@ -241,20 +230,20 @@
clock-names = "ext_clock";
uart_rts_gpios = <&gpio4 RK_PC4 GPIO_ACTIVE_LOW>; //UART9_RTSn_M0_BT
pinctrl-names = "default", "rts_gpio";
- pinctrl-0 = <&uart9m0_rtsn>, <&bt_reset_gpio>, <&bt_wake_gpio>, <&bt_irq_gpio>;
+ pinctrl-0 = <&uart9m0_rtsn>, <&bt_reset_gpio>;
pinctrl-1 = <&uart9_gpios>;
- BT,reset_gpio = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>; //BT_REG_ON_H
- BT,wake_gpio = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;//HOST_WAKE_BT_H
- BT,wake_host_irq = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>;//BT_WAKE_HOST_H
+ BT,reset_gpio = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; //BT_DISABLE_GPIO0_B2_u_1V8
+ //BT,wake_gpio = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;//HOST_WAKE_BT_H
+ //BT,wake_host_irq = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>;//BT_WAKE_HOST_H
status = "okay";
};
wireless_wlan: wireless-wlan {
compatible = "wlan-platdata";
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
+ // pinctrl-names = "default";
+ // pinctrl-0 = <&wifi_host_wake_irq>;
+ // 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";
};
@@ -263,58 +252,41 @@
compatible = "nk_io_control";
pinctrl-names = "default";
pinctrl-0 = <&ndj_io_gpio>;
-
-// vcc_5v {
-// gpio_num = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>;
-// gpio_function = <0>;
-// };
-
+
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 {
+ wake_wifi_bt {
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
};
@@ -322,11 +294,11 @@
compatible = "simple-panel";
backlight = <&backlight>;
power-supply = <&vcc3v3_lcd_n>;
- vcc-5v-gpio = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>;
- 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>;
@@ -448,11 +420,11 @@
* when dsi0 is enabled
*/
&mipi_dcphy0 {
- status = "okay";
+ status = "disabled";
};
&dsi0 {
- status = "okay";
+ status = "disabled";
};
&dsi0_in_vp2 {
@@ -461,15 +433,6 @@
&dsi0_in_vp3 {
status = "okay";
-};
-
-&dsi0_panel {
- 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>;
};
/*
@@ -523,7 +486,7 @@
/* rx_delay = <0x3f>; */
phy-handle = <&rgmii_phy>;
- status = "disabled";
+ status = "okay";
};
&hdmi0 {
@@ -868,21 +831,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
@@ -933,11 +896,11 @@
headphone {
hp_det: hp-det {
- rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
+ rockchip,pins = <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
};
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>;
};
};
@@ -961,16 +924,16 @@
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
- rockchip,pins = <3 RK_PB1 RK_FUNC_GPIO &pcfg_pull_up>;
+ rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
-
+/*
sdmmc {
sd_s0_pwr: sd-s0-pwr {
rockchip,pins = <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
-
+*/
touch {
touch_gpio: touch-gpio {
rockchip,pins =
@@ -992,45 +955,35 @@
};
bt_reset_gpio: bt-reset-gpio {
- rockchip,pins = <3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
- };
-
- bt_wake_gpio: bt-wake-gpio {
- rockchip,pins = <3 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
- };
-
- bt_irq_gpio: bt-irq-gpio {
- rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
+ rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
-
+/*
wireless-wlan {
wifi_host_wake_irq: wifi-host-wake-irq {
- rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_down>;
+ rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
-
+*/
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>,
+ <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 41
+ <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>, //SPI4_MISO_M2_1V8 32
+ <1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>, //SPI0_MOSI_M2_3V3 42
+ <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>, //SPI4_MOSI_M2_1V8 33
+ <1 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>, //SPI0_CLK_M2_1V8 43
+ <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>, //SPI4_CLK_M2_1V8 34
+ <1 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>, //SPI0_CS0_M2_1V8 44
+ <1 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>; //SPI4_CS0_M2_1V8 35
};
};
};
@@ -1040,7 +993,7 @@
};
&route_dsi0 {
- status = "okay";
+ status = "disabled";
connect = <&vp3_out_dsi0>;
};
@@ -1152,7 +1105,7 @@
};
&uart3 {
- status = "okay";
+ status = "disabled";
pinctrl-names = "default";
pinctrl-0 = <&uart3m1_xfer>;
};
@@ -1183,7 +1136,7 @@
};
&uart8 {
- status = "okay";
+ status = "disabled";
pinctrl-names = "default";
pinctrl-0 = <&uart8m1_xfer>;
};
@@ -1194,3 +1147,17 @@
pinctrl-names = "default";
pinctrl-0 = <&uart9m0_xfer &uart9m0_ctsn>;
};
+
+
+&can0 {
+ status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&can0m0_pins>;
+};
+
+
+&can1 {
+ status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&can1m1_pins>;
+};
\ No newline at end of file
--
Gitblit v1.6.2