Merge pull request #3508 from jernejsk/wifi

Update Broadcom firmware package
LibreELEC · May 14, 2019 · 7a22e6a · 7a22e6a
2 parents 28380d2 + 045342f
commit 7a22e6a
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/packages/linux-firmware/brcmfmac_sdio-firmware/package.mk b/packages/linux-firmware/brcmfmac_sdio-firmware/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="brcmfmac_sdio-firmware"
-PKG_VERSION="bc97ecd07221b0f0baca67bbe5dbb6f053a271f1"
-PKG_SHA256="61773247f8ec519db5f123b2b554746bf4e4cc1902038d87d6217337afba00f5"
+PKG_VERSION="3d887490ab93ad956670040b5413a734e722a9fb"
+PKG_SHA256="8f84cb00050f7c29ad9e3cf4c3b63b0e546adce098e667460862c84f021a2f09"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/LibreELEC/brcmfmac_sdio-firmware"
 PKG_URL="https://github.com/LibreELEC/brcmfmac_sdio-firmware/archive/$PKG_VERSION.tar.gz"

diff --git a/projects/Allwinner/devices/H3/patches/linux/beelink_x2_wifi.patch b/projects/Allwinner/devices/H3/patches/linux/beelink_x2_wifi.patch
@@ -0,0 +1,24 @@
+diff --git a/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts b/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts
+index 6277f13f3eb3..6a0ac85b4616 100644
+--- a/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts
++++ b/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts
+@@ -89,7 +89,10 @@
+
+ 	wifi_pwrseq: wifi_pwrseq {
+ 		compatible = "mmc-pwrseq-simple";
++		pinctrl-names = "default";
+ 		reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */
++		clocks = <&rtc 1>;
++		clock-names = "ext_clock";
+ 	};
+
+ 	sound_spdif {
+@@ -155,6 +158,8 @@
+
+ &mmc1 {
+ 	vmmc-supply = <&reg_vcc3v3>;
++	vqmmc-supply = <&reg_vcc3v3>;
++	mmc-pwrseq = <&wifi_pwrseq>;
+ 	bus-width = <4>;
+ 	non-removable;
+ 	status = "okay";