From patchwork Mon May 31 22:44:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 450525 Delivered-To: patch@linaro.org Received: by 2002:a02:c735:0:0:0:0:0 with SMTP id h21csp1195145jao; Mon, 31 May 2021 15:45:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx7N2t2PL3jlydCyJPsG2aZTFzadLr3lkFcMjUop50JCK6lUxqwBRihd4j9jNumYhY82t14 X-Received: by 2002:a6b:fb0f:: with SMTP id h15mr18557524iog.24.1622501135397; Mon, 31 May 2021 15:45:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622501135; cv=none; d=google.com; s=arc-20160816; b=X/7LTphWvZkWAUtRIGslvyRGM5gTegYpYYkPOVRoubh4xu7fdpYKoD+34reed7L9ke np0+siupXMQZJbv/LZY9xhPLGdWZBDvuFNm7S4mVkgxJ8elTdMcvFWZtN512Qg3N+jbE 5XwKP/jiAuVu0r46ztX3gZAi8SOg+19hmtdhRdu7tzSr7ZAwXIEMA9uzoDZiFHDWVpyU T5toBB7GlVEUpYcQv2cgJOWQZZ5m03A3VvXwnkiARFral0r70+dyuYfV8kySlyDqSYHQ twg+B2a8b3FXD30M3n2cxI7UYOqI2VMWoqgxzh67eSnYlm55HZ8g62LJOcQPv1UL7T1J DZaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=opmce6Rxnuaces55T3McLEYWuvos7Vs5yiViL8336IQ=; b=rQ6d7blt+f+xGuCUMnMQwEO0zUXvq/cuTeJbsRVx0h4pIc+IfsLCxixN7V7sAyEWI4 BJba/6j6U8yNmq14TDCxzbVFayC1535gonw6Bqf9sncBW2rbLYWq/fYMfunYQJijH7gl cxf/eKDsHnVpRmtI9xJHZLiMQhLrZ1LG5Ajyk0MrjnDdcppGS1p/Allt2BZdSfWOaDo9 46/dsL16vrdZHEg8Ey+7RgsCRV/ZNuHMhZEl5Y4MhjlPFaDqSwpcKt8uhPc9kNfwbFv2 bgcjT16DNESRi8eeMrb43Hch3cH7VMhK/ZgvUnsOtrvNFSIRQESiekn+DXhv7eHqvu2a AjgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=f2OEVwPq; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r18si6918947ilj.3.2021.05.31.15.45.34; Mon, 31 May 2021 15:45:35 -0700 (PDT) Received-SPF: pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=f2OEVwPq; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232341AbhEaWrM (ORCPT + 7 others); Mon, 31 May 2021 18:47:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40036 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232081AbhEaWrM (ORCPT ); Mon, 31 May 2021 18:47:12 -0400 Received: from mail-oo1-xc32.google.com (mail-oo1-xc32.google.com [IPv6:2607:f8b0:4864:20::c32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D95B0C061756 for ; Mon, 31 May 2021 15:45:31 -0700 (PDT) Received: by mail-oo1-xc32.google.com with SMTP id 67-20020a4a01460000b0290245b81f6261so508849oor.6 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=C9zU0ix0F2rO4smX2IkJUJpEmPhOgVFgqQWoxwZ8XurrjJvMHqjFJyhxO4UsyyNElg o6PK/pyeDgLdTu3NFvX5aTau4HzPZL/3S28fClWH3vupiInE7cDUmtltw9x37dTrQiRl wwbil/2gGbiVS1vo3SlZyTRo3QDPJuUiO0EcoSMvYK7or95FblVBPfJkO38Ifn6993jZ oMbYZaSsyC2C9aR2dW1P5uEqq3ie4azS6DZWx+8TYXsiWFSbjkyzgJebZJ82s7XBfSyx 5j/k3Rg4VZDK56jB1KmKYLDHxJfUQa9sZsuc6uyv7WgNXzeA+70sK9HXpNCQ/fvDAtq5 NoPg== X-Gm-Message-State: AOAM530yblxubxFtP6UQQlvPQnyW5+/ExwbxSiy7W6PGJ3RTXAiJtuYX 1Yw0t+EvIr7IF9KrcuJAu9Kncg== 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 Precedence: bulk List-ID: X-Mailing-List: devicetree@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(-) -- 2.29.2 Reviewed-by: Stephan Gerhold Tested-by: Stephan Gerhold 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";