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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E4285ECAAD3 for ; Thu, 1 Sep 2022 12:06:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject: Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=zGXbG85OwSaQ9RW6b5zZ9K/RY/riE4Y898TbFDyAPXs=; b=ywHpA66LOyPpIt3iYmnLKzd+6N iZPFjcoNzd+ydCL4/JkKnzSgwH3y7OFMFKq3R+9QauO/zIFwvbi2lvTrdEglN2EJnXph6vTfC5KLe v5p/MEcdXqbEASx5e1qwJaU1AdOHj1aL8mafEYtFvRc77xniQY9ylxP9eAF8FsuRmlQB6cnY91qdR QkI5fnVse2Y8oyb137NyIHqTpuBBUSNDN8FKDU6LhKcP+aP2u9OvwkOZmvvfbAi+IbvB6bCupsFxp Tct+FTLYp6zMLJzZ28/ujzpZzr0MuLVeCqD8noBV+iccQFaHAYCH4UZaS95Lz7bAU2AeTu9KQuDvh a5ltAISg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oTiy7-00BdEk-Gi; Thu, 01 Sep 2022 12:06:47 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oTiv4-00BYUB-PA; Thu, 01 Sep 2022 12:03:41 +0000 X-UUID: 89bd880f27bb4c649548491cf15d7eb4-20220901 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=zGXbG85OwSaQ9RW6b5zZ9K/RY/riE4Y898TbFDyAPXs=; b=YoUGhJ8SdaP2ws2KsiR0idhrElWngUVmnVilK9LryiVP5lW2L45OcvN0zeaTC43oyyk4PdDcz2P2XNP8XgMt6GVxwsv/MB0jEd2CXKBUCsv2Q97qNCbXArIfF9/cJ0cGg5zDeny6N4GqnZL17SQzBvBPWgbe44T+XrFZAraVo3Q=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.10,REQID:fc940900-3ab9-4ee1-ac83-56663fea0e9f,OB:0,L OB:0,IP:0,URL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_ Ham,ACTION:release,TS:0 X-CID-META: VersionHash:84eae18,CLOUDID:b63dd320-1c20-48a5-82a0-25f9c331906d,C OID:IGNORED,Recheck:0,SF:nil,TC:nil,Content:0,EDM:-3,IP:nil,URL:0,File:nil ,Bulk:nil,QS:nil,BEC:nil,COL:0 X-UUID: 89bd880f27bb4c649548491cf15d7eb4-20220901 Received: from mtkmbs11n1.mediatek.inc [(172.21.101.185)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 2030702970; Thu, 01 Sep 2022 05:03:36 -0700 Received: from mtkmbs11n2.mediatek.inc (172.21.101.187) by mtkmbs11n1.mediatek.inc (172.21.101.185) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.792.15; Thu, 1 Sep 2022 19:03:00 +0800 Received: from mtksdccf07 (172.21.84.99) by mtkmbs11n2.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.792.15 via Frontend Transport; Thu, 1 Sep 2022 19:03:00 +0800 Message-ID: <28d62f85365b2a718e143cf5bd0c1230bee8168f.camel@mediatek.com> Subject: Re: [PATCH v4] arm64: dts: mt7986: add built-in Wi-Fi device nodes From: Peter Chiu To: Matthias Brugger , Rob Herring , Krzysztof Kozlowski CC: , Ryder Lee , "Evelyn Tsai" , Sam Shih , , , Date: Thu, 1 Sep 2022 19:03:00 +0800 In-Reply-To: <079c023c-fa2d-1a5a-41ec-6d364067eb7d@gmail.com> References: <20220630094909.8014-1-chui-hao.chiu@mediatek.com> <079c023c-fa2d-1a5a-41ec-6d364067eb7d@gmail.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.28.5-0ubuntu0.18.04.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220901_050338_938807_18FE9DFD X-CRM114-Status: GOOD ( 33.40 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org On Thu, 2022-09-01 at 10:13 +0200, Matthias Brugger wrote: > > On 01/09/2022 05:47, Peter Chiu wrote: > > On Tue, 2022-08-30 at 10:43 +0200, Matthias Brugger wrote: > > > > > > On 30/06/2022 11:49, Peter Chiu wrote: > > > > This enables built-in 802.11ax Wi-Fi support. > > > > > > > > Reviewed-by: Sam Shih > > > > Reviewed-by: Ryder Lee > > > > Signed-off-by: Peter Chiu > > > > --- > > > > v2: add clocks and clock-names. > > > > v3: rename wmac to wifi and change underscores to dash in node > > > > names. > > > > v4: rebase to the latest codebase. > > > > --- > > > > arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts | 41 > > > > +++++++++++++++++++ > > > > arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 23 > > > > +++++++++++ > > > > arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts | 43 > > > > ++++++++++++++++++++ > > > > 3 files changed, 107 insertions(+) > > > > > > > > diff --git a/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts > > > > b/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts > > > > index 882277a..28cd168 100644 > > > > --- a/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts > > > > +++ b/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts > > > > @@ -115,6 +115,13 @@ &uart2 { > > > > status = "okay"; > > > > }; > > > > > > > > +&wifi { > > > > + status = "okay"; > > > > + pinctrl-names = "default", "dbdc"; > > > > + pinctrl-0 = <&wf_2g_5g_pins>; > > > > + pinctrl-1 = <&wf_dbdc_pins>; > > > > +}; > > > > + > > > > &pio { > > > > uart1_pins: uart1-pins { > > > > mux { > > > > @@ -129,4 +136,38 @@ mux { > > > > groups = "uart2"; > > > > }; > > > > }; > > > > + > > > > + wf_2g_5g_pins: wf-2g-5g-pins { > > > > + mux { > > > > + function = "wifi"; > > > > + groups = "wf_2g", "wf_5g"; > > > > > > yaml says: > > > - if: > > > properties: > > > function: > > > const: wifi > > > then: > > > properties: > > > groups: > > > enum: [wf_2g, wf_5g, wf_dbdc] > > > > > > > > > Did you run the binding checker against this DTS? > > > > The binding checker showed the groups setting is too long. We will > > send > > a patch to fix yaml by setting groups as string-array. > > > > Wait, does this mean the binding was wrong in the first place, as you > can't set > all three groups in one node? Yes, we need to set two groups in a node for the board which supports wifi 2g and wifi 5g simultaneously. The bindings lack the following code which set groups to string-array. $ref: /schemas/types.yaml#/definitions/string-array > > > > Why can't we just merge wf_2g_5g_pins with wf_dbdc_pins? > > > > Since they use different pinmux settings on the same pin, we need > > to > > distinguish them. > > > > wf-2g-5g-pins and wf-dbdc-pins set the same drive-strength to the > very same > group of pins. What do you mean exactly? Sorry I'm not an expert on > the pinctrl > infrastructure. wf-2g-5g-pins and wf-dbdc-pins use different functions by setting different groups. But I set useless drive-strength in the wf-dbdc-pins node. I will remove them in the next version. Best Regards, Peter Chiu > > Regards, > Matthias > > > > Best Regards, > > Peter Chiu > > > > > > Regards, > > > Matthias > > > > > > > + }; > > > > + conf { > > > > + pins = "WF0_HB1", "WF0_HB2", "WF0_HB3", > > > > "WF0_HB4", > > > > + "WF0_HB0", "WF0_HB0_B", > > > > "WF0_HB5", > > > > "WF0_HB6", > > > > + "WF0_HB7", "WF0_HB8", "WF0_HB9", > > > > "WF0_HB10", > > > > + "WF0_TOP_CLK", "WF0_TOP_DATA", > > > > "WF1_HB1", > > > > + "WF1_HB2", "WF1_HB3", "WF1_HB4", > > > > "WF1_HB0", > > > > + "WF1_HB5", "WF1_HB6", "WF1_HB7", > > > > "WF1_HB8", > > > > + "WF1_TOP_CLK", "WF1_TOP_DATA"; > > > > + drive-strength = <4>; > > > > + }; > > > > + }; > > > > + > > > > + wf_dbdc_pins: wf-dbdc-pins { > > > > + mux { > > > > + function = "wifi"; > > > > + groups = "wf_dbdc"; > > > > + }; > > > > + conf { > > > > + pins = "WF0_HB1", "WF0_HB2", "WF0_HB3", > > > > "WF0_HB4", > > > > + "WF0_HB0", "WF0_HB0_B", > > > > "WF0_HB5", > > > > "WF0_HB6", > > > > + "WF0_HB7", "WF0_HB8", "WF0_HB9", > > > > "WF0_HB10", > > > > + "WF0_TOP_CLK", "WF0_TOP_DATA", > > > > "WF1_HB1", > > > > + "WF1_HB2", "WF1_HB3", "WF1_HB4", > > > > "WF1_HB0", > > > > + "WF1_HB5", "WF1_HB6", "WF1_HB7", > > > > "WF1_HB8", > > > > + "WF1_TOP_CLK", "WF1_TOP_DATA"; > > > > + drive-strength = <4>; > > > > + }; > > > > + }; > > > > }; > > > > diff --git a/arch/arm64/boot/dts/mediatek/mt7986a.dtsi > > > > b/arch/arm64/boot/dts/mediatek/mt7986a.dtsi > > > > index e3a407d..890ded0 100644 > > > > --- a/arch/arm64/boot/dts/mediatek/mt7986a.dtsi > > > > +++ b/arch/arm64/boot/dts/mediatek/mt7986a.dtsi > > > > @@ -7,6 +7,7 @@ > > > > #include > > > > #include > > > > #include > > > > +#include > > > > > > > > / { > > > > interrupt-parent = <&gic>; > > > > @@ -70,6 +71,11 @@ secmon_reserved: secmon@43000000 { > > > > reg = <0 0x43000000 0 0x30000>; > > > > no-map; > > > > }; > > > > + > > > > + wmcpu_emi: wmcpu-reserved@4fc00000 { > > > > + no-map; > > > > + reg = <0 0x4fc00000 0 0x00100000>; > > > > + }; > > > > }; > > > > > > > > timer { > > > > @@ -261,6 +267,23 @@ eth: ethernet@15100000 { > > > > #size-cells = <0>; > > > > status = "disabled"; > > > > }; > > > > + > > > > + wifi: wifi@18000000 { > > > > + compatible = "mediatek,mt7986-wmac"; > > > > + resets = <&watchdog > > > > MT7986_TOPRGU_CONSYS_SW_RST>; > > > > + reset-names = "consys"; > > > > + clocks = <&topckgen > > > > CLK_TOP_CONN_MCUSYS_SEL>, > > > > + <&topckgen > > > > CLK_TOP_AP2CNN_HOST_SEL>; > > > > + clock-names = "mcu", "ap2conn"; > > > > + reg = <0 0x18000000 0 0x1000000>, > > > > + <0 0x10003000 0 0x1000>, > > > > + <0 0x11d10000 0 0x1000>; > > > > + interrupts = > > > IRQ_TYPE_LEVEL_HIGH>, > > > > + > > > IRQ_TYPE_LEVEL_HIGH>, > > > > + > > > IRQ_TYPE_LEVEL_HIGH>, > > > > + > > > IRQ_TYPE_LEVEL_HIGH>; > > > > + memory-region = <&wmcpu_emi>; > > > > + }; > > > > }; > > > > > > > > }; > > > > diff --git a/arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts > > > > b/arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts > > > > index 0f49d57..7f21b10 100644 > > > > --- a/arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts > > > > +++ b/arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts > > > > @@ -98,3 +98,46 @@ fixed-link { > > > > }; > > > > }; > > > > }; > > > > + > > > > +&wifi { > > > > + status = "okay"; > > > > + pinctrl-names = "default", "dbdc"; > > > > + pinctrl-0 = <&wf_2g_5g_pins>; > > > > + pinctrl-1 = <&wf_dbdc_pins>; > > > > +}; > > > > + > > > > +&pio { > > > > + wf_2g_5g_pins: wf-2g-5g-pins { > > > > + mux { > > > > + function = "wifi"; > > > > + groups = "wf_2g", "wf_5g"; > > > > + }; > > > > + conf { > > > > + pins = "WF0_HB1", "WF0_HB2", "WF0_HB3", > > > > "WF0_HB4", > > > > + "WF0_HB0", "WF0_HB0_B", > > > > "WF0_HB5", > > > > "WF0_HB6", > > > > + "WF0_HB7", "WF0_HB8", "WF0_HB9", > > > > "WF0_HB10", > > > > + "WF0_TOP_CLK", "WF0_TOP_DATA", > > > > "WF1_HB1", > > > > + "WF1_HB2", "WF1_HB3", "WF1_HB4", > > > > "WF1_HB0", > > > > + "WF1_HB5", "WF1_HB6", "WF1_HB7", > > > > "WF1_HB8", > > > > + "WF1_TOP_CLK", "WF1_TOP_DATA"; > > > > + drive-strength = <4>; > > > > + }; > > > > + }; > > > > + > > > > + wf_dbdc_pins: wf-dbdc-pins { > > > > + mux { > > > > + function = "wifi"; > > > > + groups = "wf_dbdc"; > > > > + }; > > > > + conf { > > > > + pins = "WF0_HB1", "WF0_HB2", "WF0_HB3", > > > > "WF0_HB4", > > > > + "WF0_HB0", "WF0_HB0_B", > > > > "WF0_HB5", > > > > "WF0_HB6", > > > > + "WF0_HB7", "WF0_HB8", "WF0_HB9", > > > > "WF0_HB10", > > > > + "WF0_TOP_CLK", "WF0_TOP_DATA", > > > > "WF1_HB1", > > > > + "WF1_HB2", "WF1_HB3", "WF1_HB4", > > > > "WF1_HB0", > > > > + "WF1_HB5", "WF1_HB6", "WF1_HB7", > > > > "WF1_HB8", > > > > + "WF1_TOP_CLK", "WF1_TOP_DATA"; > > > > + drive-strength = <4>; > > > > + }; > > > > + }; > > > > +};