From patchwork Wed Jan 6 10:21:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Gerhold X-Patchwork-Id: 12001277 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 4DE27C433E0 for ; Wed, 6 Jan 2021 10:31:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0BDD12310E for ; Wed, 6 Jan 2021 10:30:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726074AbhAFKao (ORCPT ); Wed, 6 Jan 2021 05:30:44 -0500 Received: from mo4-p02-ob.smtp.rzone.de ([85.215.255.81]:36418 "EHLO mo4-p02-ob.smtp.rzone.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725828AbhAFKao (ORCPT ); Wed, 6 Jan 2021 05:30:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1609928871; s=strato-dkim-0002; d=gerhold.net; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:From: Subject:Sender; bh=qTU4DWdSadiHTdrr7jalD2KvjWtAXAlSvru2TZMjebg=; b=Bzq9gX9N/+d35gjdff2WECvXnNXUSxKbk3MRv2zqY2cr7HZUg+yUp5imSLT+4noMp4 FX0Dy9Tv6auAnCuAOYiS8kjAaZKdpkg0R4e50azDdqNhL4xnGdNdMi+0DNor1D1XwxrV EdoNG9y1EXC8T1hFsieijLZRTcHyeShxKEaHPVOs0liUbaJxDfndg4EM9sxHCr39rLlX NWxm7CZLrxngZ5VvViAqhL/ZnIC3ixsmGkBBc13zqFhAY2I3i+nCLeAhHLOhk66oUVt1 oYE6XOK7chBTlzt1Q0Un2EkaVn3ma/63DiI76k75OlUP+55twJlNK0x3DG5cZIh4Usgd Xxuw== X-RZG-AUTH: ":P3gBZUipdd93FF5ZZvYFPugejmSTVR2nRPhVORvLd4SsytBXS7IYBkLahKxB5G6JlrU=" X-RZG-CLASS-ID: mo00 Received: from droid.. by smtp.strato.de (RZmta 47.10.7 DYNA|AUTH) with ESMTPSA id e09c6dx06ALj5DX (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Wed, 6 Jan 2021 11:21:45 +0100 (CET) From: Stephan Gerhold To: Andy Gross , Bjorn Andersson Cc: Ohad Ben-Cohen , linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, phone-devel@vger.kernel.org, Rob Herring , Stephan Gerhold Subject: [PATCH 1/3] dt-bindings: remoteproc: qcom,wcnss-pil: Add qcom,wcn3660b compatible Date: Wed, 6 Jan 2021 11:21:32 +0100 Message-Id: <20210106102134.59801-2-stephan@gerhold.net> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210106102134.59801-1-stephan@gerhold.net> References: <20210106102134.59801-1-stephan@gerhold.net> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org WCN3660B is a variant of WCN3660, but with the same regulator requirements as WCN3620/WCN3680. Add a new qcom,wcn3660b compatible to describe it from device trees. Signed-off-by: Stephan Gerhold Acked-by: Rob Herring --- Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.txt b/Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.txt index cc0b7fc1c29b..da09c0d79ac0 100644 --- a/Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.txt +++ b/Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.txt @@ -80,6 +80,7 @@ and its resource dependencies. It is described by the following properties: Definition: must be one of: "qcom,wcn3620", "qcom,wcn3660", + "qcom,wcn3660b", "qcom,wcn3680" - clocks: From patchwork Wed Jan 6 10:21:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Gerhold X-Patchwork-Id: 12001271 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 9E920C433E0 for ; Wed, 6 Jan 2021 10:30:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 64E512310E for ; Wed, 6 Jan 2021 10:30:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726076AbhAFKak (ORCPT ); Wed, 6 Jan 2021 05:30:40 -0500 Received: from mo4-p02-ob.smtp.rzone.de ([85.215.255.82]:8403 "EHLO mo4-p02-ob.smtp.rzone.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726063AbhAFKaj (ORCPT ); Wed, 6 Jan 2021 05:30:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1609928866; s=strato-dkim-0002; d=gerhold.net; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:From: Subject:Sender; bh=HPdrK9zrtiXehwRFe7QN+8x/BpSYvHuDnRLTpzJG4m8=; b=W064oqAHUrp/mF/7gacybGt9s6CuunjSuMOrswu3m1NG2dwBHLZzWjyeA2PNsEj/Ys gt2zaxKNvjB56rQVXAQO8MyxoJVZW3ScPfLybASoEensFes2VMxs7ZZrIiRGICB2Hofn Cp6VvAbgGLzLtcAzhn/eS0VgQhvAdCDdTgTM8B+lju4bTs99RwJKOK69exDTF7FkUpGx gwIcq2E4ZqBcXyI/90+dNEvBtDRe1ETeq0d/4vvSfJkYu+igh4+Hw6fSvwGp05USBTqK 9yUh1+BAgm/2Sa3+F/ZBYEIYr1ATNR7gkVTB/opuHHDqPLZXoOZheJj5QDuQ8GEQmWXD 57hA== X-RZG-AUTH: ":P3gBZUipdd93FF5ZZvYFPugejmSTVR2nRPhVORvLd4SsytBXS7IYBkLahKxB5G6JlrU=" X-RZG-CLASS-ID: mo00 Received: from droid.. by smtp.strato.de (RZmta 47.10.7 DYNA|AUTH) with ESMTPSA id e09c6dx06ALk5DY (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Wed, 6 Jan 2021 11:21:46 +0100 (CET) From: Stephan Gerhold To: Andy Gross , Bjorn Andersson Cc: Ohad Ben-Cohen , linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, phone-devel@vger.kernel.org, Rob Herring , Stephan Gerhold Subject: [PATCH 2/3] remoteproc: qcom_wcnss_iris: Add qcom,wcn3660b compatible Date: Wed, 6 Jan 2021 11:21:33 +0100 Message-Id: <20210106102134.59801-3-stephan@gerhold.net> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210106102134.59801-1-stephan@gerhold.net> References: <20210106102134.59801-1-stephan@gerhold.net> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org WCN3660B is a variant of WCN3660, but with the same regulator requirements as WCN3620/WCN3680. As far as qcom_wcnss_iris is concerned we can just use qcom,wcn3680 (wcn3680_data). However, a separate compatible is needed for WCN3660B because the wcn36xx driver uses it to enable chip-specific functionality. In particular, it enables 802.11ac for qcom,wcn3680 which is not supported by WCN3660B. Signed-off-by: Stephan Gerhold --- drivers/remoteproc/qcom_wcnss_iris.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/remoteproc/qcom_wcnss_iris.c b/drivers/remoteproc/qcom_wcnss_iris.c index 0e0ae1e764ea..169acd305ae3 100644 --- a/drivers/remoteproc/qcom_wcnss_iris.c +++ b/drivers/remoteproc/qcom_wcnss_iris.c @@ -160,6 +160,7 @@ static int qcom_iris_remove(struct platform_device *pdev) static const struct of_device_id iris_of_match[] = { { .compatible = "qcom,wcn3620", .data = &wcn3620_data }, { .compatible = "qcom,wcn3660", .data = &wcn3660_data }, + { .compatible = "qcom,wcn3660b", .data = &wcn3680_data }, { .compatible = "qcom,wcn3680", .data = &wcn3680_data }, {} }; From patchwork Wed Jan 6 10:21:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Gerhold X-Patchwork-Id: 12001273 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 5E06DC433DB for ; Wed, 6 Jan 2021 10:30:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0A33D2310D for ; Wed, 6 Jan 2021 10:30:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726063AbhAFKak (ORCPT ); Wed, 6 Jan 2021 05:30:40 -0500 Received: from mo4-p02-ob.smtp.rzone.de ([85.215.255.82]:13304 "EHLO mo4-p02-ob.smtp.rzone.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725828AbhAFKaj (ORCPT ); Wed, 6 Jan 2021 05:30:39 -0500 X-Greylist: delayed 359 seconds by postgrey-1.27 at vger.kernel.org; Wed, 06 Jan 2021 05:30:37 EST DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1609928866; s=strato-dkim-0002; d=gerhold.net; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:From: Subject:Sender; bh=iCgbCcUCqZ8Rna642B7gMEjsV+oY32yfLcAxBMiSiGQ=; b=GJDV0HbANJJX3860KznYQ/ZLZdwX8R01Yb+2Hvy9jLXBpNrmyo5jA+TAA4AXEHrmXB z4VRw8/UldUKHxOerNmKRFEifQ0xzBCrHuT3Ebdoi+GraN2ca+/uQNOiFRX2mgW8JnQF DT4PDy0CIbrbwX+/796cbSSMwFwgBxnuyWNEZeTVox1IL6cC3BE3gQ/xSxV5y23SR7SA 9szxi1rM95fCrXJ/C8oyhCUK5td5bQFIqdOj6C11x9H1wnF+1ExSQNvw2bUisH3I+qQI WOG1HOnLJUR/dM7n1MBjo2qa6n04yd8THmKRyLdy7rQU4f5pmcO7dgWJockSxDBTBd3F u1yg== X-RZG-AUTH: ":P3gBZUipdd93FF5ZZvYFPugejmSTVR2nRPhVORvLd4SsytBXS7IYBkLahKxB5G6JlrU=" X-RZG-CLASS-ID: mo00 Received: from droid.. by smtp.strato.de (RZmta 47.10.7 DYNA|AUTH) with ESMTPSA id e09c6dx06ALk5DZ (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Wed, 6 Jan 2021 11:21:46 +0100 (CET) From: Stephan Gerhold To: Andy Gross , Bjorn Andersson Cc: Ohad Ben-Cohen , linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, phone-devel@vger.kernel.org, Rob Herring , Stephan Gerhold Subject: [PATCH 3/3] arm64: dts: qcom: msm8916-samsung-a5u: Fix iris compatible Date: Wed, 6 Jan 2021 11:21:34 +0100 Message-Id: <20210106102134.59801-4-stephan@gerhold.net> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210106102134.59801-1-stephan@gerhold.net> References: <20210106102134.59801-1-stephan@gerhold.net> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Unlike most MSM8916 boards, samsung-a5u uses WCN3660B instead of WCN3620 to support the 5 GHz band additionally. WCN3660B has similar requirements as WCN3620, but it needs the XO clock to run at 48 MHz instead of 19.2 MHz. So far it was possible to describe that configuration using the qcom,wcn3680 compatible. However, as of commit 8490987bdb9a ("wcn36xx: Hook and identify RF_IRIS_WCN3680"), the wcn36xx driver will now use the qcom,wcn3680 compatible to enable functionality specific to WCN3680. In particular, WCN3680 supports 802.11ac, which is not available in WCN3660B. Use the new qcom,wcn3660b compatible to describe the chip properly. Fixes: 0d7051999175 ("arm64: dts: msm8916-samsung-a5u: Override iris compatible") Signed-off-by: Stephan Gerhold --- arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts index e39c04d977c2..dd35c3344358 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts @@ -38,7 +38,7 @@ touchscreen@48 { &pronto { iris { - compatible = "qcom,wcn3680"; + compatible = "qcom,wcn3660b"; }; };