add wifi/bt/can0/can1

hc

2024-08-12 33276c6b0b8513a340de65b0ef99993023df46ca

 kernel/arch/arm64/boot/dts/rockchip/NK-6A13_V0A.dtsi
..
..
@@ -217,9 +217,9 @@
217
217
 */
218
218
 	vcc_3v3_sd_s0: vcc-3v3-sd-s0-regulator {
219
219
 		compatible = "regulator-fixed";
220
-		gpio = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;
221
-		pinctrl-names = "default";
222
-		pinctrl-0 = <&sd_s0_pwr>;
220
+		//gpio = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;
221
+		//pinctrl-names = "default";
222
+		//pinctrl-0 = <&sd_s0_pwr>;
223
223
 		regulator-name = "vcc_3v3_sd_s0";
224
224
 		enable-active-high;
225
225
 	};
..
..
@@ -241,9 +241,9 @@
241
241
 	wireless_wlan: wireless-wlan {
242
242
 		compatible = "wlan-platdata";
243
243
 		wifi_chip_type = "ap6398s";
244
-		pinctrl-names = "default";
245
-		pinctrl-0 = <&wifi_host_wake_irq>;
246
-		WIFI,host_wake_irq = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>; //GPIO2_B5_u_1V8_WF-BT_WAKEUP_IN
244
+	//	pinctrl-names = "default";
245
+	//	pinctrl-0 = <&wifi_host_wake_irq>;
246
+	//	WIFI,host_wake_irq = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>; //GPIO2_B5_u_1V8_WF-BT_WAKEUP_IN
247
247
 	//	WIFI,poweren_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;
248
248
 		status = "okay";
249
249
 	};
..
..
@@ -273,10 +273,10 @@
273
273
 				gpio_function = <0>;
274
274
 			};//4G_PWREN_GPIO3_C7_u_3V3
275
275
 			
276
-//         	wake_4g {
277
-//				gpio_num = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
278
-//				gpio_function = <0>;
279
-//			};//GPIO2_B5_u_1V8_WF-BT_WAKEUP_IN
276
+         	wake_wifi_bt {
277
+				gpio_num = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
278
+				gpio_function = <0>;
279
+			};//GPIO2_B5_u_1V8_WF-BT_WAKEUP_IN
280
280
 			
281
281
 			air_mode_4g {
282
282
 				gpio_num = <&gpio2 RK_PB4 GPIO_ACTIVE_LOW>;
..
..
@@ -927,13 +927,13 @@
927
927
 			rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>;
928
928
 		};
929
929
 	};
930
-
930
+/*
931
931
 	sdmmc {
932
932
 		sd_s0_pwr: sd-s0-pwr {
933
933
 			rockchip,pins = <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_up>;
934
934
 		};
935
935
 	};
936
-
936
+*/
937
937
 	touch {
938
938
 		touch_gpio: touch-gpio {
939
939
 			rockchip,pins =
..
..
@@ -958,13 +958,13 @@
958
958
 			rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
959
959
 		};
960
960
 	};
961
-
961
+/*
962
962
 	wireless-wlan {
963
963
 		wifi_host_wake_irq: wifi-host-wake-irq {
964
-			rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_down>;
964
+			rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_down>;
965
965
 		};
966
966
 	};
967
-	
967
+*/	
968
968
 	
969
969
 	ndj_io_init{
970
970
 		ndj_io_gpio: ndj_io_gpio_col{
..
..
@@ -976,6 +976,10 @@
976
976
 					<2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,
977
977
 					<2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>,
978
978
 					<4 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,  //vcc_5v
979
+					<0 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>,  //I2C4_SDA_M2_3V3
980
+					<0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>,  //I2C4_SCL_M2_3V3
981
+					<4 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>,  //I2C5_SDA_M2_3V3
982
+					<4 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>,  //I2C5_SCL_M2_3V3
979
983
 					<1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>,  //SPI0_MISO_M2_1V8
980
984
 					<1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,  //SPI0_MISO_M2_1V8
981
985
 					<1 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>,  //SPI0_CLK_M2_1V8
..
..
@@ -1145,3 +1149,15 @@
1145
1149
 	pinctrl-names = "default";
1146
1150
 	pinctrl-0 = <&uart9m0_xfer &uart9m0_ctsn>;	
1147
1151
 };
1152
+
1153
+
1154
+&can0 {
1155
+	status = "okay";
1156
+};
1157
+
1158
+
1159
+&can1 {
1160
+	status = "okay";
1161
+	pinctrl-names = "default";
1162
+	pinctrl-0 = <&can1m1_pins>;
1163
+};