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=-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 B077BC4708F for ; Mon, 31 May 2021 22:45:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8ACA56127C for ; Mon, 31 May 2021 22:45:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232483AbhEaWrP (ORCPT ); Mon, 31 May 2021 18:47:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40028 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232182AbhEaWrM (ORCPT ); Mon, 31 May 2021 18:47:12 -0400 Received: from mail-oo1-xc36.google.com (mail-oo1-xc36.google.com [IPv6:2607:f8b0:4864:20::c36]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3901DC061574 for ; Mon, 31 May 2021 15:45:31 -0700 (PDT) Received: by mail-oo1-xc36.google.com with SMTP id h15-20020a4ad00f0000b0290245a068aae6so961498oor.12 for ; Mon, 31 May 2021 15:45:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=opmce6Rxnuaces55T3McLEYWuvos7Vs5yiViL8336IQ=; b=f2OEVwPqTNs4SFeTk+vRARVjcMF7xFdzRyGcX8zEhtOquraGg7crn/Ps8h+7l/+Js/ 2AWbkSUkoToPhpTGc4VW7wyOHo8EGIRYWkAJ+QZDKQ6bbdbd2GDqR1lT3M2YHJNsLKWB Zm9rqY67UunCP0AP2TJju0y+k0ZsrHTKisZ/XDlUWYvPhGuYScFeDHlhoBLZlhj13pVP KYNcfO74fGCWs4UspWbqcLcWXyPRH35NNFH2LhIf7u1KfnF0DNtTtbf3vo73TeXZDI+E sV9IpPZRphgzPWnxz8BToCwDwloqdA6ReSHS5ozR4/+J2B1qfi1iDPA2yh7ESkL57xxj gQVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=opmce6Rxnuaces55T3McLEYWuvos7Vs5yiViL8336IQ=; b=ZgwNlpaTp4RNojBhvLVJbZXLXmlsL7v2aig5H34KOl2QIVnVReHuVJJ29gi4EpCr24 eljjZunzZ+YcLkyItss2wG7/LpTruhqme04G/xXgQFraubf+HPbKwqQoJLhC87qt8o2s BibhZO6aTRMBqIGtBU95xzYnY/EUBMnWZOvi5EtDr6qLunnzOpmWV356w2hSHfc9onEH /PbGv5M49REGVK9dcB/4ZZodXQap9WvJHy4Hlh2sbrAF02Xo/fYahlfNsqOQJPaPNyeV WeXYeHY12HCNO+SIzAJH0Igiyheg1O7oN2J+aluXgwLHGA1U5g/bxgFEmpZ+MJEiUC4K uU0g== X-Gm-Message-State: AOAM533GcJIZBDOUW0lWUFyi+oR2ZMaUNwjnNL35Xc2OMoeRFC0nt9/A x9NZx5c7jWXo8cCjMgDLCE1qvQ== X-Google-Smtp-Source: ABdhPJx/Qp5zgllv9Vp37l1DupQ6t3i2dFFMbwnaF8G5LKLMcli4A812r58mrK+IId0S5WG2RHj0uQ== X-Received: by 2002:a4a:97ed:: with SMTP id x42mr17736919ooi.40.1622501130540; Mon, 31 May 2021 15:45:30 -0700 (PDT) Received: from localhost.localdomain (104-57-184-186.lightspeed.austtx.sbcglobal.net. [104.57.184.186]) by smtp.gmail.com with ESMTPSA id l9sm3041877oou.43.2021.05.31.15.45.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 May 2021 15:45:30 -0700 (PDT) From: Bjorn Andersson To: Andy Gross , Bjorn Andersson , Rob Herring , Stephan Gerhold Cc: Anibal Limon , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] arm64: dts: qcom: apq8016-sbc: Update modem and WiFi firmware path Date: Mon, 31 May 2021 15:44:53 -0700 Message-Id: <20210531224453.783218-1-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The firmware for the modem and WiFi subsystems platform specific and is signed with a OEM specific key (or a test key). In order to support more than a single device it is therefor not possible to rely on the default path and stash these files directly in the firmware directory. This has already been addressed for other platforms, but the APQ8016 SBC (aka db410c) was never finished upstream. Signed-off-by: Bjorn Andersson --- arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 12 ++++++++++++ arch/arm64/boot/dts/qcom/msm8916.dtsi | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi index 6aef0c2e4f0a..448e3561ef63 100644 --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi @@ -305,6 +305,12 @@ &mdss { status = "okay"; }; +&mpss { + status = "okay"; + + firmware-name = "qcom/msm8916/mba.mbn", "qcom/msm8916/modem.mbn"; +}; + &pm8916_resin { status = "okay"; linux,code = ; @@ -312,6 +318,8 @@ &pm8916_resin { &pronto { status = "okay"; + + firmware-name = "qcom/msm8916/wcnss.mbn"; }; &sdhc_1 { @@ -394,6 +402,10 @@ &wcd_codec { qcom,mbhc-vthreshold-high = <75 150 237 450 500>; }; +&wcnss_ctrl { + firmware-name = "qcom/msm8916/WCNSS_qcom_wlan_nv.bin"; +}; + /* Enable CoreSight */ &cti0 { status = "okay"; }; &cti1 { status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi index 4f06c0a9c425..6abe0f8edb55 100644 --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi @@ -1738,7 +1738,7 @@ smd-edge { label = "pronto"; - wcnss { + wcnss_ctrl: wcnss { compatible = "qcom,wcnss"; qcom,smd-channels = "WCNSS_CTRL"; -- 2.29.2