From 33276c6b0b8513a340de65b0ef99993023df46ca Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Mon, 12 Aug 2024 08:41:18 +0000
Subject: [PATCH] add wifi/bt/can0/can1
---
kernel/arch/arm64/boot/dts/rockchip/NK-6A13_V0A.dtsi | 46 +++++++++++++++++++++++++++++++---------------
kernel/arch/arm64/configs/rockchip_linux_defconfig | 2 +-
kernel/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile | 6 +++---
3 files changed, 35 insertions(+), 19 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 ed6b455..69b88b7 100755
--- a/kernel/arch/arm64/boot/dts/rockchip/NK-6A13_V0A.dtsi
+++ b/kernel/arch/arm64/boot/dts/rockchip/NK-6A13_V0A.dtsi
@@ -217,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,9 +241,9 @@
wireless_wlan: wireless-wlan {
compatible = "wlan-platdata";
wifi_chip_type = "ap6398s";
- 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
+ // 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";
};
@@ -273,10 +273,10 @@
gpio_function = <0>;
};//4G_PWREN_GPIO3_C7_u_3V3
-// wake_4g {
-// gpio_num = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
-// gpio_function = <0>;
-// };//GPIO2_B5_u_1V8_WF-BT_WAKEUP_IN
+ 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>;
@@ -927,13 +927,13 @@
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 =
@@ -958,13 +958,13 @@
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{
@@ -976,6 +976,10 @@
<2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,
<2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>,
<4 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>, //vcc_5v
+ <0 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>, //I2C4_SDA_M2_3V3
+ <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>, //I2C4_SCL_M2_3V3
+ <4 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>, //I2C5_SDA_M2_3V3
+ <4 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>, //I2C5_SCL_M2_3V3
<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
@@ -1145,3 +1149,15 @@
pinctrl-names = "default";
pinctrl-0 = <&uart9m0_xfer &uart9m0_ctsn>;
};
+
+
+&can0 {
+ status = "okay";
+};
+
+
+&can1 {
+ status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&can1m1_pins>;
+};
\ No newline at end of file
diff --git a/kernel/arch/arm64/configs/rockchip_linux_defconfig b/kernel/arch/arm64/configs/rockchip_linux_defconfig
index e0d3d50..f517918 100644
--- a/kernel/arch/arm64/configs/rockchip_linux_defconfig
+++ b/kernel/arch/arm64/configs/rockchip_linux_defconfig
@@ -1341,7 +1341,7 @@
# Bluetooth device drivers
#
# CONFIG_BT_HCIBTUSB is not set
-CONFIG_BT_HCIBTSDIO=y
+# CONFIG_BT_HCIBTSDIO is not set
CONFIG_BT_HCIUART=y
CONFIG_BT_HCIUART_H4=y
CONFIG_BT_HCIUART_BCSP=y
diff --git a/kernel/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile b/kernel/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile
index 1bd9a89..90de437 100755
--- a/kernel/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile
+++ b/kernel/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile
@@ -8,7 +8,7 @@
#CONFIG_BCMDHD_PCIE := y
#CONFIG_BCMDHD_USB := y
-CONFIG_BCMDHD_OOB := y
+#CONFIG_BCMDHD_OOB := y
#CONFIG_BCMDHD_CUSB := y
#CONFIG_BCMDHD_NO_POWER_OFF := y
CONFIG_BCMDHD_PROPTXSTATUS := y
@@ -97,7 +97,7 @@
-DBCMSDIO_RXLIM_POST -DBCMSDIO_TXSEQ_SYNC -DCONSOLE_DPC \
-DBCMSDIO_INTSTATUS_WAR
ifeq ($(CONFIG_BCMDHD_OOB),y)
- DHDCFLAGS += -DOOB_INTR_ONLY -DCUSTOMER_OOB -DHW_OOB
+# DHDCFLAGS += -DOOB_INTR_ONLY -DCUSTOMER_OOB -DHW_OOB
ifeq ($(CONFIG_BCMDHD_DISABLE_WOWLAN),y)
DHDCFLAGS += -DDISABLE_WOWLAN
endif
@@ -120,7 +120,7 @@
#DHDCFLAGS += -DDHD_PCIE_RUNTIMEPM -DMAX_IDLE_COUNT=11 -DCUSTOM_DHD_RUNTIME_MS=100
DHDCFLAGS += -DDHD_CONTROL_PCIE_ASPM_WIFI_TURNON
ifeq ($(CONFIG_BCMDHD_OOB),y)
- DHDCFLAGS += -DCUSTOMER_OOB -DBCMPCIE_OOB_HOST_WAKE -DHW_OOB
+# DHDCFLAGS += -DCUSTOMER_OOB -DBCMPCIE_OOB_HOST_WAKE -DHW_OOB
endif
ifneq ($(CONFIG_PCI_MSI),)
DHDCFLAGS += -DDHD_MSI_SUPPORT
--
Gitblit v1.6.2