From: Stephan Gerhold <stephan@gerhold.net>
To: Linus Walleij <linus.walleij@linaro.org>
Cc: linux-arm-kernel@lists.infradead.org,
Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
Stephan Gerhold <stephan@gerhold.net>
Subject: [PATCH 7/9] ARM: dts: ux500: samsung-golden: Add WiFi
Date: Thu, 19 Dec 2019 21:20:50 +0100 [thread overview]
Message-ID: <20191219202052.19039-8-stephan@gerhold.net> (raw)
In-Reply-To: <20191219202052.19039-1-stephan@gerhold.net>
samsung-golden uses a BCM4334 WiFi+BT combo chip, connected to SDIO.
It is supported by the brcmfmac driver in mainline,
so we only need to set up the device tree to make it work correctly.
Note: brcmfmac requires (proprietary) firmware + a device-specific
NVRAM file. Both can be extracted from the stock Android system
used on samsung-golden:
- /system/etc/wifi/bcmdhd_sta.bin_b2 -> /lib/firmware/brcm/brcmfmac4334-sdio.bin
- /system/etc/wifi/nvram_net.txt_GPIO4 -> /lib/firmware/brcm/brcmfmac4334-sdio.samsung,golden.txt
brcmfmac4334-sdio.bin from linux-firmware also seems to work,
but results in occasional errors for some reason.
Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
---
.../arm/boot/dts/ste-ux500-samsung-golden.dts | 56 +++++++++++++++++++
1 file changed, 56 insertions(+)
diff --git a/arch/arm/boot/dts/ste-ux500-samsung-golden.dts b/arch/arm/boot/dts/ste-ux500-samsung-golden.dts
index e75a425d177e..d22b2879c46a 100644
--- a/arch/arm/boot/dts/ste-ux500-samsung-golden.dts
+++ b/arch/arm/boot/dts/ste-ux500-samsung-golden.dts
@@ -64,9 +64,27 @@ sdi1_per2@80118000 {
non-removable;
cap-sd-highspeed;
+ vmmc-supply = <&wl_reg_on>;
+
pinctrl-names = "default", "sleep";
pinctrl-0 = <&mc1_a_2_default>;
pinctrl-1 = <&mc1_a_2_sleep>;
+
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ wifi@1 {
+ compatible = "brcm,bcm4329-fmac";
+ reg = <1>;
+
+ /* GPIO216 (WLAN_HOST_WAKE) */
+ interrupt-parent = <&gpio6>;
+ interrupts = <24 IRQ_TYPE_EDGE_FALLING>;
+ interrupt-names = "host-wake";
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&wlan_default>;
+ };
};
/* eMMC */
@@ -290,6 +308,28 @@ sd_level_translator: regulator-sd-level-translator {
pinctrl-names = "default";
pinctrl-0 = <&sd_level_translator_default>;
};
+
+ /*
+ * WL_REG_ON takes WLAN out of reset and enables the internal regulators.
+ * The voltage specified here is only used to determine the OCR mask,
+ * the BCM chip is actually connected directly to VBAT.
+ */
+ wl_reg_on: regulator-wl-reg-on {
+ compatible = "regulator-fixed";
+
+ regulator-name = "wl-reg-on";
+ regulator-min-microvolt = <3000000>;
+ regulator-max-microvolt = <3000000>;
+
+ startup-delay-us = <100000>;
+
+ /* GPIO215 (WLAN_EN) */
+ gpio = <&gpio6 23 GPIO_ACTIVE_HIGH>;
+ enable-active-high;
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&wlan_en_default>;
+ };
};
&pinctrl {
@@ -340,6 +380,22 @@ golden_cfg1 {
};
};
+ wlan {
+ wlan_default: wlan_default {
+ golden_cfg1 {
+ pins = "GPIO216_AG12"; /* WLAN_HOST_WAKE */
+ ste,config = <&gpio_in_pd>;
+ };
+ };
+
+ wlan_en_default: wlan_en_default {
+ golden_cfg1 {
+ pins = "GPIO215_AH13"; /* WLAN_EN */
+ ste,config = <&gpio_out_lo>;
+ };
+ };
+ };
+
vibrator {
vibrator_default: vibrator_default {
golden_cfg1 {
--
2.24.1
next prev parent reply other threads:[~2019-12-19 20:22 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-19 20:20 [PATCH 0/9] Add device tree for Samsung Galaxy S III mini (GT-I8190) Stephan Gerhold
2019-12-19 20:20 ` [PATCH 1/9] ARM: dts: ux500: Remove unused ste-href-ab8505.dtsi Stephan Gerhold
2019-12-19 20:20 ` [PATCH 2/9] ARM: dts: ux500: Add device tree include for AB8505 Stephan Gerhold
2019-12-19 20:20 ` [PATCH 3/9] dt-bindings: arm: ux500: Document samsung,golden compatible Stephan Gerhold
2019-12-19 20:20 ` [PATCH 4/9] ARM: dts: ux500: Add device tree for Samsung Galaxy S III mini (GT-I8190) Stephan Gerhold
2019-12-19 20:20 ` [PATCH 5/9] ARM: dts: ux500: samsung-golden: Add IMU (accelerometer + gyroscope) Stephan Gerhold
2019-12-19 20:20 ` [PATCH 6/9] ARM: dts: ux500: samsung-golden: Add touch screen Stephan Gerhold
2019-12-19 20:20 ` Stephan Gerhold [this message]
2019-12-19 20:20 ` [PATCH 8/9] ARM: dts: ux500: samsung-golden: Add Bluetooth Stephan Gerhold
2019-12-19 20:20 ` [PATCH 9/9] ARM: defconfig: u8500: Enable new drivers for samsung-golden Stephan Gerhold
2019-12-25 23:21 ` [PATCH 0/9] Add device tree for Samsung Galaxy S III mini (GT-I8190) Linus Walleij
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191219202052.19039-8-stephan@gerhold.net \
--to=stephan@gerhold.net \
--cc=devicetree@vger.kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).