parent: d3d58fa5 | patch | commit
hc
2024-08-12 33276c6b0b8513a340de65b0ef99993023df46ca 
add wifi/bt/can0/can1
3 files modified
54 ■■■■■ changed files
kernel/arch/arm64/boot/dts/rockchip/NK-6A13_V0A.dtsi 46 ●●●●● patch | view | raw | blame | history
kernel/arch/arm64/configs/rockchip_linux_defconfig 2 ●●●●● patch | view | raw | blame | history
kernel/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile 6 ●●●●● patch | view | raw | blame | history 
 kernel/arch/arm64/boot/dts/rockchip/NK-6A13_V0A.dtsi
....@@ -217,9 +217,9 @@
217217 */
218218 	vcc_3v3_sd_s0: vcc-3v3-sd-s0-regulator {
219219 		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>;
223223 		regulator-name = "vcc_3v3_sd_s0";
224224 		enable-active-high;
225225 	};
....@@ -241,9 +241,9 @@
241241 	wireless_wlan: wireless-wlan {
242242 		compatible = "wlan-platdata";
243243 		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
247247 	//	WIFI,poweren_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;
248248 		status = "okay";
249249 	};
....@@ -273,10 +273,10 @@
273273 				gpio_function = <0>;
274274 			};//4G_PWREN_GPIO3_C7_u_3V3
275275 			
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
280280 			
281281 			air_mode_4g {
282282 				gpio_num = <&gpio2 RK_PB4 GPIO_ACTIVE_LOW>;
....@@ -927,13 +927,13 @@
927927 			rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>;
928928 		};
929929 	};
930
-
930
+/*
931931 	sdmmc {
932932 		sd_s0_pwr: sd-s0-pwr {
933933 			rockchip,pins = <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_up>;
934934 		};
935935 	};
936
-
936
+*/
937937 	touch {
938938 		touch_gpio: touch-gpio {
939939 			rockchip,pins =
....@@ -958,13 +958,13 @@
958958 			rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
959959 		};
960960 	};
961
-
961
+/*
962962 	wireless-wlan {
963963 		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>;
965965 		};
966966 	};
967
-	
967
+*/	
968968 	
969969 	ndj_io_init{
970970 		ndj_io_gpio: ndj_io_gpio_col{
....@@ -976,6 +976,10 @@
976976 					<2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,
977977 					<2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>,
978978 					<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
979983 					<1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>,  //SPI0_MISO_M2_1V8
980984 					<1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,  //SPI0_MISO_M2_1V8
981985 					<1 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>,  //SPI0_CLK_M2_1V8
....@@ -1145,3 +1149,15 @@
11451149 	pinctrl-names = "default";
11461150 	pinctrl-0 = <&uart9m0_xfer &uart9m0_ctsn>;	
11471151 };
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
+};


 kernel/arch/arm64/configs/rockchip_linux_defconfig
....@@ -1341,7 +1341,7 @@
13411341 # Bluetooth device drivers
13421342 #
13431343 # CONFIG_BT_HCIBTUSB is not set
1344
-CONFIG_BT_HCIBTSDIO=y
1344
+# CONFIG_BT_HCIBTSDIO is not set
13451345 CONFIG_BT_HCIUART=y
13461346 CONFIG_BT_HCIUART_H4=y
13471347 CONFIG_BT_HCIUART_BCSP=y


 kernel/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile
....@@ -8,7 +8,7 @@
88 #CONFIG_BCMDHD_PCIE := y
99 #CONFIG_BCMDHD_USB := y
1010 
11
-CONFIG_BCMDHD_OOB := y
11
+#CONFIG_BCMDHD_OOB := y
1212 #CONFIG_BCMDHD_CUSB := y
1313 #CONFIG_BCMDHD_NO_POWER_OFF := y
1414 CONFIG_BCMDHD_PROPTXSTATUS := y
....@@ -97,7 +97,7 @@
9797 	-DBCMSDIO_RXLIM_POST -DBCMSDIO_TXSEQ_SYNC -DCONSOLE_DPC               \
9898 	-DBCMSDIO_INTSTATUS_WAR
9999 ifeq ($(CONFIG_BCMDHD_OOB),y)
100
-	DHDCFLAGS += -DOOB_INTR_ONLY -DCUSTOMER_OOB -DHW_OOB
100
+#	DHDCFLAGS += -DOOB_INTR_ONLY -DCUSTOMER_OOB -DHW_OOB
101101 ifeq ($(CONFIG_BCMDHD_DISABLE_WOWLAN),y)
102102 	DHDCFLAGS += -DDISABLE_WOWLAN
103103 endif
....@@ -120,7 +120,7 @@
120120 #DHDCFLAGS += -DDHD_PCIE_RUNTIMEPM -DMAX_IDLE_COUNT=11 -DCUSTOM_DHD_RUNTIME_MS=100
121121 DHDCFLAGS += -DDHD_CONTROL_PCIE_ASPM_WIFI_TURNON
122122 ifeq ($(CONFIG_BCMDHD_OOB),y)
123
-	DHDCFLAGS += -DCUSTOMER_OOB -DBCMPCIE_OOB_HOST_WAKE -DHW_OOB
123
+#	DHDCFLAGS += -DCUSTOMER_OOB -DBCMPCIE_OOB_HOST_WAKE -DHW_OOB
124124 endif
125125 ifneq ($(CONFIG_PCI_MSI),)
126126 	DHDCFLAGS += -DDHD_MSI_SUPPORT