Merge pull request #3 from lone0/enable-onboard-wifi-for-x2000-evb

Enable onboard WiFi for X2000 evb
Ingenic-community · Jan 15, 2024 · 39aefb8 · 39aefb8
2 parents 8ecdfc7 + b9ff814
commit 39aefb8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/arch/mips/boot/dts/ingenic/halley5.dts b/arch/mips/boot/dts/ingenic/halley5.dts
@@ -82,7 +82,7 @@
 };
 
 &msc0 {
-	status = "disable";
+	status = "okay";
 
 	bus-width = <8>;
 	max-frequency = <100000000>;
@@ -96,7 +96,7 @@
 };
 
 &msc1 {
-	status = "disable";
+	status = "okay";
 
 	#address-cells = <1>;
 	#size-cells = <0>;
@@ -221,7 +221,7 @@
 	};
 };
 
-&spi0 {
+&ssi0 {
 	status = "disable";
 
 	pinctrl-names = "default";

diff --git a/arch/mips/configs/halley5_defconfig b/arch/mips/configs/halley5_defconfig
@@ -27,6 +27,7 @@ CONFIG_NR_CPUS=2
 CONFIG_HZ_100=y
 # CONFIG_SECCOMP is not set
 # CONFIG_SUSPEND is not set
+CONFIG_MODULES=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 # CONFIG_COMPACTION is not set
 CONFIG_CMA=y
@@ -45,7 +46,12 @@ CONFIG_BLK_DEV_DM=y
 CONFIG_NETDEVICES=y
 CONFIG_STMMAC_ETH=y
 CONFIG_ICPLUS_PHY=y
-CONFIG_BRCMFMAC=y
+CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_PROTO_BCDC=y
+CONFIG_BRCMFMAC_SDIO=y
+CONFIG_BRCM_TRACING=y
+CONFIG_BRCMDBG=y
+
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_SERIO is not set
@@ -104,6 +110,7 @@ CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_FS=y
 CONFIG_PANIC_ON_OOPS=y
 CONFIG_PANIC_TIMEOUT=10
+CONFIG_SOFTLOCKUP_DETECTOR=y
 # CONFIG_SCHED_DEBUG is not set
 # CONFIG_DEBUG_PREEMPT is not set
 CONFIG_STACKTRACE=y

diff --git a/drivers/mmc/host/sdhci-ingenic.c b/drivers/mmc/host/sdhci-ingenic.c
@@ -159,6 +159,7 @@ static int sdhci_ingenic_probe(struct platform_device *pdev)
 	if (IS_ERR(host->ioaddr))
 		return PTR_ERR(host->ioaddr);
 
+	platform_set_drvdata(pdev, host);
 	host->hw_name = "ingenic-sdhci";
 	host->ops = &sdhci_ingenic_ops;
 	host->quirks = 0;