From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 31280C433C1 for ; Sat, 20 Mar 2021 15:30:33 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B214161965 for ; Sat, 20 Mar 2021 15:30:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B214161965 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=gerhold.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=VLlAspaocWxmO8wGfQjlmOB892wBzQpZJ8jSgRqKreU=; b=QwwJtiBw9x7MGXYV2vf1Cbhun KxfoPtTbaYz5XgVqlccmqKzhdUgUbsYt5Rask47WjhQlrKBmyjS26ToUotrIDzLq9kXTkooze7sMX IntgxdhH5ssWL3hjuC9O0oh9RRwYIpmyokPyWOoBzUg/ti7r2UUws94d54tZFScXsFn0giyb1C8NP OgZzh39CnaEwMqHTKuOy2Gm5iBdZUJUMI4F2/z39MWcRqV+Wufl7Nv9YenBUFo/8wqYWIMSAVmP5+ UhgRhvHMxtd8/mfUtERhT0VPreCiy9FmQp50SufbnW36Me1hxOyKRR3T/EqiIJ9T+N4FvcaDUeu5e YvLTeFs/Q==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lNdX7-008z0F-F0; Sat, 20 Mar 2021 15:28:57 +0000 Received: from mo4-p00-ob.smtp.rzone.de ([81.169.146.160]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lNdX3-008yzp-2i for linux-arm-kernel@lists.infradead.org; Sat, 20 Mar 2021 15:28:55 +0000 ARC-Seal: i=1; a=rsa-sha256; t=1616254131; cv=none; d=strato.com; s=strato-dkim-0002; b=IDxUJl4LAcupcvvMzDK4mQ968kOsIQV2+xriWGeqZA9V4BKRBiE+gi9P9gGngIIc/T /DCPmiLwEu9Nui6kNF7EGBtC+I7rd8d/8AlSX6QONEBhwCoq4JzQNC9jjuZ/b+pWeG+W VAMyGuLxOflZqKbHttSsNLo7CDnPD16gKo1Y/M2EFEGNid1w3ASHiMCVc+khinhK7FCH v+yY28MkQegDi8p4fDjFph5ekG8GMhHmQ40brychOYyytk7jg2CI6R/SYRZLaJlrSh9b 5LZL+LHjaSBSU2cul13CkJSkGgEvLNlBBgINeOXPZ5YA8JTu2xnFiY8v8nE5gPDHv9w2 1ORg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1616254131; s=strato-dkim-0002; d=strato.com; h=In-Reply-To:References:Message-ID:Subject:Cc:To:From:Date:Cc:Date: From:Subject:Sender; bh=5qzBugdf30sjSd/Ba7pEn3qn6TKCV2tE56adfZi3Ul0=; b=QlAKThL+XHMgBw6bVi/TFuzlapo348fz7w0WbVb0aFwIS6a4mWLmmhdx1QF0cwo731 MzADGRPVvjJCmMdpb4b44wF4ps3OJMHFQdq9xKqUuxGGLP2DCO8MyuFSGkl2ZpwOSPGm dPwh5MZbHAjQ/1C7rOoaqNaZNXP8UFtdyvYjYH/IU62a1Mitor5RjIkptnprAeNhFiFj T+41NpGEqWtRtsry61dSWtbXv36jnVrXwTjk/o8t1b6Q2TPfzA07sGhAc21AeeEFyMLU ZMJYeTY3PG1/aFnfDMXV+0pCVviUAwxctHKJUyRm8XqCpwnRUSjh/8z132UA53wzIJ8P WACg== ARC-Authentication-Results: i=1; strato.com; dkim=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1616254131; s=strato-dkim-0002; d=gerhold.net; h=In-Reply-To:References:Message-ID:Subject:Cc:To:From:Date:Cc:Date: From:Subject:Sender; bh=5qzBugdf30sjSd/Ba7pEn3qn6TKCV2tE56adfZi3Ul0=; b=UJ/0vWUK9x9eFTbhUqGelI1f6yRCjFvliiZ9aLE/rZbmho4CtQAOeMOsosQnvHK5WZ fF5H+HZdIJtDNdvy8yFv86bsr+ugGWPOKrcpKb0tHokNSPxklmyyBqejAl+ry3NJn6vy /u3wxJ8+L1VLceG0wHBl/t6ihIAvUvUoESAz1NNi9JNGy94tj7kKBDQLLgnOjxmT2gzx pojB54sGxVAvKVp7K8friexUu+DUsaif28Atop8bjDj8p4I8353VIPrvmjY9jYm+Clvr B2TyM3C84gyZ7V2rUKHVbQREmm/Fj5fHFEqd6hyX3z7BVYyTXLEgHNIy7CznwqaUDZj9 4vZQ== Authentication-Results: strato.com; dkim=none X-RZG-AUTH: ":P3gBZUipdd93FF5ZZvYFPugejmSTVR2nRPhVOQ/OcYgojyw4j34+u26zEodhPgRDZ8j7Icip" X-RZG-CLASS-ID: mo00 Received: from gerhold.net by smtp.strato.de (RZmta 47.21.0 DYNA|AUTH) with ESMTPSA id Q03f86x2KFSpKuX (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Sat, 20 Mar 2021 16:28:51 +0100 (CET) Date: Sat, 20 Mar 2021 16:28:44 +0100 From: Stephan Gerhold To: Linus Walleij Cc: linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v4] ARM: dts: ux500: Fix BT+WLAN on Janice Message-ID: References: <20210320011035.655087-1-linus.walleij@linaro.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210320011035.655087-1-linus.walleij@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210320_152853_361638_3F523176 X-CRM114-Status: GOOD ( 33.86 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Sat, Mar 20, 2021 at 02:10:35AM +0100, Linus Walleij wrote: > GPIO215 has a rail named WLAN_RST_N but it is actually connected > to the pin WLAN_REG_ON on the BCM4330 chip, so this should be > the WLAN regulator GPIO rather than GPIO222. The misunderstanding > comes from the erroneous naming of the rail on the schematic. > > GPIO222 is indeed connected to the rail BT_VREG_EN and the pin > BT_REG_ON, and can be handled by the driver as usual. > > This corrects misunderstandings and makes Janice's WLAN and BT > setup look like that of Golden and Skomer. > > Add explicit BCM4330 compatible to the WLAN chip. > > Cc: Stephan Gerhold > Signed-off-by: Linus Walleij This looks great, thanks for your patience to resolve the confusion! :) Reviewed-by: Stephan Gerhold Consider fixing the typo below when you apply this. Thanks! Stephan > --- > ChangeLog v3->v4: > - Resolve the confusion around WLAN_RST_N > ChangeLog v2->v3: > - Break out patch, Janice has BCM4330 and is different > from Golden and Skomer. > ChangeLog v1->v2: > - Change compatible strings on the WLAN chips to be > specific-to-generic indicating the exact model. > --- > .../arm/boot/dts/ste-ux500-samsung-janice.dts | 48 +++++++------------ > 1 file changed, 18 insertions(+), 30 deletions(-) > > diff --git a/arch/arm/boot/dts/ste-ux500-samsung-janice.dts b/arch/arm/boot/dts/ste-ux500-samsung-janice.dts > index 7411bfeda285..f24369873ce2 100644 > --- a/arch/arm/boot/dts/ste-ux500-samsung-janice.dts > +++ b/arch/arm/boot/dts/ste-ux500-samsung-janice.dts > @@ -135,21 +135,22 @@ lcd_1v8_reg: regulator-gpio-lcd-1v8 { > > /* > * This regulator is a GPIO line that drives the Broadcom WLAN > - * line BT_VREG_EN high and enables the internal regulators > - * inside the chip. > + * line WL_REG_ON high and enables the internal regulators > + * inside the chip. Unfortunatley it is erroneously named Typo: Unfortunatley -> Unfortunately. > + * WLAN_RST_N on the schematic but it is not a reset line. > * > * The voltage specified here is only used to determine the OCR mask, > * the for the SDIO connector, the chip is actually connected > * directly to VBAT. > */ > - wl_bt_reg: regulator-gpio-wlan { > + wl_reg: regulator-gpio-wlan { > compatible = "regulator-fixed"; > - regulator-name = "BT_VREG_EN"; > + regulator-name = "WL_REG_ON"; > regulator-min-microvolt = <3000000>; > regulator-max-microvolt = <3000000>; > startup-delay-us = <100000>; > - /* GPIO222 (BT_VREG_EN) */ > - gpio = <&gpio6 30 GPIO_ACTIVE_HIGH>; > + /* GPIO215 (WLAN_RST_N to WL_REG_ON) */ > + gpio = <&gpio6 23 GPIO_ACTIVE_HIGH>; > enable-active-high; > pinctrl-names = "default"; > pinctrl-0 = <&wlan_ldo_en_default>; > @@ -390,11 +391,10 @@ mmc@80118000 { > pinctrl-1 = <&mc1_a_2_sleep>; > /* > * GPIO-controlled voltage enablement: this drives > - * the BT_VREG_EN line high when we use this device. > - * Represented as regulator to fill OCR mask and to > - * be usable in parallel with the Bluetooth chip. > + * the WL_REG_ON line high when we use this device. > + * Represented as regulator to fill OCR mask. > */ > - vmmc-supply = <&wl_bt_reg>; > + vmmc-supply = <&wl_reg>; > > #address-cells = <1>; > #size-cells = <0>; > @@ -408,9 +408,6 @@ wifi@1 { > interrupt-parent = <&gpio6>; > interrupts = <24 IRQ_TYPE_EDGE_FALLING>; > interrupt-names = "host-wake"; > - /* GPIO215 WLAN_RST_N */ > - /* FIXME: kernel does not use this assert/deassert */ > - reset-gpios = <&gpio6 23 GPIO_ACTIVE_LOW>; > pinctrl-names = "default"; > pinctrl-0 = <&wlan_default_mode>; > }; > @@ -440,15 +437,8 @@ uart@80120000 { > > bluetooth { > compatible = "brcm,bcm4330-bt"; > - /* > - * We actually have shutdown-gpios, BT_VREG_EN on GPIO222, > - * but since this GPIO is shared with the WLAN chip, we need > - * to reference the regulator instead. The regulator > - * framework will reference count the GPIO usage and > - * make sure we can use the same GPIO for several supplies. > - */ > - // shutdown-gpios = <&gpio6 30 GPIO_ACTIVE_HIGH>; > - vbat-supply = <&wl_bt_reg>; > + /* GPIO222 rail BT_VREG_EN to BT_REG_ON */ > + shutdown-gpios = <&gpio6 30 GPIO_ACTIVE_HIGH>; > /* BT_WAKE on GPIO199 */ > device-wakeup-gpios = <&gpio6 7 GPIO_ACTIVE_HIGH>; > /* BT_HOST_WAKE on GPIO97 */ > @@ -759,9 +749,9 @@ janice_cfg1 { > /* GPIO that enables the WLAN internal LDO regulators */ > wlan-ldo { > wlan_ldo_en_default: wlan_ldo_default { > - /* GPIO222 BT_VREG_ON */ > + /* GPIO215 named WLAN_RST_N */ > janice_cfg1 { > - pins = "GPIO222_AJ9"; > + pins = "GPIO215_AH13"; > ste,config = <&gpio_out_lo>; > }; > }; > @@ -875,11 +865,6 @@ janice_cfg2 { > }; > wlan { > wlan_default_mode: wlan_default { > - /* GPIO215 used for RESET_N */ > - janice_cfg1 { > - pins = "GPIO215_AH13"; > - ste,config = <&gpio_out_lo>; > - }; > /* GPIO216 for WL_HOST_WAKE */ > janice_cfg2 { > pins = "GPIO216_AG12"; > @@ -889,14 +874,17 @@ janice_cfg2 { > }; > bluetooth { > bluetooth_default_mode: bluetooth_default { > + /* GPIO199 BT_WAKE and GPIO222 BT_VREG_ON */ > janice_cfg1 { > - pins = "GPIO199_AH23"; > + pins = "GPIO199_AH23", "GPIO222_AJ9"; > ste,config = <&gpio_out_lo>; > }; > + /* GPIO97 BT_HOST_WAKE */ > janice_cfg2 { > pins = "GPIO97_D9"; > ste,config = <&gpio_in_nopull>; > }; > + /* GPIO209 BT_RST_N */ > janice_cfg3 { > pins = "GPIO209_AG15"; > ste,config = <&gpio_out_hi>; > -- > 2.29.2 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel